Move mk/install to mk/pkginstall to better reflect the contents (the

pkginstall framework).

20 files changed, 48 insertions, 48 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 309de2dcac5..b0b06375feb 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1823 2006/05/21 14:41:29 jlam Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1824 2006/05/21 23:50:15 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -438,7 +438,7 @@ _BUILD_DATE!=	${DATE} "+%Y-%m-%d %H:%M:%S %z"
 .include "../../mk/alternatives.mk"
 
 # INSTALL/DEINSTALL script framework
-.include "../../mk/install/bsd.pkginstall.mk"
+.include "../../mk/pkginstall/bsd.pkginstall.mk"
 
 # If MESSAGE hasn't been defined, then set MESSAGE_SRC to be a space-separated
 # list of files to be concatenated together to generate the MESSAGE file.
diff --git a/mk/install/footer b/mk/install/footer
deleted file mode 100644
index 31380d9738c..00000000000
--- a/mk/install/footer
+++ /dev/null
@@ -1,4 +0,0 @@
-# $NetBSD: footer,v 1.2 2006/03/15 04:52:57 jlam Exp $
-
-exit 0
-
diff --git a/mk/install/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk
index 0a8340d4872..22182d62087 100644
--- a/mk/install/bsd.pkginstall.mk
+++ b/mk/pkginstall/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.53 2006/04/29 04:36:13 jlam Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.1 2006/05/21 23:50:15 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -33,29 +33,29 @@ _PKGINSTALL_DIR=	${WRKDIR}/.pkginstall
 # point to additional script fragments.  These bits are included after
 # the main install/deinstall script fragments.
 #
-_HEADER_TMPL?=		${.CURDIR}/../../mk/install/header
+_HEADER_TMPL?=		${.CURDIR}/../../mk/pkginstall/header
 HEADER_TEMPLATE?=	# empty
 .if exists(${PKGDIR}/HEADER) && \
     empty(HEADER_TEMPLATE:M${PKGDIR}/HEADER)
 HEADER_TEMPLATE+=	${PKGDIR}/HEADER
 .endif
-_DEINSTALL_PRE_TMPL?=	${.CURDIR}/../../mk/install/deinstall-pre
+_DEINSTALL_PRE_TMPL?=	${.CURDIR}/../../mk/pkginstall/deinstall-pre
 DEINSTALL_TEMPLATE?=	# empty
 .if exists(${PKGDIR}/DEINSTALL) && \
     empty(DEINSTALL_TEMPLATE:M${PKGDIR}/DEINSTALL)
 DEINSTALL_TEMPLATE+=	${PKGDIR}/DEINSTALL
 .endif
-_DEINSTALL_TMPL?=	${.CURDIR}/../../mk/install/deinstall
+_DEINSTALL_TMPL?=	${.CURDIR}/../../mk/pkginstall/deinstall
 _INSTALL_UNPACK_TMPL?=	# empty
-_INSTALL_TMPL?=		${.CURDIR}/../../mk/install/install
+_INSTALL_TMPL?=		${.CURDIR}/../../mk/pkginstall/install
 INSTALL_TEMPLATE?=	# empty
 .if exists(${PKGDIR}/INSTALL) && \
     empty(INSTALL_TEMPLATE:M${PKGDIR}/INSTALL)
 INSTALL_TEMPLATE+=	${PKGDIR}/INSTALL
 .endif
-_INSTALL_POST_TMPL?=	${.CURDIR}/../../mk/install/install-post
+_INSTALL_POST_TMPL?=	${.CURDIR}/../../mk/pkginstall/install-post
 _INSTALL_DATA_TMPL?=	# empty
-_FOOTER_TMPL?=		${.CURDIR}/../../mk/install/footer
+_FOOTER_TMPL?=		${.CURDIR}/../../mk/pkginstall/footer
 
 # _DEINSTALL_TEMPLATES and _INSTALL_TEMPLATES are the list of source
 #	files that are concatenated to form the DEINSTALL/INSTALL
@@ -173,10 +173,10 @@ DEPENDS+=		${_USER_DEPENDS}
 .endif
 
 _INSTALL_USERGROUP_FILE=	${_PKGINSTALL_DIR}/usergroup
