pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mail/dspam Must set PKG_SUPPORTED_OPTIONS before inclu...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f2b7b9dc85be
branches:  trunk
changeset: 524088:f2b7b9dc85be
user:      obache <obache%pkgsrc.org@localhost>
date:      Thu Jan 18 14:22:38 2007 +0000

description:
Must set PKG_SUPPORTED_OPTIONS before including bsd.options.mk.
Should fix PR 35439.

And remove duplicate preferences-extension and ldap options.

diffstat:

 mail/dspam/options.mk |  10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r fd5b1510b52f -r f2b7b9dc85be mail/dspam/options.mk
--- a/mail/dspam/options.mk     Thu Jan 18 11:55:45 2007 +0000
+++ b/mail/dspam/options.mk     Thu Jan 18 14:22:38 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.17 2006/12/10 00:30:01 xtraeme Exp $
+# $NetBSD: options.mk,v 1.18 2007/01/18 14:22:38 obache Exp $
 
 .if defined(DSPAM_DELIVERY_AGENT) && !empty(DSPAM_DELIVERY_AGENT:Mcustom)
 DSPAM_DELIVERY_AGENT:= ${DSPAM_DELIVERY_AGENT_ARGS}
@@ -6,10 +6,8 @@
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.dspam
 PKG_SUPPORTED_OPTIONS= largescale homedir long-usernames graphs \
-                       domainscale preferences-extension \
-                       clamav ldap syslog debug verbose-debug
-
-.include "../../mk/bsd.options.mk"
+                       domainscale \
+                       clamav syslog debug verbose-debug
 
 ###
 ### DSPAM_DELIVERY_AGENT is the tool called to to deliver messages.
@@ -109,6 +107,8 @@
 PKG_SUPPORTED_OPTIONS+=        preferences-extension virtualusers ldap
 .endif
 
+.include "../../mk/bsd.options.mk"
+
 ###
 ### Used to store user preferences in the backend instead of flat files
 ### (built-in method).



Home | Main Index | Thread Index | Old Index