diff options
| author | mm <mm@FreeBSD.org> | 2010-03-26 06:58:11 +0800 |
|---|---|---|
| committer | mm <mm@FreeBSD.org> | 2010-03-26 06:58:11 +0800 |
| commit | 0dad3a58ebf39db1b071326e5aacba020e0f999b (patch) | |
| tree | a28d1331773915a4b3142c3d2e7d98fad271da33 /databases/postgresql84-server | |
| parent | c740f38dda35210c83c2e54f5364ff5524b5cdef (diff) | |
| download | freebsd-ports-gnome-0dad3a58ebf39db1b071326e5aacba020e0f999b.tar.gz freebsd-ports-gnome-0dad3a58ebf39db1b071326e5aacba020e0f999b.tar.zst freebsd-ports-gnome-0dad3a58ebf39db1b071326e5aacba020e0f999b.zip | |
- Add ICU 4.x support
- Bump PORTREVISION
PR: ports/143841
Submitted by: Andrei Lavreniyuk <andy.lavr@reactor-xg.kiev.ua>
Approved by: maintainer (timeout)
Diffstat (limited to 'databases/postgresql84-server')
| -rw-r--r-- | databases/postgresql84-server/Makefile | 17 | ||||
| -rw-r--r-- | databases/postgresql84-server/files/extra-patch-icu4 | 30 |
2 files changed, 44 insertions, 3 deletions
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile index 9f4c8b5faeb3..dd57c0036363 100644 --- a/databases/postgresql84-server/Makefile +++ b/databases/postgresql84-server/Makefile @@ -7,6 +7,7 @@ PORTNAME?= postgresql DISTVERSION?= 8.4.3 +PORTREVISION?= 1 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_PGSQL} MASTER_SITE_SUBDIR= source/v${DISTVERSION} @@ -92,18 +93,28 @@ OPTIONS+= TZDATA "Use internal timezone database (server)" on OPTIONS+= DEBUG "Builds with debugging symbols" off # See http://people.freebsd.org/~girgen/postgresql-icu/README.html for more info -OPTIONS+= ICU "Use ICU for unicode collation (server)" off +OPTIONS+= ICU "Use ICU 3.x for unicode collation (server)" off +OPTIONS+= ICU4 "Use ICU 4.x 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(SERVER_ONLY) && defined(WITH_ICU)) || make(makesum) +. 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) USE_AUTOTOOLS= autoconf:262 CONFIGURE_ARGS+=--with-icu -LIB_DEPENDS= icudata:${PORTSDIR}/devel/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.43:${PORTSDIR}/devel/icu4 +EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4 +. else +LIB_DEPENDS+= icudata.38:${PORTSDIR}/devel/icu +. endif . endif PATCH_DIST_STRIP=-p1 diff --git a/databases/postgresql84-server/files/extra-patch-icu4 b/databases/postgresql84-server/files/extra-patch-icu4 new file mode 100644 index 000000000000..28c8a8cfff33 --- /dev/null +++ b/databases/postgresql84-server/files/extra-patch-icu4 @@ -0,0 +1,30 @@ +--- configure.in.orig 2010-03-25 22:25:10.655197193 +0100 ++++ configure.in 2010-03-25 22:25:13.611658318 +0100 +@@ -945,15 +945,19 @@ + 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_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_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 + |