Attachment #111909 for bug #153245

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




#

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

LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
PATCHFILES+=	pg-8121-icu-xx-2010-05-14.diff.gz:icu
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
.  endif

PATCH_DIST_STRIP=-p1

.  if defined(WITH_ICU) || defined(WITH_ICU4)
#m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.62], [], [m4_fatal([Autoconf version 2.59 or 2.62 is required.
	@${REINPLACE_CMD} -E -e \
		"s|^(m4_.*)2.6[0-9](.*Autoconf version.*)2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \
		${WRKSRC}/configure.in
.  endif


Lines 1-9 Link Here

(-)ports/databases/postgresql81-server/distinfo (-5 / +2 lines)
1	MD5 (postgresql/postgresql-8.1.22.tar.bz2) = 51bede633280d1d34a98207d6b44ab0f	1	SHA256 (postgresql/postgresql-8.1.23.tar.bz2) = 5a79eb814b4933f95deb704dfbbd6e1966b520ec12b8f4b48bcea9c3266c10ea
2	SHA256 (postgresql/postgresql-8.1.22.tar.bz2) = a01e6baa2ee08868f5318cdaec592d8ca68b5a8ef956b8304a07b3a1c208fefc	2	SIZE (postgresql/postgresql-8.1.23.tar.bz2) = 11920401
3	SIZE (postgresql/postgresql-8.1.22.tar.bz2) = 11905401
4	MD5 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 15916bf13b99702599ce70b6475f7d86
5	SHA256 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 14ecc3809ce69f47c3460efee3fc7fce78f68802936650fc4e1132adffd41d1e	3	SHA256 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 14ecc3809ce69f47c3460efee3fc7fce78f68802936650fc4e1132adffd41d1e
6	SIZE (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 31203	4	SIZE (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 31203
7	MD5 (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = af4e5f16bfc60a9e98d18f1f7c8d76e7
8	SHA256 (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = 4a5f4751599bd56144e598bce75f7a970e12d82f9300d36859f544083cf90a56	5	SHA256 (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = 4a5f4751599bd56144e598bce75f7a970e12d82f9300d36859f544083cf90a56
9	SIZE (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = 4271	6	SIZE (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = 4271




--- configure.in.orig	2010-12-17 10:44:30.756396179 +0100
+++ configure.in	2010-12-17 10:45:13.119579646 +0100
@@ -703,19 +703,27 @@
 fi
 
 if test "$with_icu" = yes ; then
-  AC_CHECK_LIB(icui18n, ucol_open_43, [], [
-     AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
-        AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
-           AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
+  AC_CHECK_LIB(icui18n, ucol_open_46, [], [
+    AC_CHECK_LIB(icui18n, ucol_open_44, [], [
+      AC_CHECK_LIB(icui18n, ucol_open_43, [], [
+        AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
+          AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
+            AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
+          ])
         ])
-     ])
+      ])
+    ])
   ])
-  AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
-     AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
-        AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
-           AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
+  AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
+    AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
+      AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
+        AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
+          AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
+            AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
+          ])
         ])
-     ])
+      ])
+    ])
   ])
 fi
 

Lines 6-13 Link Here

(-)ports/databases/postgresql82-server/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME?= postgresql	8	PORTNAME?= postgresql
9	PORTVERSION?= 8.2.18	9	PORTVERSION?= 8.2.19
10	PORTREVISION?= 1
11	CATEGORIES?= databases	10	CATEGORIES?= databases
12	MASTER_SITES= ${MASTER_SITE_PGSQL}	11	MASTER_SITES= ${MASTER_SITE_PGSQL}
13	MASTER_SITE_SUBDIR= source/v${PORTVERSION}	12	MASTER_SITE_SUBDIR= source/v${PORTVERSION}

Lines 1-3 Link Here

