diff options
| author | martti <martti> | 2010-04-02 19:45:23 +0000 |
|---|---|---|
| committer | martti <martti> | 2010-04-02 19:45:23 +0000 |
| commit | 2133d8adb6f8bc90cca8bd37468b425c62eca164 (patch) | |
| tree | cac5e3f6a5f73f63785b0aa2c0a0f52388709cbc /mail | |
| parent | 20b8ce43d49aa8c8ccb63f32ad86cce85b8b74b5 (diff) | |
| download | pkgsrc-2133d8adb6f8bc90cca8bd37468b425c62eca164.tar.gz | |
Fixed PLIST when using the milter option.
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/clamav/Makefile | 4 | ||||
| -rw-r--r-- | mail/clamav/PLIST | 3 | ||||
| -rw-r--r-- | mail/clamav/PLIST.milter | 3 | ||||
| -rw-r--r-- | mail/clamav/options.mk | 6 |
4 files changed, 9 insertions, 7 deletions
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index a789e8634ba..86d23f1a0b3 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2010/04/01 12:02:22 martti Exp $ +# $NetBSD: Makefile,v 1.102 2010/04/02 19:45:23 martti Exp $ DISTNAME= clamav-${CLAMAV_VERSION} PKGNAME= clamav-${CLAMAV_VERSION:S/-/./} @@ -31,6 +31,8 @@ CONFIGURE_ARGS+= --with-ltdl-lib=${BUILDLINK_PREFIX.libltdl}/lib .include "../../mk/bsd.prefs.mk" +PLIST_SRC+= ${PKGDIR}/PLIST + .if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M1.*) CONFIGURE_ARGS+= --disable-readdir-r .else diff --git a/mail/clamav/PLIST b/mail/clamav/PLIST index 98e4b80e9c3..5d463d6f443 100644 --- a/mail/clamav/PLIST +++ b/mail/clamav/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2010/04/01 12:02:22 martti Exp $ +@comment $NetBSD: PLIST,v 1.24 2010/04/02 19:45:24 martti Exp $ bin/clamav-config bin/clambc bin/clamconf @@ -22,7 +22,6 @@ man/man5/clamd.conf.5 man/man5/freshclam.conf.5 man/man8/clamav-milter.8 man/man8/clamd.8 -${PLIST.milter}sbin/clamav-milter sbin/clamd share/examples/clamav/clamd.conf share/examples/clamav/daily.cvd diff --git a/mail/clamav/PLIST.milter b/mail/clamav/PLIST.milter new file mode 100644 index 00000000000..4596bb292ce --- /dev/null +++ b/mail/clamav/PLIST.milter @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST.milter,v 1.5 2010/04/02 19:45:24 martti Exp $ +sbin/clamav-milter +share/examples/clamav/clamav-milter.conf diff --git a/mail/clamav/options.mk b/mail/clamav/options.mk index da405bb594c..d7fa1efdb9a 100644 --- a/mail/clamav/options.mk +++ b/mail/clamav/options.mk @@ -1,12 +1,10 @@ -# $NetBSD: options.mk,v 1.4 2008/04/12 22:43:03 jlam Exp $ +# $NetBSD: options.mk,v 1.5 2010/04/02 19:45:24 martti Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.clamav PKG_SUPPORTED_OPTIONS= milter clamav-experimental .include "../../mk/bsd.options.mk" -PLIST_VARS+= milter - .if !empty(PKG_OPTIONS:Mmilter) # force use of pkgsrc version of libmilter -- clamav uses the sendmail binary # to check API compatibility(!), so it must build with as new a version of @@ -14,7 +12,7 @@ PLIST_VARS+= milter USE_BUILTIN.libmilter= no . include "../../mail/libmilter/buildlink3.mk" CONFIGURE_ARGS+= --enable-milter -PLIST.milter= yes +PLIST_SRC+= ${PKGDIR}/PLIST.milter .else CONFIGURE_ARGS+= --disable-milter # XXX --disable-milter doesn't work as expected, so we need this |