sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 17:59:20 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Add ICU 4.x support

Browse source 
- Bump PORTREVISION

PR:		ports/143841
Submitted by:	Andrei Lavreniyuk <andy.lavr@reactor-xg.kiev.ua>
Approved by:	maintainer (timeout)
This commit is contained in:
Martin Matuska 2010-03-25 22:58:11 +00:00
parent 775e3ee22a
commit 12c4a1fce7
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=251513
8 changed files with 176 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
databases/postgresql84-server/Makefile
View file

@ -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

30
databases/postgresql84-server/files/extra-patch-icu4 Normal file
View file

@ -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

17
databases/postgresql90-server/Makefile
View file

@ -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

30
databases/postgresql90-server/files/extra-patch-icu4 Normal file
View file

@ -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

17
databases/postgresql91-server/Makefile
View file

@ -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

30
databases/postgresql91-server/files/extra-patch-icu4 Normal file
View file

@ -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

17
databases/postgresql92-server/Makefile
View file

@ -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

30
databases/postgresql92-server/files/extra-patch-icu4 Normal file
View file

@ -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