(-)ports/databases/postgresql82-server/distinfo (-3 / +2 lines)
1	MD5 (postgresql/postgresql-8.2.18.tar.bz2) = 84fec909791729e5e0e00b84c5f6c055	1	SHA256 (postgresql/postgresql-8.2.19.tar.bz2) = 9ae639ec9320830c60c7e6b2151ed744c51564d0664d6b5c896b9ed7b4285f5e
2	SHA256 (postgresql/postgresql-8.2.18.tar.bz2) = 9dd6d9a11ee8725d921a57af11bc3b83c7496e1b1324b39e09ab1b6eb547b0ca	2	SIZE (postgresql/postgresql-8.2.19.tar.bz2) = 12749881
3	SIZE (postgresql/postgresql-8.2.18.tar.bz2) = 12723850




#

PORTNAME?=	postgresql
DISTVERSION?=	8.3.13
PORTREVISION?=	2
CATEGORIES?=	databases
MASTER_SITES=	${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR=	source/v${DISTVERSION}

LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
PATCHFILES+=	pg-8311-icu-xx-2010-05-14.diff.gz:icu
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
.  endif

PATCH_DIST_STRIP=-p1

.  if defined(WITH_ICU)
	@${REINPLACE_CMD} -E -e \
		"s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \
		-e "s|_43|_46|g" \
		${WRKSRC}/configure.in
.  endif


Lines 1-6 Link Here

(-)ports/databases/postgresql83-server/distinfo (-4 / +2 lines)
1	MD5 (postgresql/postgresql-8.3.12.tar.bz2) = 6fcb02cd24b6bc25f2e2fb950c6a5d9e	1	SHA256 (postgresql/postgresql-8.3.13.tar.bz2) = 192ece18834af0fe001e11794df1bc266b056050d3c74804c6c0442c7f99d4fc
2	SHA256 (postgresql/postgresql-8.3.12.tar.bz2) = 596bd677dee6153ddc42391b33b6346ebc86f60f8d935fedff775ed46d02f070	2	SIZE (postgresql/postgresql-8.3.13.tar.bz2) = 14337117
3	SIZE (postgresql/postgresql-8.3.12.tar.bz2) = 14273431
4	MD5 (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 43fd07e87e9ecff2aa09b134408bdcb5
5	SHA256 (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 44146bdb29a5a7d51c70911096ed6d265bdf09f74f0084ee7ad1883bea2f852a	3	SHA256 (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 44146bdb29a5a7d51c70911096ed6d265bdf09f74f0084ee7ad1883bea2f852a
6	SIZE (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 5064	4	SIZE (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 5064




--- configure.in.orig	2010-12-17 11:17:22.892862951 +0100
+++ configure.in	2010-12-17 11:17:59.498605923 +0100
@@ -19,7 +19,7 @@
 
 AC_INIT([PostgreSQL], [8.3.13], [pgsql-bugs@postgresql.org])
 
-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.62], [], [m4_fatal([Autoconf version 2.62 is required.
+m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.68], [], [m4_fatal([Autoconf version 2.68 is required.
 Untested combinations of 'autoconf' and PostgreSQL versions are not
 recommended.  You can remove the check from 'configure.in' but it is then
 your responsibility whether the result works or not.])])
@@ -795,19 +795,27 @@
 fi
 
 if test "$with_icu" = yes ; then
-  AC_CHECK_LIB(icui18n, ucol_open_43, [], [
-     AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
-        AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
-           AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
+  AC_CHECK_LIB(icui18n, ucol_open_46, [], [
+    AC_CHECK_LIB(icui18n, ucol_open_44, [], [
+      AC_CHECK_LIB(icui18n, ucol_open_43, [], [
+        AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
+          AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
+            AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
+          ])
         ])
-     ])
+      ])
+    ])
   ])
-  AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
-     AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
-        AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
-           AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
+  AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
+    AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
+      AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
+        AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
+          AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
+            AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
+          ])
         ])
-     ])
+      ])
+    ])
   ])
 fi
 

Lines 6-13 Link Here

