From 15a9b4d2cb17aa26e0057c09fedee33ccbee66f6 Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Fri, 24 Jul 2015 06:05:22 +0000 Subject: [PATCH] Really fix ldap option --- databases/postgresql91-server/Makefile | 17 +++++++---------- databases/postgresql92-server/Makefile | 17 +++++++---------- 2 files changed, 14 insertions(+), 20 deletions(-) diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile index e49b4a4cf755..2268a74fe11f 100644 --- a/databases/postgresql91-server/Makefile +++ b/databases/postgresql91-server/Makefile @@ -136,6 +136,13 @@ INTDATE_CONFIGURE_OFF=--disable-integer-datetimes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext +LDAP_CONFIGURE_WITH= ldap +LDAP_USE= OPENLDAP=yes + +OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops + +DEBUG_CONFIGURE_ENABLE= debug + PLIST_SUB+= PG_USER=${PG_USER} \ PG_GROUP=${PG_GROUP} SUB_LIST+= PG_GROUP=${PG_GROUP} \ @@ -166,16 +173,6 @@ IGNORE= need userland DTrace support found in FreeBSD 9.0 . endif . endif -. if defined (SERVER_ONLY) -LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes -. endif - - -OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops - -DEBUG_CONFIGURE_ENABLE= debug - .if ${PORT_OPTIONS:MGSSAPI} CONFIGURE_ARGS+=--with-gssapi .if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5) diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index a85b0b32ace7..75c2a17ab62e 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -136,6 +136,13 @@ INTDATE_CONFIGURE_OFF=--disable-integer-datetimes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext +LDAP_CONFIGURE_WITH= ldap +LDAP_USE= OPENLDAP=yes + +OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops + +DEBUG_CONFIGURE_ENABLE= debug + PLIST_SUB+= PG_USER=${PG_USER} \ PG_GROUP=${PG_GROUP} SUB_LIST+= PG_GROUP=${PG_GROUP} \ @@ -166,16 +173,6 @@ IGNORE= need userland DTrace support found in FreeBSD 9.0 . endif . endif -. if defined (SERVER_ONLY) -LDAP_CONFIGURE_WITH= ldap -LDAP_USE= OPENLDAP=yes -. endif - - -OPTIMIZED_CFLAGS_CFLAGS= -O3 -funroll-loops - -DEBUG_CONFIGURE_ENABLE= debug - .if ${PORT_OPTIONS:MGSSAPI} CONFIGURE_ARGS+=--with-gssapi .if empty(PORT_OPTIONS:MMIT_KRB5) && empty(PORT_OPTIONS:MHEIMDAL_KRB5)