svn commit: r352707 - in head/security/bdc: . files

[Adam Weinberger]

Author: adamw
Date: Wed Apr 30 23:37:49 2014
New Revision: 352707
URL: http://svnweb.freebsd.org/changeset/ports/352707
QAT: https://qat.redports.org/buildarchive/r352707/

Log:
  STAGE. Clean up a lot. Use SUB_LIST and new LIB_DEPENDS
  format.

Added:
  head/security/bdc/files/bdc.in
     - copied unchanged from r352699, head/security/bdc/files/bdc
  head/security/bdc/files/pkg-message.in
     - copied, changed from r352699, head/security/bdc/pkg-message
Deleted:
  head/security/bdc/files/bdc
  head/security/bdc/pkg-message
Modified:
  head/security/bdc/Makefile
  head/security/bdc/pkg-plist

Modified: head/security/bdc/Makefile
==============================================================================
--- head/security/bdc/Makefile	Wed Apr 30 23:17:32 2014	(r352706)
+++ head/security/bdc/Makefile	Wed Apr 30 23:37:49 2014	(r352707)
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.2-f
 MAINTAINER=	itetcu at 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 redistribu
 
 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 
 .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}
-
-	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g'  \
-		< ${FILESDIR}/bdc > ${PREFIX}/bin/bdc
-	@${CHMOD} +x ${PREFIX}/bin/bdc
+	cd ${WRKSRC} && ${COPYTREE_SHARE} bdc ${STAGEDIR}${PREFIX}
+	${CHOWN} -R ${BINOWN}:${BINGRP} ${STAGEDIR}${PREFIX}/bdc
+	${CHMOD} -R a=rX,u+w ${STAGEDIR}${PREFIX}/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>

Copied: head/security/bdc/files/bdc.in (from r352699, head/security/bdc/files/bdc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/security/bdc/files/bdc.in	Wed Apr 30 23:37:49 2014	(r352707, copy of r352699, head/security/bdc/files/bdc)
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+BDENG_PATH=%%PREFIX%%/bdc/; export BDENG_PATH
+exec %%PREFIX%%/bdc/bdc.bin ${@+"$@"}

Copied and modified: head/security/bdc/files/pkg-message.in (from r352699, head/security/bdc/pkg-message)
==============================================================================
--- head/security/bdc/pkg-message	Wed Apr 30 21:02:04 2014	(r352699, copy source)
+++ head/security/bdc/files/pkg-message.in	Wed Apr 30 23:37:49 2014	(r352707)
@@ -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

Modified: head/security/bdc/pkg-plist
==============================================================================
--- head/security/bdc/pkg-plist	Wed Apr 30 23:17:32 2014	(r352706)
+++ head/security/bdc/pkg-plist	Wed Apr 30 23:37:49 2014	(r352707)
@@ -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
- at dirrm bdc/doc
- at 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