5 files changed, 12 insertions, 59 deletions
diff --git a/audio/umurmur/Makefile b/audio/umurmur/Makefile
index 20c4027e13b8..494654e94a6f 100644
--- a/audio/umurmur/Makefile
+++ b/audio/umurmur/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	umurmur
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.1
-PORTREVISION=	1
+PORTREVISION=	3
 CATEGORIES=	audio net
 
 MAINTAINER=	bofh@FreeBSD.org
@@ -18,6 +18,14 @@ USES=		cmake ssl
 USE_GITHUB=	yes
 USE_RC_SUBR=	umurmur
 
+USERS=	${PORTNAME}
+GROUPS=	${PORTNAME}
+
+PLIST_SUB=	USER=${USERS} \
+		GROUP=${GROUPS}
+
+SUB_LIST=	USER=${USERS}
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/conf.c
 	@${REINPLACE_CMD} \
@@ -27,5 +35,6 @@ post-patch:
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/umurmur
 	${INSTALL_DATA} ${WRKSRC}/umurmur.conf.example ${STAGEDIR}${PREFIX}/etc/umurmur/umurmur.conf.sample
+	${MKDIR} ${STAGEDIR}/var/run/umurmur
 
 .include <bsd.port.mk>
diff --git a/audio/umurmur/files/umurmur.in b/audio/umurmur/files/umurmur.in
index b646450f1589..9f047d9bd1af 100644
--- a/audio/umurmur/files/umurmur.in
+++ b/audio/umurmur/files/umurmur.in
@@ -30,6 +30,6 @@ load_rc_config $name
 
 # Set some defaults
 : ${umurmur_enable="NO"}
-: ${umurmur_user="umurmur"}
+: ${umurmur_user="%%USER%%"}
 
 run_rc_command "$1"
diff --git a/audio/umurmur/pkg-deinstall b/audio/umurmur/pkg-deinstall
deleted file mode 100644
index 1d37d16c0668..000000000000
--- a/audio/umurmur/pkg-deinstall
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-USER=umurmur
-GROUP=umurmur
-RUNDIR=/var/run/umurmur
-
-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/umurmur/pkg-install b/audio/umurmur/pkg-install
deleted file mode 100644
index dde800ab3d60..000000000000
--- a/audio/umurmur/pkg-install
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/sbin
-USER=umurmur
-GROUP=umurmur
-HOME=/nonexistent
-RUNDIR=/var/run/umurmur
-
-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 "uMurmur"
-			then
-				echo "Added user \"${USER}\"."
-			else
-				echo "Adding user \"${USER}\" failed..."
-				exit 1
-			fi
-		fi
-
-		mkdir -m 750 ${RUNDIR} 2> /dev/null
-		chown -R ${USER}:${GROUP} ${RUNDIR}
-
-		;;
-esac
diff --git a/audio/umurmur/pkg-plist b/audio/umurmur/pkg-plist
index 805808383342..5954e14ad9bb 100644
--- a/audio/umurmur/pkg-plist
+++ b/audio/umurmur/pkg-plist
@@ -1,2 +1,3 @@
 @sample etc/umurmur/umurmur.conf.sample
 bin/umurmurd
+@dir(%%USER%%,%%GROUP%%,750) /var/run/umurmur