Update to 1.4.1.

+ Hack PLIST to delete HTML version of manpages on XFree4.

PR:		21076
Submitted by:	Trevor Johnson <trevor@jpj.net>

3 files changed, 164 insertions, 5 deletions

diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 9b2642c322ea..101e110b7bc7 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	nas
-PORTVERSION=	1.4
+PORTVERSION=	1.4.1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_XCONTRIB} \
-		http://radscan.com/nas/
+MASTER_SITES=	http://radscan.com/nas/ \
+		${MASTER_SITE_XCONTRIB}
 MASTER_SITE_SUBDIR=	audio/nas
 EXTRACT_SUFX=	.src.tar.gz
 
@@ -70,6 +70,14 @@ MAN3=	AuAnyEvent.3 AuBucketAttributes.3 AuCloseServer.3 \
 	SoundReadFile.3 SoundRewindFile.3 SoundSeekFile.3 \
 	SoundStringToFileFormat.3 SoundTellFile.3 SoundWriteFile.3
 
+.include <bsd.port.pre.mk>
+
+.if ${XFREE86_VERSION} > 3
+PLIST_SUB+=	XFREE4:=""
+.else
+PLIST_SUB+=	XFREE4:="@comment "
+.endif
+
 post-patch:
 	@find ${WRKSRC} -name '*.[ch]' | xargs \
 		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
@@ -77,4 +85,4 @@ post-patch:
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/nas/distinfo b/audio/nas/distinfo
index 83cfa7cb2482..bddeee0c29ec 100644
--- a/audio/nas/distinfo
+++ b/audio/nas/distinfo
@@ -1 +1 @@
-MD5 (nas-1.4.src.tar.gz) = 8b9280377d0ad404afbaa5a93f213bc5
+MD5 (nas-1.4.1.src.tar.gz) = 8822b58c2662238ca860cfbf05345f64
diff --git a/audio/nas/pkg-plist b/audio/nas/pkg-plist
index c82c66600704..5685d84ad61f 100644
--- a/audio/nas/pkg-plist
+++ b/audio/nas/pkg-plist
@@ -39,6 +39,157 @@ include/audio/soundlib.h
 include/audio/voc.h
 include/audio/wave.h
 lib/X11/AuErrorDB
