Attachment #118901 for bug #161328

View | Details | Raw Unified | Return to bug 161328
Collapse All | Expand All




#

PORTNAME?=	postgresql
PORTVERSION?=	8.2.22
CATEGORIES?=	databases
MASTER_SITES=	${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR=	source/v${PORTVERSION}

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

# 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

# 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)

Lines 1-2 Link Here

(-)distinfo (-2 / +2 lines)
1	SHA256 (postgresql/postgresql-8.2.21.tar.bz2) = b3fd5345b751557a1153f98e104fb58d1519c10dac81dc013ff1eb46c7826faa	1	SHA256 (postgresql/postgresql-8.2.22.tar.bz2) = 88203528326c152ca556bcff986d824737ea1048ba2c6245e24a1b1efd6aeaf7
2	SIZE (postgresql/postgresql-8.2.21.tar.bz2) = 12768593	2	SIZE (postgresql/postgresql-8.2.22.tar.bz2) = 12777172




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

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




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);

Return to bug 161328

Lines 6-12 Link Here

(-)Makefile (-13 / +15 lines)
6	#	6	#
7		7
8	PORTNAME?= postgresql	8	PORTNAME?= postgresql
9	PORTVERSION?= 8.2.21	9	PORTVERSION?= 8.2.22
10	CATEGORIES?= databases	10	CATEGORIES?= databases
11	MASTER_SITES= ${MASTER_SITE_PGSQL}	11	MASTER_SITES= ${MASTER_SITE_PGSQL}
12	MASTER_SITE_SUBDIR= source/v${PORTVERSION}	12	MASTER_SITE_SUBDIR= source/v${PORTVERSION}
Lines 66-83 Link Here
66	OPTIONS= NLS "Use internationalized messages" on	66	OPTIONS= NLS "Use internationalized messages" on
67	.endif	67	.endif
68		68
69	# Cannot check this with standard OPTION due to a catch-22.
70	# USE_OPENSSL must precede bsd.port.pre.mk, but then we don't know
71	# what OPTIONS are set.
72	#
73	# If you don't want SSL, set WITHOUT_SSL=YES when making
74	.if !defined(WITHOUT_SSL)
75	USE_OPENSSL= yes
76	CONFIGURE_ARGS+=--with-openssl
77	.endif
78
79	.include <bsd.port.pre.mk>
80
81	.if !defined(SLAVE_ONLY)	69	.if !defined(SLAVE_ONLY)
82	OPTIONS+= PAM "Build with PAM support (server only)" off	70	OPTIONS+= PAM "Build with PAM support (server only)" off
83	OPTIONS+= LDAP "Build with LDAP authentication support" off	71	OPTIONS+= LDAP "Build with LDAP authentication support" off
Lines 94-100 Link Here
94	# See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info	82	# See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info
95	# (requires dump/restore if modified.)	83	# (requires dump/restore if modified.)
96	OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off	84	OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" off
		85	OPTIONS+= SSL "Build with OpenSSL support" on
		86	.endif # !SLAVE_ONLY
		87
		88	.include <bsd.port.options.mk>
97		89
		90	.if !defined(WITHOUT_SSL)
		91	USE_OPENSSL= yes
		92	CONFIGURE_ARGS+=--with-openssl
		93	.endif
		94
		95	# .if !defined(SLAVE_ONLY)
98	# . if (defined(SERVER_ONLY) && defined(WITH_ICU)) \|\| make(makesum)	96	# . if (defined(SERVER_ONLY) && defined(WITH_ICU)) \|\| make(makesum)
99	# USE_AUTOTOOLS= autoconf	97	# USE_AUTOTOOLS= autoconf
100	# CONFIGURE_ARGS+=--with-icu	98	# CONFIGURE_ARGS+=--with-icu
Lines 102-108 Link Here
102	# PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu	100	# PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
103	# PATCHFILES+= pg-814-icu-xx-2006-09-25.diff.gz:icu	101	# PATCHFILES+= pg-814-icu-xx-2006-09-25.diff.gz:icu
104	# . endif	102	# . endif
		103	# .endif # !SLAVE_ONLY
		104
		105	.include <bsd.port.pre.mk>
