Date: Thu, 27 Dec 2012 21:11:42 +0000 (UTC) From: Jason Helfman <jgh@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309555 - in head/databases: postgresql84-server postgresql91-server postgresql92-server Message-ID: <201212272111.qBRLBgCY058110@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jgh Date: Thu Dec 27 21:11:42 2012 New Revision: 309555 URL: http://svnweb.freebsd.org/changeset/ports/309555 Log: - remove broken configurable non-default user/group for postgresql-server - while here fix formatting of new header With hat: pgsql@ Modified: head/databases/postgresql84-server/Makefile head/databases/postgresql91-server/Makefile head/databases/postgresql92-server/Makefile (contents, props changed) Modified: head/databases/postgresql84-server/Makefile ============================================================================== --- head/databases/postgresql84-server/Makefile Thu Dec 27 20:12:06 2012 (r309554) +++ head/databases/postgresql84-server/Makefile Thu Dec 27 21:11:42 2012 (r309555) @@ -1,5 +1,4 @@ -# Created by: Marc G. Fournier <scrappy@FreeBSD.org> -# +# Created by: Marc G. Fournier <scrappy@FreeBSD.org> # $FreeBSD$ PORTNAME?= postgresql @@ -35,9 +34,9 @@ GNU_CONFIGURE= yes .undef GNU_CONFIGURE .endif -PG_USER?= pgsql -PG_GROUP?= ${PG_USER} -PG_UID?= 70 +PG_USER= pgsql +PG_GROUP= pgsql +PG_UID= 70 LDFLAGS+= -L${LOCALBASE}/lib INCLUDES+= -I${LOCALBASE}/include @@ -63,10 +62,6 @@ USE_RC_SUBR= postgresql USE_PGSQL= yes WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} USERS= ${PG_USER} -. if ${USERS} != "pgsql" -UID_FILES+= ${WRKDIR}/pguid -GID_FILES+= ${WRKDIR}/pggid -. endif GROUPS= ${PG_GROUP} SUB_FILES+= 502.pgsql .endif @@ -343,12 +338,6 @@ post-patch: ${WRKSRC}/configure.in . endif -. if defined(SERVER_ONLY) && (${PG_USER} != "pgsql") -pre-install: - @${SED} -n s,pgsql,${PG_USER},gp ${PORTSDIR}/UIDs > ${WRKDIR}/pguid - @${SED} -n s,pgsql,${PG_GROUP},gp ${PORTSDIR}/GIDs > ${WRKDIR}/pggid -. endif - do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ Modified: head/databases/postgresql91-server/Makefile ============================================================================== --- head/databases/postgresql91-server/Makefile Thu Dec 27 20:12:06 2012 (r309554) +++ head/databases/postgresql91-server/Makefile Thu Dec 27 21:11:42 2012 (r309555) @@ -1,5 +1,4 @@ -# Created by: Marc G. Fournier <scrappy@FreeBSD.org> -# +# Created by: Marc G. Fournier <scrappy@FreeBSD.org> # $FreeBSD$ PORTNAME?= postgresql @@ -40,9 +39,9 @@ GNU_CONFIGURE= yes .undef GNU_CONFIGURE .endif -PG_USER?= pgsql -PG_GROUP?= ${PG_USER} -PG_UID?= 70 +PG_USER= pgsql +PG_GROUP= pgsql +PG_UID= 70 LDFLAGS+= -L${LOCALBASE}/lib INCLUDES+= -I${LOCALBASE}/include @@ -69,12 +68,8 @@ SERVER_ONLY= yes USE_RC_SUBR= postgresql USE_PGSQL= yes WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} -USERS?= ${PG_USER} -.if (${USERS} != "pgsql") -UID_FILES+= ${WRKDIR}/pguid -GID_FILES+= ${WRKDIR}/pggid -.endif -GROUPS?= ${PG_GROUP} +USERS= ${PG_USER} +GROUPS= ${PG_GROUP} SUB_FILES+= 502.pgsql .endif @@ -362,12 +357,6 @@ post-patch: ${WRKSRC}/configure.in . endif -. if defined(SERVER_ONLY) && (${PG_USER} != "pgsql") -pre-install: - @${SED} -n s,pgsql,${PG_USER},gp ${PORTSDIR}/UIDs > ${WRKDIR}/pguid - @${SED} -n s,pgsql,${PG_GROUP},gp ${PORTSDIR}/GIDs > ${WRKDIR}/pggid -. endif - do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \ Modified: head/databases/postgresql92-server/Makefile ============================================================================== --- head/databases/postgresql92-server/Makefile Thu Dec 27 20:12:06 2012 (r309554) +++ head/databases/postgresql92-server/Makefile Thu Dec 27 21:11:42 2012 (r309555) @@ -1,5 +1,4 @@ -# Created by: Marc G. Fournier <scrappy@FreeBSD.org> -# +# Created by: Marc G. Fournier <scrappy@FreeBSD.org> # $FreeBSD$ PORTNAME?= postgresql @@ -40,9 +39,9 @@ GNU_CONFIGURE= yes .undef GNU_CONFIGURE .endif -PG_USER?= pgsql -PG_GROUP?= ${PG_USER} -PG_UID?= 70 +PG_USER= pgsql +PG_GROUP= pgsql +PG_UID= 70 LDFLAGS+= -L${LOCALBASE}/lib INCLUDES+= -I${LOCALBASE}/include @@ -69,12 +68,8 @@ SERVER_ONLY= yes USE_RC_SUBR= postgresql USE_PGSQL= yes WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} -USERS?= ${PG_USER} -.if (${USERS} != "pgsql") -UID_FILES+= ${WRKDIR}/pguid -GID_FILES+= ${WRKDIR}/pggid -.endif -GROUPS?= ${PG_GROUP} +USERS= ${PG_USER} +GROUPS= ${PG_GROUP} SUB_FILES+= 502.pgsql .endif @@ -364,12 +359,6 @@ post-patch: ${WRKSRC}/configure.in . endif -. if defined(SERVER_ONLY) && (${PG_USER} != "pgsql") -pre-install: - @${SED} -n s,pgsql,${PG_USER},gp ${PORTSDIR}/UIDs > ${WRKDIR}/pguid - @${SED} -n s,pgsql,${PG_GROUP},gp ${PORTSDIR}/GIDs > ${WRKDIR}/pggid -. endif - do-install: @for dir in ${INSTALL_DIRS}; do \ cd ${WRKSRC}/$${dir} && \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212272111.qBRLBgCY058110>