summaryrefslogtreecommitdiff
path: root/security/amavisd-new
diff options
context:
space:
mode:
authordillo <dillo>2005-05-31 10:01:36 +0000
committerdillo <dillo>2005-05-31 10:01:36 +0000
commit3d75323aa5391188ab027b2688faacf8286ace0c (patch)
tree54f5cc64fe8b06d4695748b3d5b9967e8c030117 /security/amavisd-new
parent12f654f60a47071640b457d59c5edb54b8757615 (diff)
downloadpkgsrc-3d75323aa5391188ab027b2688faacf8286ace0c.tar.gz
Packages have no business modifying PKG_DEFAULT_OPTIONS -- it's a
user settable variable. Set PKG_SUGGESTED_OPTIONS instead. Also, make use of PKG_OPTIONS_LEGACY_VARS. Reviewed by wiz.
Diffstat (limited to 'security/amavisd-new')
-rw-r--r--security/amavisd-new/Makefile7
1 files changed, 2 insertions, 5 deletions
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 6692c9b7484..7b37688c3ec 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/21 04:10:18 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/31 10:01:39 dillo Exp $
DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL}
PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -61,12 +61,9 @@ PKG_USERS= ${AMAVIS_USER}:${AMAVIS_GROUP}::Virus\\ Scanning\\ Account:${AMAVIS_D
RCD_SCRIPTS= amavisd
CONF_FILES= ${EGDIR}/amavisd.conf-minimal ${PKG_SYSCONFDIR}/amavisd.conf
-.if defined(USE_MILTER) && !empty(USE_MILTER:M[Yy][Es][Ss])
-PKG_DEFAULT_OPTIONS+= milter
-.endif
-
PKG_OPTIONS_VAR= PKG_OPTIONS.amavisd-new
PKG_SUPPORTED_OPTIONS= milter
+
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mmilter)