*/*: sync with upstream

Taken from: FreeBSD
2016-06-11 06:56:58 +02:00 · 2016-06-11 06:56:58 +02:00 · 2cf10371ba
commit 2cf10371ba
parent bcc858be46
170 changed files with 2150 additions and 1070 deletions
--- a/astro/qmapshack/Makefile
+++ b/astro/qmapshack/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	qmapshack
-PORTVERSION=	1.3.1
+PORTVERSION=	1.6.1
 CATEGORIES=	astro
 MASTER_SITES=	https://bitbucket.org/maproom/qmapshack/downloads/

@ -11,14 +11,14 @@ COMMENT=	Ultimate outdoor aficionado's tool

 LICENSE=	GPLv3

-BROKEN=		unfetchable
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2016-07-04

-LIB_DEPENDS=	libgdal.so:graphics/gdal \
+LIB_DEPENDS=	libQt5DBus.so:devel/dbus-qt5 \
+		libgdal.so:graphics/gdal \
+		libproj.so:graphics/proj \
 		libroutino.so:astro/routino

-USES=		cmake desktop-file-utils
-USE_QT5=	buildtools linguisttools qmake script sql webkit widgets xml
+USES=		cmake compiler:c++11-lib desktop-file-utils
+USE_QT5=	buildtools core gui linguisttools network printsupport \
+		qmake script sql sql-sqlite3 webkit widgets xml

 .include <bsd.port.mk>
--- a/astro/qmapshack/distinfo
+++ b/astro/qmapshack/distinfo
@ -1,2 +1,3 @@
-SHA256 (qmapshack-1.3.1.tar.gz) = 8f4bcb5454786d7f81681abe4f96cc8e3598f62219708d1efe4c94d19ab0dfea
-SIZE (qmapshack-1.3.1.tar.gz) = 3758785
+TIMESTAMP = 1465057676
+SHA256 (qmapshack-1.6.1.tar.gz) = e702482ef894ec3fdbc5a932dd220bbb34eef1580b1645a314e9a3fa99956c22
+SIZE (qmapshack-1.6.1.tar.gz) = 4538423
--- a/astro/qmapshack/files/patch-src_device_IDevice.cpp
+++ b/astro/qmapshack/files/patch-src_device_IDevice.cpp
@ -0,0 +1,29 @@
+--- src/device/IDevice.cpp.orig	2016-06-04 19:56:45 UTC
+++ src/device/IDevice.cpp
+@@ -22,7 +22,7 @@
+ #include "gis/prj/IGisProject.h"
+ #include "helpers/CSelectCopyAction.h"
+ 
+-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+ #include <QtDBus>
+ #endif
+ 
+@@ -52,7 +52,7 @@ IDevice::~IDevice()
+ 
+ void IDevice::mount(const QString& path)
+ {
+-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+     QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",path,"org.freedesktop.UDisks2.Filesystem","Mount");
+     QVariantMap args;
+     args.insert("options", "sync");
+@@ -63,7 +63,7 @@ void IDevice::mount(const QString& path)
+ 
+ void IDevice::umount(const QString &path)
+ {
+-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+     QDBusMessage message = QDBusMessage::createMethodCall("org.freedesktop.UDisks2",path,"org.freedesktop.UDisks2.Filesystem","Unmount");
+     QVariantMap args;
+     message << args;
--- a/astro/qmapshack/files/patch-src_gis_CGisListWks.cpp
+++ b/astro/qmapshack/files/patch-src_gis_CGisListWks.cpp
@ -0,0 +1,20 @@
+--- src/gis/CGisListWks.cpp.orig	2016-06-04 19:56:53 UTC
+++ src/gis/CGisListWks.cpp
+@@ -18,7 +18,7 @@
+ 
+ #include "CMainWindow.h"
+ #include "canvas/CCanvas.h"
+-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+ #include "device/CDeviceWatcherLinux.h"
+ #endif
+ #ifdef Q_OS_WIN
+@@ -196,7 +196,7 @@ CGisListWks::CGisListWks(QWidget *parent
+         QTimer::singleShot(saveEvery * 60000, this, SLOT(slotSaveWorkspace()));
+     }
+ 
+-#ifdef Q_OS_LINUX
+#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+     deviceWatcher = new CDeviceWatcherLinux(this);
+     connect(deviceWatcher, &CDeviceWatcherLinux::sigChanged, this, &CGisListWks::sigChanged);
+ #endif
--- a/astro/qmapshack/files/patch-src_setup_IAppSetup.cpp
+++ b/astro/qmapshack/files/patch-src_setup_IAppSetup.cpp
@ -0,0 +1,11 @@
+--- src/setup/IAppSetup.cpp.orig	2016-06-04 19:55:57 UTC
+++ src/setup/IAppSetup.cpp
+@@ -36,7 +36,7 @@ IAppSetup* IAppSetup::getPlatformInstanc
+     {
+ #if defined(Q_OS_MAC)
+         instance = new CAppSetupMac();
+-#elif defined(Q_OS_LINUX)
+#elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+         instance = new CAppSetupLinux();
+ #elif defined (Q_OS_WIN32)
+         instance = new CAppSetupWin();
--- a/astro/qmapshack/pkg-plist
+++ b/astro/qmapshack/pkg-plist
@ -1,8 +1,12 @@
 bin/qmapshack
 man/man1/qmapshack.1.gz
 share/applications/qmapshack.desktop
+share/icons/hicolor/32x32/apps/QMapShack.png
+share/icons/hicolor/48x48/apps/QMapShack.png
+share/icons/hicolor/scalable/apps/QMapShack.svg
 share/pixmaps/QMapShack.png
 %%DATADIR%%/translations/qmapshack_cs.qm
 %%DATADIR%%/translations/qmapshack_de.qm
 %%DATADIR%%/translations/qmapshack_es.qm
 %%DATADIR%%/translations/qmapshack_fr.qm
+%%DATADIR%%/translations/qmapshack_nl.qm
--- a/audio/abcde/Makefile
+++ b/audio/abcde/Makefile
@ -6,7 +6,7 @@ PORTVERSION=	2.7.2
 CATEGORIES=	audio
 MASTER_SITES=	http://abcde.einval.com/download/

-MAINTAINER=	ports@toco-domains.de
+MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Front-end shell script to encode CDs in flac/mp3/ogg/speex format

 LICENSE=	ART10 GPLv2
--- a/audio/shoutcast/Makefile
+++ b/audio/shoutcast/Makefile
@ -5,7 +5,8 @@ PORTNAME=	shoutcast
 PORTVERSION=	2.4.7.256
 PORTREVISION=	1
 CATEGORIES=	audio net
-MASTER_SITES=	http://download.nullsoft.com/shoutcast/tools/
+MASTER_SITES=	http://download.nullsoft.com/shoutcast/tools/ \
+		http://people.freebsd.org/~sbruno/shoutcast/distfiles/
 DISTNAME=	sc_serv2_bsd-latest

 MAINTAINER=	sbruno@FreeBSD.org
@ -14,8 +15,6 @@ COMMENT=	SHOUTcast Distributed Network Audio Server
 RESTRICTED=	redistribution of software is not permitted
 IA32_BINARY_PORT=	yes

-BROKEN=		does not fetch (404)
-
 USES=		dos2unix shebangfix
 DOS2UNIX_REGEX=	.*\.(conf|css|html|js|txt|xml)
 bash_CMD=	${SH}
--- a/benchmarks/siege/Makefile
+++ b/benchmarks/siege/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	siege
-PORTVERSION=	4.0.1
+PORTVERSION=	4.0.2
 CATEGORIES=	benchmarks www
 MASTER_SITES=	http://download.joedog.org/siege/ \
 		http://fossies.org/linux/www/
--- a/benchmarks/siege/distinfo
+++ b/benchmarks/siege/distinfo
@ -1,2 +1,3 @@
-SHA256 (siege-4.0.1.tar.gz) = fddd7225084ec7116e4e3401946e02d780d60d0479058bf8f090fea389992837
-SIZE (siege-4.0.1.tar.gz) = 543761
+TIMESTAMP = 1465552530
+SHA256 (siege-4.0.2.tar.gz) = 7efb81f9547bef0e693bdd51348a205ad691e1d72c36041f4608099ba0326c47
+SIZE (siege-4.0.2.tar.gz) = 521228
--- a/biology/seaview/Makefile
+++ b/biology/seaview/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	seaview
-PORTVERSION=	4.5.4.8
+PORTVERSION=	4.6
 PORTEPOCH=	1
 CATEGORIES=	biology
 MASTER_SITES=	ftp://pbil.univ-lyon1.fr/pub/mol_phylogeny/seaview/archive/
@ -11,10 +11,6 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Multiple DNA/protein sequence alignment editor

-BROKEN=		checksum mismatch
-DEPRECATED=	Broken for more than 6 months
-EXPIRATION_DATE=	2016-07-04
-
 LICENSE=	GPLv3

 LIB_DEPENDS=	libfltk.so:x11-toolkits/fltk \
--- a/biology/seaview/distinfo
+++ b/biology/seaview/distinfo
@ -1,2 +1,3 @@
-SHA256 (seaview_4.5.4.8.tar.gz) = fe53d3374f195cb178038c5e657be67b12ba14848c35f4af619d91db1f856b3f
-SIZE (seaview_4.5.4.8.tar.gz) = 426566
+TIMESTAMP = 1465555278
+SHA256 (seaview_4.6.tar.gz) = 6826a41bf2980922add66857abe42e3e6a19f0d1bb13845252745db7740c37bc
+SIZE (seaview_4.6.tar.gz) = 424258
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	freetds
-PORTVERSION=	0.99.678
+PORTVERSION=	1.00.37
 PORTEPOCH=	1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.freetds.org/pub/freetds/current/
@ -15,7 +15,7 @@ COMMENT=	Sybase/Microsoft TDS protocol library
 LICENSE=	LGPL20

 WRKSRC=		${WRKDIR}/${PORTNAME}-dev.${PORTVERSION}
-TDS_VER?=	7.2
+TDS_VER?=	7.4
 USES=		autoreconf gettext-tools gmake iconv libtool:keepla pkgconfig tar:bzip2
 GNU_GONFIGURE=	yes
 CPPFLAGS+=	"-I${LOCALBASE}/include"
--- a/databases/freetds-devel/distinfo
+++ b/databases/freetds-devel/distinfo
@ -1,2 +1,3 @@
-SHA256 (freetds-dev.0.99.678.tar.bz2) = d8ed45609f2f054196a643985e995243b236a895cdd03235e6c16a4c15b70211
-SIZE (freetds-dev.0.99.678.tar.bz2) = 3313301
+TIMESTAMP = 1465587030
+SHA256 (freetds-dev.1.00.37.tar.bz2) = 238aeed10a788ab78431b8001d52c6b8aff92cb10282d17b7486e76b61e2fa13
+SIZE (freetds-dev.1.00.37.tar.bz2) = 3310769
--- a/databases/freetds-devel/files/patch-src_tds_threadsafe.c
+++ b/databases/freetds-devel/files/patch-src_tds_threadsafe.c
@ -1,11 +0,0 @@
--- src/tds/threadsafe.c.orig	2015-02-25 09:00:37 UTC
-+++ src/tds/threadsafe.c
-@@ -23,6 +23,8 @@
- #include <stdarg.h>
- #include <stdio.h>
- 
-+#undef HAVE_GETPWUID_R
-+
- #if HAVE_UNISTD_H
- #include <unistd.h>
- #endif /* HAVE_UNISTD_H */
--- a/databases/pglogical/Makefile
+++ b/databases/pglogical/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	pglogical
-PORTVERSION=	1.1.1
+PORTVERSION=	1.1.2
 CATEGORIES=	databases
 MASTER_SITES=	http://packages.2ndquadrant.com/pglogical/tarballs/

--- a/databases/pglogical/distinfo
+++ b/databases/pglogical/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1465421707
-SHA256 (pglogical-1.1.1.tar.bz2) = 1c66e52e43cae208b31d6d6f5cdcf01dc67371fe4ea7f079ac86d49834055d55
-SIZE (pglogical-1.1.1.tar.bz2) = 256832
+TIMESTAMP = 1465561102
+SHA256 (pglogical-1.1.2.tar.bz2) = 9fca04947c23ab31f96b3fa2bb60f4e9498df24952e54e7f05be5ed6e1090440
+SIZE (pglogical-1.1.2.tar.bz2) = 257139
--- a/databases/pgpool/Makefile
+++ b/databases/pgpool/Makefile
@ -7,7 +7,7 @@ CATEGORIES=	databases
 MASTER_SITES=	http://www.pgpool.net/mediawiki/images/
 DISTNAME=	${PORTNAME}-II-${PORTVERSION}

-MAINTAINER=	ports@toco-domains.de
+MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Connection pool server for PostgreSQL

 LICENSE=	MIT
--- a/databases/pguri/Makefile
+++ b/databases/pguri/Makefile
@ -5,7 +5,7 @@ PORTNAME=	pguri
 PORTVERSION=	1.20151224
 CATEGORIES=	databases

-MAINTAINER=	ports@toco-domains.de
+MAINTAINER=	tz@FreeBSD.org
 COMMENT=	URI datatype for PostgreSQL

 BUILD_DEPENDS=	uriparser>=0.8.0:net/uriparser
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	rrdtool
 PORTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	databases graphics
 MASTER_SITES=	http://oss.oetiker.ch/rrdtool/pub/

