From c820203434cf763fe527cb057f59021e25a8fde6 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Thu, 29 Dec 2005 06:21:30 +0000
Subject: 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.

---
 mk/alternatives.mk | 3 +--
 mk/fonts.mk        | 4 +---
 mk/java-env.mk     | 3 +--
 mk/texinfo.mk      | 7 +------
 4 files changed, 4 insertions(+), 13 deletions(-)

(limited to 'mk')

diff --git a/mk/alternatives.mk b/mk/alternatives.mk
index 19ca4982463..c5293237fa1 100644
--- a/mk/alternatives.mk
+++ b/mk/alternatives.mk
@@ -1,4 +1,4 @@
-# $NetBSD: alternatives.mk,v 1.4 2005/01/25 16:48:53 jmmv Exp $
+# $NetBSD: alternatives.mk,v 1.5 2005/12/29 06:22:26 jlam Exp $
 #
 # This Makefile fragment handles the alternatives system, registering a
 # package in the database.
@@ -51,7 +51,6 @@ PKG_ALTERNATIVES=		${PREFIX.pkg_alternatives}/sbin/pkg_alternatives
 
 INSTALL_EXTRA_TMPL+=	${WRKDIR}/.altinstall
 DEINSTALL_EXTRA_TMPL+=	${WRKDIR}/.altdeinstall
-USE_PKGINSTALL=		YES
 
 .endif
 
diff --git a/mk/fonts.mk b/mk/fonts.mk
index 39bfc1c98a3..6055328e855 100644
--- a/mk/fonts.mk
+++ b/mk/fonts.mk
@@ -1,4 +1,4 @@
-# $NetBSD: fonts.mk,v 1.9 2005/12/29 03:44:38 jlam Exp $
+# $NetBSD: fonts.mk,v 1.10 2005/12/29 06:22:26 jlam Exp $
 #
 # XXX This file's use is deprecated.  This is here temporarily to help
 # XXX packages transition to using the new fonts capability of the
@@ -15,6 +15,4 @@ FONTS_DIRS.ttf+=	${FONTS_TTF_DIRS}
 FONTS_DIRS.type1+=	${FONTS_TYPE1_DIRS}
 FONTS_DIRS.x11+=	${FONTS_X11_DIRS}
 
-USE_PKGINSTALL=		YES
-
 .endif	# FONTS_MK
diff --git a/mk/java-env.mk b/mk/java-env.mk
index 4f19de5cba1..85f6c8681cb 100644
--- a/mk/java-env.mk
+++ b/mk/java-env.mk
@@ -1,4 +1,4 @@
-# $NetBSD: java-env.mk,v 1.6 2005/08/20 19:16:21 jlam Exp $
+# $NetBSD: java-env.mk,v 1.7 2005/12/29 06:22:26 jlam Exp $
 #
 # This Makefile fragment handles Java wrappers and is meant to be included
 # by packages that provide a Java build-time and/or run-time environment.
@@ -80,7 +80,6 @@ install-java-wrapper-${w}:
 .endif
 
 # Handle the ${PREFIX}/java shared directory automatically.
-USE_PKGINSTALL=		YES
 REQD_DIRS+=		${PREFIX}/java
 PRINT_PLIST_AWK+=	/^@dirrm java$$/ { next; }
 
diff --git a/mk/texinfo.mk b/mk/texinfo.mk
index 7ef227e460e..811a2db6093 100644
--- a/mk/texinfo.mk
+++ b/mk/texinfo.mk
@@ -1,4 +1,4 @@
-# $NetBSD: texinfo.mk,v 1.29 2005/12/05 22:07:07 rillig Exp $
+# $NetBSD: texinfo.mk,v 1.30 2005/12/29 06:22:26 jlam Exp $
 #
 # Copyright (c) 2002, 2003 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -48,11 +48,6 @@ TEXINFO_MK=	# defined
 # Handle install-info.
 # 
 
-# Use pkginstall framework i.e. INSTALL/DEINSTALL scripts to handle
-# install-info execution.
-#
-USE_PKGINSTALL=		YES
-
 # Pathname relative to ${PREFIX} of directory holding the info
 # files and the Info dir file.
 INFO_DIR?=	info
-- 
cgit v1.2.3