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.

41 files changed, 41 insertions, 82 deletions

diff --git a/security/AiCA/Makefile b/security/AiCA/Makefile
index 6634c3ca1b8..7184923526e 100644
--- a/security/AiCA/Makefile
+++ b/security/AiCA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/10/10 17:06:30 hira Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 06:22:09 jlam Exp $
 #
 
 DISTNAME=	AiCA-0.81
@@ -9,7 +9,6 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 HOMEPAGE=	http://mars.elcom.nitech.ac.jp/security/
 COMMENT=	Manage Certification Authority and PKI utilities
 
-USE_PKGINSTALL=		yes
 INSTALL_EXTRA_TMPL+=    ${.CURDIR}/INSTALL
 GNU_CONFIGURE=		yes
 WRKSRC=			${WRKDIR}/AiCA
diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index 87ab258ec08..688fc78d8bd 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/12/05 23:55:16 rillig Exp $
+# $NetBSD: Makefile,v 1.39 2005/12/29 06:22:09 jlam Exp $
 #
 
 DISTNAME=	Linux-PAM-0.77
@@ -18,7 +18,6 @@ CONFLICTS+=	openpam-[0-9]*
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_PKGINSTALL=		yes
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 
diff --git a/security/amap/Makefile b/security/amap/Makefile
index befa61ad03b..1cf718e51fd 100644
--- a/security/amap/Makefile
+++ b/security/amap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/12/13 20:00:38 joerg Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/29 06:22:09 jlam Exp $
 #
 
 DISTNAME=       amap-5.0
@@ -11,7 +11,6 @@ HOMEPAGE=       http://www.thc.org/
 COMMENT=        Applications and Services scanner
 
 HAS_CONFIGURE=	YES
-USE_PKGINSTALL=	YES
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX:Q}
 EGDIR=			${PREFIX}/share/examples/amap
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 7b68fdf446a..4c7d3d00859 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:16 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/29 06:22:09 jlam Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -41,7 +41,6 @@ CONFLICTS+=	amavis-perl-[0-9]*
 USE_TOOLS+=		perl:run
 REPLACE_PERL+=		amavisd amavisd-nanny
 
-USE_PKGINSTALL=		yes
 AMAVIS_USER?=		vscan
 AMAVIS_GROUP?=		vscan
 AMAVIS_DIR?=		${VARBASE}/amavis
diff --git a/security/cfs/Makefile b/security/cfs/Makefile
index 9614dbe60d7..04d449677c9 100644
--- a/security/cfs/Makefile
+++ b/security/cfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:55 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/29 06:22:09 jlam Exp $
 
 DISTNAME=		cfs-1.4.1
 PKGREVISION=		5
@@ -9,7 +9,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.crypto.com/software/
 COMMENT=		Encrypting file system, using NFS as its interface
 
-USE_PKGINSTALL=		YES
 
 CRYPTO=			# defined
 
diff --git a/security/courier-authlib/Makefile.common b/security/courier-authlib/Makefile.common
index 37e8cf47301..20df1bed0a7 100644
--- a/security/courier-authlib/Makefile.common
+++ b/security/courier-authlib/Makefile.common
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile.common,v 1.6 2005/12/05 23:55:17 rillig Exp $
+# $NetBSD: Makefile.common,v 1.7 2005/12/29 06:22:09 jlam Exp $
 
 COURIER_USER?=		courier
 COURIER_GROUP?=		mail
 FILES_SUBST+=		COURIER_USER=${COURIER_USER:Q}
 FILES_SUBST+=		COURIER_GROUP=${COURIER_GROUP:Q}
 
-USE_PKGINSTALL=		yes
 PKG_GROUPS=		${COURIER_GROUP}
 PKG_USERS=		${COURIER_USER}:${COURIER_GROUP}::Courier\ user
 
diff --git a/security/cvm/Makefile b/security/cvm/Makefile
index a5a5cb608a2..40a2d25095a 100644
--- a/security/cvm/Makefile
+++ b/security/cvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/08/30 03:57:11 schmonz Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/29 06:22:09 jlam Exp $
 #
 
 DISTNAME=		cvm-0.76
@@ -20,7 +20,6 @@ SUBST_FILES.paths=	qmail-init.c
 SUBST_SED.paths=	-e 's|/var/qmail|${QMAILDIR}|g'
 SUBST_MESSAGE.paths=	"Fixing paths."
 