(-)ports/databases/postgresql84-server/Makefile (-2 / +1 lines)
6	#	6	#
7		7
8	PORTNAME?= postgresql	8	PORTNAME?= postgresql
9	DISTVERSION?= 8.4.5	9	DISTVERSION?= 8.4.6
10	PORTREVISION?= 2
11	CATEGORIES?= databases	10	CATEGORIES?= databases
12	MASTER_SITES= ${MASTER_SITE_PGSQL}	11	MASTER_SITES= ${MASTER_SITE_PGSQL}
13	MASTER_SITE_SUBDIR= source/v${DISTVERSION}	12	MASTER_SITE_SUBDIR= source/v${DISTVERSION}

Lines 1-6 Link Here

(-)ports/databases/postgresql84-server/distinfo (-4 / +2 lines)
1	MD5 (postgresql/postgresql-8.4.5.tar.bz2) = 391a3f2eddd6fa78bb6ceba9955ffa5f	1	SHA256 (postgresql/postgresql-8.4.6.tar.bz2) = 8110c576e9055286d7b04b8930f7a378e483f0530b41dd3098f6e35528ed7d3c
2	SHA256 (postgresql/postgresql-8.4.5.tar.bz2) = 300022ae2d998a0291a1e91978c48468fdc9c389afca05d6e5f18209ff5732bf	2	SIZE (postgresql/postgresql-8.4.6.tar.bz2) = 14130201
3	SIZE (postgresql/postgresql-8.4.5.tar.bz2) = 14114152
4	MD5 (postgresql/pg-840-icu-2009-09-15.diff.gz) = 2b81134b462e01623bc9387fe4de7136
5	SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e	3	SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e
6	SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321	4	SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321




--- configure.in.orig	2010-12-17 10:28:46.362381801 +0100
+++ configure.in	2010-12-17 10:31:27.692004326 +0100
@@ -945,15 +945,27 @@
 fi
 
 if test "$with_icu" = yes ; then

-        AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
-   ])
+  AC_CHECK_LIB(icui18n, ucol_open_46, [], [
+    AC_CHECK_LIB(icui18n, ucol_open_44, [], [
+      AC_CHECK_LIB(icui18n, ucol_open_43, [], [
+        AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
+          AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
+            AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
+          ])
+        ])
+      ])
+    ])
   ])
-  AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
-     AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
-        AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
-   ])
+  AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
+    AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
+      AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
+        AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
+          AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
+            AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
+          ])
+        ])
+      ])
+    ])
   ])
 fi
 




#

PORTNAME?=	postgresql
DISTVERSION?=	9.0.2
PORTREVISION?=	2
CATEGORIES?=	databases
MASTER_SITES=	${MASTER_SITE_PGSQL}
MASTER_SITE_SUBDIR=	source/v${DISTVERSION}

PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
PATCHFILES+=	pg-900-icu-2010-09-19.diff.gz:icu
LIB_DEPENDS+=	icudata.46:${PORTSDIR}/devel/icu
EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
.  endif

PATCH_DIST_STRIP=-p1

.  if defined(WITH_ICU)
	@${REINPLACE_CMD} -E -e \
		"s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \
		-e "s|_44|_46|g" \
		${WRKSRC}/configure.in
.  endif


Lines 1-6 Link Here

(-)ports/databases/postgresql90-server/distinfo (-4 / +2 lines)
1	MD5 (postgresql/postgresql-9.0.1.tar.bz2) = 57ba57e43cfe29e16dacbf5789be98d1	1	SHA256 (postgresql/postgresql-9.0.2.tar.bz2) = ffb58195850aa0ec9b7b3dcdac51a6dee0c76ea3387b76c805e1c4d186fe2af5
2	SHA256 (postgresql/postgresql-9.0.1.tar.bz2) = 5310cd490127845f1473a0f73f7b0d18277d81d51534ddfe17ea3e78286a3196	2	SIZE (postgresql/postgresql-9.0.2.tar.bz2) = 14024244
3	SIZE (postgresql/postgresql-9.0.1.tar.bz2) = 13773951
4	SHA256 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 27cea46241ec814965c278330cd96f67ee03422b7758a210713a63b4b5bb77e9	3	SHA256 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 27cea46241ec814965c278330cd96f67ee03422b7758a210713a63b4b5bb77e9
5	MD5 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 150268fbcce8c0bbe68c176dcb5464ad
6	SIZE (postgresql/pg-900-icu-2010-09-19.diff.gz) = 4349	4	SIZE (postgresql/pg-900-icu-2010-09-19.diff.gz) = 4349

