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

- update ICU to 4.8

Browse source 
- chase library bump
- add an entry in UPDATING for instructions
- remove old conflict lines
This commit is contained in:
Baptiste Daroussin 2011-07-10 21:06:39 +00:00
parent a051292cd3
commit 10f5e8576f
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=277485
29 changed files with 159 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
UPDATING
View file

@ -5,6 +5,20 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.
20110711:
AFFECTS: users of devel/icu
AUTHORS: bapt@FreeBSD.org
icu has been updated to version 4.8. Please rebuild all ports that depends
on it.
If you use portmaster:
# portmaster -r icu
If you use portupgrade:
# portupgrade -fr devel/icu
20110706:
AFFECTS: users of multimedia/zoneminder
AUTHOR: bsam@FreeBSD.org

2
databases/couchdb/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= couchdb
PORTVERSION= 1.0.0
PORTREVISION= 2
PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_APACHE}

1
databases/firebird20-server/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME?= firebird
PORTVERSION= 2.0.6
PORTREVISION= 1
CATEGORIES?= databases
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-Release/
PKGNAMESUFFIX?= -server

2
databases/firebird21-server/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firebird
PORTVERSION= 2.1.3
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-Release/
PKGNAMESUFFIX?= -server

2
databases/firebird25-server/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= firebird
PORTVERSION= 2.5.0
PORTREVISION?= 0
PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.0//}-Release/
PKGNAMESUFFIX?= -server

2
databases/postgresql84-server/Makefile
View file

@ -109,7 +109,7 @@ 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
LIB_DEPENDS+= icudata.46:${PORTSDIR}/devel/icu
LIB_DEPENDS+= icudata.48:${PORTSDIR}/devel/icu
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4
. endif

4
databases/postgresql84-server/files/extra-patch-icu4
View file

