Add back USE_PKGINSTALL as a knob to force the pkginstall framework

to be used so that +INSTALL and +DEINSTALL scripts are generated.
This can be used in cases where it's not possible or not desirable to
use the auto-detection mechanism to decide whether the pkginstall
framework is needed.

1 files changed, 15 insertions, 5 deletions

diff --git a/mk/install/pkginstall.mk b/mk/install/pkginstall.mk
index 1b52ce4d4a4..c22fce12289 100644
--- a/mk/install/pkginstall.mk
+++ b/mk/install/pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pkginstall.mk,v 1.2 2005/12/29 13:47:43 jlam Exp $
+# $NetBSD: pkginstall.mk,v 1.3 2006/01/11 04:42:12 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and determines whether
 # or not the bsd.pkginstall.mk implementation file should be included.
@@ -8,6 +8,9 @@
 #	should be extracted from bsd.pkginstall.mk and are typically the
 #	variables named in the INSTALL_<SCRIPT>_MEMBERS lists.
 #
+# USE_PKGINSTALL may be set to "yes" to force the pkginstall framework
+#	to be used.
+#
 # The variables listed in _PKGINSTALL_VARS are documented in
 # mk/install/bsd.pkginstall.mk.
 #
@@ -35,12 +38,19 @@ _PKGINSTALL_VARS+=	FONTS_DIRS.ttf FONTS_DIRS.type1 FONTS_DIRS.x11
 #
 _PKGINSTALL_VARS+=	CONF_DEPENDS
 
+.if defined(USE_PKGINSTALL) && !empty(USE_PKGINSTALL:M[yY][eE][sS])
+_USE_PKGINSTALL=	yes
+.else
 _USE_PKGINSTALL=	no
-.for _var_ in ${_PKGINSTALL_VARS}
-.  if defined(${_var_}) && !empty(${_var_}:M*)
+.endif
+
+.if !empty(_USE_PKGINSTALL:M[nN][oO])
+.  for _var_ in ${_PKGINSTALL_VARS}
+.    if defined(${_var_}) && !empty(${_var_}:M*)
 _USE_PKGINSTALL=	yes
-.  endif
-.endfor
+.    endif
+.  endfor
+.endif
 
 .if !empty(_USE_PKGINSTALL:M[yY][eE][sS])
 .  include "../../mk/install/bsd.pkginstall.mk"