Lines 606-613 Link Here

(-)ports/databases/postgresql90-server/pkg-plist-client (+8 lines)
606	%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_dump-9.0.mo	606	%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_dump-9.0.mo
607	%%GETTEXT%%share/locale/ja/LC_MESSAGES/pgscripts-9.0.mo	607	%%GETTEXT%%share/locale/ja/LC_MESSAGES/pgscripts-9.0.mo
608	%%GETTEXT%%share/locale/ja/LC_MESSAGES/psql-9.0.mo	608	%%GETTEXT%%share/locale/ja/LC_MESSAGES/psql-9.0.mo
		609	%%GETTEXT%%share/locale/ko/LC_MESSAGES/ecpg-9.0.mo
609	%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq5-9.0.mo	610	%%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq5-9.0.mo
610	%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config-9.0.mo	611	%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config-9.0.mo
		612	%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump-9.0.mo
611	%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-9.0.mo	613	%%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-9.0.mo
612	%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-9.0.mo	614	%%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-9.0.mo
613	%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-9.0.mo	615	%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-9.0.mo
Lines 642-646 Link Here
642	%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config-9.0.mo	644	%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config-9.0.mo
643	%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump-9.0.mo	645	%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump-9.0.mo
644	%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-9.0.mo	646	%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-9.0.mo
		647	%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql-9.0.mo
		648	%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/ecpg-9.0.mo
		649	%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq5-9.0.mo
		650	%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config-9.0.mo
		651	%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump-9.0.mo
		652	%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts-9.0.mo
645	@dirrm share/doc/postgresql/html	653	@dirrm share/doc/postgresql/html
646	@dirrm share/doc/postgresql	654	@dirrm share/doc/postgresql




%%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_resetxlog-9.0.mo
%%GETTEXT%%share/locale/ja/LC_MESSAGES/plpgsql-9.0.mo
%%GETTEXT%%share/locale/ja/LC_MESSAGES/postgres-9.0.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/initdb-9.0.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_controldata-9.0.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_ctl-9.0.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_resetxlog-9.0.mo
%%GETTEXT%%share/locale/ko/LC_MESSAGES/plpgsql-9.0.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/initdb-9.0.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.0.mo
%%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.0.mo

%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_controldata-9.0.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_ctl-9.0.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_resetxlog-9.0.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/plpgsql-9.0.mo
%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/postgres-9.0.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/initdb-9.0.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_controldata-9.0.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_ctl-9.0.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_resetxlog-9.0.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/plpgsql-9.0.mo
%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/postgres-9.0.mo
share/postgresql/postgres.shdescription
share/postgresql/snowball_create.sql
%%TZDATA%%share/postgresql/timezone/Africa/Abidjan




--- configure.in.orig	2010-12-17 10:24:25.585364941 +0100
+++ configure.in	2010-12-17 10:25:08.921592644 +0100
@@ -947,23 +947,27 @@
 fi
 
 if test "$with_icu" = yes ; then
-  AC_CHECK_LIB(icui18n, ucol_open_44, [], [
-     AC_CHECK_LIB(icui18n, ucol_open_43, [], [
-        AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
-           AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
-              AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
-           ])
-        ])
-     ])
+  AC_CHECK_LIB(icui18n, ucol_open_46, [], [
+    AC_CHECK_LIB(icui18n, ucol_open_44, [], [
+       AC_CHECK_LIB(icui18n, ucol_open_43, [], [
+          AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
+             AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
+                AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
+             ])
+          ])
+       ])
+    ])
   ])
