diff options
33 files changed, 181 insertions, 103 deletions
diff --git a/databases/postgresql84-client/PLIST b/databases/postgresql84-client/PLIST index 477aa01daa5..3200810336a 100644 --- a/databases/postgresql84-client/PLIST +++ b/databases/postgresql84-client/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.20 2013/10/12 20:39:42 adam Exp $ +@comment $NetBSD: PLIST,v 1.21 2013/12/10 22:32:56 adam Exp $ bin/clusterdb bin/createdb bin/createlang @@ -1357,6 +1357,7 @@ share/doc/postgresql/html/release-8-4-15.html share/doc/postgresql/html/release-8-4-16.html share/doc/postgresql/html/release-8-4-17.html share/doc/postgresql/html/release-8-4-18.html +share/doc/postgresql/html/release-8-4-19.html share/doc/postgresql/html/release-8-4-2.html share/doc/postgresql/html/release-8-4-3.html share/doc/postgresql/html/release-8-4-4.html diff --git a/databases/postgresql84/Makefile.common b/databases/postgresql84/Makefile.common index c08109746ee..f984384793a 100644 --- a/databases/postgresql84/Makefile.common +++ b/databases/postgresql84/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.28 2013/12/02 23:08:54 bsiegert Exp $ +# $NetBSD: Makefile.common,v 1.29 2013/12/10 22:32:56 adam Exp $ # # used by databases/postgresql84-adminpack/Makefile # used by databases/postgresql84-client/Makefile @@ -17,7 +17,7 @@ # <lang>-postgresql client-side interface to PostgreSQL # postgresql-<lang> server-side module for PostgreSQL backend -DISTNAME= postgresql-8.4.18 +DISTNAME= postgresql-8.4.19 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/} EXTRACT_SUFX= .tar.bz2 diff --git a/databases/postgresql84/distinfo b/databases/postgresql84/distinfo index 39ead2b0f35..54556c4d18a 100644 --- a/databases/postgresql84/distinfo +++ b/databases/postgresql84/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.26 2013/10/12 20:39:42 adam Exp $ +$NetBSD: distinfo,v 1.27 2013/12/10 22:32:56 adam Exp $ -SHA1 (postgresql-8.4.18.tar.bz2) = e3ae82eb864af03ebf213c430c65e69fef472fbd -RMD160 (postgresql-8.4.18.tar.bz2) = b0e37aa00e4c83af13369456afe5cd124692dc42 -Size (postgresql-8.4.18.tar.bz2) = 14819294 bytes +SHA1 (postgresql-8.4.19.tar.bz2) = 1e1ae13727cea95545650df06b0035400c6f7bdd +RMD160 (postgresql-8.4.19.tar.bz2) = d88bf270e23c7f01fc2a3e182e4f76a6c1ce8df7 +Size (postgresql-8.4.19.tar.bz2) = 14825794 bytes SHA1 (patch-aa) = 72437773d67939c8d8c8e9a99caf430590fd726f SHA1 (patch-ab) = aa46d88c8a72edaf95880de48474ea484d6d2bf5 SHA1 (patch-ac) = 0b82797d0b80bdd1e9b5f3de4989fe3848adf6cb @@ -16,3 +16,4 @@ SHA1 (patch-ba) = f8de4ee18a433b65a54280d047d18b161d3e9ca8 SHA1 (patch-bb) = 22859530d2694cf4c347f5e4c02eff0483d536d1 SHA1 (patch-src_pl_plperl_plperl.h) = 8d448cc8e0e0dbc4d15dad369d3ca7a796874ac2 SHA1 (patch-src_pl_plpgsql_src_Makefile) = 1592ecb85d6ef1bd691f77b320f639b6fc822e14 +SHA1 (patch-src_pl_plpython_Makefile) = d70e0cf5e20479851df3ededa50776fd04846d49 diff --git a/databases/postgresql84/patches/patch-src_pl_plpython_Makefile b/databases/postgresql84/patches/patch-src_pl_plpython_Makefile new file mode 100644 index 00000000000..520f81fba49 --- /dev/null +++ b/databases/postgresql84/patches/patch-src_pl_plpython_Makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-src_pl_plpython_Makefile,v 1.1 2013/12/10 22:32:56 adam Exp $ + +Don't try to use Python framework. + +--- src/pl/plpython/Makefile.orig 2013-12-10 21:48:07.000000000 +0000 ++++ src/pl/plpython/Makefile +@@ -24,8 +24,6 @@ endif + # Darwin (OS X) has its own ideas about how to do this. + ifeq ($(PORTNAME), darwin) + shared_libpython = yes +-override python_libspec = -framework Python +-override python_additional_libs = + endif + + # If we don't have a shared library and the platform doesn't allow it diff --git a/databases/postgresql90-datatypes/Makefile b/databases/postgresql90-datatypes/Makefile index 6198a58aae0..81fa5ac6315 100644 --- a/databases/postgresql90-datatypes/Makefile +++ b/databases/postgresql90-datatypes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2013/02/09 11:19:12 adam Exp $ +# $NetBSD: Makefile,v 1.11 2013/12/10 22:32:56 adam Exp $ PKGNAME= ${DISTNAME:C/-/90-datatypes-/} COMMENT= PostgreSQL data types support modules @@ -7,22 +7,27 @@ DEPENDS+= postgresql90-server>=${PKGVERSION_NOREV}:../../databases/postgresql90- .include "../../databases/postgresql90/Makefile.common" +PLIST_VARS+= uuid + +.if ${OPSYS} != "Darwin" +PLIST.uuid= yes CONFIGURE_ARGS+= --with-ossp-uuid -BUILD_MAKE_FLAGS= PGXS=1 # because global pg_config.h is included, we have to define this CPPFLAGS+= -DHAVE_UUID_H +BUILD_DIRS+= contrib/uuid-ossp +. include "../../devel/ossp-uuid/buildlink3.mk" +.endif +BUILD_MAKE_FLAGS= PGXS=1 BUILD_DIRS+= contrib/citext BUILD_DIRS+= contrib/hstore BUILD_DIRS+= contrib/intarray BUILD_DIRS+= contrib/isn BUILD_DIRS+= contrib/ltree BUILD_DIRS+= contrib/lo -BUILD_DIRS+= contrib/uuid-ossp BUILD_DIRS+= contrib/unaccent REQD_DIRS+= lib/postgresql REQD_DIRS+= share/postgresql/contrib .include "../../databases/postgresql90-client/buildlink3.mk" -.include "../../devel/ossp-uuid/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql90-datatypes/PLIST b/databases/postgresql90-datatypes/PLIST index afc71cd03de..4875bcc47db 100644 --- a/databases/postgresql90-datatypes/PLIST +++ b/databases/postgresql90-datatypes/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2013/02/09 11:19:12 adam Exp $ +@comment $NetBSD: PLIST,v 1.6 2013/12/10 22:32:56 adam Exp $ lib/postgresql/_int.so lib/postgresql/citext.so lib/postgresql/hstore.so @@ -6,7 +6,7 @@ lib/postgresql/isn.so lib/postgresql/lo.so lib/postgresql/ltree.so lib/postgresql/unaccent.so -lib/postgresql/uuid-ossp.so +${PLIST.uuid}lib/postgresql/uuid-ossp.so share/postgresql/contrib/_int.sql share/postgresql/contrib/citext.sql share/postgresql/contrib/hstore.sql @@ -21,6 +21,6 @@ share/postgresql/contrib/uninstall_isn.sql share/postgresql/contrib/uninstall_lo.sql share/postgresql/contrib/uninstall_ltree.sql share/postgresql/contrib/uninstall_unaccent.sql -share/postgresql/contrib/uninstall_uuid-ossp.sql -share/postgresql/contrib/uuid-ossp.sql +${PLIST.uuid}share/postgresql/contrib/uninstall_uuid-ossp.sql +${PLIST.uuid}share/postgresql/contrib/uuid-ossp.sql share/postgresql/tsearch_data/unaccent.rules diff --git a/databases/postgresql90-docs/PLIST b/databases/postgresql90-docs/PLIST index 5906907789a..2e7400c0366 100644 --- a/databases/postgresql90-docs/PLIST +++ b/databases/postgresql90-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2013/10/12 20:39:42 adam Exp $ +@comment $NetBSD: PLIST,v 1.17 2013/12/10 22:32:56 adam Exp $ man/man1/clusterdb.1 man/man1/createdb.1 man/man1/createlang.1 @@ -927,6 +927,7 @@ share/doc/postgresql/html/release-8-4-15.html share/doc/postgresql/html/release-8-4-16.html share/doc/postgresql/html/release-8-4-17.html share/doc/postgresql/html/release-8-4-18.html +share/doc/postgresql/html/release-8-4-19.html share/doc/postgresql/html/release-8-4-2.html share/doc/postgresql/html/release-8-4-3.html share/doc/postgresql/html/release-8-4-4.html @@ -942,6 +943,7 @@ share/doc/postgresql/html/release-9-0-11.html share/doc/postgresql/html/release-9-0-12.html share/doc/postgresql/html/release-9-0-13.html share/doc/postgresql/html/release-9-0-14.html +share/doc/postgresql/html/release-9-0-15.html share/doc/postgresql/html/release-9-0-2.html share/doc/postgresql/html/release-9-0-3.html share/doc/postgresql/html/release-9-0-4.html diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile index d57641584e0..2b5cf4ec400 100644 --- a/databases/postgresql90-server/Makefile +++ b/databases/postgresql90-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2013/10/12 20:39:42 adam Exp $ +# $NetBSD: Makefile,v 1.18 2013/12/10 22:32:56 adam Exp $ PKGNAME= ${DISTNAME:C/-/90-server-/} COMMENT= PostgreSQL database server programs @@ -46,11 +46,11 @@ DL_LIBS+= -lltdl # the databases PGUSER?= pgsql PGGROUP?= pgsql -PGHOME?= ${PREFIX}/${PGUSER} +PGHOME?= ${VARBASE}/${PGUSER} FILES_SUBST+= PGUSER=${PGUSER} FILES_SUBST+= PGGROUP=${PGGROUP} FILES_SUBST+= PGHOME=${PGHOME} -BUILD_DEFS+= PGHOME +BUILD_DEFS+= PGHOME VARBASE ALL_ENV+= INSTALLED_LIBPQ=yes diff --git a/databases/postgresql90/Makefile.common b/databases/postgresql90/Makefile.common index b9dbf182385..7df01e2c068 100644 --- a/databases/postgresql90/Makefile.common +++ b/databases/postgresql90/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.26 2013/12/02 23:08:54 bsiegert Exp $ +# $NetBSD: Makefile.common,v 1.27 2013/12/10 22:32:56 adam Exp $ # # used by databases/postgresql90-adminpack/Makefile # used by databases/postgresql90-client/Makefile @@ -21,7 +21,7 @@ # <lang>-postgresql client-side interface to PostgreSQL # postgresql-<lang> server-side module for PostgreSQL backend -DISTNAME= postgresql-9.0.14 +DISTNAME= postgresql-9.0.15 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/} EXTRACT_SUFX= .tar.bz2 diff --git a/databases/postgresql90/distinfo b/databases/postgresql90/distinfo index 14a63e8132d..994aea4a10c 100644 --- a/databases/postgresql90/distinfo +++ b/databases/postgresql90/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.18 2013/10/12 20:39:42 adam Exp $ +$NetBSD: distinfo,v 1.19 2013/12/10 22:32:56 adam Exp $ -SHA1 (postgresql-9.0.14.tar.bz2) = f6d59d6fddbecc16d8f4d3ccbb70d62f77d56564 -RMD160 (postgresql-9.0.14.tar.bz2) = 17e5f49bb8497a92f641b2bc607cbd5aa6848104 -Size (postgresql-9.0.14.tar.bz2) = 15154015 bytes +SHA1 (postgresql-9.0.15.tar.bz2) = 1e12b52c1989f9e2770898ea44c26b83a8dcc09e +RMD160 (postgresql-9.0.15.tar.bz2) = a951bffd112017f3169ba3c8b6961243501b45ec +Size (postgresql-9.0.15.tar.bz2) = 15169745 bytes SHA1 (patch-aa) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0 SHA1 (patch-ab) = 6adfc53e325abe69582f1c7971f56144c697e9c1 SHA1 (patch-ac) = 76ddd3015d93b19cdd6000eaffc4f53cbd4965b5 @@ -15,3 +15,4 @@ SHA1 (patch-ao) = 4d7c40d107d4c13c63ef2908d9a02be319863657 SHA1 (patch-src_Makefile.shlib) = 72d6db917b7d6ba1dbf8037e03f83a7ce7c4d6c9 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0 SHA1 (patch-src_pl_plperl_plperl.h) = 8e2d954642cb68dc6c6fd08debd058d053566826 +SHA1 (patch-src_pl_plpython_Makefile) = d70e0cf5e20479851df3ededa50776fd04846d49 diff --git a/databases/postgresql90/patches/patch-src_pl_plpython_Makefile b/databases/postgresql90/patches/patch-src_pl_plpython_Makefile new file mode 100644 index 00000000000..520f81fba49 --- /dev/null +++ b/databases/postgresql90/patches/patch-src_pl_plpython_Makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-src_pl_plpython_Makefile,v 1.1 2013/12/10 22:32:56 adam Exp $ + +Don't try to use Python framework. + +--- src/pl/plpython/Makefile.orig 2013-12-10 21:48:07.000000000 +0000 ++++ src/pl/plpython/Makefile +@@ -24,8 +24,6 @@ endif + # Darwin (OS X) has its own ideas about how to do this. + ifeq ($(PORTNAME), darwin) + shared_libpython = yes +-override python_libspec = -framework Python +-override python_additional_libs = + endif + + # If we don't have a shared library and the platform doesn't allow it diff --git a/databases/postgresql91-datatypes/DESCR b/databases/postgresql91-datatypes/DESCR index 0fd1fb2d6cd..81d686b929f 100644 --- a/databases/postgresql91-datatypes/DESCR +++ b/databases/postgresql91-datatypes/DESCR @@ -1,12 +1,5 @@ -This package provides the following PostgreSQL modules: - - citext - - hstore - - intarray - - isn - - ltree - - lo - - uuid-ossp - - unaccent +This package provides the following PostgreSQL modules: citext, hstore, +intarray, isn, ltree, lo, uuid-ossp, unaccent. The "citext" module provides a case-insensitive character string type, citext. Essentially, it internally calls lower when comparing values. diff --git a/databases/postgresql91-datatypes/Makefile b/databases/postgresql91-datatypes/Makefile index 8a2783fc233..e413818e9c7 100644 --- a/databases/postgresql91-datatypes/Makefile +++ b/databases/postgresql91-datatypes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2013/02/09 11:19:15 adam Exp $ +# $NetBSD: Makefile,v 1.8 2013/12/10 22:32:57 adam Exp $ PKGNAME= ${DISTNAME:C/-/91-datatypes-/} COMMENT= PostgreSQL data types support modules @@ -7,9 +7,16 @@ DEPENDS+= postgresql91-server>=${PKGVERSION_NOREV}:../../databases/postgresql91- .include "../../databases/postgresql91/Makefile.common" +PLIST_VARS+= uuid + +.if ${OPSYS} != "Darwin" +PLIST.uuid= yes CONFIGURE_ARGS+= --with-ossp-uuid # because global pg_config.h is included, we have to define this CPPFLAGS+= -DHAVE_UUID_H +BUILD_DIRS+= contrib/uuid-ossp +. include "../../devel/ossp-uuid/buildlink3.mk" +.endif BUILD_DIRS+= contrib/citext BUILD_DIRS+= contrib/hstore @@ -17,10 +24,8 @@ BUILD_DIRS+= contrib/intarray BUILD_DIRS+= contrib/isn BUILD_DIRS+= contrib/ltree BUILD_DIRS+= contrib/lo -BUILD_DIRS+= contrib/uuid-ossp BUILD_DIRS+= contrib/unaccent BUILD_MAKE_FLAGS= PGXS=1 .include "../../databases/postgresql91-client/buildlink3.mk" -.include "../../devel/ossp-uuid/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql91-datatypes/PLIST b/databases/postgresql91-datatypes/PLIST index 31d3f5deaa0..533d01d4739 100644 --- a/databases/postgresql91-datatypes/PLIST +++ b/databases/postgresql91-datatypes/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/09/15 08:30:08 adam Exp $ +@comment $NetBSD: PLIST,v 1.2 2013/12/10 22:32:57 adam Exp $ lib/postgresql/_int.so lib/postgresql/citext.so lib/postgresql/hstore.so @@ -6,7 +6,7 @@ lib/postgresql/isn.so lib/postgresql/lo.so lib/postgresql/ltree.so lib/postgresql/unaccent.so -lib/postgresql/uuid-ossp.so +${PLIST.uuid}lib/postgresql/uuid-ossp.so share/postgresql/extension/citext--1.0.sql share/postgresql/extension/citext--unpackaged--1.0.sql share/postgresql/extension/citext.control @@ -28,7 +28,7 @@ share/postgresql/extension/ltree.control share/postgresql/extension/unaccent--1.0.sql share/postgresql/extension/unaccent--unpackaged--1.0.sql share/postgresql/extension/unaccent.control -share/postgresql/extension/uuid-ossp--1.0.sql -share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql -share/postgresql/extension/uuid-ossp.control +${PLIST.uuid}share/postgresql/extension/uuid-ossp--1.0.sql +${PLIST.uuid}share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql +${PLIST.uuid}share/postgresql/extension/uuid-ossp.control share/postgresql/tsearch_data/unaccent.rules diff --git a/databases/postgresql91-docs/PLIST b/databases/postgresql91-docs/PLIST index 448d1b94310..79050bd66af 100644 --- a/databases/postgresql91-docs/PLIST +++ b/databases/postgresql91-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.12 2013/10/12 20:39:43 adam Exp $ +@comment $NetBSD: PLIST,v 1.13 2013/12/10 22:32:57 adam Exp $ man/man1/clusterdb.1 man/man1/createdb.1 man/man1/createlang.1 @@ -973,6 +973,7 @@ share/doc/postgresql/html/release-8-4-15.html share/doc/postgresql/html/release-8-4-16.html share/doc/postgresql/html/release-8-4-17.html share/doc/postgresql/html/release-8-4-18.html +share/doc/postgresql/html/release-8-4-19.html share/doc/postgresql/html/release-8-4-2.html share/doc/postgresql/html/release-8-4-3.html share/doc/postgresql/html/release-8-4-4.html @@ -988,6 +989,7 @@ share/doc/postgresql/html/release-9-0-11.html share/doc/postgresql/html/release-9-0-12.html share/doc/postgresql/html/release-9-0-13.html share/doc/postgresql/html/release-9-0-14.html +share/doc/postgresql/html/release-9-0-15.html share/doc/postgresql/html/release-9-0-2.html share/doc/postgresql/html/release-9-0-3.html share/doc/postgresql/html/release-9-0-4.html @@ -999,6 +1001,7 @@ share/doc/postgresql/html/release-9-0-9.html share/doc/postgresql/html/release-9-0.html share/doc/postgresql/html/release-9-1-1.html share/doc/postgresql/html/release-9-1-10.html +share/doc/postgresql/html/release-9-1-11.html share/doc/postgresql/html/release-9-1-2.html share/doc/postgresql/html/release-9-1-3.html share/doc/postgresql/html/release-9-1-4.html diff --git a/databases/postgresql91/Makefile.common b/databases/postgresql91/Makefile.common index 926aac1d112..706a08d8f93 100644 --- a/databases/postgresql91/Makefile.common +++ b/databases/postgresql91/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.16 2013/12/02 23:08:55 bsiegert Exp $ +# $NetBSD: Makefile.common,v 1.17 2013/12/10 22:32:56 adam Exp $ # # used by databases/postgresql91-adminpack/Makefile # used by databases/postgresql91-client/Makefile @@ -21,7 +21,7 @@ # <lang>-postgresql client-side interface to PostgreSQL # postgresql-<lang> server-side module for PostgreSQL backend -DISTNAME= postgresql-9.1.10 +DISTNAME= postgresql-9.1.11 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/} EXTRACT_SUFX= .tar.bz2 diff --git a/databases/postgresql91/distinfo b/databases/postgresql91/distinfo index d5e7c31c484..a8f8ebd20dc 100644 --- a/databases/postgresql91/distinfo +++ b/databases/postgresql91/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.15 2013/10/12 20:39:43 adam Exp $ +$NetBSD: distinfo,v 1.16 2013/12/10 22:32:56 adam Exp $ -SHA1 (postgresql-9.1.10.tar.bz2) = ac2882d50f5a4798d1fcc7c6445c4964b1edda5f -RMD160 (postgresql-9.1.10.tar.bz2) = 9ffafab4c2b60be33789066b1d5563f370685500 -Size (postgresql-9.1.10.tar.bz2) = 15849107 bytes +SHA1 (postgresql-9.1.11.tar.bz2) = b9ee975498705647aae77dae91869bfc6bb079ff +RMD160 (postgresql-9.1.11.tar.bz2) = 2a3849a3e8b8f8fbbe2a35ee422a0be4a67e6dae +Size (postgresql-9.1.11.tar.bz2) = 15861805 bytes SHA1 (patch-config_perl.m4) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0 SHA1 (patch-configure) = dab79533dac06a79a5aa8439d6b15830d8d2fba7 SHA1 (patch-contrib_dblink_Makefile) = 4960ad57d42465fae203870548e4c53f8a32ce04 @@ -12,6 +12,7 @@ SHA1 (patch-src_backend_Makefile) = 76ddd3015d93b19cdd6000eaffc4f53cbd4965b5 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0 SHA1 (patch-src_pl_plperl_GNUmakefile) = 2b7448d6dd8550e2ea61f40728a2780068b93d07 SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61 +SHA1 (patch-src_pl_plpython_Makefile) = d70e0cf5e20479851df3ededa50776fd04846d49 SHA1 (patch-src_timezone_localtime.c) = a73769cf05223d2ee06249c9e69c85038c2cd936 SHA1 (patch-src_timezone_private.h) = 85dac95e40efc16270885087f868aeb76e1b9214 SHA1 (patch-src_timezone_strftime.c) = 25102dce1b9b22385353af23500636fb18e3bf64 diff --git a/databases/postgresql91/patches/patch-src_pl_plpython_Makefile b/databases/postgresql91/patches/patch-src_pl_plpython_Makefile new file mode 100644 index 00000000000..64eb727d8f3 --- /dev/null +++ b/databases/postgresql91/patches/patch-src_pl_plpython_Makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-src_pl_plpython_Makefile,v 1.1 2013/12/10 22:32:57 adam Exp $ + +Don't try to use Python framework. + +--- src/pl/plpython/Makefile.orig 2013-12-10 21:48:07.000000000 +0000 ++++ src/pl/plpython/Makefile +@@ -24,8 +24,6 @@ endif + # Darwin (OS X) has its own ideas about how to do this. + ifeq ($(PORTNAME), darwin) + shared_libpython = yes +-override python_libspec = -framework Python +-override python_additional_libs = + endif + + # If we don't have a shared library and the platform doesn't allow it diff --git a/databases/postgresql92-datatypes/DESCR b/databases/postgresql92-datatypes/DESCR index 0fd1fb2d6cd..81d686b929f 100644 --- a/databases/postgresql92-datatypes/DESCR +++ b/databases/postgresql92-datatypes/DESCR @@ -1,12 +1,5 @@ -This package provides the following PostgreSQL modules: - - citext - - hstore - - intarray - - isn - - ltree - - lo - - uuid-ossp - - unaccent +This package provides the following PostgreSQL modules: citext, hstore, +intarray, isn, ltree, lo, uuid-ossp, unaccent. The "citext" module provides a case-insensitive character string type, citext. Essentially, it internally calls lower when comparing values. diff --git a/databases/postgresql92-datatypes/Makefile b/databases/postgresql92-datatypes/Makefile index 9607e87aced..491ddae00ab 100644 --- a/databases/postgresql92-datatypes/Makefile +++ b/databases/postgresql92-datatypes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2013/02/09 11:19:17 adam Exp $ +# $NetBSD: Makefile,v 1.5 2013/12/10 22:32:57 adam Exp $ PKGNAME= ${DISTNAME:C/-/92-datatypes-/} COMMENT= PostgreSQL data types support modules @@ -7,9 +7,16 @@ DEPENDS+= postgresql92-server>=${PKGVERSION_NOREV}:../../databases/postgresql92- .include "../../databases/postgresql92/Makefile.common" +PLIST_VARS+= uuid + +.if ${OPSYS} != "Darwin" +PLIST.uuid= yes CONFIGURE_ARGS+= --with-ossp-uuid # because global pg_config.h is included, we have to define this CPPFLAGS+= -DHAVE_UUID_H +BUILD_DIRS+= contrib/uuid-ossp +. include "../../devel/ossp-uuid/buildlink3.mk" +.endif BUILD_DIRS+= contrib/citext BUILD_DIRS+= contrib/hstore @@ -17,10 +24,8 @@ BUILD_DIRS+= contrib/intarray BUILD_DIRS+= contrib/isn BUILD_DIRS+= contrib/ltree BUILD_DIRS+= contrib/lo -BUILD_DIRS+= contrib/uuid-ossp BUILD_DIRS+= contrib/unaccent BUILD_MAKE_FLAGS= PGXS=1 .include "../../databases/postgresql92-client/buildlink3.mk" -.include "../../devel/ossp-uuid/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql92-datatypes/PLIST b/databases/postgresql92-datatypes/PLIST index 98515c8cfda..5e46c7f651e 100644 --- a/databases/postgresql92-datatypes/PLIST +++ b/databases/postgresql92-datatypes/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2012/10/05 21:03:10 adam Exp $ +@comment $NetBSD: PLIST,v 1.2 2013/12/10 22:32:57 adam Exp $ lib/postgresql/_int.so lib/postgresql/citext.so lib/postgresql/hstore.so @@ -6,7 +6,7 @@ lib/postgresql/isn.so lib/postgresql/lo.so lib/postgresql/ltree.so lib/postgresql/unaccent.so -lib/postgresql/uuid-ossp.so +${PLIST.uuid}lib/postgresql/uuid-ossp.so share/postgresql/extension/citext--1.0.sql share/postgresql/extension/citext--unpackaged--1.0.sql share/postgresql/extension/citext.control @@ -29,7 +29,7 @@ share/postgresql/extension/ltree.control share/postgresql/extension/unaccent--1.0.sql share/postgresql/extension/unaccent--unpackaged--1.0.sql share/postgresql/extension/unaccent.control -share/postgresql/extension/uuid-ossp--1.0.sql -share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql -share/postgresql/extension/uuid-ossp.control +${PLIST.uuid}share/postgresql/extension/uuid-ossp--1.0.sql +${PLIST.uuid}share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql +${PLIST.uuid}share/postgresql/extension/uuid-ossp.control share/postgresql/tsearch_data/unaccent.rules diff --git a/databases/postgresql92-docs/PLIST b/databases/postgresql92-docs/PLIST index e2a9506234f..66012b24d97 100644 --- a/databases/postgresql92-docs/PLIST +++ b/databases/postgresql92-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.5 2013/10/12 07:04:22 adam Exp $ +@comment $NetBSD: PLIST,v 1.6 2013/12/10 22:32:57 adam Exp $ man/man1/clusterdb.1 man/man1/createdb.1 man/man1/createlang.1 @@ -1002,6 +1002,7 @@ share/doc/postgresql/html/release-8-4-15.html share/doc/postgresql/html/release-8-4-16.html share/doc/postgresql/html/release-8-4-17.html share/doc/postgresql/html/release-8-4-18.html +share/doc/postgresql/html/release-8-4-19.html share/doc/postgresql/html/release-8-4-2.html share/doc/postgresql/html/release-8-4-3.html share/doc/postgresql/html/release-8-4-4.html @@ -1017,6 +1018,7 @@ share/doc/postgresql/html/release-9-0-11.html share/doc/postgresql/html/release-9-0-12.html share/doc/postgresql/html/release-9-0-13.html share/doc/postgresql/html/release-9-0-14.html +share/doc/postgresql/html/release-9-0-15.html share/doc/postgresql/html/release-9-0-2.html share/doc/postgresql/html/release-9-0-3.html share/doc/postgresql/html/release-9-0-4.html @@ -1028,6 +1030,7 @@ share/doc/postgresql/html/release-9-0-9.html share/doc/postgresql/html/release-9-0.html share/doc/postgresql/html/release-9-1-1.html share/doc/postgresql/html/release-9-1-10.html +share/doc/postgresql/html/release-9-1-11.html share/doc/postgresql/html/release-9-1-2.html share/doc/postgresql/html/release-9-1-3.html share/doc/postgresql/html/release-9-1-4.html @@ -1042,6 +1045,7 @@ share/doc/postgresql/html/release-9-2-2.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 +share/doc/postgresql/html/release-9-2-6.html share/doc/postgresql/html/release-9-2.html share/doc/postgresql/html/release.html share/doc/postgresql/html/resources.html diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile index d4d42be1155..9156fcfb113 100644 --- a/databases/postgresql92-server/Makefile +++ b/databases/postgresql92-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2013/10/12 07:04:22 adam Exp $ +# $NetBSD: Makefile,v 1.7 2013/12/10 22:32:57 adam Exp $ PKGNAME= ${DISTNAME:C/-/92-server-/} COMMENT= PostgreSQL database server programs @@ -46,11 +46,11 @@ DL_LIBS+= -lltdl # the databases PGUSER?= pgsql PGGROUP?= pgsql -PGHOME?= ${PREFIX}/${PGUSER} +PGHOME?= ${VARBASE}/${PGUSER} FILES_SUBST+= PGUSER=${PGUSER} FILES_SUBST+= PGGROUP=${PGGROUP} FILES_SUBST+= PGHOME=${PGHOME} -BUILD_DEFS+= PGHOME +BUILD_DEFS+= PGHOME VARBASE ALL_ENV+= INSTALLED_LIBPQ=yes diff --git a/databases/postgresql92/Makefile.common b/databases/postgresql92/Makefile.common index ec21195af59..98ef7dd2f6b 100644 --- a/databases/postgresql92/Makefile.common +++ b/databases/postgresql92/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2013/12/02 23:08:55 bsiegert Exp $ +# $NetBSD: Makefile.common,v 1.8 2013/12/10 22:32:57 adam Exp $ # # used by databases/postgresql92-adminpack/Makefile # used by databases/postgresql92-client/Makefile @@ -21,7 +21,7 @@ # <lang>-postgresql client-side interface to PostgreSQL # postgresql-<lang> server-side module for PostgreSQL backend -DISTNAME= postgresql-9.2.5 +DISTNAME= postgresql-9.2.6 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/} EXTRACT_SUFX= .tar.bz2 diff --git a/databases/postgresql92/distinfo b/databases/postgresql92/distinfo index a707dd15142..dad290ba02d 100644 --- a/databases/postgresql92/distinfo +++ b/databases/postgresql92/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.5 2013/10/12 07:04:22 adam Exp $ +$NetBSD: distinfo,v 1.6 2013/12/10 22:32:57 adam Exp $ -SHA1 (postgresql-9.2.5.tar.bz2) = 176ac1de372c06192ec1012b17001414cfa40929 -RMD160 (postgresql-9.2.5.tar.bz2) = f156ac1770deab4d5f7bc7ed1dba1e97181a6968 -Size (postgresql-9.2.5.tar.bz2) = 16485711 bytes +SHA1 (postgresql-9.2.6.tar.bz2) = e9f124004fe6586b6d50bd14da0282d2ae613875 +RMD160 (postgresql-9.2.6.tar.bz2) = 7a74773af202730f4848ef82de333c5c18deb501 +Size (postgresql-9.2.6.tar.bz2) = 16491820 bytes SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813 SHA1 (patch-config_perl.m4) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0 SHA1 (patch-configure) = 21b27add570cff1a24c440201eb1ed49f8223747 @@ -13,6 +13,7 @@ SHA1 (patch-src_backend_Makefile) = 76ddd3015d93b19cdd6000eaffc4f53cbd4965b5 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0 SHA1 (patch-src_pl_plperl_GNUmakefile) = 2b7448d6dd8550e2ea61f40728a2780068b93d07 SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61 +SHA1 (patch-src_pl_plpython_Makefile) = d70e0cf5e20479851df3ededa50776fd04846d49 SHA1 (patch-src_timezone_localtime.c) = 622f57bc1d10f07ab73f86765cbf587eece57085 SHA1 (patch-src_timezone_private.h) = 85dac95e40efc16270885087f868aeb76e1b9214 SHA1 (patch-src_timezone_strftime.c) = 25102dce1b9b22385353af23500636fb18e3bf64 diff --git a/databases/postgresql92/patches/patch-src_pl_plpython_Makefile b/databases/postgresql92/patches/patch-src_pl_plpython_Makefile new file mode 100644 index 00000000000..64eb727d8f3 --- /dev/null +++ b/databases/postgresql92/patches/patch-src_pl_plpython_Makefile @@ -0,0 +1,15 @@ +$NetBSD: patch-src_pl_plpython_Makefile,v 1.1 2013/12/10 22:32:57 adam Exp $ + +Don't try to use Python framework. + +--- src/pl/plpython/Makefile.orig 2013-12-10 21:48:07.000000000 +0000 ++++ src/pl/plpython/Makefile +@@ -24,8 +24,6 @@ endif + # Darwin (OS X) has its own ideas about how to do this. + ifeq ($(PORTNAME), darwin) + shared_libpython = yes +-override python_libspec = -framework Python +-override python_additional_libs = + endif + + # If we don't have a shared library and the platform doesn't allow it diff --git a/databases/postgresql93-datatypes/DESCR b/databases/postgresql93-datatypes/DESCR index 0fd1fb2d6cd..81d686b929f 100644 --- a/databases/postgresql93-datatypes/DESCR +++ b/databases/postgresql93-datatypes/DESCR @@ -1,12 +1,5 @@ -This package provides the following PostgreSQL modules: - - citext - - hstore - - intarray - - isn - - ltree - - lo - - uuid-ossp - - unaccent +This package provides the following PostgreSQL modules: citext, hstore, +intarray, isn, ltree, lo, uuid-ossp, unaccent. The "citext" module provides a case-insensitive character string type, citext. Essentially, it internally calls lower when comparing values. diff --git a/databases/postgresql93-datatypes/Makefile b/databases/postgresql93-datatypes/Makefile index 23e8e0eda97..8621a3f8d42 100644 --- a/databases/postgresql93-datatypes/Makefile +++ b/databases/postgresql93-datatypes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/09/10 15:32:32 adam Exp $ +# $NetBSD: Makefile,v 1.2 2013/12/10 22:32:57 adam Exp $ PKGNAME= ${DISTNAME:C/-/93-datatypes-/} COMMENT= PostgreSQL data types support modules @@ -7,9 +7,16 @@ DEPENDS+= postgresql93-server>=${PKGVERSION_NOREV}:../../databases/postgresql93- .include "../../databases/postgresql93/Makefile.common" +PLIST_VARS+= uuid + +.if ${OPSYS} != "Darwin" +PLIST.uuid= yes CONFIGURE_ARGS+= --with-ossp-uuid # because global pg_config.h is included, we have to define this CPPFLAGS+= -DHAVE_UUID_H +BUILD_DIRS+= contrib/uuid-ossp +. include "../../devel/ossp-uuid/buildlink3.mk" +.endif BUILD_DIRS+= contrib/citext BUILD_DIRS+= contrib/hstore @@ -17,10 +24,8 @@ BUILD_DIRS+= contrib/intarray BUILD_DIRS+= contrib/isn BUILD_DIRS+= contrib/ltree BUILD_DIRS+= contrib/lo -BUILD_DIRS+= contrib/uuid-ossp BUILD_DIRS+= contrib/unaccent BUILD_MAKE_FLAGS= PGXS=1 .include "../../databases/postgresql93-client/buildlink3.mk" -.include "../../devel/ossp-uuid/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql93-datatypes/PLIST b/databases/postgresql93-datatypes/PLIST index 26e94dfc469..2e9ec98bead 100644 --- a/databases/postgresql93-datatypes/PLIST +++ b/databases/postgresql93-datatypes/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2013/10/19 08:09:18 adam Exp $ +@comment $NetBSD: PLIST,v 1.3 2013/12/10 22:32:57 adam Exp $ lib/postgresql/_int.so lib/postgresql/citext.so lib/postgresql/hstore.so @@ -6,7 +6,7 @@ lib/postgresql/isn.so lib/postgresql/lo.so lib/postgresql/ltree.so lib/postgresql/unaccent.so -lib/postgresql/uuid-ossp.so +${PLIST.uuid}lib/postgresql/uuid-ossp.so share/postgresql/extension/citext--1.0.sql share/postgresql/extension/citext--unpackaged--1.0.sql share/postgresql/extension/citext.control @@ -30,7 +30,7 @@ share/postgresql/extension/ltree.control share/postgresql/extension/unaccent--1.0.sql share/postgresql/extension/unaccent--unpackaged--1.0.sql share/postgresql/extension/unaccent.control -share/postgresql/extension/uuid-ossp--1.0.sql -share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql -share/postgresql/extension/uuid-ossp.control +${PLIST.uuid}share/postgresql/extension/uuid-ossp--1.0.sql +${PLIST.uuid}share/postgresql/extension/uuid-ossp--unpackaged--1.0.sql +${PLIST.uuid}share/postgresql/extension/uuid-ossp.control share/postgresql/tsearch_data/unaccent.rules diff --git a/databases/postgresql93-docs/PLIST b/databases/postgresql93-docs/PLIST index 3ed30ab1910..d7e5538e239 100644 --- a/databases/postgresql93-docs/PLIST +++ b/databases/postgresql93-docs/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2013/10/12 07:03:32 adam Exp $ +@comment $NetBSD: PLIST,v 1.3 2013/12/10 22:32:57 adam Exp $ man/man1/clusterdb.1 man/man1/createdb.1 man/man1/createlang.1 @@ -1023,6 +1023,7 @@ share/doc/postgresql/html/release-8-4-15.html share/doc/postgresql/html/release-8-4-16.html share/doc/postgresql/html/release-8-4-17.html share/doc/postgresql/html/release-8-4-18.html +share/doc/postgresql/html/release-8-4-19.html share/doc/postgresql/html/release-8-4-2.html share/doc/postgresql/html/release-8-4-3.html share/doc/postgresql/html/release-8-4-4.html @@ -1038,6 +1039,7 @@ share/doc/postgresql/html/release-9-0-11.html share/doc/postgresql/html/release-9-0-12.html share/doc/postgresql/html/release-9-0-13.html share/doc/postgresql/html/release-9-0-14.html +share/doc/postgresql/html/release-9-0-15.html share/doc/postgresql/html/release-9-0-2.html share/doc/postgresql/html/release-9-0-3.html share/doc/postgresql/html/release-9-0-4.html @@ -1049,6 +1051,7 @@ share/doc/postgresql/html/release-9-0-9.html share/doc/postgresql/html/release-9-0.html share/doc/postgresql/html/release-9-1-1.html share/doc/postgresql/html/release-9-1-10.html +share/doc/postgresql/html/release-9-1-11.html share/doc/postgresql/html/release-9-1-2.html share/doc/postgresql/html/release-9-1-3.html share/doc/postgresql/html/release-9-1-4.html @@ -1063,8 +1066,10 @@ share/doc/postgresql/html/release-9-2-2.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 +share/doc/postgresql/html/release-9-2-6.html share/doc/postgresql/html/release-9-2.html share/doc/postgresql/html/release-9-3-1.html +share/doc/postgresql/html/release-9-3-2.html share/doc/postgresql/html/release-9-3.html share/doc/postgresql/html/release.html share/doc/postgresql/html/resources.html diff --git a/databases/postgresql93-server/Makefile b/databases/postgresql93-server/Makefile index 8b863afc3e7..03e1fd9e042 100644 --- a/databases/postgresql93-server/Makefile +++ b/databases/postgresql93-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1 2013/09/10 15:32:33 adam Exp $ +# $NetBSD: Makefile,v 1.2 2013/12/10 22:32:57 adam Exp $ PKGNAME= ${DISTNAME:C/-/93-server-/} COMMENT= PostgreSQL database server programs @@ -46,11 +46,11 @@ DL_LIBS+= -lltdl # the databases PGUSER?= pgsql PGGROUP?= pgsql -PGHOME?= ${PREFIX}/${PGUSER} +PGHOME?= ${VARBASE}/${PGUSER} FILES_SUBST+= PGUSER=${PGUSER} FILES_SUBST+= PGGROUP=${PGGROUP} FILES_SUBST+= PGHOME=${PGHOME} -BUILD_DEFS+= PGHOME +BUILD_DEFS+= PGHOME VARBASE ALL_ENV+= INSTALLED_LIBPQ=yes diff --git a/databases/postgresql93/Makefile.common b/databases/postgresql93/Makefile.common index 33cdc3f76b1..2b030ffcf82 100644 --- a/databases/postgresql93/Makefile.common +++ b/databases/postgresql93/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2013/12/02 22:36:44 bsiegert Exp $ +# $NetBSD: Makefile.common,v 1.4 2013/12/10 22:32:57 adam Exp $ # # used by databases/postgresql93-adminpack/Makefile # used by databases/postgresql93-client/Makefile @@ -21,7 +21,7 @@ # <lang>-postgresql client-side interface to PostgreSQL # postgresql-<lang> server-side module for PostgreSQL backend -DISTNAME= postgresql-9.3.1 +DISTNAME= postgresql-9.3.2 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/} EXTRACT_SUFX= .tar.bz2 diff --git a/databases/postgresql93/distinfo b/databases/postgresql93/distinfo index 1d2742fb8d3..f80857c6de4 100644 --- a/databases/postgresql93/distinfo +++ b/databases/postgresql93/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.4 2013/10/12 07:03:32 adam Exp $ +$NetBSD: distinfo,v 1.5 2013/12/10 22:32:57 adam Exp $ -SHA1 (postgresql-9.3.1.tar.bz2) = 4be605ef67b92fe742bd6ebef910aa7dacc0ee5a -RMD160 (postgresql-9.3.1.tar.bz2) = 815631c32907f9c5c82d6ee3c59801adbd23fa19 -Size (postgresql-9.3.1.tar.bz2) = 16877807 bytes +SHA1 (postgresql-9.3.2.tar.bz2) = e1438f6cc8d387703dd1cca201316603266bd83a +RMD160 (postgresql-9.3.2.tar.bz2) = 60373d8da2f138e713943ddb103b0ebf12379739 +Size (postgresql-9.3.2.tar.bz2) = 16878364 bytes SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5 SHA1 (patch-configure) = 3de7635fe18532a05a619941fecad7bcda6c51b9 |