pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Distinguish package-specific options as such, supporti...
details: https://anonhg.NetBSD.org/pkgsrc/rev/1531de2f8619
branches: trunk
changeset: 497060:1531de2f8619
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Tue Jul 19 19:41:19 2005 +0000
description:
Distinguish package-specific options as such, supporting the old names
via PKG_OPTIONS_LEGACY_OPTS until after the next branch.
diffstat:
mail/ezmlm/options.mk | 12 ++++------
mail/qmail/options.mk | 58 +++++++++++++++-----------------------------------
net/djbdns/options.mk | 21 ++++++------------
3 files changed, 30 insertions(+), 61 deletions(-)
diffs (208 lines):
diff -r 8c104a315d6e -r 1531de2f8619 mail/ezmlm/options.mk
--- a/mail/ezmlm/options.mk Tue Jul 19 19:01:03 2005 +0000
+++ b/mail/ezmlm/options.mk Tue Jul 19 19:41:19 2005 +0000
@@ -1,18 +1,16 @@
-# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:37 dillo Exp $
+# $NetBSD: options.mk,v 1.3 2005/07/19 19:41:19 schmonz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.ezmlm
-PKG_SUPPORTED_OPTIONS= althash
+PKG_SUPPORTED_OPTIONS= ezmlm-althash
+PKG_OPTIONS_LEGACY_OPTS+= althash:ezmlm-althash
.if ${OPSYS} == "Darwin"
-PKG_SUGGESTED_OPTIONS= althash
+PKG_SUGGESTED_OPTIONS= ezmlm-althash
.endif
.include "../../mk/bsd.options.mk"
-###
-### alternate subscriber hashing scheme for case-insensitive filesystems
-###
-.if !empty(PKG_OPTIONS:Malthash)
+.if !empty(PKG_OPTIONS:Mezmlm-althash)
post-patch:
@cd ${WRKSRC} && ${PATCH} ${PATCH_ARGS} < ${FILESDIR}/patch-althash
.endif
diff -r 8c104a315d6e -r 1531de2f8619 mail/qmail/options.mk
--- a/mail/qmail/options.mk Tue Jul 19 19:01:03 2005 +0000
+++ b/mail/qmail/options.mk Tue Jul 19 19:41:19 2005 +0000
@@ -1,8 +1,16 @@
-# $NetBSD: options.mk,v 1.13 2005/05/31 10:01:38 dillo Exp $
+# $NetBSD: options.mk,v 1.14 2005/07/19 19:41:19 schmonz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.qmail
-PKG_SUPPORTED_OPTIONS= badrcptto bigdns darwin netqmail outgoingip
-PKG_SUPPORTED_OPTIONS+= qregex realrcptto sasl syncdir tls viruscan
+PKG_SUPPORTED_OPTIONS= darwin sasl syncdir tls qmail-badrcptto qmail-bigdns
+PKG_SUPPORTED_OPTIONS+= qmail-netqmail qmail-outgoingip qmail-qregex
+PKG_SUPPORTED_OPTIONS+= qmail-realrcptto qmail-viruscan
+PKG_OPTIONS_LEGACY_OPTS+= badrcptto:qmail-badrcptto
+PKG_OPTIONS_LEGACY_OPTS+= bigdns:qmail-bigdns
+PKG_OPTIONS_LEGACY_OPTS+= netqmail:qmail-netqmail
+PKG_OPTIONS_LEGACY_OPTS+= outgoingip:qmail-outgoingip
+PKG_OPTIONS_LEGACY_OPTS+= qregex:qmail-qregex
+PKG_OPTIONS_LEGACY_OPTS+= realrcptto:qmail-realrcptto
+PKG_OPTIONS_LEGACY_OPTS+= viruscan:qmail-viruscan
.if ${OPSYS} == "Darwin"
PKG_SUGGESTED_OPTIONS= darwin
@@ -10,29 +18,20 @@
.include "../../mk/bsd.options.mk"
-###
-### reject messages with bad envelope recipients
-###
-.if !empty(PKG_OPTIONS:Mbadrcptto)
+.if !empty(PKG_OPTIONS:Mqmail-badrcptto)
BADRCPTTO_PATCH= badrcptto.patch
PATCHFILES+= ${BADRCPTTO_PATCH}
SITES_${BADRCPTTO_PATCH}= http://patch.be/qmail/
PATCH_DIST_STRIP.${BADRCPTTO_PATCH}= -p2
.endif
-###
-### handle oversized responses to MX queries
-###
-.if !empty(PKG_OPTIONS:Mbigdns)
+.if !empty(PKG_OPTIONS:Mqmail-bigdns)
BIGDNS_PATCH= qmail-103.patch
PATCHFILES+= ${BIGDNS_PATCH}
SITES_${BIGDNS_PATCH}= http://www.ckdhr.com/ckd/
PATCH_DIST_STRIP.${BIGDNS_PATCH}= -p1
.endif
-###
-### build and run on Mac OS X
-###
.if !empty(PKG_OPTIONS:Mdarwin)
DARWIN_PATCH= panther.patch
PATCHFILES+= ${DARWIN_PATCH}
@@ -50,29 +49,20 @@
.endif
PLIST_SUBST+= DARWINSUFX=${DARWINSUFX}
-###
-### "netqmail" patch collection
-###
-.if !empty(PKG_OPTIONS:Mnetqmail)
+.if !empty(PKG_OPTIONS:Mqmail-netqmail)
NETQMAIL_PATCH= netqmail-1.05.tar.gz
PATCHFILES+= ${NETQMAIL_PATCH}
PATCH_DIST_CAT.${NETQMAIL_PATCH}= ${CAT} ${WRKSRC}/../${DISTNAME}.patch
PATCH_DIST_STRIP.${NETQMAIL_PATCH}= -p1
.endif
-###
-### force outgoing connections to originate from a particular IP
-###
-.if !empty(PKG_OPTIONS:Moutgoingip)
+.if !empty(PKG_OPTIONS:Mqmail-outgoingip)
OUTGOINGIP_PATCH= outgoingip.patch
PATCHFILES+= ${OUTGOINGIP_PATCH}
SITES_${OUTGOINGIP_PATCH}= http://www.qmail.org/
.endif
-###
-### reject messages matching regular expressions
-###
-.if !empty(PKG_OPTIONS:Mqregex)
+.if !empty(PKG_OPTIONS:Mqmail-qregex)
QREGEX_PATCH= qregex-20040725.patch
PATCHFILES+= ${QREGEX_PATCH}
SITES_${QREGEX_PATCH}= http://www.arda.homeunix.net/store/qmail/
@@ -80,19 +70,13 @@
PLIST_SRC+= ${PKGDIR}/PLIST.qregex
.endif
-###
-### reject messages that would bounce due to missing .qmail files
-###
-.if !empty(PKG_OPTIONS:Mrealrcptto)
+.if !empty(PKG_OPTIONS:Mqmail-realrcptto)
REALRCPTTO_PATCH= qmail-1.03-realrcptto-2004.08.20.patch
PATCHFILES+= ${REALRCPTTO_PATCH}
SITES_${REALRCPTTO_PATCH}= http://code.dogmap.org/qmail/
PATCH_DIST_STRIP.${REALRCPTTO_PATCH}= -p1
.endif
-###
-### enable STARTTLS and/or SMTP authentication
-###
.if !empty(PKG_OPTIONS:Msasl) || !empty(PKG_OPTIONS:Mtls)
. if empty(PKG_OPTIONS:Msasl)
PKG_OPTIONS+= sasl
@@ -109,9 +93,6 @@
. endif
.endif
-###
-### force synchronous link() syscall
-###
.if !empty(PKG_OPTIONS:Msyncdir)
. include "../../devel/syncdir/buildlink3.mk"
SUBST_CLASSES+= load
@@ -124,10 +105,7 @@
SUBST_MESSAGE.load= "Setting linker flags for syncdir."
.endif
-###
-### reject messages with MIME attachments that match certain signatures
-###
-.if !empty(PKG_OPTIONS:Mviruscan)
+.if !empty(PKG_OPTIONS:Mqmail-viruscan)
VIRUSCAN_PATCH= qmail-smtpd-viruscan-1.3.patch
VIRUSCAN_LOG_PATCH= qmail-smtpd-viruscan-logging.patch
PATCHFILES+= ${VIRUSCAN_PATCH} ${VIRUSCAN_LOG_PATCH}
diff -r 8c104a315d6e -r 1531de2f8619 net/djbdns/options.mk
--- a/net/djbdns/options.mk Tue Jul 19 19:01:03 2005 +0000
+++ b/net/djbdns/options.mk Tue Jul 19 19:41:19 2005 +0000
@@ -1,19 +1,18 @@
-# $NetBSD: options.mk,v 1.4 2005/05/31 10:01:38 dillo Exp $
+# $NetBSD: options.mk,v 1.5 2005/07/19 19:41:19 schmonz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.djbdns
-PKG_SUPPORTED_OPTIONS= inet6 ignoreip2 tinydns64
+PKG_SUPPORTED_OPTIONS= inet6 djbdns-ignoreip2 djbdns-tinydns64
+PKG_OPTIONS_LEGACY_OPTS+= ignoreip2:djbdns-ignoreip2
+PKG_OPTIONS_LEGACY_OPTS+= tinydns64:djbdns-tinydns64
.if ${MACHINE_ARCH} == "sparc64" || \
${MACHINE_ARCH} == "alpha" || \
${MACHINE_ARCH} == "amd64"
-PKG_SUGGESTED_OPTIONS= tinydns64
+PKG_SUGGESTED_OPTIONS= djbdns-tinydns64
.endif
.include "../../mk/bsd.options.mk"
-###
-### Felix von Leitner's IPv6 patch
-###
.if !empty(PKG_OPTIONS:Minet6)
IPV6_PATCH= djbdns-1.05-ipv6.diff.bz2
PATCHFILES+= ${IPV6_PATCH}
@@ -22,19 +21,13 @@
PLIST_SRC+= ${PKGDIR}/PLIST.inet6
.endif
-###
-### Russ Nelson's patch to treat certain responses as NXDOMAIN
-###
-.if !empty(PKG_OPTIONS:Mignoreip2)
+.if !empty(PKG_OPTIONS:Mdjbdns-ignoreip2)
IGNOREIP2_PATCH= djbdns-1.05-ignoreip2.patch
PATCHFILES+= ${IGNOREIP2_PATCH}
SITES_${IGNOREIP2_PATCH}= http://www.tinydns.org/
.endif
-###
-### Bernhard Roth's patch to fix tinydns-data on 64-bit platforms
-###
-.if !empty(PKG_OPTIONS:Mtinydns64)
+.if !empty(PKG_OPTIONS:Mdjbdns-tinydns64)
TINYDNS64_PATCH= tinydns64.diff
PATCHFILES+= ${TINYDNS64_PATCH}
SITES_${TINYDNS64_PATCH}= http://www.pwrlock.de/br/
Home |
Main Index |
Thread Index |
Old Index