--- a/databases/rrdtool/files/patch-bindings_python_setup.py
+++ b/databases/rrdtool/files/patch-bindings_python_setup.py
@ -0,0 +1,16 @@
+--- bindings/python/setup.py.orig	2015-11-10 15:07:11 UTC
+++ bindings/python/setup.py
+@@ -28,12 +28,7 @@
+ #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ #
+ 
+-try:
+-    # Attempt to build using Distribute, which also supports bdist_wheel
+-    from setuptools import setup
+-    from setuptools.extension import Extension
+-except ImportError:
+-    from distutils.core import setup, Extension
+from distutils.core import setup, Extension
+ import sys, os
+ 
+ TOP_SRCDIR = os.environ.get('ABS_TOP_SRCDIR', '../..')
--- a/devel/fpp/Makefile
+++ b/devel/fpp/Makefile
@ -10,7 +10,7 @@ MASTER_SITES=	NL/fortran/ \
 DISTNAME=	fdfpp
 EXTRACT_SUFX=	.tgz

-MAINTAINER=	ports@toco-domains.de
+MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Fortran preprocessor for FORTRAN 77 and Fortran 90 programs

 ALL_TARGET=	bsd44
--- a/devel/gitlab-shell/Makefile
+++ b/devel/gitlab-shell/Makefile
@ -8,7 +8,7 @@ CATEGORIES=	devel
 MASTER_SITES=	https://gitlab.com/gitlab-org/${PORTNAME}/repository/archive.tar.gz?ref=v${PORTVERSION}&dummy=/
 DISTNAME=	${PORTNAME}-v${PORTVERSION}

-MAINTAINER=	ports@toco-domains.de
+MAINTAINER=	tz@FreeBSD.org
 COMMENT=	GitLab Shell handles git commands for GitLab

 BUILD_DEPENDS=	gem:devel/ruby-gems
--- a/devel/isl/Makefile
+++ b/devel/isl/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	isl
-PORTVERSION=	0.16.1
+PORTVERSION=	0.17.1
 CATEGORIES=	devel
 MASTER_SITES=	http://isl.gforge.inria.fr/

--- a/devel/isl/distinfo
+++ b/devel/isl/distinfo
@ -1,2 +1,3 @@
-SHA256 (isl-0.16.1.tar.xz) = 45292f30b3cb8b9c03009804024df72a79e9b5ab89e41c94752d6ea58a1e4b02
-SIZE (isl-0.16.1.tar.xz) = 1449164
+TIMESTAMP = 1465584301
+SHA256 (isl-0.17.1.tar.xz) = be152e5c816b477594f4c6194b5666d8129f3a27702756ae9ff60346a8731647
+SIZE (isl-0.17.1.tar.xz) = 1440564
--- a/devel/isl/pkg-plist
+++ b/devel/isl/pkg-plist
@ -23,8 +23,10 @@ include/isl/deprecated/vec_int.h
 include/isl/flow.h
 include/isl/hash.h
 include/isl/hmap.h
+include/isl/hmap_templ.c
 include/isl/id.h
 include/isl/id_to_ast_expr.h
+include/isl/id_to_id.h
 include/isl/id_to_pw_aff.h
 include/isl/ilp.h
 include/isl/list.h
@ -34,6 +36,12 @@ include/isl/map.h
 include/isl/map_to_basic_set.h
 include/isl/map_type.h
 include/isl/mat.h
+include/isl/maybe.h
+include/isl/maybe_ast_expr.h
+include/isl/maybe_basic_set.h
+include/isl/maybe_id.h
+include/isl/maybe_pw_aff.h
+include/isl/maybe_templ.h
 include/isl/multi.h
 include/isl/obj.h
 include/isl/options.h
@ -41,6 +49,7 @@ include/isl/point.h
 include/isl/polynomial.h
 include/isl/polynomial_type.h
 include/isl/printer.h
+include/isl/printer_type.h
 include/isl/schedule.h
 include/isl/schedule_node.h
 include/isl/schedule_type.h
@ -61,6 +70,6 @@ include/isl/vertices.h
 lib/libisl.a
 lib/libisl.so
 lib/libisl.so.15
-lib/libisl.so.15.1.1
-lib/libisl.so.15.1.1-gdb.py
+lib/libisl.so.15.2.1
+lib/libisl.so.15.2.1-gdb.py
 libdata/pkgconfig/isl.pc
--- a/devel/libbrotli/Makefile
+++ b/devel/libbrotli/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	libbrotli
 PORTVERSION=	1.0
-PORTREVISION=	2
+PORTREVISION=	3
 MASTER_SITES=	https://github.com/bagder/libbrotli/archive/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 CATEGORIES=	devel archivers
@ -13,7 +13,7 @@ COMMENT=	Library for generic-purpose lossless compression algorithm

 LICENSE=	MIT

-BROTLI_VERSION=	3a77ebe
+BROTLI_VERSION=	9bce220

 USE_GITHUB=	nodefault
 GH_ACCOUNT=	google:brotli
@ -22,7 +22,6 @@ GH_TAGNAME=	${BROTLI_VERSION}:brotli

 USES=		pkgconfig autoreconf libtool compiler:c++0x
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}

--- a/devel/libbrotli/distinfo
+++ b/devel/libbrotli/distinfo
@ -1,4 +1,5 @@
+TIMESTAMP = 1465596007
 SHA256 (libbrotli-1.0.tar.gz) = 5b7c02eb87017e7b3886c07eca685db95fa21f9c8afbb442469370c251a54dc1
 SIZE (libbrotli-1.0.tar.gz) = 3116
-SHA256 (google-brotli-3a77ebe_GH0.tar.gz) = 109705dcb9399d4942bc7f91d56331af34a311d9b1deb63cd9616e063241d191
-SIZE (google-brotli-3a77ebe_GH0.tar.gz) = 8061078
+SHA256 (google-brotli-9bce220_GH0.tar.gz) = 76893fd511ff0a19a9ee315c876c41db31d0e9a4b6c9dbf6b06cae2ed03c41e4
+SIZE (google-brotli-9bce220_GH0.tar.gz) = 8069813
--- a/devel/ninja-ide/Makefile
+++ b/devel/ninja-ide/Makefile
@ -13,6 +13,8 @@ COMMENT=	Cross-platform integrated development environment (IDE)

 LICENSE=	GPLv3

+BROKEN=		fails to configure
+
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-network>=4.8.5,1:net/py-qt4-network \
 		${PYTHON_PKGNAMEPREFIX}qt4-webkit>=4.8.5:www/py-qt4-webkit
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}qt4-declarative>=4.10.2:devel/py-qt4-declarative \
--- a/devel/py-future/Makefile
+++ b/devel/py-future/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	future
-PORTVERSION=	0.14.3
+PORTVERSION=	0.15.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -15,6 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt

 USES=		python
 USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes

 regression-test: build
 	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test
--- a/devel/py-future/distinfo
+++ b/devel/py-future/distinfo
@ -1,2 +1,3 @@
-SHA256 (future-0.14.3.tar.gz) = 62857d51881d97dd5492b9295b9f51d92108a52a4c88e2c40054c1d3e5995be9
-SIZE (future-0.14.3.tar.gz) = 1485390
+TIMESTAMP = 1465516978
+SHA256 (future-0.15.2.tar.gz) = 3d3b193f20ca62ba7d8782589922878820d0a023b885882deec830adbf639b97
+SIZE (future-0.15.2.tar.gz) = 1583441
--- a/devel/py-transaction/Makefile
+++ b/devel/py-transaction/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	transaction
-PORTVERSION=	1.4.4
+PORTVERSION=	1.6.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -10,6 +10,8 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Transaction management for Python

+LICENSE=	ZPL21
+
 BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zope.interface>=3.5.2:devel/py-zope.interface
 RUN_DEPENDS:=	${BUILD_DEPENDS}

--- a/devel/py-transaction/distinfo
+++ b/devel/py-transaction/distinfo
@ -1,2 +1,3 @@
-SHA256 (transaction-1.4.4.tar.gz) = 1781a0c74e3d2320a2a7fc048ff0d51b790d4f81062c8fcb12e3d29968646f34
-SIZE (transaction-1.4.4.tar.gz) = 60886
+TIMESTAMP = 1465593717
+SHA256 (transaction-1.6.0.tar.gz) = 3a053d39b393fa0577d529c3f45ee711f988ec95903a6bfd67842bc4a5307855
+SIZE (transaction-1.6.0.tar.gz) = 66819
--- a/devel/qbs/Makefile
+++ b/devel/qbs/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	qbs
-PORTVERSION=	1.5.0
+PORTVERSION=	1.5.1
 DISTVERSIONPREFIX=	src-
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/${PORTNAME}/${PORTVERSION}
--- a/devel/qbs/distinfo
+++ b/devel/qbs/distinfo
@ -1,2 +1,3 @@
-SHA256 (KDE/Qt/qbs/qbs-src-1.5.0.tar.gz) = 541106d3e53429c5375a58f395413b3cd5a026d91a304a10f36d78b5e39d9085
-SIZE (KDE/Qt/qbs/qbs-src-1.5.0.tar.gz) = 897221
+TIMESTAMP = 1465488643
+SHA256 (KDE/Qt/qbs/qbs-src-1.5.1.tar.gz) = ac6b9cf56d19245c9c1e0f6b1bf5b36f8194838faf2b4a7d9dbe85373bdbeabe
+SIZE (KDE/Qt/qbs/qbs-src-1.5.1.tar.gz) = 900544
--- a/devel/qbs/pkg-plist
+++ b/devel/qbs/pkg-plist
@ -35,16 +35,16 @@ include/qbs/tools/settingsmodel.h
 include/qbs/tools/setupprojectparameters.h
 include/qbs/use_installed_corelib.pri
 include/qbs/use_installed_qtprofilesetup.pri
-lib/libqbscore.so
-lib/libqbscore.so.1
-lib/libqbscore.so.1.5
-lib/libqbscore.so.1.5.0
-lib/libqbsqtprofilesetup.so
-lib/libqbsqtprofilesetup.so.1
-lib/libqbsqtprofilesetup.so.1.5
-lib/libqbsqtprofilesetup.so.1.5.0
-lib/qbs/plugins/libqbs_cpp_scanner.so
-lib/qbs/plugins/libqbs_qt_scanner.so
+%%QT_LIBDIR%%/libqbscore.so
+%%QT_LIBDIR%%/libqbscore.so.1
+%%QT_LIBDIR%%/libqbscore.so.1.5
+%%QT_LIBDIR%%/libqbscore.so.1.5.1
+%%QT_LIBDIR%%/libqbsqtprofilesetup.so
+%%QT_LIBDIR%%/libqbsqtprofilesetup.so.1
+%%QT_LIBDIR%%/libqbsqtprofilesetup.so.1.5
+%%QT_LIBDIR%%/libqbsqtprofilesetup.so.1.5.1
+%%QT_LIBDIR%%/qbs/plugins/libqbs_cpp_scanner.so
+%%QT_LIBDIR%%/qbs/plugins/libqbs_qt_scanner.so
 %%PORTDOCS%%%%DOCSDIR%%/html/android-ndk-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/android-sdk-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/androidapk-item.html
@ -134,8 +134,6 @@ lib/qbs/plugins/libqbs_qt_scanner.so
 %%PORTDOCS%%%%DOCSDIR%%/html/xcode-module.html
 %%PORTDOCS%%%%DOCSDIR%%/html/xpcservice-item.html
 %%PORTDOCS%%%%DOCSDIR%%/qbs.qch
-%%PORTDOCS%%@dir %%DOCSDIR%%/html/images/used-in-examples
-%%PORTDOCS%%@dir %%DOCSDIR%%/html/scripts
 %%DATADIR%%/examples/app-and-lib/app/app.qbs
 %%DATADIR%%/examples/app-and-lib/app/main.cpp
 %%DATADIR%%/examples/app-and-lib/app_and_lib.qbs
@ -285,3 +283,5 @@ lib/qbs/plugins/libqbs_qt_scanner.so
 %%DATADIR%%/modules/wix/WiXModule.qbs
 %%DATADIR%%/modules/xcode/xcode.js
 %%DATADIR%%/modules/xcode/xcode.qbs
+%%PORTDOCS%%@dir %%DOCSDIR%%/html/images/used-in-examples
+%%PORTDOCS%%@dir %%DOCSDIR%%/html/scripts
--- a/devel/qtcreator/Makefile
+++ b/devel/qtcreator/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	qtcreator
-DISTVERSION=	4.0.0
+DISTVERSION=	4.0.1
 CATEGORIES=	devel
 MASTER_SITES=	QT/official_releases/qtcreator/${DISTVERSION:R}/${DISTVERSION}
 DISTNAME=	qt-creator-opensource-src-${DISTVERSION}
