STAGE support, and general cleanups. Some of the changes are a

bit more aggressive, but at this point, if I'm staging your port,
you've likely stopped caring what's done to it.

2 files changed, 27 insertions, 37 deletions

diff --git a/security/f-prot/Makefile b/security/f-prot/Makefile
index dd548d1523c4..1ef05fa2d385 100644
--- a/security/f-prot/Makefile
+++ b/security/f-prot/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	f-prot
 PORTVERSION=	6.5.1.5927
+PORTREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	ftp://ftp.i-scream.org/pub/ftp.f-prot.com/pub/bsd/ \
 		http://ftp.i-scream.org/pub/ftp.f-prot.com/pub/bsd/
@@ -17,49 +18,37 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 SUB_FILES=	900.fpupdate fpscan fpupdate
 
-MAN1=		fpscan.1
-MAN5=		f-prot.conf.5
-MAN8=		fpupdate.8
+PORT_OPTIONS=	DOCS
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-NO_STAGE=	yes
 do-install:
-	${MKDIR} ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/fpscan ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_PROGRAM} ${WRKSRC}/fpupdate ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/antivir.def ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/license.key ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/product.data ${PREFIX}/libexec/${PORTNAME}
-	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/libexec/${PORTNAME}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/fpscan ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/fpupdate ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/antivir.def ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/license.key ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/product.data ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}
 
-	${INSTALL_DATA} ${WRKSRC}/f-prot.conf.default ${PREFIX}/etc/f-prot.conf.sample
+	${INSTALL_DATA} ${WRKSRC}/f-prot.conf.default ${STAGEDIR}${PREFIX}/etc/f-prot.conf.sample
 
-	${INSTALL_SCRIPT} ${WRKDIR}/fpscan ${PREFIX}/bin/fpscan
-	${INSTALL_SCRIPT} ${WRKDIR}/fpupdate ${PREFIX}/bin/fpupdate
+	${INSTALL_SCRIPT} ${WRKDIR}/fpscan ${STAGEDIR}${PREFIX}/bin/fpscan
+	${INSTALL_SCRIPT} ${WRKDIR}/fpupdate ${STAGEDIR}${PREFIX}/bin/fpupdate
 
-	${MKDIR} ${PREFIX}/etc/periodic/daily
-	${INSTALL_SCRIPT} ${WRKDIR}/900.fpupdate ${PREFIX}/etc/periodic/daily
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily
+	${INSTALL_SCRIPT} ${WRKDIR}/900.fpupdate ${STAGEDIR}${PREFIX}/etc/periodic/daily
 
-	${INSTALL_MAN} ${WRKSRC}/doc/man/fpscan.1 ${MANPREFIX}/man/man1/
-	${INSTALL_MAN} ${WRKSRC}/doc/man/f-prot.conf.5 ${MANPREFIX}/man/man5/
-	${INSTALL_MAN} ${WRKSRC}/doc/man/fpupdate.8 ${MANPREFIX}/man/man8/
+	${INSTALL_MAN} ${WRKSRC}/doc/man/fpscan.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/doc/man/f-prot.conf.5 ${STAGEDIR}${MANPREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/doc/man/fpupdate.8 ${STAGEDIR}${MANPREFIX}/man/man8
 
 post-install:
-.ifndef(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${CP} -R ${WRKSRC}/doc/html ${DOCSDIR}
-	${CP} ${WRKSRC}/doc/CHANGES ${DOCSDIR}
-	${CP} ${WRKSRC}/doc/LICENSE ${DOCSDIR}
-	${CP} ${WRKSRC}/doc/LICENSE-FPAV ${DOCSDIR}
-	${CP} ${WRKSRC}/doc/LICENSES-others ${DOCSDIR}
-.endif
-	@if [ ! -f ${PREFIX}/etc/f-prot.conf ]; then \
-		${CP} -p ${PREFIX}/etc/f-prot.conf.sample ${PREFIX}/etc/f-prot.conf ; \
-	fi
-	@if [ ! -e /etc/f-prot.conf ]; then \
-		${LN} -s ${PREFIX}/etc/f-prot.conf /etc/f-prot.conf ; \
-	fi
-	@${CAT} ${PKGMESSAGE}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} html ${STAGEDIR}${DOCSDIR})
+	${CP} ${WRKSRC}/doc/CHANGES ${STAGEDIR}${DOCSDIR}
+	${CP} ${WRKSRC}/doc/LICENSE ${STAGEDIR}${DOCSDIR}
+	${CP} ${WRKSRC}/doc/LICENSE-FPAV ${STAGEDIR}${DOCSDIR}
+	${CP} ${WRKSRC}/doc/LICENSES-others ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/f-prot/pkg-plist b/security/f-prot/pkg-plist
index b5bc22c1e648..a842eec2d849 100644
--- a/security/f-prot/pkg-plist
+++ b/security/f-prot/pkg-plist
@@ -1,9 +1,7 @@
 bin/fpscan
 bin/fpupdate
 @unexec if [ -L /etc/f-prot.conf ]; then rm /etc/f-prot.conf; fi
-@unexec if cmp -s %D/etc/f-prot.conf.sample %D/etc/f-prot.conf; then rm -f %D/etc/f-prot.conf; fi
-etc/f-prot.conf.sample
-@exec if [ ! -f %D/etc/f-prot.conf ]; then cp -p %D/%F %B/f-prot.conf; fi
+@sample etc/f-prot.conf.sample
 @exec if [ ! -e /etc/f-prot.conf ]; then ln -s %D/etc/f-prot.conf /etc/f-prot.conf; fi
 etc/periodic/daily/900.fpupdate
 libexec/f-prot/README
@@ -12,6 +10,9 @@ libexec/f-prot/fpscan
 libexec/f-prot/fpupdate
 libexec/f-prot/license.key
 libexec/f-prot/product.data
+man/man1/fpscan.1.gz
+man/man5/f-prot.conf.5.gz
+man/man8/fpupdate.8.gz
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE
 %%PORTDOCS%%%%DOCSDIR%%/LICENSE-FPAV