105		106
		107	.if !defined(SLAVE_ONLY)
106	PATCH_DIST_STRIP=-p1	108	PATCH_DIST_STRIP=-p1
107		109
108	. if defined(WITH_PAM)	110	. if defined(WITH_PAM)

Lines 155-160 Link Here

(-)pkg-plist-server (+3 lines)
155	share/postgresql/timezone/Africa/Gaborone	155	share/postgresql/timezone/Africa/Gaborone
156	share/postgresql/timezone/Africa/Harare	156	share/postgresql/timezone/Africa/Harare
157	share/postgresql/timezone/Africa/Johannesburg	157	share/postgresql/timezone/Africa/Johannesburg
		158	share/postgresql/timezone/Africa/Juba
158	share/postgresql/timezone/Africa/Kampala	159	share/postgresql/timezone/Africa/Kampala
159	share/postgresql/timezone/Africa/Khartoum	160	share/postgresql/timezone/Africa/Khartoum
160	share/postgresql/timezone/Africa/Kigali	161	share/postgresql/timezone/Africa/Kigali
Lines 269-278 Link Here
269	share/postgresql/timezone/America/Kentucky/Louisville	270	share/postgresql/timezone/America/Kentucky/Louisville
270	share/postgresql/timezone/America/Kentucky/Monticello	271	share/postgresql/timezone/America/Kentucky/Monticello
271	share/postgresql/timezone/America/Knox_IN	272	share/postgresql/timezone/America/Knox_IN
		273	share/postgresql/timezone/America/Kralendijk
272	share/postgresql/timezone/America/La_Paz	274	share/postgresql/timezone/America/La_Paz
273	share/postgresql/timezone/America/Lima	275	share/postgresql/timezone/America/Lima
274	share/postgresql/timezone/America/Los_Angeles	276	share/postgresql/timezone/America/Los_Angeles
275	share/postgresql/timezone/America/Louisville	277	share/postgresql/timezone/America/Louisville
		278	share/postgresql/timezone/America/Lower_Princes
276	share/postgresql/timezone/America/Maceio	279	share/postgresql/timezone/America/Maceio
277	share/postgresql/timezone/America/Managua	280	share/postgresql/timezone/America/Managua
278	share/postgresql/timezone/America/Manaus	281	share/postgresql/timezone/America/Manaus

Removed Link Here

(-)files/patch-src-plperl-plperl (-28 lines)
1	Obtained from: http://archives.postgresql.org/pgsql-hackers/2011-04/msg01283.php
2	Reference: http://search.cpan.org/~jesse/perl-5.14.0/pod/perldelta.pod#GvCV()_and_GvGP()_are_no_longer_lvalues
3
4	--- src/pl/plperl/plperl.c.orig 2011-04-15 11:15:53.000000000 +0800
5	+++ src/pl/plperl/plperl.c 2011-05-19 20:39:34.126713700 +0800
6	@@ -687,7 +687,7 @@
7	if (!isGV_with_GP(sv) \|\| !GvCV(sv))
8	continue;
9	SvREFCNT_dec(GvCV(sv)); /* free the CV */
10	- GvCV(sv) = NULL; /* prevent call via GV */
11	+ GvCV_set(sv, NULL); /* prevent call via GV */
12	}
13	hv_clear(stash);
14
15	--- src/pl/plperl/plperl.h.orig 2011-04-15 11:15:53.000000000 +0800
16	+++ src/pl/plperl/plperl.h 2011-05-19 20:39:34.127713548 +0800
17	@@ -43,6 +43,11 @@
18	#undef bool
19	#endif
20
21	+/* supply GvCV_set if it's missing - ppport.h doesn't supply it, unfortunately */
22	+#ifndef GvCV_set
23	+#define GvCV_set(gv, cv) (GvCV(gv) = cv)
24	+#endif
25	+
26	/* routines from spi_internal.c */
27	int spi_DEBUG(void);
28	int spi_LOG(void);