-.if exists(../../mk/install/usergroupfuncs.${OPSYS})
-_INSTALL_USERGROUPFUNCS_FILE?=	../../mk/install/usergroupfuncs.${OPSYS}
+.if exists(../../mk/pkginstall/usergroupfuncs.${OPSYS})
+_INSTALL_USERGROUPFUNCS_FILE?=	../../mk/pkginstall/usergroupfuncs.${OPSYS}
 .else
-_INSTALL_USERGROUPFUNCS_FILE?=	../../mk/install/usergroupfuncs
+_INSTALL_USERGROUPFUNCS_FILE?=	../../mk/pkginstall/usergroupfuncs
 .endif
 _INSTALL_USERGROUP_DATAFILE=	${_PKGINSTALL_DIR}/usergroup-data
 _INSTALL_UNPACK_TMPL+=		${_INSTALL_USERGROUP_FILE}
@@ -228,11 +228,11 @@ ${_INSTALL_USERGROUP_DATAFILE}:
 
 ${_INSTALL_USERGROUP_FILE}: ${_INSTALL_USERGROUP_DATAFILE}
 ${_INSTALL_USERGROUP_FILE}:						\
-		../../mk/install/usergroup				\
+		../../mk/pkginstall/usergroup				\
 		${INSTALL_USERGROUPFUNCS_FILE}
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${SED}	-e "/^# platform-specific adduser\/addgroup functions/r${_INSTALL_USERGROUPFUNCS_FILE}" ../../mk/install/usergroup |			\
+	${SED}	-e "/^# platform-specific adduser\/addgroup functions/r${_INSTALL_USERGROUPFUNCS_FILE}" ../../mk/pkginstall/usergroup |			\
 	${SED} ${FILES_SUBST_SED} > ${.TARGET}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	if ${_ZERO_FILESIZE_P} ${_INSTALL_USERGROUP_DATAFILE}; then	\
@@ -272,7 +272,7 @@ pre-build: do-su-create-usergroup
 
 _INSTALL_USERGROUP_CHECK=						\
 	${SETENV} PERL5=${PERL5:Q}					\
-	${SH} ${PKGSRCDIR}/mk/install/usergroup-check
+	${SH} ${PKGSRCDIR}/mk/pkginstall/usergroup-check
 
 .PHONY: do-su-create-usergroup
 do-su-create-usergroup:
