ports/143841: [PATCH] databases/postgresql84-server: [ADD ICU43]

[Andrei Lavreniyuk]

>Number:         143841
>Category:       ports
>Synopsis:       [PATCH] databases/postgresql84-server: [ADD ICU43]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Fri Feb 12 13:40:05 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Andrei Lavreniyuk
>Release:        FreeBSD 8.0-STABLE
>Organization:
Technica-03, Inc.
>Environment:
FreeBSD datacenter.technica-03.local 8.0-STABLE FreeBSD 8.0-STABLE #0: Mon Feb  1 18:17:08 EET 2010     root at datacenter.technica-03.local:/usr/obj/usr/src/sys/SMP64  amd64
>Description:


  Add ICU43
>How-To-Repeat:

>Fix:

Patch for - pg-840-icu-2009-09-15.diff


--- configure.in.orig   2009-12-10 04:56:54.000000000 +0200
+++ configure.in        2010-02-12 14:50:05.000000000 +0200
@@ -19,7 +19,7 @@

 AC_INIT([PostgreSQL], [8.4.2], [pgsql-bugs at postgresql.org])

-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.61], [], [m4_fatal([Autoconf version 2.61 is required.
+m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.62], [], [m4_fatal([Autoconf version 2.62 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.])])
@@ -687,6 +687,16 @@


 #
+# ICU
+#
+AC_MSG_CHECKING([whether to build with ICU support])
+PGAC_ARG_BOOL(with, icu, no, [  --with-icu              build with ICU support],
+              [AC_DEFINE([USE_ICU], 1, [Define to build with ICU support. (--with-icu)])])
+AC_MSG_RESULT([$with_icu])
+AC_SUBST(with_icu)
+
+
+#
 # Readline
 #
 PGAC_ARG_BOOL(with, readline, yes,
@@ -934,6 +944,23 @@
   fi
 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(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
+
 if test "$with_pam" = yes ; then
   AC_CHECK_LIB(pam,    pam_start, [], [AC_MSG_ERROR([library 'pam' is required for PAM])])
 fi
@@ -1031,6 +1058,10 @@
   AC_CHECK_FUNCS([ERR_set_mark])
 fi

+if test "$with_icu" = yes ; then
+  AC_CHECK_HEADER(unicode/utypes.h, [], [AC_MSG_ERROR([header file <unicode/utypes.h> is required for ICU])])
+fi
+
 if test "$with_pam" = yes ; then
   AC_CHECK_HEADERS(security/pam_appl.h, [],
                    [AC_CHECK_HEADERS(pam/pam_appl.h, [],



Patch attached with submission follows:

diff -ruN postgresql84-server.bak/Makefile postgresql84-server/Makefile
--- postgresql84-server.bak/Makefile	2010-02-03 16:19:00.000000000 +0200
+++ postgresql84-server/Makefile	2010-02-12 14:55:38.000000000 +0200
@@ -93,16 +93,15 @@
 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+=	SYSTEM_ICU "Use ICU 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(SERVER_ONLY) && defined(WITH_SYSTEM_ICU)) || 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
 .  endif
diff -ruN postgresql84-server.bak/distinfo postgresql84-server/distinfo
--- postgresql84-server.bak/distinfo	2010-02-03 16:19:00.000000000 +0200
+++ postgresql84-server/distinfo	2010-02-12 15:18:08.000000000 +0200
@@ -1,6 +1,6 @@
 MD5 (postgresql/postgresql-8.4.2.tar.bz2) = d738227e2f1f742d2f2d4ab56496c5c6
 SHA256 (postgresql/postgresql-8.4.2.tar.bz2) = adb3c5c90396195d76e986f835c2bd0e0dad438f91f4dc2b62048caf6d9869f2
 SIZE (postgresql/postgresql-8.4.2.tar.bz2) = 13600699
-SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e
-MD5 (postgresql/pg-840-icu-2009-09-15.diff.gz) = 2b81134b462e01623bc9387fe4de7136
-SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321
+MD5 (postgresql/pg-840-icu-2009-09-15.diff.gz) = 1bf8c8723d5d85b610733f52e89d88c6
+SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = 1feb4184472b96ec9e76c4652123a6891273cd4d5c1ef0c0a5343a30d813abe8
+SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4336


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