[pkgsrc/trunk]: pkgsrc/mail/qmail Avoid the -O (to stdout) tar option, as it'...

[schmonz <schmonz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/970a4e8ae58f
branches:  trunk
changeset: 388956:970a4e8ae58f
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Sun Dec 16 23:46:44 2018 +0000

description:
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:

 mail/qmail/Makefile |  9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diffs (26 lines):

diff -r 9f65b4e7fbee -r 970a4e8ae58f mail/qmail/Makefile
--- a/mail/qmail/Makefile       Sun Dec 16 23:21:52 2018 +0000
+++ b/mail/qmail/Makefile       Sun Dec 16 23:46:44 2018 +0000
@@ -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 @@
 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