@@ -342,10 +342,10 @@ ${_INSTALL_PERMS_DATAFILE}:
 	${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
 
 ${_INSTALL_PERMS_FILE}: ${_INSTALL_PERMS_DATAFILE}
-${_INSTALL_PERMS_FILE}: ../../mk/install/perms
+${_INSTALL_PERMS_FILE}: ../../mk/pkginstall/perms
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${SED} ${FILES_SUBST_SED} ../../mk/install/perms > ${.TARGET}
+	${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/perms > ${.TARGET}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	if ${_ZERO_FILESIZE_P} ${_INSTALL_PERMS_DATAFILE}; then		\
 		${RM} -f ${.TARGET};					\
@@ -455,10 +455,10 @@ ${_INSTALL_FILES_DATAFILE}:
 	${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
 
 ${_INSTALL_FILES_FILE}: ${_INSTALL_FILES_DATAFILE}
-${_INSTALL_FILES_FILE}: ../../mk/install/files
+${_INSTALL_FILES_FILE}: ../../mk/pkginstall/files
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${SED} ${FILES_SUBST_SED} ../../mk/install/files > ${.TARGET}
+	${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/files > ${.TARGET}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	if ${_ZERO_FILESIZE_P} ${_INSTALL_FILES_DATAFILE}; then		\
 		${RM} -f ${.TARGET};					\
@@ -579,10 +579,10 @@ ${_INSTALL_DIRS_DATAFILE}:
 	${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
 
 ${_INSTALL_DIRS_FILE}: ${_INSTALL_DIRS_DATAFILE}
-${_INSTALL_DIRS_FILE}: ../../mk/install/dirs
+${_INSTALL_DIRS_FILE}: ../../mk/pkginstall/dirs
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${SED} ${FILES_SUBST_SED} ../../mk/install/dirs > ${.TARGET}
+	${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/dirs > ${.TARGET}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	if ${_ZERO_FILESIZE_P} ${_INSTALL_DIRS_DATAFILE}; then		\
 		${RM} -f ${.TARGET};					\
@@ -611,10 +611,10 @@ ${_INSTALL_INFO_FILES_DATAFILE}:
 	${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_ARGS} ${.TARGET}
 
 ${_INSTALL_INFO_FILES_FILE}: ${_INSTALL_INFO_FILES_DATAFILE}
-${_INSTALL_INFO_FILES_FILE}: ../../mk/install/info-files
+${_INSTALL_INFO_FILES_FILE}: ../../mk/pkginstall/info-files
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${SED} ${FILES_SUBST_SED} ../../mk/install/info-files > ${.TARGET}
+	${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/info-files > ${.TARGET}
 .if !defined(INFO_FILES)
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	if ${_ZERO_FILESIZE_P} ${_INSTALL_INFO_FILES_DATAFILE}; then	\
@@ -672,10 +672,10 @@ ${_INSTALL_SHELL_DATAFILE}:
 	${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
 
 ${_INSTALL_SHELL_FILE}: ${_INSTALL_SHELL_DATAFILE}
-${_INSTALL_SHELL_FILE}: ../../mk/install/shell
+${_INSTALL_SHELL_FILE}: ../../mk/pkginstall/shell
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${SED} ${FILES_SUBST_SED} ../../mk/install/shell > ${.TARGET}
+	${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/shell > ${.TARGET}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	if ${_ZERO_FILESIZE_P} ${_INSTALL_SHELL_DATAFILE}; then		\
 		${RM} -f ${.TARGET};					\
@@ -749,10 +749,10 @@ ${_INSTALL_FONTS_DATAFILE}:
 	${_PKG_SILENT}${_PKG_DEBUG}${MV} -f ${.TARGET}.tmp ${.TARGET}
 
 ${_INSTALL_FONTS_FILE}: ${_INSTALL_FONTS_DATAFILE}
-${_INSTALL_FONTS_FILE}: ../../mk/install/fonts
+${_INSTALL_FONTS_FILE}: ../../mk/pkginstall/fonts
 	${_PKG_SILENT}${_PKG_DEBUG}${MKDIR} ${.TARGET:H}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
-	${SED} ${FILES_SUBST_SED} ../../mk/install/fonts > ${.TARGET}
+	${SED} ${FILES_SUBST_SED} ../../mk/pkginstall/fonts > ${.TARGET}
 	${_PKG_SILENT}${_PKG_DEBUG}					\
 	if ${_ZERO_FILESIZE_P} ${_INSTALL_FONTS_DATAFILE}; then		\
 		${RM} -f ${.TARGET};					\
diff --git a/mk/install/deinstall b/mk/pkginstall/deinstall
index 838149766b5..cb31eb8584a 100644
--- a/mk/install/deinstall
+++ b/mk/pkginstall/deinstall
@@ -1,4 +1,4 @@
-# $NetBSD: deinstall,v 1.40 2006/04/25 19:54:39 jlam Exp $
+# $NetBSD: deinstall,v 1.1 2006/05/21 23:50:15 jlam Exp $
 
 case ${STAGE} in
 VIEW-DEINSTALL)
diff --git a/mk/install/deinstall-pre b/mk/pkginstall/deinstall-pre
index 3372bf6974c..679374c7e13 100644
--- a/mk/install/deinstall-pre
+++ b/mk/pkginstall/deinstall-pre
@@ -1,4 +1,4 @@
-# $NetBSD: deinstall-pre,v 1.3 2006/03/15 04:52:57 jlam Exp $
+# $NetBSD: deinstall-pre,v 1.1 2006/05/21 23:50:15 jlam Exp $
 
 # Ensure that the VIEW-DEINSTALL action is called for overwrite packages.
 # This is here to ensure that it's the first DEINSTALL action (before
diff --git a/mk/install/dirs b/mk/pkginstall/dirs
index f4c50dc1a57..361060edade 100644
--- a/mk/install/dirs
+++ b/mk/pkginstall/dirs
@@ -1,4 +1,4 @@
-# $NetBSD: dirs,v 1.15 2006/05/01 14:56:23 jlam Exp $
+# $NetBSD: dirs,v 1.1 2006/05/21 23:50:15 jlam Exp $
 #
 # Generate a +DIRS script that reference counts directories that are
 # required for the proper functioning of the package.
diff --git a/mk/install/files b/mk/pkginstall/files
index 8494d24ee43..aad8bb1062a 100644
--- a/mk/install/files
+++ b/mk/pkginstall/files
@@ -1,4 +1,4 @@
-# $NetBSD: files,v 1.14 2006/05/01 14:56:23 jlam Exp $
+# $NetBSD: files,v 1.1 2006/05/21 23:50:15 jlam Exp $
 #
 # Generate a +FILES script that reference counts config files that are
 # required for the proper functioning of the package.
diff --git a/mk/install/fonts b/mk/pkginstall/fonts
index c16df6470da..52c68387fa3 100644
--- a/mk/install/fonts
+++ b/mk/pkginstall/fonts
@@ -1,4 +1,4 @@
-# $NetBSD: fonts,v 1.11 2006/03/19 23:58:14 jlam Exp $
+# $NetBSD: fonts,v 1.1 2006/05/21 23:50:15 jlam Exp $
 #
 # Generate a +FONTS script that updates font databases for the package.
 #
diff --git a/mk/pkginstall/footer b/mk/pkginstall/footer
new file mode 100644
index 00000000000..4f9974ccf3e
--- /dev/null
+++ b/mk/pkginstall/footer
@@ -0,0 +1,4 @@
+# $NetBSD: footer,v 1.1 2006/05/21 23:50:15 jlam Exp $
+
+exit 0
+
diff --git a/mk/install/header b/mk/pkginstall/header
index 85e3275f06d..47c91b7981e 100644
--- a/mk/install/header
+++ b/mk/pkginstall/header
@@ -1,6 +1,6 @@
 #!@SH@
 #
-# $NetBSD: header,v 1.36 2006/03/19 23:58:14 jlam Exp $
+# $NetBSD: header,v 1.1 2006/05/21 23:50:15 jlam Exp $
 
 SELF="$0"
 PKGNAME="$1"
diff --git a/mk/install/info-files b/mk/pkginstall/info-files
index 6d1d24792b9..ae68d087e11 100644
--- a/mk/install/info-files
+++ b/mk/pkginstall/info-files
@@ -1,4 +1,4 @@
-# $NetBSD: info-files,v 1.5 2006/04/12 21:13:56 jlam Exp $
+# $NetBSD: info-files,v 1.1 2006/05/21 23:50:15 jlam Exp $
 #
 # Generate an +INFO_FILES script that handles info file registration for
 # the package.
diff --git a/mk/install/install b/mk/pkginstall/install
index 6e1a3371728..a060d9f7b07 100644
--- a/mk/install/install
+++ b/mk/pkginstall/install
@@ -1,4 +1,4 @@
-# $NetBSD: install,v 1.47 2006/05/21 00:14:51 jlam Exp $
+# $NetBSD: install,v 1.1 2006/05/21 23:50:15 jlam Exp $
 
 case ${STAGE} in
 PRE-INSTALL)
diff --git a/mk/install/install-post b/mk/pkginstall/install-post
index 79f17b0797d..2e2ea84fd3a 100644
--- a/mk/install/install-post
+++ b/mk/pkginstall/install-post
@@ -1,4 +1,4 @@
-# $NetBSD: install-post,v 1.3 2006/03/15 04:52:57 jlam Exp $
+# $NetBSD: install-post,v 1.1 2006/05/21 23:50:15 jlam Exp $
 
 # Ensure that the VIEW-INSTALL action is called for overwrite packages.
 # This is here to ensure that it's the final POST-INSTALL action (after
diff --git a/mk/install/perms b/mk/pkginstall/perms
index 303d304f349..2f898469d55 100644
--- a/mk/install/perms
+++ b/mk/pkginstall/perms
@@ -1,4 +1,4 @@
-# $NetBSD: perms,v 1.5 2006/03/19 23:58:14 jlam Exp $
+# $NetBSD: perms,v 1.1 2006/05/21 23:50:15 jlam Exp $
 #
 # Generate a +PERMS script that sets the special permissions on files
 # and directories used by the package.
diff --git a/mk/install/shell b/mk/pkginstall/shell
index 106240a5bf8..73da476d3df 100644
--- a/mk/install/shell
+++ b/mk/pkginstall/shell
@@ -1,4 +1,4 @@
-# $NetBSD: shell,v 1.6 2006/03/19 23:58:14 jlam Exp $
+# $NetBSD: shell,v 1.1 2006/05/21 23:50:15 jlam Exp $
 #
 # Generate a +SHELL script that handles shell registration for the package.
 #
diff --git a/mk/install/usergroup b/mk/pkginstall/usergroup
index bce7dec15e6..9d89271f35d 100644
--- a/mk/install/usergroup
+++ b/mk/pkginstall/usergroup
@@ -1,4 +1,4 @@
-# $NetBSD: usergroup,v 1.16 2006/05/01 14:56:23 jlam Exp $
+# $NetBSD: usergroup,v 1.1 2006/05/21 23:50:15 jlam Exp $
 #
 # Generate a +USERGROUP script that reference-counts users and groups
 # that are required for the proper functioning of the package.
diff --git a/mk/install/usergroup-check b/mk/pkginstall/usergroup-check
index 0dd318d6eb3..8561cabcf97 100755
--- a/mk/install/usergroup-check
+++ b/mk/pkginstall/usergroup-check
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: usergroup-check,v 1.1 2006/04/23 00:00:44 jlam Exp $
+# $NetBSD: usergroup-check,v 1.1 2006/05/21 23:50:15 jlam Exp $
 #
 # Copyright (c) 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
diff --git a/mk/install/usergroupfuncs b/mk/pkginstall/usergroupfuncs
index 951c505225f..77e4f8b4e4b 100644
--- a/mk/install/usergroupfuncs
+++ b/mk/pkginstall/usergroupfuncs
@@ -1,4 +1,4 @@
-# $NetBSD: usergroupfuncs,v 1.9 2006/05/01 14:56:23 jlam Exp $
+# $NetBSD: usergroupfuncs,v 1.1 2006/05/21 23:50:15 jlam Exp $
 #
 # Default implementations of user_exists() and group_exists() shell
 # functions for checking the existence of users and groups, and of
@@ -8,7 +8,7 @@
 #
 # Platform-specific replacements for this file should be located at:
 #
-#	pkgsrc/mk/install/usergroupfuncs.${OPSYS}
+#	pkgsrc/mk/pkginstall/usergroupfuncs.${OPSYS}
 #
 
 # group_exists group [groupid]
diff --git a/mk/install/usergroupfuncs.DragonFly b/mk/pkginstall/usergroupfuncs.DragonFly
index 0711ecaa665..25ff3163103 100644
--- a/mk/install/usergroupfuncs.DragonFly
+++ b/mk/pkginstall/usergroupfuncs.DragonFly
@@ -1,4 +1,4 @@
-# $NetBSD: usergroupfuncs.DragonFly,v 1.7 2006/05/01 14:56:23 jlam Exp $
+# $NetBSD: usergroupfuncs.DragonFly,v 1.1 2006/05/21 23:50:15 jlam Exp $
 #
 # Platform-specific adduser and addgroup functionality
 # on top of pw(8).
diff --git a/mk/install/usergroupfuncs.FreeBSD b/mk/pkginstall/usergroupfuncs.FreeBSD
index 58eb3bc03bc..763e5b1e4b1 100644
--- a/mk/install/usergroupfuncs.FreeBSD
+++ b/mk/pkginstall/usergroupfuncs.FreeBSD
@@ -1,4 +1,4 @@
-# $NetBSD: usergroupfuncs.FreeBSD,v 1.8 2006/05/10 05:41:40 jlam Exp $
+# $NetBSD: usergroupfuncs.FreeBSD,v 1.1 2006/05/21 23:50:15 jlam Exp $
 #
 # Platform-specific adduser and addgroup functionality
 # on top of pw(8).