diff options
| author | crees <crees@FreeBSD.org> | 2011-06-26 03:55:42 +0800 |
|---|---|---|
| committer | crees <crees@FreeBSD.org> | 2011-06-26 03:55:42 +0800 |
| commit | c9ce4b84d6f36cf80f956451aa6e75544b5e4c1c (patch) | |
| tree | bfe874360df6680cdbe544e1785de2e8b36d535f /audio/murmur | |
| parent | c3bb592c0635da97fa11582b36b76f07e9919ceb (diff) | |
| download | freebsd-ports-gnome-c9ce4b84d6f36cf80f956451aa6e75544b5e4c1c.tar.gz freebsd-ports-gnome-c9ce4b84d6f36cf80f956451aa6e75544b5e4c1c.tar.zst freebsd-ports-gnome-c9ce4b84d6f36cf80f956451aa6e75544b5e4c1c.zip | |
- Use USERS and GROUPS
- Stop automatically deleting user on deinstall; may be used by other ports
PR: ports/157520
Submitted by: Chris Rees (utisoft@gmail.com) (me)
Approved by: tabthorpe (co-mentor)
Diffstat (limited to 'audio/murmur')
| -rw-r--r-- | audio/murmur/Makefile | 2 | ||||
| -rw-r--r-- | audio/murmur/pkg-deinstall | 10 | ||||
| -rw-r--r-- | audio/murmur/pkg-install | 24 |
3 files changed, 2 insertions, 34 deletions
diff --git a/audio/murmur/Makefile b/audio/murmur/Makefile index 8b344c9b3a95..46f145558e55 100644 --- a/audio/murmur/Makefile +++ b/audio/murmur/Makefile @@ -18,6 +18,8 @@ COMMENT= Murmur is the server component of Mumble BUILD_DEPENDS= ${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs LIB_DEPENDS= protobuf.7:${PORTSDIR}/devel/protobuf +USERS= ${PORTNAME} +GROUPS= ${USERS} USE_QT_VER= 4 QT_COMPONENTS= qmake_build moc_build corelib network xml sql sql-sqlite3_run diff --git a/audio/murmur/pkg-deinstall b/audio/murmur/pkg-deinstall index 4ee32a8205ad..e6da8c4bb052 100644 --- a/audio/murmur/pkg-deinstall +++ b/audio/murmur/pkg-deinstall @@ -2,20 +2,10 @@ # $FreeBSD$ PATH=/bin:/usr/sbin -USER=murmur -GROUP=murmur RUNDIR=/var/run/murmur case $2 in POST-DEINSTALL) - if pw group show ${GROUP} 2>&1 > /dev/null; then - echo "You should manually remove the \"${GROUP}\" group." - fi - - if pw user show ${USER} 2>&1 > /dev/null; then - echo "You should manually remove the \"${USER}\" user." - fi - rm -Rf ${RUNDIR} ;; esac diff --git a/audio/murmur/pkg-install b/audio/murmur/pkg-install index 67483e1112a9..93a652d7170a 100644 --- a/audio/murmur/pkg-install +++ b/audio/murmur/pkg-install @@ -2,36 +2,12 @@ # $FreeBSD$ PATH=/bin:/usr/sbin -USER=murmur -GROUP=murmur -HOME=/nonexistent LOGDIR=/var/log/murmur RUNDIR=/var/run/murmur DBDIR=/var/db/murmur case $2 in PRE-INSTALL) - if pw group show ${GROUP} 2> /dev/null; then - 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 - else - if pw useradd ${USER} -g ${GROUP} -h - \ - -d ${HOME} -c "Murmur" - then - echo "Added user \"${USER}\"." - else - echo "Adding user \"${USER}\" failed..." - exit 1 - fi - fi mkdir -m 750 ${LOGDIR} ${DBDIR} ${RUNDIR} 2> /dev/null chown -R ${USER}:${GROUP} ${LOGDIR} ${DBDIR} ${RUNDIR} |