aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--GIDs1
-rw-r--r--UIDs1
-rw-r--r--net/gini/Makefile5
-rw-r--r--net/gini/pkg-install37
4 files changed, 4 insertions, 40 deletions
diff --git a/GIDs b/GIDs
index 057ecd310809..45f7de12eebb 100644
--- a/GIDs
+++ b/GIDs
@@ -97,6 +97,7 @@ sympa:*:200:
dspam:*:202:
yate:*:204:
gnugk:*:205:
+gini:*:206:
shoutcast:*:210:
git:*:211:
hg:*:212:
diff --git a/UIDs b/UIDs
index 0d376b30cdb9..e0056b86ead5 100644
--- a/UIDs
+++ b/UIDs
@@ -104,6 +104,7 @@ privoxy:*:201:201::0:0:Privoxy proxy user:/nonexistent:/usr/sbin/nologin
dspam:*:202:202::0:0:Dspam:/nonexistent:/usr/sbin/nologin
yate:*:204:204::0:0:Yate:/nonexistent:/usr/sbin/nologin
gnugk:*:205:205::0:0:GNU GateKeeper pseudo-user:/nonexistent:/usr/sbin/nologin
+gini:*:206:206::0:0:& streaming server:/var/log/gini:/usr/sbin/nologin
shoutcast:*:210:210::0:0:Shoutcast sandbox:/nonexistent:/bin/sh
git:*:211:211::0:0:gitosis user:/usr/local/git:/bin/sh
hg:*:212:212::0:0:mercurial-server user:/usr/local/hg:/bin/sh
diff --git a/net/gini/Makefile b/net/gini/Makefile
index 193e93346a3e..1ac6c1a7ed7f 100644
--- a/net/gini/Makefile
+++ b/net/gini/Makefile
@@ -21,13 +21,12 @@ USE_GNOME= glib12
GNU_CONFIGURE= yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
USE_GMAKE= yes
+USERS= ${PORTNAME}
+GROUPS= ${USERS}
MAN1= ginicon.1 ginifeed.1
MAN8= gini.8
-pre-install:
- @${SETENV} ${SCRIPTS_ENV} ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
post-install:
${INSTALL_SCRIPT} ${FILESDIR}/gini.sh.sample ${PREFIX}/etc/rc.d
.if !defined(NOPORTDOCS)
diff --git a/net/gini/pkg-install b/net/gini/pkg-install
deleted file mode 100644
index 1024c4cc7230..000000000000
--- a/net/gini/pkg-install
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-LOGDIR=/var/log/gini
-
-case $2 in
-PRE-INSTALL)
- USER=gini
- GROUP=${USER}
-
- if pw group show "${GROUP}" 2>/dev/null; then
- echo "You already have a group \"${GROUP}\", so I will use it."
- else
- if pw groupadd ${GROUP}; then
- echo "Added group \"${GROUP}\"."
- else
- echo "Adding group \"${GROUP}\" failed..."
- exit 1
- fi
- fi
-
- if pw user show "${USER}" 2>/dev/null; then
- echo "You already have a user \"${USER}\", so I will use it."
- else
- if pw useradd ${USER} -g ${GROUP} -h - \
- -s /sbin/nologin -d /nonexistent -c 'GINI streaming server'
- then
- echo "Added user \"${USER}\"."
- else
- echo "Adding user \"${USER}\" failed..."
- exit 1
- fi
- fi
-
- mkdir -p ${LOGDIR}
- chown -R gini:gini ${LOGDIR}
- ;;
-esac