@ -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_46, [], [
+ 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, [], [
@ -23,7 +23,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_46, [], [
+ 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, [], [

2
databases/postgresql90-server/Makefile
View file

@ -109,7 +109,7 @@ 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
LIB_DEPENDS+= icudata.46:${PORTSDIR}/devel/icu
LIB_DEPENDS+= icudata.48:${PORTSDIR}/devel/icu
EXTRA_PATCHES+= ${FILESDIR}/extra-patch-icu4
. endif

4
databases/postgresql90-server/files/extra-patch-icu4
View file

@ -12,7 +12,7 @@
- ])
- ])
- ])
+ AC_CHECK_LIB(icui18n, ucol_open_46, [], [
+ 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, [], [
@ -31,7 +31,7 @@
- ])
- ])
- ])
+ AC_CHECK_LIB(icuuc, ucnv_fromUChars_46, [], [
+ 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, [], [

1
deskutils/calibre/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= calibre
PORTVERSION= 0.8.6
PORTREVISION= 1
CATEGORIES= deskutils python
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/

15
devel/icu/Makefile
View file

@ -6,8 +6,7 @@
#
PORTNAME= icu
PORTVERSION= 4.6.1
PORTVERSION= 4.8
CATEGORIES= devel
MASTER_SITES= http://download.icu-project.org/files/icu4c/${PORTVERSION}/
DISTNAME= icu4c-${PORTVERSION:S/./_/g}
@ -27,15 +26,13 @@ LICENSE_NAME= ICU license
LICENSE_PERMS= ${_LICENSE_PERMS_DEFAULT}
LICENSE_FILE= ${WRKSRC}/../unicode-license.txt
CONFLICTS= icu2-[0-9]* icu-4.4*
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= runConfigureICU
CONFIGURE_ARGS+= ${OPSYS}
CONFIGURE_ARGS+= --enable-shared
CONFIGURE_ARGS+= --enable-static
CONFIGURE_ARGS+= --enable-samples=no
CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man
CONFIGURE_ARGS+= ${OPSYS} \
--enable-shared \
--enable-static \
--enable-samples=no \
--mandir=${MANPREFIX}/man
MAKE_JOBS_UNSAFE= yes
USE_GMAKE= yes

4
devel/icu/distinfo
View file

@ -1,2 +1,2 @@
SHA256 (icu4c-4_6_1-src.tgz) = 6846b5e67bea5cb7f5c4b0208489498a9b14bc34f2d556cc5a99209038644874
SIZE (icu4c-4_6_1-src.tgz) = 15561883
SHA256 (icu4c-4_8-src.tgz) = 45e17667b5c6886b49b43e98b8a3f6684e77e5dceda8e939af6f5c8bebd7a939
SIZE (icu4c-4_8-src.tgz) = 18620856

11
devel/icu/pkg-plist
View file

@ -196,6 +196,17 @@ include/unicode/brkiter.h
include/unicode/bmsearch.h
include/unicode/bms.h
include/unicode/basictz.h
include/unicode/appendable.h
include/unicode/bytestrie.h
include/unicode/bytestriebuilder.h
include/unicode/messagepattern.h
include/unicode/stringtriebuilder.h
include/unicode/ucharstrie.h
include/unicode/ucharstriebuilder.h
include/unicode/ustringtrie.h
include/unicode/alphaindex.h
include/unicode/udateintervalformat.h
include/unicode/upluralrules.h
include/layout/plruns.h
include/layout/playout.h
include/layout/loengine.h

4
devel/pecl-intl/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= intl
PORTVERSION= 1.1.2
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= devel pear
MASTER_SITES= http://pecl.php.net/get/
PKGNAMEPREFIX= pecl-
@ -17,7 +17,7 @@ DIST_SUBDIR= PECL
MAINTAINER= miwi@FreeBSD.org
COMMENT= A PECL extension to support Internationalization(ICU)
LIB_DEPENDS= icui18n.46:${PORTSDIR}/devel/icu
LIB_DEPENDS= icui18n.48:${PORTSDIR}/devel/icu
LICENSE= PHP301

1
devel/py-icu/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= icu
PORTVERSION= 1.1
PORTREVISION= 1
CATEGORIES= devel python
MASTER_SITES= ${MASTER_SITE_CHEESESHOP}
MASTER_SITE_SUBDIR= source/P/PyICU

40
devel/py-icu/files/patch-format.cpp Normal file
View file

@ -0,0 +1,40 @@
--- ./format.cpp.orig 2010-12-10 22:25:44.000000000 +0100
+++ ./format.cpp 2011-07-10 22:21:04.787715370 +0200
@@ -31,6 +31,10 @@
#include "dateformat.h"
#include "numberformat.h"
+#if U_ICU_VERSION_HEX >= 0x04080000
+ DECLARE_CONSTANTS_TYPE(UTimeUnitFormatStyle);
+#endif
+
/* FieldPosition */
class t_fieldposition : public _wrapper {
@@ -728,7 +732,11 @@
static int t_timeunitformat_init(t_timeunitformat *self,
PyObject *args, PyObject *kwds)
{
+#if U_ICU_VERSION_HEX >= 0x04080000
+ UTimeUnitFormatStyle style;
+#else
TimeUnitFormat::EStyle style;
+#endif
Locale *locale;
switch (PyTuple_Size(args)) {
@@ -1712,8 +1720,13 @@
INSTALL_STATIC_INT(FieldPosition, DONT_CARE);
-#if U_ICU_VERSION_HEX >= 0x04020000
+#if U_ICU_VERSION_HEX >= 0x04020000 && U_ICU_VERSION_HEX < 0x04080000
INSTALL_STATIC_INT(TimeUnitFormat, kFull);
INSTALL_STATIC_INT(TimeUnitFormat, kAbbreviate);
#endif
+#if U_ICU_VERSION_HEX >= 0x04080000
+ INSTALL_CONSTANTS_TYPE(UTimeUnitFormatStyle, m);
+ INSTALL_ENUM(UTimeUnitFormatStyle, "FULL", UTMUTFMT_FULL_STYLE);
+ INSTALL_ENUM(UTimeUnitFormatStyle, "ABBREVIATED", UTMUTFMT_ABBREVIATED_STYLE);
+#endif
}

57
devel/py-icu/files/patch-numberformat.cpp Normal file
View file

@ -0,0 +1,57 @@
--- ./numberformat.cpp.orig 2010-04-16 04:29:22.000000000 +0200
+++ ./numberformat.cpp 2011-07-10 22:23:26.996346842 +0200
@@ -30,6 +30,10 @@
#include "numberformat.h"
#include "macros.h"
+#if U_ICU_VERSION_HEX >= 0x04080000
+ DECLARE_CONSTANTS_TYPE(UCurrencySpacing);
+#endif
+
/* DecimalFormatSymbols */
class t_decimalformatsymbols : public _wrapper {
@@ -502,7 +506,11 @@
static PyObject *t_decimalformatsymbols_getPatternForCurrencySpacing(t_decimalformatsymbols *self, PyObject *args)
{
+#if U_ICU_VERSION_HEX >= 0x04080000
+ UCurrencySpacing type;
+#else
DecimalFormatSymbols::ECurrencySpacing type;
+#endif
UBool beforeCurrency;
if (!parseArgs(args, "ib", &type, &beforeCurrency))
@@ -518,7 +526,11 @@
static PyObject *t_decimalformatsymbols_setPatternForCurrencySpacing(t_decimalformatsymbols *self, PyObject *args)
{
UnicodeString *u, _u;
+#if U_ICU_VERSION_HEX >= 0x04080000
+ UCurrencySpacing type;
+#else
DecimalFormatSymbols::ECurrencySpacing type;
+#endif
UBool beforeCurrency;
if (!parseArgs(args, "ibS", &type, &beforeCurrency, &u, &_u))
@@ -2286,12 +2298,18 @@
INSTALL_STATIC_INT(DecimalFormatSymbols, kNaNSymbol);
INSTALL_STATIC_INT(DecimalFormatSymbols, kSignificantDigitSymbol);
-#if U_ICU_VERSION_HEX >= 0x04020000
+#if U_ICU_VERSION_HEX >= 0x04020000 && U_ICU_VERSION_HEX < 0x04080000
INSTALL_STATIC_INT(DecimalFormatSymbols, kCurrencyMatch);
INSTALL_STATIC_INT(DecimalFormatSymbols, kSurroundingMatch);
INSTALL_STATIC_INT(DecimalFormatSymbols, kInsert);
INSTALL_STATIC_INT(DecimalFormatSymbols, kCurrencySpacingCount);
#endif
+#if U_ICU_VERSION_HEX >= 0x04080000
+ INSTALL_CONSTANTS_TYPE(UCurrencySpacing, m);
+ INSTALL_ENUM(UCurrencySpacing, "MATCH", UNUM_CURRENCY_MATCH);
+ INSTALL_ENUM(UCurrencySpacing, "SURROUNDING_MATCH", UNUM_CURRENCY_SURROUNDING_MATCH);
+ INSTALL_ENUM(UCurrencySpacing, "INSERT", UNUM_CURRENCY_INSERT);
+#endif
INSTALL_STATIC_INT(NumberFormat, kIntegerField);
INSTALL_STATIC_INT(NumberFormat, kFractionField);

3
editors/libreoffice/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= libreoffice
PORTVERSION= 3.3.3
PORTREVISION= 1
LOVERSION= ${PORTVERSION}.1
CATEGORIES= editors
MASTER_SITES= http://ftp.osuosl.org/pub/tdf/libreoffice/src/ \
@ -82,7 +83,7 @@ EXTRACT_BEFORE_ARGS=
LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \
xml2.5:${PORTSDIR}/textproc/libxml2 \
expat.6:${PORTSDIR}/textproc/expat2 \
icutu.46:${PORTSDIR}/devel/icu \
icutu.48:${PORTSDIR}/devel/icu \
jpeg.11:${PORTSDIR}/graphics/jpeg \
curl.6:${PORTSDIR}/ftp/curl \
hunspell-1.2.0:${PORTSDIR}/hungarian/hunspell \

2
emulators/open-vm-tools/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= open-vm-tools
PORTVERSION= ${BUILD_VER}
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= emulators kld
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${RELEASE_DATE}
DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER}

2
emulators/xcpc/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= xcpc
PORTVERSION= 20070122
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

2
graphics/mapnik/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= mapnik
PORTVERSION= 0.7.1
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= graphics geography
MASTER_SITES= BERLIOS

3
lang/parrot/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= parrot
PORTVERSION= ${PARROT_VERSION}
PORTREVISION= 1
CATEGORIES= lang
MASTER_SITES= ftp://ftp.parrot.org/pub/parrot/releases/devel/${PORTVERSION}/
@ -17,7 +18,7 @@ BUILD_DEPENDS= gm4:${PORTSDIR}/devel/m4 \
${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \
${LOCALBASE}/bin/pcre-config:${PORTSDIR}/devel/pcre
LIB_DEPENDS= gmp.10:${PORTSDIR}/math/gmp \
icudata.46:${PORTSDIR}/devel/icu
icudata.48:${PORTSDIR}/devel/icu
BROKEN= incomplete plist

2
lang/rakudo/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= rakudo
PORTVERSION= 2011.04
PORTEPOCH= 2
PORTEPOCH= 3
CATEGORIES= lang
MASTER_SITES= http://cloud.github.com/downloads/rakudo/star/
DISTNAME= ${PORTNAME}-star-${PORTVERSION}

1
math/R/Makefile
View file

@ -8,6 +8,7 @@
PORTNAME?= R
PORTVERSION= 2.13.0
PORTREVISION= 1
CATEGORIES= math lang
MASTER_SITES= http://cran.r-project.org/src/base/R-2/ \
ftp://cran.r-project.org/pub/R/src/base/R-2/ \

1
net/yaz/Makefile
View file

@ -7,6 +7,7 @@
PORTNAME= yaz
PORTVERSION= 4.2.4
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://ftp.indexdata.dk/pub/yaz/

1
textproc/dwdiff/Makefile
View file

@ -6,6 +6,7 @@
PORTNAME= dwdiff
PORTVERSION= 1.9
PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= http://os.ghalkes.nl/dist/ \
http://www.logvinov.ru/files/dist/ \

1
textproc/ibus-qt/Makefile
View file

@ -6,6 +6,7 @@
PORTNAME= ibus-qt
PORTVERSION= 1.3.1
PORTREVISION= 1
CATEGORIES= textproc
MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE}
DISTNAME= ${PORTNAME}-${PORTVERSION}-Source

2
textproc/xaira/Makefile
View file

@ -7,7 +7,7 @@
PORTNAME= xaira
PORTVERSION= 1.23
PORTREVISION= 4
PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

4
www/webkit-gtk2/Makefile
View file

@ -8,7 +8,7 @@
PORTNAME= webkit
PORTVERSION= 1.2.7
PORTREVISION= 1
PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/
PKGNAMESUFFIX= -gtk2
@ -22,7 +22,7 @@ LIB_DEPENDS= enchant.1:${PORTSDIR}/textproc/enchant \
curl.6:${PORTSDIR}/ftp/curl \
sqlite3.8:${PORTSDIR}/databases/sqlite3 \
soup-2.4.1:${PORTSDIR}/devel/libsoup \
icutu.46:${PORTSDIR}/devel/icu
icutu.48:${PORTSDIR}/devel/icu
USE_GETTEXT= yes
WANT_GSTREAMER= yes