Switch from old way to new way by using USERS.

PR:		ports/164187
Submitted by:	crees

6 files changed, 7 insertions, 112 deletions

diff --git a/UIDs b/UIDs
index 7df319de843b..fe525a863440 100644
--- a/UIDs
+++ b/UIDs
@@ -173,6 +173,7 @@ distcc:*:561:561::0:0:Distcc user:/nonexistent:/usr/sbin/nologin
 polkit:*:562:562::0:0:PolicyKit User:/nonexistent:/usr/sbin/nologin
 pulse:*:563:563::0:0:PulseAudio System User:/nonexistent:/usr/sbin/nologin
 assp:*:587:587::0:0:ASSP Anti-Spam Proxy:/var/db/assp:/usr/sbin/nologin
+avahi-autoipd:*:588:588::0:0:Avahi Autoipd Daemon user:/nonexistent:/usr/sbin/nologin
 _xsi:*:600:600::0:0:XMLSysInfo User:/nonexistent:/usr/sbin/nologin
 _tss:*:601:601:daemon:0:0:TrouSerS user:/var/empty:/usr/sbin/nologin
 _pkcs11:*:602:602:daemon:0:0:opencryptoki user:/var/empty:/usr/sbin/nologin
diff --git a/net/avahi-app/Makefile b/net/avahi-app/Makefile
index 7e3d2047265f..311a9a70cc8d 100644
--- a/net/avahi-app/Makefile
+++ b/net/avahi-app/Makefile
@@ -23,6 +23,9 @@ LIB_DEPENDS?=	expat.6:${PORTSDIR}/textproc/expat2 \
 		gdbm.4:${PORTSDIR}/databases/gdbm
 RUN_DEPENDS?=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
 
+USERS?=		${PORTNAME}
+GROUPS?=	${USERS}
+
 USE_GNOME?=	gnomehack ltverhack glib20 intltool
 USE_GETTEXT=	yes
 USE_GNOME_SUBR=	yes
@@ -170,8 +173,5 @@ avahi-post-install:
 	${INSTALL_DATA} ${FILESDIR}/org.freedesktop.Avahi.service \
 		${LOCALBASE}/share/dbus-1/system-services
 .endif
-.if !defined(PACKAGE_BUILDING) && (${AVAHI_SLAVE}=="no" || ${AVAHI_SLAVE}=="autoipd")
-	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.endif
 
 .include <bsd.port.post.mk>
diff --git a/net/avahi-app/pkg-install b/net/avahi-app/pkg-install
deleted file mode 100644
index 9bbd14bce237..000000000000
--- a/net/avahi-app/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
-	USER=avahi
-	GROUP=${USER}
-	UID=558
-	GID=${UID}
-	PW=/usr/sbin/pw
-
-	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} -g ${GID}; 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} -u ${UID} -g ${GROUP} -h - \
-			-d "/nonexistent" -s /sbin/nologin -c "Avahi Daemon User"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-	exit 0
-	;;
-esac
diff --git a/net/avahi-autoipd/Makefile b/net/avahi-autoipd/Makefile
index 2f937e955c3d..058b3c008eff 100644
--- a/net/avahi-autoipd/Makefile
+++ b/net/avahi-autoipd/Makefile
@@ -15,6 +15,9 @@ COMMENT=	IPv4LL network address configuration daemon
 
 LIB_DEPENDS=	avahi-common.3:${PORTSDIR}/net/avahi-app
 
+USERS=		avahi-autoipd
+GROUPS=		${USERS}
+
 MASTERDIR=	${.CURDIR}/../avahi-app
 BUILD_WRKSRC=	${WRKSRC}/avahi-autoipd
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
@@ -25,6 +28,5 @@ AVAHI_SLAVE=	autoipd
 
 MAN8=		avahi-autoipd.8
 USE_GNOME=	gnomehack ltverhack intltool
-PKGINSTALL=	${.CURDIR}/pkg-install
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/avahi-autoipd/pkg-install b/net/avahi-autoipd/pkg-install
deleted file mode 100644
index bcc892b76356..000000000000
--- a/net/avahi-autoipd/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
-	USER=avahi-autoipd
-	GROUP=${USER}
-	UID=588
-	GID=${UID}
-	PW=/usr/sbin/pw
-
-	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} -g ${GID}; 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} -u ${UID} -g ${GROUP} -h - \
-			-d "/nonexistent" -s /sbin/nologin -c "Avahi Autoipd Daemon User"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-	exit 0
-	;;
-esac
diff --git a/net/avahi-libdns/pkg-install b/net/avahi-libdns/pkg-install
deleted file mode 100644
index 6e85e6e88d90..000000000000
--- a/net/avahi-libdns/pkg-install
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-case $2 in
-POST-INSTALL)
-	USER=avahi-autoipd
-	GROUP=${USER}
-	UID=588
-	GID=${UID}
-	PW=/usr/sbin/pw
-
-	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} -g ${GID}; 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} -u ${UID} -g ${GROUP} -h - \
-			-d "/nonexistent" -s /sbin/nologin -c "Avahi Daemon User"
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-	exit 0
-	;;
-esac