diff options
| author | schmonz <schmonz> | 2008-03-20 03:30:32 +0000 |
|---|---|---|
| committer | schmonz <schmonz> | 2008-03-20 03:30:32 +0000 |
| commit | 6c068d35f5448a0c1ab60e33f8b60157e866820a (patch) | |
| tree | c9a89809681a7466228532ea91daddc167b44058 /mail | |
| parent | be9b4db0c976e25a2587f260676e5f5684381501 (diff) | |
| download | pkgsrc-6c068d35f5448a0c1ab60e33f8b60157e866820a.tar.gz | |
Upgrade netqmail to 1.06, which is identical to 1.05 except that
instead of consisting of a pristine qmail tarball and netqmail
patch, 1.06 has the patch already applied. No user-visible changes
to pkgsrc, either; this just simplifies a weird build and will make
future upgrades (don't laugh!) easier.
jlam@ "looks fine"
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/qmail/Makefile | 10 | ||||
| -rw-r--r-- | mail/qmail/distinfo | 11 | ||||
| -rw-r--r-- | mail/qmail/options.mk | 8 |
3 files changed, 12 insertions, 17 deletions
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index cc14a5b5aea..ef2428b230a 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.57 2008/02/19 21:12:06 schmonz Exp $ +# $NetBSD: Makefile,v 1.58 2008/03/20 03:30:32 schmonz Exp $ # -DISTNAME= netqmail-1.05 +DISTNAME= ${PKGNAME_NOREV} PKGNAME= qmail-1.03 PKGREVISION= 13 CATEGORIES= mail @@ -25,7 +25,7 @@ CONFLICTS+= pulsar<=0.1.1 NOT_FOR_UNPRIVILEGED= yes -WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} +WRKSRC= ${WRKDIR}/${DISTNAME} PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= nroff @@ -101,11 +101,7 @@ PKG_HOME.alias= ${QMAILDIR}/alias SPECIAL_PERMS+= ${PREFIX}/bin/qmail-queue qmailq qmail 4555 -# extract the qmail tarball that was inside the netqmail distfile post-extract: - ${_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/distinfo b/mail/qmail/distinfo index f44cb85d136..4e0dc953ea4 100644 --- a/mail/qmail/distinfo +++ b/mail/qmail/distinfo @@ -1,8 +1,11 @@ -$NetBSD: distinfo,v 1.17 2007/04/12 03:42:21 schmonz Exp $ +$NetBSD: distinfo,v 1.18 2008/03/20 03:30:32 schmonz Exp $ -SHA1 (netqmail-1.05.tar.gz) = fe4cbe97bd2f18a5ca1b36e4fbbd6c524256a829 -RMD160 (netqmail-1.05.tar.gz) = e5bd8557c58a2686233449254b146e74389a7652 -Size (netqmail-1.05.tar.gz) = 252264 bytes +SHA1 (qmail-1.03.tar.gz) = 18fb960481291a0503e93a94df3f6094edb7f27a +RMD160 (qmail-1.03.tar.gz) = b851f273f1d365d38efd949b1efcf35768ffa30f +Size (qmail-1.03.tar.gz) = 220668 bytes +SHA1 (netqmail-1.06.tar.gz) = 9ee9a603e2ad3d8e1d34b900e19b7a5d275f538b +RMD160 (netqmail-1.06.tar.gz) = d31598afa862abb35bc1feb8d038ab619b5a17a2 +Size (netqmail-1.06.tar.gz) = 260941 bytes SHA1 (badrcptto.patch) = 713875ab08239416b6d22ba0d846b14a6aa6912f RMD160 (badrcptto.patch) = 88e29eeb203f30ec9c9d01cc42f1b849ea08d509 Size (badrcptto.patch) = 3033 bytes diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk index 94cba1c44c3..83bf03d3e3d 100644 --- a/mail/qmail/options.mk +++ b/mail/qmail/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.28 2007/05/27 18:42:54 schmonz Exp $ +# $NetBSD: options.mk,v 1.29 2008/03/20 03:30:32 schmonz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qmail PKG_OPTIONS_OPTIONAL_GROUPS= rcpt @@ -36,11 +36,7 @@ PLIST_SUBST+= DARWINSUFX=".doc" .endif .if !empty(PKG_OPTIONS:Mqmail-netqmail) -NETQMAIL_PATCH= netqmail-1.05.tar.gz -PATCHFILES+= ${NETQMAIL_PATCH} -PATCH_DIST_CAT.${NETQMAIL_PATCH}= \ - ${CAT} ${WRKDIR}/${DISTNAME}/${DISTNAME}.patch -PATCH_DIST_STRIP.${NETQMAIL_PATCH}= -p1 +DISTNAME= netqmail-1.06 .endif .if !empty(PKG_OPTIONS:Mqmail-outgoingip) |