3 files changed, 18 insertions, 6 deletions
diff --git a/mk/install/usergroupfuncs b/mk/install/usergroupfuncs
index 3cef087cc6e..bf330d7dfbf 100644
--- a/mk/install/usergroupfuncs
+++ b/mk/install/usergroupfuncs
@@ -1,4 +1,4 @@
-# $NetBSD: usergroupfuncs,v 1.6 2006/04/24 23:44:18 jlam Exp $
+# $NetBSD: usergroupfuncs,v 1.7 2006/04/27 22:44:09 jlam Exp $
 #
 # Default implementations of user_exists() and group_exists() shell
 # functions for checking the existence of users and groups, and of
@@ -96,7 +96,11 @@ adduser()
 
 	USERADD="@USERADD@"
 
-	: ${descr:="${PKGNAME%-[0-9]*} $user user"}
+	case $user in
+	${PKGNAME%-[0-9]*})	descr_dflt="$user user" ;;
+	*)			descr_dflt="${PKGNAME%-[0-9]*} $user user" ;;
+	esac
+	: ${descr:="$descr_dflt"}
 	: ${home:="@PKG_USER_HOME@"}
 	: ${shell:="@PKG_USER_SHELL@"}
 
diff --git a/mk/install/usergroupfuncs.DragonFly b/mk/install/usergroupfuncs.DragonFly
index 2d99ecfcefb..d802aa6467a 100644
--- a/mk/install/usergroupfuncs.DragonFly
+++ b/mk/install/usergroupfuncs.DragonFly
@@ -1,4 +1,4 @@
-# $NetBSD: usergroupfuncs.DragonFly,v 1.4 2006/04/24 23:44:18 jlam Exp $
+# $NetBSD: usergroupfuncs.DragonFly,v 1.5 2006/04/27 22:44:09 jlam Exp $
 #
 # Platform-specific adduser and addgroup functionality
 # on top of pw(8).
@@ -88,7 +88,11 @@ adduser()
 
 	PW="@PW@"
 
-	: ${descr:="${PKGNAME%-[0-9]*} $user user"}
+	case $user in
+	${PKGNAME%-[0-9]*})	descr_dflt="$user user" ;;
+	*)			descr_dflt="${PKGNAME%-[0-9]*} $user user" ;;
+	esac
+	: ${descr:="$descr_dflt"}
 	: ${home:="@PKG_USER_HOME@"}
 	: ${shell:="@PKG_USER_SHELL@"}
 
diff --git a/mk/install/usergroupfuncs.FreeBSD b/mk/install/usergroupfuncs.FreeBSD
index 1da92949eec..31f14b9074a 100644
--- a/mk/install/usergroupfuncs.FreeBSD
+++ b/mk/install/usergroupfuncs.FreeBSD
@@ -1,4 +1,4 @@
-# $NetBSD: usergroupfuncs.FreeBSD,v 1.4 2006/04/24 23:44:18 jlam Exp $
+# $NetBSD: usergroupfuncs.FreeBSD,v 1.5 2006/04/27 22:44:09 jlam Exp $
 #
 # Platform-specific adduser and addgroup functionality
 # on top of pw(8).
@@ -88,7 +88,11 @@ adduser()
 
 	PW="@PW@"
 
-	: ${descr:="${PKGNAME%-[0-9]*} $user user"}
+	case $user in
+	${PKGNAME%-[0-9]*})	descr_dflt="$user user" ;;
+	*)			descr_dflt="${PKGNAME%-[0-9]*} $user user" ;;
+	esac
+	: ${descr:="$descr_dflt"}
 	: ${home:="@PKG_USER_HOME@"}
 	: ${shell:="@PKG_USER_SHELL@"}