--- a/devel/qtcreator/distinfo
+++ b/devel/qtcreator/distinfo
@ -1,2 +1,3 @@
-SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-4.0.0.tar.gz) = 0cc21d720bafc72ce67f45a5553c618e8fffec3f2f23b94a2b2a9ba68ed0e2c8
-SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-4.0.0.tar.gz) = 21613655
+TIMESTAMP = 1465489154
+SHA256 (KDE/Qt/qtcreator/qt-creator-opensource-src-4.0.1.tar.gz) = 95518a0b93d2d2fb7e5b46508fc1f59811edb2c5e05659262539dd316b8e5f4c
+SIZE (KDE/Qt/qtcreator/qt-creator-opensource-src-4.0.1.tar.gz) = 21651072
--- a/devel/qtcreator/pkg-plist
+++ b/devel/qtcreator/pkg-plist
@ -663,6 +663,13 @@ share/icons/hicolor/64x64/apps/QtProject-qtcreator.png
 %%DATADIR%%/templates/wizards/projects/qmake/qtquickapplication/qml.qrc
 %%DATADIR%%/templates/wizards/projects/qmake/qtquickapplication/qml_wizard.png
 %%DATADIR%%/templates/wizards/projects/qmake/qtquickapplication/wizard.json
+%%DATADIR%%/templates/wizards/projects/qmake/qtquickcontrols2application/Page1.qml.tpl
+%%DATADIR%%/templates/wizards/projects/qmake/qtquickcontrols2application/Page1Form.ui.qml.tpl
+%%DATADIR%%/templates/wizards/projects/qmake/qtquickcontrols2application/app.pro
+%%DATADIR%%/templates/wizards/projects/qmake/qtquickcontrols2application/main.cpp
+%%DATADIR%%/templates/wizards/projects/qmake/qtquickcontrols2application/main.qml.tpl
+%%DATADIR%%/templates/wizards/projects/qmake/qtquickcontrols2application/qml.qrc
+%%DATADIR%%/templates/wizards/projects/qmake/qtquickcontrols2application/wizard.json
 %%DATADIR%%/templates/wizards/projects/qmake/qtquickcontrolsapplication/MainForm.ui.qml.tpl
 %%DATADIR%%/templates/wizards/projects/qmake/qtquickcontrolsapplication/app.pro
 %%DATADIR%%/templates/wizards/projects/qmake/qtquickcontrolsapplication/main.cpp
--- a/devel/rubygem-licensee/Makefile
+++ b/devel/rubygem-licensee/Makefile
@ -6,7 +6,7 @@ PORTVERSION=	8.0.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

-MAINTAINER=	ports@toco-domains.de
+MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Detects under what license a project is distributed

 LICENSE=	MIT
--- a/devel/sope2/Makefile
+++ b/devel/sope2/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=		sope2
-PORTVERSION=		2.3.10
+PORTVERSION=		2.3.11
 CATEGORIES=		devel gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOPE-${PORTVERSION}
--- a/devel/sope2/distinfo
+++ b/devel/sope2/distinfo
@ -1,2 +1,3 @@
-SHA256 (SOPE-2.3.10.tar.gz) = b51e5c212f938b6b39000d5149b7da6922f978df291c61e1015d8abcbfcdc245
-SIZE (SOPE-2.3.10.tar.gz) = 2276085
+TIMESTAMP = 1464621616
+SHA256 (SOPE-2.3.11.tar.gz) = 6fb36b5a1ef20c7bf83edad35cd7dc8da5e8b20f6817489e06be18623a686b7b
+SIZE (SOPE-2.3.11.tar.gz) = 2276343
--- a/devel/sope3/Makefile
+++ b/devel/sope3/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=		sope3
-PORTVERSION=		3.0.2
-PORTREVISION=		1
+PORTVERSION=		3.1.2
 CATEGORIES=		devel gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOPE-${PORTVERSION}
@ -44,6 +43,9 @@ PGSQL_USES=	pgsql
 MYSQL_USE=	MYSQL=client
 MEMCACHED_RUN_DEPENDS=	${LOCALBASE}/bin/memcached:databases/memcached

+post-patch:
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/configure
+
 post-patch-LDAP-off:
 	@${REINPLACE_CMD} -e '/checkLinking "ldap"/d' ${WRKSRC}/configure

--- a/devel/sope3/distinfo
+++ b/devel/sope3/distinfo
@ -1,2 +1,3 @@
-SHA256 (SOPE-3.0.2.tar.gz) = 62adad635d386b0f7531c40f88cd314b267fbaa873c8d0b78204c399123f4ef1
-SIZE (SOPE-3.0.2.tar.gz) = 2275515
+TIMESTAMP = 1465437357
+SHA256 (SOPE-3.1.2.tar.gz) = 218570a7f927ff3d93afe5f7012fc145b2466c0cad48f1d6fa703e3e4f551b54
+SIZE (SOPE-3.1.2.tar.gz) = 2276955
--- a/devel/sope3/files/patch-configure
+++ b/devel/sope3/files/patch-configure
@ -11,7 +11,7 @@
 
 # TODO: add pg_config, mysql_config etc!
 -LINK_SYSLIBDIRS="-L/usr/local/pgsql/lib -L/usr/local/lib -L/usr/lib"
-+LINK_SYSLIBDIRS="-L${LOCALBASE}/lib/postgresql -L${LOCALBASE}/lib/mysql -L${LOCALBASE}/lib -L/usr/lib"
+LINK_SYSLIBDIRS="-L%%LOCALBASE%%/lib/postgresql -L%%LOCALBASE%%/lib/mysql -L%%LOCALBASE%%/lib -L/usr/lib"
 
 # ******************** usage ********************
 
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@ -1,8 +1,7 @@
-# Created by: ijliao
 # $FreeBSD$

 PORTNAME=	yasm
-PORTVERSION=	1.2.0
+PORTVERSION=	1.3.0
 CATEGORIES=	devel lang
 MASTER_SITES=	http://www.tortall.net/projects/yasm/releases/

@ -17,19 +16,15 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-python --disable-python-bindings
 CPPFLAGS+=	${CXXFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+NLS_USES=	gettext iconv
+NLS_CONFIGURE_OFF=--disable-nls --without-libiconv-prefix --without-libintl-prefix

-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>

 .if ${ARCH} == "ia64"
 CFLAGS:=	${CFLAGS:C/-O[0-9]//g}
 .endif

-.if ${PORT_OPTIONS:MNLS}
-USES+=	gettext iconv
-.else
-CONFIGURE_ARGS+=--disable-nls --without-libiconv-prefix --without-libintl-prefix
-.endif
-
 INSTALL_TARGET=	install install-man

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/devel/yasm/distinfo
+++ b/devel/yasm/distinfo
@ -1,2 +1,3 @@
-SHA256 (yasm-1.2.0.tar.gz) = 768ffab457b90a20a6d895c39749adb547c1b7cb5c108e84b151a838a23ccf31
-SIZE (yasm-1.2.0.tar.gz) = 1436502
+TIMESTAMP = 1464339461
+SHA256 (yasm-1.3.0.tar.gz) = 3dce6601b495f5b3d45b59f7d2492a340ee7e84b5beca17e48f862502bd5603f
+SIZE (yasm-1.3.0.tar.gz) = 1492156
--- a/devel/yasm/pkg-plist
+++ b/devel/yasm/pkg-plist
@ -1,6 +1,6 @@
 bin/yasm
-bin/ytasm
 bin/vsyasm
+bin/ytasm
 include/libyasm.h
 include/libyasm-stdint.h
 include/libyasm/arch.h
--- a/emulators/Makefile
+++ b/emulators/Makefile
@ -118,6 +118,7 @@
    SUBDIR += qemu
    SUBDIR += qemu-cheri
    SUBDIR += qemu-cheri128
+    SUBDIR += qemu-cheri128m
    SUBDIR += qemu-devel
    SUBDIR += qemu-launcher
    SUBDIR += qemu-sbruno
--- a/emulators/qemu-cheri/Makefile.snapshot
+++ b/emulators/qemu-cheri/Makefile.snapshot
@ -4,6 +4,6 @@
 #
 # Generated by: files/gen-Makefile.snapshot.sh.
 #
-SNAPDATE=	20160514
+SNAPDATE=	20160610

-QEMU_COMMIT=		afe5bbc23efd4093c1c35cd7d58e4cf8c1569143
+QEMU_COMMIT=		09b76d7d846b439c2af66947ed688f23e42ccc0a
--- a/emulators/qemu-cheri/distinfo
+++ b/emulators/qemu-cheri/distinfo
@ -1,2 +1,2 @@
-SHA256 (CTSRD-CHERI-qemu-0.d20160514-afe5bbc23efd4093c1c35cd7d58e4cf8c1569143_GH0.tar.gz) = e15cbce6e52f6f4d6b4032c77e282ec65fdd92a0de61d1c80f78fd5aa22e7203
-SIZE (CTSRD-CHERI-qemu-0.d20160514-afe5bbc23efd4093c1c35cd7d58e4cf8c1569143_GH0.tar.gz) = 11141289
+SHA256 (CTSRD-CHERI-qemu-0.d20160610-09b76d7d846b439c2af66947ed688f23e42ccc0a_GH0.tar.gz) = 48d5fbe96de648bbc5fadf8dd996b8f24f04d7767b8e1138598704ffa9759f70
+SIZE (CTSRD-CHERI-qemu-0.d20160610-09b76d7d846b439c2af66947ed688f23e42ccc0a_GH0.tar.gz) = 11147193
--- a/emulators/qemu-cheri128/Makefile
+++ b/emulators/qemu-cheri128/Makefile
@ -9,7 +9,7 @@ RUN_DEPENDS=	qemu-system-cheri:emulators/qemu-cheri

 MASTERDIR=	${.CURDIR}/../qemu-cheri

-EXTRA_CFLAGS=	-DCHERI_MAGIC128
+EXTRA_CFLAGS=	-DCHERI_128
 PLIST=		/dev/null
 PLIST_FILES=	bin/qemu-system-cheri128

--- a/emulators/qemu-cheri128m/Makefile
+++ b/emulators/qemu-cheri128m/Makefile
@ -0,0 +1,20 @@
+# Created by: Brooks Davis
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-cheri128m
+
+COMMENT=	QEMU emulator with CHERI CPU support (128-bit, magic compression)
+
+RUN_DEPENDS=	qemu-system-cheri:emulators/qemu-cheri
+
+MASTERDIR=	${.CURDIR}/../qemu-cheri
+
+EXTRA_CFLAGS=	-DCHERI_MAGIC128
+PLIST=		/dev/null
+PLIST_FILES=	bin/qemu-system-cheri128m
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/cheri-softmmu/qemu-system-cheri \
+	    ${STAGEDIR}${PREFIX}/bin/qemu-system-cheri128m
+
+.include <${MASTERDIR}/Makefile>
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@ -2,11 +2,9 @@
 # $FreeBSD$

 PORTNAME=	qemu
-PORTVERSION=	2.4.1
-PORTREVISION=	1
+PORTVERSION=	2.5.1.1
 CATEGORIES=	emulators
 MASTER_SITES=	http://wiki.qemu.org/download/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 DIST_SUBDIR=	qemu/${PORTVERSION}

 MAINTAINER=	bofh@FreeBSD.org
@ -34,7 +32,7 @@ CDROM_DMA_DESC=		IDE CDROM DMA
 PCAP_DESC=		pcap dependency (networking with bpf)
 USBREDIR_DESC=		usb device network redirection (experimental!)
 GNS3_DESC=		gns3 patches (promiscuous multicast)
-X86_TARGETS_DESC=	Don't build non-x86 system targets
+X86_TARGETS_DESC=	Build only x86 system targets
 BSD_USER_DESC=		Also build bsd-user targets (for testing)
 STATIC_LINK_DESC=	Statically link the executables
 OPTIONS_DEFAULT=X11 GTK2 OPENGL GNUTLS SASL JPEG PNG CDROM_DMA CURL PCAP GNS3
@ -76,7 +74,7 @@ PORTDOCS=	docs qemu-doc.html qemu-tech.html qmp-commands.txt
 WITHOUT_CPU_CFLAGS=yes	#to avoid problems with register allocation
 CFLAGS:=	${CFLAGS:C/-fno-tree-vrp//}
 CONFIGURE_ARGS+=--localstatedir=/var --extra-ldflags=-L\"${LOCALBASE}/lib\" \
-		--disable-smartcard-nss --disable-libssh2 --enable-debug \
+		--disable-libssh2 --enable-debug \
 		--prefix=${PREFIX} --cc=${CC} --enable-docs --disable-kvm \
 		--disable-linux-user --disable-linux-aio --disable-xen \
 		--smbd=${LOCALBASE}/sbin/smbd --enable-debug-info --python=${PYTHON_CMD} \
@ -155,9 +153,6 @@ CONFIGURE_ARGS+=	--sparc_cpu=v9
 # -lprocstat actually only _needs_ -lelf after r249666 or r250870 (MFC)
 # but it shouldn't matter much
 post-patch:
-	@${REINPLACE_CMD} -e '/LIBS/s|-lprocstat|-lprocstat -lelf|' \
-		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e '/libs_qga=/s|glib_libs|glib_libs -lintl|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -E \
 		-e "/^by Tibor .TS. S/s|Sch.*z.$$|Schuetz.|" \
 		${WRKSRC}/qemu-doc.texi
--- a/emulators/qemu/distinfo
+++ b/emulators/qemu/distinfo
@ -1,2 +1,3 @@
-SHA256 (qemu/2.4.1/qemu-2.4.1.tar.bz2) = e3d5cf4c8b1f9129c9c797329a515bfb6b3b1ded0ab8b394c8a316490fe3a177
-SIZE (qemu/2.4.1/qemu-2.4.1.tar.bz2) = 25087522
+TIMESTAMP = 1464476316
+SHA256 (qemu/2.5.1.1/qemu-2.5.1.1.tar.bz2) = 28d9946e43765a44ccccca3cba5f4f9034f2759ec1f2ce16594ddb6776c8efe6
+SIZE (qemu/2.5.1.1/qemu-2.5.1.1.tar.bz2) = 25474902
--- a/emulators/qemu/files/patch-Makefile
+++ b/emulators/qemu/files/patch-Makefile
@ -1,18 +1,19 @@
--- Makefile.orig	2015-11-03 20:01:30 UTC
+--- Makefile.orig	2016-03-29 21:01:14 UTC
 +++ Makefile
-@@ -88,7 +88,11 @@ LIBS+=-lz $(LIBS_TOOLS)
+@@ -90,8 +90,12 @@ LIBS+=-lz $(LIBS_TOOLS)
 HELPERS-$(CONFIG_LINUX) = qemu-bridge-helper$(EXESUF)
 
 ifdef BUILD_DOCS
 +ifdef NOPORTDOCS
 +DOCS=qemu.1 qemu-img.1 qemu-nbd.8
 +else
- DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qmp-commands.txt
+ DOCS=qemu-doc.html qemu-tech.html qemu.1 qemu-img.1 qemu-nbd.8 qemu-ga.8
+ DOCS+=qmp-commands.txt
 +endif
 ifdef CONFIG_LINUX
 DOCS+=kvm_stat.1
 endif
-@@ -390,8 +394,10 @@ endif
+@@ -407,8 +411,10 @@ endif
 
 install-doc: $(DOCS)
 	$(INSTALL_DIR) "$(DESTDIR)$(qemu_docdir)"
--- a/emulators/qemu/files/patch-configure
+++ b/emulators/qemu/files/patch-configure
@ -1,6 +1,6 @@
--- configure.orig	2015-11-03 20:01:31 UTC
+--- configure.orig	2016-03-30 17:53:28 UTC
 +++ configure
-@@ -273,7 +273,7 @@ DSOSUF=".so"
+@@ -276,7 +276,7 @@ DSOSUF=".so"
 LDFLAGS_SHARED="-shared"
 modules="no"
 prefix="/usr/local"
@ -9,7 +9,28 @@
 datadir="\${prefix}/share"
 qemu_docdir="\${prefix}/share/doc/qemu"
 bindir="\${prefix}/bin"
-@@ -2102,7 +2102,7 @@ if test "$gtk" != "no"; then
+@@ -344,6 +344,9 @@ libssh2=""
+ vhdx=""
+ numa=""
+ tcmalloc="no"
+pcap="no"
+pcap_create="no"
+bpf="no"
+ jemalloc="no"
+ 
+ # parse CC options first
+@@ -905,6 +908,10 @@ for opt do
+   ;;
+   --enable-vnc-png) vnc_png="yes"
+   ;;
+  --enable-pcap) pcap="yes"
+  ;;
+  --disable-pcap) pcap="no"
+  ;;
+   --disable-slirp) slirp="no"
+   ;;
+   --disable-uuid) uuid="no"
+@@ -2241,7 +2248,7 @@ if test "$gtk" != "no"; then
             gtk_cflags="$gtk_cflags $x11_cflags"
             gtk_libs="$gtk_libs $x11_libs"
         fi
