ports/157574: [PATCH] Fix port: games/conquest should use GROUPS

[Chris Rees]

>Number:         157574
>Category:       ports
>Synopsis:       [PATCH] Fix port: games/conquest should use GROUPS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jun 04 08:30:12 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Chris Rees
>Release:        FreeBSD 8.2-RELEASE-p1 i386
>Organization:
bayofrum
>Environment:
System: FreeBSD zeus.bayofrum.net 8.2-RELEASE-p1 FreeBSD 8.2-RELEASE-p1 #0: Sat Apr 30 15:09:06 BST 2011 root at zeus.bayofrum.net:/usr/obj/usr/src/sys/ZEUS i386


	
>Description:
	

	This port uses pkg-install to create new users instead of using USERS= and GROUPS=.
>How-To-Repeat:
	
>Fix:

	

	- Use GROUPS

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


--- games-conquest.patch begins here ---
Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/games/conquest/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- Makefile	19 Nov 2009 22:07:38 -0000	1.12
+++ Makefile	2 Jun 2011 17:41:36 -0000
@@ -18,6 +18,7 @@
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc/conquest \
 		--datadir=${LOCALBASE}/share/conquest \
 		--localstatedir=/var/games
+GROUPS=		${PORTNAME}
 BINGRP=		conquest
 SHAREGRP=	conquest
 MAKE_JOBS_UNSAFE=	yes
@@ -29,7 +30,6 @@
 	${REINPLACE_CMD} "s/-O2 -fPIC//g" ${WRKSRC}/configure
 
 do-install:
-	@${SH} pkg-install ${PORTNAME} PRE-INSTALL
 	${INSTALL_PROGRAM} -m 2550 ${WRKSRC}/conqai ${PREFIX}/sbin
 	${INSTALL_PROGRAM} -m 2551 ${WRKSRC}/conqdriv ${PREFIX}/libexec
 	${INSTALL_PROGRAM} -m 2551 ${WRKSRC}/conqoper ${PREFIX}/sbin
Index: pkg-install
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/games/conquest/pkg-install,v
retrieving revision 1.2
diff -u -r1.2 pkg-install
--- pkg-install	19 Nov 2002 11:52:40 -0000	1.2
+++ pkg-install	2 Jun 2011 17:40:58 -0000
@@ -1,21 +1,7 @@
 #!/bin/sh
 
-[ "${PKG_PREFIX}" ] && PREFIX="${PKG_PREFIX}"
-[ "${PREFIX}" ] || PREFIX=/usr/local
-
 case "$2" in
-	PRE-INSTALL)
-		if ! pw group show conquest >/dev/null 2>&1
-		then
-			echo "===>   Creating group conquest"
-			pw add group conquest
-		fi
-	;;
 	POST-INSTALL)
 		install -d -o root -g conquest -m 770 /var/games/conquest
 	;;
-	*)
-		echo "Incorrect parameter"
-		exit 1
-	;;
 esac
--- games-conquest.patch ends here ---



-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

>Release-Note:
>Audit-Trail:
>Unformatted: