diff options
| -rw-r--r-- | mk/bsd.pkg.install.mk | 10 | ||||
| -rw-r--r-- | mk/install/dirs | 3 | ||||
| -rw-r--r-- | mk/install/usergroup | 6 |
3 files changed, 6 insertions, 13 deletions
diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk index 0016a94b270..5770f5ec164 100644 --- a/mk/bsd.pkg.install.mk +++ b/mk/bsd.pkg.install.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.install.mk,v 1.77 2005/01/28 18:32:40 jlam Exp $ +# $NetBSD: bsd.pkg.install.mk,v 1.78 2005/01/28 19:06:07 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk to use the common # INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply: @@ -78,14 +78,6 @@ FILES_SUBST+= CONF_DEPENDS=${CONF_DEPENDS:C/:.*//:Q} FILES_SUBST+= PKGBASE=${PKGBASE} FILES_SUBST+= PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE} -# Database directory for reference-counted package objects. Subdirectories -# represent different classes of package objects, e.g. dirs, users, -# group, etc. The default value is ${PKG_DBDIR} with ".refcount" -# appended to the name. -# -PKG_REFCOUNT_DBDIR?= ${PKG_DBDIR}.refcount -FILES_SUBST+= PKG_REFCOUNT_DBDIR=${PKG_REFCOUNT_DBDIR:Q} - # PKG_USERS represents the users to create for the package. It is a # space-separated list of elements of the form # diff --git a/mk/install/dirs b/mk/install/dirs index 9f95755aa99..5e09564a970 100644 --- a/mk/install/dirs +++ b/mk/install/dirs @@ -47,8 +47,9 @@ TRUE="@TRUE@" SELF=$0 ACTION=$1 PKG_METADATA_DIR="${2-`${PWD_CMD}`}" -PKG_REFCOUNT_DBDIR="@PKG_REFCOUNT_DBDIR@" : ${PKGNAME=${PKG_METADATA_DIR##*/}} +: ${PKG_DBDIR=${PKG_METADATA_DIR%/*}} +: ${PKG_REFCOUNT_DBDIR=${PKG_DBDIR}.refcount} PKG_REFCOUNT_DIRS_DBDIR="${PKG_REFCOUNT_DBDIR}/dirs" diff --git a/mk/install/usergroup b/mk/install/usergroup index 1b811880488..431adaa6f1c 100644 --- a/mk/install/usergroup +++ b/mk/install/usergroup @@ -54,9 +54,9 @@ USERADD="@USERADD@" SELF=$0 ACTION=$1 PKG_METADATA_DIR="${2-`${PWD_CMD}`}" -PKG_REFCOUNT_DBDIR="@PKG_REFCOUNT_DBDIR@" : ${PKGNAME=${PKG_METADATA_DIR##*/}} -: ${PKGBASE=${PKGNAME%-[0-9]*}} +: ${PKG_DBDIR=${PKG_METADATA_DIR%/*}} +: ${PKG_REFCOUNT_DBDIR=${PKG_DBDIR}.refcount} PKG_REFCOUNT_USERS_DBDIR="${PKG_REFCOUNT_DBDIR}/users" PKG_REFCOUNT_GROUPS_DBDIR="${PKG_REFCOUNT_DBDIR}/groups" @@ -158,7 +158,7 @@ ADD) case $user in "") continue ;; esac - : ${descr:="${PKGBASE} $user user"} + : ${descr:="${PKGNAME%-[0-9]*} $user user"} : ${home:="${PKG_USER_HOME}"} : ${shell:="${PKG_USER_SHELL}"} shadow_dir="${PKG_REFCOUNT_USERS_DBDIR}/$user" |