diff options
author | Martin Matuska <mm@FreeBSD.org> | 2010-12-31 09:56:15 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2010-12-31 09:56:15 +0000 |
commit | d765c72be948bdc65532c7db715b01e0bb3cc186 (patch) | |
tree | 2cf7895c5408c05f52014cd6a6385be1dd07e219 /databases/postgresql84-server/files | |
parent | - Update to 8.3.13 (diff) |
- Update to 8.4.6
- Unify ICU handling
PR: ports/153245
Approved by: maintainer (timeout)
Notes
Notes:
svn path=/head/; revision=267207
Diffstat (limited to 'databases/postgresql84-server/files')
-rw-r--r-- | databases/postgresql84-server/files/extra-patch-icu4 | 30 |
1 files changed, 19 insertions, 11 deletions
diff --git a/databases/postgresql84-server/files/extra-patch-icu4 b/databases/postgresql84-server/files/extra-patch-icu4 index f233b8889778..b152713c62ec 100644 --- a/databases/postgresql84-server/files/extra-patch-icu4 +++ b/databases/postgresql84-server/files/extra-patch-icu4 @@ -1,6 +1,6 @@ ---- 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 @@ +--- configure.in.orig 2010-12-17 10:28:46.362381801 +0100 ++++ configure.in 2010-12-17 10:31:27.692004326 +0100 +@@ -945,15 +945,27 @@ fi if test "$with_icu" = yes ; then @@ -9,22 +9,30 @@ - AC_CHECK_LIB(icui18n, ucol_open_3_4, [], [AC_MSG_ERROR([library 'icui18n' is required for ICU])]) - ]) + AC_CHECK_LIB(icui18n, ucol_open_46, [], [ -+ 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_44, [], [ ++ 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_46, [], [ -+ 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_44, [], [ ++ 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 |