STAGE. Clean up a lot. Use SUB_LIST and new LIB_DEPENDS

format.

4 files changed, 20 insertions, 24 deletions

diff --git a/security/bdc/Makefile b/security/bdc/Makefile
index efb23b812f98..896a50d960f7 100644
--- a/security/bdc/Makefile
+++ b/security/bdc/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.2-fbsd${BDREL}
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	BitDefender Console Antivirus for FreeBSD
 
-LIB_DEPENDS=	c.5:${PORTSDIR}/misc/compat5x
+LIB_DEPENDS=	libc.so.5:${PORTSDIR}/misc/compat5x
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
@@ -23,7 +23,8 @@ RESTRICTED=	License prohibits redistribution
 
 BDREL=		5
 
-NO_STAGE=	yes
+SUB_LIST=	bdc pkg-message
+
 .include <bsd.port.pre.mk>
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
@@ -36,18 +37,14 @@ Once the file has been downloaded, move it to ${DISTDIR} and restart the build
 .endif
 
 do-install:
-	@cd ${WRKDIR} && ${TAR} -cf - bdc | ${TAR} -xf - -C ${PREFIX}/
-	@${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/bdc
-	@${CHMOD} -R a=rX,u+w ${PREFIX}/bdc/
-
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
-		s|%%PORTNAME%%|${PORTNAME}|g' \
-		< ${PKGDIR}/pkg-message > ${PKGMESSAGE}
+	cd ${WRKSRC} && ${COPYTREE_SHARE} bdc ${STAGEDIR}${PREFIX}
+	${CHOWN} -R ${BINOWN}:${BINGRP} ${STAGEDIR}${PREFIX}/bdc
+	${CHMOD} -R a=rX,u+w ${STAGEDIR}${PREFIX}/bdc/
 
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g'  \
-		< ${FILESDIR}/bdc > ${PREFIX}/bin/bdc
-	@${CHMOD} +x ${PREFIX}/bin/bdc
+	${MV} ${STAGEDIR}${PREFIX}/bdc/doc ${STAGEDIR}${DOCSDIR}
+	${INSTALL_MAN} ${STAGEDIR}${PREFIX}/bdc/man/bdc.1 ${STAGEDIR}${MANPREFIX}/man/man1
+	${RM} -f ${STAGEDIR}${PREFIX}/bdc/man
 
-	@${CAT} ${PKGMESSAGE}
+	${INSTALL_SCRIPT} ${WRKDIR}/bdc ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.post.mk>
diff --git a/security/bdc/files/bdc b/security/bdc/files/bdc.in
index c56c10d2a76c..c56c10d2a76c 100644
--- a/security/bdc/files/bdc
+++ b/security/bdc/files/bdc.in
diff --git a/security/bdc/pkg-message b/security/bdc/files/pkg-message.in
index b4b4aa415d4d..842e42e81c59 100644
--- a/security/bdc/pkg-message
+++ b/security/bdc/files/pkg-message.in
@@ -1,15 +1,15 @@
 
 Congratulations, BitDefender Console Antivirus for FreeBSD is now installed.
 For your reference, the License Agreement is located in:
-%%PREFIX%%/%%PORTNAME%%/doc/LICENSE
+%%DOCSDIR%%/LICENSE
 
 For more info on BitDefender Console Antivirus, you should check the
 documentation located in:
-%%PREFIX%%/%%PORTNAME%%/doc
+%%DOCSDIR%%
 
 You should also update the virus definitions as soon as possible by running:
 
-%%PORTNAME%% --update
+bdc --update
 
 The BitDefender Team,
 http://www.bitdefender.com
diff --git a/security/bdc/pkg-plist b/security/bdc/pkg-plist
index d332f50fdcdd..877e1f3b4751 100644
--- a/security/bdc/pkg-plist
+++ b/security/bdc/pkg-plist
@@ -89,17 +89,16 @@ bdc/bdc.bin
 bdc/bdc.ini
 bdc/bdcore.so
 bdc/bdupd.so
-bdc/doc/FAQ
-bdc/doc/INSTALL
-bdc/doc/KNOWN-ISSUES
-bdc/doc/LICENSE
-bdc/doc/README
 bdc/libfn.so
-bdc/man/bdc.1
 bdc/plugins.htm
 bin/bdc
+man/man1/bdc.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/FAQ
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/KNOWN-ISSUES
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm bdc/Plugins
-@dirrm bdc/doc
-@dirrm bdc/man
 @dirrm bdc
 @unexec rmdir %D/bdc 2>/dev/null || echo "If you are permanently removing this port, you should do a \"rm -rf %D/bdc\" to remove files installed after doing an update. " | fmt