ports/157594: Fix port: devel/py-gitosis should use USERS

[Chris Rees]

>Number:         157594
>Category:       ports
>Synopsis:       Fix port: devel/py-gitosis should use USERS
>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 09:50:10 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 USERS and GROUPS

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

	Please note that pkg-install has been removed


--- devel-py-gitosis.patch begins here ---
Index: Makefile
===================================================================
RCS file: /exports/cvsroot-freebsd/ports/devel/py-gitosis/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	15 Jan 2011 15:33:32 -0000	1.5
+++ Makefile	2 Jun 2011 14:55:56 -0000
@@ -22,15 +22,12 @@
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	easy_install
+USERS=		git
+GROUPS=		${USERS}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PYDISTUTILS_PKGVERSION=	${PORTVERSION:R}
 
-pre-su-install:
-	@${SETENV} PKG_PREFIX=${PREFIX} GITUSER=${GITUSER} \
-		GITGROUP=${GITGROUP} GITHOME=${GITHOME} \
-		${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
-
 post-install:
 	${CHMOD} +x ${PYTHON_SITELIBDIR}/${PYEASYINSTALL_EGG}/gitosis/templates/admin/hooks/post-update
 	@${CAT} ${PKGMESSAGE}
Index: pkg-install
===================================================================
RCS file: pkg-install
diff -N pkg-install
--- pkg-install	15 Sep 2009 08:23:25 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-# $FreeBSD: ports/devel/py-gitosis/pkg-install,v 1.1 2009/09/15 08:23:25 nivit Exp $
-
-PATH=/bin:/usr/bin:/usr/sbin
-
-case $2 in
-PRE-INSTALL)
-	GITUSER=${GITUSER:-git}
-	GITGROUP=${GITGROUP:-git}
-	GITHOME=${GITHOME:-${PKG_PREFIX}/${GITUSER}}
-	UID=211
-	GID=211
-
-	if pw group show "${GITGROUP}" 2>/dev/null; then
-		echo "You already have a group \"${GITGROUP}\", so I will use it."
-	else
-		if pw groupadd ${GITGROUP} -g ${GID}; then
-			echo "Added group \"${GITGROUP}\"."
-		else
-			echo "Adding group \"${GITGROUP}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if pw user show "${GITUSER}" 2>/dev/null; then
-		echo "You already have a user \"${GITUSER}\", so I will use it."
-	else
-		if pw useradd ${GITUSER} -u ${UID} -g ${GITGROUP} -h - -d ${GITHOME} \
-			-c "gitosis user"
-		then
-			echo "Added user \"${GITUSER}\"."
-		else
-			echo "Adding user \"${GITUSER}\" failed..."
-			exit 1
-		fi
-	fi
-
-	if ! [ -x ~${GITUSER} ] ; then
-		install -m 755 -o ${GITUSER} -g ${GITGROUP} -d ${GITHOME}
-	fi
-	;;
-esac
--- devel-py-gitosis.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: