summaryrefslogtreecommitdiff
path: root/databases/postgresql96/Makefile.common
diff options
context:
space:
mode:
Diffstat (limited to 'databases/postgresql96/Makefile.common')
-rw-r--r--databases/postgresql96/Makefile.common27
1 files changed, 14 insertions, 13 deletions
diff --git a/databases/postgresql96/Makefile.common b/databases/postgresql96/Makefile.common
index 936d76dc05e..dc59dd343f9 100644
--- a/databases/postgresql96/Makefile.common
+++ b/databases/postgresql96/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2017/11/10 14:47:41 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.8 2017/11/13 09:33:33 adam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
# used by databases/postgresql96-pltcl/Makefile
# used by databases/postgresql96-server/Makefile
-DISTNAME= postgresql-9.6.5
+DISTNAME= postgresql-9.6.6
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
EXTRACT_SUFX= .tar.bz2
@@ -65,17 +65,16 @@ CONFIGURE_ARGS+= --localedir=${PG_LOCALE_DIR}
CONFIGURE_ARGS+= --with-template=${PG_TEMPLATE.${OPSYS}}
CONFIGURE_ARGS+= --enable-nls
+CONFIGURE_ARGS+= --with-gssapi
+CONFIGURE_ARGS+= --with-libxml
CONFIGURE_ARGS+= --with-readline
CONFIGURE_ARGS+= --without-perl
CONFIGURE_ARGS+= --without-python
CONFIGURE_ARGS+= --without-tcl
-CONFIGURE_ARGS+= --without-zlib
# sys/ucred.h shouldn't be included on Solaris, causes conflicts between
# procfs and largefile.
-.if ${OPSYS} == "SunOS"
-CONFIGURE_ENV+= ac_cv_header_sys_ucred_h=no
-.endif
+CONFIGURE_ENV.SunOS+= ac_cv_header_sys_ucred_h=no
# pkgsrc silently filters the --as-needed linker arg, but that makes
# it leak into the pgxs Makefiles and compromises manual building
@@ -86,9 +85,8 @@ CONFIGURE_ENV+= pgac_cv_prog_cc_ldflags__Wl___as_needed=no
.endif
# configure fails on OpenBSD and MirBSD if thread safety is enabled.
-.if ${OPSYS} == "OpenBSD" || ${OPSYS} == "MirBSD"
-CONFIGURE_ARGS+= --disable-thread-safety
-.endif
+CONFIGURE_ARGS.MirBSD+= --disable-thread-safety
+CONFIGURE_ARGS.OpenBSD+=--disable-thread-safety
# PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
# This also limits the size of a tuple. The valid values are powers
@@ -111,11 +109,14 @@ USE_LIBLTDL?= no
.include "../../devel/gettext-lib/buildlink3.mk"
LIBS.SunOS+= -lintl
-# XXX work around core dumps with the native libedit
-USE_GNU_READLINE= yes
-.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+
+.include "../../mk/readline.buildlink3.mk"
+.if ${READLINE_TYPE} == "editline"
+CONFIGURE_ARGS+= --with-libedit-preferred
+.endif
-.if !defined(META_PACKAGE)
post-extract:
. if !empty(USE_LIBLTDL:M[yY][eE][sS])
cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \