Received: by mail.netbsd.org (Postfix, from userid 605) id 8BACD84D45; Sat, 10 Nov 2018 16:42:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 754EF84D02 for ; Sat, 10 Nov 2018 16:42:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id EfzoHtKrd-mR for ; Sat, 10 Nov 2018 16:42:52 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 4EAD784CDC for ; Sat, 10 Nov 2018 16:42:52 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 36146FB1F; Sat, 10 Nov 2018 16:42:52 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_154186817255310" MIME-Version: 1.0 Date: Sat, 10 Nov 2018 16:42:52 +0000 From: "Amitai Schleier" Subject: CVS commit: pkgsrc/mail/qmail To: pkgsrc-changes@NetBSD.org Reply-To: schmonz@netbsd.org X-Mailer: log_accum Message-Id: <20181110164252.36146FB1F@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_154186817255310 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: schmonz Date: Sat Nov 10 16:42:52 UTC 2018 Modified Files: pkgsrc/mail/qmail: Makefile options.mk Log Message: Move patches long since non-optional out of options.mk. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 pkgsrc/mail/qmail/Makefile cvs rdiff -u -r1.58 -r1.59 pkgsrc/mail/qmail/options.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_154186817255310 Content-Disposition: inline Content-Length: 5216 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mail/qmail/Makefile diff -u pkgsrc/mail/qmail/Makefile:1.101 pkgsrc/mail/qmail/Makefile:1.102 --- pkgsrc/mail/qmail/Makefile:1.101 Sat Nov 10 15:29:01 2018 +++ pkgsrc/mail/qmail/Makefile Sat Nov 10 16:42:52 2018 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.101 2018/11/10 15:29:01 schmonz Exp $ +# $NetBSD: Makefile,v 1.102 2018/11/10 16:42:52 schmonz Exp $ # DISTNAME= netqmail-1.06 @@ -139,6 +139,56 @@ PKG_HOME.alias= ${QMAILDIR}/alias READMES= README.pkgsrc +# Record all patches applied, starting with the non-optional ones: +QMAILPATCHES= netqmail:${DEFAULT_DISTFILES} + +QMAILPATCHES+= tls:${TLSREMOTE_PATCH} +TLSREMOTE_PATCH= netqmail-1.06-tls-20160918-onlyremote-20181107.patch +PATCHFILES+= ${TLSREMOTE_PATCH} +SITES.${TLSREMOTE_PATCH}= https://schmonz.com/qmail/tlsonlyremote/ + +QMAILPATCHES+= bigdns:${BIGDNS_PATCH} +BIGDNS_PATCH= qmail-103.patch +PATCHFILES+= ${BIGDNS_PATCH} +SITES.${BIGDNS_PATCH}= http://www.ckdhr.com/ckd/ +SITES.${BIGDNS_PATCH}+= ${MASTER_SITE_LOCAL} +PATCH_DIST_STRIP.${BIGDNS_PATCH}=-p1 + +QMAILPATCHES+= destdir:${DESTDIR_PATCH} +DESTDIR_PATCH= netqmail-1.06-destdir-20170716.patch +PATCHFILES+= ${DESTDIR_PATCH} +SITES.${DESTDIR_PATCH}= https://schmonz.com/qmail/destdir/ + +QMAILPATCHES+= maildiruniq:${MAILDIRUNIQ_PATCH} +MAILDIRUNIQ_PATCH= qmail-1.03-maildir-uniq.patch +PATCHFILES+= ${MAILDIRUNIQ_PATCH} +SITES.${MAILDIRUNIQ_PATCH}= http://www.memoryhole.net/qmail/ +PATCH_DIST_STRIP.${MAILDIRUNIQ_PATCH}=-p1 + +QMAILPATCHES+= outgoingip:${OUTGOINGIP_PATCH} +OUTGOINGIP_PATCH= outgoingip.patch +PATCHFILES+= ${OUTGOINGIP_PATCH} +SITES.${OUTGOINGIP_PATCH}= http://www.qmail.org/ + +QMAILPATCHES+= qbiffutmpx:${QBIFFUTMPX_PATCH} +QBIFFUTMPX_PATCH= netqmail-1.06-qbiffutmpx-20170820.patch +PATCHFILES+= ${QBIFFUTMPX_PATCH} +SITES.${QBIFFUTMPX_PATCH}= https://schmonz.com/qmail/qbiffutmpx/ + +QMAILPATCHES+= remote:${REMOTE_PATCH} +REMOTE_PATCH= netqmail-1.06-qmailremote-20170716.patch +PATCHFILES+= ${REMOTE_PATCH} +SITES.${REMOTE_PATCH}= https://schmonz.com/qmail/remote/ + +QMAILPATCHES+= spp:${SPP_PATCH} +SPP_PATCH= qmail-spp-0.42.tar.gz +PATCHFILES+= ${SPP_PATCH} +SITES.${SPP_PATCH}= ${MASTER_SITE_SOURCEFORGE:=qmail-spp/} +PATCH_DIST_CAT.${SPP_PATCH}= ${TAR} -zxOf ${SPP_PATCH} ./qmail-spp-0.42/netqmail-spp.diff \ + | ${SED} -e 's|sppfok \!= 1|sppfok == -1|' +PATCH_DIST_STRIP.${SPP_PATCH}= -p1 +LICENSE+= AND gnu-gpl-v2 + post-extract: for i in ${READMES}; do \ ${CP} ${FILESDIR}/$$i ${WRKSRC} || ${TRUE}; \ Index: pkgsrc/mail/qmail/options.mk diff -u pkgsrc/mail/qmail/options.mk:1.58 pkgsrc/mail/qmail/options.mk:1.59 --- pkgsrc/mail/qmail/options.mk:1.58 Sat Nov 10 16:27:18 2018 +++ pkgsrc/mail/qmail/options.mk Sat Nov 10 16:42:52 2018 @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.58 2018/11/10 16:27:18 schmonz Exp $ +# $NetBSD: options.mk,v 1.59 2018/11/10 16:42:52 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qmail PKG_SUPPORTED_OPTIONS+= eai inet6 pam syncdir tls @@ -6,56 +6,6 @@ PKG_SUPPORTED_OPTIONS+= qmail-customerr PKG_SUGGESTED_OPTIONS+= eai syncdir tls PKG_SUGGESTED_OPTIONS+= qmail-customerror qmail-srs -# Formerly optional patches, now unconditionally applied: -QMAILPATCHES= netqmail:${DEFAULT_DISTFILES} - -QMAILPATCHES+= tls:${TLSREMOTE_PATCH} -TLSREMOTE_PATCH= netqmail-1.06-tls-20160918-onlyremote-20181107.patch -PATCHFILES+= ${TLSREMOTE_PATCH} -SITES.${TLSREMOTE_PATCH}= https://schmonz.com/qmail/tlsonlyremote/ - -QMAILPATCHES+= bigdns:${BIGDNS_PATCH} -BIGDNS_PATCH= qmail-103.patch -PATCHFILES+= ${BIGDNS_PATCH} -SITES.${BIGDNS_PATCH}= http://www.ckdhr.com/ckd/ -SITES.${BIGDNS_PATCH}+= ${MASTER_SITE_LOCAL} -PATCH_DIST_STRIP.${BIGDNS_PATCH}=-p1 - -QMAILPATCHES+= destdir:${DESTDIR_PATCH} -DESTDIR_PATCH= netqmail-1.06-destdir-20170716.patch -PATCHFILES+= ${DESTDIR_PATCH} -SITES.${DESTDIR_PATCH}= https://schmonz.com/qmail/destdir/ - -QMAILPATCHES+= maildiruniq:${MAILDIRUNIQ_PATCH} -MAILDIRUNIQ_PATCH= qmail-1.03-maildir-uniq.patch -PATCHFILES+= ${MAILDIRUNIQ_PATCH} -SITES.${MAILDIRUNIQ_PATCH}= http://www.memoryhole.net/qmail/ -PATCH_DIST_STRIP.${MAILDIRUNIQ_PATCH}=-p1 - -QMAILPATCHES+= outgoingip:${OUTGOINGIP_PATCH} -OUTGOINGIP_PATCH= outgoingip.patch -PATCHFILES+= ${OUTGOINGIP_PATCH} -SITES.${OUTGOINGIP_PATCH}= http://www.qmail.org/ - -QMAILPATCHES+= qbiffutmpx:${QBIFFUTMPX_PATCH} -QBIFFUTMPX_PATCH= netqmail-1.06-qbiffutmpx-20170820.patch -PATCHFILES+= ${QBIFFUTMPX_PATCH} -SITES.${QBIFFUTMPX_PATCH}= https://schmonz.com/qmail/qbiffutmpx/ - -QMAILPATCHES+= remote:${REMOTE_PATCH} -REMOTE_PATCH= netqmail-1.06-qmailremote-20170716.patch -PATCHFILES+= ${REMOTE_PATCH} -SITES.${REMOTE_PATCH}= https://schmonz.com/qmail/remote/ - -QMAILPATCHES+= spp:${SPP_PATCH} -SPP_PATCH= qmail-spp-0.42.tar.gz -PATCHFILES+= ${SPP_PATCH} -SITES.${SPP_PATCH}= ${MASTER_SITE_SOURCEFORGE:=qmail-spp/} -PATCH_DIST_CAT.${SPP_PATCH}= ${TAR} -zxOf ${SPP_PATCH} ./qmail-spp-0.42/netqmail-spp.diff \ - | ${SED} -e 's|sppfok \!= 1|sppfok == -1|' -PATCH_DIST_STRIP.${SPP_PATCH}= -p1 -LICENSE+= AND gnu-gpl-v2 - .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Meai) --_----------=_154186817255310--