summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--audio/nas/Makefile63
-rw-r--r--audio/nas/Makefile.man153
-rw-r--r--audio/nas/distinfo2
-rw-r--r--audio/nas/files/patch-ab30
-rw-r--r--audio/nas/files/patch-ag12
-rw-r--r--audio/nas/pkg-plist3
6 files changed, 191 insertions, 72 deletions
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index e585c55..733ef8a 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -6,75 +6,28 @@
#
PORTNAME= nas
-PORTVERSION= 1.4.1
+PORTVERSION= 1.5
CATEGORIES= audio
-MASTER_SITES= http://radscan.com/nas/ \
- ${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR= audio/nas
+MASTER_SITES= http://radscan.com/nas/
EXTRACT_SUFX= .src.tar.gz
MAINTAINER= ports@FreeBSD.org
USE_IMAKE= yes
-INSTALLS_SHLIB= yes
ALL_TARGET= World
# no need to "xmkmf -a" and create the Makefiles twice -- see above
XMKMF= xmkmf
+INSTALLS_SHLIB= yes
+
+.include <bsd.port.pre.mk>
-MAN1= auconvert.1 auctl.1 audemo.1 audial.1 auedit.1 auinfo.1 aupanel.1 \
- auphone.1 auplay.1 aurecord.1 auscope.1 autool.1 auvoxware.1 auwave.1 \
- checkmail.1 issndfile.1 nas.1 nasd.1 nasd.conf.1 playbucket.1 soundtoh.1
-MAN3= AuAnyEvent.3 AuBucketAttributes.3 AuCloseServer.3 \
- AuConvertDataToShort.3 AuConvertShortToData.3 AuCreateBucket.3 \
- AuCreateFlow.3 AuDataFormats.3 AuDataTypes.3 AuDefineToFormat.3 \
- AuDestroyBucket.3 AuDestroyFlow.3 AuDeviceAttributes.3 \
- AuDispatchEvent.3 AuElement.3 AuElementNotifyEvent.3 \
- AuElementParameters.3 AuElementState.3 AuErrorEvent.3 AuEvent.3 \
- AuEventsQueued.3 AuFileFormats.3 AuFixedPointFractionalAddend.3 \
- AuFixedPointFromFraction.3 AuFixedPointFromSum.3 \
- AuFixedPointIntegralAddend.3 AuFixedPointRoundDown.3 \
- AuFixedPointRoundUp.3 AuFlush.3 AuFormatToDefine.3 AuFormatToString.3 \
- AuFreeBucketAttributes.3 AuFreeDeviceAttributes.3 \
- AuFreeElementStates.3 AuFreeElements.3 AuGetBucketAttributes.3 \
- AuGetCloseDownMode.3 AuGetDeviceAttributes.3 AuGetElementParameters.3 \
- AuGetElementStates.3 AuGetElements.3 AuGetErrorDatabaseText.3 \
- AuGetErrorText.3 AuGetScratchFlow.3 AuGetScratchFlowFromBucket.3 \
- AuGetScratchFlowToBucket.3 AuGetServerTime.3 AuGrabNotifyEvent.3 \
- AuHandleEvents.3 AuIDOfEvent.3 AuInputTrack.3 AuKillClient.3 \
- AuListBuckets.3 AuListDevices.3 AuLookupEventHandler.3 \
- AuMakeChangeStateAction.3 AuMakeElementAddConstant.3 \
- AuMakeElementBundle.3 AuMakeElementExportBucket.3 \
- AuMakeElementExportClient.3 AuMakeElementExportDevice.3 \
- AuMakeElementExportMonitor.3 AuMakeElementImportBucket.3 \
- AuMakeElementImportClient.3 AuMakeElementImportDevice.3 \
- AuMakeElementImportWaveForm.3 AuMakeElementMultiplyConstant.3 \
- AuMakeElementState.3 AuMakeElementSum.3 AuMakeInputTrack.3 \
- AuMakeNoopAction.3 AuMakeSendNotifyAction.3 AuMonitorDevice.3 \
- AuMonitorNotifyEvent.3 AuNextEvent.3 AuOpenServer.3 AuPauseFlow.3 \
- AuReadElement.3 AuRegisterEventHandler.3 AuReleaseScratchFlow.3 \
- AuRequeueEvent.3 AuScanEvents.3 AuScanForTypedEvent.3 AuServer.3 \
- AuServerName.3 AuSetBucketAttributes.3 AuSetCloseDownMode.3 \
- AuSetDeviceAttributes.3 AuSetElementParameters.3 AuSetElementStates.3 \
- AuSetElements.3 AuSetErrorHandler.3 AuSetIOErrorHandler.3 \
- AuSetString.3 AuSoundCreateBucketFromData.3 \
- AuSoundCreateBucketFromFile.3 AuSoundCreateDataFromBucket.3 \
- AuSoundCreateFileFromBucket.3 AuSoundPlay.3 AuSoundPlayFromBucket.3 \
- AuSoundPlayFromData.3 AuSoundPlayFromFile.3 \
- AuSoundPlaySynchronousFromFile.3 AuSoundRecord.3 \
- AuSoundRecordToBucket.3 AuSoundRecordToData.3 AuSoundRecordToFile.3 \
- AuSoundRecordToFileN.3 AuStartFlow.3 AuStopFlow.3 AuStringToFormat.3 \
- AuStringToWaveForm.3 AuSync.3 AuSynchronize.3 \
- AuUnregisterEventHandler.3 AuWaveFormToString.3 AuWriteElement.3 \
- Sound.3 SoundAbbrevToFileFormat.3 SoundCloseFile.3 SoundCreate.3 \
- SoundFlushFile.3 SoundOpenFileForReading.3 SoundOpenFileForWriting.3 \
- SoundReadFile.3 SoundRewindFile.3 SoundSeekFile.3 \
- SoundStringToFileFormat.3 SoundTellFile.3 SoundWriteFile.3
+.include "${.CURDIR}/Makefile.man"
post-patch:
@find ${WRKSRC} -name '*.[ch]' | xargs \
${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
post-install:
- @${CAT} ${PKGMESSAGE}
+ @${SED} -e 's:/usr/X11R6:${PREFIX}:g' ${PKGMESSAGE}
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/nas/Makefile.man b/audio/nas/Makefile.man
new file mode 100644
index 0000000..b827fea
--- /dev/null
+++ b/audio/nas/Makefile.man
@@ -0,0 +1,153 @@
+# $FreeBSD$
+
+MAN1= auconvert.1 \
+ auctl.1 \
+ audemo.1 \
+ audial.1 \
+ auedit.1 \
+ auinfo.1 \
+ aupanel.1 \
+ auphone.1 \
+ auplay.1 \
+ aurecord.1 \
+ auscope.1 \
+ autool.1 \
+ auvoxware.1 \
+ auwave.1 \
+ checkmail.1 \
+ issndfile.1 \
+ nas.1 \
+ nasd.1 \
+ playbucket.1 \
+ soundtoh.1
+MAN3= AuAnyEvent.3 \
+ AuBucketAttributes.3 \
+ AuCloseServer.3 \
+ AuConvertDataToShort.3 \
+ AuConvertShortToData.3 \
+ AuCreateBucket.3 \
+ AuCreateFlow.3 \
+ AuDataFormats.3 \
+ AuDataTypes.3 \
+ AuDefineToFormat.3 \
+ AuDestroyBucket.3 \
+ AuDestroyFlow.3 \
+ AuDeviceAttributes.3 \
+ AuDispatchEvent.3 \
+ AuElement.3 \
+ AuElementNotifyEvent.3 \
+ AuElementParameters.3 \
+ AuElementState.3 \
+ AuErrorEvent.3 \
+ AuEvent.3 \
+ AuEventsQueued.3 \
+ AuFileFormats.3 \
+ AuFixedPointFractionalAddend.3 \
+ AuFixedPointFromFraction.3 \
+ AuFixedPointFromSum.3 \
+ AuFixedPointIntegralAddend.3 \
+ AuFixedPointRoundDown.3 \
+ AuFixedPointRoundUp.3 \
+ AuFlush.3 \
+ AuFormatToDefine.3 \
+ AuFormatToString.3 \
+ AuFreeBucketAttributes.3 \
+ AuFreeDeviceAttributes.3 \
+ AuFreeElementStates.3 \
+ AuFreeElements.3 \
+ AuGetBucketAttributes.3 \
+ AuGetCloseDownMode.3 \
+ AuGetDeviceAttributes.3 \
+ AuGetElementParameters.3 \
+ AuGetElementStates.3 \
+ AuGetElements.3 \
+ AuGetErrorDatabaseText.3 \
+ AuGetErrorText.3 \
+ AuGetScratchFlow.3 \
+ AuGetScratchFlowFromBucket.3 \
+ AuGetScratchFlowToBucket.3 \
+ AuGetServerTime.3 \
+ AuGrabNotifyEvent.3 \
+ AuHandleEvents.3 \
+ AuIDOfEvent.3 \
+ AuInputTrack.3 \
+ AuKillClient.3 \
+ AuListBuckets.3 \
+ AuListDevices.3 \
+ AuLookupEventHandler.3 \
+ AuMakeChangeStateAction.3 \
+ AuMakeElementAddConstant.3 \
+ AuMakeElementBundle.3 \
+ AuMakeElementExportBucket.3 \
+ AuMakeElementExportClient.3 \
+ AuMakeElementExportDevice.3 \
+ AuMakeElementExportMonitor.3 \
+ AuMakeElementImportBucket.3 \
+ AuMakeElementImportClient.3 \
+ AuMakeElementImportDevice.3 \
+ AuMakeElementImportWaveForm.3 \
+ AuMakeElementMultiplyConstant.3 \
+ AuMakeElementState.3 \
+ AuMakeElementSum.3 \
+ AuMakeInputTrack.3 \
+ AuMakeNoopAction.3 \
+ AuMakeSendNotifyAction.3 \
+ AuMonitorDevice.3 \
+ AuMonitorNotifyEvent.3 \
+ AuNextEvent.3 \
+ AuOpenServer.3 \
+ AuPauseFlow.3 \
+ AuReadElement.3 \
+ AuRegisterEventHandler.3 \
+ AuReleaseScratchFlow.3 \
+ AuRequeueEvent.3 \
+ AuScanEvents.3 \
+ AuScanForTypedEvent.3 \
+ AuServer.3 \
+ AuServerName.3 \
+ AuSetBucketAttributes.3 \
+ AuSetCloseDownMode.3 \
+ AuSetDeviceAttributes.3 \
+ AuSetElementParameters.3 \
+ AuSetElementStates.3 \
+ AuSetElements.3 \
+ AuSetErrorHandler.3 \
+ AuSetIOErrorHandler.3 \
+ AuSetString.3 \
+ AuSoundCreateBucketFromData.3 \
+ AuSoundCreateBucketFromFile.3 \
+ AuSoundCreateDataFromBucket.3 \
+ AuSoundCreateFileFromBucket.3 \
+ AuSoundPlay.3 \
+ AuSoundPlayFromBucket.3 \
+ AuSoundPlayFromData.3 \
+ AuSoundPlayFromFile.3 \
+ AuSoundPlaySynchronousFromFile.3 \
+ AuSoundRecord.3 \
+ AuSoundRecordToBucket.3 \
+ AuSoundRecordToData.3 \
+ AuSoundRecordToFile.3 \
+ AuSoundRecordToFileN.3 \
+ AuStartFlow.3 \
+ AuStopFlow.3 \
+ AuStringToFormat.3 \
+ AuStringToWaveForm.3 \
+ AuSync.3 \
+ AuSynchronize.3 \
+ AuUnregisterEventHandler.3 \
+ AuWaveFormToString.3 \
+ AuWriteElement.3 \
+ Sound.3 \
+ SoundAbbrevToFileFormat.3 \
+ SoundCloseFile.3 \
+ SoundCreate.3 \
+ SoundFlushFile.3 \
+ SoundOpenFileForReading.3 \
+ SoundOpenFileForWriting.3 \
+ SoundReadFile.3 \
+ SoundRewindFile.3 \
+ SoundSeekFile.3 \
+ SoundStringToFileFormat.3 \
+ SoundTellFile.3 \
+ SoundWriteFile.3
+MAN5= nasd.conf.5
diff --git a/audio/nas/distinfo b/audio/nas/distinfo
index bddeee0..2faf492 100644
--- a/audio/nas/distinfo
+++ b/audio/nas/distinfo
@@ -1 +1 @@
-MD5 (nas-1.4.1.src.tar.gz) = 8822b58c2662238ca860cfbf05345f64
+MD5 (nas-1.5.src.tar.gz) = 0726f5537b576d4d2c80208ae8b24946
diff --git a/audio/nas/files/patch-ab b/audio/nas/files/patch-ab
index ea21ce3..b01c243 100644
--- a/audio/nas/files/patch-ab
+++ b/audio/nas/files/patch-ab
@@ -1,5 +1,5 @@
---- server/dda/voxware/auvoxware.c.orig Sun Mar 5 03:40:55 2000
-+++ server/dda/voxware/auvoxware.c Sat Dec 16 22:11:35 2000
+--- server/dda/voxware/auvoxware.c.orig Fri Dec 28 16:33:46 2001
++++ server/dda/voxware/auvoxware.c Fri Dec 28 16:58:50 2001
@@ -156,7 +156,9 @@
#ifdef __FreeBSD__
@@ -11,19 +11,19 @@
#else
# ifdef __NetBSD__
# include <sys/ioctl.h>
-@@ -610,7 +612,11 @@
+@@ -624,7 +626,11 @@
if(sndStatOut.fd == -1)
{
+#ifdef __FreeBSD__
-+ while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR)) == -1 && wait)
++ while ((sndStatOut.fd = open(sndStatOut.device, sndStatOut.howToOpen, 0666)) == -1 && wait)
+#else
- while ((sndStatOut.fd = open(sndStatOut.device, O_RDWR|O_SYNC)) == -1 && wait)
+ while ((sndStatOut.fd = open(sndStatOut.device, sndStatOut.howToOpen|O_SYNC, 0666)) == -1 && wait)
+#endif
{
osLogMsg("openDevice: waiting on output device\n");
sleep(1);
-@@ -1230,6 +1236,11 @@
+@@ -1269,6 +1275,11 @@
/*
* Setup soundcard at maximum audio quality.
*/
@@ -35,15 +35,15 @@
static void setupSoundcard(sndStatPtr)
SndStat* sndStatPtr;
{
-@@ -1380,7 +1391,11 @@
-
- AL_initialized = AuTrue;
-
+@@ -1425,7 +1436,11 @@
+ osLogMsg("openDevice OUT %s mode %d\n",
+ sndStatOut.device, sndStatOut.howToOpen);
+
+#ifdef __FreeBSD__
-+ if ((fd = open(sndStatOut.device, O_RDWR, 0)) == -1) {
++ if ((fd = open(sndStatOut.device, sndStatOut.howToOpen, 0)) == -1)
+#else
- if ((fd = open(sndStatOut.device, O_RDWR|O_SYNC, 0)) == -1) {
+ if ((fd = open(sndStatOut.device, sndStatOut.howToOpen|O_SYNC, 0)) == -1)
+#endif
- UNIDENTMSG;
- return AuFalse;
- }
+ {
+ UNIDENTMSG;
+ return AuFalse;
diff --git a/audio/nas/files/patch-ag b/audio/nas/files/patch-ag
new file mode 100644
index 0000000..503f595
--- /dev/null
+++ b/audio/nas/files/patch-ag
@@ -0,0 +1,12 @@
+--- server/Imakefile.orig Sun Dec 2 15:57:38 2001
++++ server/Imakefile Fri Dec 28 18:00:27 2001
+@@ -105,6 +105,9 @@
+ # if defined(LinuxArchitecture)
+ RCMANDIR = $(FILEMANDIR)
+ RCMANSUFFIX = 5nas
++# elif defined(FreeBSDArchitecture)
++ RCMANDIR = $(FILEMANDIR)
++ RCMANSUFFIX = $(FILEMANSUFFIX)
+ # else
+ RCMANDIR = $(MANDIR)
+ RCMANSUFFIX = 5x
diff --git a/audio/nas/pkg-plist b/audio/nas/pkg-plist
index c82c666..79429f8 100644
--- a/audio/nas/pkg-plist
+++ b/audio/nas/pkg-plist
@@ -33,6 +33,7 @@ include/audio/audio.h
include/audio/audiolib.h
include/audio/audioutil.h
include/audio/fileutil.h
+include/audio/mutex.h
include/audio/snd.h
include/audio/sound.h
include/audio/soundlib.h
@@ -41,5 +42,5 @@ include/audio/wave.h
lib/X11/AuErrorDB
lib/libaudio.a
lib/libaudio.so
-lib/libaudio.so.1
+lib/libaudio.so.2
@dirrm include/audio
OpenPOWER on IntegriCloud