-  AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
-     AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
-        AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
-           AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
-              AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
-           ])
-        ])
-     ])
+  AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
+    AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
+       AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
+          AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
+             AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
+                AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
+             ])
+          ])
+       ])
+    ])
   ])
 fi


Return to bug 153245

Lines 6-13 Link Here

(-)ports/databases/postgresql81-server/Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME?= postgresql	8	PORTNAME?= postgresql
9	PORTVERSION?= 8.1.22	9	PORTVERSION?= 8.1.23
10	PORTREVISION?= 1
11	CATEGORIES?= databases	10	CATEGORIES?= databases
12	MASTER_SITES= ${MASTER_SITE_PGSQL}	11	MASTER_SITES= ${MASTER_SITE_PGSQL}
13	MASTER_SITE_SUBDIR= source/v${PORTVERSION}	12	MASTER_SITE_SUBDIR= source/v${PORTVERSION}
Lines 110-115 Link Here
110	LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu	109	LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu
111	PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu	110	PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
112	PATCHFILES+= pg-8121-icu-xx-2010-05-14.diff.gz:icu	111	PATCHFILES+= pg-8121-icu-xx-2010-05-14.diff.gz:icu
		112	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4
113	. endif	113	. endif
114		114
115	PATCH_DIST_STRIP=-p1	115	PATCH_DIST_STRIP=-p1
Lines 274-280 Link Here
274	. if defined(WITH_ICU) \|\| defined(WITH_ICU4)	274	. if defined(WITH_ICU) \|\| defined(WITH_ICU4)
275	#m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.62], [], [m4_fatal([Autoconf version 2.59 or 2.62 is required.	275	#m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.62], [], [m4_fatal([Autoconf version 2.59 or 2.62 is required.
276	@${REINPLACE_CMD} -E -e \	276	@${REINPLACE_CMD} -E -e \
277	"s\|^(m4_.)2.6[0-9](.Autoconf version.*)2.6[0-9]\|\1${AUTOCONF_VERSION:S/2/2./}\2${AUTOCONF_VERSION:S/2/2./}\|g" \	277	"s\|^(m4_.)2.6[0-9](.Autoconf version.*)2.6[0-9]\|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}\|g" \
278	${WRKSRC}/configure.in	278	${WRKSRC}/configure.in
279	. endif	279	. endif
280		280

Added Link Here

(-)ports/databases/postgresql81-server/files/extra-patch-icu4 (+40 lines)
1	--- configure.in.orig 2010-12-17 10:44:30.756396179 +0100
2	+++ configure.in 2010-12-17 10:45:13.119579646 +0100
3	@@ -703,19 +703,27 @@
4	fi
5
6	if test "$with_icu" = yes ; then
7	- AC_CHECK_LIB(icui18n, ucol_open_43, [], [
8	- AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
9	- AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
10	- AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
11	+ AC_CHECK_LIB(icui18n, ucol_open_46, [], [
12	+ AC_CHECK_LIB(icui18n, ucol_open_44, [], [
13	+ AC_CHECK_LIB(icui18n, ucol_open_43, [], [
14	+ AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
15	+ AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
16	+ AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
17	+ ])
18	])
19	- ])
20	+ ])
21	+ ])
22	])
23	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
24	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
25	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
26	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
27	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
28	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
29	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
30	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
31	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
32	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
33	+ ])
34	])
35	- ])
36	+ ])
37	+ ])
38	])
39	fi
40

Lines 6-13 Link Here

