This port uses pkg-install to create new users instead of using USERS= and GROUPS=.

Fix: - Use USERS and GROUPS

	Submitted by: Chris Rees (utisoft@gmail.com)

	This depends on ports/157528 for the UIDs patch




-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.--jncgmbQkv2ou0nu54jj0aWWPCInCRCnL6CvJ1d078O10am2Y
Content-Type: text/plain; name="dns-dnrd.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="dns-dnrd.patch"

Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/dns/dnrd/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- Makefile	21 Aug 2008 06:16:53 -0000	1.30
+++ Makefile	2 Jun 2011 15:16:50 -0000
@@ -28,14 +28,12 @@
 		DEBUG "Enable debugging" off \
 		RANDOM "Enable random source port" off
 
-DNRD_USER?=	dnrd
-DNRD_GROUP?=	dnrd
+USERS=		dnrd
+GROUPS=		dnrd
 DNRD_DIR?=	${ETCDIR}
 
 SUB_FILES=	pkg-install
-SUB_LIST+=	DNRD_USER=${DNRD_USER} \
-		DNRD_GROUP=${DNRD_GROUP} \
-		DNRD_DIR=${DNRD_DIR}
+SUB_LIST+=	DNRD_DIR=${DNRD_DIR}
 
 .include <bsd.port.pre.mk>
 
@@ -55,10 +53,6 @@
 CONFIGURE_ARGS+=	--enable-random-src
 .endif
 
-pre-install:
-	@${ECHO} "==>  Creating custom user to run dnrd..."
-	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 do-install:
 	@${ECHO} "==>  Creating dnrd directory"
 	@${SETENV} PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
Index: pkg-install
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/dns/dnrd/pkg-install,v
retrieving revision 1.1
diff -u -r1.1 pkg-install
--- pkg-install	6 Sep 2005 12:10:46 -0000	1.1
+++ pkg-install	2 Jun 2011 15:14:30 -0000
@@ -1,34 +1,9 @@
 #!/bin/sh
 
 
-USER=${DNRDUSER:-dnrd}
-GROUP=${USER}
 SYSCONF_DIR=${SYSCONF_DIR:-${PKG_PREFIX}/etc/dnrd}
 
 case $2 in
-	PRE-INSTALL)
-		if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
-			if pw groupadd ${GROUP}; then
-				echo "Added group \"${GROUP}\"."
-			else
-				echo "Adding group \"${GROUP}\" failed..."
-				exit 1
-			fi
-		fi
-
-		if ! pw usershow "${USER}" 2>/dev/null 1>&2; then
-			if pw useradd ${USER} -g ${GROUP} -h - \
-				-s "/sbin/nologin" -d "/var/empty" \
-				-c "DNRD daemon"; \
-			then
-				echo "Added user \"${USER}\"."
-			else
-				echo "Adding user \"${USER}\" failed..."
-				exit 1
-			fi
-		fi
-		;;
-
 	POST-INSTALL)
 		if [ ! -d ${SYSCONF_DIR} ]; then
 			mkdir -p ${SYSCONF_DIR}