Instead of including bsd.pkg.install.mk directly in a package Makefile,

have it be automatically included by bsd.pkg.mk if USE_PKGINSTALL is set
to "YES".  This enforces the requirement that bsd.pkg.install.mk be
included at the end of a package Makefile.  Idea suggested by Julio M.
Merino Vidal <jmmv at menta.net>.

30 files changed, 73 insertions, 72 deletions

diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile
index 32f00b3ee08..92c6c61bc99 100644
--- a/mail/courier-auth/Makefile
+++ b/mail/courier-auth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/10/08 23:15:58 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2003/01/28 22:03:28 jlam Exp $
 
 PKGNAME=	courier-auth-${BASE_VERS}
 PKGREVISION?=	1
@@ -9,6 +9,7 @@ CONFLICTS=	courier-imap<=1.4.0
 CONFLICTS+=	courier-imap-ldap-*
 
 USE_PERL5=		yes
+USE_PKGINSTALL=		yes
 REPLACE_PERL=		sysconftool
 
 .include "../../mail/courier-auth/Makefile.authdaemond"
@@ -37,5 +38,4 @@ post-install:
 		${RM} -f ${PKG_SYSCONFDIR}/$${file};			\
 	done
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-authldap/Makefile b/mail/courier-authldap/Makefile
index e08aab18fa9..3cb2f1bc440 100644
--- a/mail/courier-authldap/Makefile
+++ b/mail/courier-authldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/10/08 23:15:59 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:28 jlam Exp $
 
 PKGNAME=		courier-authldap-${BASE_VERS}
 PKGREVISION?=		# empty
@@ -10,6 +10,7 @@ DEPENDS+=		courier-auth>=${BASE_VERS}:../../mail/courier-auth
 
 .include "../../mail/courier-auth/Makefile.authdaemond"
 
+USE_PKGINSTALL=		yes
 CONFIGURE_ARGS+=	--with-authldap
 
 GEN_FILES=		authldaprc
@@ -28,5 +29,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/authlib/authldaprc ${EGDIR}/authldaprc.dist
 
 .include "../../databases/openldap/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-authmysql/Makefile b/mail/courier-authmysql/Makefile
index b64914ebbfc..7e3383b3feb 100644
--- a/mail/courier-authmysql/Makefile
+++ b/mail/courier-authmysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/10/08 23:15:59 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:29 jlam Exp $
 
 PKGNAME=		courier-authmysql-${BASE_VERS}
 PKGREVISION?=		# empty
@@ -8,6 +8,7 @@ DEPENDS+=		courier-auth>=${BASE_VERS}:../../mail/courier-auth
 
 .include "../../mail/courier-auth/Makefile.authdaemond"
 
+USE_PKGINSTALL=		yes
 CONFIGURE_ARGS+=	--with-authmysql
 LDFLAGS+=		${BUILDLINK_LDFLAGS.mysql-client}
 
@@ -29,5 +30,4 @@ do-install:
 		${PREFIX}/share/doc/html/courier
 
 .include "../../databases/mysql-client/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-authpgsql/Makefile b/mail/courier-authpgsql/Makefile
index bd053be1010..7360e550f92 100644
--- a/mail/courier-authpgsql/Makefile
+++ b/mail/courier-authpgsql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/01/05 20:14:30 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2003/01/28 22:03:29 jlam Exp $
 
 PKGNAME=		courier-authpgsql-${BASE_VERS}
 PKGREVISION=		1
@@ -8,6 +8,7 @@ DEPENDS+=		courier-auth>=${BASE_VERS}:../../mail/courier-auth
 
 .include "../../mail/courier-auth/Makefile.authdaemond"
 
+USE_PKGINSTALL=		yes
 CONFIGURE_ARGS+=	--with-authpgsql
 CONFIGURE_ARGS+=	--with-pgsql-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
 CONFIGURE_ARGS+=	--with-pgsql-libs=${BUILDLINK_PREFIX.postgresql-lib}/lib