(-)ports/databases/postgresql83-server/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME?= postgresql	8	PORTNAME?= postgresql
9	DISTVERSION?= 8.3.12	9	DISTVERSION?= 8.3.13
10	PORTREVISION?= 2
11	CATEGORIES?= databases	10	CATEGORIES?= databases
12	MASTER_SITES= ${MASTER_SITE_PGSQL}	11	MASTER_SITES= ${MASTER_SITE_PGSQL}
13	MASTER_SITE_SUBDIR= source/v${DISTVERSION}	12	MASTER_SITE_SUBDIR= source/v${DISTVERSION}
Lines 108-113 Link Here
108	LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu	107	LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu
109	PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu	108	PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
110	PATCHFILES+= pg-8311-icu-xx-2010-05-14.diff.gz:icu	109	PATCHFILES+= pg-8311-icu-xx-2010-05-14.diff.gz:icu
		110	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4
111	. endif	111	. endif
112		112
113	PATCH_DIST_STRIP=-p1	113	PATCH_DIST_STRIP=-p1
Lines 285-291 Link Here
285	. if defined(WITH_ICU)	285	. if defined(WITH_ICU)
286	@${REINPLACE_CMD} -E -e \	286	@${REINPLACE_CMD} -E -e \
287	"s\|^(m4_if.)2.6[0-9](.Autoconf version )2.6[0-9]\|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}\|g" \	287	"s\|^(m4_if.)2.6[0-9](.Autoconf version )2.6[0-9]\|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}\|g" \
288	-e "s\|_43\|_46\|g" \
289	${WRKSRC}/configure.in	288	${WRKSRC}/configure.in
290	. endif	289	. endif
291		290

Added Link Here

(-)ports/databases/postgresql83-server/files/extra-patch-icu4 (+49 lines)
1	--- configure.in.orig 2010-12-17 11:17:22.892862951 +0100
2	+++ configure.in 2010-12-17 11:17:59.498605923 +0100
3	@@ -19,7 +19,7 @@
4
5	AC_INIT([PostgreSQL], [8.3.13], [pgsql-bugs@postgresql.org])
6
7	-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.62], [], [m4_fatal([Autoconf version 2.62 is required.
8	+m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.68], [], [m4_fatal([Autoconf version 2.68 is required.
9	Untested combinations of 'autoconf' and PostgreSQL versions are not
10	recommended. You can remove the check from 'configure.in' but it is then
11	your responsibility whether the result works or not.])])
12	@@ -795,19 +795,27 @@
13	fi
14
15	if test "$with_icu" = yes ; then
16	- AC_CHECK_LIB(icui18n, ucol_open_43, [], [
17	- AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
18	- AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
19	- AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
20	+ AC_CHECK_LIB(icui18n, ucol_open_46, [], [
21	+ AC_CHECK_LIB(icui18n, ucol_open_44, [], [
22	+ AC_CHECK_LIB(icui18n, ucol_open_43, [], [
23	+ AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
24	+ AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
25	+ AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
26	+ ])
27	])
28	- ])
29	+ ])
30	+ ])
31	])
32	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
33	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
34	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
35	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
36	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
37	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
38	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
39	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
40	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
41	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
42	+ ])
43	])
44	- ])
45	+ ])
46	+ ])
47	])
48	fi
49

Lines 1-6 Link Here

(-)ports/databases/postgresql84-server/files/extra-patch-icu4 (-11 / +19 lines)
1	--- configure.in.orig 2010-03-25 22:25:10.655197193 +0100	1	--- configure.in.orig 2010-12-17 10:28:46.362381801 +0100
2	+++ configure.in 2010-03-25 22:25:13.611658318 +0100	2	+++ configure.in 2010-12-17 10:31:27.692004326 +0100
3	@@ -945,15 +945,19 @@	3	@@ -945,15 +945,27 @@
4	fi	4	fi
5		5
6	if test "$with_icu" = yes ; then	6	if test "$with_icu" = yes ; then
Lines 9-30 Link Here
9	- AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])	9	- AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
10	- ])	10	- ])
11	+ AC_CHECK_LIB(icui18n, ucol_open_46, [], [	11	+ AC_CHECK_LIB(icui18n, ucol_open_46, [], [
12	+ AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [	12	+ AC_CHECK_LIB(icui18n, ucol_open_44, [], [
13	+ AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [	13	+ AC_CHECK_LIB(icui18n, ucol_open_43, [], [
14	+ AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])	14	+ AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
		15	+ AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
		16	+ AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
		17	+ ])
15	+ ])	18	+ ])
16	+ ])	19	+ ])
		20	+ ])
