diff options
| author | jlam <jlam@pkgsrc.org> | 2004-08-22 19:32:51 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-08-22 19:32:51 +0000 |
| commit | 9d5426ff76defa85311d3e55ed2c442fb5ae9977 (patch) | |
| tree | be106f064832dabfe855335adc4a7d14708a360a /security/amavisd-new | |
| parent | 3c0724db4840983688df4cd77ea88653e9b13249 (diff) | |
| download | pkgsrc-9d5426ff76defa85311d3e55ed2c442fb5ae9977.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 'security/amavisd-new')
| -rw-r--r-- | security/amavisd-new/Makefile | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 463dc881336..45728057eb5 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2004/08/06 15:05:54 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2004/08/22 19:32:52 jlam Exp $ DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL} PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//} @@ -59,13 +59,8 @@ PKG_USERS= ${AMAVIS_USER}:${AMAVIS_GROUP}::Virus\\ Scanning\\ Account:${AMAVIS_D RCD_SCRIPTS= amavisd CONF_FILES= ${EGDIR}/amavisd.conf-minimal ${PKG_SYSCONFDIR}/amavisd.conf -# Global and legacy options -.if defined(USE_MILTER) -. if !defined(PKG_OPTIONS.amavisd-new) -. if defined(USE_MILTER) && !empty(USE_MILTER:M[Yy][Es][Ss]) -PKG_OPTIONS.amavisd-new+= milter -. endif -. endif +.if defined(USE_MILTER) && !empty(USE_MILTER:M[Yy][Es][Ss]) +PKG_DEFAULT_OPTIONS+= milter .endif PKG_OPTIONS_VAR= PKG_OPTIONS.amavisd-new |