Modify the INSTALL script to allow for selective unpacking of a scriptlet.

9 files changed, 31 insertions, 26 deletions

diff --git a/mk/install/dirs b/mk/install/dirs
index f2760e5cae9..451ad9a331b 100644
--- a/mk/install/dirs
+++ b/mk/install/dirs
@@ -1,10 +1,10 @@
-# $NetBSD: dirs,v 1.9 2006/03/15 04:52:57 jlam Exp $
+# $NetBSD: dirs,v 1.10 2006/03/19 23:58:14 jlam Exp $
 #
 # Generate a +DIRS script that reference counts directories that are
 # required for the proper functioning of the package.
 #
-case "${STAGE}" in
-PRE-INSTALL|UNPACK)
+case "${STAGE},$1" in
+UNPACK,|UNPACK,+DIRS)
 	${CAT} > ./+DIRS << 'EOF'
 #!@SH@
 #
diff --git a/mk/install/files b/mk/install/files
index ae88d1b155d..44bf2d2e3d1 100644
--- a/mk/install/files
+++ b/mk/install/files
@@ -1,10 +1,10 @@
-# $NetBSD: files,v 1.9 2006/03/15 04:52:57 jlam Exp $
+# $NetBSD: files,v 1.10 2006/03/19 23:58:14 jlam Exp $
 #
 # Generate a +FILES script that reference counts config files that are
 # required for the proper functioning of the package.
 #
-case "${STAGE}" in
-PRE-INSTALL|UNPACK)
+case "${STAGE},$1" in
+UNPACK,|UNPACK,+FILES)
 	${CAT} > ./+FILES << 'EOF'
 #!@SH@
 #
diff --git a/mk/install/fonts b/mk/install/fonts
index 20afbe6dd3e..c16df6470da 100644
--- a/mk/install/fonts
+++ b/mk/install/fonts
@@ -1,9 +1,9 @@
-# $NetBSD: fonts,v 1.10 2006/03/15 04:52:57 jlam Exp $
+# $NetBSD: fonts,v 1.11 2006/03/19 23:58:14 jlam Exp $
 #
 # Generate a +FONTS script that updates font databases for the package.
 #
-case "${STAGE}" in
-PRE-INSTALL|UNPACK)
+case "${STAGE},$1" in
+UNPACK,|UNPACK,+FONTS)
 	${CAT} > ./+FONTS << 'EOF'
 #!@SH@
 #
diff --git a/mk/install/header b/mk/install/header
index 69ba520436b..85e3275f06d 100644
--- a/mk/install/header
+++ b/mk/install/header
@@ -1,10 +1,11 @@
 #!@SH@
 #
-# $NetBSD: header,v 1.35 2006/03/15 04:52:57 jlam Exp $
+# $NetBSD: header,v 1.36 2006/03/19 23:58:14 jlam Exp $
 
-SELF=$0
-PKGNAME=$1
-STAGE=$2
+SELF="$0"
+PKGNAME="$1"
+STAGE="$2"
+shift 2
 
 AWK="@AWK@"
 BASENAME="@BASENAME@"
diff --git a/mk/install/info-files b/mk/install/info-files
index 299f145bb4e..036438af4ab 100644
--- a/mk/install/info-files
+++ b/mk/install/info-files
@@ -1,10 +1,10 @@
-# $NetBSD: info-files,v 1.2 2006/03/15 04:52:57 jlam Exp $
+# $NetBSD: info-files,v 1.3 2006/03/19 23:58:14 jlam Exp $
 #
 # Generate an +INFO_FILES script that handles info file registration for
 # the package.
 #
-case "${STAGE}" in
-PRE-INSTALL|UNPACK)
+case "${STAGE},$1" in
+UNPACK,|UNPACK,+INFO_FILES)
 	${CAT} > ./+INFO_FILES << 'EOF'
 #!@SH@
 #
diff --git a/mk/install/install b/mk/install/install
index 027913b2de6..713f33cb7b0 100644
--- a/mk/install/install
+++ b/mk/install/install
@@ -1,8 +1,12 @@
-# $NetBSD: install,v 1.44 2006/03/15 04:52:57 jlam Exp $
+# $NetBSD: install,v 1.45 2006/03/19 23:58:14 jlam Exp $
 
 case ${STAGE} in
 PRE-INSTALL)
 	#
+	# Unpack the helper scriptlets.
+	#
+	${SELF} ${PKGNAME} UNPACK
+	#
 	# Require that necessary users and groups exist or else fail the
 	# installation of the package.
 	#
diff --git a/mk/install/perms b/mk/install/perms
index 9de1e3ff1f5..303d304f349 100644
--- a/mk/install/perms
+++ b/mk/install/perms
@@ -1,10 +1,10 @@
-# $NetBSD: perms,v 1.4 2006/03/15 04:52:57 jlam Exp $
+# $NetBSD: perms,v 1.5 2006/03/19 23:58:14 jlam Exp $
 #
 # Generate a +PERMS script that sets the special permissions on files
 # and directories used by the package.
 #
-case "${STAGE}" in
-PRE-INSTALL|UNPACK)
+case "${STAGE},$1" in
+UNPACK,|UNPACK,+PERMS)
 	${CAT} > ./+PERMS << 'EOF'
 #!@SH@
 #
diff --git a/mk/install/shell b/mk/install/shell
index ee48308e27f..106240a5bf8 100644
--- a/mk/install/shell
+++ b/mk/install/shell
@@ -1,9 +1,9 @@
-# $NetBSD: shell,v 1.5 2006/03/15 04:52:57 jlam Exp $
+# $NetBSD: shell,v 1.6 2006/03/19 23:58:14 jlam Exp $
 #
 # Generate a +SHELL script that handles shell registration for the package.
 #
-case "${STAGE}" in
-PRE-INSTALL|UNPACK)
+case "${STAGE},$1" in
+UNPACK,|UNPACK,+SHELL)
 	${CAT} > ./+SHELL << 'EOF'
 #!@SH@
 #
diff --git a/mk/install/usergroup b/mk/install/usergroup
index 9fa8d6220a4..c9fca96e048 100644
--- a/mk/install/usergroup
+++ b/mk/install/usergroup
@@ -1,10 +1,10 @@
-# $NetBSD: usergroup,v 1.13 2006/03/15 04:52:57 jlam Exp $
+# $NetBSD: usergroup,v 1.14 2006/03/19 23:58:14 jlam Exp $
 #
 # Generate a +USERGROUP script that reference-counts users and groups
 # that are required for the proper functioning of the package.
 #
-case "${STAGE}" in
-PRE-INSTALL|UNPACK)
+case "${STAGE},$1" in
+UNPACK,|UNPACK,+USERGROUP)
 	${CAT} > ./+USERGROUP << 'EOF'
 #!@SH@
 #