Drop use of INSTALL_SRC and DEINSTALL_SRC and instead set the proper

variables so that the default INSTALL/DEINSTALL scripts from the
pkginstall framework do the right thing.  Where possible, move some
post-install directions for package setup into MESSAGE files so that
they may be re-inspected by querying the installed package using
"pkg_info -D ...".

4 files changed, 10 insertions, 86 deletions

diff --git a/parallel/glunix/DEINSTALL b/parallel/glunix/DEINSTALL
deleted file mode 100644
index 81b7b4a3553..00000000000
--- a/parallel/glunix/DEINSTALL
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.1 2001/10/31 22:58:14 zuntum Exp $
-#
-
-if [ "$2" != "POST-DEINSTALL" ]; then
-    exit 0
-fi
-
-if ! user del glunix
-then
-    echo Removing user \'glunix\' failed, please remove him manually.
-fi
-if ! group del glunix
-then
-    echo Removing group  \'glunix\' failed, please remove it manually.
-fi
diff --git a/parallel/glunix/INSTALL b/parallel/glunix/INSTALL
deleted file mode 100644
index d47a10a8b01..00000000000
--- a/parallel/glunix/INSTALL
+++ /dev/null
@@ -1,35 +0,0 @@
-# $NetBSD: INSTALL,v 1.1 2001/10/31 22:58:15 zuntum Exp $
-#
-
-if [ "$2" != "PRE-INSTALL" ]; then
-    exit 0
-fi
-
-if [ -f /usr/sbin/user ]
-then
-    USER_CMD=/usr/sbin/user
-    GROUP_CMD=/usr/sbin/group
-else
-    if [ -f ${PKG_PREFIX}/sbin/user ]
-    then
-	USER_CMD=${PKG_PREFIX}/sbin/user
-	GROUP_CMD=${PKG_PREFIX}/sbin/group
-    else
-	echo
-	echo Please install the sysutils/user first!
-	echo
-	exit 0
-    fi
-fi
-
-if `${GROUP_CMD} info -e glunix` ; then \
-	${ECHO} Group \'glunix\' already exists.; \
-else \
-	${GROUP_CMD} add glunix; \
-fi
-if `${USER_CMD} info -e glunix` ; then \
-	${ECHO} User \'glunix\' already exists.; \
-else \
-	${USER_CMD} add -g glunix -d /nonexistent -s \
-		${PKG_PREFIX}/now/bin/glush glunix; \
-fi
diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile
index 44b04d1cc0b..74dd8caf08e 100644
--- a/parallel/glunix/Makefile
+++ b/parallel/glunix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2006/03/14 01:14:32 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2006/07/05 06:53:13 jlam Exp $
 
 DISTNAME=	glunix-release-1-0a
 PKGNAME=	glunix-1.0a
@@ -34,17 +34,12 @@ MAKE_ENV+= OPSYS=${OPSYS:Q} ARCH=${MACHINE_ARCH:Q} NOW_ROOT=${NOW_ROOT:Q}
 MAKE_ENV+= PORTSDIR=${PKGDIR:Q} WRKDIR=${WRKDIR:Q} FLAGS=${FLAGS:Q}
 MAKE_ENV+= SSH=${SSH:Q}
 
-.if exists(/usr/sbin/user)
-USER_CMD=       /usr/sbin/user
-GROUP_CMD=      /usr/sbin/group
-.else
-DEPENDS+=       user>=20000313:../../sysutils/user
-USER_CMD=       ${LOCALBASE}/sbin/user
-GROUP_CMD=      ${LOCALBASE}/sbin/group
-.endif
+PKG_GROUPS=		glunix
+PKG_USERS=		glunix:glunix
+PKG_SHELL.glunix=	${NOW_ROOT}/bin/glush
+USERGROUP_PHASE=	configure
 
-DEINSTALL_SRC=	${PKGDIR}/DEINSTALL
-INSTALL_SRC=	${PKGDIR}/INSTALL
+PKG_SHELL=		${NOW_ROOT}/bin/glush
 
 post-patch:
 	cd ${WRKSRC};							\
@@ -60,31 +55,12 @@ post-patch:
 		${SED} -e 's|%%%PLAT%%%|${MACHINE_ARCH}-NetBSD-tcp|'	\
 			progs/glush/Makefile.input > progs/glush/Makefile
 
-# the glunix group needs to exist before building.
 pre-configure:
 	${CP} ${FILESDIR}/Makefile-2 ${WRKSRC}/Makefile
-	@if `${GROUP_CMD} info -e glunix`; then				\
-		${ECHO} Group \'glunix\' already exists.;		\
-	else								\
-		${GROUP_CMD} add glunix;				\
-	fi
-
-pre-install:
-	@${ECHO} "updating /etc/shells";
-	${CP} /etc/shells /etc/shells.bak;
-	( ${GREP} -v ${NOW_ROOT}/bin/glush /etc/shells.bak;		\
-		${ECHO} ${NOW_ROOT}/bin/glush				\
-	) >/etc/shells
-	@if `${USER_CMD} info -e glunix`; then				\
-		${ECHO} User \'glunix\' already exists.;		\
-	else								\
-		${USER_CMD} add -g glunix -d /nonexistent		\
-			-s ${NOW_ROOT}/bin/glush glunix;		\
-	fi;
 
 post-install:
-	@${LN} -s ../../now/lib/libglunix.so.1.0 ${PREFIX}/now/lib/libglunix.so.1
-	@${LN} -s ../../now/lib/libglunix.so.1.0 ${PREFIX}/now/lib/libglunix.so
-	@${TOUCH} ${NOW_ROOT}/lib/${MACHINE_ARCH}-${OPSYS}-tcp/.keepme
+	${LN} -s libglunix.so.1.0 ${PREFIX}/now/lib/libglunix.so.1
+	${LN} -s libglunix.so.1.0 ${PREFIX}/now/lib/libglunix.so
+	${TOUCH} ${NOW_ROOT}/lib/${MACHINE_ARCH}-${OPSYS}-tcp/.keepme
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/parallel/glunix/PLIST b/parallel/glunix/PLIST
index 2710e28055f..2bcbc463bfc 100644
--- a/parallel/glunix/PLIST
+++ b/parallel/glunix/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2005/05/29 11:23:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/07/05 06:53:13 jlam Exp $
 now/bin/${MACHINE_ARCH}-${OPSYS}-tcp/daemon
 now/bin/${MACHINE_ARCH}-${OPSYS}-tcp/master
 now/bin/GLUnix-bin
@@ -26,8 +26,6 @@ now/bin/glups
 now/bin/gluptime
 now/bin/glurun
 now/bin/glush
-@exec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (/usr/bin/grep -v %D/%F /etc/shells.bak; echo %D/%F) >/etc/shells
-@unexec echo "updating /etc/shells"; cp /etc/shells /etc/shells.bak; (/usr/bin/grep -v %D/%F /etc/shells.bak) >/etc/shells
 now/bin/glustat
 now/bin/glutestnode
 now/bin/mhtml2html