Update to version 6.3a.

PR:		32264
Submitted by:	maintainer

6 files changed, 117 insertions, 29 deletions

diff --git a/audio/afsp/Makefile b/audio/afsp/Makefile
index d3585e0d7022..5b23c1142acd 100644
--- a/audio/afsp/Makefile
+++ b/audio/afsp/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	afsp
-PORTVERSION=	5.2
+PORTVERSION=	6.3a
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.tsp.ece.mcgill.ca/pub/AFsp/
-DISTNAME=	AFsp-v5r2
+DISTNAME=	AFsp-v6r3a
 
-MAINTAINER=	ginga@athena.club.ne.jp
+MAINTAINER=	ginga-freebsd@ginganet.org
 
 USE_GMAKE=	yes
 
@@ -19,7 +19,8 @@ MAN1=	AFsp.1audio CompAudio.1audio CopyAudio.1audio FiltAudio.1audio \
 	GenNoise.1audio GenTone.1audio InfoAudio.1audio LPanal.1audio \
 	LPsyn.1audio ResampAudio.1audio
 MAN3=	AFclose.3tsp AFopenRead.3tsp AFopenWrite.3tsp AFreadData.3tsp \
-	AFsetFileType.3tsp AFsetHinfo.3tsp AFwriteData.3tsp AFsetNHpar.3tsp
+	AFsetFileType.3tsp AFsetHinfo.3tsp AFsetNHpar.3tsp \
+	AFwriteData.3tsp AFsetSpeaker.3tsp
 
 post-extract:
 	@${CP} -f ${FILESDIR}/Makefile ${WRKSRC}
diff --git a/audio/afsp/distinfo b/audio/afsp/distinfo
index 9f6951a5e852..4941a8ddf4ba 100644
--- a/audio/afsp/distinfo
+++ b/audio/afsp/distinfo
@@ -1 +1 @@
-MD5 (AFsp-v5r2.tar.gz) = e148f51669f080a50c0b10f2bc750065
+MD5 (AFsp-v6r3a.tar.gz) = 14a061efc1fb2ab3347a30437a158ff4
diff --git a/audio/afsp/files/Makefile b/audio/afsp/files/Makefile
index d10befc80865..8ee0bd051dce 100644
--- a/audio/afsp/files/Makefile
+++ b/audio/afsp/files/Makefile
@@ -35,24 +35,62 @@ SUBHEADERS =	include/libtsp/AFdataio.h \
 		include/libtsp/WVpar.h \
 		include/libtsp/nucleus.h \
 		include/libtsp/sysOS.h