@ -18,20 +39,69 @@
         gtk="yes"
     elif test "$gtk" = "yes"; then
         feature_not_found "gtk" "Install gtk2 or gtk3 devel"
-@@ -3643,15 +3643,18 @@ if compile_prog "" "" ; then
+@@ -2413,6 +2420,50 @@ then
 fi
 
+ ##########################################
+# pcap probe
+if test "$pcap" = "yes" -a "$pcap" != "no"; then
+  cat > $TMPC << EOF
+#include <pcap.h>
+int main(void) { return (pcap_lib_version() == (char *)0 ? 1 : 0); }
+EOF
+  if test "$mingw32" = "no" ; then
+    libpcap=-lpcap
+  else
+    libpcap=-lwpcap
+  fi
+  if compile_prog "" "$libpcap" ; then
+    :
+  else
+   echo
+    echo "Error: Could not find pcap"
+    echo "Make sure to have the pcap libs and headers installed."
+    echo
+    exit 1
+  fi
+  cat > $TMPC << EOF
+#include <pcap.h>
+int main(void)
+{
+  char errbuf[PCAP_ERRBUF_SIZE];
+  return (pcap_create("foo", errbuf) == (pcap_t *)0 ? 1 : 0);
+}
+EOF
+  if compile_prog "" "$libpcap" ; then
+    pcap_create="yes"
+  fi
+  cat > $TMPC << EOF
+#define PCAP_DONT_INCLUDE_PCAP_BPF_H
+#include <pcap.h>
+#include <net/bpf.h>
+int main(void) { return (BPF_MAJOR_VERSION); }
+EOF
+  if compile_prog ; then
+    bpf="yes"
+  fi
+  libs_softmmu="$libpcap $libs_softmmu"
+fi # test "$pcap"
+
+##########################################
+ # libtasn1 - only for the TLS creds/session test suite
+ 
+ tasn1=yes
+@@ -2983,7 +3034,7 @@ for i in $glib_modules; do
+         glib_libs=`$pkg_config --libs $i`
+         CFLAGS="$glib_cflags $CFLAGS"
+         LIBS="$glib_libs $LIBS"
+-        libs_qga="$glib_libs $libs_qga"
+        libs_qga="$glib_libs -lintl $libs_qga"
+     else
+         error_exit "glib-$glib_req_ver $i is required to compile QEMU"
+     fi
+@@ -3864,14 +3915,7 @@ fi
+ 
 # Check if tools are available to build documentation.
-+#if test "$docs" != "no" ; then
-+#  if has makeinfo && has pod2man; then
-+#    docs=yes
-+#  else
-+#    if test "$docs" = "yes" ; then
-+#      feature_not_found "docs" "Install texinfo and Perl/perl-podlators"
-+#    fi
-+#    docs=no
-+#  fi
-+#fi
 if test "$docs" != "no" ; then
 -  if has makeinfo && has pod2man; then
 -    docs=yes
@ -41,11 +111,11 @@
 -    fi
 -    docs=no
 -  fi
-+  docs=yes
+docs=yes
 fi
 
 # Search for bswap_32 function
-@@ -3793,6 +3796,17 @@ fi
+@@ -3999,6 +4043,17 @@ fi
 
 # check for libusb
 if test "$libusb" != "no" ; then
@ -63,7 +133,7 @@
     if $pkg_config --atleast-version=1.0.13 libusb-1.0; then
         libusb="yes"
         libusb_cflags=$($pkg_config --cflags libusb-1.0)
-@@ -3805,6 +3819,7 @@ if test "$libusb" != "no" ; then
+@@ -4011,6 +4066,7 @@ if test "$libusb" != "no" ; then
         fi
         libusb="no"
     fi
@ -71,3 +141,27 @@
 fi
 
 # check for usbredirparser for usb network redirection support
+@@ -4773,6 +4829,7 @@ echo "Audio drivers     $audio_drv_list"
+ echo "Block whitelist (rw) $block_drv_rw_whitelist"
+ echo "Block whitelist (ro) $block_drv_ro_whitelist"
+ echo "VirtFS support    $virtfs"
+echo "pcap support      $pcap"
+ echo "VNC support       $vnc"
+ if test "$vnc" = "yes" ; then
+     echo "VNC SASL support  $vnc_sasl"
+@@ -4951,6 +5008,15 @@ fi
+ if test "$profiler" = "yes" ; then
+   echo "CONFIG_PROFILER=y" >> $config_host_mak
+ fi
+if test "$pcap" = "yes" ; then
+  echo "CONFIG_PCAP=y" >> $config_host_mak
+  if test "$pcap_create" = "yes" ; then
+    echo "CONFIG_PCAP_CREATE=y" >> $config_host_mak
+  fi
+  if test "$bpf" = "yes" ; then
+    echo "CONFIG_BPF=y" >> $config_host_mak
+  fi
+fi
+ if test "$slirp" = "yes" ; then
+   echo "CONFIG_SLIRP=y" >> $config_host_mak
+   echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
--- a/emulators/qemu/files/patch-include_qemu-common.h
+++ b/emulators/qemu/files/patch-include_qemu-common.h
@ -1,6 +1,6 @@
--- include/qemu-common.h.orig	2015-11-03 20:01:34 UTC
+--- include/qemu-common.h.orig	2016-03-30 18:14:31 UTC
 +++ include/qemu-common.h
-@@ -568,7 +568,9 @@ void qemu_hexdump(const char *buf, FILE 
+@@ -469,7 +469,9 @@ void qemu_hexdump(const char *buf, FILE 
 #define VEC_OR(v1, v2) ((v1) | (v2))
 /* altivec.h may redefine the bool macro as vector type.
  * Reset it to POSIX semantics. */
--- a/emulators/qemu/files/pcap-patch
+++ b/emulators/qemu/files/pcap-patch
@ -1,102 +1,3 @@
--- configure.orig	2015-08-11 19:11:05 UTC
-+++ configure
-@@ -338,6 +338,9 @@ libssh2=""
- vhdx=""
- numa=""
- tcmalloc="no"
-+pcap="no"
-+pcap_create="no"
-+bpf="no"
- 
- # parse CC options first
- for opt do
-@@ -896,6 +899,10 @@ for opt do
-   ;;
-   --enable-vnc-png) vnc_png="yes"
-   ;;
-+  --enable-pcap) pcap="yes"
-+  ;;
-+  --disable-pcap) pcap="no"
-+  ;;
-   --disable-slirp) slirp="no"
-   ;;
-   --disable-uuid) uuid="no"
-@@ -2354,6 +2361,51 @@ EOF
- fi
- 
- ##########################################
-+# pcap probe
-+
-+if test "$pcap" = "yes" -a "$pcap" != "no"; then
-+  cat > $TMPC << EOF
-+#include <pcap.h>
-+int main(void) { return (pcap_lib_version() == (char *)0 ? 1 : 0); }
-+EOF
-+  if test "$mingw32" = "no" ; then
-+    libpcap=-lpcap
-+  else
-+    libpcap=-lwpcap
-+  fi
-+  if compile_prog "" "$libpcap" ; then
-+    :
-+  else
-+    echo
-+    echo "Error: Could not find pcap"
-+    echo "Make sure to have the pcap libs and headers installed."
-+    echo
-+    exit 1
-+  fi
-+  cat > $TMPC << EOF
-+#include <pcap.h>
-+int main(void)
-+{
-+  char errbuf[PCAP_ERRBUF_SIZE];
-+  return (pcap_create("foo", errbuf) == (pcap_t *)0 ? 1 : 0);
-+}
-+EOF
-+  if compile_prog "" "$libpcap" ; then
-+    pcap_create="yes"
-+  fi
-+  cat > $TMPC << EOF
-+#define PCAP_DONT_INCLUDE_PCAP_BPF_H
-+#include <pcap.h>
-+#include <net/bpf.h>
-+int main(void) { return (BPF_MAJOR_VERSION); }
-+EOF
-+  if compile_prog ; then
-+    bpf="yes"
-+  fi
-+  libs_softmmu="$libpcap $libs_softmmu"
-+fi # test "$pcap"
-+
-+##########################################
- # VNC TLS/WS detection
- if test "$vnc" = "yes" -a "$vnc_tls" != "no" ; then
-   cat > $TMPC <<EOF
-@@ -4515,6 +4567,7 @@ echo "Audio drivers     $audio_drv_list"
- echo "Block whitelist (rw) $block_drv_rw_whitelist"
- echo "Block whitelist (ro) $block_drv_ro_whitelist"
- echo "VirtFS support    $virtfs"
-+echo "pcap support      $pcap"
- echo "VNC support       $vnc"
- if test "$vnc" = "yes" ; then
-     echo "VNC TLS support   $vnc_tls"
-@@ -4692,6 +4745,15 @@ fi
- if test "$profiler" = "yes" ; then
-   echo "CONFIG_PROFILER=y" >> $config_host_mak
- fi
-+if test "$pcap" = "yes" ; then
-+  echo "CONFIG_PCAP=y" >> $config_host_mak
-+  if test "$pcap_create" = "yes" ; then
-+    echo "CONFIG_PCAP_CREATE=y" >> $config_host_mak
-+  fi
-+  if test "$bpf" = "yes" ; then
-+    echo "CONFIG_BPF=y" >> $config_host_mak
-+  fi
-+fi
- if test "$slirp" = "yes" ; then
-   echo "CONFIG_SLIRP=y" >> $config_host_mak
-   echo "CONFIG_SMBD_COMMAND=\"$smbd\"" >> $config_host_mak
 --- net/clients.h.orig	2015-08-11 19:11:09 UTC
 +++ net/clients.h
