svn commit: r309246 - in head/databases: postgresql83-server/files postgresql84-server/files postgresql90-server/files postgresql91-server postgresql92-server
Palle Girgensohn
girgen at FreeBSD.org
Wed Dec 19 16:04:01 UTC 2012
Author: girgen
Date: Wed Dec 19 16:03:58 2012
New Revision: 309246
URL: http://svnweb.freebsd.org/changeset/ports/309246
Log:
Chase ICU update to 50
Modified:
head/databases/postgresql83-server/files/extra-patch-icu4
head/databases/postgresql84-server/files/extra-patch-icu4
head/databases/postgresql90-server/files/extra-patch-icu4
head/databases/postgresql91-server/Makefile
head/databases/postgresql91-server/distinfo
head/databases/postgresql92-server/Makefile
head/databases/postgresql92-server/distinfo
Modified: head/databases/postgresql83-server/files/extra-patch-icu4
==============================================================================
--- head/databases/postgresql83-server/files/extra-patch-icu4 Wed Dec 19 16:02:07 2012 (r309245)
+++ head/databases/postgresql83-server/files/extra-patch-icu4 Wed Dec 19 16:03:58 2012 (r309246)
@@ -9,7 +9,7 @@
Untested combinations of 'autoconf' and PostgreSQL versions are not
recommended. You can remove the check from 'configure.in' but it is then
your responsibility whether the result works or not.])])
-@@ -795,19 +795,27 @@
+@@ -795,19 +795,31 @@
fi
if test "$with_icu" = yes ; then
@@ -17,7 +17,8 @@
- 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_48, [], [
++ AC_CHECK_LIB(icui18n, ucol_open_50, [], [
++ 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, [], [
@@ -28,12 +29,14 @@
- ])
+ ])
+ ])
++ ])
])
- 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_48, [], [
++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_50, [], [
++ 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, [], [
@@ -44,6 +47,7 @@
- ])
+ ])
+ ])
++ ])
])
fi
Modified: head/databases/postgresql84-server/files/extra-patch-icu4
==============================================================================
--- head/databases/postgresql84-server/files/extra-patch-icu4 Wed Dec 19 16:02:07 2012 (r309245)
+++ head/databases/postgresql84-server/files/extra-patch-icu4 Wed Dec 19 16:03:58 2012 (r309246)
@@ -1,6 +1,6 @@
--- 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 @@
+@@ -945,15 +945,31 @@
fi
if test "$with_icu" = yes ; then
@@ -8,7 +8,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_48, [], [
++ AC_CHECK_LIB(icui18n, ucol_open_50
++ 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, [], [
@@ -17,13 +18,15 @@
+ ])
+ ])
+ ])
++ ])
+ ])
])
- 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_48, [], [
++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_50, [], [
++ 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, [], [
@@ -33,6 +36,7 @@
+ ])
+ ])
+ ])
++ ])
])
fi
Modified: head/databases/postgresql90-server/files/extra-patch-icu4
==============================================================================
--- head/databases/postgresql90-server/files/extra-patch-icu4 Wed Dec 19 16:02:07 2012 (r309245)
+++ head/databases/postgresql90-server/files/extra-patch-icu4 Wed Dec 19 16:03:58 2012 (r309246)
@@ -1,6 +1,6 @@
--- configure.in.orig 2010-12-17 10:24:25.585364941 +0100
+++ configure.in 2010-12-17 10:25:08.921592644 +0100
-@@ -947,23 +947,27 @@
+@@ -947,23 +947,31 @@
fi
if test "$with_icu" = yes ; then
@@ -12,7 +12,8 @@
- ])
- ])
- ])
-+ AC_CHECK_LIB(icui18n, ucol_open_48, [], [
++ AC_CHECK_LIB(icui18n, ucol_open_50, [], [
++ 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, [], [
@@ -21,6 +22,7 @@
+ ])
+ ])
+ ])
++ ])
+ ])
])
- AC_CHECK_LIB(icuuc, ucnv_fromUChars_44, [], [
@@ -31,7 +33,8 @@
- ])
- ])
- ])
-+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_48, [], [
++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_50, [], [
++ 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, [], [
@@ -40,6 +43,7 @@
+ ])
+ ])
+ ])
++ ])
+ ])
])
fi
Modified: head/databases/postgresql91-server/Makefile
==============================================================================
--- head/databases/postgresql91-server/Makefile Wed Dec 19 16:02:07 2012 (r309245)
+++ head/databases/postgresql91-server/Makefile Wed Dec 19 16:03:58 2012 (r309246)
@@ -21,7 +21,7 @@ CONFLICTS?= ${PORTNAME}-client-[^${PORTV
WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION}
DIST_SUBDIR= postgresql
-ICU_PATCHFILE?= pg-910-icu-2011-09-22.diff.gz
+ICU_PATCHFILE?= pg-910-icu-2012-12-19.diff.gz
.if !defined(SLAVE_ONLY)
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}
@@ -128,7 +128,7 @@ CONFIGURE_ARGS+=--with-openssl
. if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum)
USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS+=--with-icu
-PATCH_SITES+= http://people.freebsd.org/~crees/patches/postgresql-icu/:icu
+PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
PATCHFILES+= ${ICU_PATCHFILE}:icu
. if defined(ICU_EXTRAPATCH)
EXTRA_PATCHES+= ${ICU_EXTRAPATCH}
Modified: head/databases/postgresql91-server/distinfo
==============================================================================
--- head/databases/postgresql91-server/distinfo Wed Dec 19 16:02:07 2012 (r309245)
+++ head/databases/postgresql91-server/distinfo Wed Dec 19 16:03:58 2012 (r309246)
@@ -1,4 +1,4 @@
SHA256 (postgresql/postgresql-9.1.7.tar.bz2) = df19eaa98e6065034401b312f476ab4d3c27d67e0ae5063400eae8b00d333c82
SIZE (postgresql/postgresql-9.1.7.tar.bz2) = 15688516
-SHA256 (postgresql/pg-910-icu-2011-09-22.diff.gz) = a88094ec22a8caeffa06d7c3a6b53d19035b171dad2acb9084da0a617a93e149
-SIZE (postgresql/pg-910-icu-2011-09-22.diff.gz) = 4373
+SHA256 (postgresql/pg-910-icu-2012-12-19.diff.gz) = 61ef9c9b55b63b63b0fb108dfef086f92e9c43b5bd934fab9639b31f91193611
+SIZE (postgresql/pg-910-icu-2012-12-19.diff.gz) = 4386
Modified: head/databases/postgresql92-server/Makefile
==============================================================================
--- head/databases/postgresql92-server/Makefile Wed Dec 19 16:02:07 2012 (r309245)
+++ head/databases/postgresql92-server/Makefile Wed Dec 19 16:03:58 2012 (r309246)
@@ -21,7 +21,7 @@ CONFLICTS?= ${PORTNAME}-client-[^${PORTV
WRKSRC= ${WRKDIR}/postgresql-${DISTVERSION}
DIST_SUBDIR= postgresql
-ICU_PATCHFILE?= pg-910-icu-2011-09-22.diff.gz
+ICU_PATCHFILE?= pg-910-icu-2012-12-19.diff.gz
.if !defined(SLAVE_ONLY)
UNIQUENAME?= ${PORTNAME}${DISTVERSION:R:S/.//}
@@ -127,7 +127,7 @@ CONFIGURE_ARGS+=--with-openssl
. if ( defined(SERVER_ONLY) && ${PORT_OPTIONS:MICU} ) || make(makesum)
USE_AUTOTOOLS= autoconf
CONFIGURE_ARGS+=--with-icu
-PATCH_SITES+= http://people.freebsd.org/~crees/patches/postgresql-icu/:icu
+PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu
PATCHFILES+= ${ICU_PATCHFILE}:icu
. if defined(ICU_EXTRAPATCH)
EXTRA_PATCHES+= ${ICU_EXTRAPATCH}
Modified: head/databases/postgresql92-server/distinfo
==============================================================================
--- head/databases/postgresql92-server/distinfo Wed Dec 19 16:02:07 2012 (r309245)
+++ head/databases/postgresql92-server/distinfo Wed Dec 19 16:03:58 2012 (r309246)
@@ -1,4 +1,4 @@
SHA256 (postgresql/postgresql-9.2.2.tar.bz2) = e1a7a854a98896cb7fcd1696a76fca6f3bcac94d75e68a6154ffe2b69184f7f3
SIZE (postgresql/postgresql-9.2.2.tar.bz2) = 16222148
-SHA256 (postgresql/pg-910-icu-2011-09-22.diff.gz) = a88094ec22a8caeffa06d7c3a6b53d19035b171dad2acb9084da0a617a93e149
-SIZE (postgresql/pg-910-icu-2011-09-22.diff.gz) = 4373
+SHA256 (postgresql/pg-910-icu-2012-12-19.diff.gz) = 61ef9c9b55b63b63b0fb108dfef086f92e9c43b5bd934fab9639b31f91193611
+SIZE (postgresql/pg-910-icu-2012-12-19.diff.gz) = 4386
More information about the svn-ports-all
mailing list