17	])	21	])
18	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [	22	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
19	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [	23	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
20	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])	24	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
21	- ])	25	- ])
22	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [	26	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
23	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [	27	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
24	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [	28	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
25	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])	29	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
		30	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
		31	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
		32	+ ])
26	+ ])	33	+ ])
27	+ ])	34	+ ])
		35	+ ])
28	])	36	])
29	fi	37	fi
30		38

Lines 6-13 Link Here

(-)ports/databases/postgresql90-server/Makefile (-3 / +2 lines)
6	#	6	#
7		7
8	PORTNAME?= postgresql	8	PORTNAME?= postgresql
9	DISTVERSION?= 9.0.1	9	DISTVERSION?= 9.0.2
10	PORTREVISION?= 2
11	CATEGORIES?= databases	10	CATEGORIES?= databases
12	MASTER_SITES= ${MASTER_SITE_PGSQL}	11	MASTER_SITES= ${MASTER_SITE_PGSQL}
13	MASTER_SITE_SUBDIR= source/v${DISTVERSION}	12	MASTER_SITE_SUBDIR= source/v${DISTVERSION}
Lines 109-114 Link Here
109	PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu	108	PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
110	PATCHFILES+= pg-900-icu-2010-09-19.diff.gz:icu	109	PATCHFILES+= pg-900-icu-2010-09-19.diff.gz:icu
111	LIB_DEPENDS+= icudata.46:${PORTSDIR}/devel/icu	110	LIB_DEPENDS+= icudata.46:${PORTSDIR}/devel/icu
		111	EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4
112	. endif	112	. endif
113		113
114	PATCH_DIST_STRIP=-p1	114	PATCH_DIST_STRIP=-p1
Lines 319-325 Link Here
319	. if defined(WITH_ICU)	319	. if defined(WITH_ICU)
320	@${REINPLACE_CMD} -E -e \	320	@${REINPLACE_CMD} -E -e \
321	"s\|^(m4_if.)2.6[0-9](.Autoconf version )2.6[0-9]\|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}\|g" \	321	"s\|^(m4_if.)2.6[0-9](.Autoconf version )2.6[0-9]\|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}\|g" \
322	-e "s\|_44\|_46\|g" \
323	${WRKSRC}/configure.in	322	${WRKSRC}/configure.in
324	. endif	323	. endif
325		324

Added Link Here

(-)ports/databases/postgresql90-server/files/extra-patch-icu4 (+46 lines)
1	--- configure.in.orig 2010-12-17 10:24:25.585364941 +0100
2	+++ configure.in 2010-12-17 10:25:08.921592644 +0100
3	@@ -947,23 +947,27 @@
4	fi
5
6	if test "$with_icu" = yes ; then
7	- AC_CHECK_LIB(icui18n, ucol_open_44, [], [
8	- AC_CHECK_LIB(icui18n, ucol_open_43, [], [
9	- AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
10	- AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
11	- AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
12	- ])
13	- ])
14	- ])
15	+ AC_CHECK_LIB(icui18n, ucol_open_46, [], [
16	+ AC_CHECK_LIB(icui18n, ucol_open_44, [], [
17	+ AC_CHECK_LIB(icui18n, ucol_open_43, [], [
18	+ AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
19	+ AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
20	+ AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
21	+ ])
22	+ ])
23	+ ])
24	+ ])
25	])
26	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
27	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
28	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
29	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
30	- AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
31	- ])
32	- ])
33	- ])
34	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
35	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
36	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
37	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
38	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
39	+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
40	+ ])
41	+ ])
42	+ ])
43	+ ])
44	])
45	fi
46