Remove USE_PKGINSTALL from pkgsrc now that mk/install/pkginstall.mk

automatically detects whether we want the pkginstall machinery to be
used by the package Makefile.

72 files changed, 72 insertions, 144 deletions

diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index 5edc6f89fc1..9c52196ae3c 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/12/05 20:50:28 rillig Exp $
+# $NetBSD: Makefile,v 1.45 2005/12/29 06:21:47 jlam Exp $
 
 DISTNAME=	balsa-2.2.6
 PKGREVISION=	2
@@ -14,7 +14,6 @@ COMMENT=	GNOME2 EMail client
 BUILD_USES_MSGFMT=	yes
 
 USE_DIRS+=		gnome2-1.5
-USE_PKGINSTALL=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index f30ccc86569..c44f126bee4 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/12/05 23:55:10 rillig Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/29 06:21:47 jlam Exp $
 
 DISTNAME=	bogofilter-0.96.6
 CATEGORIES=	mail
@@ -12,7 +12,6 @@ COMMENT=	Bayesian spam filter written in C
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	YES
-USE_PKGINSTALL=	YES
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile
index 7d9d9da4a6a..07179d281f6 100644
--- a/mail/clamav/Makefile
+++ b/mail/clamav/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/12/05 23:55:10 rillig Exp $
+# $NetBSD: Makefile,v 1.50 2005/12/29 06:21:47 jlam Exp $
 
 DISTNAME=	clamav-${CLAMAV_VERSION}
 PKGNAME=	clamav-${CLAMAV_VERSION:S/-/./}
@@ -30,7 +30,6 @@ BUILD_DEFS+=	CLAMAV_USER CLAMAV_GROUP
 FILES_SUBST+=	CLAMAV_USER=${CLAMAV_USER:Q}
 MESSAGE_SUBST+=	CLAMAV_USER=${CLAMAV_USER}
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
 
 RCD_SCRIPTS=	clamd freshclamd
diff --git a/mail/clamsmtp/Makefile b/mail/clamsmtp/Makefile
index 39eff47c9db..6bdc440d391 100644
--- a/mail/clamsmtp/Makefile
+++ b/mail/clamsmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:28 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/29 06:21:47 jlam Exp $
 
 DISTNAME=		clamsmtp-1.6
 CATEGORIES=		mail
@@ -11,7 +11,6 @@ COMMENT=		SMTP filter that allows you to check for viruses
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
-USE_PKGINSTALL=		yes
 RCD_SCRIPTS=		clamsmtpd
 
 MESSAGE_SUBST+=		HOMEPAGE=${HOMEPAGE}
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 24d7e25104c..4a501a10cf6 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/12/17 05:20:22 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2005/12/29 06:21:47 jlam Exp $
 
 DISTNAME=	courier-imap-4.0.6
 CATEGORIES=	mail
@@ -35,7 +35,6 @@ SSLCNF_FILES=		imapd.cnf pop3d.cnf
 FILES_SUBST+=		SSLCERTS=${SSLCERTS:Q}
 FILES_SUBST+=		GEN_FILES=${GEN_FILES:Q}
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 MAKE_DIRS=		${VARBASE}/run
 CONF_FILES_PERMS=	# empty
diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile
index 7b41cd6e4e2..79ba57e2758 100644
--- a/mail/courier-maildir/Makefile
+++ b/mail/courier-maildir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/17 05:20:22 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 06:21:48 jlam Exp $
 
 DISTNAME=	courier-0.52.1
 PKGNAME=	${DISTNAME:S/-/-maildir-/}
@@ -40,7 +40,6 @@ EXTRACT_ELEMENTS+=	${WRKSRC_SUBDIRS:S/^/${DISTNAME}\//}
 BUILD_DIRS=		${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
 INSTALLATION_DIRS=	bin man/man1 man/man5 man/man5 man/man7 man/man8 sbin
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${PKGDIR}/DEINSTALL
 OWN_DIRS=		${PKG_SYSCONFDIR}/shared
 OWN_DIRS+=		${PKG_SYSCONFDIR}/shared.tmp
diff --git a/mail/cucipop/Makefile b/mail/cucipop/Makefile
index 7a21d713931..b5e0c97df63 100644
--- a/mail/cucipop/Makefile
+++ b/mail/cucipop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:29 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/29 06:21:48 jlam Exp $
 #
 
 DISTNAME=	cucipop-1.31
@@ -13,7 +13,6 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	tech-pkg@NetBSD.org
 COMMENT=	The Cubic Circle POP3 mail server
 
-USE_PKGINSTALL=	YES
 
 LICENSE=	cucipop-license
 
diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index cee91ae037e..b0477c3686b 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/12/05 23:55:10 rillig Exp $
+# $NetBSD: Makefile,v 1.59 2005/12/29 06:21:48 jlam Exp $
 
 DISTNAME=	cyrus-imapd-2.2.12
 PKGREVISION=	2
@@ -15,7 +15,6 @@ GNU_CONFIGURE=		yes
 PERL5_CONFIGURE=	no
 BDB_ACCEPTED=		db4 db3
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
index d93daa7b9b0..be1cdf3cf63 100644
--- a/mail/cyrus-imapd21/Makefile
+++ b/mail/cyrus-imapd21/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/12/05 23:55:10 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/29 06:21:48 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.1.18
 SVR4_PKGNAME=		cimap
@@ -17,7 +17,6 @@ GNU_CONFIGURE=		yes
 PERL5_CONFIGURE=	no
 USE_TOOLS+=		autoconf213
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 295c4c0ea64..94aca8715fc 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:29 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/29 06:21:48 jlam Exp $
 #
 
 DISTNAME=		dbmail-2.0.1
@@ -14,7 +14,6 @@ COMMENT=		Store and retrieve mail messages in a database
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
-USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 
 EGDIR=			${PREFIX}/share/examples/dbmail
diff --git a/mail/demime/Makefile b/mail/demime/Makefile
index 43c046bfa6c..c9a2b57ef72 100644
--- a/mail/demime/Makefile
+++ b/mail/demime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/26 20:04:24 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/29 06:21:48 jlam Exp $
 #
 
 DISTNAME=	demime-1.1d
@@ -20,7 +20,6 @@ DEPENDS+=       p5-HTML-Tree-[0-9]*:../../www/p5-HTML-Tree
 
 DIST_SUBDIR=	${PKGNAME_NOREV}
 USE_TOOLS+=	perl:run pod2man
-USE_PKGINSTALL=	YES
 
 EGDIR=		${PREFIX}/share/examples
 CONF_FILES=	${EGDIR}/demime_junkmail.cf ${PKG_SYSCONFDIR}/demime_junkmail.cf
diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index f89dcf8beae..fe2dd979b36 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:29 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/29 06:21:48 jlam Exp $
 
 DISTNAME=	dk-milter-0.3.0
 PKGREVISION=	1
@@ -16,7 +16,6 @@ MAKE_ENV+=		M4=${M4:Q}
 RCD_SCRIPTS=		dk-milter
 USE_BUILTIN.libmilter=	no
 USE_TOOLS+=		gm4
-USE_PKGINSTALL=		YES
 
 SUBST_CLASSES+=		libs
 SUBST_STAGE.libs=	pre-configure
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 96d5eee0d3d..56854507fa6 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:29 rillig Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/29 06:21:48 jlam Exp $
 
 DISTNAME=	dkim-milter-0.1.1
 CATEGORIES=	mail
@@ -15,7 +15,6 @@ MAKE_ENV+=		M4=${M4:Q}
 RCD_SCRIPTS=		dkim-milter
 USE_BUILTIN.libmilter=	no
 USE_TOOLS+=		gm4
-USE_PKGINSTALL=		YES
 
 SUBST_CLASSES+=		libs
 SUBST_STAGE.libs=	pre-configure
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 63823394da4..caf52b5c59f 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/12/05 23:55:10 rillig Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/29 06:21:48 jlam Exp $
 
 DISTNAME=		dovecot-0.99.14
 PKGREVISION=		1
@@ -13,7 +13,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S/.1$//}
 USE_LIBTOOL=		yes
-USE_PKGINSTALL= 	yes
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 0013c2baf9c..b17b4ddd560 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/12/05 23:55:10 rillig Exp $
+# $NetBSD: Makefile,v 1.44 2005/12/29 06:21:48 jlam Exp $
 
 DISTNAME=	dspam-3.6.2
 CATEGORIES=	mail
@@ -74,7 +74,6 @@ DOCDIR=		${PREFIX}/share/doc/dspam
 DATADIR=	${PREFIX}/share/dspam
 EGDIR=		${PREFIX}/share/examples/dspam
 
-USE_PKGINSTALL=		yes
 RCD_SCRIPTS=		dspam
 
 PKG_SYSCONFSUBDIR=	dspam
diff --git a/mail/elm-me/Makefile b/mail/elm-me/Makefile
index b7eee4f2490..dd297effbd5 100644
--- a/mail/elm-me/Makefile
+++ b/mail/elm-me/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:29 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/29 06:21:48 jlam Exp $
 
 DISTNAME=		elm-2.4ME+93
 PKGNAME=		elm-me-2.4.93
@@ -15,7 +15,6 @@ COMMENT=		ELM Mail User Agent with ME extensions
 CONFLICTS=		elm-[0-9]*
 
 WRKSRC=			${WRKDIR}/elm2.4.ME+.93
-USE_PKGINSTALL=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	ksh ./Configure
 CONFIGURE_ENV+=		PREFIX=${PREFIX:Q} RUN_AS_BATCH=yes
diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile
index a10092adc73..0da6c921adf 100644
--- a/mail/esmtp/Makefile
+++ b/mail/esmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/05 23:55:10 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/29 06:21:48 jlam Exp $
 #
 
 DISTNAME=	esmtp-0.5.1
@@ -12,7 +12,6 @@ HOMEPAGE=	http://esmtp.sourceforge.net/
 COMMENT=	Relay-only Mail Transfer Agent with sendmail-compatible syntax
 
 GNU_CONFIGURE=		yes
-USE_PKGINSTALL=		yes
 USE_TOOLS+=		bison flex
 PTHREAD_OPTS+=		require
 
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 67cd2a95534..3886c43655f 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2005/12/27 21:22:02 reed Exp $
+# $NetBSD: Makefile,v 1.73 2005/12/29 06:21:49 jlam Exp $
 
 DISTNAME=	exim-4.54
 PKGREVISION=	1
@@ -15,7 +15,6 @@ COMMENT=	The Exim mail transfer agent, a replacement for sendmail
 CONFLICTS+=	exim-exiscan-[0-9]*
 
 USE_TOOLS+=	perl:run
-USE_PKGINSTALL=	yes
 INSTALLATION_DIRS+=	${PKGMANDIR}/man8
 
 MAKE_ENV+=	SSLBASE=${SSLBASE:Q}
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index ed7998702fe..25722d66518 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:30 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/29 06:21:49 jlam Exp $
 
 DISTNAME=	exim-3.36
 PKGREVISION=	4
@@ -13,7 +13,6 @@ COMMENT=	The Exim mail transfer agent, a replacement for sendmail
 
 CONFLICTS+=	exim-exiscan-[0-9]*
 
-USE_PKGINSTALL=	YES
 
 BUILD_DEFS+=		EXIM_USER EXIM_GROUP
 BUILD_DEFS+=		EXIM_DB.mysql EXIM_DB.pgsql
diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile
index 74e6b39545f..938f56d6d42 100644
--- a/mail/ezmlm-idx/Makefile
+++ b/mail/ezmlm-idx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/09/02 01:08:48 schmonz Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/29 06:21:49 jlam Exp $
 #
 
 .include "../../mail/ezmlm/Makefile.common"
@@ -20,7 +20,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 # ezmlm-idx is a modification of the ezmlm source.
 DJB_RESTRICTED=		YES
 
-USE_PKGINSTALL=		YES
 
 PKG_SYSCONFSUBDIR=	ezmlm
 CFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 345af5012d3..ea54552728d 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.155 2005/12/20 14:27:53 frueauf Exp $
+# $NetBSD: Makefile,v 1.156 2005/12/29 06:21:50 jlam Exp $
 
 DISTNAME=	fetchmail-6.2.5.5
 CATEGORIES=	mail
@@ -14,7 +14,6 @@ BUILD_USES_MSGFMT=	yes
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-hesiod
diff --git a/mail/gld/Makefile b/mail/gld/Makefile
index 050622d63fa..89c8570e383 100644
--- a/mail/gld/Makefile
+++ b/mail/gld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/08/23 11:48:48 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/29 06:21:50 jlam Exp $
 #
 
 DISTNAME=		gld-1.5.2
@@ -10,7 +10,6 @@ MAINTAINER=		xtraeme@NetBSD.org
 HOMEPAGE=		http://www.gasmi.net/
 COMMENT=		Standalone greylisting server for Postfix
 
-USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
diff --git a/mail/gotmail/Makefile b/mail/gotmail/Makefile
index 79c769bea97..c70a3599a1c 100644
--- a/mail/gotmail/Makefile
+++ b/mail/gotmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/10/31 20:34:19 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/29 06:21:50 jlam Exp $
 #
 
 DISTNAME=		gotmail-0.8.6
@@ -13,7 +13,6 @@ DEPENDS+=		curl-[0-9]*:../../www/curl
 DEPENDS+=		p5-URI>=1.03:../../www/p5-URI
 DEPENDS+=		p5-Net-[0-9]*:../../net/p5-Net
 
-USE_PKGINSTALL=		yes
 USE_TOOLS+=		perl:run
 REPLACE_PERL=		${WRKSRC}/gotmail.in
 
diff --git a/mail/imp/Makefile b/mail/imp/Makefile
index 268f6f3d048..feb96de0843 100644
--- a/mail/imp/Makefile
+++ b/mail/imp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/09/28 14:31:07 rillig Exp $
+# $NetBSD: Makefile,v 1.35 2005/12/29 06:21:50 jlam Exp $
 
 DISTNAME=	imp-3.2.8
 PKGREVISION=	1
@@ -23,7 +23,6 @@ IMPDIR=		${HORDEDIR}/imp
 MESSAGE_SUBST+=	IMPDIR=${IMPDIR}
 MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
-USE_PKGINSTALL=		yes
 PKG_SYSCONFSUBDIR?=	httpd
 
 CONF_FILES=	${EGDIR}/imp.conf ${PKG_SYSCONFDIR}/imp.conf
diff --git a/mail/imp4/Makefile b/mail/imp4/Makefile
index 6ffb5fca563..6f22ca2d81c 100644
--- a/mail/imp4/Makefile
+++ b/mail/imp4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:32 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 06:21:50 jlam Exp $
 
 DISTNAME=	imp-h3-${IMPVER}
 PKGNAME=	imp-${IMPVER}
@@ -27,7 +27,6 @@ PAXDIRS=	lib locale po scripts templates themes
 MESSAGE_SUBST+=	IMPDIR=${IMPDIR}
 MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 
-USE_PKGINSTALL=		YES
 PKG_SYSCONFSUBDIR?=	httpd
 
 CONF_FILES=		${EGDIR}/imp.conf ${PKG_SYSCONFDIR}/imp.conf
diff --git a/mail/ja-squirrelmail/Makefile b/mail/ja-squirrelmail/Makefile
index bebd0f4b898..dc57e732673 100644
--- a/mail/ja-squirrelmail/Makefile
+++ b/mail/ja-squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/12/10 19:23:01 martti Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/29 06:21:50 jlam Exp $
 
 DISTNAME=	squirrelmail-1.4.5
 PKGNAME=	ja-${DISTNAME}
@@ -23,7 +23,6 @@ DEPENDS+=	php-gettext>=4.3.3:../../devel/php-gettext
 DEPENDS+=	php-mbstring>=4.3.3:../../misc/php-mbstring
 
 USE_LANGUAGES=	# empty
-USE_PKGINSTALL=	yes
 NO_BUILD=	yes
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	config/conf.pl config/ri_once.pl
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index b87a98ad587..9a37625c1a3 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 06:21:50 jlam Exp $
 #
 
 DISTNAME=	mail-notification-1.0
@@ -13,7 +13,6 @@ COMMENT=	Status icon that provides new mail notifications
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
 USE_TOOLS+=		gmake pkg-config
-USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/mail/mailfront/Makefile b/mail/mailfront/Makefile
index 46b02975f8e..86542ee55d4 100644
--- a/mail/mailfront/Makefile
+++ b/mail/mailfront/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/11/21 05:54:03 schmonz Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/29 06:21:50 jlam Exp $
 #
 
 DISTNAME=		mailfront-0.98
@@ -17,7 +17,6 @@ DEPENDS+=		${DEPENDS_QMAIL}
 DJB_RESTRICTED=		NO
 DJB_MAKE_TARGETS=	NO
 
-USE_PKGINSTALL=		YES
 RCD_SCRIPTS=		smtpfront
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index ed72c40d620..4278628b57a 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:33 rillig Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/29 06:21:50 jlam Exp $
 #
 
 DISTNAME=	mailgraph-1.12
@@ -13,7 +13,6 @@ COMMENT=	RRDtool frontend for mail statistics
 DEPENDS+=	rrdtool-1*:../../databases/rrdtool
 DEPENDS+=	p5-File-Tail-[0-9]*:../../misc/p5-File-Tail
 
-USE_PKGINSTALL=	yes
 USE_TOOLS+=	perl:run
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile
index 2efae54c40a..73bafcc6212 100644
--- a/mail/mailman/Makefile
+++ b/mail/mailman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/12/08 21:09:04 bouyer Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/29 06:21:50 jlam Exp $
 
 DISTNAME=	mailman-2.1.6
 PKGREVISION=	1
@@ -13,7 +13,6 @@ 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}
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 331b6ddbc97..665387470c8 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:33 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/29 06:21:50 jlam Exp $
 #
 
 DISTNAME=		MailScanner-4.30.3-2
@@ -12,7 +12,6 @@ HOMEPAGE=		http://www.mailscanner.info/
 COMMENT=		Powerful spam/virus filter with many options
 
 WRKSRC=			${WRKDIR}/MailScanner-4.30.3
-USE_PKGINSTALL=		YES
 
 PKG_SYSCONFSUBDIR=	MailScanner
 
diff --git a/mail/mailserv/Makefile b/mail/mailserv/Makefile
index d56f9e7bf5b..90708cd1726 100644
--- a/mail/mailserv/Makefile
+++ b/mail/mailserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:33 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 06:21:50 jlam Exp $
 #
 
 DISTNAME=	mailserv
@@ -14,7 +14,6 @@ WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 USE_TOOLS+=	perl:run
-USE_PKGINSTALL=	YES
 NO_BUILD=	YES
 
 PKG_SYSCONFSUBDIR=	mailserv
diff --git a/mail/mailwrapper/Makefile b/mail/mailwrapper/Makefile
index d96b894e184..6f10fe0291e 100644
--- a/mail/mailwrapper/Makefile
+++ b/mail/mailwrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:33 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/29 06:21:50 jlam Exp $
 
 DISTNAME=	mailwrapper-19990412
 PKGREVISION=	4
@@ -13,7 +13,6 @@ NO_SRC_ON_FTP=		Already in MASTER_SITE_LOCAL
 WRKSRC=			${WRKDIR}/mailwrapper
 MANCOMPRESSED_IF_MANZ=	yes
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
 EGDIR=			${PREFIX}/share/examples/mailwrapper
diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile
index d9adbea8787..02a821990c9 100644
--- a/mail/mess822/Makefile
+++ b/mail/mess822/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/08/19 18:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/29 06:21:50 jlam Exp $
 #
 
 DISTNAME=		mess822-0.58
@@ -21,7 +21,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 EGDIR=			${PREFIX}/share/examples/mess822
 CFLAGS+=		-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
-USE_PKGINSTALL=		yes
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
 CONF_FILES+=		${EGDIR}/leapsecs.dat ${PKG_SYSCONFDIR}/leapsecs.dat
 
diff --git a/mail/metamail/Makefile b/mail/metamail/Makefile
index 1447df0339a..4d3773b08b6 100644
--- a/mail/metamail/Makefile
+++ b/mail/metamail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:33 rillig Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/29 06:21:51 jlam Exp $
 
 DISTNAME=	mm2.7
 PKGNAME=	metamail-2.7
@@ -16,7 +16,6 @@ CONFLICTS+=	elm>=2.5.5 mm-2.7
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src
-USE_PKGINSTALL=		YES
 
 CFLAGS.Linux+=	-DLINUX
 CFLAGS.SunOS+=	-DSYSV
diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile
index cc02f8f4d20..ce6c0ec0315 100644
--- a/mail/milter-greylist/Makefile
+++ b/mail/milter-greylist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/29 06:21:51 jlam Exp $
 
 DISTNAME=	milter-greylist-2.0.2
 CATEGORIES=	mail
@@ -9,7 +9,6 @@ MAINTAINER=	tron@NetBSD.org
 HOMEPAGE=	http://hcpnet.free.fr/milter-greylist/
 COMMENT=	Easy-to-use greylist milter for sendmail
 
-USE_PKGINSTALL=	YES
 
 HAS_CONFIGURE=	YES
 CONFIGURE_ARGS+=--with-user=smmsp
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 53f902e3137..ea9810d3c65 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/12/10 22:14:14 markd Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/29 06:21:51 jlam Exp $
 
 DISTNAME=		mimedefang-2.54
 CATEGORIES=		mail
@@ -21,7 +21,6 @@ USE_TOOLS+=		perl:run
 GNU_CONFIGURE=		YES
 PKG_SYSCONFSUBDIR?=	mimedefang
 
-USE_PKGINSTALL=		YES
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
 DEFANG_SPOOLDIR?=	${VARBASE}/spool/MIMEDefang
diff --git a/mail/mpop/Makefile b/mail/mpop/Makefile
index 2b496bbbc40..53eddd36795 100644
--- a/mail/mpop/Makefile
+++ b/mail/mpop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/13 03:09:20 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/29 06:21:51 jlam Exp $
 #
 
 DISTNAME=	mpop-0.8.2
@@ -12,7 +12,6 @@ HOMEPAGE=	http://mpop.sourceforge.net/
 COMMENT=	Small, fast and portable POP3 client
 
 GNU_CONFIGURE=		yes
-USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		pkg-config
 
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 18597fdf4b3..0d41640c428 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: Makefile,v 1.43 2005/12/29 06:21:51 jlam Exp $
 
 DISTNAME=		mutt-1.5.11
 PKGREVISION=	2
@@ -45,7 +45,6 @@ CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
 
 LDFLAGS+=		${_STRIPFLAG_CC}
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
 INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
 DOCDIR=			${PREFIX}/share/doc/mutt
diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile
index 4132faa3df1..69df3d07aa2 100644
--- a/mail/mutt/Makefile
+++ b/mail/mutt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.131 2005/12/26 16:45:27 ben Exp $
+# $NetBSD: Makefile,v 1.132 2005/12/29 06:21:51 jlam Exp $
 
 DISTNAME=		mutt-1.4.2.1i
 PKGNAME=		${DISTNAME:C/i$//}
@@ -48,7 +48,6 @@ CONFIGURE_ARGS+=	--with-exec-shell=/bin/ksh
 
 LDFLAGS+=		${_STRIPFLAG_CC}
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
 INSTALL_EXTRA_TMPL=	${.CURDIR}/INSTALL
 DOCDIR=			${PREFIX}/share/doc/mutt
diff --git a/mail/nail/Makefile b/mail/nail/Makefile
index 81992eac1a5..d57a1f109bc 100644
--- a/mail/nail/Makefile
+++ b/mail/nail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/11/20 11:08:39 cjep Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/29 06:21:51 jlam Exp $
 
 DISTNAME=	nail-11.25
 CATEGORIES=	mail
@@ -9,7 +9,6 @@ MAINTAINER=	cjep@NetBSD.org
 HOMEPAGE=	http://nail.sourceforge.net/
 COMMENT=	BSD mail utility with MIME extensions
 
-USE_PKGINSTALL=	yes
 BUILD_DEFS+=	USE_INET6
 
 MAKE_ENV+=	"SYSCONFDIR=${PKG_SYSCONFDIR}"
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index 88ec858eae6..56780efa071 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.60 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: Makefile,v 1.61 2005/12/29 06:21:51 jlam Exp $
 
 DISTNAME=		nmh-1.0.4
 PKGREVISION=		6
@@ -26,7 +26,6 @@ CONFLICTS+=		ja-mh6-[0-9]*
 NMH_MTA?=		smtp
 
 GNU_CONFIGURE=		yes
-USE_PKGINSTALL=		yes
 
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/libexec/nmh
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile
index acf0da9f272..34c486b09fb 100644
--- a/mail/nullmailer/Makefile
+++ b/mail/nullmailer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/29 06:21:52 jlam Exp $
 
 DISTNAME=		nullmailer-1.00
 CATEGORIES=		mail
@@ -9,7 +9,6 @@ HOMEPAGE=		http://untroubled.org/nullmailer/
 COMMENT=		Simple relay-only mail transport agent
 
 USE_LANGUAGES=		c++
-USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+= 	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}/spool
diff --git a/mail/pine/Makefile b/mail/pine/Makefile
index eae58d5dfb4..5dec67177ce 100644
--- a/mail/pine/Makefile
+++ b/mail/pine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2005/08/12 20:23:00 tv Exp $
+# $NetBSD: Makefile,v 1.107 2005/12/29 06:21:52 jlam Exp $
 
 DISTNAME=	pine4.63
 PKGNAME=	pine-4.63
@@ -13,7 +13,6 @@ COMMENT=	Program for Internet News and E-mail
 
 LICENSE=	pine-license
 
-USE_PKGINSTALL=		yes
 
 CONF_FILES=    ${PREFIX}/share/examples/pine/pine.conf ${PKG_SYSCONFDIR}/pine.conf
 
diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile
index 6ac94a9234e..a4175c2f046 100644
--- a/mail/popa3d/Makefile
+++ b/mail/popa3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:34 rillig Exp $
+# $NetBSD: Makefile,v 1.43 2005/12/29 06:21:52 jlam Exp $
 #
 
 DISTNAME=	popa3d-1.0
@@ -17,7 +17,6 @@ POPA3D_GROUP?=	popa3d
 PKG_GROUPS=	${POPA3D_GROUP}
 PKG_USERS=	${POPA3D_USER}:${POPA3D_GROUP}
 
-USE_PKGINSTALL=	YES
 
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index cce44f3888a..5847488ae00 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/12/05 20:50:34 rillig Exp $
+# $NetBSD: Makefile,v 1.51 2005/12/29 06:21:52 jlam Exp $
 
 DISTNAME=	postfix-2.3-20051128
 #PKGREVISION=	1
@@ -86,7 +86,6 @@ BUILD_TARGET=		# empty
 MAKE_ENV+=		CC=${CC:Q} OPT=${CFLAGS:M*:Q}
 MAKE_ENV+=		AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
 
-USE_PKGINSTALL=		yes
 RCD_SCRIPTS=		postfix
 OWN_DIRS+=		${POSTFIX_QUEUE_DIR}
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index b0bbe5a04c1..6d5a552b2b3 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.170 2005/12/05 20:50:34 rillig Exp $
+# $NetBSD: Makefile,v 1.171 2005/12/29 06:21:52 jlam Exp $
 
 DISTNAME=	postfix-2.2.6
 #PKGREVISION=	1
@@ -83,7 +83,6 @@ BUILD_TARGET=		# empty
 MAKE_ENV+=		CC=${CC:Q} OPT=${CFLAGS:M*:Q}
 MAKE_ENV+=		AUXLIBS=${AUXLIBS:Q} CCARGS=${CCARGS:Q}
 
-USE_PKGINSTALL=		yes
 RCD_SCRIPTS=		postfix
 OWN_DIRS+=		${POSTFIX_QUEUE_DIR}
 MAKE_DIRS+=		${PKG_SYSCONFDIR}
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index f281fdacb4e..f2c40eb90ba 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/29 06:21:52 jlam Exp $
 #
 
 DISTNAME=	postgrey-1.21
@@ -15,7 +15,6 @@ DEPENDS+=	p5-IO-Multiplex-[0-9]*:../../devel/p5-IO-Multiplex
 DEPENDS+=	p5-Net-Server-[0-9]*:../../net/p5-Net-Server
 
 NO_CONFIGURE=	yes
-USE_PKGINSTALL=	yes
 USE_TOOLS+=	perl:run
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 08ff6d9a3ca..2aac9109e29 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/29 06:21:52 jlam Exp $
 #
 
 DISTNAME=	prayer-1.0.12
@@ -9,7 +9,6 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/
 COMMENT=	Small, fast, web mail interface
 
-USE_PKGINSTALL=	yes
 USE_TOOLS+=	gmake perl
 PRAYER_USER=	prayer
 PRAYER_GROUP=	prayer
diff --git a/mail/proxsmtp/Makefile b/mail/proxsmtp/Makefile
index 9f57641e94b..da3ec288003 100644
--- a/mail/proxsmtp/Makefile
+++ b/mail/proxsmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/12/17 05:20:22 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/29 06:21:52 jlam Exp $
 
 DISTNAME=	proxsmtp-1.0
 PKGREVISION=	1
@@ -10,7 +10,6 @@ HOMEPAGE=	http://memberwebs.com/nielsen/software/proxsmtp/
 COMMENT=	SMTP proxy content filter
 
 GNU_CONFIGURE=	yes
-USE_PKGINSTALL=	yes
 
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 CONF_FILES=	${EGDIR}/proxsmtpd.conf ${PKG_SYSCONFDIR}/proxsmtpd.conf
diff --git a/mail/pymsgauth/Makefile b/mail/pymsgauth/Makefile
index b0984c8fa89..6a225d26603 100644
--- a/mail/pymsgauth/Makefile
+++ b/mail/pymsgauth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/29 06:21:52 jlam Exp $
 #
 
 DISTNAME=		pymsgauth-2.1.0
@@ -22,7 +22,6 @@ EGDIR=			share/examples/pymsgauth
 NO_BUILD=		yes
 PYTHON_PATCH_SCRIPTS=	${PYMSGAUTH_PROGRAMS} *.py
 
-USE_PKGINSTALL=		yes
 INSTALL_EXTRA_TMPL+=	${PKGDIR}/INSTALL
 DEINSTALL_EXTRA_TMPL+=	${PKGDIR}/DEINSTALL
 FILES_SUBST+=		SHAREDIR=${SHAREDIR:Q}
diff --git a/mail/qgreylist/Makefile b/mail/qgreylist/Makefile
index e1007779209..2588258a867 100644
--- a/mail/qgreylist/Makefile
+++ b/mail/qgreylist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/10/13 17:01:46 schmonz Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/29 06:21:53 jlam Exp $
 #
 
 DISTNAME=		qgreylist-0.3
@@ -15,7 +15,6 @@ DEPENDS+=		${DEPENDS_QMAIL}
 WRKSRC=			${WRKDIR}/qgreylist
 
 USE_TOOLS+=		perl:run
-USE_PKGINSTALL=		yes
 OWN_DIRS_PERMS=		${PKG_SYSCONFDIR}/greylist qmaild wheel 0755
 OWN_DIRS_PERMS+=	${PKG_SYSCONFDIR}/whitelist qmaild wheel 0755
 NO_BUILD=		yes
diff --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile
index b4cf67b501b..b54f3ff26b6 100644
--- a/mail/qmail-qfilter/Makefile
+++ b/mail/qmail-qfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/08/24 04:47:10 schmonz Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/29 06:21:53 jlam Exp $
 #
 
 DISTNAME=		qmail-qfilter-2.1
@@ -13,7 +13,6 @@ DEPENDS+=		qmail>=1.03nb9:../../mail/qmail
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_PKGINSTALL=		yes
 OWN_DIRS_PERMS+=	${QMAIL_QFILTER_TMPDIR} qmaild ${ROOT_GROUP} 700
 
 REPLACE_PERL=		samples/block-long-dates			\
diff --git a/mail/qmail-run/Makefile b/mail/qmail-run/Makefile
index 4fcee5030e0..44d90f0d204 100644
--- a/mail/qmail-run/Makefile
+++ b/mail/qmail-run/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 06:21:53 jlam Exp $
 #
 
 DISTNAME=		qmail-run-20050415
@@ -19,7 +19,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=			${WRKDIR}
 NO_CHECKSUM=		yes
 
-USE_PKGINSTALL=		yes
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 FILES_SUBST+=		QMAIL_QUEUE_EXTRA=${QMAIL_QUEUE_EXTRA:Q}
 FILES_SUBST+=		PKGNAME=${PKGNAME:Q}
diff --git a/mail/qmail-users/Makefile b/mail/qmail-users/Makefile
index 3fc8282588e..b53c81bdf48 100644
--- a/mail/qmail-users/Makefile
+++ b/mail/qmail-users/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:26 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/29 06:21:53 jlam Exp $
 #
 
 DISTNAME=	qmail-users-1.0
@@ -26,7 +26,6 @@ PKG_USERS+=	qmails:qmail::qmails:${QMAILDIR}
 WRKSRC=		${WRKDIR}
 NO_BUILD=	YES
 NO_CHECKSUM=	YES
-USE_PKGINSTALL=	YES
 
 do-install:	# empty
 
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index c6086bf834e..26496b1e5af 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/29 06:21:53 jlam Exp $
 #
 
 DISTNAME=		netqmail-1.05
@@ -36,7 +36,6 @@ DJB_BUILD_TARGETS= 	man
 DJB_RESTRICTED=		YES
 NO_PACKAGE=		"needs work to function properly as a binary package"
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${PKGDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${PKGDIR}/INSTALL
 MAKE_DIRS+=		${PKG_SYSCONFDIR} ${PKG_SYSCONFDIR}/alias
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index 51a158d4b16..c20d0c25ebf 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: Makefile,v 1.54 2005/12/29 06:21:53 jlam Exp $
 #
 
 DISTNAME=		qpopper${VERSION}
@@ -31,7 +31,6 @@ DB_SUFFIX?=		db
 CONFIGURE_ARGS+=	--enable-spool-dir=${QPOPPER_SPOOL_DIR:Q}
 .endif
 
-USE_PKGINSTALL=		yes
 RCD_SCRIPTS=		qpopper
 MESSAGE_SUBST+=		RCD_SCRIPTS=${RCD_SCRIPTS} \
 			RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR}
diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile
index eaf992449ec..dde4d14c8c3 100644
--- a/mail/sendmail/Makefile
+++ b/mail/sendmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: Makefile,v 1.81 2005/12/29 06:21:53 jlam Exp $
 
 .include "../../mail/sendmail/Makefile.common"
 
@@ -87,7 +87,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/doc/op/op.me ${PREFIX}/share/doc/sendmail
 	${INSTALL_DATA} ${WRKSRC}/doc/op/op.ps ${PREFIX}/share/doc/sendmail
 
-USE_PKGINSTALL=	yes
 PKG_GROUPS=	smmsp
 PKG_USERS=	smmsp:smmsp::Sendmail\ Message\ Submission\ Program
 
diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile
index 3fb4a77777a..189f5aadf97 100644
--- a/mail/sendmail812/Makefile
+++ b/mail/sendmail812/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/08/23 11:48:49 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/29 06:21:53 jlam Exp $
 
 .include "options.mk"
 .include "../../mail/sendmail812/Makefile.common"
@@ -12,7 +12,6 @@ CONFLICTS+=	postfix-[0-9]* fastforward>=0.51nb2
 MESSAGE_SRC=	${WRKDIR}/.MESSAGE_SRC
 PLIST_SRC=	${WRKDIR}/.PLIST_SRC
 
-USE_PKGINSTALL=	yes
 PKG_GROUPS=	smmsp
 PKG_USERS=	smmsp:smmsp::Sendmail\ Message\ Submission\ Program
 
diff --git a/mail/spamass-milter/Makefile b/mail/spamass-milter/Makefile
index b730c37dead..895454f65b0 100644
--- a/mail/spamass-milter/Makefile
+++ b/mail/spamass-milter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/08/24 16:08:13 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/29 06:21:53 jlam Exp $
 #
 
 DISTNAME=	spamass-milter-0.3.0
@@ -13,7 +13,6 @@ COMMENT=	Milter interface to Spamassassin
 DEPENDS+=	spamassassin>=2.44:../../mail/spamassassin
 
 GNU_CONFIGURE=	YES
-USE_PKGINSTALL=	YES
 USE_LANGUAGES=	c++
 
 RCD_SCRIPTS=	spamass-milter
diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile
index 9953024b733..48808d1b2f1 100644
--- a/mail/spamassassin/Makefile
+++ b/mail/spamassassin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: Makefile,v 1.67 2005/12/29 06:21:53 jlam Exp $
 
 DISTNAME=	Mail-SpamAssassin-3.1.0
 PKGNAME=	spamassassin-3.1.0
@@ -31,7 +31,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/${DISTNAME}
 
-USE_PKGINSTALL=		YES
 PKG_SYSCONFSUBDIR=	spamassassin
 
 # Set contact address (e-mail, URL, ...) for use in spam report messages
diff --git a/mail/spamd/Makefile b/mail/spamd/Makefile
index ac988318600..aa96eeeb77d 100644
--- a/mail/spamd/Makefile
+++ b/mail/spamd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:35 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/29 06:21:53 jlam Exp $
 
 DISTNAME=		spamd-20050726
 CATEGORIES=		mail
@@ -10,7 +10,6 @@ COMMENT=		OpenBSD spam deferral daemon
 
 ONLY_FOR_PLATFORM=	NetBSD-[2-9]*-*
 
-USE_PKGINSTALL=		yes
 NO_CONFIGURE=		yes
 
 PKG_USERS=		_spamd:_spamd::Spam\ Daemon:${VARBASE}/chroot/spamd:/sbin/nologin
diff --git a/mail/squirrelmail/Makefile b/mail/squirrelmail/Makefile
index 89b0f358e04..34a6f48085d 100644
--- a/mail/squirrelmail/Makefile
+++ b/mail/squirrelmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2005/12/10 19:23:01 martti Exp $
+# $NetBSD: Makefile,v 1.64 2005/12/29 06:21:53 jlam Exp $
 
 DISTNAME=	squirrelmail-1.4.5
 PKGREVISION=	3
@@ -17,7 +17,6 @@ CONFLICTS+=	ja-squirrelspell-[0-9]*
 DEPENDS+=	php-gettext>=4.3.3:../../devel/php-gettext
 
 USE_LANGUAGES=	# empty
-USE_PKGINSTALL=	yes
 NO_BUILD=	yes
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	config/conf.pl config/ri_once.pl
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index b2769ed4ae9..fe4c3689aba 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/29 06:21:53 jlam Exp $
 #
 # TLS functionality needs testing. Please let me know the result,
 # and preferably info about your system.
@@ -17,7 +17,6 @@ COMMENT=	Extremely simple MTA to forward mail to a mail hub
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:S/.orig$//}
 USE_TOOLS+=		gmake
-USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE:Q}
 
diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile
index b492ef587d4..81cfe74219e 100644
--- a/mail/sylpheed-claws/Makefile
+++ b/mail/sylpheed-claws/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: Makefile,v 1.43 2005/12/29 06:21:53 jlam Exp $
 
 .include "Makefile.common"
 
@@ -10,7 +10,6 @@ COMMENT=	X based e-mail and netnews client
 CONFLICTS=		sylpheed-[0-9]* sylpheed-gtk2-[0-9]*
 
 BUILD_USES_MSGFMT=	YES
-USE_PKGINSTALL=		YES
 PKGCONFIG_OVERRIDE+=	sylpheed-claws.pc.in
 
 CONFIGURE_ARGS+=        --enable-aspell
diff --git a/mail/sylpheed-devel/Makefile b/mail/sylpheed-devel/Makefile
index d3916e43eb7..4180bd88455 100644
--- a/mail/sylpheed-devel/Makefile
+++ b/mail/sylpheed-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:12 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/29 06:21:53 jlam Exp $
 
 DISTNAME=	sylpheed-2.1.8
 CATEGORIES=	mail news x11
@@ -15,7 +15,6 @@ DEPENDS+=		metamail>=2.7:../../mail/metamail
 
 CONFLICTS=		sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]*
 
-USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=            yes
 USE_TOOLS+=		gmake
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index cb1cbbff46a..8a2f699d468 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2005/12/05 23:55:11 rillig Exp $
+# $NetBSD: Makefile,v 1.85 2005/12/29 06:21:54 jlam Exp $
 
 DISTNAME=	sylpheed-2.0.4
 CATEGORIES=	mail news x11
