2 files changed, 14 insertions, 19 deletions

diff --git a/devel/sfio/Makefile b/devel/sfio/Makefile
index d3eecc6d8310..41303e55171f 100644
--- a/devel/sfio/Makefile
+++ b/devel/sfio/Makefile
@@ -15,12 +15,8 @@ EXTRACT_CMD=	${CPIO}
 EXTRACT_BEFORE_ARGS=	-idF
 EXTRACT_AFTER_ARGS=	# empty
 NO_WRKSUBDIR=	yes
-MAN1=		iffe.1
-MAN3=		sfio.3
-PLIST=		${WRKDIR}/pkg-plist
 
 # Remove a test that's too clever for its own good
-NO_STAGE=	yes
 post-extract:
 	@${MV} ${WRKDIR}/src/lib/sfio/Sfio_t/tmmap2read.c \
 		${WRKDIR}/src/lib/sfio/Sfio_t/.tmmap2read.c
@@ -28,21 +24,11 @@ post-extract:
 do-build:
 	@cd ${WRKDIR}/src/lib/sfio && ${MAKE} all -f makefile
 
-pre-install:
-	${RM} -f ${PLIST}
-.for ii in ast_common sfio sfio_t stdio
-	${ECHO_CMD} include/sfio/${ii}.h >> ${PLIST}
-.endfor
-.for ii in sfio stdio
-	${ECHO_CMD} lib/lib${ii}.a >> ${PLIST}
-.endfor
-	${ECHO_CMD} @dirrm include/sfio >> ${PLIST}
-
 do-install:
-	${MKDIR} ${PREFIX}/include/sfio
-	${INSTALL_DATA} ${WRKDIR}/include/* ${PREFIX}/include/sfio
-	cd ${WRKDIR}/lib ; ${INSTALL_DATA} libsfio.a libstdio.a ${PREFIX}/lib
-	${INSTALL_MAN} ${WRKDIR}/man/man1/iffe.1 ${PREFIX}/man/man1
-	${INSTALL_MAN} ${WRKDIR}/man/man3/sfio.3 ${PREFIX}/man/man3
+	${MKDIR} ${STAGEDIR}${PREFIX}/include/sfio
+	${INSTALL_DATA} ${WRKDIR}/include/* ${STAGEDIR}${PREFIX}/include/sfio
+	cd ${WRKDIR}/lib ; ${INSTALL_DATA} libsfio.a libstdio.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_MAN} ${WRKDIR}/man/man1/iffe.1 ${STAGEDIR}${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKDIR}/man/man3/sfio.3 ${STAGEDIR}${PREFIX}/man/man3
 
 .include <bsd.port.mk>
diff --git a/devel/sfio/pkg-plist b/devel/sfio/pkg-plist
new file mode 100644
index 000000000000..294214b73d25
--- /dev/null
+++ b/devel/sfio/pkg-plist
@@ -0,0 +1,9 @@
+include/sfio/ast_common.h
+include/sfio/sfio.h
+include/sfio/sfio_t.h
+include/sfio/stdio.h
+lib/libsfio.a
+lib/libstdio.a
+man/man1/iffe.1.gz
+man/man3/sfio.3.gz
+@dirrm include/sfio