157589 – Fix port: irc/ptlink-services should use USERS

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)

	Please note that pkg-install has been removed




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

Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/irc/ptlink-services/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile

--- Makefile	19 Mar 2011 13:15:23 -0000	1.12
+++ Makefile	2 Jun 2011 19:44:11 -0000
@@ -21,6 +21,9 @@
 USE_PERL5=	yes
 USE_MYSQL=	yes
 
+USERS=		ircd
+GROUPS=		${USERS}
+
 USE_RC_SUBR=	ptlink-services.sh
 SUB_FILES=	pkg-message
 
@@ -30,7 +33,6 @@
 		--with-pidfile=/var/run/ircsvs.pid
 
 post-install:
-	@${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	@${CHOWN} -R ircd:ircd ${SYSCONFDIR}
 	@${CAT} ${PKGMESSAGE}
 
Index: pkg-install
===================================================================
RCS file: pkg-install
diff -N pkg-install
--- pkg-install	3 Aug 2006 16:57:40 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD: ports/irc/ptlink-services/pkg-install,v 1.2 2006/08/03 16:57:40 garga Exp $
-#
-
-case $2 in
-POST-INSTALL)
-	USER=ircd
-	GROUP=ircd
-	UID=72
-	GID=72
-
-	if pw groupshow "${GROUP}" > /dev/null 2>&1; then
-	   echo "===> Using existing group ${GROUP}"
-	else
-	   echo "===> Adding group ${GROUP}"
-	   pw groupadd ${GROUP} -g ${GID} || exit 1
-	fi
-
-	if pw usershow "${USER}" > /dev/null 2>&1; then
-	   echo "===> Using existing user ${USER}"
-	else
-	   echo "===> Adding user ${USER}"
-	   pw adduser ${USER} -u ${UID} -g ${GROUP} -h - -d "/nonexistent" \
-	      -s "/nonexistent" -c "IRC daemon" || exit 1
-	fi
-	;;
-esac