Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/postgresql90-server/Makefile,v
retrieving revision 1.227
diff -u -r1.227 Makefile
--- Makefile	18 Oct 2011 09:03:32 -0000	1.227
+++ Makefile	18 Oct 2011 09:34:29 -0000
@@ -63,12 +63,16 @@
 USE_RC_SUBR=	postgresql
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
+
+PG_NONSTD_UG=	no
 USERS?=		${PG_USER}
-.if (${USERS} != "pgsql")
+GROUPS?=	${PG_GROUP}
+.if (${USERS} != "pgsql" || ${GROUPS} != "pgsql")
+PG_NONSTD_UG=	yes
 UID_FILES+=	${WRKDIR}/pguid
 GID_FILES+=	${WRKDIR}/pggid
 .endif
-GROUPS?=	${PG_GROUP}
+
 SUB_FILES+=	502.pgsql
 .endif
 
@@ -346,10 +350,10 @@
 		${WRKSRC}/configure.in
 .  endif
 
-.  if defined(SERVER_ONLY) && (${PG_USER} != "pgsql")
+.  if defined(SERVER_ONLY) && (${PG_NONSTD_UG} == "yes")
 pre-install:
-	@${SED} -n s,pgsql,${PG_USER},gp ${PORTSDIR}/UIDs > ${WRKDIR}/pguid
-	@${SED} -n s,pgsql,${PG_GROUP},gp ${PORTSDIR}/GIDs > ${WRKDIR}/pggid
+	@${SED} -n s,^pgsql:,${USERS}:,p ${PORTSDIR}/UIDs > ${WRKDIR}/pguid
+	@${SED} -n s,^pgsql:,${GROUPS}:,p ${PORTSDIR}/GIDs > ${WRKDIR}/pggid
 .  endif
 
 do-install: