summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/jitterbug/Makefile15
-rw-r--r--misc/jitterbug/pkg/REQ9
2 files changed, 17 insertions, 7 deletions
diff --git a/misc/jitterbug/Makefile b/misc/jitterbug/Makefile
index c42f8fa29a5..a36adb39398 100644
--- a/misc/jitterbug/Makefile
+++ b/misc/jitterbug/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2000/01/06 17:02:47 wennmach Exp $
+# $NetBSD: Makefile,v 1.10 2000/08/18 16:22:38 wiz Exp $
DISTNAME= jitterbug-1.6.2
WRKSRC= ${WRKDIR}/${PKGNAME}/source
@@ -8,9 +8,17 @@ MASTER_SITES= ftp://jitterbug.samba.org/pub/jitterbug/
MAINTAINER= wennmach@netbsd.org
HOMEPAGE= http://jitterbug.samba.org/
-DEPENDS+= addnerd-1.6:../../sysutils/addnerd
DEPENDS+= apache-1.3.*:../../www/apache
+.if exists(/usr/sbin/user)
+ADDUSER= /usr/sbin/useradd
+ADDGROUP= /usr/sbin/groupadd
+.else
+DEPENDS+= user>=20000313:../../sysutils/user
+ADDUSER= ${LOCALBASE}/sbin/useradd
+ADDGROUP= ${LOCALBASE}/sbin/groupadd
+.endif
+
PLIST_SRC= ${WRKDIR}/PLIST-src
REQ_FILE= ${WRKDIR}/REQ
DEINSTALL_FILE= ${WRKDIR}/DEINSTALL
@@ -122,7 +130,8 @@ pre-install:
-e 's|@JB_LOCALMAIL@|${JB_LOCALMAIL}|g' \
-e 's|@JB_PACKAGE@|${JB_PACKAGE}|g' \
-e 's|@PREFIX@|${PREFIX}|g' \
- -e 's|@LOCALBASE@|${LOCALBASE}|g' \
+ -e 's|@ADDUSER@|${ADDUSER}|g' \
+ -e 's|@ADDGROUP@|${ADDGROUP}|g' \
-e 's|@FILESDIR@|${FILESDIR}|g' \
<${PKGDIR}/REQ \
>${REQ_FILE}
diff --git a/misc/jitterbug/pkg/REQ b/misc/jitterbug/pkg/REQ
index 25ebc864a35..0c7c25a0ac1 100644
--- a/misc/jitterbug/pkg/REQ
+++ b/misc/jitterbug/pkg/REQ
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: REQ,v 1.2 1999/10/11 13:39:34 wennmach Exp $
+# $NetBSD: REQ,v 1.3 2000/08/18 16:22:40 wiz Exp $
JB_USER=@JB_USER@
JB_USERID=@JB_USERID@
@@ -9,7 +9,8 @@ JB_GROUPID=@JB_GROUPID@
JB_LOCALMAIL=@JB_LOCALMAIL@
JB_PACKAGE=@JB_PACKAGE@
PREFIX=@PREFIX@
-ADDNERD=@LOCALBASE@/sbin/addnerd
+ADDUSER=@ADDUSER@
+ADDGROUP=@ADDGROUP@
FILESDIR=@FILESDIR@
PKG=$1
@@ -36,7 +37,7 @@ then
exit 1
else
echo "Adding group $JB_GROUP (gid $JB_GROUPID) to /etc/group ..."
- echo "$JB_GROUP:*:$JB_GROUPID:" >> /etc/group
+ ${ADDGROUP} -g ${JB_GROUPID} ${JB_GROUP}
fi
fi
@@ -44,7 +45,7 @@ fi
if finger ${JB_USER} 2>&1 | grep >/dev/null "no such user"
then
echo "Creating '$JB_USER' user ..."
- ${ADDNERD} -h ${PREFIX} -u ${JB_USERID} -g ${JB_GROUP} ${JB_USER}
+ ${ADDUSER} -d ${PREFIX} -u ${JB_USERID} -g ${JB_GROUP} ${JB_USER}
echo Done.
else
echo "User '$JB_USER' already exists, proceeding."