summaryrefslogtreecommitdiff
path: root/databases/postgresql92-server/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'databases/postgresql92-server/Makefile')
-rw-r--r--databases/postgresql92-server/Makefile24
1 files changed, 4 insertions, 20 deletions
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 0bc8098de2af..ceab5d0308d6 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME?= postgresql
-DISTVERSION?= 9.1.1
-PORTREVISION?= 1
+DISTVERSION?= 9.1.2
CATEGORIES?= databases
MASTER_SITES= ${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR= source/v${DISTVERSION}
@@ -88,11 +87,11 @@ OPTIONS+= PAM "Build with PAM support (server only)" off
OPTIONS+= LDAP "Build with LDAP authentication support" off
OPTIONS+= MIT_KRB5 "Build with MIT's kerberos support" off
OPTIONS+= HEIMDAL_KRB5 "Builds with Heimdal kerberos support" off
+OPTIONS+= GSSAPI "Build with GSSAPI support" off
OPTIONS+= OPTIMIZED_CFLAGS "Builds with compiler optimizations (-O3)" off
OPTIONS+= XML "Build with XML data type (server)" on
OPTIONS+= TZDATA "Use internal timezone database (server)" on
OPTIONS+= DEBUG "Builds with debugging symbols" off
-OPTIONS+= GSSAPI "Build with GSSAPI support" off
# See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
OPTIONS+= ICU "Use ICU for unicode collation (server)" off
@@ -195,29 +194,15 @@ LDFLAGS_SL+= -lgssapi
.endif
. if defined(WITH_MIT_KRB5)
-. if exists(/usr/lib/libkrb5.so) || exists(/usr/bin/krb5-config)
-BROKEN= You must remove /usr/bin/krb5-config and /usr/lib/libkrb5.so* (from system heimdal), and set NO_KERBEROS=true in /etc/make.conf to build successfully with MIT-KRB
-. endif
-# Allow defining a home built MIT Kerberos by setting KRB5_HOME
-. if defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config)
CONFIGURE_ARGS+=--with-krb5
-. else
+# Allow defining a home built MIT Kerberos by setting KRB5_HOME
+. if !(defined(KRB5_HOME) && exists(${KRB5_HOME}/lib/libgssapi_krb5.a) && exists(${KRB5_HOME}/bin/krb5-config))
LIB_DEPENDS+= krb5.3:${PORTSDIR}/security/krb5
-CONFIGURE_ARGS+=--with-krb5
. endif
. endif
. if defined(WITH_HEIMDAL_KRB5)
-# Allow defining a home built Heimdal Kerberos by setting HEIMDAL_HOME
-. if defined(HEIMDAL_HOME) && exists(${HEIMDAL_HOME}/lib/libgssapi.a) && exists(${HEIMDAL_HOME}/bin/krb5-config)
CONFIGURE_ARGS+=--with-krb5
-. else
-# Postgresql apps will not link properly when libpq is linked with base heimdal in /usr,
-# so we always use the heimdal port. See
-# http://lists.freebsd.org/pipermail/freebsd-stable/2005-October/018809.html
-LIB_DEPENDS+= krb5.26:${PORTSDIR}/security/heimdal
-CONFIGURE_ARGS+=--with-krb5
-. endif
. endif
.endif # !SLAVE_ONLY
@@ -347,7 +332,6 @@ PLIST_SUB+= PG_USER=$(PG_USER)
.if !defined(NO_BUILD)
post-patch:
- @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in
. if defined(WITH_ICU)
@${REINPLACE_CMD} -E -e \
"s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \