diff options
38 files changed, 190 insertions, 309 deletions
diff --git a/databases/postgresql10-client/Makefile b/databases/postgresql10-client/Makefile index 72c189b2d4b..b85e13eaba1 100644 --- a/databases/postgresql10-client/Makefile +++ b/databases/postgresql10-client/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.2 2017/11/10 14:47:41 fhajny Exp $ +# $NetBSD: Makefile,v 1.3 2017/11/13 09:33:31 adam Exp $ PKGNAME= ${DISTNAME:C/-/10-client-/} -PKGREVISION= 1 COMMENT= PostgreSQL database client programs .include "../../databases/postgresql10/Makefile.common" diff --git a/databases/postgresql10-docs/PLIST b/databases/postgresql10-docs/PLIST index 0fb7c824721..846601e2825 100644 --- a/databases/postgresql10-docs/PLIST +++ b/databases/postgresql10-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2017/10/23 20:33:49 adam Exp $ +@comment $NetBSD: PLIST,v 1.2 2017/11/13 09:33:31 adam Exp $ man/man1/clusterdb.1 man/man1/createdb.1 man/man1/createuser.1 @@ -914,6 +914,7 @@ share/doc/postgresql/html/release-1-0.html share/doc/postgresql/html/release-1-01.html share/doc/postgresql/html/release-1-02.html share/doc/postgresql/html/release-1-09.html +share/doc/postgresql/html/release-10-1.html share/doc/postgresql/html/release-10.html share/doc/postgresql/html/release-6-0.html share/doc/postgresql/html/release-6-1-1.html @@ -1187,6 +1188,7 @@ share/doc/postgresql/html/release-9-2-20.html share/doc/postgresql/html/release-9-2-21.html share/doc/postgresql/html/release-9-2-22.html share/doc/postgresql/html/release-9-2-23.html +share/doc/postgresql/html/release-9-2-24.html share/doc/postgresql/html/release-9-2-3.html share/doc/postgresql/html/release-9-2-4.html share/doc/postgresql/html/release-9-2-5.html @@ -1207,6 +1209,7 @@ share/doc/postgresql/html/release-9-3-17.html share/doc/postgresql/html/release-9-3-18.html share/doc/postgresql/html/release-9-3-19.html share/doc/postgresql/html/release-9-3-2.html +share/doc/postgresql/html/release-9-3-20.html share/doc/postgresql/html/release-9-3-3.html share/doc/postgresql/html/release-9-3-4.html share/doc/postgresql/html/release-9-3-5.html @@ -1221,6 +1224,7 @@ share/doc/postgresql/html/release-9-4-11.html share/doc/postgresql/html/release-9-4-12.html share/doc/postgresql/html/release-9-4-13.html share/doc/postgresql/html/release-9-4-14.html +share/doc/postgresql/html/release-9-4-15.html share/doc/postgresql/html/release-9-4-2.html share/doc/postgresql/html/release-9-4-3.html share/doc/postgresql/html/release-9-4-4.html @@ -1231,6 +1235,7 @@ share/doc/postgresql/html/release-9-4-8.html share/doc/postgresql/html/release-9-4-9.html share/doc/postgresql/html/release-9-4.html share/doc/postgresql/html/release-9-5-1.html +share/doc/postgresql/html/release-9-5-10.html share/doc/postgresql/html/release-9-5-2.html share/doc/postgresql/html/release-9-5-3.html share/doc/postgresql/html/release-9-5-4.html @@ -1245,6 +1250,7 @@ share/doc/postgresql/html/release-9-6-2.html share/doc/postgresql/html/release-9-6-3.html share/doc/postgresql/html/release-9-6-4.html share/doc/postgresql/html/release-9-6-5.html +share/doc/postgresql/html/release-9-6-6.html share/doc/postgresql/html/release-9-6.html share/doc/postgresql/html/release.html share/doc/postgresql/html/replication-origins.html diff --git a/databases/postgresql10-server/PLIST b/databases/postgresql10-server/PLIST index 1cdba33d2d9..104b20eb03a 100644 --- a/databases/postgresql10-server/PLIST +++ b/databases/postgresql10-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2017/10/23 20:33:50 adam Exp $ +@comment $NetBSD: PLIST,v 1.2 2017/11/13 09:33:31 adam Exp $ bin/postgres bin/postmaster include/postgresql/server/plpgsql.h @@ -442,7 +442,6 @@ share/postgresql/timezone/CET share/postgresql/timezone/CST6CDT share/postgresql/timezone/Canada/Atlantic share/postgresql/timezone/Canada/Central -share/postgresql/timezone/Canada/East-Saskatchewan share/postgresql/timezone/Canada/Eastern share/postgresql/timezone/Canada/Mountain share/postgresql/timezone/Canada/Newfoundland diff --git a/databases/postgresql10/Makefile.common b/databases/postgresql10/Makefile.common index b11554590e3..db3a28bdadc 100644 --- a/databases/postgresql10/Makefile.common +++ b/databases/postgresql10/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2017/11/10 14:47:41 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.3 2017/11/13 09:33:31 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/postgresql10-pltcl/Makefile # used by databases/postgresql10-server/Makefile -DISTNAME= postgresql-10.0 +DISTNAME= postgresql-10.1 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/} EXTRACT_SUFX= .tar.bz2 @@ -75,9 +75,7 @@ CONFIGURE_ENV+= MSGFMT=${TOOLS_PATH.msgfmt} # 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 @@ -88,9 +86,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 diff --git a/databases/postgresql10/distinfo b/databases/postgresql10/distinfo index 92695aa39a4..7ac33d339f1 100644 --- a/databases/postgresql10/distinfo +++ b/databases/postgresql10/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.1 2017/10/23 20:33:49 adam Exp $ +$NetBSD: distinfo,v 1.2 2017/11/13 09:33:31 adam Exp $ -SHA1 (postgresql-10.0.tar.bz2) = 4c26f81278f7da12f46f2ff4fda5b0311e191b95 -RMD160 (postgresql-10.0.tar.bz2) = d8995f0f4072d5bee91274f508e18a2155ef346f -SHA512 (postgresql-10.0.tar.bz2) = 88295af13db77a85a604c925aa627d383fdac62c1185119bba87753ce4167a13aed0f055a7a1329b3051f8757c6ba7529baed00a564ef0cfbee685720f282678 -Size (postgresql-10.0.tar.bz2) = 19639147 bytes +SHA1 (postgresql-10.1.tar.bz2) = 4adcfd527ec1652ecd7a22eb71541928d3d37277 +RMD160 (postgresql-10.1.tar.bz2) = 4238ae067e5e282ee36302d596ea0654dd9e96b8 +SHA512 (postgresql-10.1.tar.bz2) = 06050d353aa43f32e0de0199d833d8a4652aff893b718b1c40ed31837838f73fe4d977ac0f2164ab97b3eeff4aae3409f440601740898a893877d96bc0ed1882 +Size (postgresql-10.1.tar.bz2) = 19669989 bytes SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632 diff --git a/databases/postgresql92-client/Makefile b/databases/postgresql92-client/Makefile index 1f581916697..dcf65e79edc 100644 --- a/databases/postgresql92-client/Makefile +++ b/databases/postgresql92-client/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2017/11/10 14:47:41 fhajny Exp $ +# $NetBSD: Makefile,v 1.11 2017/11/13 09:33:31 adam Exp $ PKGNAME= ${DISTNAME:C/-/92-client-/} -PKGREVISION= 1 COMMENT= PostgreSQL database client programs .include "../../databases/postgresql92/Makefile.common" @@ -40,9 +39,6 @@ BUILD_DIRS+= src/backend CONF_FILES+= share/postgresql/${f}.sample ${PKG_SYSCONFDIR}/${f} .endfor -# XXX work around core dumps with the native libedit -USE_GNU_READLINE= yes - .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/databases/postgresql92-docs/PLIST b/databases/postgresql92-docs/PLIST index ccf25bcd71d..8e56155223f 100644 --- a/databases/postgresql92-docs/PLIST +++ b/databases/postgresql92-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2017/09/04 19:33:43 adam Exp $ +@comment $NetBSD: PLIST,v 1.24 2017/11/13 09:33:31 adam Exp $ man/man1/clusterdb.1 man/man1/createdb.1 man/man1/createlang.1 @@ -1083,6 +1083,7 @@ share/doc/postgresql/html/release-9-2-20.html share/doc/postgresql/html/release-9-2-21.html share/doc/postgresql/html/release-9-2-22.html share/doc/postgresql/html/release-9-2-23.html +share/doc/postgresql/html/release-9-2-24.html share/doc/postgresql/html/release-9-2-3.html share/doc/postgresql/html/release-9-2-4.html share/doc/postgresql/html/release-9-2-5.html diff --git a/databases/postgresql92-server/PLIST b/databases/postgresql92-server/PLIST index 01de91c1e7b..bd29f1903de 100644 --- a/databases/postgresql92-server/PLIST +++ b/databases/postgresql92-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.13 2017/05/12 19:37:54 adam Exp $ +@comment $NetBSD: PLIST,v 1.14 2017/11/13 09:33:31 adam Exp $ bin/postgres bin/postmaster include/postgresql/server/plpgsql.h @@ -442,7 +442,6 @@ share/postgresql/timezone/CET share/postgresql/timezone/CST6CDT share/postgresql/timezone/Canada/Atlantic share/postgresql/timezone/Canada/Central -share/postgresql/timezone/Canada/East-Saskatchewan share/postgresql/timezone/Canada/Eastern share/postgresql/timezone/Canada/Mountain share/postgresql/timezone/Canada/Newfoundland diff --git a/databases/postgresql92/Makefile.common b/databases/postgresql92/Makefile.common index 2719ca12b0f..5dcc5c4551f 100644 --- a/databases/postgresql92/Makefile.common +++ b/databases/postgresql92/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.32 2017/11/10 14:47:41 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.33 2017/11/13 09:33:31 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/postgresql92-pltcl/Makefile # used by databases/postgresql92-server/Makefile -DISTNAME= postgresql-9.2.23 +DISTNAME= postgresql-9.2.24 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/} EXTRACT_SUFX= .tar.bz2 @@ -39,7 +39,6 @@ DISTINFO_FILE?= ${.CURDIR}/../../databases/postgresql92/distinfo COMMON_FILESDIR?= ${.CURDIR}/../../databases/postgresql92/files PATCHDIR?= ${.CURDIR}/../../databases/postgresql92/patches -USE_GCC_RUNTIME= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= bison gmake lex msgfmt PKG_SYSCONFSUBDIR= postgresql @@ -66,11 +65,12 @@ 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-readline CONFIGURE_ARGS+= --without-tcl -CONFIGURE_ARGS+= --without-zlib # sys/ucred.h shouldn't be included on Solaris, causes conflicts between # procfs and largefile. @@ -85,8 +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. -CONFIGURE_ARGS.MirBSD+= --disable-thread-safety -CONFIGURE_ARGS.OpenBSD+= --disable-thread-safety +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 @@ -109,6 +109,13 @@ USE_LIBLTDL?= no .include "../../devel/gettext-lib/buildlink3.mk" LIBS.SunOS+= -lintl +.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: diff --git a/databases/postgresql92/distinfo b/databases/postgresql92/distinfo index ba50149a119..e012518fc4d 100644 --- a/databases/postgresql92/distinfo +++ b/databases/postgresql92/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.25 2017/09/04 19:33:43 adam Exp $ +$NetBSD: distinfo,v 1.26 2017/11/13 09:33:31 adam Exp $ -SHA1 (postgresql-9.2.23.tar.bz2) = bdedc8aebb1f1622834b7e5636e2712581c83731 -RMD160 (postgresql-9.2.23.tar.bz2) = 4200df89fc85ff1cd3e58cc5dee83bf457ddf1e5 -SHA512 (postgresql-9.2.23.tar.bz2) = 9715cb9aa34921f7d246837c6c516d588f88fda543ad635520e9575a5ea448ad39062f2c89c086c7f129cc5f61f4dca33e4f5fd94e1df39da428507c56a81ba3 -Size (postgresql-9.2.23.tar.bz2) = 16531436 bytes +SHA1 (postgresql-9.2.24.tar.bz2) = 63d6966ccdbab6aae1f9754fdb8e341ada1ef653 +RMD160 (postgresql-9.2.24.tar.bz2) = 2fc1b9c37cfefd5fae5bd02f974484c5fc680c08 +SHA512 (postgresql-9.2.24.tar.bz2) = a6f043e5ef5e12e23c1c43b26a5ecafce62f3a86f38b5b85e7cb0cb7aa376d40e460a526baf67ae40de40525e4744fb5e48650ee5e007db4ce9742fcf548bd56 +Size (postgresql-9.2.24.tar.bz2) = 16552576 bytes SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813 SHA1 (patch-config_perl.m4) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0 SHA1 (patch-configure) = 21b27add570cff1a24c440201eb1ed49f8223747 diff --git a/databases/postgresql92/options.mk b/databases/postgresql92/options.mk index 7f56e3cc610..d83a859a069 100644 --- a/databases/postgresql92/options.mk +++ b/databases/postgresql92/options.mk @@ -1,13 +1,11 @@ -# $NetBSD: options.mk,v 1.3 2013/10/12 05:05:42 richard Exp $ +# $NetBSD: options.mk,v 1.4 2017/11/13 09:33:31 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql92 -PKG_SUPPORTED_OPTIONS= bonjour gssapi kerberos ldap pam xml dtrace +PKG_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam .include "../../mk/bsd.options.mk" -### -### Bonjour support. -### +# Bonjour support .if !empty(PKG_OPTIONS:Mbonjour) CONFIGURE_ARGS+= --with-bonjour . if ${OPSYS} != "Darwin" @@ -16,16 +14,12 @@ LIBS+= -ldns_sd . include "../../net/mDNSResponder/buildlink3.mk" .endif -### -### GSSAPI authentication for the PostgreSQL backend. -### -.if !empty(PKG_OPTIONS:Mgssapi) -CONFIGURE_ARGS+= --with-gssapi +# Dtrace support +.if !empty(PKG_OPTIONS:Mdtrace) +CONFIGURE_ARGS+= --enable-dtrace .endif -### -### Kerberos5 authentication for the PostgreSQL backend. -### +# Kerberos5 authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mkerberos) . include "../../mk/krb5.buildlink3.mk" CONFIGURE_ARGS+= --with-krb5 @@ -41,33 +35,14 @@ CPPFLAGS+= ${CFLAGS_KRB5} . endif .endif -### -### LDAP authentication for the PostgreSQL backend. -### +# LDAP authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mldap) . include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-ldap .endif -### -### PAM authentication for the PostgreSQL backend. -### +# PAM authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --with-pam .endif - -### -### XML support for the PostgreSQL backend. -### -.if !empty(PKG_OPTIONS:Mxml) -. include "../../textproc/libxml2/buildlink3.mk" -CONFIGURE_ARGS+= --with-libxml -.endif - -### -### Dtrace support -### -.if !empty(PKG_OPTIONS:Mdtrace) -CONFIGURE_ARGS+= --enable-dtrace -.endif diff --git a/databases/postgresql93-client/Makefile b/databases/postgresql93-client/Makefile index 0df96252af6..43bcc1d30d2 100644 --- a/databases/postgresql93-client/Makefile +++ b/databases/postgresql93-client/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.12 2017/11/10 14:47:41 fhajny Exp $ +# $NetBSD: Makefile,v 1.13 2017/11/13 09:33:31 adam Exp $ PKGNAME= ${DISTNAME:C/-/93-client-/} -PKGREVISION= 1 COMMENT= PostgreSQL database client programs .include "../../databases/postgresql93/Makefile.common" @@ -53,9 +52,6 @@ BUILD_DIRS+= src/backend CONF_FILES+= share/postgresql/${f}.sample ${PKG_SYSCONFDIR}/${f} .endfor -# XXX work around core dumps with the native libedit -USE_GNU_READLINE= yes - .include "../../devel/readline/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" diff --git a/databases/postgresql93-docs/PLIST b/databases/postgresql93-docs/PLIST index 5555732f70d..76eab9d2820 100644 --- a/databases/postgresql93-docs/PLIST +++ b/databases/postgresql93-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2017/09/04 19:33:43 adam Exp $ +@comment $NetBSD: PLIST,v 1.21 2017/11/13 09:33:31 adam Exp $ man/man1/clusterdb.1 man/man1/createdb.1 man/man1/createlang.1 @@ -1104,6 +1104,7 @@ share/doc/postgresql/html/release-9-2-20.html share/doc/postgresql/html/release-9-2-21.html share/doc/postgresql/html/release-9-2-22.html share/doc/postgresql/html/release-9-2-23.html +share/doc/postgresql/html/release-9-2-24.html share/doc/postgresql/html/release-9-2-3.html share/doc/postgresql/html/release-9-2-4.html share/doc/postgresql/html/release-9-2-5.html @@ -1124,6 +1125,7 @@ share/doc/postgresql/html/release-9-3-17.html share/doc/postgresql/html/release-9-3-18.html share/doc/postgresql/html/release-9-3-19.html share/doc/postgresql/html/release-9-3-2.html +share/doc/postgresql/html/release-9-3-20.html share/doc/postgresql/html/release-9-3-3.html share/doc/postgresql/html/release-9-3-4.html share/doc/postgresql/html/release-9-3-5.html diff --git a/databases/postgresql93-server/PLIST b/databases/postgresql93-server/PLIST index baedd52ead7..ecefad31f5a 100644 --- a/databases/postgresql93-server/PLIST +++ b/databases/postgresql93-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.11 2017/05/12 19:37:54 adam Exp $ +@comment $NetBSD: PLIST,v 1.12 2017/11/13 09:33:32 adam Exp $ bin/postgres bin/postmaster include/postgresql/server/plpgsql.h @@ -442,7 +442,6 @@ share/postgresql/timezone/CET share/postgresql/timezone/CST6CDT share/postgresql/timezone/Canada/Atlantic share/postgresql/timezone/Canada/Central -share/postgresql/timezone/Canada/East-Saskatchewan share/postgresql/timezone/Canada/Eastern share/postgresql/timezone/Canada/Mountain share/postgresql/timezone/Canada/Newfoundland diff --git a/databases/postgresql93/Makefile.common b/databases/postgresql93/Makefile.common index 54f3075dd7f..2b5b305bcc8 100644 --- a/databases/postgresql93/Makefile.common +++ b/databases/postgresql93/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.28 2017/11/10 14:47:41 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.29 2017/11/13 09:33:31 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/postgresql93-pltcl/Makefile # used by databases/postgresql93-server/Makefile -DISTNAME= postgresql-9.3.19 +DISTNAME= postgresql-9.3.20 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/} EXTRACT_SUFX= .tar.bz2 @@ -65,11 +65,12 @@ 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-readline CONFIGURE_ARGS+= --without-tcl -CONFIGURE_ARGS+= --without-zlib # sys/ucred.h shouldn't be included on Solaris, causes conflicts between # procfs and largefile. @@ -84,8 +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. -CONFIGURE_ARGS.MirBSD+= --disable-thread-safety -CONFIGURE_ARGS.OpenBSD+= --disable-thread-safety +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 @@ -108,6 +109,13 @@ USE_LIBLTDL?= no .include "../../devel/gettext-lib/buildlink3.mk" LIBS.SunOS+= -lintl +.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: diff --git a/databases/postgresql93/distinfo b/databases/postgresql93/distinfo index b898fe1ae8c..ec35cf6d858 100644 --- a/databases/postgresql93/distinfo +++ b/databases/postgresql93/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.25 2017/09/04 19:33:43 adam Exp $ +$NetBSD: distinfo,v 1.26 2017/11/13 09:33:31 adam Exp $ -SHA1 (postgresql-9.3.19.tar.bz2) = 92402d56fd8a82341a7dbf7c7459fa6eef32a5be -RMD160 (postgresql-9.3.19.tar.bz2) = 79293893f37e67e86c6ae1bb6408578d1fe809e8 -SHA512 (postgresql-9.3.19.tar.bz2) = 7293d75b97255720c30d342e1de6032e14e9112e283d2668e80320f76906038d7419ffa7a12eba1fcf9f9274595db10e372db4999b0845cb55998d47f683ebb1 -Size (postgresql-9.3.19.tar.bz2) = 17190203 bytes +SHA1 (postgresql-9.3.20.tar.bz2) = c42716dc68db04822f5454b75f884631d2830ed2 +RMD160 (postgresql-9.3.20.tar.bz2) = 2b19fce50fb1ebecc548d2da6e8e47ad08350353 +SHA512 (postgresql-9.3.20.tar.bz2) = 40098661bf00b64ad2d773b242613c44fe269b5ae984ad8990f85ce705b27138b127493c507103052fb6705d52f2e63a1df6692c7024d43c3c6b18154f2ef407 +Size (postgresql-9.3.20.tar.bz2) = 17197360 bytes SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5 SHA1 (patch-configure) = 3de7635fe18532a05a619941fecad7bcda6c51b9 diff --git a/databases/postgresql93/options.mk b/databases/postgresql93/options.mk index c83b7458ec5..6603c9066d5 100644 --- a/databases/postgresql93/options.mk +++ b/databases/postgresql93/options.mk @@ -1,13 +1,11 @@ -# $NetBSD: options.mk,v 1.2 2013/10/12 04:51:05 richard Exp $ +# $NetBSD: options.mk,v 1.3 2017/11/13 09:33:31 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql93 -PKG_SUPPORTED_OPTIONS= bonjour gssapi kerberos ldap pam xml dtrace +PKG_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam .include "../../mk/bsd.options.mk" -### -### Bonjour support. -### +# Bonjour support .if !empty(PKG_OPTIONS:Mbonjour) CONFIGURE_ARGS+= --with-bonjour . if ${OPSYS} != "Darwin" @@ -16,16 +14,12 @@ LIBS+= -ldns_sd . include "../../net/mDNSResponder/buildlink3.mk" .endif -### -### GSSAPI authentication for the PostgreSQL backend. -### -.if !empty(PKG_OPTIONS:Mgssapi) -CONFIGURE_ARGS+= --with-gssapi +# Dtrace support +.if !empty(PKG_OPTIONS:Mdtrace) +CONFIGURE_ARGS+= --enable-dtrace .endif -### -### Kerberos5 authentication for the PostgreSQL backend. -### +# Kerberos5 authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mkerberos) . include "../../mk/krb5.buildlink3.mk" CONFIGURE_ARGS+= --with-krb5 @@ -41,33 +35,14 @@ CPPFLAGS+= ${CFLAGS_KRB5} . endif .endif -### -### LDAP authentication for the PostgreSQL backend. -### +# LDAP authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mldap) . include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-ldap .endif -### -### PAM authentication for the PostgreSQL backend. -### +# PAM authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --with-pam .endif - -### -### XML support for the PostgreSQL backend. -### -.if !empty(PKG_OPTIONS:Mxml) -. include "../../textproc/libxml2/buildlink3.mk" -CONFIGURE_ARGS+= --with-libxml -.endif - -### -### Dtrace support -### -.if !empty(PKG_OPTIONS:Mdtrace) -CONFIGURE_ARGS+= --enable-dtrace -.endif diff --git a/databases/postgresql94-client/Makefile b/databases/postgresql94-client/Makefile index bcfc5974aa4..7c63a1f0b04 100644 --- a/databases/postgresql94-client/Makefile +++ b/databases/postgresql94-client/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2017/11/10 14:47:42 fhajny Exp $ +# $NetBSD: Makefile,v 1.7 2017/11/13 09:33:32 adam Exp $ PKGNAME= ${DISTNAME:C/-/94-client-/} -PKGREVISION= 1 COMMENT= PostgreSQL database client programs .include "../../databases/postgresql94/Makefile.common" diff --git a/databases/postgresql94-docs/Makefile b/databases/postgresql94-docs/Makefile index 9b2119b6e2c..e59cb4d9ff6 100644 --- a/databases/postgresql94-docs/Makefile +++ b/databases/postgresql94-docs/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2016/08/14 16:56:30 is Exp $ +# $NetBSD: Makefile,v 1.6 2017/11/13 09:33:32 adam Exp $ PKGNAME= ${DISTNAME:C/-/94-docs-/} -PKGREVISION= # COMMENT= PostgreSQL database documentation .include "../../databases/postgresql94/Makefile.common" diff --git a/databases/postgresql94-docs/PLIST b/databases/postgresql94-docs/PLIST index e6b93a9f07d..186208217e1 100644 --- a/databases/postgresql94-docs/PLIST +++ b/databases/postgresql94-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2017/09/04 19:33:43 adam Exp $ +@comment $NetBSD: PLIST,v 1.16 2017/11/13 09:33:32 adam Exp $ man/man1/clusterdb.1 man/man1/createdb.1 man/man1/createlang.1 @@ -1124,6 +1124,7 @@ share/doc/postgresql/html/release-9-2-20.html share/doc/postgresql/html/release-9-2-21.html share/doc/postgresql/html/release-9-2-22.html share/doc/postgresql/html/release-9-2-23.html +share/doc/postgresql/html/release-9-2-24.html share/doc/postgresql/html/release-9-2-3.html share/doc/postgresql/html/release-9-2-4.html share/doc/postgresql/html/release-9-2-5.html @@ -1144,6 +1145,7 @@ share/doc/postgresql/html/release-9-3-17.html share/doc/postgresql/html/release-9-3-18.html share/doc/postgresql/html/release-9-3-19.html share/doc/postgresql/html/release-9-3-2.html +share/doc/postgresql/html/release-9-3-20.html share/doc/postgresql/html/release-9-3-3.html share/doc/postgresql/html/release-9-3-4.html share/doc/postgresql/html/release-9-3-5.html @@ -1158,6 +1160,7 @@ share/doc/postgresql/html/release-9-4-11.html share/doc/postgresql/html/release-9-4-12.html share/doc/postgresql/html/release-9-4-13.html share/doc/postgresql/html/release-9-4-14.html +share/doc/postgresql/html/release-9-4-15.html share/doc/postgresql/html/release-9-4-2.html share/doc/postgresql/html/release-9-4-3.html share/doc/postgresql/html/release-9-4-4.html diff --git a/databases/postgresql94-plperl/Makefile b/databases/postgresql94-plperl/Makefile index 3e615d6808c..85210c5268e 100644 --- a/databases/postgresql94-plperl/Makefile +++ b/databases/postgresql94-plperl/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.8 2016/08/14 16:56:30 is Exp $ +# $NetBSD: Makefile,v 1.9 2017/11/13 09:33:32 adam Exp $ PKGNAME= ${DISTNAME:C/-/94-plperl-/} -PKGREVISION= # COMMENT= PL/Perl procedural language for the PostgreSQL backend DEPENDS+= postgresql94-server>=${PKGVERSION_NOREV}:../../databases/postgresql94-server diff --git a/databases/postgresql94-server/PLIST b/databases/postgresql94-server/PLIST index 84e90c2aa63..46d4a08d945 100644 --- a/databases/postgresql94-server/PLIST +++ b/databases/postgresql94-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.8 2017/05/12 19:37:54 adam Exp $ +@comment $NetBSD: PLIST,v 1.9 2017/11/13 09:33:32 adam Exp $ bin/postgres bin/postmaster include/postgresql/server/plpgsql.h @@ -442,7 +442,6 @@ share/postgresql/timezone/CET share/postgresql/timezone/CST6CDT share/postgresql/timezone/Canada/Atlantic share/postgresql/timezone/Canada/Central -share/postgresql/timezone/Canada/East-Saskatchewan share/postgresql/timezone/Canada/Eastern share/postgresql/timezone/Canada/Mountain share/postgresql/timezone/Canada/Newfoundland diff --git a/databases/postgresql94/Makefile.common b/databases/postgresql94/Makefile.common index bcfccc7ea83..7cd8dc61db7 100644 --- a/databases/postgresql94/Makefile.common +++ b/databases/postgresql94/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2017/11/10 14:47:41 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.21 2017/11/13 09:33:32 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/postgresql94-pltcl/Makefile # used by databases/postgresql94-server/Makefile -DISTNAME= postgresql-9.4.14 +DISTNAME= postgresql-9.4.15 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/} EXTRACT_SUFX= .tar.bz2 @@ -65,11 +65,12 @@ 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. @@ -84,8 +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. -CONFIGURE_ARGS.MirBSD+= --disable-thread-safety -CONFIGURE_ARGS.OpenBSD+= --disable-thread-safety +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 @@ -108,9 +109,13 @@ 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: diff --git a/databases/postgresql94/distinfo b/databases/postgresql94/distinfo index f3315fde5bb..bf2c288323c 100644 --- a/databases/postgresql94/distinfo +++ b/databases/postgresql94/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.17 2017/09/04 19:33:43 adam Exp $ +$NetBSD: distinfo,v 1.18 2017/11/13 09:33:32 adam Exp $ -SHA1 (postgresql-9.4.14.tar.bz2) = 6b0b4eff681d1b93be903b96c2c16a6ca9e0d848 -RMD160 (postgresql-9.4.14.tar.bz2) = 63f096fdfa5afa74c173e6fb0ce99977552db138 -SHA512 (postgresql-9.4.14.tar.bz2) = 5952479b7c911cc381744e72d44c7c2269f98f4dda677e8c20a8ac7f4281e143017d287634b707ed96859e5438e82e96668bc4c68bb0c2ce9f3853c5a38fd0b2 -Size (postgresql-9.4.14.tar.bz2) = 17873740 bytes +SHA1 (postgresql-9.4.15.tar.bz2) = 5e50e5c0a66c676c584a41b25f18e326781aecdb +RMD160 (postgresql-9.4.15.tar.bz2) = 04dc5296bca61d8d1e32fa95b2002f36f9effc8f +SHA512 (postgresql-9.4.15.tar.bz2) = be69f184cf18fb4c611d31a128f3593dc537551606f1db84a3ce9899b72f546876f05b29792435c3780c6c2b571759f4db2c172d62b2c012bd58574df80b4eb1 +Size (postgresql-9.4.15.tar.bz2) = 17921677 bytes SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632 @@ -19,4 +19,3 @@ SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d84 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef SHA1 (patch-src_pl_plperl_plperl.h) = 0e7daec79a00d7378326e56525e50cfe61cfc174 SHA1 (patch-src_timezone_localtime.c) = 9b5748ef94b11b8798121ac85d2bb18cb99b3812 -SHA1 (patch-src_timezone_strftime.c) = f1f37e424dd70c0b2ad905ef491f9d9574bd3266 diff --git a/databases/postgresql94/options.mk b/databases/postgresql94/options.mk index 18fa4678c1c..d0d2894cefb 100644 --- a/databases/postgresql94/options.mk +++ b/databases/postgresql94/options.mk @@ -1,13 +1,11 @@ -# $NetBSD: options.mk,v 1.1 2015/01/14 21:01:18 adam Exp $ +# $NetBSD: options.mk,v 1.2 2017/11/13 09:33:32 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql94 -PKG_SUPPORTED_OPTIONS= bonjour gssapi kerberos ldap pam xml dtrace +PKG_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam .include "../../mk/bsd.options.mk" -### -### Bonjour support. -### +# Bonjour support .if !empty(PKG_OPTIONS:Mbonjour) CONFIGURE_ARGS+= --with-bonjour . if ${OPSYS} != "Darwin" @@ -16,16 +14,12 @@ LIBS+= -ldns_sd . include "../../net/mDNSResponder/buildlink3.mk" .endif -### -### GSSAPI authentication for the PostgreSQL backend. -### -.if !empty(PKG_OPTIONS:Mgssapi) -CONFIGURE_ARGS+= --with-gssapi +# Dtrace support +.if !empty(PKG_OPTIONS:Mdtrace) +CONFIGURE_ARGS+= --enable-dtrace .endif -### -### Kerberos5 authentication for the PostgreSQL backend. -### +# Kerberos5 authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mkerberos) . include "../../mk/krb5.buildlink3.mk" CONFIGURE_ARGS+= --with-krb5 @@ -41,33 +35,14 @@ CPPFLAGS+= ${CFLAGS_KRB5} . endif .endif -### -### LDAP authentication for the PostgreSQL backend. -### +# LDAP authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mldap) . include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-ldap .endif -### -### PAM authentication for the PostgreSQL backend. -### +# PAM authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --with-pam .endif - -### -### XML support for the PostgreSQL backend. -### -.if !empty(PKG_OPTIONS:Mxml) -. include "../../textproc/libxml2/buildlink3.mk" -CONFIGURE_ARGS+= --with-libxml -.endif - -### -### Dtrace support -### -.if !empty(PKG_OPTIONS:Mdtrace) -CONFIGURE_ARGS+= --enable-dtrace -.endif diff --git a/databases/postgresql94/patches/patch-src_timezone_strftime.c b/databases/postgresql94/patches/patch-src_timezone_strftime.c deleted file mode 100644 index e121af05701..00000000000 --- a/databases/postgresql94/patches/patch-src_timezone_strftime.c +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-src_timezone_strftime.c,v 1.2 2016/08/14 16:56:29 is Exp $ - ---- src/timezone/strftime.c.orig 2016-08-08 20:29:39.000000000 +0000 -+++ src/timezone/strftime.c -@@ -109,7 +109,7 @@ static const struct lc_time_T C_time_loc - }; - - static char *_add(const char *, char *, const char *); --static char *_conv(int, const char *, char *, const char *); -+static char *_conv(const int, const char *, char *, const char *); - static char *_fmt(const char *, const struct pg_tm *, char *, - const char *, int *); - static char *_yconv(int, int, bool, bool, char *, const char *); diff --git a/databases/postgresql95-client/Makefile b/databases/postgresql95-client/Makefile index d5b1cb53296..78d36e20357 100644 --- a/databases/postgresql95-client/Makefile +++ b/databases/postgresql95-client/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.6 2017/11/10 14:47:42 fhajny Exp $ +# $NetBSD: Makefile,v 1.7 2017/11/13 09:33:32 adam Exp $ PKGNAME= ${DISTNAME:C/-/95-client-/} -PKGREVISION= 1 COMMENT= PostgreSQL database client programs .include "../../databases/postgresql95/Makefile.common" diff --git a/databases/postgresql95-docs/PLIST b/databases/postgresql95-docs/PLIST index 81e38894563..839d3a3bdb1 100644 --- a/databases/postgresql95-docs/PLIST +++ b/databases/postgresql95-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2017/09/04 19:33:43 adam Exp $ +@comment $NetBSD: PLIST,v 1.10 2017/11/13 09:33:32 adam Exp $ man/man1/clusterdb.1 man/man1/createdb.1 man/man1/createlang.1 @@ -1145,6 +1145,7 @@ share/doc/postgresql/html/release-9-2-20.html share/doc/postgresql/html/release-9-2-21.html share/doc/postgresql/html/release-9-2-22.html share/doc/postgresql/html/release-9-2-23.html +share/doc/postgresql/html/release-9-2-24.html share/doc/postgresql/html/release-9-2-3.html share/doc/postgresql/html/release-9-2-4.html share/doc/postgresql/html/release-9-2-5.html @@ -1165,6 +1166,7 @@ share/doc/postgresql/html/release-9-3-17.html share/doc/postgresql/html/release-9-3-18.html share/doc/postgresql/html/release-9-3-19.html share/doc/postgresql/html/release-9-3-2.html +share/doc/postgresql/html/release-9-3-20.html share/doc/postgresql/html/release-9-3-3.html share/doc/postgresql/html/release-9-3-4.html share/doc/postgresql/html/release-9-3-5.html @@ -1179,6 +1181,7 @@ share/doc/postgresql/html/release-9-4-11.html share/doc/postgresql/html/release-9-4-12.html share/doc/postgresql/html/release-9-4-13.html share/doc/postgresql/html/release-9-4-14.html +share/doc/postgresql/html/release-9-4-15.html share/doc/postgresql/html/release-9-4-2.html share/doc/postgresql/html/release-9-4-3.html share/doc/postgresql/html/release-9-4-4.html @@ -1189,6 +1192,7 @@ share/doc/postgresql/html/release-9-4-8.html share/doc/postgresql/html/release-9-4-9.html share/doc/postgresql/html/release-9-4.html share/doc/postgresql/html/release-9-5-1.html +share/doc/postgresql/html/release-9-5-10.html share/doc/postgresql/html/release-9-5-2.html share/doc/postgresql/html/release-9-5-3.html share/doc/postgresql/html/release-9-5-4.html diff --git a/databases/postgresql95-server/PLIST b/databases/postgresql95-server/PLIST index 234a4417974..4e3dc7da170 100644 --- a/databases/postgresql95-server/PLIST +++ b/databases/postgresql95-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2017/05/12 19:37:55 adam Exp $ +@comment $NetBSD: PLIST,v 1.7 2017/11/13 09:33:32 adam Exp $ bin/postgres bin/postmaster include/postgresql/server/plpgsql.h @@ -443,7 +443,6 @@ share/postgresql/timezone/CET share/postgresql/timezone/CST6CDT share/postgresql/timezone/Canada/Atlantic share/postgresql/timezone/Canada/Central -share/postgresql/timezone/Canada/East-Saskatchewan share/postgresql/timezone/Canada/Eastern share/postgresql/timezone/Canada/Mountain share/postgresql/timezone/Canada/Newfoundland diff --git a/databases/postgresql95/Makefile.common b/databases/postgresql95/Makefile.common index 69c8bc07147..c06ff8fbe87 100644 --- a/databases/postgresql95/Makefile.common +++ b/databases/postgresql95/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2017/11/10 14:47:41 fhajny Exp $ +# $NetBSD: Makefile.common,v 1.14 2017/11/13 09:33:32 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/postgresql95-pltcl/Makefile # used by databases/postgresql95-server/Makefile -DISTNAME= postgresql-9.5.9 +DISTNAME= postgresql-9.5.10 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 \ diff --git a/databases/postgresql95/distinfo b/databases/postgresql95/distinfo index 3b3d3b1566e..79dfddcf3d8 100644 --- a/databases/postgresql95/distinfo +++ b/databases/postgresql95/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2017/09/04 19:33:43 adam Exp $ +$NetBSD: distinfo,v 1.11 2017/11/13 09:33:32 adam Exp $ -SHA1 (postgresql-9.5.9.tar.bz2) = ea1fc6ce64611e2c32620330b2de5a54a04d7e8d -RMD160 (postgresql-9.5.9.tar.bz2) = a93f904059823534a6578e8427f100d14f61047e -SHA512 (postgresql-9.5.9.tar.bz2) = 2c6a887b80a4b1d1da18282f443419db2279d8fe61821aa6ed1e9af6d28dda41959981ccede2456bd8835dccd16a80fd485ebc0a1bdc9459996a5d27d7781c55 -Size (postgresql-9.5.9.tar.bz2) = 18677113 bytes +SHA1 (postgresql-9.5.10.tar.bz2) = dd0c5905ffc122cede63727c39077f185ee4bde5 +RMD160 (postgresql-9.5.10.tar.bz2) = d5f557708cacf75788fea9e89c848568b1c4289e +SHA512 (postgresql-9.5.10.tar.bz2) = 24e31adabb0b88be882ab0440c560f0e4d5d69203be0581ca0ce22316555d92219ea0a2fd5254f12b2508bd3e58bbe0f1a7c8837228c96d9d5f00caac45af95a +Size (postgresql-9.5.10.tar.bz2) = 18701419 bytes SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632 diff --git a/databases/postgresql95/options.mk b/databases/postgresql95/options.mk index a80ce90aeb0..7822d3f72b4 100644 --- a/databases/postgresql95/options.mk +++ b/databases/postgresql95/options.mk @@ -1,13 +1,11 @@ -# $NetBSD: options.mk,v 1.1 2016/02/25 21:37:35 tnn Exp $ +# $NetBSD: options.mk,v 1.2 2017/11/13 09:33:32 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql95 -PKG_SUPPORTED_OPTIONS= bonjour gssapi kerberos ldap pam xml dtrace +PKG_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam .include "../../mk/bsd.options.mk" -### -### Bonjour support. -### +# Bonjour support .if !empty(PKG_OPTIONS:Mbonjour) CONFIGURE_ARGS+= --with-bonjour . if ${OPSYS} != "Darwin" @@ -16,16 +14,12 @@ LIBS+= -ldns_sd . include "../../net/mDNSResponder/buildlink3.mk" .endif -### -### GSSAPI authentication for the PostgreSQL backend. -### -.if !empty(PKG_OPTIONS:Mgssapi) -CONFIGURE_ARGS+= --with-gssapi +# Dtrace support +.if !empty(PKG_OPTIONS:Mdtrace) +CONFIGURE_ARGS+= --enable-dtrace .endif -### -### Kerberos5 authentication for the PostgreSQL backend. -### +# Kerberos5 authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mkerberos) . include "../../mk/krb5.buildlink3.mk" CONFIGURE_ARGS+= --with-krb5 @@ -41,33 +35,14 @@ CPPFLAGS+= ${CFLAGS_KRB5} . endif .endif -### -### LDAP authentication for the PostgreSQL backend. -### +# LDAP authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mldap) . include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-ldap .endif -### -### PAM authentication for the PostgreSQL backend. -### +# PAM authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --with-pam .endif - -### -### XML support for the PostgreSQL backend. -### -.if !empty(PKG_OPTIONS:Mxml) -. include "../../textproc/libxml2/buildlink3.mk" -CONFIGURE_ARGS+= --with-libxml -.endif - -### -### Dtrace support -### -.if !empty(PKG_OPTIONS:Mdtrace) -CONFIGURE_ARGS+= --enable-dtrace -.endif diff --git a/databases/postgresql96-client/Makefile b/databases/postgresql96-client/Makefile index 43bdda05404..eb194a630b1 100644 --- a/databases/postgresql96-client/Makefile +++ b/databases/postgresql96-client/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2017/11/10 14:47:42 fhajny Exp $ +# $NetBSD: Makefile,v 1.5 2017/11/13 09:33:33 adam Exp $ PKGNAME= ${DISTNAME:C/-/96-client-/} -PKGREVISION= 1 COMMENT= PostgreSQL database client programs .include "../../databases/postgresql96/Makefile.common" diff --git a/databases/postgresql96-docs/PLIST b/databases/postgresql96-docs/PLIST index 23733356827..9bdab41546f 100644 --- a/databases/postgresql96-docs/PLIST +++ b/databases/postgresql96-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2017/09/04 19:33:43 adam Exp $ +@comment $NetBSD: PLIST,v 1.6 2017/11/13 09:33:33 adam Exp $ man/man1/clusterdb.1 man/man1/createdb.1 man/man1/createlang.1 @@ -1159,6 +1159,7 @@ share/doc/postgresql/html/release-9-2-20.html share/doc/postgresql/html/release-9-2-21.html share/doc/postgresql/html/release-9-2-22.html share/doc/postgresql/html/release-9-2-23.html +share/doc/postgresql/html/release-9-2-24.html share/doc/postgresql/html/release-9-2-3.html share/doc/postgresql/html/release-9-2-4.html share/doc/postgresql/html/release-9-2-5.html @@ -1179,6 +1180,7 @@ share/doc/postgresql/html/release-9-3-17.html share/doc/postgresql/html/release-9-3-18.html share/doc/postgresql/html/release-9-3-19.html share/doc/postgresql/html/release-9-3-2.html +share/doc/postgresql/html/release-9-3-20.html share/doc/postgresql/html/release-9-3-3.html share/doc/postgresql/html/release-9-3-4.html share/doc/postgresql/html/release-9-3-5.html @@ -1193,6 +1195,7 @@ share/doc/postgresql/html/release-9-4-11.html share/doc/postgresql/html/release-9-4-12.html share/doc/postgresql/html/release-9-4-13.html share/doc/postgresql/html/release-9-4-14.html +share/doc/postgresql/html/release-9-4-15.html share/doc/postgresql/html/release-9-4-2.html share/doc/postgresql/html/release-9-4-3.html share/doc/postgresql/html/release-9-4-4.html @@ -1203,6 +1206,7 @@ share/doc/postgresql/html/release-9-4-8.html share/doc/postgresql/html/release-9-4-9.html share/doc/postgresql/html/release-9-4.html share/doc/postgresql/html/release-9-5-1.html +share/doc/postgresql/html/release-9-5-10.html share/doc/postgresql/html/release-9-5-2.html share/doc/postgresql/html/release-9-5-3.html share/doc/postgresql/html/release-9-5-4.html @@ -1217,6 +1221,7 @@ share/doc/postgresql/html/release-9-6-2.html share/doc/postgresql/html/release-9-6-3.html share/doc/postgresql/html/release-9-6-4.html share/doc/postgresql/html/release-9-6-5.html +share/doc/postgresql/html/release-9-6-6.html share/doc/postgresql/html/release-9-6.html share/doc/postgresql/html/release.html share/doc/postgresql/html/replication-origins.html diff --git a/databases/postgresql96-server/PLIST b/databases/postgresql96-server/PLIST index 90ca2f3f6e3..23ddc658338 100644 --- a/databases/postgresql96-server/PLIST +++ b/databases/postgresql96-server/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2017/05/12 19:37:55 adam Exp $ +@comment $NetBSD: PLIST,v 1.4 2017/11/13 09:33:33 adam Exp $ bin/postgres bin/postmaster include/postgresql/server/plpgsql.h @@ -444,7 +444,6 @@ share/postgresql/timezone/CET share/postgresql/timezone/CST6CDT share/postgresql/timezone/Canada/Atlantic share/postgresql/timezone/Canada/Central -share/postgresql/timezone/Canada/East-Saskatchewan share/postgresql/timezone/Canada/Eastern share/postgresql/timezone/Canada/Mountain share/postgresql/timezone/Canada/Newfoundland 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 \ diff --git a/databases/postgresql96/distinfo b/databases/postgresql96/distinfo index b6779535337..278f0c6aade 100644 --- a/databases/postgresql96/distinfo +++ b/databases/postgresql96/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.6 2017/09/04 19:33:43 adam Exp $ +$NetBSD: distinfo,v 1.7 2017/11/13 09:33:33 adam Exp $ -SHA1 (postgresql-9.6.5.tar.bz2) = e45faa85c03a937eb82a34a3f02a4793bba836a6 -RMD160 (postgresql-9.6.5.tar.bz2) = 95ed637b26927b83c944d4ae70b903953e239601 -SHA512 (postgresql-9.6.5.tar.bz2) = ad35c27ea55b18005ea61b49d6994718df86519b3f99addd0ecb17ece1f1c34764eb5194f8961c45cfa75703d810baf54433f8538cfd43a70bd908e1e5878df9 -Size (postgresql-9.6.5.tar.bz2) = 19576132 bytes +SHA1 (postgresql-9.6.6.tar.bz2) = bd911c2a2ee25086cfebe03f3483f82c38210cdb +RMD160 (postgresql-9.6.6.tar.bz2) = bd2c81026b226517bfe0351db253464c465c8ac8 +SHA512 (postgresql-9.6.6.tar.bz2) = ac2f0fe6ef7c4e14f85cd7592d1306d9657b7f35efa6f43a089d7785ab970b8c25aa1e66d83df056c23513d6dbac0a9f54717b3d85758560d02e7f8141914ebc +Size (postgresql-9.6.6.tar.bz2) = 19605724 bytes SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632 diff --git a/databases/postgresql96/options.mk b/databases/postgresql96/options.mk index 9b7bd89f40a..657b2ddf324 100644 --- a/databases/postgresql96/options.mk +++ b/databases/postgresql96/options.mk @@ -1,13 +1,11 @@ -# $NetBSD: options.mk,v 1.1 2016/10/29 19:41:54 adam Exp $ +# $NetBSD: options.mk,v 1.2 2017/11/13 09:33:33 adam Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.postgresql96 -PKG_SUPPORTED_OPTIONS= bonjour gssapi kerberos ldap pam xml dtrace +PKG_SUPPORTED_OPTIONS= bonjour dtrace kerberos ldap pam .include "../../mk/bsd.options.mk" -### -### Bonjour support. -### +# Bonjour support .if !empty(PKG_OPTIONS:Mbonjour) CONFIGURE_ARGS+= --with-bonjour . if ${OPSYS} != "Darwin" @@ -16,16 +14,12 @@ LIBS+= -ldns_sd . include "../../net/mDNSResponder/buildlink3.mk" .endif -### -### GSSAPI authentication for the PostgreSQL backend. -### -.if !empty(PKG_OPTIONS:Mgssapi) -CONFIGURE_ARGS+= --with-gssapi +# Dtrace support +.if !empty(PKG_OPTIONS:Mdtrace) +CONFIGURE_ARGS+= --enable-dtrace .endif -### -### Kerberos5 authentication for the PostgreSQL backend. -### +# Kerberos5 authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mkerberos) . include "../../mk/krb5.buildlink3.mk" CONFIGURE_ARGS+= --with-krb5 @@ -41,33 +35,14 @@ CPPFLAGS+= ${CFLAGS_KRB5} . endif .endif -### -### LDAP authentication for the PostgreSQL backend. -### +# LDAP authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mldap) . include "../../databases/openldap-client/buildlink3.mk" CONFIGURE_ARGS+= --with-ldap .endif -### -### PAM authentication for the PostgreSQL backend. -### +# PAM authentication for the PostgreSQL backend .if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" CONFIGURE_ARGS+= --with-pam .endif - -### -### XML support for the PostgreSQL backend. -### -.if !empty(PKG_OPTIONS:Mxml) -. include "../../textproc/libxml2/buildlink3.mk" -CONFIGURE_ARGS+= --with-libxml -.endif - -### -### Dtrace support -### -.if !empty(PKG_OPTIONS:Mdtrace) -CONFIGURE_ARGS+= --enable-dtrace -.endif |