From aa5519feeabc2fbc1651fc0166d8b8c458b71bcd Mon Sep 17 00:00:00 2001 From: Eygene Ryabinkin Date: Tue, 18 Oct 2011 12:02:56 +0400 Subject: [PATCH] PostgreSQL: upgrade to 8.4.9 Obtained from: Martin Matuska PR: ports/161330 Signed-off-by: Eygene Ryabinkin --- databases/postgresql84-server/Makefile | 35 +++++++++---------- databases/postgresql84-server/distinfo | 4 +- .../files/patch-src-plperl-plperl | 28 ---------------- databases/postgresql84-server/pkg-plist-client | 6 +++ databases/postgresql84-server/pkg-plist-server | 9 +++++ 5 files changed, 34 insertions(+), 48 deletions(-) delete mode 100644 databases/postgresql84-server/files/patch-src-plperl-plperl diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 66aaaf9..7d8d84e 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -DISTVERSION?= 8.4.8 -PORTREVISION?= 1 +DISTVERSION?= 8.4.9 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -73,16 +72,6 @@ MAKE_ENV= PATH=${PREFIX}/bin:${PATH} CONFIGURE_ENV+= PATH=${PREFIX}/bin:${PATH} .endif -# Cannot check this with standard OPTION due to a catch-22. -# USE_OPENSSL must precede bsd.port.pre.mk, but then we don't know -# what OPTIONS are set. -# -# If you *don't* want SSL, set WITHOUT_SSL=YES when making -.if !defined(WITHOUT_SSL) -USE_OPENSSL= yes -CONFIGURE_ARGS+=--with-openssl -.endif - .if !defined(SLAVE_ONLY) OPTIONS+= PAM "Build with PAM support (server only)" off OPTIONS+= LDAP "Build with LDAP authentication support" off @@ -100,9 +89,15 @@ OPTIONS+= ICU "Use ICU for unicode collation (server)" off # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info # (requires dump/restore if modified.) OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" on +OPTIONS+= SSL "Build with OpenSSL support" on .endif # !SLAVE_ONLY -.include +.include + +.if !defined(WITHOUT_SSL) +USE_OPENSSL= yes +CONFIGURE_ARGS+=--with-openssl +.endif .if !defined(SLAVE_ONLY) . if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum) @@ -113,7 +108,11 @@ PATCHFILES+= pg-840-icu-2009-09-15.diff.gz:icu LIB_DEPENDS+= icudata.48:${PORTSDIR}/devel/icu EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4 . endif +.endif # !SLAVE_ONLY + +.include +.if !defined(SLAVE_ONLY) PATCH_DIST_STRIP=-p1 . if defined(WITH_PAM) @@ -288,11 +287,11 @@ PKGMESSAGE= ${WRKSRC}/pkg-message${PKGNAMESUFFIX} . endif . if exists(${FILESDIR}/pkg-install${PKGNAMESUFFIX}.in) -SUB_FILES+= pkg-install${PKGNAMESUFFIX} -SUB_LIST= PG_GROUP=$(PG_GROUP) \ - PG_USER=$(PG_USER) \ - PG_UID=$(PG_UID) -PLIST_SUB+= PG_USER=$(PG_USER) +SUB_FILES+= pkg-install${PKGNAMESUFFIX} +SUB_LIST= PG_GROUP=${PG_GROUP} \ + PG_USER=${PG_USER} \ + PG_UID=${PG_UID} +PLIST_SUB+= PG_USER=${PG_USER} PKGINSTALL= ${WRKDIR}/pkg-install${PKGNAMESUFFIX} . endif diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo index 3e969fb..e527bfd 100644 --- a/databases/postgresql84-server/distinfo +++ b/databases/postgresql84-server/distinfo @@ -1,4 +1,4 @@ -SHA256 (postgresql/postgresql-8.4.8.tar.bz2) = 3e90ef2a86a9f4831e21ff4a574fbfb8e1b8c097af637c93ec43c64c684a0938 -SIZE (postgresql/postgresql-8.4.8.tar.bz2) = 14136376 +SHA256 (postgresql/postgresql-8.4.9.tar.bz2) = 1d58cb8d0cb8ae8f61042b2d5aa54135a2d2a0f324d06593870e1242b0e8c38a +SIZE (postgresql/postgresql-8.4.9.tar.bz2) = 14275979 SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321 diff --git a/databases/postgresql84-server/files/patch-src-plperl-plperl b/databases/postgresql84-server/files/patch-src-plperl-plperl deleted file mode 100644 index ea95950..0000000 --- a/databases/postgresql84-server/files/patch-src-plperl-plperl +++ /dev/null @@ -1,28 +0,0 @@ -Obtained from: http://archives.postgresql.org/pgsql-hackers/2011-04/msg01283.php -Reference: http://search.cpan.org/~jesse/perl-5.14.0/pod/perldelta.pod#GvCV()_and_GvGP()_are_no_longer_lvalues - ---- src/pl/plperl/plperl.c.orig 2011-04-15 11:15:53.000000000 +0800 -+++ src/pl/plperl/plperl.c 2011-05-19 20:39:34.126713700 +0800 -@@ -700,7 +700,7 @@ - if (!isGV_with_GP(sv) || !GvCV(sv)) - continue; - SvREFCNT_dec(GvCV(sv)); /* free the CV */ -- GvCV(sv) = NULL; /* prevent call via GV */ -+ GvCV_set(sv, NULL); /* prevent call via GV */ - } - hv_clear(stash); - ---- src/pl/plperl/plperl.h.orig 2011-04-15 11:15:53.000000000 +0800 -+++ src/pl/plperl/plperl.h 2011-05-19 20:39:34.127713548 +0800 -@@ -43,6 +43,11 @@ - #undef bool - #endif - -+/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */ -+#ifndef GvCV_set -+#define GvCV_set(gv, cv) (GvCV(gv) = cv) -+#endif -+ - /* routines from spi_internal.c */ - int spi_DEBUG(void); - int spi_LOG(void); diff --git a/databases/postgresql84-server/pkg-plist-client b/databases/postgresql84-server/pkg-plist-client index 715b496..92d1fdc 100644 --- a/databases/postgresql84-server/pkg-plist-client +++ b/databases/postgresql84-server/pkg-plist-client @@ -598,6 +598,12 @@ share/postgresql/psqlrc.sample %%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-8.4.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/psql-8.4.mo %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpg-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/ecpglib6-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/libpq5-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_config-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_dump-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pgscripts-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/libpq5-8.4.mo diff --git a/databases/postgresql84-server/pkg-plist-server b/databases/postgresql84-server/pkg-plist-server index 9134bcc..af7ae9b 100644 --- a/databases/postgresql84-server/pkg-plist-server +++ b/databases/postgresql84-server/pkg-plist-server @@ -81,6 +81,12 @@ share/postgresql/system_views.sql %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog-8.4.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/plpgsql-8.4.mo %%GETTEXT%%share/locale/ko/LC_MESSAGES/postgres-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/initdb-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_controldata-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_ctl-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/pg_resetxlog-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/plpgsql-8.4.mo +%%GETTEXT%%share/locale/pl/LC_MESSAGES/postgres-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-8.4.mo %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-8.4.mo @@ -149,6 +155,7 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/Africa/Khartoum %%TZDATA%%share/postgresql/timezone/Africa/Kigali %%TZDATA%%share/postgresql/timezone/Africa/Kinshasa +%%TZDATA%%share/postgresql/timezone/Africa/Juba %%TZDATA%%share/postgresql/timezone/Africa/Lagos %%TZDATA%%share/postgresql/timezone/Africa/Libreville %%TZDATA%%share/postgresql/timezone/Africa/Lome @@ -259,10 +266,12 @@ share/postgresql/snowball_create.sql %%TZDATA%%share/postgresql/timezone/America/Kentucky/Louisville %%TZDATA%%share/postgresql/timezone/America/Kentucky/Monticello %%TZDATA%%share/postgresql/timezone/America/Knox_IN +%%TZDATA%%share/postgresql/timezone/America/Kralendijk %%TZDATA%%share/postgresql/timezone/America/La_Paz %%TZDATA%%share/postgresql/timezone/America/Lima %%TZDATA%%share/postgresql/timezone/America/Los_Angeles %%TZDATA%%share/postgresql/timezone/America/Louisville +%%TZDATA%%share/postgresql/timezone/America/Lower_Princes %%TZDATA%%share/postgresql/timezone/America/Maceio %%TZDATA%%share/postgresql/timezone/America/Managua %%TZDATA%%share/postgresql/timezone/America/Manaus -- 1.7.6.1