Adapt to new qmail scheme; bump PKGREVISION

3 files changed, 36 insertions, 29 deletions

diff --git a/mail/fastforward/MESSAGE b/mail/fastforward/MESSAGE
index c0467b7f9af..833c298338d 100644
--- a/mail/fastforward/MESSAGE
+++ b/mail/fastforward/MESSAGE
@@ -1,12 +1,12 @@
 ======================================================================
-$NetBSD: MESSAGE,v 1.1 2001/11/01 01:00:04 zuntum Exp $
+$NetBSD: MESSAGE,v 1.2 2002/01/21 19:00:38 zuntum Exp $
 
-Be sure to read the documentation in /var/qmail/doc/fastforward/ALIASES
+Be sure to read the documentation in ${QMAILDIR}/doc/fastforward/ALIASES
 for setting up and using fastforward.
 
 Also, consider configuring /etc/mailer.conf with the following contents:
 
-newaliases      ${LOCALBASE}/qmail/bin/newaliases
+newaliases      ${QMAILDIR}/bin/newaliases
 
 See mailer.conf(5) and mailwrapper(8) for details.
 
diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
index ebf962992ea..625ffc848fe 100644
--- a/mail/fastforward/Makefile
+++ b/mail/fastforward/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2002/01/16 07:19:07 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2002/01/21 19:00:38 zuntum Exp $
 #
 
 DISTNAME=		fastforward-0.51
+PKGREVISION=		1
 CATEGORIES=		mail
 MASTER_SITES=		http://cr.yp.to/software/
 
@@ -9,11 +10,16 @@ MAINTAINER=		zuntum@netbsd.org
 HOMEPAGE=		http://cr.yp.to/fastforward.html
 COMMENT=		/etc/aliases support for qmail
 
-DEPENDS+=		qmail>=1.03:../../mail/qmail
+DEPENDS+=		qmail>=1.03nb1:../../mail/qmail
 
 ALL_TARGET=		it
 INSTALL_TARGET=		setup check
 
+.include "../../mk/bsd.prefs.mk"
+
+NO_MTREE=	YES
+LOCALBASE=	/
+
 RESTRICTED=		"unsure of djb's license"
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
@@ -21,5 +27,6 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 post-patch:
 	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	${ECHO} ${CC} ${STRIPFLAG} > ${WRKSRC}/conf-ld
+	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/fastforward/PLIST b/mail/fastforward/PLIST
index 88f0dd52af4..45bd5c7ace5 100644
--- a/mail/fastforward/PLIST
+++ b/mail/fastforward/PLIST
@@ -1,24 +1,24 @@
-@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:00:04 zuntum Exp $
-qmail/doc/fastforward/ALIASES
-qmail/bin/fastforward
-qmail/bin/printforward
-qmail/bin/setforward
-qmail/bin/newaliases
-qmail/bin/printmaillist
-qmail/bin/setmaillist
-qmail/bin/newinclude
-qmail/man/man1/fastforward.1
-qmail/man/man1/printforward.1
-qmail/man/man1/setforward.1
-qmail/man/man1/newaliases.1
-qmail/man/man1/printmaillist.1
-qmail/man/man1/setmaillist.1
-qmail/man/man1/newinclude.1
-qmail/man/cat1/fastforward.0
-qmail/man/cat1/printforward.0
-qmail/man/cat1/setforward.0
-qmail/man/cat1/newaliases.0
-qmail/man/cat1/printmaillist.0
-qmail/man/cat1/setmaillist.0
-qmail/man/cat1/newinclude.0
-@dirrm qmail/doc/fastforward
+@comment $NetBSD: PLIST,v 1.2 2002/01/21 19:00:39 zuntum Exp $
+${QMAILDIR}/doc/fastforward/ALIASES
+${QMAILDIR}/bin/fastforward
+${QMAILDIR}/bin/printforward
+${QMAILDIR}/bin/setforward
+${QMAILDIR}/bin/newaliases
+${QMAILDIR}/bin/printmaillist
+${QMAILDIR}/bin/setmaillist
+${QMAILDIR}/bin/newinclude
+${QMAILDIR}/man/man1/fastforward.1
+${QMAILDIR}/man/man1/printforward.1
+${QMAILDIR}/man/man1/setforward.1
+${QMAILDIR}/man/man1/newaliases.1
+${QMAILDIR}/man/man1/printmaillist.1
+${QMAILDIR}/man/man1/setmaillist.1
+${QMAILDIR}/man/man1/newinclude.1
+${QMAILDIR}/man/cat1/fastforward.0
+${QMAILDIR}/man/cat1/printforward.0
+${QMAILDIR}/man/cat1/setforward.0
+${QMAILDIR}/man/cat1/newaliases.0
+${QMAILDIR}/man/cat1/printmaillist.0
+${QMAILDIR}/man/cat1/setmaillist.0
+${QMAILDIR}/man/cat1/newinclude.0
+@dirrm ${QMAILDIR}/doc/fastforward