-MAN3FILES =	man/AFclose.3tsp \
-		man/AFopenRead.3tsp \
-		man/AFopenWrite.3tsp \
-		man/AFreadData.3tsp \
-		man/AFsetFileType.3tsp \
-		man/AFsetHinfo.3tsp \
-		man/AFwriteData.3tsp \
-		man/AFsetNHpar.3tsp
-MAN1FILES =	man/AFsp.1audio \
-		man/CompAudio.1audio \
-		man/CopyAudio.1audio \
-		man/FiltAudio.1audio \
-		man/GenNoise.1audio \
-		man/GenTone.1audio \
-		man/InfoAudio.1audio \
-		man/LPanal.1audio \
-		man/LPsyn.1audio \
-		man/ResampAudio.1audio
+MAN3FILES =	man/libtsp/AF/AFclose.3tsp \
+		man/libtsp/AF/AFopenRead.3tsp \
+		man/libtsp/AF/AFopenWrite.3tsp \
+		man/libtsp/AF/AFreadData.3tsp \
+		man/libtsp/AF/AFsetFileType.3tsp \
+		man/libtsp/AF/AFsetHinfo.3tsp \
+		man/libtsp/AF/AFsetNHpar.3tsp \
+		man/libtsp/AF/AFsetSpeaker.3tsp \
+		man/libtsp/AF/AFwriteData.3tsp
+MAN1FILES =	man/audio/AFsp.1audio \
+		man/audio/CompAudio.1audio \
+		man/audio/CopyAudio.1audio \
+		man/audio/FiltAudio.1audio \
+		man/audio/GenNoise.1audio \
+		man/audio/GenTone.1audio \
+		man/audio/InfoAudio.1audio \
+		man/audio/LPanal.1audio \
+		man/audio/LPsyn.1audio \
+		man/audio/ResampAudio.1audio
+HTMLFILES1 =	html/audio/AFsp.html \
+		html/audio/CompAudio.html \
+		html/audio/CopyAudio.html \
+		html/audio/FiltAudio.html \
+		html/audio/GenNoise.html \
+		html/audio/GenTone.html \
+		html/audio/InfoAudio.html \
+		html/audio/LPanal.html \
+		html/audio/LPsyn.html \
+		html/audio/ResampAudio.html
+HTMLFILES3 =	html/libtsp/AF/AFclose.html \
+		html/libtsp/AF/AFopenRead.html \
+		html/libtsp/AF/AFopenWrite.html \
+		html/libtsp/AF/AFreadData.html \
+		html/libtsp/AF/AFsetFileType.html \
+		html/libtsp/AF/AFsetHinfo.html \
+		html/libtsp/AF/AFsetNHpar.html \
+		html/libtsp/AF/AFsetSpeaker.html \
+		html/libtsp/AF/AFwriteData.html
+FILTERFILES =	filters/STL_BPF_FIR_16k.cof \
+		filters/STL_G712_IIR_16k.cof \
+		filters/STL_G712_IIR_8k.cof \
+		filters/STL_IRS_FIR_16k.cof \
+		filters/STL_IRS_FIR_8k.cof \
+		filters/STL_IRS_IIR_8k.cof \
+		filters/STL_LPx2_FIR.cof \
+		filters/STL_LPx3_FIR.cof \
+		filters/STL_LPx3_IIR.cof \
+		filters/STL_P341_FIR_16k.cof \
+		filters/STL_WB_IIR_48k.cof \
+		filters/STL_dc_IIR_8k.cof \
+		filters/STL_dsm_FIR_16k.cof \
+		filters/STL_hIRS_FIR_16k.cof \
+		filters/STL_mIRS_FIR_16k.cof \
+		filters/STL_mIRS_FIR_48k.cof \
+		filters/STL_pso_FIR_8k.cof \
+		filters/TIA_IRS_FIR_8k.cof
 
 all:
 	for dirs in libtsp libAO audio; do \
@@ -67,3 +105,9 @@ install: ${LIBRARIES} ${BINARIES}
 	${BSD_INSTALL_DATA} ${SUBHEADERS} ${PREFIX}/include/libtsp/
 	${BSD_INSTALL_MAN} ${MAN1FILES} ${PREFIX}/man/man1/
 	${BSD_INSTALL_MAN} ${MAN3FILES} ${PREFIX}/man/man3/
+	mkdir -p ${PREFIX}/share/doc/afsp/audio/
+	${BSD_INSTALL_DATA} ${HTMLFILES1} ${PREFIX}/share/doc/afsp/audio/
+	mkdir -p ${PREFIX}/share/doc/afsp/libtsp/AF/
+	${BSD_INSTALL_DATA} ${HTMLFILES3} ${PREFIX}/share/doc/afsp/libtsp/AF/
+	mkdir -p ${PREFIX}/share/afsp/filters/
+	${BSD_INSTALL_DATA} ${FILTERFILES} ${PREFIX}/share/afsp/filters/
diff --git a/audio/afsp/pkg-comment b/audio/afsp/pkg-comment
index 15b3c43df060..e3f2e7802228 100644
--- a/audio/afsp/pkg-comment
+++ b/audio/afsp/pkg-comment
@@ -1 +1 @@
-Audio file conversion utilities
+Audio file conversion utilities and library
diff --git a/audio/afsp/pkg-descr b/audio/afsp/pkg-descr
index 84d61224d177..de8a264f19be 100644
--- a/audio/afsp/pkg-descr
+++ b/audio/afsp/pkg-descr
@@ -13,11 +13,11 @@ Audio File Utility Programs:
               a new sequence of samples with a new spacing (sampling rate).
    and FiltAudio, GenNoise, GenTone, LPanal, LPsyn
 The following file formats are supported for reading.
