From owner-svn-ports-head@FreeBSD.ORG  Sun Sep  9 16:29:31 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id A3C76106566C;
	Sun,  9 Sep 2012 16:29:31 +0000 (UTC)
	(envelope-from adamw@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 84D148FC0A;
	Sun,  9 Sep 2012 16:29:31 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q89GTVH0005829;
	Sun, 9 Sep 2012 16:29:31 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q89GTVHX005826;
	Sun, 9 Sep 2012 16:29:31 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201209091629.q89GTVHX005826@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Sun, 9 Sep 2012 16:29:31 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303976 - in head/mail/squirrelmail: . files
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Sep 2012 16:29:31 -0000

Author: adamw
Date: Sun Sep  9 16:29:30 2012
New Revision: 303976
URL: http://svn.freebsd.org/changeset/ports/303976

Log:
  Let bsd.port.mk create users and groups rather than doing it
  ourselves. Introduces SMUSER/SMGROUP tunables.

Modified:
  head/mail/squirrelmail/Makefile
  head/mail/squirrelmail/files/pkg-install.in

Modified: head/mail/squirrelmail/Makefile
==============================================================================
--- head/mail/squirrelmail/Makefile	Sun Sep  9 15:58:06 2012	(r303975)
+++ head/mail/squirrelmail/Makefile	Sun Sep  9 16:29:30 2012	(r303976)
@@ -31,11 +31,16 @@ DATABASE_DESC=	PEAR database support (mu
 # if you were using WITHOUT_WWWDIR, use SQUIRRELDIR=${PREFIX}/${PORTNAME}
 SQUIRRELDIR?=	${PREFIX}/www/${PORTNAME}
 
+SMUSER?=	${WWWOWN}
+SMGROUP?=	${WWWGRP}
+USERS=		${SMUSER}
+GROUPS=		${SMGROUP}
+
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		SQUIRRELDIR="${SQUIRRELDIR:S,^${PREFIX}/,,}"
 
 SUB_FILES=	pkg-message pkg-install pkg-deinstall
-SUB_LIST=	SQUIRRELDIR=${SQUIRRELDIR}
+SUB_LIST=	SQUIRRELDIR=${SQUIRRELDIR} SMUSER=${SMUSER} SMGROUP=${SMGROUP}
 
 PORTDOCS=	*
 
@@ -109,7 +114,7 @@ do-install:
 .for DIR in class config data functions help images include locale plugins po src themes
 	@${CP} -rpv ${WRKSRC}/${DIR} ${SQUIRRELDIR}
 .endfor
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${SQUIRRELDIR}/data
+	${CHOWN} -R ${SMUSER}:${SMGROUP} ${SQUIRRELDIR}/data
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 	@${CP} -Rv ${WRKSRC}/doc/* ${DOCSDIR}

Modified: head/mail/squirrelmail/files/pkg-install.in
==============================================================================
--- head/mail/squirrelmail/files/pkg-install.in	Sun Sep  9 15:58:06 2012	(r303975)
+++ head/mail/squirrelmail/files/pkg-install.in	Sun Sep  9 16:29:30 2012	(r303976)
@@ -10,39 +10,13 @@ SQUIRRELDIR=%%SQUIRRELDIR%%
 
 case $2 in
 PRE-INSTALL)
-	USER=www
-	GROUP=${USER}
-	UID=80
-	GID=${UID}
-
-	if ! pw groupshow "${GROUP}" 2>/dev/null 1>&2; then
-		if pw groupadd ${GROUP} -g ${GID}; 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} -u ${UID} -g ${GROUP} -h - \
-			-s "/sbin/nologin" -d "/nonexistent" \
-			-c "World Wide Web Owner"; \
-		then
-			echo "Added user \"${USER}\"."
-		else
-			echo "Adding user \"${USER}\" failed..."
-			exit 1
-		fi
-	fi
-
 	exit 0
 	;;
 POST-INSTALL)
 	if [ "${PKG_BATCH}" = "NO" ]; then
-		install -d -o www -g www -m 0755 /var/spool/squirrelmail
-		install -d -o www -g www -m 0730 /var/spool/squirrelmail/attach
-		install -d -o www -g www -m 0750 /var/spool/squirrelmail/pref
+		install -d -o %%SMUSER%% -g %%SMGROUP%% -m 0755 /var/spool/squirrelmail
+		install -d -o %%SMUSER%% -g %%SMGROUP%% -m 0730 /var/spool/squirrelmail/attach
+		install -d -o %%SMUSER%% -g %%SMGROUP%% -m 0750 /var/spool/squirrelmail/pref
 		if [ ! -f /var/spool/squirrelmail/pref/default_pref ]; then
 			cp -rp ${SQUIRRELDIR}/data/default_pref \
 				/var/spool/squirrelmail/pref/default_pref