diff options
| -rw-r--r-- | databases/postgresql81-server/Makefile | 6 | ||||
| -rw-r--r-- | databases/postgresql81-server/distinfo | 7 | ||||
| -rw-r--r-- | databases/postgresql81-server/files/extra-patch-icu4 | 40 |
3 files changed, 45 insertions, 8 deletions
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile index 912902d4da58..072c9e695e81 100644 --- a/databases/postgresql81-server/Makefile +++ b/databases/postgresql81-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -PORTVERSION?= 8.1.22 -PORTREVISION?= 1 +PORTVERSION?= 8.1.23 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${PORTVERSION} @@ -110,6 +109,7 @@ CONFIGURE_ARGS+=--with-icu LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= pg-8121-icu-xx-2010-05-14.diff.gz:icu +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4 . endif PATCH_DIST_STRIP=-p1 @@ -274,7 +274,7 @@ post-patch: . if defined(WITH_ICU) || defined(WITH_ICU4) #m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.62], [], [m4_fatal([Autoconf version 2.59 or 2.62 is required. @${REINPLACE_CMD} -E -e \ - "s|^(m4_.*)2.6[0-9](.*Autoconf version.*)2.6[0-9]|\1${AUTOCONF_VERSION:S/2/2./}\2${AUTOCONF_VERSION:S/2/2./}|g" \ + "s|^(m4_.*)2.6[0-9](.*Autoconf version.*)2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \ ${WRKSRC}/configure.in . endif diff --git a/databases/postgresql81-server/distinfo b/databases/postgresql81-server/distinfo index a8d5df502f6f..dd3a8960037a 100644 --- a/databases/postgresql81-server/distinfo +++ b/databases/postgresql81-server/distinfo @@ -1,9 +1,6 @@ -MD5 (postgresql/postgresql-8.1.22.tar.bz2) = 51bede633280d1d34a98207d6b44ab0f -SHA256 (postgresql/postgresql-8.1.22.tar.bz2) = a01e6baa2ee08868f5318cdaec592d8ca68b5a8ef956b8304a07b3a1c208fefc -SIZE (postgresql/postgresql-8.1.22.tar.bz2) = 11905401 -MD5 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 15916bf13b99702599ce70b6475f7d86 +SHA256 (postgresql/postgresql-8.1.23.tar.bz2) = 5a79eb814b4933f95deb704dfbbd6e1966b520ec12b8f4b48bcea9c3266c10ea +SIZE (postgresql/postgresql-8.1.23.tar.bz2) = 11920401 SHA256 (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 14ecc3809ce69f47c3460efee3fc7fce78f68802936650fc4e1132adffd41d1e SIZE (postgresql/hier-Pg8.1.2-0.5.5.diff.gz) = 31203 -MD5 (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = af4e5f16bfc60a9e98d18f1f7c8d76e7 SHA256 (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = 4a5f4751599bd56144e598bce75f7a970e12d82f9300d36859f544083cf90a56 SIZE (postgresql/pg-8121-icu-xx-2010-05-14.diff.gz) = 4271 diff --git a/databases/postgresql81-server/files/extra-patch-icu4 b/databases/postgresql81-server/files/extra-patch-icu4 new file mode 100644 index 000000000000..39b903b34825 --- /dev/null +++ b/databases/postgresql81-server/files/extra-patch-icu4 @@ -0,0 +1,40 @@ +--- configure.in.orig 2010-12-17 10:44:30.756396179 +0100 ++++ configure.in 2010-12-17 10:45:13.119579646 +0100 +@@ -703,19 +703,27 @@ + fi + + if test "$with_icu" = yes ; then +- 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_46, [], [ ++ 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_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_46, [], [ ++ 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 + |