From 01f53d548200c0386e16edb98320e90db61da635 Mon Sep 17 00:00:00 2001
From: Chris Rees <crees@FreeBSD.org>
Date: Tue, 31 Jan 2012 18:21:33 +0000
Subject: - Stop clobbering postgresql-server/-client OPTIONS with -contrib
 OPTIONS - Minor optimisation (stop testing for !SLAVE_ONLY twice)

PR:		ports/164662
---
 databases/postgresql91-server/Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'databases/postgresql91-server')

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
-- 
cgit v1.2.3