@@ -37,5 +38,4 @@ do-install:
 		${PREFIX}/share/doc/html/courier
 
 .include "../../databases/postgresql-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index b68c3121a52..f34b0e768c7 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2002/10/08 23:16:00 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2003/01/28 22:03:29 jlam Exp $
 
 DISTNAME=	courier-imap-1.4.2
 PKGREVISION=	1
@@ -8,6 +8,7 @@ HOMEPAGE=	http://www.inter7.com/courierimap/
 DEPENDS+=	courier-auth>=0.37.1:../../mail/courier-auth
 DEPENDS+=	courier-maildirmake>=0.37.1nb1:../../mail/courier-maildirmake
 
+USE_PKGINSTALL=		yes
 USE_PERL5=		yes
 REPLACE_PERL=		sysconftool
 
@@ -68,5 +69,4 @@ post-install:
 	cd ${WRKSRC}; ${INSTALL_DATA} imap/imapd.pam imap/pop3d.pam ${EGDIR}
 
 .include "../../security/openssl/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/courier-maildirmake/Makefile b/mail/courier-maildirmake/Makefile
index 6eb505eb4d0..42376bb0ae6 100644
--- a/mail/courier-maildirmake/Makefile
+++ b/mail/courier-maildirmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/11/15 00:04:08 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:30 jlam Exp $
 
 PKGNAME=	courier-maildirmake-${BASE_VERS}
 PKGREVISION?=	1
@@ -6,6 +6,7 @@ COMMENT=	Courier Maildir utilities
 
 PERL5_REQD=	5.6.0
 USE_PERL5=	build
+USE_PKGINSTALL=	yes
 
 REPLACE_PERL=		sysconftool
 
@@ -40,5 +41,4 @@ post-install:
 		${DOCDIR}/README.sharedfolders
 
 .include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 27c26b3b404..abd9cefe18e 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2002/12/06 12:53:51 chris Exp $
+# $NetBSD: Makefile,v 1.38 2003/01/28 22:03:30 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.0.17
 SVR4_PKGNAME=		cimap
@@ -11,6 +11,7 @@ HOMEPAGE=		http://asg.web.cmu.edu/cyrus/imapd/
 COMMENT=		Cyrus IMAP server
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 PERL5_CONFIGURE=	NO
 AUTOCONF_REQD=		2.13
@@ -115,6 +116,6 @@ post-install:
 .include "../../security/cyrus-sasl/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 .include "../../security/tcp_wrappers/buildlink2.mk"
+
 .include "../../mk/autoconf.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index 85632ab92ce..f97c1baaca5 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/12/08 00:39:42 chris Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:31 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.1.11
 SVR4_PKGNAME=		cimap
@@ -11,6 +11,7 @@ HOMEPAGE=		http://asg.web.cmu.edu/cyrus/imapd/
 COMMENT=		Cyrus IMAP server
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 PERL5_CONFIGURE=	NO
 AUTOCONF_REQD=		2.13
@@ -128,6 +129,6 @@ post-install:
 .include "../../security/cyrus-sasl2/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 .include "../../security/tcp_wrappers/buildlink2.mk"
+
 .include "../../mk/autoconf.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
index 98c8ba7ef0f..8b8cbeabdf4 100644
--- a/mail/demime/Makefile
+++ b/mail/demime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2002/11/15 01:39:28 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2003/01/28 22:03:32 jlam Exp $
 #
 
 DISTNAME=	demime-0.99d.1
@@ -20,6 +20,7 @@ DEPENDS+=       p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
 DIST_SUBDIR=	${PKGNAME}
 NO_BUILD=	YES
 USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
 
 POD2MAN?=	${BUILDLINK_PREFIX.perl}/bin/pod2man
 
@@ -42,5 +43,4 @@ do-install:
 	${INSTALL_MAN} ${WRKSRC}/demime.1 ${PREFIX}/man/man1/demime.1
 
 .include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index 2224d1bd1db..8e973112cc4 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2002/12/24 09:04:12 kim Exp $
