CVS commit: pkgsrc/mail/qmail

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Dec 16 23:46:44 UTC 2018

Modified Files:
        pkgsrc/mail/qmail: Makefile

Log Message:
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.


To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 pkgsrc/mail/qmail/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mail/qmail/Makefile
diff -u pkgsrc/mail/qmail/Makefile:1.105 pkgsrc/mail/qmail/Makefile:1.106
--- pkgsrc/mail/qmail/Makefile:1.105    Thu Dec 13 05:05:05 2018
+++ pkgsrc/mail/qmail/Makefile  Sun Dec 16 23:46:44 2018
@@ -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-qmailremot
 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