- update ICU to 4.8

- chase library bump
- add an entry in UPDATING for instructions
- remove old conflict lines

8 files changed, 10 insertions, 9 deletions

diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index 479a8d68c0f1..d4cfb32b7376 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	couchdb
 PORTVERSION=	1.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_APACHE}
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 89c0e3662fd4..7ed696633fdb 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	firebird
 PORTVERSION=	2.0.6
+PORTREVISION=	1
 CATEGORIES?=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-Release/
 PKGNAMESUFFIX?=	-server
diff --git a/databases/firebird21-server/Makefile b/databases/firebird21-server/Makefile
index 93a850d014e4..1e8bb593e1f9 100644
--- a/databases/firebird21-server/Makefile
+++ b/databases/firebird21-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firebird
 PORTVERSION=	2.1.3
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-Release/
 PKGNAMESUFFIX?=	-server
diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile
index 7d478c981965..1a5c37cbaeb9 100644
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	firebird
 PORTVERSION=	2.5.0
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.0//}-Release/
 PKGNAMESUFFIX?=	-server
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 031bf88a4140..8c6d4972a77b 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -109,7 +109,7 @@ USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS+=--with-icu
 PATCH_SITES+=	http://people.freebsd.org/~girgen/postgresql-icu/:icu
 PATCHFILES+=	pg-840-icu-2009-09-15.diff.gz:icu
-LIB_DEPENDS+=	icudata.46:${PORTSDIR}/devel/icu
+LIB_DEPENDS+=	icudata.48:${PORTSDIR}/devel/icu
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
 .  endif
 
diff --git a/databases/postgresql84-server/files/extra-patch-icu4 b/databases/postgresql84-server/files/extra-patch-icu4
index b152713c62ec..278f9d035d93 100644
--- a/databases/postgresql84-server/files/extra-patch-icu4
+++ b/databases/postgresql84-server/files/extra-patch-icu4
@@ -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_46, [], [
++  AC_CHECK_LIB(icui18n, ucol_open_48, [], [
 +    AC_CHECK_LIB(icui18n, ucol_open_44, [], [
 +      AC_CHECK_LIB(icui18n, ucol_open_43, [], [
 +        AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
@@ -23,7 +23,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_46, [], [
++  AC_CHECK_LIB(icuuc, ucnv_fromUChars_48, [], [
 +    AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
 +      AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
 +        AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index fc1857d300bb..5e702a374a7b 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -109,7 +109,7 @@ USE_AUTOTOOLS=	autoconf
 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
+LIB_DEPENDS+=	icudata.48:${PORTSDIR}/devel/icu
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
 .  endif
 
diff --git a/databases/postgresql90-server/files/extra-patch-icu4 b/databases/postgresql90-server/files/extra-patch-icu4
index bf28a732a2bd..046200311185 100644
--- a/databases/postgresql90-server/files/extra-patch-icu4
+++ b/databases/postgresql90-server/files/extra-patch-icu4
@@ -12,7 +12,7 @@
 -           ])
 -        ])
 -     ])
-+  AC_CHECK_LIB(icui18n, ucol_open_46, [], [
++  AC_CHECK_LIB(icui18n, ucol_open_48, [], [
 +    AC_CHECK_LIB(icui18n, ucol_open_44, [], [
 +       AC_CHECK_LIB(icui18n, ucol_open_43, [], [
 +          AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
@@ -31,7 +31,7 @@
 -           ])
 -        ])
 -     ])
-+  AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
++  AC_CHECK_LIB(icuuc, ucnv_fromUChars_48, [], [
 +    AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
 +       AC_CHECK_LIB(icuuc, ucnv_fromUChars_43, [], [
 +          AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [