Sun Oct 29 00:46:14 2017 UTC ()
Remove compatibility mappings for options retired in 2017Q2.


(schmonz)
diff -r1.46 -r1.47 pkgsrc/mail/qmail/options.mk
cvs diff -r1.46 -r1.47 pkgsrc/mail/qmail/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/qmail/options.mk 2017/08/19 22:11:43 1.46
+++ pkgsrc/mail/qmail/options.mk 2017/10/29 00:46:14 1.47
@@ -1,28 +1,21 @@ @@ -1,28 +1,21 @@
1# $NetBSD: options.mk,v 1.46 2017/08/19 22:11:43 schmonz Exp $ 1# $NetBSD: options.mk,v 1.47 2017/10/29 00:46:14 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qmail 3PKG_OPTIONS_VAR= PKG_OPTIONS.qmail
4PKG_SUPPORTED_OPTIONS+= eai sasl syncdir tls 4PKG_SUPPORTED_OPTIONS+= eai sasl syncdir tls
5PKG_SUPPORTED_OPTIONS+= qmail-customerror qmail-rejectutils qmail-srs 5PKG_SUPPORTED_OPTIONS+= qmail-customerror qmail-rejectutils qmail-srs
6PKG_SUGGESTED_OPTIONS+= eai sasl syncdir tls 6PKG_SUGGESTED_OPTIONS+= eai sasl syncdir tls
7PKG_SUGGESTED_OPTIONS+= qmail-customerror qmail-rejectutils qmail-srs 7PKG_SUGGESTED_OPTIONS+= qmail-customerror qmail-rejectutils qmail-srs
8 8
9# For users migrating from 2017Q2; remove compatibility after 2017Q3 is branched 
10QMAIL_PATCHES_ALWAYS_ON= netqmail bigdns maildiruniq outgoingip rcptcheck remote 
11QMAIL_PATCHES_REMOVED= badrcptto qregex realrcptto viruscan 
12PKG_OPTIONS_ALWAYS_ON= ${QMAIL_PATCHES_ALWAYS_ON:S/^/qmail-/} 
13PKG_OPTIONS_REMOVED= ${QMAIL_PATCHES_REMOVED:S/^/qmail-/} 
14PKG_SUPPORTED_OPTIONS+= ${PKG_OPTIONS_ALWAYS_ON} ${PKG_OPTIONS_REMOVED} 
15 
16# Formerly optional patches, now unconditionally applied: 9# Formerly optional patches, now unconditionally applied:
17QMAILPATCHES= netqmail:${DEFAULT_DISTFILES} 10QMAILPATCHES= netqmail:${DEFAULT_DISTFILES}
18 11
19QMAILPATCHES+= tls-smtpauth:${TLSSASL_PATCH} 12QMAILPATCHES+= tls-smtpauth:${TLSSASL_PATCH}
20TLSSASL_PATCH= netqmail-1.05-tls-smtpauth-20070417.patch 13TLSSASL_PATCH= netqmail-1.05-tls-smtpauth-20070417.patch
21PATCHFILES+= ${TLSSASL_PATCH} 14PATCHFILES+= ${TLSSASL_PATCH}
22SITES.${TLSSASL_PATCH}= https://raw.githubusercontent.com/shupp/legacy-qmail-related/master/patches/ 15SITES.${TLSSASL_PATCH}= https://raw.githubusercontent.com/shupp/legacy-qmail-related/master/patches/
23 16
24QMAILPATCHES+= bigdns:${BIGDNS_PATCH} 17QMAILPATCHES+= bigdns:${BIGDNS_PATCH}
25BIGDNS_PATCH= qmail-103.patch 18BIGDNS_PATCH= qmail-103.patch
26PATCHFILES+= ${BIGDNS_PATCH} 19PATCHFILES+= ${BIGDNS_PATCH}
27SITES.${BIGDNS_PATCH}= http://www.ckdhr.com/ckd/ 20SITES.${BIGDNS_PATCH}= http://www.ckdhr.com/ckd/
28SITES.${BIGDNS_PATCH}+= ${MASTER_SITE_LOCAL} 21SITES.${BIGDNS_PATCH}+= ${MASTER_SITE_LOCAL}
@@ -51,42 +44,26 @@ SITES.${QBIFFUTMPX_PATCH}= https://schmo @@ -51,42 +44,26 @@ SITES.${QBIFFUTMPX_PATCH}= https://schmo
51 44
52QMAILPATCHES+= rcptcheck:${RCPTCHECK_PATCH} 45QMAILPATCHES+= rcptcheck:${RCPTCHECK_PATCH}
53RCPTCHECK_PATCH= netqmail-1.06-tls-smtpauth-20070417-rcptcheck-20170716.patch 46RCPTCHECK_PATCH= netqmail-1.06-tls-smtpauth-20070417-rcptcheck-20170716.patch
54PATCHFILES+= ${RCPTCHECK_PATCH} 47PATCHFILES+= ${RCPTCHECK_PATCH}
55SITES.${RCPTCHECK_PATCH}= https://schmonz.com/qmail/rcptcheck/ 48SITES.${RCPTCHECK_PATCH}= https://schmonz.com/qmail/rcptcheck/
56 49
57QMAILPATCHES+= remote:${REMOTE_PATCH} 50QMAILPATCHES+= remote:${REMOTE_PATCH}
58REMOTE_PATCH= netqmail-1.06-qmailremote-20170716.patch 51REMOTE_PATCH= netqmail-1.06-qmailremote-20170716.patch
59PATCHFILES+= ${REMOTE_PATCH} 52PATCHFILES+= ${REMOTE_PATCH}
60SITES.${REMOTE_PATCH}= https://schmonz.com/qmail/remote/ 53SITES.${REMOTE_PATCH}= https://schmonz.com/qmail/remote/
61 54
62.include "../../mk/bsd.options.mk" 55.include "../../mk/bsd.options.mk"
63 56
64# For users migrating from 2017Q2; remove compatibility after 2017Q3 is branched 
65.for i in ${PKG_OPTIONS_ALWAYS_ON} 
66. if !empty(PKG_OPTIONS:M${i}) 
67PKG_LEGACY_OPTIONS+= ${i} 
68PKG_OPTIONS_DEPRECATED_WARNINGS+="WARN: Please unset \"${i}\" option (it's now always enabled)." 
69. endif 
70.endfor 
71 
72# For users migrating from 2017Q2; remove compatibility after 2017Q3 is branched 
73.for i in ${PKG_OPTIONS_REMOVED} 
74. if !empty(PKG_OPTIONS:M${i}) 
75PKG_LEGACY_OPTIONS+= ${i} 
76PKG_OPTIONS_DEPRECATED_WARNINGS+="WARN: Please unset \"${i}\" option (it's now always included, as a program)." 
77. endif 
78.endfor 
79 
80.if !empty(PKG_OPTIONS:Meai) 57.if !empty(PKG_OPTIONS:Meai)
81. include "../../devel/libidn2/buildlink3.mk" 58. include "../../devel/libidn2/buildlink3.mk"
82QMAILPATCHES+= eai:${EAI_PATCH} 59QMAILPATCHES+= eai:${EAI_PATCH}
83EAI_PATCH= qmail-smtputf8.patch 60EAI_PATCH= qmail-smtputf8.patch
84PATCHFILES+= ${EAI_PATCH} 61PATCHFILES+= ${EAI_PATCH}
85SITES.${EAI_PATCH}= http://arnt.gulbrandsen.priv.no/qmail/ 62SITES.${EAI_PATCH}= http://arnt.gulbrandsen.priv.no/qmail/
86PATCH_DIST_CAT.${EAI_PATCH}= ${SED} \ 63PATCH_DIST_CAT.${EAI_PATCH}= ${SED} \
87 -e 's|\(if (!stralloc_append(&firstpart,&ch)) temp_nomem();\)|if (ch == '"'\\\n'"' \&\& \!stralloc_append(\&firstpart,"\\r")) temp_nomem(); \1|' < ${EAI_PATCH} 64 -e 's|\(if (!stralloc_append(&firstpart,&ch)) temp_nomem();\)|if (ch == '"'\\\n'"' \&\& \!stralloc_append(\&firstpart,"\\r")) temp_nomem(); \1|' < ${EAI_PATCH}
88PATCH_DIST_STRIP.${EAI_PATCH}= -p1 65PATCH_DIST_STRIP.${EAI_PATCH}= -p1
89.endif 66.endif
90 67
91.if !empty(PKG_OPTIONS:Mqmail-customerror) 68.if !empty(PKG_OPTIONS:Mqmail-customerror)
92QMAILPATCHES+= customerror:${CUSTOMERROR_PATCH} 69QMAILPATCHES+= customerror:${CUSTOMERROR_PATCH}