-USE_PKGINSTALL=		YES
 RCD_SCRIPTS=		cvm
 PKG_USERS+=		cvmlog:users::cvmlog
 
diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile
index fbe4073838f..c52b26266f5 100644
--- a/security/cyrus-sasl2/Makefile
+++ b/security/cyrus-sasl2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/12/05 23:55:17 rillig Exp $
+# $NetBSD: Makefile,v 1.45 2005/12/29 06:22:09 jlam Exp $
 
 .include "Makefile.common"
 
@@ -48,7 +48,6 @@ CONFIGURE_ARGS+=	--with-devrandom=${SASL_ENTROPY_SOURCE:Q}
 .endif
 BUILD_DEFS+=		SASL_ENTROPY_SOURCE
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
 # CYRUS_USER		username of the Cyrus administrator
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index e1fd2e1e6d3..0f85e39aa26 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.32 2005/12/17 05:20:23 jlam Exp $
+# $NetBSD: Makefile.common,v 1.33 2005/12/29 06:22:09 jlam Exp $
 #
 # This file is currently included by:
 #
@@ -40,7 +40,6 @@ DEFAULT_VIEW.${PKGBASE}=	${DEFAULT_VIEW.cyrus-sasl}
 .  endif
 .endif
 
-USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake
 
diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile
index d85306a8f6a..da989be319b 100644
--- a/security/cyrus-saslauthd/Makefile
+++ b/security/cyrus-saslauthd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/12/17 05:20:23 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/29 06:22:09 jlam Exp $
 
 DISTNAME=	cyrus-sasl-2.1.20
 PKGNAME=	${DISTNAME:S/sasl/saslauthd/}
@@ -33,7 +33,6 @@ CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
 
 .include "options.mk"
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL=	${PKGDIR}/DEINSTALL
 RCD_SCRIPTS=		saslauthd
 FILES_SUBST+=		ROOT_USER=${ROOT_USER:Q}
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index 29efafebd3a..c15e1da92be 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/12/05 23:55:17 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/29 06:22:09 jlam Exp $
 #
 
 DISTNAME=		dirmngr-0.9.1
@@ -20,7 +20,6 @@ PKG_USERS=		${DIRMNGR_USER}:${DIRMNGR_GROUP}::pseudo\ user:${VARBASE}/dirmngr:
 
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gawk
-USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 RCD_SCRIPTS=		dirmngr
 PKG_RCD_SCRIPTS=	yes
diff --git a/security/fprot-workstation-bin/Makefile b/security/fprot-workstation-bin/Makefile
index 33cd215d69c..e5746cc478f 100644
--- a/security/fprot-workstation-bin/Makefile
+++ b/security/fprot-workstation-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/11/21 02:06:50 ben Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/29 06:22:09 jlam Exp $
 #
 
 DISTNAME=		#defined
@@ -24,7 +24,6 @@ LICENSE=		fprot-workstation-license
 
 WRKSRC=			${WRKDIR}/f-prot
 NO_BUILD=		yes
-USE_PKGINSTALL=		yes
 USE_TOOLS+=		perl:run
 
 DATDIR=			${PREFIX}/share/fprot-workstation-bin
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 0ae837ab6ae..7e442cc2138 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/12/21 04:17:49 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2005/12/29 06:22:09 jlam Exp $
 
 DISTNAME=	heimdal-0.7.1
 PKGREVISION=	2
@@ -86,7 +86,6 @@ HEIMDAL_TRANSFORM=	s/^ftp/k&/
 PLIST_SUBST+=		KRB5_PREFIX=${KRB5_PREFIX:Q}
 CONFIGURE_ARGS+=	--program-transform-name=${HEIMDAL_TRANSFORM:Q}
 
-USE_PKGINSTALL=		yes
 OWN_DIRS_PERMS=		${HEIMDAL_STATEDIR} ${ROOT_USER} ${ROOT_GROUP} 0700
 SPECIAL_PERMS=		${PREFIX}/bin/${KRB5_PREFIX}su ${SETUID_ROOT_PERMS}
 RCD_SCRIPTS=		kadmind kcm kdc kpasswdd
diff --git a/security/honeyd-arpd/Makefile b/security/honeyd-arpd/Makefile
index 6271e2ce94e..f6bb499c516 100644
--- a/security/honeyd-arpd/Makefile
+++ b/security/honeyd-arpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:56 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/29 06:22:10 jlam Exp $
 #
 
 DISTNAME=	arpd-0.2
@@ -11,7 +11,6 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://niels.xtdnet.nl/honeyd/index.php
 COMMENT=	ARP daemon for honeyd
 
-USE_PKGINSTALL= yes
 RCD_SCRIPTS=	honeydarpd
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/arpd
diff --git a/security/honeyd/Makefile b/security/honeyd/Makefile
index 80764429f0f..8306d7f4df1 100644
--- a/security/honeyd/Makefile
+++ b/security/honeyd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:56 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 06:22:10 jlam Exp $
 #
 
 DISTNAME=	honeyd-1.0
@@ -14,7 +14,6 @@ DEPENDS+=       honeyd-arpd>=0.2:../../security/honeyd-arpd
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_PKGINSTALL=		YES
 PKG_SYSCONFSUBDIR=	honeyd
 RCD_SCRIPTS=		honeyd
 USE_BUILTIN.libevent=	NO
diff --git a/security/isakmpd/Makefile b/security/isakmpd/Makefile
index d4a27c437a9..722f884ce89 100644
--- a/security/isakmpd/Makefile
+++ b/security/isakmpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/04/11 21:47:12 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/29 06:22:10 jlam Exp $
 #
 
 DISTNAME=		isakmpd-20030903
@@ -17,7 +17,6 @@ PKG_FAIL_REASON+=	"${PKGNAME} requires ipsec-ready ${OPSYS}"
 WRKSRC=			${WRKDIR}/isakmpd
 
 BUILD_TARGET=		depend all
-USE_PKGINSTALL=		YES
 
 MAKE_ENV+=		BINDIR=${PREFIX}/sbin MANDIR=${PREFIX}/man
 
diff --git a/security/logcheck/Makefile b/security/logcheck/Makefile
index f3e452b3e28..a740bcca829 100644
--- a/security/logcheck/Makefile
+++ b/security/logcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/11/08 03:56:31 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 06:22:10 jlam Exp $
 
 DISTNAME=	logcheck-1.1.1
 PKGREVISION=	1
@@ -9,7 +9,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/sentrytools/
 COMMENT=	Auditing tool for system logs on Unix boxes
 
-USE_PKGINSTALL=	YES
 
 OWN_DIRS=	/var/adm/tmp /var/adm
 
diff --git a/security/mirrordir/Makefile b/security/mirrordir/Makefile
index c851b34ad7d..309898bd44f 100644
--- a/security/mirrordir/Makefile
+++ b/security/mirrordir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:18:10 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/29 06:22:10 jlam Exp $
 #
 
 DISTNAME=	mirrordir-0.10.49
@@ -12,7 +12,6 @@ COMMENT=	Directory mirroring tool
 
 CONFLICTS=	qmail>=1.03nb7 netqmail>=1.05
 
-USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile
index e05af0417b9..6ba8f992d4d 100644
--- a/security/mit-krb5/Makefile
+++ b/security/mit-krb5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/12/17 05:20:23 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/12/29 06:22:10 jlam Exp $
 
 DISTNAME=	krb5-1.4.2
 PKGNAME=	mit-${DISTNAME:S/-signed$//}
@@ -72,7 +72,6 @@ SUBST_SED.mit-krb5=	-e "/KRB5_PATH_RLOGIN/s,/rlogin,/${KRB5_PREFIX}rlogin,g"
 
 INFO_FILES=	krb425.info krb5-admin.info krb5-install.info krb5-user.info
 
-USE_PKGINSTALL=		yes
 OWN_DIRS_PERMS=		${MIT_KRB5_STATEDIR}/krb5kdc			\
 			${ROOT_USER} ${ROOT_GROUP} 0700
 RCD_SCRIPTS=		kadmind kdc
diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile
index a42101d4c70..418d93ae08c 100644
--- a/security/nessus-core/Makefile
+++ b/security/nessus-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:18 rillig Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/29 06:22:10 jlam Exp $
 
 .include 	"../../security/nessus/Makefile.common"
 
@@ -7,7 +7,6 @@ DISTNAME=	nessus-core-${VERS}
 COMMENT=	Core module of the Nessus Network Security Scanner
 
 WRKSRC=		${WRKDIR}/nessus-core
-USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-gtk --with-x --localstatedir=${VARBASE:Q}
 CONFIGURE_ENV+=		ac_cv_path_GTKCONFIG="pkg-config gtk+-2.0" \
diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index 83267d3b56b..7aa7f73ab72 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:57 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/29 06:22:10 jlam Exp $
 
 DISTNAME=	nikto-1.35
 PKGREVISION=	2
@@ -16,7 +16,6 @@ DEPENDS+=	nmap>=2.00:../../net/nmap
 USE_TOOLS+=	perl:run
 REPLACE_PERL=	nikto.pl
 NO_BUILD=	YES
-USE_PKGINSTALL=	YES
 
 # NOTE: this package will not work with pkgviews due to a hardcoded
 # location for nmap.
diff --git a/security/openpam/Makefile b/security/openpam/Makefile
index 4ecd6d5fee4..3e8e22e434f 100644
--- a/security/openpam/Makefile
+++ b/security/openpam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/12/17 05:20:23 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/29 06:22:10 jlam Exp $
 
 DISTNAME=	openpam-20050201
 CATEGORIES=	security
@@ -17,7 +17,6 @@ CONFIGURE_ARGS+=	--without-pam-su
 CONFIGURE_ARGS+=	--with-pam-unix
 CONFIGURE_ARGS+=	--with-modules-dir=${PREFIX}/lib/security
 
-USE_PKGINSTALL=		yes
 OWN_DIRS=		${PKG_SYSCONFDIR}/pam.d
 
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index b69863d6e34..ab04a9eba8c 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/12/05 23:55:18 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/29 06:22:10 jlam Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -51,7 +51,6 @@ SSH_PID_DIR=		/var/run	# default directory for PID files
 
 PKG_SYSCONFSUBDIR=	ssh
 
-USE_PKGINSTALL=		yes
 USE_TOOLS+=		autoconf perl
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index dd683fc19b6..216e9e7e151 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.162 2005/12/05 23:55:18 rillig Exp $
+# $NetBSD: Makefile,v 1.163 2005/12/29 06:22:10 jlam Exp $
 
 DISTNAME=		openssh-4.2p1
 PKGNAME=		openssh-4.2.1
@@ -57,7 +57,6 @@ SSH_PID_DIR=		${VARBASE}/run	# default directory for PID files
 
 PKG_SYSCONFSUBDIR=	ssh
 
-USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-mantype=man
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 53dde292023..65fe1bdc3c9 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2005/12/17 05:20:23 jlam Exp $
+# $NetBSD: Makefile,v 1.112 2005/12/29 06:22:11 jlam Exp $
 
 OPENSSL_SNAPSHOT?=	# empty
 OPENSSL_STABLE?=	# empty
@@ -39,7 +39,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 
-USE_PKGINSTALL=		yes
 USE_TOOLS+=		gmake perl
 TEST_TARGET=		tests
 
diff --git a/security/p0f/Makefile b/security/p0f/Makefile
index 9711d606d1d..f8999689427 100644
--- a/security/p0f/Makefile
+++ b/security/p0f/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/12/08 19:14:47 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/29 06:22:11 jlam Exp $
 #
 
 DISTNAME=	p0f-2.0.5
@@ -11,7 +11,6 @@ HOMEPAGE=	http://lcamtuf.coredump.cx/p0f.shtml
 COMMENT=	Passive OS fingerprinting tool
 
 WRKSRC=		${WRKDIR}/p0f
-USE_PKGINSTALL=	yes
 
 PKG_SYSCONFSUBDIR=     p0f
 
diff --git a/security/p5-Net-DNS-SEC/Makefile b/security/p5-Net-DNS-SEC/Makefile
index 90b549b8368..5f9ec9caac8 100644
--- a/security/p5-Net-DNS-SEC/Makefile
+++ b/security/p5-Net-DNS-SEC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:57 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 06:22:11 jlam Exp $
 #
 
 DISTNAME=		Net-DNS-SEC-0.12
@@ -21,7 +21,6 @@ DEPENDS+=		p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
 DEPENDS+=		p5-Digest-BubbleBabble>=0.01:../../security/p5-Digest-BubbleBabble
 
 BUILDLINK_DEPENDS.perl+=	perl>=5.6.1
-USE_PKGINSTALL=		YES
 
 PERL5_PACKLIST=		auto/Net/DNS/SEC/.packlist
 
diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index 31ab68ead3a..b3b28ce0ad8 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:18 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/29 06:22:11 jlam Exp $
 #
 
 DISTNAME=	pam_ldap-180
@@ -28,7 +28,6 @@ INSTALL_TARGET=		install install-data
 DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
 EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 
-USE_PKGINSTALL=	yes
 CONF_FILES=	${EGDIR}/pam_ldap.conf ${PKG_SYSCONFDIR}/pam_ldap.conf
 
 .include "../../databases/openldap/buildlink3.mk"
diff --git a/security/pflkm/Makefile b/security/pflkm/Makefile
index 705b48e3083..cbbe6b66d29 100644
--- a/security/pflkm/Makefile
+++ b/security/pflkm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/12/07 12:03:16 peter Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/29 06:22:11 jlam Exp $
 
 DISTNAME=		pflkm-20050511
 CATEGORIES=		security
@@ -10,7 +10,6 @@ COMMENT=		OpenBSD Packet Filter as loadable kernel module for NetBSD
 
 ONLY_FOR_PLATFORM=	NetBSD-2.[0-9]*-*
 
-USE_PKGINSTALL=		yes
 NO_CONFIGURE=		yes
 
 PKG_USERS=		_pflogd:nogroup::pflogd\ pseudo-user:${VARBASE}/chroot/pflogd:${NOLOGIN}
diff --git a/security/pks/Makefile b/security/pks/Makefile
index 853e675e1c6..25ed6ed0403 100644
--- a/security/pks/Makefile
+++ b/security/pks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:18 rillig Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/29 06:22:11 jlam Exp $
 
 DISTNAME=	pks-0.9.4
 PKGREVISION=	3
@@ -16,7 +16,6 @@ MAINTAINER=	burgess@neonramp.com
 HOMEPAGE=	http://www.mit.edu/people/marc/pks/
 COMMENT=	PGP Public Key Server
 
-USE_PKGINSTALL=	YES
 GNU_CONFIGURE=	YES
 
 PKS_USER=	pks
diff --git a/security/portsentry/Makefile b/security/portsentry/Makefile
index cdc4c9a7140..6a1c0f43925 100644
--- a/security/portsentry/Makefile
+++ b/security/portsentry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:17 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/29 06:22:11 jlam Exp $
 #
 
 DISTNAME=	portsentry-1.2
@@ -9,7 +9,6 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://sourceforge.net/projects/sentrytools/
 COMMENT=	Detects and respond to port scans against a target host in real-time
 
-USE_PKGINSTALL=	YES
 WRKSRC=		${WRKDIR}/portsentry_beta
 
 BUILD_TARGET=	${LOWER_OPSYS}
diff --git a/security/priv/Makefile b/security/priv/Makefile
index 72fc6691d84..6cb5145394a 100644
--- a/security/priv/Makefile
+++ b/security/priv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:18 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/29 06:22:11 jlam Exp $
 #
 
 DISTNAME=	priv-1.0-beta2
@@ -13,7 +13,6 @@ COMMENT=	Execute commands as a different user
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	YES
-USE_PKGINSTALL=	YES
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 SUBST_CLASSES+=		sysconfdir
diff --git a/security/rid/Makefile b/security/rid/Makefile
index cf0fe2c131b..3081558a550 100644
--- a/security/rid/Makefile
+++ b/security/rid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:32 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/29 06:22:11 jlam Exp $
 #
 
 DISTNAME=	rid-1.11
@@ -12,7 +12,6 @@ HOMEPAGE=	http://www.theorygroup.com/Software/RID/
 COMMENT=	Remote Intrusion Detection to track down compromised hosts
 
 GNU_CONFIGURE=	YES
-USE_PKGINSTALL=	YES
 
 CONF_FILES=	${PREFIX}/share/examples/rid/rid.conf ${PKG_SYSCONFDIR}/rid.conf
 
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index 8039eb71cc4..c7aae068bc0 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:18 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/29 06:22:11 jlam Exp $
 #
 
 DISTNAME=		sfs-0.7.2
@@ -18,7 +18,6 @@ CONFIGURE_ARGS+=	--with-etcdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-sfsdir=${SFS_ROOT:Q}
 CONFIGURE_ARGS+=	--disable-uvfs
 
-USE_PKGINSTALL=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		perl:run
 
diff --git a/security/skey/Makefile b/security/skey/Makefile
index 3556f9654c6..9f920ed3ad8 100644
--- a/security/skey/Makefile
+++ b/security/skey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:18 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/29 06:22:11 jlam Exp $
 #
 
 DISTNAME=		skey-1.1.5
@@ -13,7 +13,6 @@ COMMENT=		Port of OpenBSD s/key implementation
 
 USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		yes
-USE_PKGINSTALL=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONF_FILES+=		${PREFIX}/share/examples/skey/skeykeys \
 			${PKG_SYSCONFDIR}/skeykeys
diff --git a/security/smtpd/Makefile b/security/smtpd/Makefile
index a4ad42f6fd5..afb622c2d07 100644
--- a/security/smtpd/Makefile
+++ b/security/smtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:58 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/29 06:22:11 jlam Exp $
 #
 
 DISTNAME=	smtpd-2.0
@@ -14,7 +14,6 @@ COMMENT=	Store and forward SMTP proxy
 
 SPOOL=		/var/spool/smtpd
 
-USE_PKGINSTALL=	yes
 RCD_SCRIPTS=	smtpfwdd
 FILES_SUBST+=	SPOOL=${SPOOL:Q}
 
diff --git a/security/ssh2/Makefile.common b/security/ssh2/Makefile.common
index 11120e8ba9a..bf31e1ecc52 100644
--- a/security/ssh2/Makefile.common
+++ b/security/ssh2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2005/12/27 13:54:59 seb Exp $
+# $NetBSD: Makefile.common,v 1.18 2005/12/29 06:22:12 jlam Exp $
 #
 
 DISTNAME=	ssh-3.2.9.1
@@ -11,7 +11,6 @@ HOMEPAGE=	http://www.ssh.com/
 CONFLICTS+=	openssh-[0-9]* ssh6-[0-9]* ssh-[0-9]* sftp-[0-9]*
 CONFLICTS+=	openssh+gssapi-[0-9]*
 
-USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 
 BUILD_DEFS+=		USE_INET6
diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile
index b9fe738d79b..535c2c7fac8 100644
--- a/security/stunnel/Makefile
+++ b/security/stunnel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/12/05 23:55:18 rillig Exp $
+# $NetBSD: Makefile,v 1.52 2005/12/29 06:22:12 jlam Exp $
 
 DISTNAME=		stunnel-4.07
 PKGREVISION=		2
@@ -11,7 +11,6 @@ MAINTAINER=		martti@NetBSD.org
 HOMEPAGE=		http://www.stunnel.org/
 COMMENT=		Universal SSL tunnel
 
-USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ssl=${SSLBASE:Q} \
 			--with-cert-dir=${SSLCERTS:Q} \
diff --git a/security/sudo/Makefile b/security/sudo/Makefile
index 03e80af8f63..a50f92ee212 100644
--- a/security/sudo/Makefile
+++ b/security/sudo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2005/12/05 23:55:18 rillig Exp $
+# $NetBSD: Makefile,v 1.85 2005/12/29 06:22:12 jlam Exp $
 #
 
 DISTNAME=		sudo-1.6.8p9
@@ -19,7 +19,6 @@ COMMENT=		Allow others to run commands as root
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LIBTOOL=		yes
-USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/security/tripwire/Makefile b/security/tripwire/Makefile
index ae394a575a2..0d3fa3eecc1 100644
--- a/security/tripwire/Makefile
+++ b/security/tripwire/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:20 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/29 06:22:12 jlam Exp $
 #
 
 DISTNAME=	tripwire-1.2
@@ -12,7 +12,6 @@ COMMENT=	File and directory integrity checker
 
 ONLY_FOR_PLATFORM=	NetBSD-*-* FreeBSD-*-* SunOS-*-*
 
-USE_PKGINSTALL=	YES
 
 PKG_SYSCONFSUBDIR=	tripwire
 OWN_DIRS=		${PKG_SYSCONFDIR}/databases
diff --git a/security/uvscan/Makefile b/security/uvscan/Makefile
index 1dbb4af2e0a..6d186aee7c8 100644
--- a/security/uvscan/Makefile
+++ b/security/uvscan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/12/12 14:43:26 joerg Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/29 06:22:12 jlam Exp $
 
 DISTNAME=		vlnx424e
 PKGNAME=		uvscan-4.24.1
@@ -34,7 +34,6 @@ DATDIR=			${PREFIX}/share/uvscan
 UVSCANDIR=		${PREFIX}/libexec/uvscan
 DATFILES=		clean.dat internet.dat names.dat scan.dat pkgdesc.ini
 
-USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
 FILES_SUBST+=		UVSCANDIR=${UVSCANDIR:Q}