[pkgsrc/trunk]: pkgsrc/mail/qmail-conf Now that we install into the normal ${...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e486a40f1b5e
branches:  trunk
changeset: 478338:e486a40f1b5e
user:      schmonz <schmonz%pkgsrc.org@localhost>
date:      Wed Jul 21 23:54:47 2004 +0000

description:
Now that we install into the normal ${LOCALBASE}, remove local
definitions of LOCALBASE and NO_MTREE. This requires either the
latest qmail package or netqmail. Add needed dependencies on
daemontools and ucspi-tcp also. Rename post-patch to do-configure.
Set ALL_TARGET explicitly. Set USE_BUILDLINK3=yes. Update HOMEPAGE.
Take MAINTAINER. Bump PKGREVISION.

diffstat:

 mail/qmail-conf/Makefile |  27 ++++++++++++---------------
 mail/qmail-conf/PLIST    |  12 ++++++------
 2 files changed, 18 insertions(+), 21 deletions(-)

diffs (67 lines):

diff -r 46a43339a78c -r e486a40f1b5e mail/qmail-conf/Makefile
--- a/mail/qmail-conf/Makefile  Wed Jul 21 23:49:36 2004 +0000
+++ b/mail/qmail-conf/Makefile  Wed Jul 21 23:54:47 2004 +0000
@@ -1,35 +1,32 @@
-# $NetBSD: Makefile,v 1.15 2003/07/21 16:56:54 martti Exp $
+# $NetBSD: Makefile,v 1.16 2004/07/21 23:54:47 schmonz Exp $
 #
 
 DISTNAME=      qmail-conf-0.60
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    mail
 MASTER_SITES=  http://www.din.or.jp/~ushijima/qmail-conf/              \
                http://cr.yp.to/djbdns/                                 \
                ftp://cr.yp.to/djbdns/
 DISTFILES=     ${DISTNAME}${EXTRACT_SUFX} djbdns-1.05${EXTRACT_SUFX}
 
-MAINTAINER=    zuntum%NetBSD.org@localhost
-HOMEPAGE=      http://www.din.or.jp/~ushijima/qmail-conf/
+MAINTAINER=    schmonz%NetBSD.org@localhost
+HOMEPAGE=      http://www.din.or.jp/~ushijima/qmail-conf.html
 COMMENT=       Collection of tools for setting up qmail services
 
-DEPENDS+=      qmail>=1.03nb1:../../mail/qmail
 DEPENDS+=      checkpassword-[0-9]*:../../sysutils/checkpassword
+DEPENDS+=      daemontools>=0.70:../../sysutils/daemontools
+DEPENDS+=      {qmail>=1.03nb7,netqmail>=1.05}:../../mail/qmail
+DEPENDS+=      ucspi-tcp>=0.86:../../net/ucspi-tcp
 
-ALL_TARGET=    #
+USE_BUILDLINK3=        yes
+
+ALL_TARGET=    it
 INSTALL_TARGET= setup check
 
-.include "../../mk/bsd.prefs.mk"
-
-NO_MTREE=      YES
-LOCALBASE=     /
-
-post-patch:
+do-configure:
        ${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
        ${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
-       # derive LOCALBASE from ${DIGEST}, because we have deliberately altered LOCALBASE
-       # and there's no easy way to guess what the real LOCALBASE is
-       ${ECHO} ${DIGEST} | ${SED} 's,/bin/digest,,' > ${WRKSRC}/conf-ucspi-tcp
+       ${ECHO} ${LOCALBASE} > ${WRKSRC}/conf-ucspi-tcp
        ${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
 
 pre-build:
diff -r 46a43339a78c -r e486a40f1b5e mail/qmail-conf/PLIST
--- a/mail/qmail-conf/PLIST     Wed Jul 21 23:49:36 2004 +0000
+++ b/mail/qmail-conf/PLIST     Wed Jul 21 23:54:47 2004 +0000
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/21 18:51:30 zuntum Exp $
-${QMAILDIR}/bin/qmail-delivery-conf
-${QMAILDIR}/bin/qmail-pop3d-conf
-${QMAILDIR}/bin/qmail-qmqpd-conf
-${QMAILDIR}/bin/qmail-qmtpd-conf
-${QMAILDIR}/bin/qmail-smtpd-conf
+@comment $NetBSD: PLIST,v 1.3 2004/07/21 23:54:47 schmonz Exp $
+bin/qmail-delivery-conf
+bin/qmail-pop3d-conf
+bin/qmail-qmqpd-conf
+bin/qmail-qmtpd-conf
+bin/qmail-smtpd-conf