@@ -49,6 +49,12 @@ int net_init_bridge(const NetClientOptio
@ -213,7 +114,7 @@
 +
 +int net_init_pcap(const NetClientOptions *opts, const char *name, NetClientState *peer)
 +{
-+    const NetdevPcapOptions *pcap_opts = opts->pcap;
+    const NetdevPcapOptions *pcap_opts = opts->u.pcap;
 +    NetClientState *nc;
 +    struct PCAPState *s;
 +    const char *ifname;
--- a/emulators/qemu/pkg-plist
+++ b/emulators/qemu/pkg-plist
@ -1,32 +1,34 @@
+%%SOFTMMU%%bin/ivshmem-client
+%%SOFTMMU%%bin/ivshmem-server
 %%SOFTMMU%%bin/qemu-ga
 %%SOFTMMU%%bin/qemu-img
 %%SOFTMMU%%bin/qemu-io
 %%SOFTMMU%%bin/qemu-nbd
-%%X86_TARGETS%%bin/qemu-system-aarch64
-%%X86_TARGETS%%bin/qemu-system-alpha
-%%X86_TARGETS%%bin/qemu-system-arm
-%%X86_TARGETS%%bin/qemu-system-cris
+%%NO_X86_TARGETS%%bin/qemu-system-aarch64
+%%NO_X86_TARGETS%%bin/qemu-system-alpha
+%%NO_X86_TARGETS%%bin/qemu-system-arm
+%%NO_X86_TARGETS%%bin/qemu-system-cris
 %%SOFTMMU%%bin/qemu-system-i386
-%%X86_TARGETS%%bin/qemu-system-lm32
-%%X86_TARGETS%%bin/qemu-system-m68k
-%%X86_TARGETS%%bin/qemu-system-microblaze
-%%X86_TARGETS%%bin/qemu-system-microblazeel
-%%X86_TARGETS%%bin/qemu-system-mips
-%%X86_TARGETS%%bin/qemu-system-mips64
-%%X86_TARGETS%%bin/qemu-system-mips64el
-%%X86_TARGETS%%bin/qemu-system-mipsel
-%%X86_TARGETS%%bin/qemu-system-moxie
-%%X86_TARGETS%%bin/qemu-system-or32
-%%X86_TARGETS%%bin/qemu-system-ppc
-%%X86_TARGETS%%bin/qemu-system-ppc64
-%%X86_TARGETS%%bin/qemu-system-ppcemb
-%%X86_TARGETS%%bin/qemu-system-s390x
-%%X86_TARGETS%%bin/qemu-system-sh4
-%%X86_TARGETS%%bin/qemu-system-sh4eb
-%%X86_TARGETS%%bin/qemu-system-sparc
-%%X86_TARGETS%%bin/qemu-system-sparc64
-%%X86_TARGETS%%bin/qemu-system-tricore
-%%X86_TARGETS%%bin/qemu-system-unicore32
+%%NO_X86_TARGETS%%bin/qemu-system-lm32
+%%NO_X86_TARGETS%%bin/qemu-system-m68k
+%%NO_X86_TARGETS%%bin/qemu-system-microblaze
+%%NO_X86_TARGETS%%bin/qemu-system-microblazeel
+%%NO_X86_TARGETS%%bin/qemu-system-mips
+%%NO_X86_TARGETS%%bin/qemu-system-mips64
+%%NO_X86_TARGETS%%bin/qemu-system-mips64el
+%%NO_X86_TARGETS%%bin/qemu-system-mipsel
+%%NO_X86_TARGETS%%bin/qemu-system-moxie
+%%NO_X86_TARGETS%%bin/qemu-system-or32
+%%NO_X86_TARGETS%%bin/qemu-system-ppc
+%%NO_X86_TARGETS%%bin/qemu-system-ppc64
+%%NO_X86_TARGETS%%bin/qemu-system-ppcemb
+%%NO_X86_TARGETS%%bin/qemu-system-s390x
+%%NO_X86_TARGETS%%bin/qemu-system-sh4
+%%NO_X86_TARGETS%%bin/qemu-system-sh4eb
+%%NO_X86_TARGETS%%bin/qemu-system-sparc
+%%NO_X86_TARGETS%%bin/qemu-system-sparc64
+%%NO_X86_TARGETS%%bin/qemu-system-tricore
+%%NO_X86_TARGETS%%bin/qemu-system-unicore32
 %%BSD_USER%%bin/qemu-arm%%STATIC%%
 %%BSD_USER%%bin/qemu-i386%%STATIC%%
 %%BSD_USER%%bin/qemu-mips%%STATIC%%
@ -37,9 +39,10 @@
 %%BSD_USER64%%bin/qemu-sparc64%%STATIC%%
 %%BSD_USER64%%bin/qemu-x86_64%%STATIC%%
 %%SOFTMMU%%bin/qemu-system-x86_64
-%%X86_TARGETS%%bin/qemu-system-xtensa
-%%X86_TARGETS%%bin/qemu-system-xtensaeb
+%%NO_X86_TARGETS%%bin/qemu-system-xtensa
+%%NO_X86_TARGETS%%bin/qemu-system-xtensaeb
 %%SOFTMMU%%man/man1/qemu.1.gz
+%%SOFTMMU%%man/man8/qemu-ga.8.gz
 %%SOFTMMU%%man/man1/qemu-img.1.gz
 %%SOFTMMU%%man/man8/qemu-nbd.8.gz
 %%SOFTMMU%%@sample etc/qemu-ifup.sample
--- a/emulators/qmc2/Makefile
+++ b/emulators/qmc2/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	qmc2
-PORTVERSION=	0.63
+PORTVERSION=	0.64
 CATEGORIES=	emulators
 MASTER_SITES=	SF

@ -17,11 +17,12 @@ OPTIONS_DEFINE=	DOCS
 NO_WRKSUBDIR=	yes

 USES=		gmake tar:bzip2
-USE_XORG=	xmu
-USE_GL=		glu
-USE_QT4=	gui opengl phonon qtestlib webkit xml \
-		moc_build qmake_build rcc_build scripttools \
-		uic_build
+USE_XORG=	x11 xmu
+USE_GL=		gl glu
+USE_QT4=	corelib declarative gui moc_build \
+		network opengl phonon qmake_build \
+		qtestlib rcc_build script scripttools \
+		sql svg uic_build webkit xml xmlpatterns
 USE_SDL=	sdl

 CXXFLAGS+=	-I${LOCALBASE}/include/SDL/
--- a/emulators/qmc2/distinfo
+++ b/emulators/qmc2/distinfo
@ -1,2 +1,3 @@
-SHA256 (qmc2-0.63.tar.bz2) = 320faec68e8704e7b5c8c7035b0dc2f7d92a69cc87a5906cb86586d49b4a4928
-SIZE (qmc2-0.63.tar.bz2) = 13466349
+TIMESTAMP = 1465589816
+SHA256 (qmc2-0.64.tar.bz2) = 16b9e6a68d4bfa3d640f3d159ddbec69294dd7582914e96b03654c54ce967be4
+SIZE (qmc2-0.64.tar.bz2) = 13426099
--- a/games/capicity/Makefile
+++ b/games/capicity/Makefile
@ -42,20 +42,12 @@ OPTIONS_SUB=	yes
 NLS_CONFIGURE_ENABLE=	nls
 NLS_USES=		gettext

-.include <bsd.port.options.mk>
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/CapiCity \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
-
 .for d in games images
 	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR})
 .endfor
-
-.if ${PORT_OPTIONS:MNLS}
-	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ts ${STAGEDIR}${DATADIR})
-.endif
-
 .for s in ${ICON_SIZES}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps
 	${INSTALL_DATA} ${WRKSRC}/icons/${s}.png \
@ -64,6 +56,10 @@ do-install:
 	${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps/

+do-install-NLS-on:
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} ts ${STAGEDIR}${DATADIR})
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}

--- a/games/nlarn/Makefile
+++ b/games/nlarn/Makefile
@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF

-MAINTAINER=	ports@toco-domains.de
+MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Roguelike game and as such a remake of the classic game Larn

 LICENSE=	GPLv3
--- a/games/wesnoth/Makefile
+++ b/games/wesnoth/Makefile
@ -8,7 +8,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERS
 		http://files.wesnoth.org/ \
 		http://ports.toco-domains.de/

-MAINTAINER=	ports@toco-domains.de
+MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Fantasy turn-based strategy game

 LICENSE=	GPLv2 GPLv3
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	feh
-PORTVERSION=	2.15.4
+PORTVERSION=	2.16
 CATEGORIES=	graphics
 MASTER_SITES=	http://feh.finalrewind.org/ \
 		LOCAL/uqs
@ -14,7 +14,8 @@ LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING

 LIB_DEPENDS=	libcurl.so:ftp/curl \
-		libImlib2.so:graphics/imlib2
+		libImlib2.so:graphics/imlib2 \
+		libpng16.so:graphics/png

 USE_XORG=	x11 xt xinerama
 USES=		cpe desktop-file-utils gmake perl5 shebangfix tar:bzip2
--- a/graphics/feh/distinfo
+++ b/graphics/feh/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1465231542
-SHA256 (feh-2.15.4.tar.bz2) = b8a9c29f37b1349228b19866f712b677e2a150837bc46be8c5d6348dd4850758
-SIZE (feh-2.15.4.tar.bz2) = 2124632
+TIMESTAMP = 1465500134
+SHA256 (feh-2.16.tar.bz2) = a2639dec600ffac3ac3d3ffb4254bef7385082b9c417bef72167b7b258778e4c
+SIZE (feh-2.16.tar.bz2) = 2125570
--- a/graphics/wxsvg/Makefile
+++ b/graphics/wxsvg/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	wxsvg
-PORTVERSION=	1.5.7
+PORTVERSION=	1.5.8
 CATEGORIES=	graphics
 MASTER_SITES=	SF

@ -14,10 +14,10 @@ LICENSE=	LGPL21+
 LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg \
 		libexpat.so:textproc/expat2

-USES=		compiler:c++11-lib gmake libtool pathfix pkgconfig tar:bzip2
+USES=		compiler:c++11-lib gettext-runtime gmake libtool pathfix pkgconfig tar:bzip2
 USE_WX=		3.0
 WX_CONF_ARGS=	absolute
-USE_GNOME=	cairo
+USE_GNOME=	cairo glib20 pango
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBAV_CFLAGS="${LIBAV_CFLAGS}" LIBAV_LIBS="${LIBAV_LIBS}" \
 		CXXFLAGS="${CXXFLAGS} -std=c++11"
--- a/graphics/wxsvg/distinfo
+++ b/graphics/wxsvg/distinfo
@ -1,2 +1,3 @@
-SHA256 (wxsvg-1.5.7.tar.bz2) = ae70cffeadbc7b1ec7e921e7f69816f586089289f9e684039356968022bdbd4d
-SIZE (wxsvg-1.5.7.tar.bz2) = 496443
+TIMESTAMP = 1465586718
+SHA256 (wxsvg-1.5.8.tar.bz2) = e349abf4f77a06bdb75fd615f07a87518faafeac68b510ce6215c43d52e8587c
+SIZE (wxsvg-1.5.8.tar.bz2) = 513575
--- a/graphics/wxsvg/pkg-plist
+++ b/graphics/wxsvg/pkg-plist
@ -190,5 +190,5 @@ include/wxSVGXML/svgxmlhelpr.h
 lib/libwxsvg.a
 lib/libwxsvg.so
 lib/libwxsvg.so.3
-lib/libwxsvg.so.3.10.0
+lib/libwxsvg.so.3.10.1
 libdata/pkgconfig/libwxsvg.pc
--- a/java/intellij/Makefile
+++ b/java/intellij/Makefile
@ -5,7 +5,7 @@
 # Vadim Zhukov <zhuk@openbsd.org>

 PORTNAME=	intellij
-PORTVERSION=	2016.1.2b
+PORTVERSION=	2016.1.3
 CATEGORIES=	java devel
 MASTER_SITES=	https://download.jetbrains.com/idea/ \
 		http://download.jetbrains.com/idea/
@ -25,7 +25,7 @@ JAVA_VERSION=	1.7+
 NO_ARCH=	yes
 NO_BUILD=	yes

-WRKDIST=	${WRKDIR}/idea-IC-145.972.3
+WRKDIST=	${WRKDIR}/idea-IC-145.1617.8

 .include "common.mk"

--- a/java/intellij/distinfo
+++ b/java/intellij/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1463436276
-SHA256 (ideaIC-2016.1.2b.tar.gz) = 9e3e0f4538707da37237106697fff4e0b5ed651085f456671764e1fbc9651bbe
-SIZE (ideaIC-2016.1.2b.tar.gz) = 316986526
+TIMESTAMP = 1465227325
+SHA256 (ideaIC-2016.1.3.tar.gz) = d1cd3f9fd650c00ba85181da6d66b4b80b8e48ce5f4f15b5f4dc67453e96a179
+SIZE (ideaIC-2016.1.3.tar.gz) = 317001830
--- a/lang/Makefile
+++ b/lang/Makefile
@ -99,6 +99,7 @@
    SUBDIR += gcc5
    SUBDIR += gcc5-aux
    SUBDIR += gcc5-devel
+    SUBDIR += gcc6
    SUBDIR += gcc6-aux
    SUBDIR += gcc6-devel
    SUBDIR += gcc7-devel
