aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Beich <jbeich@FreeBSD.org>2017-09-25 00:02:36 +0000
committerJan Beich <jbeich@FreeBSD.org>2017-09-25 00:02:36 +0000
commita38219861723215d3c7d044cc973c09fd60c0646 (patch)
tree5591751f79396196499fbf2ae1ebbbdb4567d10f
parent635a77adac0851653822796a29095500d1ee461e (diff)
downloadports-a38219861723215d3c7d044cc973c09fd60c0646.tar.gz
ports-a38219861723215d3c7d044cc973c09fd60c0646.zip
devel/icu: update to 59.1
- Temporarily keep C++98 working in consumers for Clang's default -std= Changes: http://site.icu-project.org/download/59 PR: 218788 Submitted by: takefu@airport.fm, dcarmich@dcarmichael.net (early version) Exp-run by: antoine
Notes
Notes: svn path=/head/; revision=450556
-rw-r--r--archivers/unarchiver/Makefile2
-rw-r--r--audio/musicpd/Makefile2
-rw-r--r--audio/ncmpcpp/Makefile2
-rw-r--r--databases/clickhouse/Makefile2
-rw-r--r--databases/couchdb/Makefile2
-rw-r--r--databases/evolution-data-server/Makefile2
-rw-r--r--databases/firebird25-client/Makefile1
-rw-r--r--databases/firebird25-server/Makefile2
-rw-r--r--databases/kdb/Makefile1
-rw-r--r--databases/postgresql92-server/Makefile2
-rw-r--r--databases/postgresql96-server/Makefile2
-rw-r--r--databases/sqlite3/Makefile1
-rw-r--r--deskutils/bijiben/Makefile2
-rw-r--r--deskutils/calibre/Makefile1
-rw-r--r--deskutils/gnome-calendar/Makefile2
-rw-r--r--deskutils/gnome-todo/Makefile2
-rw-r--r--deskutils/orage/Makefile2
-rw-r--r--deskutils/osmo/Makefile2
-rw-r--r--devel/boost-libs/Makefile1
-rw-r--r--devel/dee/Makefile2
-rw-r--r--devel/glib20/Makefile2
-rw-r--r--devel/hs-text-icu/Makefile2
-rw-r--r--devel/icu-le-hb/Makefile2
-rw-r--r--devel/icu/Makefile6
-rw-r--r--devel/icu/distinfo6
-rw-r--r--devel/icu/files/patch-common_unicode_platform.h22
-rw-r--r--devel/icu/files/patch-common_unicode_umachine.h11
-rw-r--r--devel/icu/files/patch-common_unicode_unistr.h33
-rw-r--r--devel/icu/files/patch-common_unicode_uvernum.h8
-rw-r--r--devel/icu/files/patch-r39484148
-rw-r--r--devel/icu/files/patch-r39671176
-rw-r--r--devel/icu/pkg-plist4
-rw-r--r--devel/libical/Makefile1
-rw-r--r--devel/objecthash/Makefile1
-rw-r--r--devel/pecl-intl/Makefile2
-rw-r--r--devel/php70-intl/Makefile2
-rw-r--r--devel/php71-intl/Makefile2
-rw-r--r--devel/py-pyicu/Makefile2
-rw-r--r--devel/qt4-corelib/Makefile2
-rw-r--r--devel/qt5-core/Makefile2
-rw-r--r--dns/libpsl/Makefile1
-rw-r--r--editors/libreoffice/Makefile2
-rw-r--r--editors/poedit/Makefile2
-rw-r--r--emulators/open-vm-tools/Makefile2
-rw-r--r--games/0ad/Makefile2
-rw-r--r--games/an/Makefile2
-rw-r--r--games/liblcf/Makefile2
-rw-r--r--games/openttd/Makefile1
-rw-r--r--games/widelands/Makefile2
-rw-r--r--graphics/libcdr01/Makefile1
-rw-r--r--graphics/libfreehand/Makefile1
-rw-r--r--graphics/libzmf/Makefile1
-rw-r--r--graphics/mapnik/Makefile2
-rw-r--r--graphics/tesseract/Makefile2
-rw-r--r--irc/znc/Makefile2
-rw-r--r--java/openjfx8-devel/Makefile2
-rw-r--r--lang/gnustep-base/Makefile1
-rw-r--r--lang/parrot/Makefile2
-rw-r--r--lang/phantomjs/Makefile2
-rw-r--r--lang/spidermonkey38/Makefile2
-rw-r--r--lang/swift/Makefile3
-rw-r--r--lang/v8-devel/Makefile2
-rw-r--r--mail/cyrus-imapd30/Makefile2
-rw-r--r--mail/dovecot/Makefile1
-rw-r--r--mail/evolution-ews/Makefile1
-rw-r--r--mail/evolution/Makefile1
-rw-r--r--mail/postfix-current/Makefile2
-rw-r--r--mail/postfix/Makefile2
-rw-r--r--mail/rspamd-devel/Makefile1
-rw-r--r--mail/rspamd/Makefile1
-rw-r--r--mail/thunderbird/Makefile2
-rw-r--r--math/R/Makefile2
-rw-r--r--misc/sword/Makefile2
-rw-r--r--multimedia/aegisub/Makefile2
-rw-r--r--multimedia/subtitlecomposer-kde4/Makefile2
-rw-r--r--net/yaz/Makefile2
-rw-r--r--net/zebra-server/Makefile2
-rw-r--r--news/tin/Makefile2
-rw-r--r--print/harfbuzz-icu/Makefile1
-rw-r--r--print/libmspub01/Makefile2
-rw-r--r--print/tex-xetex/Makefile2
-rw-r--r--print/texlive-base/Makefile2
-rw-r--r--security/certificate-transparency/Makefile2
-rw-r--r--sysutils/gdisk/Makefile2
-rw-r--r--sysutils/osquery/Makefile1
-rw-r--r--sysutils/tracker/Makefile2
-rw-r--r--textproc/R-cran-stringi/Makefile1
-rw-r--r--textproc/dwdiff/Makefile2
-rw-r--r--textproc/ibus-qt/Makefile2
-rw-r--r--textproc/libe-book/Makefile2
-rw-r--r--textproc/libvisio01/Makefile2
-rw-r--r--textproc/raptor2/Makefile2
-rw-r--r--textproc/rubygem-charlock_holmes/Makefile2
-rw-r--r--textproc/zorba/Makefile2
-rw-r--r--www/chromium/Makefile1
-rw-r--r--www/cppcms/Makefile2
-rw-r--r--www/epiphany/Makefile2
-rw-r--r--www/firefox-esr/Makefile2
-rw-r--r--www/firefox/Makefile2
-rw-r--r--www/iridium/Makefile2
-rw-r--r--www/libxul/Makefile2
-rw-r--r--www/node/Makefile1
-rw-r--r--www/node4/Makefile2
-rw-r--r--www/node6/Makefile1
-rw-r--r--www/qt5-webkit/Makefile2
-rw-r--r--www/seamonkey/Makefile2
-rw-r--r--www/webkit-gtk2/Makefile2
-rw-r--r--www/webkit-gtk3/Makefile2
-rw-r--r--www/webkit2-gtk3/Makefile2
-rw-r--r--x11-toolkits/gnustep-gui/Makefile1
-rw-r--r--x11/gnome-shell/Makefile2
111 files changed, 185 insertions, 409 deletions
diff --git a/archivers/unarchiver/Makefile b/archivers/unarchiver/Makefile
index 00a20c9e1a39..05977c9287eb 100644
--- a/archivers/unarchiver/Makefile
+++ b/archivers/unarchiver/Makefile
@@ -3,7 +3,7 @@
PORTNAME= unar
PORTVERSION= 1.10.1
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= archivers gnustep
MASTER_SITES= http://wakaba.c3.cx/releases/TheUnarchiver/
DISTNAME= ${PORTNAME}${PORTVERSION}_src
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index d023a4e4ae86..8036e01483e8 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -2,7 +2,7 @@
PORTNAME= musicpd
PORTVERSION= 0.20.10
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= audio ipv6
MASTER_SITES= http://www.musicpd.org/download/mpd/${PORTVERSION:R}/
DISTNAME= mpd-${PORTVERSION}
diff --git a/audio/ncmpcpp/Makefile b/audio/ncmpcpp/Makefile
index c53e3caef217..2fc4e2378325 100644
--- a/audio/ncmpcpp/Makefile
+++ b/audio/ncmpcpp/Makefile
@@ -2,7 +2,7 @@
PORTNAME= ncmpcpp
PORTVERSION= 0.8
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= audio
MASTER_SITES= http://ncmpcpp.rybczak.net/stable/
diff --git a/databases/clickhouse/Makefile b/databases/clickhouse/Makefile
index fd96a8fb7d3f..12764be321af 100644
--- a/databases/clickhouse/Makefile
+++ b/databases/clickhouse/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= 1.1.54289
DISTVERSIONPREFIX= v
DISTVERSIONSUFFIX= -stable
#DISTVERSIONSUFFIX= -testing
-#PORTREVISION= 1
+PORTREVISION= 1
CATEGORIES= databases
MAINTAINER= proler@gmail.com
diff --git a/databases/couchdb/Makefile b/databases/couchdb/Makefile
index 6a3c2cd5b8f6..ac129361fed6 100644
--- a/databases/couchdb/Makefile
+++ b/databases/couchdb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= couchdb
PORTVERSION= 1.6.1
-PORTREVISION= 11
+PORTREVISION= 12
PORTEPOCH= 2
CATEGORIES= databases
MASTER_SITES= APACHE/couchdb/source/${PORTVERSION}
diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 1d6799fafa7b..212406797f30 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= evolution-data-server
PORTVERSION= 3.24.2
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= databases gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/databases/firebird25-client/Makefile b/databases/firebird25-client/Makefile
index 5516192ff958..0098fb2f1f4a 100644
--- a/databases/firebird25-client/Makefile
+++ b/databases/firebird25-client/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= firebird
+PORTREVISION= 1
PKGNAMESUFFIX= ${PORTVERSION:R:S/.//}-client
COMMENT= Firebird-2 database client
diff --git a/databases/firebird25-server/Makefile b/databases/firebird25-server/Makefile
index 3bbd4da68595..77108cc539be 100644
--- a/databases/firebird25-server/Makefile
+++ b/databases/firebird25-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= firebird
PORTVERSION= 2.5.6
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES?= databases
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION:S/.0//}-Release/
PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}-server
diff --git a/databases/kdb/Makefile b/databases/kdb/Makefile
index e6997d1c9528..b0af0cb76047 100644
--- a/databases/kdb/Makefile
+++ b/databases/kdb/Makefile
@@ -2,6 +2,7 @@
PORTNAME= kdb
PORTVERSION= 3.0.0
+PORTREVISION= 1
CATEGORIES= databases kde
MASTER_SITES= KDE/stable/${PORTNAME}/src
DIST_SUBDIR= KDE/${PORTNAME}
diff --git a/databases/postgresql92-server/Makefile b/databases/postgresql92-server/Makefile
index 3082e2800d71..5d142ee0f54f 100644
--- a/databases/postgresql92-server/Makefile
+++ b/databases/postgresql92-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME?= postgresql
DISTVERSION?= 9.2.23
-PORTREVISION?= 0
+PORTREVISION?= 1
CATEGORIES?= databases
MASTER_SITES= PGSQL/source/v${DISTVERSION}
PKGNAMESUFFIX?= ${PORTVERSION:R:S/.//}${COMPONENT}
diff --git a/databases/postgresql96-server/Makefile b/databases/postgresql96-server/Makefile
index 987e4b5c54ff..c6cf89ed2868 100644
--- a/databases/postgresql96-server/Makefile
+++ b/databases/postgresql96-server/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
DISTVERSION?= 9.6.5
-PORTREVISION?= 0
+PORTREVISION?= 1
MAINTAINER?= pgsql@FreeBSD.org
diff --git a/databases/sqlite3/Makefile b/databases/sqlite3/Makefile
index a1790f3d4a3f..aa806983e3df 100644
--- a/databases/sqlite3/Makefile
+++ b/databases/sqlite3/Makefile
@@ -3,6 +3,7 @@
PORTNAME= sqlite3
PORTVERSION= 3.20.1
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= https://www.sqlite.org/2017/ http://www2.sqlite.org/2017/ http://www3.sqlite.org/2017/
DISTNAME= sqlite-autoconf-${PORTVERSION:C/\.([[:digit:]])[[:>:]]/0\1/g:S/.//g}00
diff --git a/deskutils/bijiben/Makefile b/deskutils/bijiben/Makefile
index 0fb58554963f..0fac1ab8faaf 100644
--- a/deskutils/bijiben/Makefile
+++ b/deskutils/bijiben/Makefile
@@ -3,7 +3,7 @@
PORTNAME= bijiben
PORTVERSION= 3.18.2
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/deskutils/calibre/Makefile b/deskutils/calibre/Makefile
index 56c59829698e..b05273a4c5ed 100644
--- a/deskutils/calibre/Makefile
+++ b/deskutils/calibre/Makefile
@@ -3,6 +3,7 @@
PORTNAME= calibre
PORTVERSION= 3.7.0
+PORTREVISION= 1
CATEGORIES= deskutils python
MASTER_SITES= http://download.calibre-ebook.com/${PORTVERSION}/
diff --git a/deskutils/gnome-calendar/Makefile b/deskutils/gnome-calendar/Makefile
index ea542b6e43f2..7eed6e0a7ac0 100644
--- a/deskutils/gnome-calendar/Makefile
+++ b/deskutils/gnome-calendar/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnome-calendar
PORTVERSION= 3.18.2.1
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/deskutils/gnome-todo/Makefile b/deskutils/gnome-todo/Makefile
index 7de094c113f1..c9c9906e1873 100644
--- a/deskutils/gnome-todo/Makefile
+++ b/deskutils/gnome-todo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnome-todo
PORTVERSION= 3.18.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= deskutils gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/deskutils/orage/Makefile b/deskutils/orage/Makefile
index aa9f0434e9aa..7c3a4d21f9c4 100644
--- a/deskutils/orage/Makefile
+++ b/deskutils/orage/Makefile
@@ -3,7 +3,7 @@
PORTNAME= orage
PORTVERSION= 4.12.1
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= deskutils xfce
MASTER_SITES= XFCE/src/apps/${PORTNAME}/${PORTVERSION:R}/
DIST_SUBDIR= xfce4
diff --git a/deskutils/osmo/Makefile b/deskutils/osmo/Makefile
index 6f6cff724dba..ed34329fe8dd 100644
--- a/deskutils/osmo/Makefile
+++ b/deskutils/osmo/Makefile
@@ -3,7 +3,7 @@
PORTNAME= osmo
PORTVERSION= 0.2.14
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= deskutils
MASTER_SITES= SF/${PORTNAME}-pim/${PORTNAME}-pim/${PORTNAME}-${PORTVERSION}
diff --git a/devel/boost-libs/Makefile b/devel/boost-libs/Makefile
index 57e782840c27..38d78fb0177e 100644
--- a/devel/boost-libs/Makefile
+++ b/devel/boost-libs/Makefile
@@ -2,6 +2,7 @@
# $FreeBSD$
PORTNAME= boost-libs
+PORTREVISION= 1
COMMENT= Free portable C++ libraries (without Boost.Python)
diff --git a/devel/dee/Makefile b/devel/dee/Makefile
index 4a1f248de3fd..1e2bcad4e16f 100644
--- a/devel/dee/Makefile
+++ b/devel/dee/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dee
PORTVERSION= 1.2.7
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel
MASTER_SITES= https://launchpadlibrarian.net/151383425/ \
https://launchpad.net/${PORTNAME}/1.0/${PORTVERSION}/+download/
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 6d0f479744fe..44f7d928566f 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,7 +3,7 @@
PORTNAME= glib
PORTVERSION= 2.50.2
-PORTREVISION= 5
+PORTREVISION= 6
PORTEPOCH= 1
CATEGORIES= devel
MASTER_SITES= GNOME
diff --git a/devel/hs-text-icu/Makefile b/devel/hs-text-icu/Makefile
index 0f24ca69db9e..a0b0f547c996 100644
--- a/devel/hs-text-icu/Makefile
+++ b/devel/hs-text-icu/Makefile
@@ -2,7 +2,7 @@
PORTNAME= text-icu
PORTVERSION= 0.7.0.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= devel haskell
MAINTAINER= haskell@FreeBSD.org
diff --git a/devel/icu-le-hb/Makefile b/devel/icu-le-hb/Makefile
index aedb154ec41f..5fcb3383d971 100644
--- a/devel/icu-le-hb/Makefile
+++ b/devel/icu-le-hb/Makefile
@@ -3,7 +3,7 @@
PORTNAME= icu-le-hb
DISTVERSION= 1.0.3-3
DISTVERSIONSUFFIX= -gb8a3163
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel print
MAINTAINER= office@FreeBSD.org
diff --git a/devel/icu/Makefile b/devel/icu/Makefile
index 01dc3f09539e..707944ac2681 100644
--- a/devel/icu/Makefile
+++ b/devel/icu/Makefile
@@ -2,8 +2,8 @@
# $FreeBSD$
PORTNAME= icu
-DISTVERSION= 58_2
-PORTREVISION?= 3 # keep for icu-lx
+DISTVERSION= 59_1
+PORTREVISION?= 0 # keep for icu-lx
PORTEPOCH?= 1
CATEGORIES?= devel
MASTER_SITES= http://download.icu-project.org/files/icu4c/${PORTVERSION}/
@@ -26,7 +26,7 @@ CONFIGURE_ARGS+=--with-data-packaging=archive \
CPPFLAGS+= -DICU_NO_USER_DATA_OVERRIDE
MAKE_ARGS= VERBOSE=1
TEST_TARGET= check
-USES+= compiler:c++0x gmake pathfix tar:tgz
+USES+= compiler:c++11-lib gmake pathfix tar:tgz
USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/icu/source
diff --git a/devel/icu/distinfo b/devel/icu/distinfo
index e1dd826fa950..28ae3f263b83 100644
--- a/devel/icu/distinfo
+++ b/devel/icu/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481218489
-SHA256 (icu4c-58_2-src.tgz) = 2b0a4410153a9b20de0e20c7d8b66049a72aef244b53683d0d7521371683da0c
-SIZE (icu4c-58_2-src.tgz) = 23369902
+TIMESTAMP = 1491550830
+SHA256 (icu4c-59_1-src.tgz) = 7132fdaf9379429d004005217f10e00b7d2319d0fea22bdfddef8991c45b75fe
+SIZE (icu4c-59_1-src.tgz) = 22706578
diff --git a/devel/icu/files/patch-common_unicode_platform.h b/devel/icu/files/patch-common_unicode_platform.h
index 895bb50e3de0..60c8a8446aa2 100644
--- a/devel/icu/files/patch-common_unicode_platform.h
+++ b/devel/icu/files/patch-common_unicode_platform.h
@@ -1,6 +1,6 @@
---- common/unicode/platform.h.orig 2016-03-23 20:49:58 UTC
+--- common/unicode/platform.h.orig 2017-03-22 19:06:26 UTC
+++ common/unicode/platform.h
-@@ -379,8 +379,8 @@
+@@ -382,8 +382,8 @@
*/
#ifdef U_IS_BIG_ENDIAN
/* Use the predefined value. */
@@ -11,3 +11,21 @@
#elif defined(__BYTE_ORDER__) && defined(__ORDER_BIG_ENDIAN__)
/* gcc */
# define U_IS_BIG_ENDIAN (__BYTE_ORDER__ == __ORDER_BIG_ENDIAN__)
+@@ -498,11 +498,15 @@
+ # define U_CPLUSPLUS_VERSION 1
+ #endif
+
+-#if (U_PLATFORM == U_PF_AIX || U_PLATFORM == U_PF_OS390) && defined(__cplusplus) &&(U_CPLUSPLUS_VERSION < 11)
++#if defined(__cplusplus) && (U_CPLUSPLUS_VERSION < 11)
+ // add in std::nullptr_t
+ namespace std {
++#if (U_PLATFORM == U_PF_AIX || U_PLATFORM == U_PF_OS390)
+ typedef decltype(nullptr) nullptr_t;
+-};
++#elif defined(__GNUC__) && !defined(__clang__)
++ typedef __decltype(__null) nullptr_t;
++#endif
++}
+ #endif
+
+ /**
diff --git a/devel/icu/files/patch-common_unicode_umachine.h b/devel/icu/files/patch-common_unicode_umachine.h
new file mode 100644
index 000000000000..b5495e6df585
--- /dev/null
+++ b/devel/icu/files/patch-common_unicode_umachine.h
@@ -0,0 +1,11 @@
+--- common/unicode/umachine.h.orig 2017-03-16 19:01:12 UTC
++++ common/unicode/umachine.h
+@@ -295,7 +295,7 @@ typedef int8_t UBool;
+ * If 1, then char16_t is a typedef and not a real type (yet)
+ * @internal
+ */
+-#if (U_PLATFORM == U_PF_AIX) && defined(__cplusplus) &&(U_CPLUSPLUS_VERSION < 11)
++#if defined(__cplusplus) && (U_CPLUSPLUS_VERSION < 11)
+ // for AIX, uchar.h needs to be included
+ # include <uchar.h>
+ # define U_CHAR16_IS_TYPEDEF 1
diff --git a/devel/icu/files/patch-common_unicode_unistr.h b/devel/icu/files/patch-common_unicode_unistr.h
new file mode 100644
index 000000000000..334f3633af18
--- /dev/null
+++ b/devel/icu/files/patch-common_unicode_unistr.h
@@ -0,0 +1,33 @@
+--- common/unicode/unistr.h.orig 2017-03-29 04:44:37 UTC
++++ common/unicode/unistr.h
+@@ -117,12 +117,20 @@ class UnicodeStringAppendable; // unicode/appendable.
+ * The string parameter must be a C string literal.
+ * The length of the string, not including the terminating
+ * <code>NUL</code>, must be specified as a constant.
++ * The U_STRING_DECL macro should be invoked exactly once for one
++ * such string variable before it is used.
+ * @stable ICU 2.0
+ */
+ #if !U_CHAR16_IS_TYPEDEF
+ # define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, u ## cs, _length)
++#elif defined(U_DECLARE_UTF16)
++# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const char16_t *)U_DECLARE_UTF16(cs), _length)
++#elif U_SIZEOF_WCHAR_T==U_SIZEOF_UCHAR && (U_CHARSET_FAMILY==U_ASCII_FAMILY || (U_SIZEOF_UCHAR == 2 && defined(U_WCHAR_IS_UTF16)))
++# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const char16_t *)L ## cs, _length)
++#elif U_SIZEOF_UCHAR==1 && U_CHARSET_FAMILY==U_ASCII_FAMILY
++# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const char16_t *)cs, _length)
+ #else
+-# define UNICODE_STRING(cs, _length) icu::UnicodeString(TRUE, (const char16_t*)u ## cs, _length)
++# define UNICODE_STRING(cs, _length) icu::UnicodeString(cs, _length, US_INV)
+ #endif
+
+ /**
+@@ -3985,7 +3993,7 @@ UnicodeString::isBufferWritable() const
+ inline const char16_t *
+ UnicodeString::getBuffer() const {
+ if(fUnion.fFields.fLengthAndFlags&(kIsBogus|kOpenGetBuffer)) {
+- return nullptr;
++ return NULL;
+ } else if(fUnion.fFields.fLengthAndFlags&kUsingStackBuffer) {
+ return fUnion.fStackFields.fBuffer;
+ } else {
diff --git a/devel/icu/files/patch-common_unicode_uvernum.h b/devel/icu/files/patch-common_unicode_uvernum.h
new file mode 100644
index 000000000000..21af34231d25
--- /dev/null
+++ b/devel/icu/files/patch-common_unicode_uvernum.h
@@ -0,0 +1,8 @@
+--- common/unicode/uvernum.h.orig 2017-03-21 01:03:49 UTC
++++ common/unicode/uvernum.h
+@@ -125,4 +125,4 @@
+ * This value will change in the subsequent releases of ICU
+ * @stable ICU 2.6
+ */
+-#if U_PLATFORM_HAS_WINUWP_API == 0
++#ifndef U_PLATFORM_HAS_WINUWP_API
diff --git a/devel/icu/files/patch-r39484 b/devel/icu/files/patch-r39484
deleted file mode 100644
index 9a2ffabbebe6..000000000000
--- a/devel/icu/files/patch-r39484
+++ /dev/null
@@ -1,148 +0,0 @@
-https://ssl.icu-project.org/trac/ticket/12827
-
-Index: test/intltest/apicoll.h
-===================================================================
---- test/intltest/apicoll.h (revision 39483)
-+++ test/intltest/apicoll.h (revision 39484)
-@@ -35,6 +35,7 @@ class CollationAPITest: public IntlTestCollator {
- * - displayable name in the desired locale
- */
- void TestProperty(/* char* par */);
-+ void TestKeywordValues();
-
- /**
- * This tests the RuleBasedCollator
-Index: test/intltest/apicoll.cpp
-===================================================================
---- test/intltest/apicoll.cpp (revision 39483)
-+++ test/intltest/apicoll.cpp (revision 39484)
-@@ -81,17 +81,10 @@ CollationAPITest::TestProperty(/* char* par */)
- logln("Test ctors : ");
- col = Collator::createInstance(Locale::getEnglish(), success);
- if (U_FAILURE(success)){
-- errcheckln(success, "Default Collator creation failed. - %s", u_errorName(success));
-+ errcheckln(success, "English Collator creation failed. - %s", u_errorName(success));
- return;
- }
-
-- StringEnumeration* kwEnum = col->getKeywordValuesForLocale("", Locale::getEnglish(),true,success);
-- if (U_FAILURE(success)){
-- errcheckln(success, "Get Keyword Values for Locale failed. - %s", u_errorName(success));
-- return;
-- }
-- delete kwEnum;
--
- col->getVersion(versionArray);
- // Check for a version greater than some value rather than equality
- // so that we need not update the expected version each time.
-@@ -231,6 +224,29 @@ CollationAPITest::TestProperty(/* char* par */)
- delete junk;
- }
-
-+void CollationAPITest::TestKeywordValues() {
-+ IcuTestErrorCode errorCode(*this, "TestKeywordValues");
-+ LocalPointer<Collator> col(Collator::createInstance(Locale::getEnglish(), errorCode));
-+ if (errorCode.logIfFailureAndReset("English Collator creation failed")) {
-+ return;
-+ }
-+
-+ LocalPointer<StringEnumeration> kwEnum(
-+ col->getKeywordValuesForLocale("collation", Locale::getEnglish(), TRUE, errorCode));
-+ if (errorCode.logIfFailureAndReset("Get Keyword Values for English Collator failed")) {
-+ return;
-+ }
-+ assertTrue("expect at least one collation tailoring for English", kwEnum->count(errorCode) > 0);
-+ const char *kw;
-+ UBool hasStandard = FALSE;
-+ while ((kw = kwEnum->next(NULL, errorCode)) != NULL) {
-+ if (strcmp(kw, "standard") == 0) {
-+ hasStandard = TRUE;
-+ }
-+ }
-+ assertTrue("expect at least the 'standard' collation tailoring for English", hasStandard);
-+}
-+
- void
- CollationAPITest::TestRuleBasedColl()
- {
-@@ -2466,6 +2482,7 @@ void CollationAPITest::runIndexedTest( int32_t ind
- if (exec) logln("TestSuite CollationAPITest: ");
- TESTCASE_AUTO_BEGIN;
- TESTCASE_AUTO(TestProperty);
-+ TESTCASE_AUTO(TestKeywordValues);
- TESTCASE_AUTO(TestOperators);
- TESTCASE_AUTO(TestDuplicate);
- TESTCASE_AUTO(TestCompare);
-Index: i18n/ucol_res.cpp
-===================================================================
---- i18n/ucol_res.cpp (revision 39483)
-+++ i18n/ucol_res.cpp (revision 39484)
-@@ -680,6 +680,7 @@ ucol_getKeywordValuesForLocale(const char* /*key*/
- return NULL;
- }
- memcpy(en, &defaultKeywordValues, sizeof(UEnumeration));
-+ ulist_resetList(sink.values); // Initialize the iterator.
- en->context = sink.values;
- sink.values = NULL; // Avoid deletion in the sink destructor.
- return en;
-Index: common/ulist.c
-===================================================================
---- common/ulist.c (revision 39483)
-+++ common/ulist.c (revision 39484)
-@@ -29,7 +29,6 @@ struct UList {
- UListNode *tail;
-
- int32_t size;
-- int32_t currentIndex;
- };
-
- static void ulist_addFirstItem(UList *list, UListNode *newItem);
-@@ -51,7 +50,6 @@ U_CAPI UList *U_EXPORT2 ulist_createEmptyList(UErr
- newList->head = NULL;
- newList->tail = NULL;
- newList->size = 0;
-- newList->currentIndex = -1;
-
- return newList;
- }
-@@ -80,8 +78,9 @@ static void ulist_removeItem(UList *list, UListNod
- } else {
- p->next->previous = p->previous;
- }
-- list->curr = NULL;
-- list->currentIndex = 0;
-+ if (p == list->curr) {
-+ list->curr = p->next;
-+ }
- --list->size;
- if (p->forceDelete) {
- uprv_free(p->data);
-@@ -150,7 +149,6 @@ U_CAPI void U_EXPORT2 ulist_addItemBeginList(UList
- newItem->next = list->head;
- list->head->previous = newItem;
- list->head = newItem;
-- list->currentIndex++;
- }
-
- list->size++;
-@@ -193,7 +191,6 @@ U_CAPI void *U_EXPORT2 ulist_getNext(UList *list)
-
- curr = list->curr;
- list->curr = curr->next;
-- list->currentIndex++;
-
- return curr->data;
- }
-@@ -209,7 +206,6 @@ U_CAPI int32_t U_EXPORT2 ulist_getListSize(const U
- U_CAPI void U_EXPORT2 ulist_resetList(UList *list) {
- if (list != NULL) {
- list->curr = list->head;
-- list->currentIndex = 0;
- }
- }
-
-@@ -272,4 +268,3 @@ U_CAPI void U_EXPORT2 ulist_reset_keyword_values_i
- U_CAPI UList * U_EXPORT2 ulist_getListFromEnum(UEnumeration *en) {
- return (UList *)(en->context);
- }
--
diff --git a/devel/icu/files/patch-r39671 b/devel/icu/files/patch-r39671
deleted file mode 100644
index a746fc2c099d..000000000000
--- a/devel/icu/files/patch-r39671
+++ /dev/null
@@ -1,176 +0,0 @@
-Index: test/intltest/utxttest.h
-===================================================================
---- test/intltest/utxttest.h (revision 39670)
-+++ test/intltest/utxttest.h (revision 39671)
-@@ -38,6 +38,7 @@ class UTextTest : public IntlTest {
- void Ticket10562();
- void Ticket10983();
- void Ticket12130();
-+ void Ticket12888();
-
- private:
- struct m { // Map between native indices & code points.
-Index: test/intltest/utxttest.cpp
-===================================================================
---- test/intltest/utxttest.cpp (revision 39670)
-+++ test/intltest/utxttest.cpp (revision 39671)
-@@ -67,6 +67,8 @@ UTextTest::runIndexedTest(int32_t index, UBool exe
- if (exec) Ticket10983(); break;
- case 7: name = "Ticket12130";
- if (exec) Ticket12130(); break;
-+ case 8: name = "Ticket12888";
-+ if (exec) Ticket12888(); break;
- default: name = ""; break;
- }
- }
-@@ -1583,3 +1585,63 @@ void UTextTest::Ticket12130() {
- }
- utext_close(&ut);
- }
-+
-+// Ticket 12888: bad handling of illegal utf-8 containing many instances of the archaic, now illegal,
-+// six byte utf-8 forms. Original implementation had an assumption that
-+// there would be at most three utf-8 bytes per UTF-16 code unit.
-+// The five and six byte sequences map to a single replacement character.
-+
-+void UTextTest::Ticket12888() {
-+ const char *badString =
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80"
-+ "\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80\xfd\x80\x80\x80\x80\x80";
-+
-+ UErrorCode status = U_ZERO_ERROR;
-+ LocalUTextPointer ut(utext_openUTF8(NULL, badString, -1, &status));
-+ TEST_SUCCESS(status);
-+ for (;;) {
-+ UChar32 c = utext_next32(ut.getAlias());
-+ if (c == U_SENTINEL) {
-+ break;
-+ }
-+ }
-+ int32_t endIdx = utext_getNativeIndex(ut.getAlias());
-+ if (endIdx != (int32_t)strlen(badString)) {
-+ errln("%s:%d expected=%d, actual=%d", __FILE__, __LINE__, strlen(badString), endIdx);
-+ return;
-+ }
-+
-+ for (int32_t prevIndex = endIdx; prevIndex>0;) {
-+ UChar32 c = utext_previous32(ut.getAlias());
-+ int32_t currentIndex = utext_getNativeIndex(ut.getAlias());
-+ if (c != 0xfffd) {
-+ errln("%s:%d (expected, actual, index) = (%d, %d, %d)\n",
-+ __FILE__, __LINE__, 0xfffd, c, currentIndex);
-+ break;
-+ }
-+ if (currentIndex != prevIndex - 6) {
-+ errln("%s:%d: wrong index. Expected, actual = %d, %d",
-+ __FILE__, __LINE__, prevIndex - 6, currentIndex);
-+ break;
-+ }
-+ prevIndex = currentIndex;
-+ }
-+}
-Index: common/utext.cpp
-===================================================================
---- common/utext.cpp (revision 39670)
-+++ common/utext.cpp (revision 39671)
-@@ -847,9 +847,15 @@ U_CDECL_END
- //------------------------------------------------------------------------------
-
- // Chunk size.
--// Must be less than 85, because of byte mapping from UChar indexes to native indexes.
--// Worst case is three native bytes to one UChar. (Supplemenaries are 4 native bytes
--// to two UChars.)
-+// Must be less than 42 (256/6), because of byte mapping from UChar indexes to native indexes.
-+// Worst case there are six UTF-8 bytes per UChar.
-+// obsolete 6 byte form fd + 5 trails maps to fffd
-+// obsolete 5 byte form fc + 4 trails maps to fffd
-+// non-shortest 4 byte forms maps to fffd
-+// normal supplementaries map to a pair of utf-16, two utf8 bytes per utf-16 unit
-+// mapToUChars array size must allow for the worst case, 6.
-+// This could be brought down to 4, by treating fd and fc as pure illegal,
-+// rather than obsolete lead bytes. But that is not compatible with the utf-8 access macros.
- //
- enum { UTF8_TEXT_CHUNK_SIZE=32 };
-
-@@ -889,7 +895,7 @@ struct UTF8Buf {
- // Requires two extra slots,
- // one for a supplementary starting in the last normal position,
- // and one for an entry for the buffer limit position.
-- uint8_t mapToUChars[UTF8_TEXT_CHUNK_SIZE*3+6]; // Map native offset from bufNativeStart to
-+ uint8_t mapToUChars[UTF8_TEXT_CHUNK_SIZE*6+6]; // Map native offset from bufNativeStart to
- // correspoding offset in filled part of buf.
- int32_t align;
- };
-@@ -1032,6 +1038,7 @@ utf8TextAccess(UText *ut, int64_t index, UBool for
- // Requested index is in this buffer.
- u8b = (UTF8Buf *)ut->p; // the current buffer
- mapIndex = ix - u8b->toUCharsMapStart;
-+ U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars));
- ut->chunkOffset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx;
- return TRUE;
-
-@@ -1298,6 +1305,10 @@ fillReverse:
- // Can only do this if the incoming index is somewhere in the interior of the string.
- // If index is at the end, there is no character there to look at.
- if (ix != ut->b) {
-+ // Note: this function will only move the index back if it is on a trail byte
-+ // and there is a preceding lead byte and the sequence from the lead
-+ // through this trail could be part of a valid UTF-8 sequence
-+ // Otherwise the index remains unchanged.
- U8_SET_CP_START(s8, 0, ix);
- }
-
-@@ -1311,7 +1322,10 @@ fillReverse:
- UChar *buf = u8b->buf;
- uint8_t *mapToNative = u8b->mapToNative;
- uint8_t *mapToUChars = u8b->mapToUChars;
-- int32_t toUCharsMapStart = ix - (UTF8_TEXT_CHUNK_SIZE*3 + 1);
-+ int32_t toUCharsMapStart = ix - sizeof(UTF8Buf::mapToUChars) + 1;
-+ // Note that toUCharsMapStart can be negative. Happens when the remaining
-+ // text from current position to the beginning is less than the buffer size.
-+ // + 1 because mapToUChars must have a slot at the end for the bufNativeLimit entry.
- int32_t destIx = UTF8_TEXT_CHUNK_SIZE+2; // Start in the overflow region
- // at end of buffer to leave room
- // for a surrogate pair at the
-@@ -1338,6 +1352,7 @@ fillReverse:
- if (c<0x80) {
- // Special case ASCII range for speed.
- buf[destIx] = (UChar)c;
-+ U_ASSERT(toUCharsMapStart <= srcIx);
- mapToUChars[srcIx - toUCharsMapStart] = (uint8_t)destIx;
- mapToNative[destIx] = (uint8_t)(srcIx - toUCharsMapStart);
- } else {
-@@ -1367,6 +1382,7 @@ fillReverse:
- do {
- mapToUChars[sIx-- - toUCharsMapStart] = (uint8_t)destIx;
- } while (sIx >= srcIx);
-+ U_ASSERT(toUCharsMapStart <= (srcIx+1));
-
- // Set native indexing limit to be the current position.
- // We are processing a non-ascii, non-native-indexing char now;
-@@ -1541,6 +1557,7 @@ utf8TextMapIndexToUTF16(const UText *ut, int64_t i
- U_ASSERT(index>=ut->chunkNativeStart+ut->nativeIndexingLimit);
- U_ASSERT(index<=ut->chunkNativeLimit);
- int32_t mapIndex = index - u8b->toUCharsMapStart;
-+ U_ASSERT(mapIndex < (int32_t)sizeof(UTF8Buf::mapToUChars));
- int32_t offset = u8b->mapToUChars[mapIndex] - u8b->bufStartIdx;
- U_ASSERT(offset>=0 && offset<=ut->chunkLength);
- return offset;
diff --git a/devel/icu/pkg-plist b/devel/icu/pkg-plist
index b4d1e7191688..10ff8f4674ea 100644
--- a/devel/icu/pkg-plist
+++ b/devel/icu/pkg-plist
@@ -1,3 +1,4 @@
+sbin/escapesrc
sbin/icupkg
sbin/gensprep
sbin/gennorm2
@@ -44,6 +45,8 @@ include/unicode/bytestrie.h
include/unicode/bytestriebuilder.h
include/unicode/calendar.h
include/unicode/caniter.h
+include/unicode/casemap.h
+include/unicode/char16ptr.h
include/unicode/chariter.h
include/unicode/choicfmt.h
include/unicode/coleitr.h
@@ -63,6 +66,7 @@ include/unicode/dtitvfmt.h
include/unicode/dtitvinf.h
include/unicode/dtptngen.h
include/unicode/dtrule.h
+include/unicode/edits.h
include/unicode/enumset.h
include/unicode/errorcode.h
include/unicode/fieldpos.h
diff --git a/devel/libical/Makefile b/devel/libical/Makefile
index fc97a2648e65..bb5a64479d94 100644
--- a/devel/libical/Makefile
+++ b/devel/libical/Makefile
@@ -4,6 +4,7 @@
PORTNAME= libical
PORTVERSION= 2.0.0
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= gnome@FreeBSD.org
diff --git a/devel/objecthash/Makefile b/devel/objecthash/Makefile
index 453e9cb21c30..fad948654e52 100644
--- a/devel/objecthash/Makefile
+++ b/devel/objecthash/Makefile
@@ -3,6 +3,7 @@
PORTNAME= objecthash
PORTVERSION= 20160802
+PORTREVISION= 1
CATEGORIES= devel
MAINTAINER= amutu@amutu.com
diff --git a/devel/pecl-intl/Makefile b/devel/pecl-intl/Makefile
index a59129ae1569..fe761e0ca966 100644
--- a/devel/pecl-intl/Makefile
+++ b/devel/pecl-intl/Makefile
@@ -3,7 +3,7 @@
PORTNAME= intl
PORTVERSION= 3.0.0
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= devel pear
MAINTAINER= sunpoet@FreeBSD.org
diff --git a/devel/php70-intl/Makefile b/devel/php70-intl/Makefile
index f8a572ceb788..fa96ef953672 100644
--- a/devel/php70-intl/Makefile
+++ b/devel/php70-intl/Makefile
@@ -1,7 +1,7 @@
# Created by: Alex Dupre <ale@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php70
diff --git a/devel/php71-intl/Makefile b/devel/php71-intl/Makefile
index af7bea5b33a0..5688b0afc6cf 100644
--- a/devel/php71-intl/Makefile
+++ b/devel/php71-intl/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
MASTERDIR= ${.CURDIR}/../../lang/php71
diff --git a/devel/py-pyicu/Makefile b/devel/py-pyicu/Makefile
index c2ba04c48c04..4b4d178d03b3 100644
--- a/devel/py-pyicu/Makefile
+++ b/devel/py-pyicu/Makefile
@@ -3,7 +3,7 @@
PORTNAME= pyicu
PORTVERSION= 1.9.4
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel python
MASTER_SITES= CHEESESHOP
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index c821685cb15a..5f1a80a18785 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -3,7 +3,7 @@
PORTNAME= corelib
DISTVERSION= ${QT4_VERSION}
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= devel
PKGNAMEPREFIX= qt4-
diff --git a/devel/qt5-core/Makefile b/devel/qt5-core/Makefile
index 53e5d0cdee9a..380908b86d1b 100644
--- a/devel/qt5-core/Makefile
+++ b/devel/qt5-core/Makefile
@@ -2,7 +2,7 @@
PORTNAME= core
DISTVERSION= ${QT5_VERSION}
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= devel
PKGNAMEPREFIX= qt5-
diff --git a/dns/libpsl/Makefile b/dns/libpsl/Makefile
index 2f8b7c8ee82c..28486e33c764 100644
--- a/dns/libpsl/Makefile
+++ b/dns/libpsl/Makefile
@@ -4,6 +4,7 @@
PORTNAME= libpsl
PORTVERSION= 0.18.0
DISTVERSIONPREFIX= ${PORTNAME}-
+PORTREVISION= 1
CATEGORIES= dns
MAINTAINER= sunpoet@FreeBSD.org
diff --git a/editors/libreoffice/Makefile b/editors/libreoffice/Makefile
index 1e08cdb2c92f..7a3641561f2c 100644
--- a/editors/libreoffice/Makefile
+++ b/editors/libreoffice/Makefile
@@ -2,7 +2,7 @@
.include "${.CURDIR}/Makefile.common"
-PORTREVISION= 1
+PORTREVISION= 2
MASTER_SITES= http://download.documentfoundation.org/libreoffice/src/${PORTVERSION}/ \
http://dev-www.libreoffice.org/src/:src \
http://dev-www.libreoffice.org/extern/:ext
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 51b7d67f33f1..772449f7a252 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -4,7 +4,7 @@
PORTNAME= poedit
PORTVERSION= 1.8.4
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= editors
MASTER_SITES= https://github.com/vslavik/${PORTNAME}/releases/download/v${PORTVERSION}-oss/
diff --git a/emulators/open-vm-tools/Makefile b/emulators/open-vm-tools/Makefile
index ae297f01efdd..60f1ab64df21 100644
--- a/emulators/open-vm-tools/Makefile
+++ b/emulators/open-vm-tools/Makefile
@@ -4,7 +4,7 @@
PORTNAME= open-vm-tools
PORTVERSION= ${RELEASE_VER}
DISTVERSIONPREFIX= stable-
-PORTREVISION= 2
+PORTREVISION= 3
PORTEPOCH= 2
CATEGORIES= emulators
diff --git a/games/0ad/Makefile b/games/0ad/Makefile
index 821281d5dbed..fa2097bf9ca8 100644
--- a/games/0ad/Makefile
+++ b/games/0ad/Makefile
@@ -2,7 +2,7 @@
PORTNAME= 0ad
PORTVERSION= 0.0.22
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= games
MASTER_SITES= http://releases.wildfiregames.com/ \
SF/zero-ad/releases
diff --git a/games/an/Makefile b/games/an/Makefile
index abb92875aeaa..f43278a579f3 100644
--- a/games/an/Makefile
+++ b/games/an/Makefile
@@ -3,7 +3,7 @@
PORTNAME= an
PORTVERSION= 1.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= DEBIAN_POOL
DISTNAME= ${PORTNAME}_${PORTVERSION}.orig
diff --git a/games/liblcf/Makefile b/games/liblcf/Makefile
index 02121d2cad35..aead0dcacbbd 100644
--- a/games/liblcf/Makefile
+++ b/games/liblcf/Makefile
@@ -3,7 +3,7 @@
PORTNAME= liblcf
PORTVERSION= 0.5.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MAINTAINER= amdmi3@FreeBSD.org
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 1e4280ac4097..120f7a47e04d 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -3,6 +3,7 @@
PORTNAME= openttd
DISTVERSION= 1.7.1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://ca.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \
http://cz.binaries.openttd.org/binaries/releases/${DISTVERSION}/ \
diff --git a/games/widelands/Makefile b/games/widelands/Makefile
index 0803f5a86424..2dbbbd136202 100644
--- a/games/widelands/Makefile
+++ b/games/widelands/Makefile
@@ -3,7 +3,7 @@
PORTNAME= widelands
DISTVERSION= build19
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= games
MASTER_SITES= https://launchpad.net/widelands/${DISTVERSION}/${DISTVERSION}/+download/ \
http://mirror.amdmi3.ru/distfiles/
diff --git a/graphics/libcdr01/Makefile b/graphics/libcdr01/Makefile
index b876a3f08961..b638e30b41d2 100644
--- a/graphics/libcdr01/Makefile
+++ b/graphics/libcdr01/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libcdr
PORTVERSION= 0.1.4
+PORTREVISION= 1
CATEGORIES= graphics devel
MASTER_SITES= LODEV
PKGNAMESUFFIX= 01
diff --git a/graphics/libfreehand/Makefile b/graphics/libfreehand/Makefile
index 534380ecb569..050057a3e90c 100644
--- a/graphics/libfreehand/Makefile
+++ b/graphics/libfreehand/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libfreehand
PORTVERSION= 0.1.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= LODEV
diff --git a/graphics/libzmf/Makefile b/graphics/libzmf/Makefile
index 158badb20855..18a4271469e3 100644
--- a/graphics/libzmf/Makefile
+++ b/graphics/libzmf/Makefile
@@ -2,6 +2,7 @@
PORTNAME= libzmf
PORTVERSION= 0.0.2
+PORTREVISION= 1
CATEGORIES= graphics
MASTER_SITES= LODEV
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index 3e709a703c52..588d7c8ed5a9 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -4,7 +4,7 @@
PORTNAME= mapnik
PORTVERSION= 3.0.9
DISTVERSIONPREFIX= v
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= graphics geography
MASTER_SITES= http://mapnik.s3.amazonaws.com/dist/v${PORTVERSION}/
diff --git a/graphics/tesseract/Makefile b/graphics/tesseract/Makefile
index a2ac9da612ae..0a7f2a65ad5a 100644
--- a/graphics/tesseract/Makefile
+++ b/graphics/tesseract/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tesseract
PORTVERSION= 3.05.01
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= graphics
MAINTAINER= pkubaj@anongoth.pl
diff --git a/irc/znc/Makefile b/irc/znc/Makefile
index e3cc1b0fa754..00b72e1b12e2 100644
--- a/irc/znc/Makefile
+++ b/irc/znc/Makefile
@@ -3,7 +3,7 @@
PORTNAME= znc
PORTVERSION= 1.6.5
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= irc ipv6
MASTER_SITES= http://znc.in/releases/ \
http://znc.in/releases/archive/
diff --git a/java/openjfx8-devel/Makefile b/java/openjfx8-devel/Makefile
index bea2792c31e4..e8c5e0d05c22 100644
--- a/java/openjfx8-devel/Makefile
+++ b/java/openjfx8-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= openjfx8
PORTVERSION= 20170722
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= java x11-toolkits devel
MASTER_SITES= https://bitbucket.org/tobik/openjfx-rt/get/freebsd${PORTVERSION}${EXTRACT_SUFX}?dummy=/
PKGNAMESUFFIX= -devel
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index b7e55cee5616..fcaf01110ac9 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gnustep-base
PORTVERSION= 1.25.0
+PORTREVISION= 1
CATEGORIES= lang devel gnustep
MASTER_SITES= GNUSTEP/core
diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index ff4c82172e3c..8a596b59467c 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -3,7 +3,7 @@
PORTNAME= parrot
PORTVERSION= 8.1.0
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= lang
MASTER_SITES= ftp://ftp.parrot.org/pub/parrot/releases/supported/${PORTVERSION}/ \
LOCAL/sunpoet
diff --git a/lang/phantomjs/Makefile b/lang/phantomjs/Makefile
index 7703bb5d0bde..fbfca43c2cae 100644
--- a/lang/phantomjs/Makefile
+++ b/lang/phantomjs/Makefile
@@ -2,7 +2,7 @@
PORTNAME= phantomjs
PORTVERSION= 2.1.1
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= lang
MAINTAINER= feld@FreeBSD.org
diff --git a/lang/spidermonkey38/Makefile b/lang/spidermonkey38/Makefile
index b6097a927d0e..1ad73dfa8dcc 100644
--- a/lang/spidermonkey38/Makefile
+++ b/lang/spidermonkey38/Makefile
@@ -3,7 +3,7 @@
PORTNAME= spidermonkey38
PORTVERSION= 38.8.0
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= lang
MASTER_SITES= MOZILLA/firefox/releases/${PORTVERSION}esr/source
DISTNAME= firefox-${PORTVERSION}esr.source
diff --git a/lang/swift/Makefile b/lang/swift/Makefile
index a0ed69f498d5..5c6ce1610635 100644
--- a/lang/swift/Makefile
+++ b/lang/swift/Makefile
@@ -2,9 +2,9 @@
PORTNAME= swift
PORTVERSION= 3.1.1
-PORTREVISION= 1
DISTVERSIONPREFIX= swift-
DISTVERSIONSUFFIX= -RELEASE
+PORTREVISION= 2
CATEGORIES= lang
MAINTAINER= swills@FreeBSD.org
@@ -44,6 +44,7 @@ USE_AUTOTOOLS= autoconf:env
USE_GNOME= libxml2
USE_LDCONFIG= yes
ONLY_FOR_ARCHS= amd64
+BROKEN= fails to build with ICU 59, see bug 222428
BROKEN_FreeBSD_10= Builds but does not work
CONFLICTS_BUILD= googletest
LDFLAGS+= -lobjc
diff --git a/lang/v8-devel/Makefile b/lang/v8-devel/Makefile
index e02d5f6292bc..b8d79eaef452 100644
--- a/lang/v8-devel/Makefile
+++ b/lang/v8-devel/Makefile
@@ -3,7 +3,7 @@
PORTNAME= v8
PORTVERSION= 3.27.7
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= lang
MASTER_SITES= LOCAL/vanilla
PKGNAMESUFFIX= -devel
diff --git a/mail/cyrus-imapd30/Makefile b/mail/cyrus-imapd30/Makefile
index a895aa743a3a..66c13acd7c0f 100644
--- a/mail/cyrus-imapd30/Makefile
+++ b/mail/cyrus-imapd30/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cyrus-imapd
PORTVERSION= 3.0.4
-#PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.cyrusimap.org/cyrus-imapd/ \
http://cyrusimap.org/releases/
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index f851840a9950..82e40a093232 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -13,6 +13,7 @@
PORTNAME= dovecot
PORTVERSION= 2.2.32
+PORTREVISION= 1
CATEGORIES= mail ipv6
MASTER_SITES= https://www.dovecot.org/releases/2.2/
diff --git a/mail/evolution-ews/Makefile b/mail/evolution-ews/Makefile
index 264305e099de..6407eb33d9e3 100644
--- a/mail/evolution-ews/Makefile
+++ b/mail/evolution-ews/Makefile
@@ -3,6 +3,7 @@
PORTNAME= evolution-ews
PORTVERSION= 3.24.2
+PORTREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 9fdf17c9b62b..5bc6b04579a4 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -3,6 +3,7 @@
PORTNAME= evolution
PORTVERSION= 3.24.2
+PORTREVISION= 1
CATEGORIES= mail gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 4569e3cd8861..4fef37104a68 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postfix
DISTVERSION= 3.3-20170910
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH= 5
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \
diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile
index ea97ea99a823..767f1c1227c9 100644
--- a/mail/postfix/Makefile
+++ b/mail/postfix/Makefile
@@ -3,7 +3,7 @@
PORTNAME= postfix
PORTVERSION= 3.2.2
-PORTREVISION?= 0
+PORTREVISION?= 1
PORTEPOCH= 1
CATEGORIES= mail ipv6
MASTER_SITES= ftp://ftp.porcupine.org/mirrors/postfix-release/ \
diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index 929d1b63f55b..22f881c6e11e 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -2,6 +2,7 @@
PORTNAME= rspamd
PORTVERSION= 1.5.4.a1.20170328
+PORTREVISION= 1
CATEGORIES= mail
PKGNAMESUFFIX= -devel
diff --git a/mail/rspamd/Makefile b/mail/rspamd/Makefile
index 8b420b0f1e0c..959065629fc9 100644
--- a/mail/rspamd/Makefile
+++ b/mail/rspamd/Makefile
@@ -2,6 +2,7 @@
PORTNAME= rspamd
PORTVERSION= 1.6.4
+PORTREVISION= 1
CATEGORIES= mail
MAINTAINER= vsevolod@FreeBSD.org
diff --git a/mail/thunderbird/Makefile b/mail/thunderbird/Makefile
index ef941af715c3..00da86a6c867 100644
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@@ -3,7 +3,7 @@
PORTNAME= thunderbird
DISTVERSION= 52.3.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= mail news net-im ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
diff --git a/math/R/Makefile b/math/R/Makefile
index 988ac931a119..545b68441660 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -3,7 +3,7 @@
PORTNAME= R
DISTVERSION= 3.4.1
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= math lang
MASTER_SITES= CRAN/src/base/R-${PORTVERSION:C|\..*||}
diff --git a/misc/sword/Makefile b/misc/sword/Makefile
index 332c9a9585c5..a338ff8098cc 100644
--- a/misc/sword/Makefile
+++ b/misc/sword/Makefile
@@ -3,7 +3,7 @@
PORTNAME= sword
PORTVERSION= 1.7.4
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= misc
MASTER_SITES= ftp://ftp.crosswire.org/pub/sword/source/v${PORTVERSION:R}/ \
http://crosswire.org/ftpmirror/pub/sword/source/v${PORTVERSION:R}/
diff --git a/multimedia/aegisub/Makefile b/multimedia/aegisub/Makefile
index 64a1f5204388..e29dfc997527 100644
--- a/multimedia/aegisub/Makefile
+++ b/multimedia/aegisub/Makefile
@@ -3,7 +3,7 @@
PORTNAME= aegisub
PORTVERSION= 3.2.2
-PORTREVISION= 20
+PORTREVISION= 21
CATEGORIES= multimedia
MASTER_SITES= http://ftp.aegisub.org/pub/archives/releases/source/ \
ftp://ftp.aegisub.org/pub/archives/releases/source/ \
diff --git a/multimedia/subtitlecomposer-kde4/Makefile b/multimedia/subtitlecomposer-kde4/Makefile
index d9d38a9f5930..89f55e28d66a 100644
--- a/multimedia/subtitlecomposer-kde4/Makefile
+++ b/multimedia/subtitlecomposer-kde4/Makefile
@@ -3,7 +3,7 @@
PORTNAME= subtitlecomposer
PORTVERSION= 0.5.7
DISTVERSIONPREFIX= v
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= multimedia kde
MAINTAINER= ports@FreeBSD.org
diff --git a/net/yaz/Makefile b/net/yaz/Makefile
index 1db6953a72b6..8ca6d483b26f 100644
--- a/net/yaz/Makefile
+++ b/net/yaz/Makefile
@@ -3,7 +3,7 @@
PORTNAME= yaz
PORTVERSION= 5.21.1
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= net
MASTER_SITES= http://ftp.indexdata.dk/pub/yaz/
diff --git a/net/zebra-server/Makefile b/net/zebra-server/Makefile
index a3d671cf19e3..51424fc8c30d 100644
--- a/net/zebra-server/Makefile
+++ b/net/zebra-server/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zebra-server
PORTVERSION= 2.0.55
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= net
MASTER_SITES= http://ftp.indexdata.dk/pub/zebra/
DISTNAME= idzebra-${PORTVERSION}
diff --git a/news/tin/Makefile b/news/tin/Makefile
index 0a1137f4127a..c7f748d7276a 100644
--- a/news/tin/Makefile
+++ b/news/tin/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tin
PORTVERSION= 2.4.1
-PORTREVISION?= 0 # keep for chinese/tin
+PORTREVISION?= 1 # keep for chinese/tin
CATEGORIES+= news ipv6
MASTER_SITES= ftp://ftp.tin.org/pub/news/clients/tin/v${PORTVERSION:R}/ \
ftp://ftp.sunet.se/pub/news/readers/tin/v${PORTVERSION:R}/ \
diff --git a/print/harfbuzz-icu/Makefile b/print/harfbuzz-icu/Makefile
index 5a668d09ec1f..53be2342b72b 100644
--- a/print/harfbuzz-icu/Makefile
+++ b/print/harfbuzz-icu/Makefile
@@ -1,5 +1,6 @@
# $FreeBSD$
+PORTREVISION= 1
PKGNAMESUFFIX= -icu
COMMENT= Harfbuzz ICU support
diff --git a/print/libmspub01/Makefile b/print/libmspub01/Makefile
index 6dedbb5448f5..1bb5c182b521 100644
--- a/print/libmspub01/Makefile
+++ b/print/libmspub01/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libmspub
PORTVERSION= 0.1.2
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= print graphics devel
MASTER_SITES= http://dev-www.libreoffice.org/src/${PORTNAME}/
PKGNAMESUFFIX= 01
diff --git a/print/tex-xetex/Makefile b/print/tex-xetex/Makefile
index f36293c4dd59..53556333faec 100644
--- a/print/tex-xetex/Makefile
+++ b/print/tex-xetex/Makefile
@@ -2,7 +2,7 @@
PORTNAME= xetex
PORTVERSION= 0.99992
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= print
MASTER_SITES= ftp://tug.org/historic/systems/texlive/2015/
PKGNAMEPREFIX= tex-
diff --git a/print/texlive-base/Makefile b/print/texlive-base/Makefile
index e31348df397e..41a7a7bdecbe 100644
--- a/print/texlive-base/Makefile
+++ b/print/texlive-base/Makefile
@@ -2,7 +2,7 @@
PORTNAME= texlive
PORTVERSION= 20150521
-PORTREVISION= 21
+PORTREVISION= 22
CATEGORIES= print
MASTER_SITES= TEX_CTAN/systems/texlive/Source/
PKGNAMESUFFIX= -base
diff --git a/security/certificate-transparency/Makefile b/security/certificate-transparency/Makefile
index 43b3728ca80a..fe88be083509 100644
--- a/security/certificate-transparency/Makefile
+++ b/security/certificate-transparency/Makefile
@@ -3,7 +3,7 @@
PORTNAME= certificate-transparency
PORTVERSION= 20161015
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= security
MAINTAINER= ports@FreeBSD.org
diff --git a/sysutils/gdisk/Makefile b/sysutils/gdisk/Makefile
index a260040d66ef..24048067d226 100644
--- a/sysutils/gdisk/Makefile
+++ b/sysutils/gdisk/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gdisk
PORTVERSION= 0.8.10
-PORTREVISION= 4
+PORTREVISION= 5
CATEGORIES= sysutils
MASTER_SITES= SF/gptfdisk/gptfdisk/${PORTVERSION}
DISTNAME= gptfdisk-${PORTVERSION}
diff --git a/sysutils/osquery/Makefile b/sysutils/osquery/Makefile
index 82bc87f5ad7f..d0b87fd5a981 100644
--- a/sysutils/osquery/Makefile
+++ b/sysutils/osquery/Makefile
@@ -3,6 +3,7 @@
PORTNAME= osquery
PORTVERSION= 2.8.0
+PORTREVISION= 1
CATEGORIES= sysutils
MAINTAINER= zi@FreeBSD.org
diff --git a/sysutils/tracker/Makefile b/sysutils/tracker/Makefile
index 98b46dbebd2d..a2e6607089eb 100644
--- a/sysutils/tracker/Makefile
+++ b/sysutils/tracker/Makefile
@@ -3,7 +3,7 @@
PORTNAME= tracker
PORTVERSION= 1.6.1
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= sysutils gnome
MASTER_SITES= GNOME
diff --git a/textproc/R-cran-stringi/Makefile b/textproc/R-cran-stringi/Makefile
index 49624d74353d..3710fd491cf2 100644
--- a/textproc/R-cran-stringi/Makefile
+++ b/textproc/R-cran-stringi/Makefile
@@ -3,6 +3,7 @@
PORTNAME= stringi
DISTVERSION= 1.1.5
+PORTREVISION= 1
CATEGORIES= textproc
DISTNAME= ${PORTNAME}_${DISTVERSION}
diff --git a/textproc/dwdiff/Makefile b/textproc/dwdiff/Makefile
index 14c0514157c9..df6ea77f9f17 100644
--- a/textproc/dwdiff/Makefile
+++ b/textproc/dwdiff/Makefile
@@ -3,7 +3,7 @@
PORTNAME= dwdiff
PORTVERSION= 2.0.9
-PORTREVISION= 6
+PORTREVISION= 7
CATEGORIES= textproc
MASTER_SITES= http://os.ghalkes.nl/dist/ \
http://fossies.org/unix/privat/
diff --git a/textproc/ibus-qt/Makefile b/textproc/ibus-qt/Makefile
index 0a67c2e6991e..d8166f8f68f1 100644
--- a/textproc/ibus-qt/Makefile
+++ b/textproc/ibus-qt/Makefile
@@ -3,7 +3,7 @@
PORTNAME= ibus-qt
PORTVERSION= 1.3.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MASTER_SITES= https://github.com/${GH_ACCOUNT}/${PORTNAME}/releases/download/${PORTVERSION}/
DISTNAME= ${PORTNAME}-${PORTVERSION}-Source
diff --git a/textproc/libe-book/Makefile b/textproc/libe-book/Makefile
index f2f30a1f077d..3e9036254bd4 100644
--- a/textproc/libe-book/Makefile
+++ b/textproc/libe-book/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libe-book
PORTVERSION= 0.1.2
-PORTREVISION= 13
+PORTREVISION= 14
CATEGORIES= textproc
MASTER_SITES= SF/libebook/${PORTNAME}-${PORTVERSION}/
diff --git a/textproc/libvisio01/Makefile b/textproc/libvisio01/Makefile
index ebc9913534c4..e73c08f9ecac 100644
--- a/textproc/libvisio01/Makefile
+++ b/textproc/libvisio01/Makefile
@@ -2,7 +2,7 @@
PORTNAME= libvisio
PORTVERSION= 0.1.5
-PORTREVISION= 10
+PORTREVISION= 11
CATEGORIES= textproc devel
MASTER_SITES= http://dev-www.libreoffice.org/src/${PORTNAME}/
PKGNAMESUFFIX= 01
diff --git a/textproc/raptor2/Makefile b/textproc/raptor2/Makefile
index 75b4c24aaadf..dd602ba07d61 100644
--- a/textproc/raptor2/Makefile
+++ b/textproc/raptor2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= raptor2
PORTVERSION= 2.0.15
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc
MASTER_SITES= http://download.librdf.org/source/ \
SF/librdf/${PORTNAME}/${PORTVERSION}
diff --git a/textproc/rubygem-charlock_holmes/Makefile b/textproc/rubygem-charlock_holmes/Makefile
index 1e3ba40252b0..7b3a865b97bd 100644
--- a/textproc/rubygem-charlock_holmes/Makefile
+++ b/textproc/rubygem-charlock_holmes/Makefile
@@ -2,7 +2,7 @@
PORTNAME= charlock_holmes
PORTVERSION= 0.7.3
-PORTREVISION= 5
+PORTREVISION= 6
CATEGORIES= textproc rubygems
MASTER_SITES= RG
diff --git a/textproc/zorba/Makefile b/textproc/zorba/Makefile
index b18682a0124a..38e7137d2aff 100644
--- a/textproc/zorba/Makefile
+++ b/textproc/zorba/Makefile
@@ -3,7 +3,7 @@
PORTNAME= zorba
PORTVERSION= 2.7.0
-PORTREVISION= 15
+PORTREVISION= 16
CATEGORIES= textproc
MASTER_SITES= https://launchpadlibrarian.net/119058962/
DISTNAME= ${PORTNAME}-src-${PORTVERSION}
diff --git a/www/chromium/Makefile b/www/chromium/Makefile
index 8cfb8074deac..1f6c73cc24de 100644
--- a/www/chromium/Makefile
+++ b/www/chromium/Makefile
@@ -3,6 +3,7 @@
PORTNAME= chromium
PORTVERSION= 61.0.3163.100
+PORTREVISION= 1
CATEGORIES?= www
MASTER_SITES= https://commondatastorage.googleapis.com/chromium-browser-official/
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/www/cppcms/Makefile b/www/cppcms/Makefile
index bcbe6a7168d7..fd6796b49cc7 100644
--- a/www/cppcms/Makefile
+++ b/www/cppcms/Makefile
@@ -2,7 +2,7 @@
PORTNAME= cppcms
PORTVERSION= 1.0.5
-PORTREVISION= 9
+PORTREVISION= 10
CATEGORIES= www
MASTER_SITES= SF/cppcms/${PORTNAME}/${PORTVERSION}
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index 618c844d2700..c5284876f77e 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -3,7 +3,7 @@
PORTNAME= epiphany
PORTVERSION= 3.24.2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3
diff --git a/www/firefox-esr/Makefile b/www/firefox-esr/Makefile
index 06f387013dac..35a7f7ad8304 100644
--- a/www/firefox-esr/Makefile
+++ b/www/firefox-esr/Makefile
@@ -4,7 +4,7 @@
PORTNAME= firefox
DISTVERSION= 52.3.0
DISTVERSIONSUFFIX=esr.source
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}esr/source \
diff --git a/www/firefox/Makefile b/www/firefox/Makefile
index d648ad7a4624..a40300938640 100644
--- a/www/firefox/Makefile
+++ b/www/firefox/Makefile
@@ -4,7 +4,7 @@
PORTNAME= firefox
DISTVERSION= 55.0.3
DISTVERSIONSUFFIX=.source
-PORTREVISION= 1
+PORTREVISION= 2
PORTEPOCH= 1
CATEGORIES= www ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
diff --git a/www/iridium/Makefile b/www/iridium/Makefile
index 61ffffbe5c8b..5a3880266861 100644
--- a/www/iridium/Makefile
+++ b/www/iridium/Makefile
@@ -3,7 +3,7 @@
PORTNAME= iridium
PORTVERSION= 58.0
-PORTREVISION= 8
+PORTREVISION= 9
CATEGORIES= www
MASTER_SITES= https://downloads.iridiumbrowser.de/source/
PKGNAMESUFFIX= -browser
diff --git a/www/libxul/Makefile b/www/libxul/Makefile
index 5c331c586661..c7733a4c9368 100644
--- a/www/libxul/Makefile
+++ b/www/libxul/Makefile
@@ -3,7 +3,7 @@
PORTNAME= libxul
DISTVERSION= 45.9.0
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES?= www devel
MASTER_SITES= MOZILLA/firefox/releases/${DISTVERSION}esr/source \
MOZILLA/firefox/candidates/${DISTVERSION}esr-candidates/build3/source
diff --git a/www/node/Makefile b/www/node/Makefile
index 2c3614e7f4c5..e6da791d6475 100644
--- a/www/node/Makefile
+++ b/www/node/Makefile
@@ -3,6 +3,7 @@
PORTNAME= node
PORTVERSION= 8.5.0
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/
diff --git a/www/node4/Makefile b/www/node4/Makefile
index 39087c28f5f9..d68945bc5f40 100644
--- a/www/node4/Makefile
+++ b/www/node4/Makefile
@@ -3,8 +3,8 @@
PORTNAME= node
PORTVERSION= 4.8.4
-PORTREVISION= 1
DISTVERSIONPREFIX= v
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/
PKGNAMESUFFIX= 4
diff --git a/www/node6/Makefile b/www/node6/Makefile
index b7cb6d1628f3..c28e4fa80e73 100644
--- a/www/node6/Makefile
+++ b/www/node6/Makefile
@@ -3,6 +3,7 @@
PORTNAME= node
PORTVERSION= 6.11.3
DISTVERSIONPREFIX= v
+PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://nodejs.org/dist/v${PORTVERSION}/
PKGNAMESUFFIX= 6
diff --git a/www/qt5-webkit/Makefile b/www/qt5-webkit/Makefile
index 60d9e149f12e..ac8b0c6cef3f 100644
--- a/www/qt5-webkit/Makefile
+++ b/www/qt5-webkit/Makefile
@@ -2,7 +2,7 @@
PORTNAME= webkit
DISTVERSION= 5.212.0-alpha2
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= https://github.com/annulen/${PORTNAME}/releases/download/${DISTNAME}/
PKGNAMEPREFIX= qt5-
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 35934df3cbcc..2bbd4ac7548c 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -4,7 +4,7 @@
PORTNAME= seamonkey
DISTVERSION= 2.48
MOZILLA_VER= 51 # above + 3
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES?= www mail news editors irc ipv6
MASTER_SITES= MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build1/source
diff --git a/www/webkit-gtk2/Makefile b/www/webkit-gtk2/Makefile
index cc7b96768951..b091bb6bdce8 100644
--- a/www/webkit-gtk2/Makefile
+++ b/www/webkit-gtk2/Makefile
@@ -3,7 +3,7 @@
PORTNAME= webkit
PORTVERSION= 2.4.11
-PORTREVISION= 12
+PORTREVISION= 13
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/releases/
PKGNAMESUFFIX= -gtk2
diff --git a/www/webkit-gtk3/Makefile b/www/webkit-gtk3/Makefile
index 5b96fb69cbc2..bc8cc9ada897 100644
--- a/www/webkit-gtk3/Makefile
+++ b/www/webkit-gtk3/Makefile
@@ -3,7 +3,7 @@
PORTNAME= webkit
PORTVERSION= 2.4.11
-PORTREVISION= 11
+PORTREVISION= 12
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/releases/
PKGNAMESUFFIX= -gtk3
diff --git a/www/webkit2-gtk3/Makefile b/www/webkit2-gtk3/Makefile
index f3801e1e7b03..7d3de9202b65 100644
--- a/www/webkit2-gtk3/Makefile
+++ b/www/webkit2-gtk3/Makefile
@@ -3,7 +3,7 @@
PORTNAME= webkit
PORTVERSION= 2.16.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www
MASTER_SITES= http://webkitgtk.org/releases/
PKGNAMESUFFIX= 2-gtk3
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 2b5a6ecaea79..cb5d0af8110c 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -3,6 +3,7 @@
PORTNAME= gnustep-gui
PORTVERSION= 0.25.1
+PORTREVISION= 1
CATEGORIES= x11-toolkits gnustep
MASTER_SITES= GNUSTEP/core
diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile
index e816c3c9a8cd..0264899a67c7 100644
--- a/x11/gnome-shell/Makefile
+++ b/x11/gnome-shell/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gnome-shell
PORTVERSION= 3.18.5
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= x11 gnome
MASTER_SITES= GNOME
DIST_SUBDIR= gnome3