1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

Chase ICU update

This commit is contained in:
Palle Girgensohn 2014-02-10 16:32:40 +00:00
parent 5670c3c9e9
commit 2999fc98f0
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=343650
11 changed files with 14 additions and 107 deletions

View File

@ -20,7 +20,7 @@ CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R:R}]?-client* \
WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION}
DIST_SUBDIR= postgresql
ICU_PATCHFILE?= pg-840-icu-2009-09-15.diff.gz
ICU_PATCHFILE?= pg-8419-icu-2014-02-10.diff.gz
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}
@ -128,7 +128,6 @@ CONFIGURE_ARGS+=--with-icu
PATCH_SITES+= http://people.freebsd.org/~crees/postgresql-icu/:icu
PATCHFILES+= ${ICU_PATCHFILE}:icu
LIB_DEPENDS+= libicudata.so:${PORTSDIR}/devel/icu
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4
. endif
.endif # !SLAVE_ONLY

View File

@ -1,4 +1,4 @@
SHA256 (postgresql/postgresql-8.4.19.tar.bz2) = f744d04a5d9feeea516fa57fea92be5568527bab03a84cf660a06ce90f90dcea
SIZE (postgresql/postgresql-8.4.19.tar.bz2) = 14825794
SHA256 (postgresql/pg-840-icu-2009-09-15.diff.gz) = c09d3b59340a3bb6ea754e985739d4fbb47f730d1e48a357c5585825034fc72e
SIZE (postgresql/pg-840-icu-2009-09-15.diff.gz) = 4321
SHA256 (postgresql/pg-8419-icu-2014-02-10.diff.gz) = a67fc17ef9985200cd25d6d534338305978496ea13d86fc6d1f6125d36ecf78f
SIZE (postgresql/pg-8419-icu-2014-02-10.diff.gz) = 4440

View File

@ -1,42 +0,0 @@
--- configure.in.orig 2010-12-17 10:28:46.362381801 +0100
+++ configure.in 2010-12-17 10:31:27.692004326 +0100
@@ -945,15 +945,31 @@
fi
if test "$with_icu" = yes ; then
- 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_52, [], [
+ AC_CHECK_LIB(icui18n, ucol_open_48, [], [
+ 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_52, [], [
+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_48, [], [
+ 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

View File

@ -7,7 +7,7 @@ PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${COMPONENT}
MAINTAINER?= pgsql@FreeBSD.org
ICU_PATCHFILE?= pg-900-icu-2010-09-19.diff.gz
ICU_PATCHFILE?= pg-9015-icu-2014-02-10.diff.gz
ICU_EXTRAPATCH= ${FILESDIR}/extra-patch-icu4
BUILD_DIRS?= src/timezone src/backend src/backend/utils/mb/conversion_procs \
src/backend/snowball src/backend/replication/libpqwalreceiver \

View File

@ -1,4 +1,4 @@
SHA256 (postgresql/postgresql-9.0.15.tar.bz2) = a45acd27d546e425911ecd371247066be5dafd96304e50e0708c84b918c28f9d
SIZE (postgresql/postgresql-9.0.15.tar.bz2) = 15169745
SHA256 (postgresql/pg-900-icu-2010-09-19.diff.gz) = 27cea46241ec814965c278330cd96f67ee03422b7758a210713a63b4b5bb77e9
SIZE (postgresql/pg-900-icu-2010-09-19.diff.gz) = 4349
SHA256 (postgresql/pg-9015-icu-2014-02-10.diff.gz) = ee4a9a9cac56842ed532597f3e9e52ca2363f809a9283c01b2514df19173763a
SIZE (postgresql/pg-9015-icu-2014-02-10.diff.gz) = 4386

View File

@ -1,50 +0,0 @@
--- configure.in.orig 2010-12-17 10:24:25.585364941 +0100
+++ configure.in 2010-12-17 10:25:08.921592644 +0100
@@ -947,23 +947,31 @@
fi
if test "$with_icu" = yes ; then
- 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(icui18n, ucol_open_52, [], [
+ AC_CHECK_LIB(icui18n, ucol_open_48, [], [
+ 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_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])])
- ])
- ])
- ])
+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_52, [], [
+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_48, [], [
+ 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

View File

@ -20,7 +20,7 @@ CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R:R}]?-client* \
WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION}
DIST_SUBDIR= postgresql
ICU_PATCHFILE?= pg-910-icu-2012-12-19.diff.gz
ICU_PATCHFILE?= pg-923-icu-2014-02-10.diff.gz
.if !defined(SLAVE_ONLY)
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}

View File

@ -1,4 +1,4 @@
SHA256 (postgresql/postgresql-9.1.11.tar.bz2) = ccbc35aae1490ee5878b97a6aea48dad7465cdad296b380542e4303b68cc6f74
SIZE (postgresql/postgresql-9.1.11.tar.bz2) = 15861805
SHA256 (postgresql/pg-910-icu-2012-12-19.diff.gz) = 61ef9c9b55b63b63b0fb108dfef086f92e9c43b5bd934fab9639b31f91193611
SIZE (postgresql/pg-910-icu-2012-12-19.diff.gz) = 4386
SHA256 (postgresql/pg-923-icu-2014-02-10.diff.gz) = c7ca70433c819cea5fef0a9448da236b175d910177b18a8cb2ed9012a949aeb1
SIZE (postgresql/pg-923-icu-2014-02-10.diff.gz) = 4374

View File

@ -20,7 +20,7 @@ CONFLICTS?= ${PORTNAME}[^${PORTVERSION:R:R}]?-client* \
WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION}
DIST_SUBDIR= postgresql
ICU_PATCHFILE?= pg-910-icu-2012-12-19.diff.gz
ICU_PATCHFILE?= pg-923-icu-2014-02-10.diff.gz
.if !defined(SLAVE_ONLY)
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}

View File

@ -1,4 +1,4 @@
SHA256 (postgresql/postgresql-9.2.6.tar.bz2) = 4ba98053a66e5678af93dbc2956e8b04623f759e174f48940c41f4251cf0f886
SIZE (postgresql/postgresql-9.2.6.tar.bz2) = 16491820
SHA256 (postgresql/pg-910-icu-2012-12-19.diff.gz) = 61ef9c9b55b63b63b0fb108dfef086f92e9c43b5bd934fab9639b31f91193611
SIZE (postgresql/pg-910-icu-2012-12-19.diff.gz) = 4386
SHA256 (postgresql/pg-923-icu-2014-02-10.diff.gz) = c7ca70433c819cea5fef0a9448da236b175d910177b18a8cb2ed9012a949aeb1
SIZE (postgresql/pg-923-icu-2014-02-10.diff.gz) = 4374

View File

@ -1,4 +1,4 @@
SHA256 (postgresql/postgresql-9.3.2.tar.bz2) = 700da51a71857e092f6af1c85fcd86b46d7d5cd2f2ba343cafb1f206c20232d7
SIZE (postgresql/postgresql-9.3.2.tar.bz2) = 16878364
SHA256 (postgresql/pg-910-icu-2012-12-19.diff.gz) = 61ef9c9b55b63b63b0fb108dfef086f92e9c43b5bd934fab9639b31f91193611
SIZE (postgresql/pg-910-icu-2012-12-19.diff.gz) = 4386
SHA256 (postgresql/pg-923-icu-2014-02-10.diff.gz) = c7ca70433c819cea5fef0a9448da236b175d910177b18a8cb2ed9012a949aeb1
SIZE (postgresql/pg-923-icu-2014-02-10.diff.gz) = 4374