[pkgsrc/trunk]: pkgsrc/mail/qmail Extract more sanely, from jlam and joerg. S...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c9b6c1e4941e
branches:  trunk
changeset: 508485:c9b6c1e4941e
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Mon Feb 20 03:39:25 2006 +0000

description:
Extract more sanely, from jlam and joerg. Should fix DragonFly bulk build.

diffstat:

 mail/qmail/Makefile   |  15 ++++++---------
 mail/qmail/options.mk |   5 +++--
 2 files changed, 9 insertions(+), 11 deletions(-)

diffs (64 lines):

diff -r 98405b5c9e71 -r c9b6c1e4941e mail/qmail/Makefile
--- a/mail/qmail/Makefile       Mon Feb 20 03:05:42 2006 +0000
+++ b/mail/qmail/Makefile       Mon Feb 20 03:39:25 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/01/19 01:18:30 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2006/02/20 03:39:25 schmonz Exp $
 #
 
 DISTNAME=              netqmail-1.05
@@ -22,11 +22,7 @@
 CONFLICTS+=            netqmail-[0-9]*
 CONFLICTS+=            pulsar<=0.1.1
 
-.if defined(PKG_PHASE) && ${PKG_PHASE} == "extract"
-WRKSRC=                        ${WRKDIR}/${DISTNAME}
-.else
 WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
-.endif
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 USE_TOOLS+=            expr nroff
@@ -45,7 +41,7 @@
 DOCDIR=                        ${PREFIX}/share/doc/qmail
 EGDIR=                 ${PREFIX}/share/examples/qmail
 SHAREDIR=              ${PREFIX}/share/qmail
-MESSAGE_SUBST+=                DOCDIR=${DOCDIR} EGDIR=${EGDIR}
+MESSAGE_SUBST+=                DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q}
 FILES_SUBST+=          DOCDIR=${DOCDIR:Q} EGDIR=${EGDIR:Q} SHAREDIR=${SHAREDIR:Q}
 FILES_SUBST+=          QMAILDIR=${QMAILDIR:Q} QMAIL_QUEUE_DIR=${QMAIL_QUEUE_DIR:Q}
 FILES_SUBST+=          QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
@@ -94,10 +90,11 @@
 SUBST_SED.paths+=      -e 's,@GREP@,${GREP},g'
 SUBST_STAGE.paths=     post-patch
 
+# extract the qmail tarball that was inside the netqmail distfile
 post-extract:
-       ${_PKG_SILENT}${_PKG_DEBUG}extract_file=${PKGNAME_NOREV}.tar.gz;\
-       export extract_file; cd ${WRKSRC}; ${EXTRACT_CMD};              \
-       ${MV} ${PKGNAME_NOREV} ..; ${MV} ${DISTNAME}.patch ..
+       ${_PKG_SILENT}${_PKG_DEBUG}                                     \
+       extract_file=${WRKDIR}/${DISTNAME}/${PKGNAME_NOREV}.tar.gz;     \
+       cd ${WRKDIR} && ${EXTRACT_CMD}
        ${CP} ${FILESDIR}/README.pkgsrc ${WRKDIR}/README.pkgsrc
 
 post-install:
diff -r 98405b5c9e71 -r c9b6c1e4941e mail/qmail/options.mk
--- a/mail/qmail/options.mk     Mon Feb 20 03:05:42 2006 +0000
+++ b/mail/qmail/options.mk     Mon Feb 20 03:39:25 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.19 2006/01/02 21:13:43 schmonz Exp $
+# $NetBSD: options.mk,v 1.20 2006/02/20 03:39:25 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qmail
 PKG_SUPPORTED_OPTIONS+=        darwin sasl syncdir tls qmail-badrcptto qmail-bigdns
@@ -39,7 +39,8 @@
 .if !empty(PKG_OPTIONS:Mqmail-netqmail)
 NETQMAIL_PATCH=                netqmail-1.05.tar.gz
 PATCHFILES+=           ${NETQMAIL_PATCH}
-PATCH_DIST_CAT.${NETQMAIL_PATCH}=      ${CAT} ${WRKSRC}/../${DISTNAME}.patch
+PATCH_DIST_CAT.${NETQMAIL_PATCH}=      \
+                       ${CAT} ${WRKDIR}/${DISTNAME}/${DISTNAME}.patch
 PATCH_DIST_STRIP.${NETQMAIL_PATCH}=    -p1
 .endif