ports/161328: [PATCH] databases/postgresql-server: update to 8.2.22

[Martin Matuska]

>Number:         161328
>Category:       ports
>Synopsis:       [PATCH] databases/postgresql-server: update to 8.2.22
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Oct 06 11:40:02 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 9.0-BETA3 amd64
>Organization:
>Environment:
System: FreeBSD neo.vx.sk 9.0-BETA3 FreeBSD 9.0-BETA3 #0 r225756M: Wed Sep 28 12:38:53 CEST
>Description:
- Update to 8.2.22
- Make SSL available as an option

Removed file(s):
- files/patch-src-plperl-plperl

Port maintainer (girgen at FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:

--- postgresql-server-8.2.22.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/postgresql82-server/Makefile,v
retrieving revision 1.200
diff -u -r1.200 Makefile
--- Makefile	23 Sep 2011 22:21:38 -0000	1.200
+++ Makefile	6 Oct 2011 11:31:47 -0000
@@ -6,7 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-PORTVERSION?=	8.2.21
+PORTVERSION?=	8.2.22
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${PORTVERSION}
@@ -66,18 +66,6 @@
 OPTIONS=	NLS "Use internationalized messages" on
 .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
-
-.include <bsd.port.pre.mk>
-
 .if !defined(SLAVE_ONLY)
 OPTIONS+=	PAM "Build with PAM support (server only)" off
 OPTIONS+=	LDAP "Build with LDAP authentication support" off
@@ -94,7 +82,17 @@
 # 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)" off
+OPTIONS+=	SSL "Build with OpenSSL support" on
+.endif # !SLAVE_ONLY
+
+.include <bsd.port.options.mk>
 
+.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)
 # USE_AUTOTOOLS=	autoconf
 # CONFIGURE_ARGS+=--with-icu
@@ -102,7 +100,11 @@
 # PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 # PATCHFILES+=	pg-814-icu-xx-2006-09-25.diff.gz:icu
 # .  endif
+# .endif # !SLAVE_ONLY
+
+.include <bsd.port.pre.mk>
 
+.if !defined(SLAVE_ONLY)
 PATCH_DIST_STRIP=-p1
 
 .  if defined(WITH_PAM)
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/databases/postgresql82-server/distinfo,v
retrieving revision 1.69
diff -u -r1.69 distinfo
--- distinfo	18 Apr 2011 23:34:26 -0000	1.69
+++ distinfo	6 Oct 2011 11:31:47 -0000
@@ -1,2 +1,2 @@
-SHA256 (postgresql/postgresql-8.2.21.tar.bz2) = b3fd5345b751557a1153f98e104fb58d1519c10dac81dc013ff1eb46c7826faa
-SIZE (postgresql/postgresql-8.2.21.tar.bz2) = 12768593
+SHA256 (postgresql/postgresql-8.2.22.tar.bz2) = 88203528326c152ca556bcff986d824737ea1048ba2c6245e24a1b1efd6aeaf7
+SIZE (postgresql/postgresql-8.2.22.tar.bz2) = 12777172
Index: pkg-plist-server
===================================================================
RCS file: /home/pcvs/ports/databases/postgresql82-server/pkg-plist-server,v
retrieving revision 1.20
diff -u -r1.20 pkg-plist-server
--- pkg-plist-server	18 Apr 2011 23:34:26 -0000	1.20
+++ pkg-plist-server	6 Oct 2011 11:31:48 -0000
@@ -155,6 +155,7 @@
 share/postgresql/timezone/Africa/Gaborone
 share/postgresql/timezone/Africa/Harare
 share/postgresql/timezone/Africa/Johannesburg
+share/postgresql/timezone/Africa/Juba
 share/postgresql/timezone/Africa/Kampala
 share/postgresql/timezone/Africa/Khartoum
 share/postgresql/timezone/Africa/Kigali
@@ -269,10 +270,12 @@
 share/postgresql/timezone/America/Kentucky/Louisville
 share/postgresql/timezone/America/Kentucky/Monticello
 share/postgresql/timezone/America/Knox_IN
+share/postgresql/timezone/America/Kralendijk
 share/postgresql/timezone/America/La_Paz
 share/postgresql/timezone/America/Lima
 share/postgresql/timezone/America/Los_Angeles
 share/postgresql/timezone/America/Louisville
+share/postgresql/timezone/America/Lower_Princes
 share/postgresql/timezone/America/Maceio
 share/postgresql/timezone/America/Managua
 share/postgresql/timezone/America/Manaus
Index: files/patch-src-plperl-plperl
===================================================================
RCS file: files/patch-src-plperl-plperl
diff -N files/patch-src-plperl-plperl
--- files/patch-src-plperl-plperl	14 Aug 2011 01:32:13 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -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
-@@ -687,7 +687,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);
--- postgresql-server-8.2.22.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: