ports/151257: [PATCH] databases/postgresql-server: update to 8.4.5

Martin Matuska mm at FreeBSD.org
Wed Oct 6 11:40:02 UTC 2010


>Number:         151257
>Category:       ports
>Synopsis:       [PATCH] databases/postgresql-server: update to 8.4.5
>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:   Wed Oct 06 11:40:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 8.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD neo.vx.sk 8.1-STABLE FreeBSD 8.1-STABLE #1 r212768M: Fri Sep 17 00:01:06 CEST
>Description:
- update to 8.4.5
- move SSL to OPTIONS (and use bsd.options.mk)

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

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

--- postgresql-server-8.4.5.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/postgresql84-server/Makefile,v
retrieving revision 1.210
diff -u -r1.210 Makefile
--- Makefile	6 Oct 2010 10:56:57 -0000	1.210
+++ Makefile	6 Oct 2010 11:37:23 -0000
@@ -6,8 +6,8 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	8.4.4
-PORTREVISION=	2
+DISTVERSION?=	8.4.5
+PORTREVISION?=	0
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -57,7 +57,7 @@
 
 .if !defined(CLIENT_ONLY) && !defined(SLAVE_ONLY)
 SERVER_ONLY=	yes
-PORTREVISION=	3
+PORTREVISION=	0
 USE_RC_SUBR=	postgresql
 USE_PGSQL=	yes
 WANT_PGSQL_VER=	${PORTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g}
@@ -72,24 +72,13 @@
 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
-
-.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
 OPTIONS+=	MIT_KRB5 "Build with MIT's kerberos support" off
 OPTIONS+=	HEIMDAL_KRB5 "Builds with Heimdal kerberos support" off
 OPTIONS+=	OPTIMIZED_CFLAGS "Builds with compiler optimizations (-O3)" off
+OPTIONS+=	SSL "Build with OpenSSL support" on
 OPTIONS+=	XML "Build with XML data type (server)" on
 OPTIONS+=	TZDATA "Use internal timezone database (server)" on
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
@@ -101,7 +90,18 @@
 # 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
+.endif # !SLAVE_ONLY
+
+.include <bsd.port.options.mk>
 
+.if !defined(WITHOUT_SSL)
+USE_OPENSSL=	yes
+CONFIGURE_ARGS+=--with-openssl
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if !defined(SLAVE_ONLY)
 .  if defined(WITH_ICU) && defined(WITH_ICU4)
 IGNORE=		options WITH_ICU and WITH_ICU4 are mutually exclusive
 .  endif
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/databases/postgresql84-server/distinfo,v
retrieving revision 1.77
diff -u -r1.77 distinfo
--- distinfo	20 May 2010 15:43:39 -0000	1.77
+++ distinfo	6 Oct 2010 11:37:23 -0000
@@ -1,6 +1,6 @@
-MD5 (postgresql/postgresql-8.4.4.tar.bz2) = 4bf2448ad965bca3940df648c02194df
-SHA256 (postgresql/postgresql-8.4.4.tar.bz2) = e66b398d565f7fb16d8ae58ae72881dcd3dbb1b88f532bbe1c2d1284812be37e
-SIZE (postgresql/postgresql-8.4.4.tar.bz2) = 13853838
+MD5 (postgresql/postgresql-8.4.5.tar.bz2) = 391a3f2eddd6fa78bb6ceba9955ffa5f
+SHA256 (postgresql/postgresql-8.4.5.tar.bz2) = 300022ae2d998a0291a1e91978c48468fdc9c389afca05d6e5f18209ff5732bf
+SIZE (postgresql/postgresql-8.4.5.tar.bz2) = 14114152
 MD5 (postgresql/pg-840-icu-2009-09-15.diff.gz) = 2b81134b462e01623bc9387fe4de7136
 SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e
 SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321
Index: pkg-plist-client
===================================================================
RCS file: /home/pcvs/ports/databases/postgresql84-server/pkg-plist-client,v
retrieving revision 1.18
diff -u -r1.18 pkg-plist-client
--- pkg-plist-client	2 Jun 2010 10:16:03 -0000	1.18
+++ pkg-plist-client	6 Oct 2010 11:37:23 -0000
@@ -589,9 +589,12 @@
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_dump-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/pgscripts-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/psql-8.4.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/ecpg-8.4.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq5-8.4.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config-8.4.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump-8.4.mo
 %%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/pt_BR/LC_MESSAGES/ecpg-8.4.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpglib6-8.4.mo
@@ -626,3 +629,9 @@
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump-8.4.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-8.4.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/ecpg-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq5-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/psql-8.4.mo
Index: pkg-plist-server
===================================================================
RCS file: /home/pcvs/ports/databases/postgresql84-server/pkg-plist-server,v
retrieving revision 1.28
diff -u -r1.28 pkg-plist-server
--- pkg-plist-server	5 Jun 2010 11:04:02 -0000	1.28
+++ pkg-plist-server	6 Oct 2010 11:37:23 -0000
@@ -76,14 +76,18 @@
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_controldata-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_resetxlog-8.4.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/plpgsql-8.4.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb-8.4.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl-8.4.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata-8.4.mo
 %%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/pt_BR/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_ctl-8.4.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-8.4.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-8.4.mo
+%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/plpgsql-8.4.mo
 %%GETTEXT%%share/locale/ro/LC_MESSAGES/pg_resetxlog-8.4.mo
 %%GETTEXT%%share/locale/ro/LC_MESSAGES/plpgsql-8.4.mo
 %%GETTEXT%%share/locale/ru/LC_MESSAGES/initdb-8.4.mo
@@ -108,6 +112,12 @@
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog-8.4.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/plpgsql-8.4.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/plpgsql-8.4.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres-8.4.mo
 share/postgresql/postgres.shdescription
 share/postgresql/snowball_create.sql
 %%TZDATA%%share/postgresql/timezone/Africa/Abidjan
@@ -620,6 +630,7 @@
 %%TZDATA%%share/postgresql/timezone/Pacific/Apia
 %%TZDATA%%share/postgresql/timezone/Pacific/Auckland
 %%TZDATA%%share/postgresql/timezone/Pacific/Chatham
+%%TZDATA%%share/postgresql/timezone/Pacific/Chuuk
 %%TZDATA%%share/postgresql/timezone/Pacific/Easter
 %%TZDATA%%share/postgresql/timezone/Pacific/Efate
 %%TZDATA%%share/postgresql/timezone/Pacific/Enderbury
@@ -645,6 +656,7 @@
 %%TZDATA%%share/postgresql/timezone/Pacific/Pago_Pago
 %%TZDATA%%share/postgresql/timezone/Pacific/Palau
 %%TZDATA%%share/postgresql/timezone/Pacific/Pitcairn
+%%TZDATA%%share/postgresql/timezone/Pacific/Pohnpei
 %%TZDATA%%share/postgresql/timezone/Pacific/Ponape
 %%TZDATA%%share/postgresql/timezone/Pacific/Port_Moresby
 %%TZDATA%%share/postgresql/timezone/Pacific/Rarotonga
--- postgresql-server-8.4.5.patch ends here ---

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



More information about the freebsd-ports-bugs mailing list