3 files changed, 35 insertions, 21 deletions

diff --git a/audio/afsp/Makefile b/audio/afsp/Makefile
index 9dfa2c681239..07e2583318a2 100644
--- a/audio/afsp/Makefile
+++ b/audio/afsp/Makefile
@@ -10,17 +10,9 @@ DISTNAME=	AFsp-v8r2
 MAINTAINER=	ginga-freebsd@ginganet.org
 COMMENT=	Audio file conversion utilities and library
 
-NO_STAGE=	yes
 USES=		gmake
 MAKE_JOBS_UNSAFE=	yes
 
-MAN1=	AFsp.1audio CompAudio.1audio CopyAudio.1audio FiltAudio.1audio \
-	GenNoise.1audio GenTone.1audio InfoAudio.1audio LPanal.1audio \
-	LPsyn.1audio PQevalAudio.1audio ResampAudio.1audio
-MAN3=	AFclose.3tsp AFdReadData.3tsp AFdWriteData.3tsp AFfReadData.3tsp \
-	AFfWriteData.3tsp AFopnRead.3tsp AFopnWrite.3tsp AFsetFileType.3tsp \
-	AFsetInfo.3tsp AFsetNHpar.3tsp AFsetSpeaker.3tsp
-
 MAKE_ARGS=	COPTS="${CFLAGS}"
 
 post-extract:
diff --git a/audio/afsp/files/Makefile b/audio/afsp/files/Makefile
index e0015c16f832..b7221caa7c9f 100644
--- a/audio/afsp/files/Makefile
+++ b/audio/afsp/files/Makefile
@@ -113,16 +113,16 @@ all:
 	done
 
 install: ${LIBRARIES} ${BINARIES}
-	${BSD_INSTALL_DATA} ${LIBRARIES} ${PREFIX}/lib/
-	${BSD_INSTALL_PROGRAM} ${BINARIES} ${PREFIX}/bin/
-	${BSD_INSTALL_DATA} ${MAINHEADERS} ${PREFIX}/include/
-	mkdir -p ${PREFIX}/include/libtsp/
-	${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/
+	${BSD_INSTALL_DATA} ${LIBRARIES} ${DESTDIR}${PREFIX}/lib/
+	${BSD_INSTALL_PROGRAM} ${BINARIES} ${DESTDIR}${PREFIX}/bin/
+	${BSD_INSTALL_DATA} ${MAINHEADERS} ${DESTDIR}${PREFIX}/include/
+	mkdir -p ${DESTDIR}${PREFIX}/include/libtsp/
+	${BSD_INSTALL_DATA} ${SUBHEADERS} ${DESTDIR}${PREFIX}/include/libtsp/
+	${BSD_INSTALL_MAN} ${MAN1FILES} ${DESTDIR}${PREFIX}/man/man1/
+	${BSD_INSTALL_MAN} ${MAN3FILES} ${DESTDIR}${PREFIX}/man/man3/
+	mkdir -p ${DESTDIR}${PREFIX}/share/doc/afsp/audio/
+	${BSD_INSTALL_DATA} ${HTMLFILES1} ${DESTDIR}${PREFIX}/share/doc/afsp/audio/
+	mkdir -p ${DESTDIR}${PREFIX}/share/doc/afsp/libtsp/AF/
+	${BSD_INSTALL_DATA} ${HTMLFILES3} ${DESTDIR}${PREFIX}/share/doc/afsp/libtsp/AF/
+	mkdir -p ${DESTDIR}${PREFIX}/share/afsp/filters/
+	${BSD_INSTALL_DATA} ${FILTERFILES} ${DESTDIR}${PREFIX}/share/afsp/filters/
diff --git a/audio/afsp/pkg-plist b/audio/afsp/pkg-plist
index 40841d32fb4e..70cc2ac7f709 100644
--- a/audio/afsp/pkg-plist
+++ b/audio/afsp/pkg-plist
@@ -34,6 +34,28 @@ include/libtsp/nucleus.h
 include/libtsp/sysOS.h
 lib/libAO.a
 lib/libtsp.a
+man/man1/AFsp.1audio.gz
+man/man1/CompAudio.1audio.gz
+man/man1/CopyAudio.1audio.gz
+man/man1/FiltAudio.1audio.gz
+man/man1/GenNoise.1audio.gz
+man/man1/GenTone.1audio.gz
+man/man1/InfoAudio.1audio.gz
+man/man1/LPanal.1audio.gz
+man/man1/LPsyn.1audio.gz
+man/man1/PQevalAudio.1audio.gz
+man/man1/ResampAudio.1audio.gz
+man/man3/AFclose.3tsp.gz
+man/man3/AFdReadData.3tsp.gz
+man/man3/AFdWriteData.3tsp.gz
+man/man3/AFfReadData.3tsp.gz
+man/man3/AFfWriteData.3tsp.gz
+man/man3/AFopnRead.3tsp.gz
+man/man3/AFopnWrite.3tsp.gz
+man/man3/AFsetFileType.3tsp.gz
+man/man3/AFsetInfo.3tsp.gz
+man/man3/AFsetNHpar.3tsp.gz
+man/man3/AFsetSpeaker.3tsp.gz
 %%DATADIR%%/filters/STL_BPF100x5k_FIR_16k.cof
 %%DATADIR%%/filters/STL_BPF50x14k_FIR_32k.cof
 %%DATADIR%%/filters/STL_BPF50x5k_FIR_16k.cof