mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-02 06:03:50 +00:00
Code Issues Releases Activity

Fix build with ICU4 option after ICU 4.4 update

Browse Source 
PR:		ports/148837
Approved by:	maintainer (timeout)
This commit is contained in:
Martin Matuska 2010-08-05 21:37:28 +00:00
parent bb1ea6a8c1
commit 5382cf6af4
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=258829
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/postgresql84-server/Makefile
View File

@ -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 @@ CONFIGURE_ARGS+=--with-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
LIB_DEPENDS+= icudata.44:${PORTSDIR}/devel/icu4
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4
. else
LIB_DEPENDS+= icudata.38:${PORTSDIR}/devel/icu

4
databases/postgresql84-server/files/extra-patch-icu4
View File

@ -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])])