1 files changed, 6 insertions, 35 deletions
diff --git a/misc/jitterbug/pkg/REQ b/misc/jitterbug/pkg/REQ
index 0c7c25a0ac1..607dcb3a2b8 100644
--- a/misc/jitterbug/pkg/REQ
+++ b/misc/jitterbug/pkg/REQ
@@ -1,17 +1,14 @@
 #!/bin/sh
 #
-# $NetBSD: REQ,v 1.3 2000/08/18 16:22:40 wiz Exp $
+# $NetBSD: REQ,v 1.4 2000/09/12 17:23:02 wennmach Exp $
 
 JB_USER=@JB_USER@
 JB_USERID=@JB_USERID@
 JB_GROUP=@JB_GROUP@
 JB_GROUPID=@JB_GROUPID@
-JB_LOCALMAIL=@JB_LOCALMAIL@
-JB_PACKAGE=@JB_PACKAGE@
 PREFIX=@PREFIX@
 ADDUSER=@ADDUSER@
 ADDGROUP=@ADDGROUP@
-FILESDIR=@FILESDIR@
 
 PKG=$1
 STAGE=$2
@@ -23,8 +20,6 @@ fi
 
 # Add group first 
 #
-# NB: Ahem, this will not work with NIS, kerberos or hesiod.
-# Will have to rework this, e.g. using finger (wennmach)
 
 if grep "^${JB_GROUP}:" /etc/group 2>&1 >/dev/null
 then
@@ -45,39 +40,15 @@ fi
 if finger ${JB_USER} 2>&1 | grep >/dev/null "no such user"
 then
 	echo "Creating '$JB_USER' user ..."
-	${ADDUSER} -d ${PREFIX} -u ${JB_USERID} -g ${JB_GROUP} ${JB_USER}
+	${ADDUSER} -c "Jitterbug Administrator"				\
+		   -b ${PREFIX}						\
+		   -u ${JB_USERID}					\
+		   -g ${JB_GROUP}					\
+			 ${JB_USER}
 	echo Done.
 else
 	echo "User '$JB_USER' already exists, proceeding."
 fi
 
-if grep "^${JB_LOCALMAIL}:" /etc/aliases 2>&1 >/dev/null
-then
-	echo "'${JB_LOCALMAIL}' alias already exists, proceeding."
-else
-	echo "Adding alias ${JB_LOCALMAIL} to /etc/aliases ..."
-	echo "" >> /etc/aliases
-	echo "# entry for jitterbug" >> /etc/aliases
-	echo "${JB_LOCALMAIL}: \"|${PREFIX}/${JB_USER}/bin/new_message\"" >> /etc/aliases
-	echo "Running newaliases ..."
-	newaliases
-fi
 
-if grep "^# jitterbug config for package ${JB_PACKAGE}" ${PREFIX}/etc/httpd/httpd.conf 2>&1 >/dev/null
-then
-	echo "config lines for ${JB_PACKAGE} already in ${PREFIX}/etc/httpd/httpd.conf, proceeding."
-else
-	echo "Adding config lines for ${JB_PACKAGE} to ${PREFIX}/etc/httpd/httpd.conf ..."
-	sed \
-		-e 's|%JB_PACKAGE%|@JB_PACKAGE@|g' \
-		-e 's|%JB_USER%|@JB_USER@|g' \
-		-e 's|%PREFIX%|@PREFIX@|g' \
-			<  ${FILESDIR}/httpd.conf \
-			>> ${PREFIX}/etc/httpd/httpd.conf
-	if [ -e /var/run/httpd.pid ]; then
-		echo -n "Restarting httpd ..."
-		kill -USR1 `cat /var/run/httpd.pid` 2>&1 >/dev/null || echo -n " failed."
-		echo " "
-	fi
-fi
 exit 0