[pkgsrc/trunk]: pkgsrc/mk/install Modify the INSTALL script to allow for sele...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8b5a7693f032
branches:  trunk
changeset: 509940:8b5a7693f032
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sun Mar 19 23:58:14 2006 +0000

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

diffstat:

 mk/install/dirs       |  6 +++---
 mk/install/files      |  6 +++---
 mk/install/fonts      |  6 +++---
 mk/install/header     |  9 +++++----
 mk/install/info-files |  6 +++---
 mk/install/install    |  6 +++++-
 mk/install/perms      |  6 +++---
 mk/install/shell      |  6 +++---
 mk/install/usergroup  |  6 +++---
 9 files changed, 31 insertions(+), 26 deletions(-)

diffs (153 lines):

diff -r 6dea8ea61016 -r 8b5a7693f032 mk/install/dirs
--- a/mk/install/dirs   Sun Mar 19 23:40:07 2006 +0000
+++ b/mk/install/dirs   Sun Mar 19 23:58:14 2006 +0000
@@ -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 -r 6dea8ea61016 -r 8b5a7693f032 mk/install/files
--- a/mk/install/files  Sun Mar 19 23:40:07 2006 +0000
+++ b/mk/install/files  Sun Mar 19 23:58:14 2006 +0000
@@ -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 -r 6dea8ea61016 -r 8b5a7693f032 mk/install/fonts
--- a/mk/install/fonts  Sun Mar 19 23:40:07 2006 +0000
+++ b/mk/install/fonts  Sun Mar 19 23:58:14 2006 +0000
@@ -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 -r 6dea8ea61016 -r 8b5a7693f032 mk/install/header
--- a/mk/install/header Sun Mar 19 23:40:07 2006 +0000
+++ b/mk/install/header Sun Mar 19 23:58:14 2006 +0000
@@ -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 -r 6dea8ea61016 -r 8b5a7693f032 mk/install/info-files
--- a/mk/install/info-files     Sun Mar 19 23:40:07 2006 +0000
+++ b/mk/install/info-files     Sun Mar 19 23:58:14 2006 +0000
@@ -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 -r 6dea8ea61016 -r 8b5a7693f032 mk/install/install
--- a/mk/install/install        Sun Mar 19 23:40:07 2006 +0000
+++ b/mk/install/install        Sun Mar 19 23:58:14 2006 +0000
@@ -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 -r 6dea8ea61016 -r 8b5a7693f032 mk/install/perms
--- a/mk/install/perms  Sun Mar 19 23:40:07 2006 +0000
+++ b/mk/install/perms  Sun Mar 19 23:58:14 2006 +0000
@@ -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 -r 6dea8ea61016 -r 8b5a7693f032 mk/install/shell
--- a/mk/install/shell  Sun Mar 19 23:40:07 2006 +0000
+++ b/mk/install/shell  Sun Mar 19 23:58:14 2006 +0000
@@ -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 -r 6dea8ea61016 -r 8b5a7693f032 mk/install/usergroup
--- a/mk/install/usergroup      Sun Mar 19 23:40:07 2006 +0000
+++ b/mk/install/usergroup      Sun Mar 19 23:58:14 2006 +0000
@@ -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@
 #