@@ -15,7 +15,6 @@ DEPENDS+=		metamail>=2.7:../../mail/metamail
 
 CONFLICTS=		sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]*
 
-USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=            yes
 USE_TOOLS+=		gmake pkg-config
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index 3fdcc08bd59..b971ae0c8a9 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/12/27 13:54:58 seb Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/29 06:21:54 jlam Exp $
 #
 
 DISTNAME=	sympa-4.1.2
@@ -33,7 +33,6 @@ DEPENDS.SunOS+=	p5-DB_File>=1.75:../../databases/p5-DB_File
 
 OPSYSVARS+=	DEPENDS
 
-USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-confdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-cgidir=${SYMPA_BIN:Q}
diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile
index b5df6bcd489..0a11ede81ba 100644
--- a/mail/teapop/Makefile
+++ b/mail/teapop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:12 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/29 06:21:54 jlam Exp $
 
 DISTNAME=	teapop-0.3.8
 PKGREVISION=	2
@@ -10,7 +10,6 @@ MAINTAINER=	dawszy@arhea.net
 HOMEPAGE=	http://www.toontown.org/teapop/
 COMMENT=	Yet another RFC1939 compliant POP3 server
 
-USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--enable-flock
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 2c3c3ff962a..a9aca3f93cc 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:36 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/29 06:21:54 jlam Exp $
 #
 
 DISTNAME=	tmda-1.0.3
