svn commit: r303976 - in head/mail/squirrelmail: . files

[Adam Weinberger]

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