diff options
| author | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-22 19:32:51 +0000 |
| commit | b1276828b47cd0e050c7db6a6dd702ffc806f96a (patch) | |
| tree | be106f064832dabfe855335adc4a7d14708a360a /mail/clamav/Makefile | |
| parent | 4795460da1a16fd97804c0cfe23df962441269c8 (diff) | |
| download | pkgsrc-b1276828b47cd0e050c7db6a6dd702ffc806f96a.tar.gz | |
Change the way that legacy USE_* and FOO_USE_* options are converted
into the bsd.options.mk framework. Instead of appending to
${PKG_OPTIONS_VAR}, it appends to PKG_DEFAULT_OPTIONS. This causes
the default options to be the union of PKG_DEFAULT_OPTIONS and any
old USE_* and FOO_USE_* settings.
This fixes PR pkg/26590.
Diffstat (limited to 'mail/clamav/Makefile')
| -rw-r--r-- | mail/clamav/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index 402b18ca1cb..12247c2270a 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2004/08/03 11:28:37 tv Exp $ +# $NetBSD: Makefile,v 1.24 2004/08/22 19:32:51 jlam Exp $ DISTNAME= clamav-${CLAMAV_VERSION} PKGNAME= clamav-${CLAMAV_VERSION:S/-/./} @@ -56,13 +56,8 @@ CONF_FILES_PERMS+= ${EGDIR}/${_file_} ${VIRUSDBDIR}/${_file_} \ INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} CFGINST=${EGDIR} DBINST=${EGDIR} -# Global and legacy options -.if defined(USE_MILTER) -. if !defined(PKG_OPTIONS.clamav) -. if defined(USE_MILTER) && !empty(USE_MILTER:M[yY][eE][sS]) -PKG_OPTIONS.clamav+= milter -. endif -. endif +.if defined(USE_MILTER) && !empty(USE_MILTER:M[yY][eE][sS]) +PKG_DEFAULT_OPTIONS+= milter .endif PKG_OPTIONS_VAR= PKG_OPTIONS.clamav |