2 files changed, 4 insertions, 67 deletions

diff --git a/audio/pulseaudio/Makefile b/audio/pulseaudio/Makefile
index aa0fa5bb9911..3889fa8fcb46 100644
--- a/audio/pulseaudio/Makefile
+++ b/audio/pulseaudio/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pulseaudio
 PORTVERSION=	0.9.15
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	audio
 MASTER_SITES=	http://0pointer.de/lennart/projects/${PORTNAME}/
 
@@ -41,6 +41,9 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--disable-lirc # untested
 
+USERS=		pulse
+GROUPS=		pulse pulse-access pulse-rt
+
 OPTIONS=	JACK "JACK audio support" Off \
 		AVAHI "Enable Avahi mDNS support" On \
 		HAL "Enable HAL support" On \
@@ -114,9 +117,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/src/${ii} \
 		${PREFIX}/etc/pulse/${ii}-dist
 .endfor
-.if !defined(PACKAGE_BUILDING)
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/audio/pulseaudio/pkg-install b/audio/pulseaudio/pkg-install
deleted file mode 100644
index 118fd3ef2bba..000000000000
--- a/audio/pulseaudio/pkg-install
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
-	RGROUP=pulse-rt
-	SUSER=pulse
-	SGROUP=${SUSER}
-	AGROUP=pulse-access
-	SUID=563
-	RGID=557
-	SGID=${SUID}
-	AGID=564
-	PW=/usr/sbin/pw
-
-	if ${PW} group show "${RGROUP}" 2>/dev/null; then
-		echo "You already have a group \"${RGROUP}\", so I will use it."
-	else
-		if ${PW} groupadd ${RGROUP} -g ${RGID}; then
-			echo "Added group \"${RGROUP}\"."
-		else
-			echo "Adding group \"${RGROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ${PW} group show "${SGROUP}" 2>/dev/null; then
-		echo "You already have a group \"${SGROUP}\", so I will use it."
-	else
-		if ${PW} groupadd ${SGROUP} -g ${SGID}; then
-			echo "Added group \"${SGROUP}\"."
-		else
-			echo "Adding group \"${SGROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ${PW} group show "${AGROUP}" 2>/dev/null; then
-		echo "You already have a group \"${AGROUP}\", so I will use it."
-	else
-		if ${PW} groupadd ${AGROUP} -g ${AGID}; then
-			echo "Added group \"${AGROUP}\"."
-		else
-			echo "Adding group \"${AGROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ${PW} user show "${SUSER}" 2>/dev/null; then
-	    echo "You already have a user \"${SUSER}\", so I will use it."
-	else
-	    if ${PW} useradd ${SUSER} -u ${SUID} -g ${SGROUP} -h - \
-		-d "/nonexistent" -s /sbin/nologin -c "PulseAudio System User"
-	    then
-		echo "Added user \"${SUSER}\"."
-	    else
-		echo "Adding user \"${SUSER}\" failed..."
-		exit 1
-	    fi
-	fi
-	echo ""
-	exit 0
-	;;
-esac