+# $NetBSD: Makefile,v 1.8 2003/01/28 22:03:32 jlam Exp $
 # FreeBSD: Makefile,v 1.42 1997/12/24 01:21:07 alex Exp
 #
 
@@ -16,6 +16,7 @@ COMMENT=		ELM Mail User Agent with ME extensions
 CONFLICTS=		elm-[0-9]*
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	ksh ./Configure
 CONFIGURE_ENV=		PREFIX="${PREFIX}" RUN_AS_BATCH=yes
@@ -43,5 +44,4 @@ post-configure:
 	${TOUCH} ${WRKSRC}/*/Makefile
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 72bfe7e4a8f..abeb2dbff58 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2002/02/01 22:44:27 bouyer Exp $
+# $NetBSD: Makefile,v 1.18 2003/01/28 22:03:33 jlam Exp $
 
 DISTNAME=	imp-3.0
 CATEGORIES=	mail www
@@ -21,6 +21,7 @@ MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
+USE_PKGINSTALL=		yes
 PKG_SYSCONFSUBDIR?=	httpd
 
 CONF_FILES=	${EGDIR}/imp.conf ${PKG_SYSCONFDIR}/imp.conf
@@ -66,5 +67,4 @@ do-install:
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${IMPDIR}
 	${CHMOD} -R a-w ${IMPDIR}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index ebb961bb5f1..a0cadff48f6 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/09/21 23:46:53 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:34 jlam Exp $
 
 DISTNAME=	mailman-2.0.12
 CATEGORIES=	mail www
@@ -11,6 +11,7 @@ COMMENT=	the GNU Mailing List Manager
 
 .include "../../mk/bsd.prefs.mk"
 
+USE_PKGINSTALL=		yes
 PKG_SYSCONFSUBDIR?=	httpd
 MESSAGE_SUBST+=		PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 MESSAGE_SUBST+=		DOCDIR=${DOCDIR}
@@ -146,5 +147,4 @@ do-install:
 	${CHMOD} -R g-w ${EXECDIR}
 
 .include "../../lang/python/application.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 6ca3288762e..c1c0b4c90bc 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/10/30 09:50:24 markd Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:34 jlam Exp $
 
 DISTNAME=		mimedefang-2.24
 CATEGORIES=		mail
@@ -18,6 +18,7 @@ DEPENDS+=		p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools
 DEPENDS+=		spamassassin>=2.31:../../mail/spamassassin
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 USE_PERL5=		YES
 GNU_CONFIGURE=		YES
 PKG_SYSCONFSUBDIR?=	mimedefang
@@ -71,5 +72,4 @@ do-install:
 
 .include "../../mail/libmilter/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index cffec6538d9..376ba4ba912 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2002/12/03 21:21:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.91 2003/01/28 22:03:34 jlam Exp $
 
 DISTNAME=		mutt-1.4i
 PKGNAME=		${DISTNAME:C/i$//}
@@ -13,12 +13,13 @@ MAINTAINER=		tron@netbsd.org
 HOMEPAGE=		http://www.mutt.org/
 COMMENT=		text-based MIME mail client with PGP support
 
-BUILD_USES_MSGFMT=	# defined
+BUILD_USES_MSGFMT=	yes
 
-USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
-GNU_CONFIGURE=		# defined
-USE_PKGLOCALEDIR=	# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
+USE_GMAKE=		yes
+GNU_CONFIGURE=		yes
+USE_PKGLOCALEDIR=	yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR} \
 			--with-docdir=${PREFIX}/share/doc/mutt \
 			--without-included-gettext \
@@ -34,7 +35,7 @@ WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
 CONFIGURE_ARGS+=	--with-slang=${BUILDLINK_PREFIX.libslang}
 .else
 . if ${MUTT_USE_NCURSES} == YES
-USE_NCURSES=		# defined
+USE_NCURSES=		yes
 . endif
 . include "../../devel/ncurses/buildlink2.mk"
 CONFIGURE_ARGS+=	--with-curses=${BUILDLINK_PREFIX.ncurses}
@@ -77,5 +78,4 @@ post-install:
 .include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index aa34ccf482d..e6d1c5faeb5 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/01/19 18:10:32 cjep Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:35 jlam Exp $
 
 DISTNAME=	nail-10.4
 CATEGORIES=	mail
@@ -9,6 +9,7 @@ HOMEPAGE=	http://omnibus.ruf.uni-freiburg.de/~gritter/
 COMMENT=	BSD mail utility with MIME extensions
 
 USE_BUILDLINK2=	yes
+USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-rcfile=${PKG_SYSCONFDIR}/nail.rc
 
@@ -22,5 +23,4 @@ do-install:
 		${INSTALL_DATA_DIR} ${EGDIR}
 		${INSTALL_DATA} ${WRKSRC}/nail.rc ${EGDIR}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index 231e40514c0..6ca807d5fd8 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/01/21 15:43:00 heinz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:35 jlam Exp $
 
 DISTNAME=		nullmailer-1.00RC5
 CATEGORIES=		mail
@@ -8,6 +8,7 @@ MAINTAINER=		packages@netbsd.org
 HOMEPAGE=		http://untroubled.org/nullmailer/
 COMMENT=		Simple relay-only mail transport agent
 
+USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+= 	--sysconfdir=${PKG_SYSCONFDIR} --localstatedir=/var
 
@@ -39,5 +40,4 @@ post-install:
 	cd ${WRKSRC} && ${INSTALL_DATA} AUTHORS BUGS COPYING ChangeLog	\
 		HOWTO NEWS README TODO ${PREFIX}/share/doc/nullmailer
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index f088c6bc18e..c0349e2c702 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2002/11/07 03:48:00 dillo Exp $
+# $NetBSD: Makefile,v 1.25 2003/01/28 22:03:36 jlam Exp $
 #
 
 DISTNAME=	popa3d-0.5.9
@@ -19,6 +19,7 @@ PKG_GROUPS=	${POPA3D_GROUP}
 PKG_USERS=	${POPA3D_USER}:${POPA3D_GROUP}
 
 USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
 
 RCD_SCRIPTS=	popa3d
 
@@ -40,5 +41,4 @@ do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/empty
 
 .include "../../security/tcp_wrappers/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index 6839d10d0dc..f22a22507cf 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.77 2003/01/26 13:20:08 taca Exp $
+# $NetBSD: Makefile,v 1.78 2003/01/28 22:03:36 jlam Exp $
 
 DISTNAME=	postfix-2.0.3
 CATEGORIES=	mail
@@ -13,6 +13,7 @@ DIST_SUBDIR=	postfix
 POSTFIX_SPOOL=	/var/spool/postfix
 
 USE_BUILDLINK2=	yes
+USE_PKGINSTALL=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -171,5 +172,4 @@ post-install:
 	${TEST} -f /etc/postfix/master.cf || \
 		${INSTALL_DATA} ${PREFIX}/share/postfix/master.cf /etc/postfix
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 4280bfcbeb9..91564464176 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/01/04 21:54:31 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:37 jlam Exp $
 #
 
 DISTNAME=	prayer-1.0.5
@@ -12,6 +12,7 @@ COMMENT=	Small, fast, web mail interface
 PKG_GROUPS=	prayer
 
 USE_BUILDLINK2=	YES
+USE_PKGINSTALL=	YES
 USE_GMAKE=	YES
 USE_PERL5=	build
 
@@ -21,5 +22,4 @@ USE_PERL5=	build
 .include "../../mail/imap-uw/buildlink2.mk"
 .include "../../security/openssl/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmail-users/Makefile b/mail/qmail-users/Makefile
index 48eaae318fa..cc26f107332 100644
--- a/mail/qmail-users/Makefile
+++ b/mail/qmail-users/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2002/01/28 17:51:11 zuntum Exp $
+# $NetBSD: Makefile,v 1.4 2003/01/28 22:03:37 jlam Exp $
 #
 
 DISTNAME=	qmail-users-1.0
@@ -22,10 +22,10 @@ PKG_USERS+=	qmails:qmail::qmails:${QMAILDIR}
 
 NO_BUILD=	YES
 NO_CHECKSUM=	YES
+USE_PKGINSTALL=	YES
 
 WRKSRC=		${WRKDIR}
 
 do-install:	# empty
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 3865574aa46..ae785863ad4 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2002/09/19 09:04:12 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2003/01/28 22:03:38 jlam Exp $
 #
 
 DISTNAME=	qmail-1.03
@@ -26,6 +26,7 @@ NO_BIN_ON_FTP=		${RESTRICTED}
 
 NO_PACKAGE=		"needs work to function properly as a binary package"
 
+USE_PKGINSTALL=		yes
 OWN_DIRS+=		${QMAILDIR}
 
 FILES_SUBST+=		QMAILDIR=${QMAILDIR}
@@ -54,5 +55,4 @@ post-install:
 	cd ${QMAILDIR}/alias && 					\
 		${TOUCH} .qmail-postmaster .qmail-mailer-daemon .qmail-root
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 09057913307..4c5ac05228d 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2002/11/23 17:01:20 taca Exp $
+# $NetBSD: Makefile,v 1.36 2003/01/28 22:03:38 jlam Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -17,7 +17,8 @@ COMMENT=		Qualcomm's POP server for Eudora
 
 .include "Makefile.common"
 
-USE_BUILDLINK2=		# defined
+USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 
 PKG_USERS?=		${QPOPPER_USER}
@@ -35,6 +36,4 @@ post-install:
 		 ${PREFIX}/share/examples
 
 .include "../../security/openssl/buildlink2.mk"
-
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index cd6b87d1c1c..2d2c18c35aa 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2002/10/03 10:09:03 markd Exp $
+# $NetBSD: Makefile,v 1.55 2003/01/28 22:03:39 jlam Exp $
 
 .include "../../mail/sendmail/Makefile.common"
 
@@ -89,10 +89,10 @@ post-install:
 	${MV} -f /usr/sbin/makemap /usr/sbin/makemap.8.8 || ${TRUE}
 .endif
 
+USE_PKGINSTALL=	yes
 PKG_GROUPS=	smmsp
 PKG_USERS=	smmsp:smmsp::Sendmail\\ Message\\ Submission\\ Program
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
 
 # has to be below include for bsd.pkg.mk, else substition fails
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 73b681e1396..57702c44365 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2002/11/06 21:51:26 heinz Exp $
+# $NetBSD: Makefile,v 1.15 2003/01/28 22:03:39 jlam Exp $
 
 DISTNAME=	Mail-SpamAssassin-2.43
 PKGNAME=	spamassassin-2.43
@@ -20,6 +20,7 @@ DEPENDS+=	p5-MIME-Base64>=2.11:../../converters/p5-MIME-Base64
 
 BUILDLINK_DEPENDS.perl=	perl>=5.6.0
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 
 CONFLICTS=		p5-Mail-SpamAssassin-[1-9]*
 
@@ -116,5 +117,4 @@ post-install:
 	${CHGRP} ${SHAREGRP} ${RULESDIR}/*
 
 .include "../../lang/perl5/module.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index c57a179f694..81bb481b448 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2002/12/03 06:37:15 martti Exp $
+# $NetBSD: Makefile,v 1.30 2003/01/28 22:03:40 jlam Exp $
 
 DISTNAME=	squirrelmail-1.2.10
 CATEGORIES=	mail www
@@ -17,8 +17,9 @@ DEPENDS+=	php-gettext>=4.0.6:../../devel/php4-gettext
 DEPENDS+=	php-session>=4.0.6:../../devel/php4-session
 DEPENDS+=	php-pcre>=4.0.6:../../devel/php4-pcre
 
-USE_BUILDLINK2=	# defined
-NO_BUILD=	# defined
+USE_BUILDLINK2=	yes
+USE_PKGINSTALL=	yes
+NO_BUILD=	yes
 REPLACE_PERL=	config/conf.pl config/ri_once.pl
 
 .include "../../mk/bsd.prefs.mk"
@@ -68,5 +69,4 @@ do-install:
 	${CHMOD} -R a-w ${SMDIR}
 
 .include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 00a553b563d..e3874793725 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2002/10/08 23:16:01 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2003/01/28 22:03:40 jlam Exp $
 
 DISTNAME=	sqwebmail-3.3.1
 CATEGORIES=	www
@@ -9,6 +9,7 @@ DEPENDS+=	courier-auth>=0.37.1nb1:../../mail/courier-auth
 DEPENDS+=	courier-maildirmake>=0.37.1nb1:../../mail/courier-maildirmake
 
 USE_PERL5=		yes
+USE_PKGINSTALL=		yes
 REPLACE_PERL=		sysconftool
 
 .include "../../mail/courier-auth/Makefile.common"
@@ -87,5 +88,4 @@ post-install:
 	cd ${WRKSRC}/sqwebmail; ${INSTALL_DATA} BUGS.html SECURITY.html	\
 		${HTMLDIR}/sqwebmail
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index a50cedeaa96..0e86fb8f7ce 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2002/12/30 18:45:57 chris Exp $
+# $NetBSD: Makefile,v 1.13 2003/01/28 22:03:41 jlam Exp $
 
 DISTNAME=	sylpheed-0.8.8claws
 PKGNAME=	sylpheed-claws-0.8.8
@@ -16,6 +16,7 @@ BUILD_USES_MSGFMT=	yes
 CONFLICTS=	sylpheed-[0-9]*
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11BASE=		yes
 USE_GMAKE=		yes
@@ -65,5 +66,4 @@ post-install:
 .include "../../security/openssl/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 79dfeb2c114..9893843e28c 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/01/19 23:08:19 chris Exp $
+# $NetBSD: Makefile,v 1.32 2003/01/28 22:03:41 jlam Exp $
 
 DISTNAME=	sylpheed-0.8.9
 CATEGORIES=	mail news x11
@@ -14,6 +14,7 @@ BUILD_USES_MSGFMT=	yes
 CONFLICTS=	sylpheed-claws-[0-9]*
 
 USE_BUILDLINK2=		yes
+USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11BASE=		yes
 USE_GMAKE=		yes
@@ -61,5 +62,4 @@ post-install:
 .include "../../security/openssl/buildlink2.mk"
 .include "../../x11/gtk/buildlink2.mk"
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 8043ad39cd8..9827dbe327e 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/01/28 09:40:15 uebayasi Exp $
+# $NetBSD: Makefile,v 1.3 2003/01/28 22:03:42 jlam Exp $
 #
 
 DISTNAME=	sympa-3.4.2
@@ -23,8 +23,9 @@ DEPENDS+=	p5-DBD-mysql>=2.0407:../../databases/p5-DBD-mysql
 DEPENDS+=	p5-DBD-postgresql>=0.90:../../databases/p5-DBD-postgresql
 DEPENDS+=	p5-perl-ldap>=0.10:../../databases/p5-perl-ldap
 
-USE_BUILDLINK2=	YES
-GNU_CONFIGURE=	YES
+USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
+GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-piddir=/var/run
 
 PERL5_REQD=	5.005
@@ -37,7 +38,6 @@ post-install:
 	${CHMOD} ug-s ${PREFIX}/bin/wwsympa.fcgi
 
 .include "../../lang/perl5/buildlink2.mk"
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"
 
 PREFIX=	${LOCALBASE}/sympa
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index 395bd567e96..fe65cdb11d4 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/01/19 13:04:48 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/01/28 22:03:42 jlam Exp $
 
 DISTNAME=	teapop-0.3.5
 CATEGORIES=	mail
@@ -10,6 +10,7 @@ HOMEPAGE=	http://www.toontown.org/teapop/
 COMMENT=	Yet another RFC1939 compliant POP3 server
 
 USE_BUILDLINK2=		YES
+USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--enable-flock
@@ -46,5 +47,4 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/teapop.passwd ${EGDIR}
 
-.include "../../mk/bsd.pkg.install.mk"
 .include "../../mk/bsd.pkg.mk"