@@ -11,7 +11,6 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://tmda.net/
 COMMENT=	Python-based SPAM reduction system
 
-USE_PKGINSTALL=		yes
 PY_PATCHPLIST=		# defined
 PYTHON_PATCH_SCRIPTS=	${TMDA_PROGRAMS}
 
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index ce7c68ee143..7060361bdbf 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/21 05:36:44 adrianp Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/29 06:21:54 jlam Exp $
 
 DISTNAME=	turba-h3-${TURBAVER}
 PKGNAME=	turba-${TURBAVER}
@@ -25,7 +25,6 @@ MESSAGE_SUBST+=	TURBADIR=${TURBADIR}
 MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
 REPLACE_PERL=	${WRKSRC}/scripts/ldap/addou.pl
 
-USE_PKGINSTALL=		YES
 PKG_SYSCONFSUBDIR?=	httpd
 
 SUBST_CLASSES+=		files
diff --git a/mail/yatsvrs/Makefile b/mail/yatsvrs/Makefile
index 605240fcdf4..747fee44511 100644
--- a/mail/yatsvrs/Makefile
+++ b/mail/yatsvrs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:12 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/29 06:21:54 jlam Exp $
 #
 
 DISTNAME=		yatsvrs-5.00p6
@@ -13,7 +13,6 @@ COMMENT=		Extended POP3 server and some supporting servers
 
 CONFLICTS=		ascyd-* yatsvr4-*
 
-USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 DOCS=			IMPORTANT README UPDATE doc/YATCONF doc/YATEXT4
 DOCDIR=			${PREFIX}/share/doc/yatsvr5