diff options
Diffstat (limited to 'databases/postgresql84-server')
| -rw-r--r-- | databases/postgresql84-server/Makefile | 17 | ||||
| -rw-r--r-- | databases/postgresql84-server/files/extra-patch-icu4 | 4 |
2 files changed, 6 insertions, 15 deletions
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index df3d2dbddb02..fdd1e474d77e 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -97,28 +97,19 @@ OPTIONS+= DEBUG "Builds with debugging symbols" off OPTIONS+= GSSAPI "BUild with GSSAPI support" on # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info -OPTIONS+= ICU "Use ICU 4.6 for unicode collation (server)" off -OPTIONS+= ICU4 "Use ICU 4.4 for unicode collation (server)" off +OPTIONS+= ICU "Use ICU for unicode collation (server)" off # See http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/76999 for more info # (requires dump/restore if modified.) OPTIONS+= INTDATE "Builds with 64-bit date/time type (server)" on -. if defined(WITH_ICU) && defined(WITH_ICU4) -IGNORE= options WITH_ICU and WITH_ICU4 are mutually exclusive -. endif - -. if (defined(SERVER_ONLY) && (defined(WITH_ICU) || defined(WITH_ICU4))) || make(makesum) +. if (defined(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum) USE_AUTOTOOLS= autoconf CONFIGURE_ARGS+=--with-icu PATCH_SITES+= http://people.freebsd.org/~girgen/postgresql-icu/:icu PATCHFILES+= pg-840-icu-2009-09-15.diff.gz:icu -. if defined(WITH_ICU4) -LIB_DEPENDS+= icudata.44:${PORTSDIR}/devel/icu4 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4 -. else LIB_DEPENDS+= icudata.46:${PORTSDIR}/devel/icu -. endif +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4 . endif PATCH_DIST_STRIP=-p1 @@ -295,7 +286,7 @@ pre-su-install: .if !defined(NO_BUILD) post-patch: @${REINPLACE_CMD} s/@PTHREAD_LIBS@// ${WRKSRC}/src/Makefile.global.in -. if defined(WITH_ICU) || defined(WITH_ICU4) +. 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" \ ${WRKSRC}/configure.in diff --git a/databases/postgresql84-server/files/extra-patch-icu4 b/databases/postgresql84-server/files/extra-patch-icu4 index 9eda633fda4a..f233b8889778 100644 --- a/databases/postgresql84-server/files/extra-patch-icu4 +++ b/databases/postgresql84-server/files/extra-patch-icu4 @@ -8,7 +8,7 @@ - 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_44, [], [ ++ AC_CHECK_LIB(icui18n, ucol_open_46, [], [ + 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])]) @@ -19,7 +19,7 @@ - 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_44, [], [ ++ AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [ + 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])]) |