8 files changed, 176 insertions, 12 deletions

diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 9f4c8b5faeb3..dd57c0036363 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	postgresql
 DISTVERSION?=	8.4.3
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -92,18 +93,28 @@ OPTIONS+=	TZDATA "Use internal timezone database (server)" on
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
 
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
-OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
+OPTIONS+=	ICU	"Use ICU 3.x for unicode collation (server)" off
+OPTIONS+=	ICU4	"Use ICU 4.x for unicode collation (server)" off
 
 # 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
 
-.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
+.  if defined(WITH_ICU) && defined(WITH_ICU4)
+IGNORE=		options WITH_ICU and WITH_ICU4 are mutually exclusive
+.  endif
+
+.  if (defined(SERVER_ONLY) && (defined(WITH_ICU) || defined(WITH_ICU4))) || make(makesum)
 USE_AUTOTOOLS=	autoconf:262
 CONFIGURE_ARGS+=--with-icu
-LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 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
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
+.   else
+LIB_DEPENDS+=	icudata.38:${PORTSDIR}/devel/icu
+.   endif
 .  endif
 
 PATCH_DIST_STRIP=-p1
diff --git a/databases/postgresql84-server/files/extra-patch-icu4 b/databases/postgresql84-server/files/extra-patch-icu4
new file mode 100644
index 000000000000..28c8a8cfff33
--- /dev/null
+++ b/databases/postgresql84-server/files/extra-patch-icu4
@@ -0,0 +1,30 @@
+--- configure.in.orig	2010-03-25 22:25:10.655197193 +0100
++++ configure.in	2010-03-25 22:25:13.611658318 +0100
+@@ -945,15 +945,19 @@
+ fi
+ 
+ if test "$with_icu" = yes ; then
+-  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_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_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/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index 9f4c8b5faeb3..dd57c0036363 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	postgresql
 DISTVERSION?=	8.4.3
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -92,18 +93,28 @@ OPTIONS+=	TZDATA "Use internal timezone database (server)" on
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
 
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
-OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
+OPTIONS+=	ICU	"Use ICU 3.x for unicode collation (server)" off
+OPTIONS+=	ICU4	"Use ICU 4.x for unicode collation (server)" off
 
 # 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
 
-.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
+.  if defined(WITH_ICU) && defined(WITH_ICU4)
+IGNORE=		options WITH_ICU and WITH_ICU4 are mutually exclusive
+.  endif
+
+.  if (defined(SERVER_ONLY) && (defined(WITH_ICU) || defined(WITH_ICU4))) || make(makesum)
 USE_AUTOTOOLS=	autoconf:262
 CONFIGURE_ARGS+=--with-icu
-LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 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
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
+.   else
+LIB_DEPENDS+=	icudata.38:${PORTSDIR}/devel/icu
+.   endif
 .  endif
 
 PATCH_DIST_STRIP=-p1
diff --git a/databases/postgresql90-server/files/extra-patch-icu4 b/databases/postgresql90-server/files/extra-patch-icu4
new file mode 100644
index 000000000000..28c8a8cfff33
--- /dev/null
+++ b/databases/postgresql90-server/files/extra-patch-icu4
@@ -0,0 +1,30 @@
+--- configure.in.orig	2010-03-25 22:25:10.655197193 +0100
++++ configure.in	2010-03-25 22:25:13.611658318 +0100
+@@ -945,15 +945,19 @@
+ fi
+ 
+ if test "$with_icu" = yes ; then
+-  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_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_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/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index 9f4c8b5faeb3..dd57c0036363 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	postgresql
 DISTVERSION?=	8.4.3
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -92,18 +93,28 @@ OPTIONS+=	TZDATA "Use internal timezone database (server)" on
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
 
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
-OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
+OPTIONS+=	ICU	"Use ICU 3.x for unicode collation (server)" off
+OPTIONS+=	ICU4	"Use ICU 4.x for unicode collation (server)" off
 
 # 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
 
-.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
+.  if defined(WITH_ICU) && defined(WITH_ICU4)
+IGNORE=		options WITH_ICU and WITH_ICU4 are mutually exclusive
+.  endif
+
+.  if (defined(SERVER_ONLY) && (defined(WITH_ICU) || defined(WITH_ICU4))) || make(makesum)
 USE_AUTOTOOLS=	autoconf:262
 CONFIGURE_ARGS+=--with-icu
-LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 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
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
+.   else
+LIB_DEPENDS+=	icudata.38:${PORTSDIR}/devel/icu
+.   endif
 .  endif
 
 PATCH_DIST_STRIP=-p1
diff --git a/databases/postgresql91-server/files/extra-patch-icu4 b/databases/postgresql91-server/files/extra-patch-icu4
new file mode 100644
index 000000000000..28c8a8cfff33
--- /dev/null
+++ b/databases/postgresql91-server/files/extra-patch-icu4
@@ -0,0 +1,30 @@
+--- configure.in.orig	2010-03-25 22:25:10.655197193 +0100
++++ configure.in	2010-03-25 22:25:13.611658318 +0100
+@@ -945,15 +945,19 @@
+ fi
+ 
+ if test "$with_icu" = yes ; then
+-  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_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_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/Makefile b/databases/postgresql92-server/Makefile
index 9f4c8b5faeb3..dd57c0036363 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME?=	postgresql
 DISTVERSION?=	8.4.3
+PORTREVISION?=	1
 CATEGORIES?=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL}
 MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
@@ -92,18 +93,28 @@ OPTIONS+=	TZDATA "Use internal timezone database (server)" on
 OPTIONS+=	DEBUG "Builds with debugging symbols" off
 
 # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info
-OPTIONS+=	ICU   "Use ICU for unicode collation (server)" off
+OPTIONS+=	ICU	"Use ICU 3.x for unicode collation (server)" off
+OPTIONS+=	ICU4	"Use ICU 4.x for unicode collation (server)" off
 
 # 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
 
-.  if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum)
+.  if defined(WITH_ICU) && defined(WITH_ICU4)
+IGNORE=		options WITH_ICU and WITH_ICU4 are mutually exclusive
+.  endif
+
+.  if (defined(SERVER_ONLY) && (defined(WITH_ICU) || defined(WITH_ICU4))) || make(makesum)
 USE_AUTOTOOLS=	autoconf:262
 CONFIGURE_ARGS+=--with-icu
-LIB_DEPENDS=	icudata:${PORTSDIR}/devel/icu
 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
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
+.   else
+LIB_DEPENDS+=	icudata.38:${PORTSDIR}/devel/icu
+.   endif
 .  endif
 
 PATCH_DIST_STRIP=-p1
diff --git a/databases/postgresql92-server/files/extra-patch-icu4 b/databases/postgresql92-server/files/extra-patch-icu4
new file mode 100644
index 000000000000..28c8a8cfff33
--- /dev/null
+++ b/databases/postgresql92-server/files/extra-patch-icu4
@@ -0,0 +1,30 @@
+--- configure.in.orig	2010-03-25 22:25:10.655197193 +0100
++++ configure.in	2010-03-25 22:25:13.611658318 +0100
+@@ -945,15 +945,19 @@
+ fi
+ 
+ if test "$with_icu" = yes ; then
+-  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_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_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
+