aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Daroussin <bapt@FreeBSD.org>2011-07-10 21:06:39 +0000
committerBaptiste Daroussin <bapt@FreeBSD.org>2011-07-10 21:06:39 +0000
commit10f5e8576fb1331bc700551cee28ba4b68c1f450 (patch)
tree5c629b4bf5189b0863629ff754faa24f7b96107c
parenta051292cd3a4a3b1f819a0e74b2ca97df8bce860 (diff)
downloadports-10f5e8576fb1331bc700551cee28ba4b68c1f450.tar.gz
ports-10f5e8576fb1331bc700551cee28ba4b68c1f450.zip
Notes
-rw-r--r--UPDATING14
-rw-r--r--databases/couchdb/Makefile2
-rw-r--r--databases/firebird20-server/Makefile1
-rw-r--r--databases/firebird21-server/Makefile2
-rw-r--r--databases/firebird25-server/Makefile2
-rw-r--r--databases/postgresql84-server/Makefile2
-rw-r--r--databases/postgresql84-server/files/extra-patch-icu44
-rw-r--r--databases/postgresql90-server/Makefile2
-rw-r--r--databases/postgresql90-server/files/extra-patch-icu44
-rw-r--r--deskutils/calibre/Makefile1
-rw-r--r--devel/icu/Makefile15
-rw-r--r--devel/icu/distinfo4
-rw-r--r--devel/icu/pkg-plist11
-rw-r--r--devel/pecl-intl/Makefile4
-rw-r--r--devel/py-icu/Makefile1
-rw-r--r--devel/py-icu/files/patch-format.cpp40
-rw-r--r--devel/py-icu/files/patch-numberformat.cpp57
-rw-r--r--editors/libreoffice/Makefile3
-rw-r--r--emulators/open-vm-tools/Makefile2
-rw-r--r--emulators/xcpc/Makefile2
-rw-r--r--graphics/mapnik/Makefile2
-rw-r--r--lang/parrot/Makefile3
-rw-r--r--lang/rakudo/Makefile2
-rw-r--r--math/R/Makefile1
-rw-r--r--net/yaz/Makefile1
-rw-r--r--textproc/dwdiff/Makefile1
-rw-r--r--textproc/ibus-qt/Makefile1
-rw-r--r--textproc/xaira/Makefile2
-rw-r--r--www/webkit-gtk2/Makefile4
29 files changed, 159 insertions, 31 deletions
diff --git a/UPDATING b/UPDATING
index 68488070ddfb..0df26f8a67b3 100644
--- a/UPDATING
+++ b/UPDATING
@@ -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
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index 479a8d68c0f1..d4cfb32b7376 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -7,7 +7,7 @@
PORTNAME= couchdb
PORTVERSION= 1.0.0
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 1
CATEGORIES= databases
MASTER_SITES= ${MASTER_SITE_APACHE}
diff --git a/databases/firebird20-server/Makefile b/databases/firebird20-server/Makefile
index 89c0e3662fd4..7ed696633fdb 100644
--- a/databases/firebird20-server/Makefile
+++ b/databases/firebird20-server/Makefile
@@ -7,6 +7,7 @@
PORTNAME?= firebird
PORTVERSION= 2.0.6
+PORTREVISION= 1
CATEGORIES?= databases
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-Release/
PKGNAMESUFFIX?= -server
diff --git a/databases/firebird21-server/Makefile b/databases/firebird21-server/Makefile
index 93a850d014e4..1e8bb593e1f9 100644
--- a/databases/firebird21-server/Makefile
+++ b/databases/firebird21-server/Makefile
@@ -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
diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile
index 7d478c981965..1a5c37cbaeb9 100644
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@@ -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
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 031bf88a4140..8c6d4972a77b 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -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
diff --git a/databases/postgresql84-server/files/extra-patch-icu4 b/databases/postgresql84-server/files/extra-patch-icu4
index b152713c62ec..278f9d035d93 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_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, [], [
diff --git a/databases/postgresql90-server/Makefile b/databases/postgresql90-server/Makefile
index fc1857d300bb..5e702a374a7b 100644
--- a/databases/postgresql90-server/Makefile
+++ b/databases/postgresql90-server/Makefile
@@ -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
diff --git a/databases/postgresql90-server/files/extra-patch-icu4 b/databases/postgresql90-server/files/extra-patch-icu4
index bf28a732a2bd..046200311185 100644
--- a/databases/postgresql90-server/files/extra-patch-icu4
+++ b/databases/postgresql90-server/files/extra-patch-icu4
@@ -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, [], [
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 341bc3ea80d2..a88255bb1122 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -7,6 +7,7 @@
PORTNAME= calibre
PORTVERSION= 0.8.6
+PORTREVISION= 1
CATEGORIES= deskutils python
MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}/
diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index f2197b0f92a5..6aaaa7e507c8 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -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
diff --git a/devel/icu/distinfo b/devel/icu/distinfo
index 1999f0969c4a..4ca12a85b0a2 100644
--- a/devel/icu/distinfo
+++ b/devel/icu/distinfo
@@ -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
diff --git a/devel/icu/pkg-plist b/devel/icu/pkg-plist
index d3303e19febc..cc31813f2e90 100644
--- a/devel/icu/pkg-plist
+++ b/devel/icu/pkg-plist
@@ -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
diff --git a/devel/pecl-intl/Makefile b/devel/pecl-intl/Makefile
index 5fcd140cd393..5c38cf6541a8 100644
--- a/devel/pecl-intl/Makefile
+++ b/devel/pecl-intl/Makefile
@@ -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
diff --git a/devel/py-icu/Makefile b/devel/py-icu/Makefile
index 6513b3a0f81e..2779d296169b 100644
--- a/devel/py-icu/Makefile
+++ b/devel/py-icu/Makefile
@@ -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
diff --git a/devel/py-icu/files/patch-format.cpp b/devel/py-icu/files/patch-format.cpp
new file mode 100644
index 000000000000..6557cf571757
--- /dev/null
+++ b/devel/py-icu/files/patch-format.cpp
@@ -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
+ }
diff --git a/devel/py-icu/files/patch-numberformat.cpp b/devel/py-icu/files/patch-numberformat.cpp
new file mode 100644
index 000000000000..d6bba0adfc5b
--- /dev/null
+++ b/devel/py-icu/files/patch-numberformat.cpp
@@ -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);
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 32fc5500aa18..b1287efe7217 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -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 \
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index 3f2ac89668b9..cff449f55bad 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -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}
diff --git a/emulators/xcpc/Makefile b/emulators/xcpc/Makefile
index 0477e7b872a6..9c61e3b65891 100644
--- a/emulators/xcpc/Makefile
+++ b/emulators/xcpc/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xcpc
PORTVERSION= 20070122
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= emulators
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index f97613ac019e..ceb41c1affab 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -7,7 +7,7 @@
PORTNAME= mapnik
PORTVERSION= 0.7.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics geography
MASTER_SITES= BERLIOS
diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index 39386467b2b1..6c75529c2a13 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -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
diff --git a/lang/rakudo/Makefile b/lang/rakudo/Makefile
index 1db902089349..3575d61d1baa 100644
--- a/lang/rakudo/Makefile
+++ b/lang/rakudo/Makefile
@@ -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}
diff --git a/math/R/Makefile b/math/R/Makefile
index 046177d27a2d..959f50e00226 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -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/ \
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 993047ea09b3..302b4d9339ab 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -7,6 +7,7 @@
PORTNAME= yaz
PORTVERSION= 4.2.4
+PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= http://ftp.indexdata.dk/pub/yaz/
diff --git a/textproc/dwdiff/Makefile b/textproc/dwdiff/Makefile
index ccb3080f097f..30e4645d4bf2 100644
--- a/textproc/dwdiff/Makefile
+++ b/textproc/dwdiff/Makefile
@@ -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/ \
diff --git a/textproc/ibus-qt/Makefile b/textproc/ibus-qt/Makefile
index 1461d2d09ec3..697b4013538c 100644
--- a/textproc/ibus-qt/Makefile
+++ b/textproc/ibus-qt/Makefile
@@ -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
diff --git a/textproc/xaira/Makefile b/textproc/xaira/Makefile
index 38fc4ef1799a..19733abb6a63 100644
--- a/textproc/xaira/Makefile
+++ b/textproc/xaira/Makefile
@@ -7,7 +7,7 @@
PORTNAME= xaira
PORTVERSION= 1.23
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= textproc
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index ea64e9530d9e..c3f219adf72d 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -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