-  - Headerless, AU, RIFF WAVE, AIFF/AIFF-C, NIST SPHERE, IRCAM,
-    INRS-Telecom, ESPS, Text audio (NATO/ESPRIT CD-ROM format)
+  - Headerless, AU, WAVE, AIFF/AIFF-C, NIST SPHERE, IRCAM,
+    INRS-Telecom, ESPS, Comdisco SPW, Text audio
 The following file formats are supported for writing.
-  - Headerless, AU, RIFF WAVE, AIFF-C
+  - Headerless, AU, WAVE, AIFF-C
 
-WWW: http://www.TSP.ECE.McGill.CA/reports/Software/AFsp/AFsp.html
+WWW: http://www.TSP.ECE.McGill.CA/Docs/Software/AFsp/AFsp.html
 
--- Kawaguti Ginga <ginga@athena.club.ne.jp>
+-- Kawaguti Ginga <ginga-freebsd@ginganet.org>
diff --git a/audio/afsp/pkg-plist b/audio/afsp/pkg-plist
index f6271fae2758..9fb8bf205963 100644
--- a/audio/afsp/pkg-plist
+++ b/audio/afsp/pkg-plist
@@ -33,4 +33,47 @@ include/libtsp/nucleus.h
 include/libtsp/sysOS.h
 lib/libAO.a
 lib/libtsp.a
+share/afsp/filters/STL_BPF_FIR_16k.cof
+share/afsp/filters/STL_G712_IIR_16k.cof
+share/afsp/filters/STL_G712_IIR_8k.cof
+share/afsp/filters/STL_IRS_FIR_16k.cof
+share/afsp/filters/STL_IRS_FIR_8k.cof
+share/afsp/filters/STL_IRS_IIR_8k.cof
+share/afsp/filters/STL_LPx2_FIR.cof
+share/afsp/filters/STL_LPx3_FIR.cof
+share/afsp/filters/STL_LPx3_IIR.cof
+share/afsp/filters/STL_P341_FIR_16k.cof
+share/afsp/filters/STL_WB_IIR_48k.cof
+share/afsp/filters/STL_dc_IIR_8k.cof
+share/afsp/filters/STL_dsm_FIR_16k.cof
+share/afsp/filters/STL_hIRS_FIR_16k.cof
+share/afsp/filters/STL_mIRS_FIR_16k.cof
+share/afsp/filters/STL_mIRS_FIR_48k.cof
+share/afsp/filters/STL_pso_FIR_8k.cof
+share/afsp/filters/TIA_IRS_FIR_8k.cof
+share/doc/afsp/audio/AFsp.html
+share/doc/afsp/audio/CompAudio.html
+share/doc/afsp/audio/CopyAudio.html
+share/doc/afsp/audio/FiltAudio.html
+share/doc/afsp/audio/GenNoise.html
+share/doc/afsp/audio/GenTone.html
+share/doc/afsp/audio/InfoAudio.html
+share/doc/afsp/audio/LPanal.html
+share/doc/afsp/audio/LPsyn.html
+share/doc/afsp/audio/ResampAudio.html
+share/doc/afsp/libtsp/AF/AFclose.html
+share/doc/afsp/libtsp/AF/AFopenRead.html
+share/doc/afsp/libtsp/AF/AFopenWrite.html
+share/doc/afsp/libtsp/AF/AFreadData.html
+share/doc/afsp/libtsp/AF/AFsetFileType.html
+share/doc/afsp/libtsp/AF/AFsetHinfo.html
+share/doc/afsp/libtsp/AF/AFsetNHpar.html
+share/doc/afsp/libtsp/AF/AFsetSpeaker.html
+share/doc/afsp/libtsp/AF/AFwriteData.html
 @dirrm include/libtsp
+@dirrm share/doc/afsp/audio
+@dirrm share/doc/afsp/libtsp/AF
+@dirrm share/doc/afsp/libtsp
+@dirrm share/doc/afsp
+@dirrm share/afsp/filters
+@dirrm share/afsp