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, and conflicts with both postfix
and sendmail. Rename post-patch to do-configure. Add "install" and
"instcheck" to ALL_TARGET to build the installer at the end of the
build phase, rather than at the beginning of the install phase.
Remove notes at install and deinstall time about updating the
"newaliases" mailer.conf entry, as this entry is now included in
the qmail package's example mailer.conf. Clarify RESTRICTED. Take
MAINTAINER. Bump PKGREVISION.

4 files changed, 38 insertions, 67 deletions

diff --git a/mail/fastforward/DEINSTALL b/mail/fastforward/DEINSTALL
deleted file mode 100644
index 766a8e0c449..00000000000
--- a/mail/fastforward/DEINSTALL
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# $NetBSD: DEINSTALL,v 1.2 2003/08/30 20:22:56 jlam Exp $
-
-PKGNAME=$1
-STAGE=$2
-
-case ${STAGE} in
-POST-DEINSTALL)
-	cat << EOF
-===========================================================================
-
-Please check the contents of /etc/mailer.conf and make sure there
-is an appropriate value defined for newaliases.
-
-"See mailer.conf(5) and mailwrapper(8) for details."
-
-===========================================================================
-EOF
-	;;
-esac
diff --git a/mail/fastforward/MESSAGE b/mail/fastforward/MESSAGE
index 2a08eef3cee..e32512f8e34 100644
--- a/mail/fastforward/MESSAGE
+++ b/mail/fastforward/MESSAGE
@@ -1,13 +1,8 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.3 2002/09/24 12:30:11 wiz Exp $
+$NetBSD: MESSAGE,v 1.4 2004/07/21 23:31:24 schmonz Exp $
 
-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      ${QMAILDIR}/bin/newaliases
-
-See mailer.conf(5) and mailwrapper(8) for details.
+Be sure to read the documentation in
+${PREFIX}/share/doc/qmail/fastforward/ALIASES for setting up and
+using fastforward.
 
 ===========================================================================
diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
index 6c062d1266c..27dbf9d5c67 100644
--- a/mail/fastforward/Makefile
+++ b/mail/fastforward/Makefile
@@ -1,30 +1,27 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:46:03 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/21 23:31:24 schmonz Exp $
 #
 
 DISTNAME=		fastforward-0.51
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		mail
 MASTER_SITES=		http://cr.yp.to/software/
 
-MAINTAINER=		zuntum@NetBSD.org
+MAINTAINER=		schmonz@NetBSD.org
 HOMEPAGE=		http://cr.yp.to/fastforward.html
-COMMENT=		/etc/aliases support for qmail
+COMMENT=		Sendmail-style /etc/aliases support for qmail
 
-DEPENDS+=		qmail>=1.03nb1:../../mail/qmail
+DEPENDS+=		{qmail>=1.03nb7,netqmail>=1.05}:../../mail/qmail
 
-ALL_TARGET=		it
-INSTALL_TARGET=		setup check
-
-.include "../../mk/bsd.prefs.mk"
+CONFLICTS+=		postfix-[0-9]* sendmail-[0-9]*
 
-NO_MTREE=	YES
-LOCALBASE=	/
+ALL_TARGET=		it install instcheck
+INSTALL_TARGET=		setup check
 
-RESTRICTED=		"unsure of djb's license"
+RESTRICTED=		"modified source and binaries may not be distributed"
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
-post-patch:
+do-configure:
 	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
 	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
diff --git a/mail/fastforward/PLIST b/mail/fastforward/PLIST
index 45bd5c7ace5..234e22d800d 100644
--- a/mail/fastforward/PLIST
+++ b/mail/fastforward/PLIST
@@ -1,24 +1,24 @@
-@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
+@comment $NetBSD: PLIST,v 1.3 2004/07/21 23:31:24 schmonz Exp $
+share/doc/qmail/fastforward/ALIASES
+bin/fastforward
+bin/printforward
+bin/setforward
+bin/newaliases
+bin/printmaillist
+bin/setmaillist
+bin/newinclude
+man/man1/fastforward.1
+man/man1/printforward.1
+man/man1/setforward.1
+man/man1/newaliases.1
+man/man1/printmaillist.1
+man/man1/setmaillist.1
+man/man1/newinclude.1
+man/cat1/fastforward.0
+man/cat1/printforward.0
+man/cat1/setforward.0
+man/cat1/newaliases.0
+man/cat1/printmaillist.0
+man/cat1/setmaillist.0
+man/cat1/newinclude.0
+@dirrm share/doc/qmail/fastforward