From b5711cc197a40c381dbce588b36096f2a6dc19d8 Mon Sep 17 00:00:00 2001
From: schmonz <schmonz@pkgsrc.org>
Date: Wed, 21 Jul 2004 23:54:47 +0000
Subject: 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.

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

(limited to 'mail')

diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile
index 61d84f3de8c..cafa16dd1f6 100644
--- a/mail/qmail-conf/Makefile
+++ b/mail/qmail-conf/Makefile
@@ -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
-HOMEPAGE=	http://www.din.or.jp/~ushijima/qmail-conf/
+MAINTAINER=	schmonz@NetBSD.org
+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=	#
-INSTALL_TARGET= setup check
-
-.include "../../mk/bsd.prefs.mk"
+USE_BUILDLINK3=	yes
 
-NO_MTREE=	YES
-LOCALBASE=	/
+ALL_TARGET=	it
+INSTALL_TARGET= setup check
 
-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 --git a/mail/qmail-conf/PLIST b/mail/qmail-conf/PLIST
index a2101737dab..6531ce27767 100644
--- a/mail/qmail-conf/PLIST
+++ b/mail/qmail-conf/PLIST
@@ -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
-- 
cgit v1.2.3