ports/148837: [PATCH] databases/postgresql-server: fix build with icu 4.4

[Martin Matuska]

>Number:         148837
>Category:       ports
>Synopsis:       [PATCH] databases/postgresql-server: fix build with icu 4.4
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jul 22 11:20:01 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Martin Matuska
>Release:        FreeBSD 8.1-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD core.vx.sk 8.1-RELEASE FreeBSD 8.1-RELEASE #21 r210200M: Sat Jul 17 22:02:58 CEST
>Description:
- fix build with ICU4 option after ICU 4.4 update

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

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

--- postgresql-server-8.4.4_2.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/databases/postgresql84-server/Makefile,v
retrieving revision 1.207
diff -u -r1.207 Makefile
--- Makefile	13 Jun 2010 08:39:57 -0000	1.207
+++ Makefile	22 Jul 2010 11:14:00 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME?=	postgresql
 DISTVERSION?=	8.4.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -112,7 +112,7 @@
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 PATCHFILES+=	pg-840-icu-2009-09-15.diff.gz:icu
 .   if defined(WITH_ICU4)
-LIB_DEPENDS+=	icudata.43:${PORTSDIR}/devel/icu4
+LIB_DEPENDS+=	icudata.44:${PORTSDIR}/devel/icu4
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
 .   else
 LIB_DEPENDS+=	icudata.38:${PORTSDIR}/devel/icu
Index: files/extra-patch-icu4
===================================================================
RCS file: /home/pcvs/ports/databases/postgresql84-server/files/extra-patch-icu4,v
retrieving revision 1.1
diff -u -r1.1 extra-patch-icu4
--- files/extra-patch-icu4	25 Mar 2010 22:58:11 -0000	1.1
+++ files/extra-patch-icu4	22 Jul 2010 11:14:00 -0000
@@ -8,7 +8,7 @@
 -     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_43, [], [
++  AC_CHECK_LIB(icui18n, ucol_open_44, [], [
 +     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])])
@@ -19,7 +19,7 @@
 -     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_43, [], [
++  AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
 +     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])])
--- postgresql-server-8.4.4_2.patch ends here ---

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