[pkgsrc/trunk]: pkgsrc/mail/qmail Upgrade netqmail to 1.06, which is identica...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bbb1606df5de
branches:  trunk
changeset: 539996:bbb1606df5de
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Thu Mar 20 03:30:32 2008 +0000

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

 mail/qmail/Makefile   |  10 +++-------
 mail/qmail/distinfo   |  11 +++++++----
 mail/qmail/options.mk |   8 ++------
 3 files changed, 12 insertions(+), 17 deletions(-)

diffs (75 lines):

diff -r 4a65f2ec4037 -r bbb1606df5de mail/qmail/Makefile
--- a/mail/qmail/Makefile       Thu Mar 20 02:43:11 2008 +0000
+++ b/mail/qmail/Makefile       Thu Mar 20 03:30:32 2008 +0000
@@ -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 @@
 
 NOT_FOR_UNPRIVILEGED=  yes
 
-WRKSRC=                        ${WRKDIR}/${PKGNAME_NOREV}
+WRKSRC=                        ${WRKDIR}/${DISTNAME}
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 USE_TOOLS+=            nroff
@@ -101,11 +101,7 @@
 
 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 -r 4a65f2ec4037 -r bbb1606df5de mail/qmail/distinfo
--- a/mail/qmail/distinfo       Thu Mar 20 02:43:11 2008 +0000
+++ b/mail/qmail/distinfo       Thu Mar 20 03:30:32 2008 +0000
@@ -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 -r 4a65f2ec4037 -r bbb1606df5de mail/qmail/options.mk
--- a/mail/qmail/options.mk     Thu Mar 20 02:43:11 2008 +0000
+++ b/mail/qmail/options.mk     Thu Mar 20 03:30:32 2008 +0000
@@ -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 @@
 .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)