--- a/lang/gcc6-devel/Makefile
+++ b/lang/gcc6-devel/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	gcc
-PORTVERSION=	6.1.1.s20160602
+PORTVERSION=	6.1.1.s20160609
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/snapshots/${DISTVERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
--- a/lang/gcc6-devel/distinfo
+++ b/lang/gcc6-devel/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1464957280
-SHA256 (gcc-6-20160602.tar.bz2) = 4ca2cca4938ecb72fedd39df9fbac1fedd1e1efe23536a083643d17732a088cc
-SIZE (gcc-6-20160602.tar.bz2) = 95411803
+TIMESTAMP = 1465543668
+SHA256 (gcc-6-20160609.tar.bz2) = d8e7ef85b60ea05d9bcb64d03d9a41b45eb657bd14b39ec54fe9fccbaa92f325
+SIZE (gcc-6-20160609.tar.bz2) = 95475293
--- a/lang/gcc6/Makefile
+++ b/lang/gcc6/Makefile
@ -0,0 +1,177 @@
+# Created by: Gerald Pfeifer <gerald@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	gcc
+PORTVERSION=	6.1.0
+CATEGORIES=	lang java
+MASTER_SITES=	GCC/releases/gcc-${DISTVERSION}
+PKGNAMESUFFIX=	${SUFFIX}
+
+MAINTAINER=	gerald@FreeBSD.org
+COMMENT=	GNU Compiler Collection 6
+
+LICENSE=	GPLv3 GPLv3RLE
+LICENSE_COMB=	multi
+
+BROKEN_powerpc64=	Does not build
+
+LIB_DEPENDS=	libgmp.so:math/gmp \
+		libmpfr.so:math/mpfr \
+		libmpc.so:math/mpc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
+RUN_DEPENDS+=	${LOCALBASE}/bin/as:devel/binutils
+
+.if defined(MAINTAINER_MODE)
+BUILD_DEPENDS+=	runtest:misc/dejagnu
+.endif
+
+CPE_VENDOR=	gnu
+CPE_VERSION=	${GCC_VERSION}
+
+# DISTVERSION relates to downloads, GCC_VERSION and SUFFIX to names
+# of executables and directories once installed.  A PORTVERSION of
+# Y.2.1.s20140817 results in values of Y-20140817, Y.2.1, and Y
+# for these three.
+DISTVERSION=	${PORTVERSION:C/([0-9]+).*\.s([0-9]+)/\1-\2/}
+GCC_VERSION=	${PORTVERSION:C/(.+)\.s[0-9]{8}/\1/}
+SUFFIX=		${PORTVERSION:C/([0-9]+).*/\1/}
+ONLY_FOR_ARCHS=	amd64 i386 powerpc powerpc64 sparc64 arm armv6 armv6hf
+USES=		compiler cpe gmake iconv libtool makeinfo perl5 tar:bzip2
+USE_BINUTILS=	yes
+USE_PERL5=	build
+SSP_UNSAFE=	yes
+
+OPTIONS_DEFINE=		BOOTSTRAP GRAPHITE
+OPTIONS_DEFINE_i386=	JAVA
+OPTIONS_DEFINE_amd64=	JAVA
+OPTIONS_DEFINE_powerpc64=	JAVA
+OPTIONS_DEFAULT=	BOOTSTRAP
+OPTIONS_DEFAULT_i386=	JAVA
+OPTIONS_DEFAULT_amd64=	JAVA
+OPTIONS_DEFAULT_powerpc64=	JAVA
+OPTIONS_EXCLUDE_DragonFly=	JAVA
+BOOTSTRAP_DESC=		Build using a full bootstrap
+GRAPHITE_DESC=		Support for Graphite loop optimizations
+
+.if exists(/usr/lib32/libc.so)
+OPTIONS_DEFINE_powerpc64+=	MULTILIB
+OPTIONS_DEFAULT_powerpc64+=	MULTILIB
+MULTILIB_DESC=		Build support for 32-bit and 64-bit targets
+MULTILIB_CONFIGURE_ENABLE=	multilib
+.else
+CONFIGURE_ARGS+=	--disable-multilib
+.endif
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "amd64"
+CONFIGURE_TARGET=	x86_64-portbld-${OPSYS:tl}${OSREL}
+.endif
+
+.if ${ARCH} == powerpc64
+CONFIGURE_ENV+=	UNAME_m="powerpc64"
+USE_GCC=	4.9+
+.endif
+
+.if ${ARCH} == "armv6" || ${ARCH} == "armv6hf"
+. if ${COMPILER_TYPE} == clang
+.  if empty(PORT_OPTIONS:MBOOTSTRAP)
+MAKE_ARGS+=CXXFLAGS=-fbracket-depth=512
+.  else
+MAKE_ARGS+=STAGE1_CXXFLAGS=-fbracket-depth=512
+.  endif
+. endif
+.endif
+
+LANGUAGES:=	c,c++,objc,fortran
+TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
+LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
+GNU_CONFIGURE=	yes
+CONFIGURE_OUTSOURCE=	yes
+.if empty(PORT_OPTIONS:MBOOTSTRAP)
+CONFIGURE_ARGS+=--disable-bootstrap
+.else
+CONFIGURE_ARGS+=--with-build-config=bootstrap-debug
+ALL_TARGET=	bootstrap-lean
+.endif
+CONFIGURE_ARGS+=--disable-nls \
+		--enable-gnu-indirect-function \
+		--libdir=${TARGLIB} \
+		--libexecdir=${LIBEXEC} \
+		--program-suffix=${SUFFIX} \
+		--with-as=${LOCALBASE}/bin/as \
+		--with-gmp=${LOCALBASE} \
+		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
+		--with-ld=${LOCALBASE}/bin/ld \
+		${ICONV_CONFIGURE_ARG} \
+		--with-pkgversion="FreeBSD Ports Collection" \
+		--with-system-zlib
+MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
+USE_LDCONFIG=	${TARGLIB}
+PLIST_SUB=	GCC_VERSION=${GCC_VERSION} \
+		GNU_HOST=${CONFIGURE_TARGET} \
+		SUFFIX=${SUFFIX}
+INFO=		gcc${SUFFIX}/cpp \
+		gcc${SUFFIX}/cppinternals \
+		gcc${SUFFIX}/gcc \
+		gcc${SUFFIX}/gccinstall \
+		gcc${SUFFIX}/gccint \
+		gcc${SUFFIX}/gfortran \
+		gcc${SUFFIX}/libgomp
+# Release tarballs (as opposed to snapshots) always carry this.
+#.if ${ARCH} == "i386" || ${ARCH} == "amd64"
+INFO+=		gcc${SUFFIX}/libquadmath \
+		gcc${SUFFIX}/libitm
+#.endif
+SUB_FILES=	pkg-message
+SUB_LIST+=	TARGLIB=${TARGLIB}
+
+.if ${PORT_OPTIONS:MGRAPHITE}
+LIB_DEPENDS+=	libisl.so:devel/isl
+CONFIGURE_ARGS+=--with-isl=${LOCALBASE}
+.endif
+
+.if ${PORT_OPTIONS:MJAVA}
+ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
+BUILD_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45 \
+		zip:archivers/zip
+RUN_DEPENDS+=	${ECJ_JAR}:lang/gcc-ecj45
+EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
+CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
+LANGUAGES:=	${LANGUAGES},java
+INFO+=		gcc${SUFFIX}/cp-tools \
+		gcc${SUFFIX}/gcj
+PLIST_SUB+=	JAVA=""
+.else
+CONFIGURE_ARGS+=--disable-libgcj
+PLIST_SUB+=	JAVA="@comment "
+.endif
+CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
+
+pre-everything::
+	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
+
+pre-configure:
+	cd ${WRKSRC} ; contrib/gcc_update --touch
+	@${RM} -f ${WRKSRC}/gcc/*/*.info*
+
+.if defined(MAINTAINER_MODE)
+full-regression-test: build
+	cd ${TEST_WRKSRC}; ${MAKE_CMD} -sk check \
+	; ${WRKSRC}/contrib/test_summary
+.endif
+
+post-stage:
+	${RM} -f ${STAGEDIR}${PREFIX}/man/man7/*
+	${RM} -f ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \
+	         ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1
+	# Add target libraries and include files to packaging list.
+	${RM} -f ${WRKDIR}/PLIST.lib
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+	cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \
+	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
+	fi
+.endfor
+	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
+
+.include <bsd.port.post.mk>
--- a/lang/gcc6/distinfo
+++ b/lang/gcc6/distinfo
@ -0,0 +1,2 @@
+SHA256 (gcc-6.1.0.tar.bz2) = 09c4c85cabebb971b1de732a0219609f93fc0af5f86f6e437fd8d7f832f1a351
+SIZE (gcc-6.1.0.tar.bz2) = 99267556
--- a/lang/gcc6/files/java-patch-hier
+++ b/lang/gcc6/files/java-patch-hier
@ -0,0 +1,11 @@
+--- libjava/Makefile.in	2013-05-26 22:33:07.000000000 +0000
+++ libjava/Makefile.in	2013-05-31 21:19:23.000000000 +0000
+@@ -941,7 +941,7 @@
+ @BUILD_SUBLIBS_FALSE@LIBJAVA_CORE_EXTRA = 
+ @BUILD_SUBLIBS_TRUE@LIBJAVA_CORE_EXTRA = @LIBGCJ_SUBLIB_CORE_EXTRA_DEPS@
+ dbexec_LTLIBRARIES = libjvm.la
+-pkgconfigdir = $(toolexeclibdir)/pkgconfig
+pkgconfigdir = $(prefix)/libdata/pkgconfig
+ jardir = $(datadir)/java
+ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar \
+ 	$(am__append_5)
--- a/lang/gcc6/files/patch-arm-unwind-cxx-support
+++ b/lang/gcc6/files/patch-arm-unwind-cxx-support
@ -0,0 +1,106 @@
+--- UTC
+Index: gcc/ginclude/unwind-arm-common.h
+===================================================================
+--- gcc/ginclude/unwind-arm-common.h	(revision 219113)
+++ gcc/ginclude/unwind-arm-common.h	(working copy)
+@@ -82,7 +82,11 @@
+ 
+   struct _Unwind_Control_Block
+     {
+#ifdef __FreeBSD__
+      unsigned exception_class __attribute__((__mode__(__DI__)));
+#else
+       char exception_class[8];
+#endif
+       void (*exception_cleanup)(_Unwind_Reason_Code, _Unwind_Control_Block *);
+       /* Unwinder cache, private fields for the unwinder's use */
+       struct
+@@ -181,7 +185,11 @@
+ 
+   /* Support functions for the PR.  */
+ #define _Unwind_Exception _Unwind_Control_Block
+#ifdef __FreeBSD__
+  typedef unsigned _Unwind_Exception_Class __attribute__((__mode__(__DI__)));
+#else
+   typedef char _Unwind_Exception_Class[8];
+#endif
+ 
+   void * _Unwind_GetLanguageSpecificData (_Unwind_Context *);
+   _Unwind_Ptr _Unwind_GetRegionStart (_Unwind_Context *);
+Index: libstdc++-v3/libsupc++/unwind-cxx.h
+===================================================================
+--- libstdc++-v3/libsupc++/unwind-cxx.h	(revision 219147)
+++ libstdc++-v3/libsupc++/unwind-cxx.h	(working copy)
+@@ -235,7 +235,7 @@
+   return reinterpret_cast<__cxa_dependent_exception *>(exc + 1) - 1;
+ }
+ 
+-#ifdef __ARM_EABI_UNWINDER__
+#if defined(__ARM_EABI_UNWINDER__) && !defined(__FreeBSD__)
+ static inline bool
+ __is_gxx_exception_class(_Unwind_Exception_Class c)
+ {
+@@ -309,13 +309,7 @@
+   c[6] = 'R';
+   c[7] = '\0';
+ }
+-
+-static inline void*
+-__gxx_caught_object(_Unwind_Exception* eo)
+-{
+-  return (void*)eo->barrier_cache.bitpattern[0];
+-}
+-#else // !__ARM_EABI_UNWINDER__
+#else // !__ARM_EABI_UNWINDER__ || __FreeBSD__
+ // This is the primary exception class we report -- "GNUCC++\0".
+ const _Unwind_Exception_Class __gxx_primary_exception_class
+ = ((((((((_Unwind_Exception_Class) 'G' 
+@@ -339,6 +333,16 @@
+     << 8 | (_Unwind_Exception_Class) '+')
+    << 8 | (_Unwind_Exception_Class) '\x01');
+ 
+const _Unwind_Exception_Class __gxx_forced_unwind_class
+= ((((((((_Unwind_Exception_Class) 'G'
+        << 8 | (_Unwind_Exception_Class) 'N')
+       << 8 | (_Unwind_Exception_Class) 'U')
+      << 8 | (_Unwind_Exception_Class) 'C')
+     << 8 | (_Unwind_Exception_Class) 'F')
+    << 8 | (_Unwind_Exception_Class) 'O')
+   << 8 | (_Unwind_Exception_Class) 'R')
+  << 8 | (_Unwind_Exception_Class) '\0');
+
+ static inline bool
+ __is_gxx_exception_class(_Unwind_Exception_Class c)
+ {
+@@ -346,6 +350,12 @@
+       || c == __gxx_dependent_exception_class;
+ }
+ 
+static inline bool
+__is_gxx_forced_unwind_class(_Unwind_Exception_Class c)
+{
+  return c ==  __gxx_forced_unwind_class;
+}
+
+ // Only checks for primary or dependent, but not that it is a C++ exception at
+ // all.
+ static inline bool
+@@ -357,7 +367,18 @@
+ #define __GXX_INIT_PRIMARY_EXCEPTION_CLASS(c) c = __gxx_primary_exception_class
+ #define __GXX_INIT_DEPENDENT_EXCEPTION_CLASS(c) \
+   c = __gxx_dependent_exception_class
+#define __GXX_INIT_FORCED_UNWIND_CLASS(c) c = __gxx_forced_unwind_class 
+#endif // __ARM_EABI_UNWINDER__ && !__FreeBSD__
+ 
+#ifdef __ARM_EABI_UNWINDER__
+static inline void*
+__gxx_caught_object(_Unwind_Exception* eo)
+{
+    return (void*)eo->barrier_cache.bitpattern[0];
+}
+
+#else // !__ARM_EABI_UNWINDER__
+
+ // GNU C++ personality routine, Version 0.
+ extern "C" _Unwind_Reason_Code __gxx_personality_v0
+      (int, _Unwind_Action, _Unwind_Exception_Class,
--- a/lang/gcc6/files/patch-unwind-ia64.h
+++ b/lang/gcc6/files/patch-unwind-ia64.h
@ -0,0 +1,21 @@
+2012-12-17  Gerald Pfeifer  <gerald@pfeifer.com>
+            Anton Shterenlikht  <mexas@bristol.ac.uk>
+
+       PR target/45650
+       * config/ia64/unwind-ia64.h: Do not mark _Unwind_FindTableEntry
+       hidden on FreeBSD.
+
+--- UTC
+Index: libgcc/config/ia64/unwind-ia64.h
+===================================================================
+--- libgcc/config/ia64/unwind-ia64.h
+++ libgcc/config/ia64/unwind-ia64.h	(working copy)
+@@ -49,4 +49,7 @@
+ extern struct unw_table_entry *
+ _Unwind_FindTableEntry (void *pc, unw_word *segment_base,
+ 			unw_word *gp, struct unw_table_entry *ent)
+-			__attribute__ ((__visibility__ ("hidden")));
+#ifndef __FreeBSD__
+			__attribute__ ((__visibility__ ("hidden")))
+#endif
+			;
--- a/lang/gcc6/files/pkg-message.in
+++ b/lang/gcc6/files/pkg-message.in
@ -0,0 +1,7 @@
+To ensure binaries built with this toolchain find appropriate versions
+of the necessary run-time libraries, you may want to link using
+
+  -Wl,-rpath=%%TARGLIB%%
+
+For ports leveraging USE_GCC, USES=compiler, or USES=fortran this happens
+transparently.
--- a/lang/gcc6/pkg-descr
+++ b/lang/gcc6/pkg-descr
@ -0,0 +1,7 @@
+GCC, the GNU Compiler Collection, supports a number of languages.  This
+port installs the C, C++, Fortran and Java front ends as gcc6, g++6,
+gfortran6, and gcj6, respectively.
+
+WWW: http://gcc.gnu.org/
+
+Gerald Pfeifer <gerald@FreeBSD.org>
--- a/lang/gcc6/pkg-plist
+++ b/lang/gcc6/pkg-plist
@ -0,0 +1,78 @@
+bin/%%GNU_HOST%%-c++%%SUFFIX%%
+bin/%%GNU_HOST%%-g++%%SUFFIX%%
+bin/%%GNU_HOST%%-gcc%%SUFFIX%%
+bin/%%GNU_HOST%%-gcc-%%GCC_VERSION%%
+bin/%%GNU_HOST%%-gcc-ar%%SUFFIX%%
+bin/%%GNU_HOST%%-gcc-nm%%SUFFIX%%
+bin/%%GNU_HOST%%-gcc-ranlib%%SUFFIX%%
+bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
+bin/c++%%SUFFIX%%
+bin/cpp%%SUFFIX%%
+bin/g++%%SUFFIX%%
+bin/gcc%%SUFFIX%%
+bin/gcc-ar%%SUFFIX%%
+bin/gcc-nm%%SUFFIX%%
+bin/gcc-ranlib%%SUFFIX%%
+bin/gcov%%SUFFIX%%
+bin/gcov-tool%%SUFFIX%%
+bin/gfortran%%SUFFIX%%
+@comment info/gcc%%SUFFIX%%/dir
+man/man1/cpp%%SUFFIX%%.1.gz
+man/man1/g++%%SUFFIX%%.1.gz
+man/man1/gcc%%SUFFIX%%.1.gz
+man/man1/gcov%%SUFFIX%%.1.gz
+man/man1/gfortran%%SUFFIX%%.1.gz
+%%JAVA%%share/gcc-%%GCC_VERSION%%/python/libjava/aotcompile.py
+%%JAVA%%share/gcc-%%GCC_VERSION%%/python/libjava/classfile.py
+share/gcc-%%GCC_VERSION%%/python/libstdcxx/__init__.py
+share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/__init__.py
+share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py
+share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/xmethods.py
+%%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
+%%JAVA%%bin/aot-compile%%SUFFIX%%
+%%JAVA%%bin/gappletviewer%%SUFFIX%%
+%%JAVA%%bin/gc-analyze%%SUFFIX%%
+%%JAVA%%bin/gcj%%SUFFIX%%
+%%JAVA%%bin/gcj-dbtool%%SUFFIX%%
+%%JAVA%%bin/gcjh%%SUFFIX%%
+%%JAVA%%bin/gij%%SUFFIX%%
+%%JAVA%%bin/gjar%%SUFFIX%%
+%%JAVA%%bin/gjarsigner%%SUFFIX%%
+%%JAVA%%bin/gjavah%%SUFFIX%%
+%%JAVA%%bin/gkeytool%%SUFFIX%%
+%%JAVA%%bin/gnative2ascii%%SUFFIX%%
+%%JAVA%%bin/gorbd%%SUFFIX%%
+%%JAVA%%bin/grmic%%SUFFIX%%
+%%JAVA%%bin/grmid%%SUFFIX%%
+%%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/gserialver%%SUFFIX%%
+%%JAVA%%bin/gtnameserv%%SUFFIX%%
+%%JAVA%%bin/jcf-dump%%SUFFIX%%
+%%JAVA%%bin/jv-convert%%SUFFIX%%
+%%JAVA%%libdata/pkgconfig/libgcj-6.pc
+%%JAVA%%man/man1/aot-compile%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gappletviewer%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gc-analyze%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gcj%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gcj-dbtool%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gcjh%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gij%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gjar%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gjarsigner%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gjavah%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gjdoc%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gkeytool%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gnative2ascii%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gorbd%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/grmic%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/grmid%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/grmiregistry%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gserialver%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/gtnameserv%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/jcf-dump%%SUFFIX%%.1.gz
+%%JAVA%%man/man1/jv-convert%%SUFFIX%%.1.gz
+%%JAVA%%share/java/libgcj-%%GCC_VERSION%%.jar
+%%JAVA%%share/java/libgcj-tools-%%GCC_VERSION%%.jar
+@postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
+@postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi
+@comment Insert PLIST.lib here
--- a/mail/pear-MIME_Type/Makefile
+++ b/mail/pear-MIME_Type/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	MIME_Type
-PORTVERSION=	1.4.0
+PORTVERSION=	1.4.1
 CATEGORIES=	mail www pear

 MAINTAINER=	bofh@FreeBSD.org
--- a/mail/pear-MIME_Type/distinfo
+++ b/mail/pear-MIME_Type/distinfo
@ -1,2 +1,3 @@
-SHA256 (PEAR/MIME_Type-1.4.0.tgz) = b4a3bcdd934c81584cd58938543295cfa320a6ee4de82371ede50e17ccf772d2
-SIZE (PEAR/MIME_Type-1.4.0.tgz) = 13656
+TIMESTAMP = 1465561190
+SHA256 (PEAR/MIME_Type-1.4.1.tgz) = ee46853524110b2f076f444d835fea4301dc0216db6484918994903fba8e8e2d
+SIZE (PEAR/MIME_Type-1.4.1.tgz) = 21807
--- a/mail/phpmailer/Makefile
+++ b/mail/phpmailer/Makefile
@ -6,7 +6,7 @@ PORTVERSION=	5.2.14
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail

-MAINTAINER=	ports@toco-domains.de
+MAINTAINER=	tz@FreeBSD.org
 COMMENT=	Full Featured Email Transfer Class for PHP

 LICENSE=	LGPL21
--- a/mail/roundcube/Makefile
+++ b/mail/roundcube/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	roundcube
-DISTVERSION=	1.1.5
+DISTVERSION=	1.2.0
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES?=	mail www
@ -24,10 +24,9 @@ CPE_PRODUCT=	webmail
 CPE_VENDOR=	roundcube

 WANT_PHP_WEB=	yes
-USE_PHP=	pcre mbstring session iconv dom xml json intl zip filter
-IGNORE_WITH_PHP=70
+USE_PHP=	pcre mbstring session iconv dom xml json intl zip filter openssl fileinfo exif

-OPTIONS_DEFINE=	SSL LDAP GD PSPELL NSC DOCS
+OPTIONS_DEFINE=	LDAP GD PSPELL NSC DOCS
 OPTIONS_SINGLE=	DB
 OPTIONS_SINGLE_DB=	MYSQL PGSQL SQLITE
 OPTIONS_DEFAULT=MYSQL
@ -35,7 +34,6 @@ OPTIONS_DEFAULT=MYSQL
 MYSQL_DESC=	Use MySQL backend
 PGSQL_DESC=	Use PostgreSQL backend
 SQLITE_DESC=	Use SQLite backend
-SSL_DESC=	Enable SSL support (imaps or google spellcheck)
 LDAP_DESC=	Enable LDAP support (address book)
 GD_DESC=	Enable GD support (image conversion)
 PSPELL_DESC=	Enable PSpell support (internal spellcheck)
@ -55,10 +53,6 @@ USE_PHP+=	pdo_pgsql
 USE_PHP+=	pdo_sqlite
 .endif

-.if ${PORT_OPTIONS:MSSL}
-USE_PHP+=	openssl
-.endif
-
 .if ${PORT_OPTIONS:MLDAP}
 USE_PHP+=	ldap
 .endif
--- a/mail/roundcube/distinfo
+++ b/mail/roundcube/distinfo
@ -1,2 +1,3 @@
-SHA256 (roundcubemail-1.1.5-complete.tar.gz) = 476a1d45b0592b2ad43e3e08cbc72e69ef31e33ed8a8f071f02e5a1ae3e7f334
-SIZE (roundcubemail-1.1.5-complete.tar.gz) = 4581781
+TIMESTAMP = 1465476478
+SHA256 (roundcubemail-1.2.0-complete.tar.gz) = 574895da03b5ad78eaf0843a78e0c0ab734a9327b4ba47b72405b768cb2854cc
+SIZE (roundcubemail-1.2.0-complete.tar.gz) = 3748290
--- a/mail/roundcube/files/patch-CVE-2016-5103
+++ b/mail/roundcube/files/patch-CVE-2016-5103
@ -1,19 +0,0 @@
-commit 6652367d656de7e5f404935be04e10aa281add53
-Author: Aleksander Machniak <alec@alec.pl>
-Date:   Fri May 6 08:28:15 2016 +0200
-
-    Fix XSS issue in href attribute on area tag (#5240, #5241)
-
-diff --git a/program/lib/Roundcube/rcube_washtml.php b/program/lib/Roundcube/rcube_washtml.php
-index 5938d9b..d03f04a 100644
--- program/lib/Roundcube/rcube_washtml.php
-+++ program/lib/Roundcube/rcube_washtml.php
-@@ -370,7 +370,7 @@ class rcube_washtml
-      */
-     private function is_link_attribute($tag, $attr)
-     {
-        return $tag == 'a' && $attr == 'href';
-+        return ($tag == 'a' || $tag == 'area') && $attr == 'href';
-     }
- 
-     /**
--- a/mail/roundcube/files/patch-INSTALL
+++ b/mail/roundcube/files/patch-INSTALL
@ -1,6 +1,6 @@
--- INSTALL.orig	2015-02-08 13:43:29.000000000 +0000
-+++ INSTALL	2015-02-19 12:22:34.259436291 +0000
-@@ -29,7 +29,6 @@
+--- INSTALL.orig	2016-05-22 11:06:47 UTC
+++ INSTALL
+@@ -29,7 +29,6 @@ REQUIREMENTS
    - memory_limit > 16MB (increase as suitable to support large attachments)
    - file_uploads enabled (for attachment upload features)
    - session.auto_start disabled
--- a/mail/roundcube/files/patch-config_defaults.inc.php
+++ b/mail/roundcube/files/patch-config_defaults.inc.php
@ -1,7 +1,7 @@
--- config/defaults.inc.php.orig	2014-04-06 14:13:09.000000000 +0000
-+++ config/defaults.inc.php	2014-04-10 09:08:58.242144399 +0000
-@@ -596,8 +596,8 @@
- // connect to a Nox Spell Server when using 'googie' here. Therefore specify the 'spellcheck_uri'
+--- config/defaults.inc.php.orig	2016-05-22 11:06:45 UTC
+++ config/defaults.inc.php
+@@ -717,8 +717,8 @@ $config['spellcheck_dictionary'] = false
+ // You can connect to any other googie-compliant service by setting 'spellcheck_uri' accordingly.
 $config['spellcheck_engine'] = 'googie';
 
 -// For locally installed Nox Spell Server or After the Deadline services,
--- a/mail/roundcube/files/patch-installer_check.php
+++ b/mail/roundcube/files/patch-installer_check.php
@ -1,8 +1,8 @@
--- installer/check.php.orig	2012-08-06 18:18:13.000000000 +0200
-+++ installer/check.php	2012-08-13 12:36:52.000000000 +0200
-@@ -39,7 +39,6 @@
+--- installer/check.php.orig	2016-05-22 11:06:45 UTC
+++ installer/check.php
+@@ -43,7 +43,6 @@ $ini_checks = array(
+     'file_uploads'                  => 1,
     'session.auto_start'            => 0,
-     'zend.ze1_compatibility_mode'   => 0,
     'mbstring.func_overload'        => 0,
 -    'suhosin.session.encrypt'       => 0,
     'magic_quotes_runtime'          => 0,
--- a/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php
+++ b/mail/roundcube/files/patch-program_lib_Roundcube_bootstrap.php
@ -1,6 +1,6 @@
--- program/lib/Roundcube/bootstrap.php.orig	2014-07-07 18:18:50.261368902 +0000
-+++ program/lib/Roundcube/bootstrap.php	2014-07-07 18:18:58.202127091 +0000
-@@ -38,7 +38,6 @@
+--- program/lib/Roundcube/bootstrap.php.orig	2016-05-22 11:06:47 UTC
+++ program/lib/Roundcube/bootstrap.php
+@@ -37,7 +37,6 @@ $config = array(
 // check these additional ini settings if not called via CLI
 if (php_sapi_name() != 'cli') {
     $config += array(
--- a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
+++ b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_message.php
@ -1,6 +1,6 @@
--- program/lib/Roundcube/rcube_message.php.orig	2010-11-26 13:41:16.000000000 +0100
-+++ program/lib/Roundcube/rcube_message.php	2010-12-13 17:20:59.000000000 +0100
-@@ -452,9 +452,7 @@
+--- program/lib/Roundcube/rcube_message.php.orig	2016-05-22 11:06:47 UTC
+++ program/lib/Roundcube/rcube_message.php
+@@ -766,9 +766,7 @@ class rcube_message
                 }
                 // part is a file/attachment
                 else if (preg_match('/^(inline|attach)/', $mail_part->disposition) ||
--- a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php
+++ b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session.php
@ -1,73 +1,30 @@
--- program/lib/Roundcube/rcube_session.php.orig	2015-09-22 15:24:26.400132239 +0000
-+++ program/lib/Roundcube/rcube_session.php	2015-09-22 15:24:08.430133455 +0000
-@@ -35,7 +35,6 @@
-     private $time_diff = 0;
-     private $reloaded = false;
-     private $appends = array();
-    private $unsets = array();
-     private $gc_handlers = array();
-     private $cookiename = 'roundcube_sessauth';
-     private $vars;
-@@ -46,6 +45,7 @@
-     private $logging = false;
-     private $storage;
-     private $memcache;
-+    private $need_base64 = false;
+--- program/lib/Roundcube/rcube_session.php.orig	2016-05-22 11:06:47 UTC
+++ program/lib/Roundcube/rcube_session.php
+@@ -39,7 +39,6 @@ abstract class rcube_session
+     protected $time_diff    = 0;
+     protected $reloaded     = false;
+     protected $appends      = array();
+-    protected $unsets       = array();
+     protected $gc_enabled   = 0;
+     protected $gc_handlers  = array();
+     protected $cookiename   = 'roundcube_sessauth';
+@@ -158,7 +157,7 @@ abstract class rcube_session
 
-     /**
-      * Blocks session data from being written to database.
-@@ -95,6 +95,9 @@
-         else if ($this->storage != 'php') {
-             ini_set('session.serialize_handler', 'php');
- 
-+            if (ini_get("suhosin.session.encrypt") !== "1")
-+                $this->need_base64 = true;
-+
-             // set custom functions for PHP session management
-             session_set_save_handler(
-                 array($this, 'open'),
-@@ -192,7 +195,7 @@
-             $this->time_diff = time() - strtotime($sql_arr['ts']);
-             $this->changed   = strtotime($sql_arr['changed']);
-             $this->ip        = $sql_arr['ip'];
-            $this->vars      = base64_decode($sql_arr['vars']);
-+            $this->vars      = $this->_decode($sql_arr['vars']);
-             $this->key       = $key;
- 
-             return !empty($this->vars) ? (string) $this->vars : '';
-@@ -232,12 +235,12 @@
-         }
- 
-         if ($oldvars !== null) {
+         // if there are cached vars, update store, else insert new data
+         if ($oldvars) {
 -            $newvars = $this->_fixvars($vars, $oldvars);
 +            $newvars = $vars;
- 
-             if ($newvars !== $oldvars) {
-                 $this->db->query("UPDATE {$this->table_name} "
-                     . "SET `changed` = $now, `vars` = ? WHERE `sess_id` = ?",
-                    base64_encode($newvars), $key);
-+                    $this->_encode($newvars), $key);
-             }
-             else if ($ts - $this->changed + $this->time_diff > $this->lifetime / 2) {
-                 $this->db->query("UPDATE {$this->table_name} SET `changed` = $now"
-@@ -248,44 +251,30 @@
-             $this->db->query("INSERT INTO {$this->table_name}"
-                 . " (`sess_id`, `vars`, `ip`, `created`, `changed`)"
-                 . " VALUES (?, ?, ?, $now, $now)",
-                $key, base64_encode($vars), (string)$this->ip);
-+                $key, $this->_encode($vars), (string)$this->ip);
+             return $this->update($key, $newvars, $oldvars);
         }
- 
-         return true;
+         else {
+@@ -180,39 +179,6 @@ abstract class rcube_session
     }
 
- 
-    /**
+     /**
 -     * Merge vars with old vars and apply unsets
 -     */
-    private function _fixvars($vars, $oldvars)
-+    private function _encode($vars)
-     {
+-    protected function _fixvars($vars, $oldvars)
+-    {
 -        if ($oldvars !== null) {
 -            $a_oldvars = $this->unserialize($oldvars);
 -            if (is_array($a_oldvars)) {
@ -90,36 +47,29 @@
 -            else {
 -                $newvars = $vars;
 -            }
-+        if ($this->need_base64) {
-+            return base64_encode($vars);
-+        } else {
-+            return $vars;
-         }
-+    }
- 
+-        }
+-
 -        $this->unsets = array();
 -        return $newvars;
-+
-+    private function _decode($vars) 
-+    {
-+        if ($this->need_base64) {
-+            return base64_decode($vars);
-+        } else {
-+            return $vars;
-+        }
+-    }
+-
+-    /**
+      * Execute registered garbage collector routines
+      */
+     public function gc($maxlifetime)
+@@ -321,11 +287,6 @@ abstract class rcube_session
+         }
+ 
+         $this->appends[] = $path;
+-
+-        // when overwriting a previously unset variable
+-        if ($this->unsets[$path]) {
+-            unset($this->unsets[$path]);
+-        }
     }
 
- 
-@@ -350,7 +339,7 @@
-         else // else read data again
-             $oldvars = $this->mc_read($key);
- 
-        $newvars = $oldvars !== null ? $this->_fixvars($vars, $oldvars) : $vars;
-+        $newvars = $vars;
- 
-         if ($newvars !== $oldvars || $ts - $this->changed > $this->lifetime / 3) {
-             return $this->memcache->set($key, serialize(array('changed' => time(), 'ip' => $this->ip, 'vars' => $newvars)),
-@@ -488,8 +477,6 @@
+     /**
+@@ -340,8 +301,6 @@ abstract class rcube_session
             return $this->destroy(session_id());
         }
 
@ -128,3 +78,25 @@
         if (isset($_SESSION[$var])) {
             unset($_SESSION[$var]);
         }
+@@ -387,21 +346,6 @@ abstract class rcube_session
+ 
+         if ($data) {
+             session_decode($data);
+-
+-            // apply appends and unsets to reloaded data
+-            $_SESSION = array_merge_recursive($_SESSION, $merge_data);
+-
+-            foreach ((array)$this->unsets as $var) {
+-                if (isset($_SESSION[$var])) {
+-                    unset($_SESSION[$var]);
+-                }
+-                else {
+-                    $path = explode('.', $var);
+-                    $k = array_pop($path);
+-                    $node = &$this->get_node($path, $_SESSION);
+-                    unset($node[$k]);
+-                }
+-            }
+         }
+     }
+ 
--- a/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session_db.php
+++ b/mail/roundcube/files/patch-program_lib_Roundcube_rcube_session_db.php
@ -0,0 +1,71 @@
+--- program/lib/Roundcube/rcube_session_db.php.orig	2016-05-22 11:06:47 UTC
+++ program/lib/Roundcube/rcube_session_db.php
+@@ -32,6 +32,7 @@ class rcube_session_db extends rcube_ses
+ {
+     private $db;
+     private $table_name;
+    private $need_base64;
+ 
+     /**
+      * @param Object $config
+@@ -39,6 +40,9 @@ class rcube_session_db extends rcube_ses
+     public function __construct($config)
+     {
+         parent::__construct($config);
+        
+        // base64 encode if suhosin is not enabled
+        $this->need_base64 = ini_get("suhosin.session.encrypt") !== "1";
+ 
+         // get db instance
+         $this->db = rcube::get_instance()->get_dbh();
+@@ -103,7 +107,7 @@ class rcube_session_db extends rcube_ses
+             $this->time_diff = time() - strtotime($sql_arr['ts']);
+             $this->changed   = strtotime($sql_arr['changed']);
+             $this->ip        = $sql_arr['ip'];
+-            $this->vars      = base64_decode($sql_arr['vars']);
+            $this->vars      = $this->_decode($sql_arr['vars']);
+             $this->key       = $key;
+ 
+             return !empty($this->vars) ? (string) $this->vars : '';
+@@ -126,7 +130,7 @@ class rcube_session_db extends rcube_ses
+         $this->db->query("INSERT INTO {$this->table_name}"
+             . " (`sess_id`, `vars`, `ip`, `created`, `changed`)"
+             . " VALUES (?, ?, ?, $now, $now)",
+-            $key, base64_encode($vars), (string)$this->ip);
+            $key, $this->_encode($vars), (string)$this->ip);
+ 
+         return true;
+     }
+@@ -150,7 +154,7 @@ class rcube_session_db extends rcube_ses
+         if ($newvars !== $oldvars) {
+             $this->db->query("UPDATE {$this->table_name} "
+                 . "SET `changed` = $now, `vars` = ? WHERE `sess_id` = ?",
+-                base64_encode($newvars), $key);
+                $this->_encode($newvars), $key);
+         }
+         else if ($ts - $this->changed + $this->time_diff > $this->lifetime / 2) {
+             $this->db->query("UPDATE {$this->table_name} SET `changed` = $now"
+@@ -173,4 +177,23 @@ class rcube_session_db extends rcube_ses
+             . date('Y-m-d H:i:s', time() - $this->gc_enabled)
+             . '; rows = ' . intval($this->db->affected_rows()));
+     }
+
+    private function _encode($vars)
+    {
+        if ($this->need_base64) {
+            return base64_encode($vars);
+        } else {
+            return $vars;
+        }
+    }
+
+    private function _decode($vars) 
+    {
+        if ($this->need_base64) {
+            return base64_decode($vars);
+        } else {
+            return $vars;
+        }
+    }
+
+ }
--- a/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php
+++ b/mail/roundcube/files/patch-vendor_pear-pear.php.net_Net__Sieve_Net_Sieve.php
@ -1,11 +0,0 @@
--- vendor/pear-pear.php.net/Net_Sieve/Net/Sieve.php.orig	2016-03-01 14:32:07 UTC
-+++ vendor/pear-pear.php.net/Net_Sieve/Net/Sieve.php
-@@ -229,7 +229,7 @@ class Net_Sieve
-         $this->_sock              = new Net_Socket();
-         $this->_bypassAuth        = $bypassAuth;
-         $this->_useTLS            = $useTLS;
-        $this->_options           = $options;
-+        $this->_options           = (array)$options;
-         $this->setDebug($debug, $handler);
- 
-         /* Try to include the Auth_SASL package.  If the package is not
--- a/mail/tlb/Makefile
+++ b/mail/tlb/Makefile
@ -9,7 +9,7 @@ MASTER_SITES=	ftp://ftp.hpc.uh.edu/pub/tlb/ \
 		ftp://totem.fix.no/pub/mirrors/misc/ \
 		http://ports.toco-domains.de/

-MAINTAINER=	ports@toco-domains.de
+MAINTAINER=	tz@FreeBSD.org
 COMMENT=	The List Batcher, a general purpose mail list delivery engine

 RUN_DEPENDS=	p5-Mail-Tools>=0:mail/p5-Mail-Tools \
--- a/math/R-cran-quantreg/Makefile
+++ b/math/R-cran-quantreg/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	quantreg
-PORTVERSION=	5.24
+PORTVERSION=	5.26
 CATEGORIES=	math
 DISTNAME=	${PORTNAME}_${PORTVERSION}

--- a/math/R-cran-quantreg/distinfo
+++ b/math/R-cran-quantreg/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1463269925
-SHA256 (quantreg_5.24.tar.gz) = 1adb2f42620a77bdfccda920437a7b5c03299896d4bc34b9ff0ac7c018eccbc1
-SIZE (quantreg_5.24.tar.gz) = 1720092
+TIMESTAMP = 1465514094
+SHA256 (quantreg_5.26.tar.gz) = 9d7403f7c5ee219ec155838648401a1c4915a46a74f5774a0f6876c537ef2c87
+SIZE (quantreg_5.26.tar.gz) = 1720216
--- a/Show more
+++ b/Show more