diff options
| author | Chris Rees <crees@FreeBSD.org> | 2012-01-31 18:21:33 +0000 |
|---|---|---|
| committer | Chris Rees <crees@FreeBSD.org> | 2012-01-31 18:21:33 +0000 |
| commit | 01f53d548200c0386e16edb98320e90db61da635 (patch) | |
| tree | 08836ace6fa3e26a92d4d96b474ae5624f4c60a5 /databases | |
| parent | Update to 1.3.3 (diff) | |
- Stop clobbering postgresql-server/-client OPTIONS with -contrib OPTIONS
- Minor optimisation (stop testing for !SLAVE_ONLY twice)
PR: ports/164662
Notes
Notes:
svn path=/head/; revision=290188
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/postgresql91-contrib/Makefile | 2 | ||||
| -rw-r--r-- | databases/postgresql91-server/Makefile | 9 | ||||
| -rw-r--r-- | databases/postgresql92-server/Makefile | 9 |
3 files changed, 10 insertions, 10 deletions
diff --git a/databases/postgresql91-contrib/Makefile b/databases/postgresql91-contrib/Makefile index 4687e2d343f7..dc67d9948c5e 100644 --- a/databases/postgresql91-contrib/Makefile +++ b/databases/postgresql91-contrib/Makefile @@ -28,8 +28,6 @@ SLAVE_ONLY= yes CONFIGURE_ARGS+=--with-libxslt --with-libxml LDFLAGS+= ${PTHREAD_LIBS} -L${PREFIX}/lib -OPTIONS= OSSP_UUID "Enable / disable ossp-uuid support" on - post-install: @- ${INSTALL_DATA} ${WRKSRC}/contrib/README ${DOCSDIR}/extension/README diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index 3e0d07251047..8d5a421a7ff1 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -26,7 +26,11 @@ DIST_SUBDIR= postgresql ICU_PATCHFILE?= pg-910-icu-2011-09-22.diff.gz +.if !defined(SLAVE_ONLY) UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//} +.else # Contrib has different options from -client/-server +UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}-${PKGNAMESUFFIX} +.endif LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX} PKGINSTALL?= ${PKGDIR}/pkg-install${PKGNAMESUFFIX} @@ -75,16 +79,13 @@ GROUPS?= ${PG_GROUP} SUB_FILES+= 502.pgsql .endif -.if !defined(SLAVE_ONLY) -OPTIONS+= NLS "Use internationalized messages" on -.endif - .if !defined(CLIENT_ONLY) MAKE_ENV= PATH=${PREFIX}/bin:${PATH} CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} .endif .if !defined(SLAVE_ONLY) +OPTIONS+= NLS "Use internationalized messages" on OPTIONS+= DTRACE "Build with DTrace probes (server only)" off OPTIONS+= PAM "Build with PAM support (server only)" off OPTIONS+= LDAP "Build with LDAP authentication support" off diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index 3e0d07251047..8d5a421a7ff1 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -26,7 +26,11 @@ DIST_SUBDIR= postgresql ICU_PATCHFILE?= pg-910-icu-2011-09-22.diff.gz +.if !defined(SLAVE_ONLY) UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//} +.else # Contrib has different options from -client/-server +UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}-${PKGNAMESUFFIX} +.endif LATEST_LINK?= ${PKGNAMEPREFIX}${UNIQUENAME}${PKGNAMESUFFIX} PKGINSTALL?= ${PKGDIR}/pkg-install${PKGNAMESUFFIX} @@ -75,16 +79,13 @@ GROUPS?= ${PG_GROUP} SUB_FILES+= 502.pgsql .endif -.if !defined(SLAVE_ONLY) -OPTIONS+= NLS "Use internationalized messages" on -.endif - .if !defined(CLIENT_ONLY) MAKE_ENV= PATH=${PREFIX}/bin:${PATH} CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} .endif .if !defined(SLAVE_ONLY) +OPTIONS+= NLS "Use internationalized messages" on OPTIONS+= DTRACE "Build with DTrace probes (server only)" off OPTIONS+= PAM "Build with PAM support (server only)" off OPTIONS+= LDAP "Build with LDAP authentication support" off |