diff options
| author | Palle Girgensohn <girgen@FreeBSD.org> | 2014-02-10 16:32:40 +0000 |
|---|---|---|
| committer | Palle Girgensohn <girgen@FreeBSD.org> | 2014-02-10 16:32:40 +0000 |
| commit | 2999fc98f0eabf2b12f5e5565d294a1332facc84 (patch) | |
| tree | d0bbc22683316b2e1add863024de4c53c6891bae /databases/postgresql84-server | |
| parent | 5670c3c9e92bd19b510b652e911d21fde727830f (diff) | |
Notes
Diffstat (limited to 'databases/postgresql84-server')
| -rw-r--r-- | databases/postgresql84-server/Makefile | 3 | ||||
| -rw-r--r-- | databases/postgresql84-server/distinfo | 4 | ||||
| -rw-r--r-- | databases/postgresql84-server/files/extra-patch-icu4 | 42 |
3 files changed, 3 insertions, 46 deletions
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 4fb402a23c02..3d8cf29c70d1 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -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 diff --git a/databases/postgresql84-server/distinfo b/databases/postgresql84-server/distinfo index 57893778b84b..b5abfb57302e 100644 --- a/databases/postgresql84-server/distinfo +++ b/databases/postgresql84-server/distinfo @@ -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 diff --git a/databases/postgresql84-server/files/extra-patch-icu4 b/databases/postgresql84-server/files/extra-patch-icu4 deleted file mode 100644 index 1dd391bdd868..000000000000 --- a/databases/postgresql84-server/files/extra-patch-icu4 +++ /dev/null @@ -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 - |