Sat Nov 10 16:42:52 2018 UTC ()
Move patches long since non-optional out of options.mk.


(schmonz)
diff -r1.101 -r1.102 pkgsrc/mail/qmail/Makefile
diff -r1.58 -r1.59 pkgsrc/mail/qmail/options.mk
cvs diff -r1.101 -r1.102 pkgsrc/mail/qmail/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/qmail/Makefile 2018/11/10 15:29:01 1.101
+++ pkgsrc/mail/qmail/Makefile 2018/11/10 16:42:52 1.102
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.101 2018/11/10 15:29:01 schmonz Exp $ 1# $NetBSD: Makefile,v 1.102 2018/11/10 16:42:52 schmonz Exp $
2# 2#
3 3
4DISTNAME= netqmail-1.06 4DISTNAME= netqmail-1.06
5PKGNAME= qmail-1.03 5PKGNAME= qmail-1.03
6PKGREVISION= 40 6PKGREVISION= 40
7CATEGORIES= mail 7CATEGORIES= mail
8MASTER_SITES= http://qmail.org/ 8MASTER_SITES= http://qmail.org/
9 9
10MAINTAINER= schmonz@NetBSD.org 10MAINTAINER= schmonz@NetBSD.org
11HOMEPAGE= http://qmail.org/netqmail/ 11HOMEPAGE= http://qmail.org/netqmail/
12COMMENT= Secure, reliable, efficient, simple, and fast MTA 12COMMENT= Secure, reliable, efficient, simple, and fast MTA
13LICENSE= public-domain 13LICENSE= public-domain
14 14
@@ -129,26 +129,76 @@ PKG_USERS+= ${QMAIL_ALIAS_USER}:${QMAIL @@ -129,26 +129,76 @@ PKG_USERS+= ${QMAIL_ALIAS_USER}:${QMAIL
129PKG_USERS+= ${QMAIL_DAEMON_USER}:${QMAIL_NOFILES_GROUP} 129PKG_USERS+= ${QMAIL_DAEMON_USER}:${QMAIL_NOFILES_GROUP}
130PKG_USERS+= ${QMAIL_LOG_USER}:${QMAIL_NOFILES_GROUP} 130PKG_USERS+= ${QMAIL_LOG_USER}:${QMAIL_NOFILES_GROUP}
131PKG_USERS+= ${QMAIL_PASSWD_USER}:${QMAIL_NOFILES_GROUP} 131PKG_USERS+= ${QMAIL_PASSWD_USER}:${QMAIL_NOFILES_GROUP}
132PKG_USERS+= ${QMAIL_QUEUE_USER}:${QMAIL_QMAIL_GROUP} 132PKG_USERS+= ${QMAIL_QUEUE_USER}:${QMAIL_QMAIL_GROUP}
133PKG_USERS+= ${QMAIL_REMOTE_USER}:${QMAIL_QMAIL_GROUP} 133PKG_USERS+= ${QMAIL_REMOTE_USER}:${QMAIL_QMAIL_GROUP}
134PKG_USERS+= ${QMAIL_SEND_USER}:${QMAIL_QMAIL_GROUP} 134PKG_USERS+= ${QMAIL_SEND_USER}:${QMAIL_QMAIL_GROUP}
135.for user in ${PKG_USERS:C/\:.*//} 135.for user in ${PKG_USERS:C/\:.*//}
136PKG_HOME.${user}= ${QMAILDIR} 136PKG_HOME.${user}= ${QMAILDIR}
137.endfor 137.endfor
138PKG_HOME.alias= ${QMAILDIR}/alias 138PKG_HOME.alias= ${QMAILDIR}/alias
139 139
140READMES= README.pkgsrc 140READMES= README.pkgsrc
141 141
 142# Record all patches applied, starting with the non-optional ones:
 143QMAILPATCHES= netqmail:${DEFAULT_DISTFILES}
 144
 145QMAILPATCHES+= tls:${TLSREMOTE_PATCH}
 146TLSREMOTE_PATCH= netqmail-1.06-tls-20160918-onlyremote-20181107.patch
 147PATCHFILES+= ${TLSREMOTE_PATCH}
 148SITES.${TLSREMOTE_PATCH}= https://schmonz.com/qmail/tlsonlyremote/
 149
 150QMAILPATCHES+= bigdns:${BIGDNS_PATCH}
 151BIGDNS_PATCH= qmail-103.patch
 152PATCHFILES+= ${BIGDNS_PATCH}
 153SITES.${BIGDNS_PATCH}= http://www.ckdhr.com/ckd/
 154SITES.${BIGDNS_PATCH}+= ${MASTER_SITE_LOCAL}
 155PATCH_DIST_STRIP.${BIGDNS_PATCH}=-p1
 156
 157QMAILPATCHES+= destdir:${DESTDIR_PATCH}
 158DESTDIR_PATCH= netqmail-1.06-destdir-20170716.patch
 159PATCHFILES+= ${DESTDIR_PATCH}
 160SITES.${DESTDIR_PATCH}= https://schmonz.com/qmail/destdir/
 161
 162QMAILPATCHES+= maildiruniq:${MAILDIRUNIQ_PATCH}
 163MAILDIRUNIQ_PATCH= qmail-1.03-maildir-uniq.patch
 164PATCHFILES+= ${MAILDIRUNIQ_PATCH}
 165SITES.${MAILDIRUNIQ_PATCH}= http://www.memoryhole.net/qmail/
 166PATCH_DIST_STRIP.${MAILDIRUNIQ_PATCH}=-p1
 167
 168QMAILPATCHES+= outgoingip:${OUTGOINGIP_PATCH}
 169OUTGOINGIP_PATCH= outgoingip.patch
 170PATCHFILES+= ${OUTGOINGIP_PATCH}
 171SITES.${OUTGOINGIP_PATCH}= http://www.qmail.org/
 172
 173QMAILPATCHES+= qbiffutmpx:${QBIFFUTMPX_PATCH}
 174QBIFFUTMPX_PATCH= netqmail-1.06-qbiffutmpx-20170820.patch
 175PATCHFILES+= ${QBIFFUTMPX_PATCH}
 176SITES.${QBIFFUTMPX_PATCH}= https://schmonz.com/qmail/qbiffutmpx/
 177
 178QMAILPATCHES+= remote:${REMOTE_PATCH}
 179REMOTE_PATCH= netqmail-1.06-qmailremote-20170716.patch
 180PATCHFILES+= ${REMOTE_PATCH}
 181SITES.${REMOTE_PATCH}= https://schmonz.com/qmail/remote/
 182
 183QMAILPATCHES+= spp:${SPP_PATCH}
 184SPP_PATCH= qmail-spp-0.42.tar.gz
 185PATCHFILES+= ${SPP_PATCH}
 186SITES.${SPP_PATCH}= ${MASTER_SITE_SOURCEFORGE:=qmail-spp/}
 187PATCH_DIST_CAT.${SPP_PATCH}= ${TAR} -zxOf ${SPP_PATCH} ./qmail-spp-0.42/netqmail-spp.diff \
 188 | ${SED} -e 's|sppfok \!= 1|sppfok == -1|'
 189PATCH_DIST_STRIP.${SPP_PATCH}= -p1
 190LICENSE+= AND gnu-gpl-v2
 191
142post-extract: 192post-extract:
143 for i in ${READMES}; do \ 193 for i in ${READMES}; do \
144 ${CP} ${FILESDIR}/$$i ${WRKSRC} || ${TRUE}; \ 194 ${CP} ${FILESDIR}/$$i ${WRKSRC} || ${TRUE}; \
145 done 195 done
146 mkdir ${WRKSRC}/doc && \ 196 mkdir ${WRKSRC}/doc && \
147 for i in INSTALL SENDMAIL; do \ 197 for i in INSTALL SENDMAIL; do \
148 ${MV} ${WRKSRC}/$$i ${WRKSRC}/doc/$$i; \ 198 ${MV} ${WRKSRC}/$$i ${WRKSRC}/doc/$$i; \
149 done 199 done
150 200
151post-patch: 201post-patch:
152 cd ${WRKSRC}; \ 202 cd ${WRKSRC}; \
153 for i in ssl_timeoutio.c tls.c; do \ 203 for i in ssl_timeoutio.c tls.c; do \
154 ( ${ECHO} '#ifdef TLS'; ${CAT} $$i; ${ECHO} '#endif' ) > $$i.new; \ 204 ( ${ECHO} '#ifdef TLS'; ${CAT} $$i; ${ECHO} '#endif' ) > $$i.new; \
cvs diff -r1.58 -r1.59 pkgsrc/mail/qmail/options.mk (expand / switch to unified diff)

--- pkgsrc/mail/qmail/options.mk 2018/11/10 16:27:18 1.58
+++ pkgsrc/mail/qmail/options.mk 2018/11/10 16:42:52 1.59
@@ -1,71 +1,21 @@ @@ -1,71 +1,21 @@
1# $NetBSD: options.mk,v 1.58 2018/11/10 16:27:18 schmonz Exp $ 1# $NetBSD: options.mk,v 1.59 2018/11/10 16:42:52 schmonz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.qmail 3PKG_OPTIONS_VAR= PKG_OPTIONS.qmail
4PKG_SUPPORTED_OPTIONS+= eai inet6 pam syncdir tls 4PKG_SUPPORTED_OPTIONS+= eai inet6 pam syncdir tls
5PKG_SUPPORTED_OPTIONS+= qmail-customerror qmail-srs 5PKG_SUPPORTED_OPTIONS+= qmail-customerror qmail-srs
6PKG_SUGGESTED_OPTIONS+= eai syncdir tls 6PKG_SUGGESTED_OPTIONS+= eai syncdir tls
7PKG_SUGGESTED_OPTIONS+= qmail-customerror qmail-srs 7PKG_SUGGESTED_OPTIONS+= qmail-customerror qmail-srs
8 8
9# Formerly optional patches, now unconditionally applied: 
10QMAILPATCHES= netqmail:${DEFAULT_DISTFILES} 
11 
12QMAILPATCHES+= tls:${TLSREMOTE_PATCH} 
13TLSREMOTE_PATCH= netqmail-1.06-tls-20160918-onlyremote-20181107.patch 
14PATCHFILES+= ${TLSREMOTE_PATCH} 
15SITES.${TLSREMOTE_PATCH}= https://schmonz.com/qmail/tlsonlyremote/ 
16 
17QMAILPATCHES+= bigdns:${BIGDNS_PATCH} 
18BIGDNS_PATCH= qmail-103.patch 
19PATCHFILES+= ${BIGDNS_PATCH} 
20SITES.${BIGDNS_PATCH}= http://www.ckdhr.com/ckd/ 
21SITES.${BIGDNS_PATCH}+= ${MASTER_SITE_LOCAL} 
22PATCH_DIST_STRIP.${BIGDNS_PATCH}=-p1 
23 
24QMAILPATCHES+= destdir:${DESTDIR_PATCH} 
25DESTDIR_PATCH= netqmail-1.06-destdir-20170716.patch 
26PATCHFILES+= ${DESTDIR_PATCH} 
27SITES.${DESTDIR_PATCH}= https://schmonz.com/qmail/destdir/ 
28 
29QMAILPATCHES+= maildiruniq:${MAILDIRUNIQ_PATCH} 
30MAILDIRUNIQ_PATCH= qmail-1.03-maildir-uniq.patch 
31PATCHFILES+= ${MAILDIRUNIQ_PATCH} 
32SITES.${MAILDIRUNIQ_PATCH}= http://www.memoryhole.net/qmail/ 
33PATCH_DIST_STRIP.${MAILDIRUNIQ_PATCH}=-p1 
34 
35QMAILPATCHES+= outgoingip:${OUTGOINGIP_PATCH} 
36OUTGOINGIP_PATCH= outgoingip.patch 
37PATCHFILES+= ${OUTGOINGIP_PATCH} 
38SITES.${OUTGOINGIP_PATCH}= http://www.qmail.org/ 
39 
40QMAILPATCHES+= qbiffutmpx:${QBIFFUTMPX_PATCH} 
41QBIFFUTMPX_PATCH= netqmail-1.06-qbiffutmpx-20170820.patch 
42PATCHFILES+= ${QBIFFUTMPX_PATCH} 
43SITES.${QBIFFUTMPX_PATCH}= https://schmonz.com/qmail/qbiffutmpx/ 
44 
45QMAILPATCHES+= remote:${REMOTE_PATCH} 
46REMOTE_PATCH= netqmail-1.06-qmailremote-20170716.patch 
47PATCHFILES+= ${REMOTE_PATCH} 
48SITES.${REMOTE_PATCH}= https://schmonz.com/qmail/remote/ 
49 
50QMAILPATCHES+= spp:${SPP_PATCH} 
51SPP_PATCH= qmail-spp-0.42.tar.gz 
52PATCHFILES+= ${SPP_PATCH} 
53SITES.${SPP_PATCH}= ${MASTER_SITE_SOURCEFORGE:=qmail-spp/} 
54PATCH_DIST_CAT.${SPP_PATCH}= ${TAR} -zxOf ${SPP_PATCH} ./qmail-spp-0.42/netqmail-spp.diff \ 
55 | ${SED} -e 's|sppfok \!= 1|sppfok == -1|' 
56PATCH_DIST_STRIP.${SPP_PATCH}= -p1 
57LICENSE+= AND gnu-gpl-v2 
58 
59.include "../../mk/bsd.options.mk" 9.include "../../mk/bsd.options.mk"
60 10
61.if !empty(PKG_OPTIONS:Meai) 11.if !empty(PKG_OPTIONS:Meai)
62. include "../../devel/libidn2/buildlink3.mk" 12. include "../../devel/libidn2/buildlink3.mk"
63QMAILPATCHES+= eai:${EAI_PATCH} 13QMAILPATCHES+= eai:${EAI_PATCH}
64EAI_PATCH= netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181109.patch 14EAI_PATCH= netqmail-1.06-tls-20160918-onlyremote-20181107-spp-20181109-smtputf8-20181109.patch
65PATCHFILES+= ${EAI_PATCH} 15PATCHFILES+= ${EAI_PATCH}
66SITES.${EAI_PATCH}= https://schmonz.com/qmail/eai/ 16SITES.${EAI_PATCH}= https://schmonz.com/qmail/eai/
67CFLAGS+= -DEHLO=1 17CFLAGS+= -DEHLO=1
68.endif 18.endif
69 19
70.if !empty(PKG_OPTIONS:Mpam) 20.if !empty(PKG_OPTIONS:Mpam)
71DEPENDS+= checkpassword-pam>=0.99nb1:../../sysutils/checkpassword-pam 21DEPENDS+= checkpassword-pam>=0.99nb1:../../sysutils/checkpassword-pam