diff options
| -rw-r--r-- | databases/postgresql83-server/Makefile | 5 | ||||
| -rw-r--r-- | databases/postgresql83-server/distinfo | 6 | ||||
| -rw-r--r-- | databases/postgresql83-server/files/extra-patch-icu4 | 49 |
3 files changed, 53 insertions, 7 deletions
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile index 286cd08b9d3d..cff33fcbcf03 100644 --- a/databases/postgresql83-server/Makefile +++ b/databases/postgresql83-server/Makefile @@ -6,8 +6,7 @@ # PORTNAME?= postgresql -DISTVERSION?= 8.3.12 -PORTREVISION?= 2 +DISTVERSION?= 8.3.13 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -108,6 +107,7 @@ CONFIGURE_ARGS+=--with-icu LIB_DEPENDS= icudata:${PORTSDIR}/devel/icu PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= pg-8311-icu-xx-2010-05-14.diff.gz:icu +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4 . endif PATCH_DIST_STRIP=-p1 @@ -285,7 +285,6 @@ post-patch: . if defined(WITH_ICU) @${REINPLACE_CMD} -E -e \ "s|^(m4_if.*)2.6[0-9](.*Autoconf version )2.6[0-9]|\1${AUTOCONF_VERSION}\2${AUTOCONF_VERSION}|g" \ - -e "s|_43|_46|g" \ ${WRKSRC}/configure.in . endif diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo index 1918dafabeed..8848a73f2add 100644 --- a/databases/postgresql83-server/distinfo +++ b/databases/postgresql83-server/distinfo @@ -1,6 +1,4 @@ -MD5 (postgresql/postgresql-8.3.12.tar.bz2) = 6fcb02cd24b6bc25f2e2fb950c6a5d9e -SHA256 (postgresql/postgresql-8.3.12.tar.bz2) = 596bd677dee6153ddc42391b33b6346ebc86f60f8d935fedff775ed46d02f070 -SIZE (postgresql/postgresql-8.3.12.tar.bz2) = 14273431 -MD5 (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 43fd07e87e9ecff2aa09b134408bdcb5 +SHA256 (postgresql/postgresql-8.3.13.tar.bz2) = 192ece18834af0fe001e11794df1bc266b056050d3c74804c6c0442c7f99d4fc +SIZE (postgresql/postgresql-8.3.13.tar.bz2) = 14337117 SHA256 (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 44146bdb29a5a7d51c70911096ed6d265bdf09f74f0084ee7ad1883bea2f852a SIZE (postgresql/pg-8311-icu-xx-2010-05-14.diff.gz) = 5064 diff --git a/databases/postgresql83-server/files/extra-patch-icu4 b/databases/postgresql83-server/files/extra-patch-icu4 new file mode 100644 index 000000000000..2c5ca8e56e51 --- /dev/null +++ b/databases/postgresql83-server/files/extra-patch-icu4 @@ -0,0 +1,49 @@ +--- configure.in.orig 2010-12-17 11:17:22.892862951 +0100 ++++ configure.in 2010-12-17 11:17:59.498605923 +0100 +@@ -19,7 +19,7 @@ + + AC_INIT([PostgreSQL], [8.3.13], [pgsql-bugs@postgresql.org]) + +-m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.62], [], [m4_fatal([Autoconf version 2.62 is required. ++m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.68], [], [m4_fatal([Autoconf version 2.68 is required. + 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 @@ + 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 + |