diff options
| author | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-04-12 22:42:57 +0000 |
| commit | 841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a (patch) | |
| tree | fdd67c81079412bf94013749a954125434a9baca /security/amavisd-new | |
| parent | 6874584eae20f517f70816571f6d4ac696db16b3 (diff) | |
| download | pkgsrc-841dfa0e7aaa6a0f0cce2901291d1d938dd0fc0a.tar.gz | |
Convert to use PLIST_VARS instead of manually passing "@comment "
through PLIST_SUBST to the plist module.
Diffstat (limited to 'security/amavisd-new')
| -rw-r--r-- | security/amavisd-new/Makefile | 6 | ||||
| -rw-r--r-- | security/amavisd-new/PLIST | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 78b8961ac14..3cf4989ce75 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2008/02/19 16:20:15 reed Exp $ +# $NetBSD: Makefile,v 1.37 2008/04/12 22:43:09 jlam Exp $ DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL} PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//} @@ -69,6 +69,7 @@ PKG_SUPPORTED_OPTIONS= milter .include "../../mk/bsd.options.mk" +PLIST_VARS+= milter .if !empty(PKG_OPTIONS:Mmilter) GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-runtime-dir=${AMAVIS_DIR:Q} @@ -80,14 +81,13 @@ CONFIGURE_DIRS= ${WRKSRC}/helper-progs BUILD_DIRS= ${WRKSRC}/helper-progs RCD_SCRIPTS+= amavismilter MESSAGE_SRC+= ${PKGDIR}/MESSAGE.milter -PLIST_SUBST+= MILTER= +PLIST.milter= yes PTHREAD_OPTS+= require native # doesn't work with pth . include "../../mail/libmilter/buildlink3.mk" . include "../../mk/pthread.buildlink3.mk" .else USE_LANGUAGES= # none, not even C -PLIST_SUBST+= MILTER="@comment " do-build: replace-interpreter .endif diff --git a/security/amavisd-new/PLIST b/security/amavisd-new/PLIST index a8d1eb27b48..1937af324c5 100644 --- a/security/amavisd-new/PLIST +++ b/security/amavisd-new/PLIST @@ -1,6 +1,6 @@ -@comment $NetBSD: PLIST,v 1.12 2008/02/19 16:18:18 reed Exp $ -${MILTER}sbin/amavis -${MILTER}sbin/amavis-milter +@comment $NetBSD: PLIST,v 1.13 2008/04/12 22:43:09 jlam Exp $ +${PLIST.milter}sbin/amavis +${PLIST.milter}sbin/amavis-milter sbin/amavisd sbin/amavisd-agent sbin/amavisd-nanny @@ -42,6 +42,6 @@ share/examples/amavisd-new/amavisd.conf-default share/examples/amavisd-new/amavisd.conf-minimal share/examples/amavisd-new/amavisd.conf-sample share/examples/rc.d/amavisd -${MILTER}share/examples/rc.d/amavismilter +${PLIST.milter}share/examples/rc.d/amavismilter @dirrm share/examples/amavisd-new @dirrm share/doc/amavisd-new |