Date: Sun, 30 Dec 2001 03:54:01 -0800 (PST) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/33333: Update port: audio/nas to 1.5 Message-ID: <200112301154.fBUBs1E58575@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 33333 >Category: ports >Synopsis: Update port: audio/nas to 1.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Dec 30 04:00:03 PST 2001 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.5 New file: files/manpages files/patch-ag >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/nas/Makefile audio/nas/Makefile --- /usr/ports/audio/nas/Makefile Thu Sep 21 08:48:05 2000 +++ audio/nas/Makefile Sun Dec 30 16:28:50 2001 @@ -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 "${FILESDIR}/manpages" 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 -urN /usr/ports/audio/nas/distinfo audio/nas/distinfo --- /usr/ports/audio/nas/distinfo Thu Sep 7 21:16:59 2000 +++ audio/nas/distinfo Fri Dec 28 16:30:02 2001 @@ -1 +1 @@ -MD5 (nas-1.4.1.src.tar.gz) = 8822b58c2662238ca860cfbf05345f64 +MD5 (nas-1.5.src.tar.gz) = 0726f5537b576d4d2c80208ae8b24946 diff -urN /usr/ports/audio/nas/files/manpages audio/nas/files/manpages --- /usr/ports/audio/nas/files/manpages Thu Jan 1 09:00:00 1970 +++ audio/nas/files/manpages Fri Dec 28 20:10:30 2001 @@ -0,0 +1,151 @@ +MAN1+= auconvert.1 +MAN1+= auctl.1 +MAN1+= audemo.1 +MAN1+= audial.1 +MAN1+= auedit.1 +MAN1+= auinfo.1 +MAN1+= aupanel.1 +MAN1+= auphone.1 +MAN1+= auplay.1 +MAN1+= aurecord.1 +MAN1+= auscope.1 +MAN1+= autool.1 +MAN1+= auvoxware.1 +MAN1+= auwave.1 +MAN1+= checkmail.1 +MAN1+= issndfile.1 +MAN1+= nas.1 +MAN1+= nasd.1 +MAN1+= playbucket.1 +MAN1+= soundtoh.1 +MAN3+= AuAnyEvent.3 +MAN3+= AuBucketAttributes.3 +MAN3+= AuCloseServer.3 +MAN3+= AuConvertDataToShort.3 +MAN3+= AuConvertShortToData.3 +MAN3+= AuCreateBucket.3 +MAN3+= AuCreateFlow.3 +MAN3+= AuDataFormats.3 +MAN3+= AuDataTypes.3 +MAN3+= AuDefineToFormat.3 +MAN3+= AuDestroyBucket.3 +MAN3+= AuDestroyFlow.3 +MAN3+= AuDeviceAttributes.3 +MAN3+= AuDispatchEvent.3 +MAN3+= AuElement.3 +MAN3+= AuElementNotifyEvent.3 +MAN3+= AuElementParameters.3 +MAN3+= AuElementState.3 +MAN3+= AuErrorEvent.3 +MAN3+= AuEvent.3 +MAN3+= AuEventsQueued.3 +MAN3+= AuFileFormats.3 +MAN3+= AuFixedPointFractionalAddend.3 +MAN3+= AuFixedPointFromFraction.3 +MAN3+= AuFixedPointFromSum.3 +MAN3+= AuFixedPointIntegralAddend.3 +MAN3+= AuFixedPointRoundDown.3 +MAN3+= AuFixedPointRoundUp.3 +MAN3+= AuFlush.3 +MAN3+= AuFormatToDefine.3 +MAN3+= AuFormatToString.3 +MAN3+= AuFreeBucketAttributes.3 +MAN3+= AuFreeDeviceAttributes.3 +MAN3+= AuFreeElementStates.3 +MAN3+= AuFreeElements.3 +MAN3+= AuGetBucketAttributes.3 +MAN3+= AuGetCloseDownMode.3 +MAN3+= AuGetDeviceAttributes.3 +MAN3+= AuGetElementParameters.3 +MAN3+= AuGetElementStates.3 +MAN3+= AuGetElements.3 +MAN3+= AuGetErrorDatabaseText.3 +MAN3+= AuGetErrorText.3 +MAN3+= AuGetScratchFlow.3 +MAN3+= AuGetScratchFlowFromBucket.3 +MAN3+= AuGetScratchFlowToBucket.3 +MAN3+= AuGetServerTime.3 +MAN3+= AuGrabNotifyEvent.3 +MAN3+= AuHandleEvents.3 +MAN3+= AuIDOfEvent.3 +MAN3+= AuInputTrack.3 +MAN3+= AuKillClient.3 +MAN3+= AuListBuckets.3 +MAN3+= AuListDevices.3 +MAN3+= AuLookupEventHandler.3 +MAN3+= AuMakeChangeStateAction.3 +MAN3+= AuMakeElementAddConstant.3 +MAN3+= AuMakeElementBundle.3 +MAN3+= AuMakeElementExportBucket.3 +MAN3+= AuMakeElementExportClient.3 +MAN3+= AuMakeElementExportDevice.3 +MAN3+= AuMakeElementExportMonitor.3 +MAN3+= AuMakeElementImportBucket.3 +MAN3+= AuMakeElementImportClient.3 +MAN3+= AuMakeElementImportDevice.3 +MAN3+= AuMakeElementImportWaveForm.3 +MAN3+= AuMakeElementMultiplyConstant.3 +MAN3+= AuMakeElementState.3 +MAN3+= AuMakeElementSum.3 +MAN3+= AuMakeInputTrack.3 +MAN3+= AuMakeNoopAction.3 +MAN3+= AuMakeSendNotifyAction.3 +MAN3+= AuMonitorDevice.3 +MAN3+= AuMonitorNotifyEvent.3 +MAN3+= AuNextEvent.3 +MAN3+= AuOpenServer.3 +MAN3+= AuPauseFlow.3 +MAN3+= AuReadElement.3 +MAN3+= AuRegisterEventHandler.3 +MAN3+= AuReleaseScratchFlow.3 +MAN3+= AuRequeueEvent.3 +MAN3+= AuScanEvents.3 +MAN3+= AuScanForTypedEvent.3 +MAN3+= AuServer.3 +MAN3+= AuServerName.3 +MAN3+= AuSetBucketAttributes.3 +MAN3+= AuSetCloseDownMode.3 +MAN3+= AuSetDeviceAttributes.3 +MAN3+= AuSetElementParameters.3 +MAN3+= AuSetElementStates.3 +MAN3+= AuSetElements.3 +MAN3+= AuSetErrorHandler.3 +MAN3+= AuSetIOErrorHandler.3 +MAN3+= AuSetString.3 +MAN3+= AuSoundCreateBucketFromData.3 +MAN3+= AuSoundCreateBucketFromFile.3 +MAN3+= AuSoundCreateDataFromBucket.3 +MAN3+= AuSoundCreateFileFromBucket.3 +MAN3+= AuSoundPlay.3 +MAN3+= AuSoundPlayFromBucket.3 +MAN3+= AuSoundPlayFromData.3 +MAN3+= AuSoundPlayFromFile.3 +MAN3+= AuSoundPlaySynchronousFromFile.3 +MAN3+= AuSoundRecord.3 +MAN3+= AuSoundRecordToBucket.3 +MAN3+= AuSoundRecordToData.3 +MAN3+= AuSoundRecordToFile.3 +MAN3+= AuSoundRecordToFileN.3 +MAN3+= AuStartFlow.3 +MAN3+= AuStopFlow.3 +MAN3+= AuStringToFormat.3 +MAN3+= AuStringToWaveForm.3 +MAN3+= AuSync.3 +MAN3+= AuSynchronize.3 +MAN3+= AuUnregisterEventHandler.3 +MAN3+= AuWaveFormToString.3 +MAN3+= AuWriteElement.3 +MAN3+= Sound.3 +MAN3+= SoundAbbrevToFileFormat.3 +MAN3+= SoundCloseFile.3 +MAN3+= SoundCreate.3 +MAN3+= SoundFlushFile.3 +MAN3+= SoundOpenFileForReading.3 +MAN3+= SoundOpenFileForWriting.3 +MAN3+= SoundReadFile.3 +MAN3+= SoundRewindFile.3 +MAN3+= SoundSeekFile.3 +MAN3+= SoundStringToFileFormat.3 +MAN3+= SoundTellFile.3 +MAN3+= SoundWriteFile.3 +MAN5+= nasd.conf.5nas diff -urN /usr/ports/audio/nas/files/patch-ab audio/nas/files/patch-ab --- /usr/ports/audio/nas/files/patch-ab Sun Dec 17 10:53:29 2000 +++ audio/nas/files/patch-ab Fri Dec 28 16:58:59 2001 @@ -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 -urN /usr/ports/audio/nas/files/patch-ag audio/nas/files/patch-ag --- /usr/ports/audio/nas/files/patch-ag Thu Jan 1 09:00:00 1970 +++ audio/nas/files/patch-ag Fri Dec 28 18:00:48 2001 @@ -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 -urN /usr/ports/audio/nas/pkg-plist audio/nas/pkg-plist --- /usr/ports/audio/nas/pkg-plist Thu Sep 21 08:48:07 2000 +++ audio/nas/pkg-plist Fri Dec 28 17:51:49 2001 @@ -33,6 +33,7 @@ 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 @@ lib/X11/AuErrorDB lib/libaudio.a lib/libaudio.so -lib/libaudio.so.1 +lib/libaudio.so.2 @dirrm include/audio >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200112301154.fBUBs1E58575>