- Update to 9.0.2

- Unify ICU handling

PR:		ports/153245
Approved by:	maintainer (timeout)

5 files changed, 68 insertions, 7 deletions

diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 77abdb59c3d..bc9d7a369f6 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME?=	postgresql
-DISTVERSION?=	9.0.1
-PORTREVISION?=	2
+DISTVERSION?=	9.0.2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -109,6 +108,7 @@ CONFIGURE_ARGS+=--with-icu
 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
@@ -319,7 +319,6 @@ post-patch:
 .  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
 
diff --git a/databases/postgresql92-server/distinfo b/databases/postgresql92-server/distinfo
index d623f4df5ee..a2d2b93c1dc 100644
--- a/databases/postgresql92-server/distinfo
+++ b/databases/postgresql92-server/distinfo
@@ -1,6 +1,4 @@
-MD5 (postgresql/postgresql-9.0.1.tar.bz2) = 57ba57e43cfe29e16dacbf5789be98d1
-SHA256 (postgresql/postgresql-9.0.1.tar.bz2) = 5310cd490127845f1473a0f73f7b0d18277d81d51534ddfe17ea3e78286a3196
-SIZE (postgresql/postgresql-9.0.1.tar.bz2) = 13773951
+SHA256 (postgresql/postgresql-9.0.2.tar.bz2) = ffb58195850aa0ec9b7b3dcdac51a6dee0c76ea3387b76c805e1c4d186fe2af5
+SIZE (postgresql/postgresql-9.0.2.tar.bz2) = 14024244
 SHA256 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 27cea46241ec814965c278330cd96f67ee03422b7758a210713a63b4b5bb77e9
-MD5 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 150268fbcce8c0bbe68c176dcb5464ad
 SIZE (postgresql/pg-900-icu-2010-09-19.diff.gz) = 4349
diff --git a/databases/postgresql92-server/files/extra-patch-icu4 b/databases/postgresql92-server/files/extra-patch-icu4
new file mode 100644
index 00000000000..bf28a732a2b
--- /dev/null
+++ b/databases/postgresql92-server/files/extra-patch-icu4
@@ -0,0 +1,46 @@
+--- 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
+ 
diff --git a/databases/postgresql92-server/pkg-plist-client b/databases/postgresql92-server/pkg-plist-client
index e39b4b80738..dac1a5f8c8f 100644
--- a/databases/postgresql92-server/pkg-plist-client
+++ b/databases/postgresql92-server/pkg-plist-client
@@ -606,8 +606,10 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/pg_dump-9.0.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/pgscripts-9.0.mo
 %%GETTEXT%%share/locale/ja/LC_MESSAGES/psql-9.0.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/ecpg-9.0.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/libpq5-9.0.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/ko/LC_MESSAGES/pg_dump-9.0.mo
 %%GETTEXT%%share/locale/ko/LC_MESSAGES/pgscripts-9.0.mo
 %%GETTEXT%%share/locale/nb/LC_MESSAGES/pg_config-9.0.mo
 %%GETTEXT%%share/locale/pt_BR/LC_MESSAGES/ecpg-9.0.mo
@@ -642,5 +644,11 @@ share/postgresql/psqlrc.sample
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_config-9.0.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pg_dump-9.0.mo
 %%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/pgscripts-9.0.mo
+%%GETTEXT%%share/locale/zh_CN/LC_MESSAGES/psql-9.0.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/ecpg-9.0.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/libpq5-9.0.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_config-9.0.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pg_dump-9.0.mo
+%%GETTEXT%%share/locale/zh_TW/LC_MESSAGES/pgscripts-9.0.mo
 @dirrm share/doc/postgresql/html
 @dirrm share/doc/postgresql
diff --git a/databases/postgresql92-server/pkg-plist-server b/databases/postgresql92-server/pkg-plist-server
index 780469f97aa..457bffe0ccb 100644
--- a/databases/postgresql92-server/pkg-plist-server
+++ b/databases/postgresql92-server/pkg-plist-server
@@ -76,9 +76,11 @@ share/postgresql/system_views.sql
 %%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
@@ -110,6 +112,14 @@ share/postgresql/system_views.sql
 %%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