[pkgsrc/trunk]: pkgsrc/security/amavis-perl Set USE_BUILDLINK3, since this pa...

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8206c1d1e1f0
branches:  trunk
changeset: 478721:8206c1d1e1f0
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Jul 29 00:59:53 2004 +0000

description:
Set USE_BUILDLINK3, since this package already includes a bl3 file.
While here, fix PLIST handling, so that multiple 'make install's work.

diffstat:

 security/amavis-perl/Makefile       |  14 ++++++++------
 security/amavis-perl/PLIST.nomilter |   3 +++
 2 files changed, 11 insertions(+), 6 deletions(-)

diffs (71 lines):

diff -r 0ec97a359dfe -r 8206c1d1e1f0 security/amavis-perl/Makefile
--- a/security/amavis-perl/Makefile     Thu Jul 29 00:50:59 2004 +0000
+++ b/security/amavis-perl/Makefile     Thu Jul 29 00:59:53 2004 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/07/02 20:47:49 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2004/07/29 00:59:53 wiz Exp $
 
 DISTNAME=      amavisd-${VERSION}
 PKGNAME=       amavis-perl-${VERSION}
@@ -34,6 +34,8 @@
 DEPENDS+=      p5-Net-[0-9]*:../../net/p5-Net
 DEPENDS+=      p5-Unix-Syslog-[0-9]*:../../sysutils/p5-Unix-Syslog
 
+USE_BUILDLINK3=        YES
+
 .include "../../mk/bsd.prefs.mk"
 .if defined(USE_MILTER) && ${USE_MILTER} == "YES"
 DEPENDS+=      sendmail>=8.12.9nb1:../../mail/sendmail
@@ -46,6 +48,7 @@
 VIRUSMAILTO?=  security                # whom to notify about viruses
 
 GNU_CONFIGURE= YES
+PLIST_SRC=     ${PKGDIR}/PLIST
 
 CONFIGURE_ENV+=        procmail="/usr/libexec/mail.local"
 # XXX Milter needs pthreads, and configure fails looking for it
@@ -66,19 +69,18 @@
 CONFIGURE_ARGS+=--with-milter-includes=${PREFIX}/include
 .else
 CONFIGURE_ARGS+=--enable-smtp --with-smtp-port=${SMTPPORT}
+PLIST_SRC+=    ${PKGDIR}/PLIST.nomilter
 .endif
 
-PLIST_SRC=     ${WRKDIR}/.PLIST_SRC
 
 post-build:
-       ${CP} ${PKGDIR}/PLIST ${PLIST_SRC}
        ${SED} -e "s|/etc/amavisd.conf|${PREFIX}/etc/amavis/amavisd.conf|" \
                ${WRKSRC}/amavis/amavisd > ${WRKDIR}/amavisd
+
 do-install:
        # Program files
 .if !defined(USE_MILTER) || ${USE_MILTER} != YES
        ${INSTALL_PROGRAM} ${WRKSRC}/amavis/amavis ${PREFIX}/sbin
-       ${ECHO} "sbin/amavis" >> ${PLIST_SRC}
 .endif
        ${INSTALL_SCRIPT} ${WRKDIR}/amavisd ${PREFIX}/sbin
        # Documents
@@ -103,13 +105,13 @@
        # Man pages
 .if !defined(USE_MILTER) || ${USE_MILTER} != YES
        ${INSTALL_DATA} ${WRKSRC}/doc/amavis.1 ${PREFIX}/man/man1
-       ${ECHO} "man/man1/amavis.1" >> ${PLIST_SRC}
 .endif
        ${INSTALL_DATA} ${WRKSRC}/doc/amavis-milter.1 ${PREFIX}/man/man1
        ${INSTALL_DATA} ${WRKSRC}/doc/amavisd.conf.5 ${PREFIX}/man/man5
        ${INSTALL_DATA} ${WRKSRC}/doc/amavisd.8 ${PREFIX}/man/man8
 
-.include "../../mk/bsd.pkg.mk"
 .if defined(USE_MILTER) && ${USE_MILTER} == "YES"
 .include "../../mk/pthread.buildlink3.mk"
 .endif
+
+.include "../../mk/bsd.pkg.mk"
diff -r 0ec97a359dfe -r 8206c1d1e1f0 security/amavis-perl/PLIST.nomilter
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/security/amavis-perl/PLIST.nomilter       Thu Jul 29 00:59:53 2004 +0000
@@ -0,0 +1,3 @@
+@comment $NetBSD: PLIST.nomilter,v 1.1 2004/07/29 00:59:53 wiz Exp $
+sbin/amavis
+man/man1/amavis.1