ports/153197: databases/portgresql84-server: configure borken WITH_ICU after ICU upgrade

[Barbara]

>Number:         153197
>Category:       ports
>Synopsis:       databases/portgresql84-server: configure borken WITH_ICU after ICU upgrade
>Confidential:   no
>Severity:       serious
>Priority:       high
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Thu Dec 16 02:40:10 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Barbara
>Release:        RELENG_8
>Organization:
>Environment:
FreeBSD satanasso.local.net 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Thu Dec  2 02:11:02 CET 2010     root at satanasso.local.net:/usr/obj/usr/src/sys/SATANASSO  i386

>Description:
After the update of devel/icu (pr=152940), I tried to update postgresql84-server as suggested.
Anyway the configure script is failing using when the ICU knob is set:

checking for ucol_open_3_8 in -licui18n... no
checking for ucol_open_3_6 in -licui18n... no
checking for ucol_open_3_4 in -licui18n... no
configure: error: library 'icui18n' is required for ICU
===>  Script "configure" failed unexpectedly.
Please report the problem to girgen at FreeBSD.org [maintainer] and attach the
"/usr/ports/databases/postgresql84-server/work/postgresql-8.4.5/config.log"
including the output of the failure of your make command. Also, it might be
a good idea to provide an overview of all packages installed on your system
(e.g. an `ls /var/db/pkg`).

>How-To-Repeat:
portupgrade devel/icu
cd /usr/ports/databases/portgresql84-server
make config      -> check ICU knob
make configure

>Fix:
I wrote a patch for the Makefile and a new patch to put in files/

Notes:
- probably the same should be done for the other postgresql versions in ports tree
- maybe the patch file pg-840-icu-2009-09-15.diff.gz should be refreshed, at least for the configure.in part, as it requires a lot of extra patching (I also reported a problem after m4 update)
- does it builds and works using ICU4?
- I'm not sure how to use diff for a new file, so I', attaching a shar with the diff for Makefile and the new file files/extra-patch-icu, but it was rejected because of wrong content type. So I postfixed .txt to the name of the file

Patch attached with submission follows:

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	files/extra-patch-icu
#	patch.txt
#
echo x - files/extra-patch-icu
sed 's/^X//' >files/extra-patch-icu << 'c0c0707f6854f11669d7ad4b5764b0b3'
X--- configure.in.orig	2010-12-16 02:47:58.000000000 +0100
X+++ configure.in	2010-12-16 02:50:14.000000000 +0100
X@@ -945,16 +945,8 @@
X fi
X 
X if test "$with_icu" = yes ; then
X-  AC_CHECK_LIB(icui18n, ucol_open_3_8, [], [
X-     AC_CHECK_LIB(icui18n, ucol_open_3_6, [], [
X-        AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
X-   ])
X-  ])
X-  AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_8, [], [
X-     AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_6, [], [
X-        AC_CHECK_LIB(icuuc, ucnv_fromUChars_3_4, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
X-   ])
X-  ])
X+  AC_CHECK_LIB(icui18n, ucol_open_46, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])])
X+  AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [AC_MSG_ERROR([library 'icuuc' is required for ICU])])
X fi
X 
X if test "$with_pam" = yes ; then
c0c0707f6854f11669d7ad4b5764b0b3
echo x - patch.txt
sed 's/^X//' >patch.txt << '155de78ca87a0f720a4ce91f118203a5'
X--- Makefile.orig	2010-12-15 12:37:46.000000000 +0100
X+++ Makefile	2010-12-16 03:00:48.000000000 +0100
X@@ -7,7 +7,7 @@
X 
X PORTNAME?=	postgresql
X DISTVERSION?=	8.4.5
X-PORTREVISION?=	2
X+PORTREVISION?=	3
X CATEGORIES?=	databases
X MASTER_SITES=	${MASTER_SITE_PGSQL}
X MASTER_SITE_SUBDIR=	source/v${DISTVERSION}
X@@ -118,6 +118,7 @@
X EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu4
X .   else
X LIB_DEPENDS+=	icudata.46:${PORTSDIR}/devel/icu
X+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-icu
X .   endif
X .  endif
X 
155de78ca87a0f720a4ce91f118203a5
exit



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