diff options
| author | mm <mm@FreeBSD.org> | 2010-08-06 05:37:28 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2010-08-06 05:37:28 +0800 |
| commit | 42b16c4455ddd935ae60ce88ee981c74c0829583 (patch) | |
| tree | fc07bff0b44ec1de60daf2abbdfbbf1c1bcd2744 /databases | |
| parent | 84b05469102685e6cbbd211655b2f4abec1506cb (diff) | |
| download | freebsd-ports-gnome-42b16c4455ddd935ae60ce88ee981c74c0829583.tar.gz freebsd-ports-gnome-42b16c4455ddd935ae60ce88ee981c74c0829583.tar.zst freebsd-ports-gnome-42b16c4455ddd935ae60ce88ee981c74c0829583.zip | |
Fix build with ICU4 option after ICU 4.4 update
PR: ports/148837
Approved by: maintainer (timeout)
Diffstat (limited to 'databases')
| -rw-r--r-- | databases/postgresql84-server/Makefile | 4 | ||||
| -rw-r--r-- | databases/postgresql84-server/files/extra-patch-icu4 | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index c8341d32cd6a..73324cafe131 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -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 diff --git a/databases/postgresql84-server/files/extra-patch-icu4 b/databases/postgresql84-server/files/extra-patch-icu4 index 28c8a8cfff33..9eda633fda4a 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_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])]) |