+%%XFREE4:%%lib/X11/doc/html/AuAnyEvent.3.html
+%%XFREE4:%%lib/X11/doc/html/AuBucketAttributes.3.html
+%%XFREE4:%%lib/X11/doc/html/AuCloseServer.3.html
+%%XFREE4:%%lib/X11/doc/html/AuConvertDataToShort.3.html
+%%XFREE4:%%lib/X11/doc/html/AuConvertShortToData.3.html
+%%XFREE4:%%lib/X11/doc/html/AuCreateBucket.3.html
+%%XFREE4:%%lib/X11/doc/html/AuCreateFlow.3.html
+%%XFREE4:%%lib/X11/doc/html/AuDataFormats.3.html
+%%XFREE4:%%lib/X11/doc/html/AuDataTypes.3.html
+%%XFREE4:%%lib/X11/doc/html/AuDefineToFormat.3.html
+%%XFREE4:%%lib/X11/doc/html/AuDestroyBucket.3.html
+%%XFREE4:%%lib/X11/doc/html/AuDestroyFlow.3.html
+%%XFREE4:%%lib/X11/doc/html/AuDeviceAttributes.3.html
+%%XFREE4:%%lib/X11/doc/html/AuDispatchEvent.3.html
+%%XFREE4:%%lib/X11/doc/html/AuElement.3.html
+%%XFREE4:%%lib/X11/doc/html/AuElementNotifyEvent.3.html
+%%XFREE4:%%lib/X11/doc/html/AuElementParameters.3.html
+%%XFREE4:%%lib/X11/doc/html/AuElementState.3.html
+%%XFREE4:%%lib/X11/doc/html/AuErrorEvent.3.html
+%%XFREE4:%%lib/X11/doc/html/AuEvent.3.html
+%%XFREE4:%%lib/X11/doc/html/AuEventsQueued.3.html
+%%XFREE4:%%lib/X11/doc/html/AuFileFormats.3.html
+%%XFREE4:%%lib/X11/doc/html/AuFixedPointFractionalAddend.3.html
+%%XFREE4:%%lib/X11/doc/html/AuFixedPointFromFraction.3.html
+%%XFREE4:%%lib/X11/doc/html/AuFixedPointFromSum.3.html
+%%XFREE4:%%lib/X11/doc/html/AuFixedPointIntegralAddend.3.html
+%%XFREE4:%%lib/X11/doc/html/AuFixedPointRoundDown.3.html
+%%XFREE4:%%lib/X11/doc/html/AuFixedPointRoundUp.3.html
+%%XFREE4:%%lib/X11/doc/html/AuFlush.3.html
+%%XFREE4:%%lib/X11/doc/html/AuFormatToDefine.3.html
+%%XFREE4:%%lib/X11/doc/html/AuFormatToString.3.html
+%%XFREE4:%%lib/X11/doc/html/AuFreeBucketAttributes.3.html
+%%XFREE4:%%lib/X11/doc/html/AuFreeDeviceAttributes.3.html
+%%XFREE4:%%lib/X11/doc/html/AuFreeElementStates.3.html
+%%XFREE4:%%lib/X11/doc/html/AuFreeElements.3.html
+%%XFREE4:%%lib/X11/doc/html/AuGetBucketAttributes.3.html
+%%XFREE4:%%lib/X11/doc/html/AuGetCloseDownMode.3.html
+%%XFREE4:%%lib/X11/doc/html/AuGetDeviceAttributes.3.html
+%%XFREE4:%%lib/X11/doc/html/AuGetElementParameters.3.html
+%%XFREE4:%%lib/X11/doc/html/AuGetElementStates.3.html
+%%XFREE4:%%lib/X11/doc/html/AuGetElements.3.html
+%%XFREE4:%%lib/X11/doc/html/AuGetErrorDatabaseText.3.html
+%%XFREE4:%%lib/X11/doc/html/AuGetErrorText.3.html
+%%XFREE4:%%lib/X11/doc/html/AuGetScratchFlow.3.html
+%%XFREE4:%%lib/X11/doc/html/AuGetScratchFlowFromBucket.3.html
+%%XFREE4:%%lib/X11/doc/html/AuGetScratchFlowToBucket.3.html
+%%XFREE4:%%lib/X11/doc/html/AuGetServerTime.3.html
+%%XFREE4:%%lib/X11/doc/html/AuGrabNotifyEvent.3.html
+%%XFREE4:%%lib/X11/doc/html/AuHandleEvents.3.html
+%%XFREE4:%%lib/X11/doc/html/AuIDOfEvent.3.html
+%%XFREE4:%%lib/X11/doc/html/AuInputTrack.3.html
+%%XFREE4:%%lib/X11/doc/html/AuKillClient.3.html
+%%XFREE4:%%lib/X11/doc/html/AuListBuckets.3.html
+%%XFREE4:%%lib/X11/doc/html/AuListDevices.3.html
+%%XFREE4:%%lib/X11/doc/html/AuLookupEventHandler.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeChangeStateAction.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeElementAddConstant.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeElementBundle.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeElementExportBucket.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeElementExportClient.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeElementExportDevice.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeElementExportMonitor.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeElementImportBucket.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeElementImportClient.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeElementImportDevice.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeElementImportWaveForm.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeElementMultiplyConstant.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeElementState.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeElementSum.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeInputTrack.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeNoopAction.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMakeSendNotifyAction.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMonitorDevice.3.html
+%%XFREE4:%%lib/X11/doc/html/AuMonitorNotifyEvent.3.html
+%%XFREE4:%%lib/X11/doc/html/AuNextEvent.3.html
+%%XFREE4:%%lib/X11/doc/html/AuOpenServer.3.html
+%%XFREE4:%%lib/X11/doc/html/AuPauseFlow.3.html
+%%XFREE4:%%lib/X11/doc/html/AuReadElement.3.html
+%%XFREE4:%%lib/X11/doc/html/AuRegisterEventHandler.3.html
+%%XFREE4:%%lib/X11/doc/html/AuReleaseScratchFlow.3.html
+%%XFREE4:%%lib/X11/doc/html/AuRequeueEvent.3.html
+%%XFREE4:%%lib/X11/doc/html/AuScanEvents.3.html
+%%XFREE4:%%lib/X11/doc/html/AuScanForTypedEvent.3.html
+%%XFREE4:%%lib/X11/doc/html/AuServer.3.html
+%%XFREE4:%%lib/X11/doc/html/AuServerName.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSetBucketAttributes.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSetCloseDownMode.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSetDeviceAttributes.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSetElementParameters.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSetElementStates.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSetElements.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSetErrorHandler.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSetIOErrorHandler.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSetString.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSoundCreateBucketFromData.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSoundCreateBucketFromFile.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSoundCreateDataFromBucket.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSoundCreateFileFromBucket.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSoundPlay.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSoundPlayFromBucket.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSoundPlayFromData.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSoundPlayFromFile.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSoundPlaySynchronousFromFile.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSoundRecord.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSoundRecordToBucket.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSoundRecordToData.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSoundRecordToFile.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSoundRecordToFileN.3.html
+%%XFREE4:%%lib/X11/doc/html/AuStartFlow.3.html
+%%XFREE4:%%lib/X11/doc/html/AuStopFlow.3.html
+%%XFREE4:%%lib/X11/doc/html/AuStringToFormat.3.html
+%%XFREE4:%%lib/X11/doc/html/AuStringToWaveForm.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSync.3.html
+%%XFREE4:%%lib/X11/doc/html/AuSynchronize.3.html
+%%XFREE4:%%lib/X11/doc/html/AuUnregisterEventHandler.3.html
+%%XFREE4:%%lib/X11/doc/html/AuWaveFormToString.3.html
+%%XFREE4:%%lib/X11/doc/html/AuWriteElement.3.html
+%%XFREE4:%%lib/X11/doc/html/Sound.3.html
+%%XFREE4:%%lib/X11/doc/html/SoundAbbrevToFileFormat.3.html
+%%XFREE4:%%lib/X11/doc/html/SoundCloseFile.3.html
+%%XFREE4:%%lib/X11/doc/html/SoundCreate.3.html
+%%XFREE4:%%lib/X11/doc/html/SoundFlushFile.3.html
+%%XFREE4:%%lib/X11/doc/html/SoundOpenFileForReading.3.html
+%%XFREE4:%%lib/X11/doc/html/SoundOpenFileForWriting.3.html
+%%XFREE4:%%lib/X11/doc/html/SoundReadFile.3.html
+%%XFREE4:%%lib/X11/doc/html/SoundRewindFile.3.html
+%%XFREE4:%%lib/X11/doc/html/SoundSeekFile.3.html
+%%XFREE4:%%lib/X11/doc/html/SoundStringToFileFormat.3.html
+%%XFREE4:%%lib/X11/doc/html/SoundTellFile.3.html
+%%XFREE4:%%lib/X11/doc/html/SoundWriteFile.3.html
+%%XFREE4:%%lib/X11/doc/html/auconvert.1.html
+%%XFREE4:%%lib/X11/doc/html/auctl.1.html
+%%XFREE4:%%lib/X11/doc/html/audemo.1.html
+%%XFREE4:%%lib/X11/doc/html/audial.1.html
+%%XFREE4:%%lib/X11/doc/html/auedit.1.html
+%%XFREE4:%%lib/X11/doc/html/auinfo.1.html
+%%XFREE4:%%lib/X11/doc/html/aupanel.1.html
+%%XFREE4:%%lib/X11/doc/html/auphone.1.html
+%%XFREE4:%%lib/X11/doc/html/auplay.1.html
+%%XFREE4:%%lib/X11/doc/html/aurecord.1.html
+%%XFREE4:%%lib/X11/doc/html/auscope.1.html
+%%XFREE4:%%lib/X11/doc/html/autool.1.html
+%%XFREE4:%%lib/X11/doc/html/auvoxware.1.html
+%%XFREE4:%%lib/X11/doc/html/auwave.1.html
+%%XFREE4:%%lib/X11/doc/html/checkmail.1.html
+%%XFREE4:%%lib/X11/doc/html/issndfile.1.html
+%%XFREE4:%%lib/X11/doc/html/nas.1.html
+%%XFREE4:%%lib/X11/doc/html/nasd.1.html
+%%XFREE4:%%lib/X11/doc/html/nasd.conf.1.html
+%%XFREE4:%%lib/X11/doc/html/playbucket.1.html
+%%XFREE4:%%lib/X11/doc/html/soundtoh.1.html
 lib/libaudio.a
 lib/libaudio.so
 lib/libaudio.so.1