diff options
Diffstat (limited to 'databases/postgresql90-server/Makefile')
| -rw-r--r-- | databases/postgresql90-server/Makefile | 40 |
1 files changed, 25 insertions, 15 deletions
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index e3f181ce9914..ccea4b175bcd 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -6,8 +6,8 @@ # PORTNAME?= postgresql -DISTVERSION?= 9.0.4 -PORTREVISION?= 3 +DISTVERSION?= 9.0.5 +PORTREVISION?= 0 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -17,7 +17,9 @@ MAINTAINER?= girgen@FreeBSD.org COMMENT?= The most advanced open-source database available anywhere CONFLICTS?= ${PORTNAME}-client-[78]* \ - ${PORTNAME}${PKGNAMESUFFIX}-[78]* + ${PORTNAME}${PKGNAMESUFFIX}-[78]* \ + ${PORTNAME}-client-9.[1-9]* \ + ${PORTNAME}${PKGNAMESUFFIX}-9.[1-9]* WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION} DIST_SUBDIR= postgresql @@ -25,6 +27,7 @@ DIST_SUBDIR= postgresql UNIQUENAME?= ${PORTNAME}90 LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX} +PKGINSTALL?= ${PKGDIR}/pkg-install${PKGNAMESUFFIX} USE_BZIP2= YES USE_GMAKE= YES GNU_CONFIGURE= YES @@ -34,7 +37,7 @@ GNU_CONFIGURE= YES .endif PG_USER?= pgsql -PG_GROUP?= pgsql +PG_GROUP?= ${PG_USER} PG_UID?= 70 LDFLAGS+= -L${LOCALBASE}/lib @@ -59,7 +62,13 @@ INSTALL_DIRS?= ${BUILD_DIRS} SERVER_ONLY= yes USE_RC_SUBR= postgresql USE_PGSQL= yes -WANT_PGSQL_VER= ${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +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 @@ -296,7 +305,7 @@ MAN7= ABORT.7 ALTER_AGGREGATE.7 ALTER_CONVERSION.7 ALTER_DATABASE.7 \ .if defined(SERVER_ONLY) pre-everything:: - @${SH} ${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in ${PORTNAME} BACKUPWARNING + @${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL .endif .if !defined(NO_BUILD) @@ -320,19 +329,14 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) SUB_FILES+= pkg-install${PKGNAMESUFFIX} -SUB_LIST= PG_GROUP=${PG_GROUP} \ - PG_USER=${PG_USER} \ - PG_UID=${PG_UID} -PLIST_SUB+= PG_USER=${PG_USER} +SUB_LIST= PG_GROUP=$(PG_GROUP) \ + PG_USER=$(PG_USER) \ + PG_UID=$(PG_UID) +PLIST_SUB+= PG_USER=$(PG_USER) PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} . endif .endif -.if defined(SERVER_ONLY) -pre-su-install: - @ ${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PORTNAME} PRE-INSTALL -.endif - .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in @@ -342,6 +346,12 @@ 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} && \ |