aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorbapt <bapt@FreeBSD.org>2010-12-17 02:47:56 +0800
committerbapt <bapt@FreeBSD.org>2010-12-17 02:47:56 +0800
commit8bd5c04480d2de92fc171aa8541a99d2496eb461 (patch)
tree81af85352b2e1efacea77405781fbd7517b7886e /databases
parent131717cc7a280e2493ae7870180987af59a88916 (diff)
downloadfreebsd-ports-gnome-8bd5c04480d2de92fc171aa8541a99d2496eb461.tar.gz
freebsd-ports-gnome-8bd5c04480d2de92fc171aa8541a99d2496eb461.tar.zst
freebsd-ports-gnome-8bd5c04480d2de92fc171aa8541a99d2496eb461.zip
- Prepare for devel/icu4 deletion
- fix py-icu with icu4.6 - fix portsgresql*server with icu 4.6 - remove now useless icu patch from webkit
Diffstat (limited to 'databases')
-rw-r--r--databases/postgresql83-server/Makefile3
-rw-r--r--databases/postgresql84-server/Makefile17
-rw-r--r--databases/postgresql84-server/files/extra-patch-icu44
-rw-r--r--databases/postgresql90-server/Makefile16
-rw-r--r--databases/postgresql91-server/Makefile16
-rw-r--r--databases/postgresql92-server/Makefile16
6 files changed, 20 insertions, 52 deletions
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index e111cb932dad..286cd08b9d3d 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -282,9 +282,10 @@ 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" \
+ -e "s|_43|_46|g" \
${WRKSRC}/configure.in
. endif
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])])
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index dc3eb4f1c7a1..77abdb59c3d1 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -97,27 +97,18 @@ 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-900-icu-2010-09-19.diff.gz:icu
-. if defined(WITH_ICU4)
-LIB_DEPENDS+= icudata.44:${PORTSDIR}/devel/icu4
-. else
LIB_DEPENDS+= icudata.46:${PORTSDIR}/devel/icu
-. endif
. endif
PATCH_DIST_STRIP=-p1
@@ -325,9 +316,10 @@ 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" \
+ -e "s|_44|_46|g" \
${WRKSRC}/configure.in
. endif
diff --git a/databases/postgresql91-server/Makefile b/databases/postgresql91-server/Makefile
index dc3eb4f1c7a1..77abdb59c3d1 100644
--- a/databases/postgresql91-server/Makefile
+++ b/databases/postgresql91-server/Makefile
@@ -97,27 +97,18 @@ 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-900-icu-2010-09-19.diff.gz:icu
-. if defined(WITH_ICU4)
-LIB_DEPENDS+= icudata.44:${PORTSDIR}/devel/icu4
-. else
LIB_DEPENDS+= icudata.46:${PORTSDIR}/devel/icu
-. endif
. endif
PATCH_DIST_STRIP=-p1
@@ -325,9 +316,10 @@ 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" \
+ -e "s|_44|_46|g" \
${WRKSRC}/configure.in
. endif
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index dc3eb4f1c7a1..77abdb59c3d1 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -97,27 +97,18 @@ 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-900-icu-2010-09-19.diff.gz:icu
-. if defined(WITH_ICU4)
-LIB_DEPENDS+= icudata.44:${PORTSDIR}/devel/icu4
-. else
LIB_DEPENDS+= icudata.46:${PORTSDIR}/devel/icu
-. endif
. endif
PATCH_DIST_STRIP=-p1
@@ -325,9 +316,10 @@ 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" \
+ -e "s|_44|_46|g" \
${WRKSRC}/configure.in
. endif