diff options
| author | schmonz <schmonz@pkgsrc.org> | 2006-02-20 03:39:25 +0000 |
|---|---|---|
| committer | schmonz <schmonz@pkgsrc.org> | 2006-02-20 03:39:25 +0000 |
| commit | 699cc8fa69db87bae0c8f9bae4a4134c2855f444 (patch) | |
| tree | 2b9401550a5023485b35f79d063f60526d29ee6f /mail/qmail | |
| parent | 5ffd79703202f27feb689225896a291a399bdd13 (diff) | |
| download | pkgsrc-699cc8fa69db87bae0c8f9bae4a4134c2855f444.tar.gz | |
Extract more sanely, from jlam and joerg. Should fix DragonFly bulk build.
Diffstat (limited to 'mail/qmail')
| -rw-r--r-- | mail/qmail/Makefile | 15 | ||||
| -rw-r--r-- | mail/qmail/options.mk | 5 |
2 files changed, 9 insertions, 11 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index e72a975e009..bbae60f0461 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -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+= mutt<=1.4.2.1nb1 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 @@ PKG_SYSCONFSUBDIR= qmail 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,@PKG_INFO@,${PKG_INFO},g' 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 --git a/mail/qmail/options.mk b/mail/qmail/options.mk index d1d2aab0d19..43ea9c35b2f 100644 --- a/mail/qmail/options.mk +++ b/mail/qmail/options.mk @@ -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 @@ PLIST_SUBST+= DARWINSUFX=${DARWINSUFX:Q} .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 |