summaryrefslogtreecommitdiff
path: root/mail/qmail
diff options
context:
space:
mode:
authorschmonz <schmonz@pkgsrc.org>2018-12-16 23:46:44 +0000
committerschmonz <schmonz@pkgsrc.org>2018-12-16 23:46:44 +0000
commit36b175ee4c46e94c1ec95d91a022c222fb2d9f7b (patch)
treebc07aa43b39682843f522735fc292a58ae96ef05 /mail/qmail
parent0cbeafe45d9d8913516768c9ef7e5e2d9310c443 (diff)
downloadpkgsrc-36b175ee4c46e94c1ec95d91a022c222fb2d9f7b.tar.gz
Avoid the -O (to stdout) tar option, as it's not sufficiently portable.
While here, append the specific patch file (not just the distribution) to the qmail-spp QMAILPATCHES entry.
Diffstat (limited to 'mail/qmail')
-rw-r--r--mail/qmail/Makefile9
1 files changed, 6 insertions, 3 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index cf169bc0f99..6c24cb5646e 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2018/12/13 05:05:05 schmonz Exp $
+# $NetBSD: Makefile,v 1.106 2018/12/16 23:46:44 schmonz Exp $
#
DISTNAME= netqmail-1.06
@@ -184,11 +184,14 @@ REMOTE_PATCH= netqmail-1.06-qmailremote-20170716.patch
PATCHFILES+= ${REMOTE_PATCH}
SITES.${REMOTE_PATCH}= https://schmonz.com/qmail/remote/
-QMAILPATCHES+= spp:${SPP_PATCH}
+QMAILPATCHES+= spp:${SPP_PATCH}:${SPP_PATCHFILE_cmd:sh}
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 \
+SPP_PATCHFILE= ./qmail-spp-0.42/netqmail-spp.diff
+SPP_PATCHFILE_cmd= ${BASENAME} ${SPP_PATCHFILE}
+PATCH_DIST_CAT.${SPP_PATCH}= ${TAR} -C ${WRKDIR} -zxf ${SPP_PATCH} ${SPP_PATCHFILE} \
+ && ${CAT} ${WRKDIR}/${SPP_PATCHFILE} \
| ${SED} -e 's|sppfok \!= 1|sppfok == -1|'
PATCH_DIST_STRIP.${SPP_PATCH}= -p1
LICENSE+= AND gnu-gpl-v2