*/*: sync with upstream

Taken from: HardenedBSD
2019-03-18 04:49:40 +01:00 · 2019-03-18 04:49:40 +01:00 · 1190e28d0d
parent dd369b65b1
commit 1190e28d0d
242 changed files with 2874 additions and 781 deletions
--- a/astro/gpscorrelate/Makefile
+++ b/astro/gpscorrelate/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gpscorrelate
 PORTVERSION=	1.6.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	astro geography

 MAINTAINER=	ports@FreeBSD.org
--- a/astro/merkaartor/Makefile
+++ b/astro/merkaartor/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	merkaartor
 PORTVERSION=	0.18.2
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	astro

 MAINTAINER=	dev2@heesakkers.info
--- a/astro/py-metpy/Makefile
+++ b/astro/py-metpy/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	metpy
 PORTVERSION=	0.10.0
+PORTREVISION=	1
 CATEGORIES=	astro python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -22,7 +23,7 @@ RUN_DEPENDS=	${PY_ENUM34} \
 		${PYTHON_PKGNAMEPREFIX}pyproj>=1.9.4:graphics/py-pyproj@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>=0.17.0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}traitlets>=4.3.0:devel/py-traitlets@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}xarray>=0.10.7:devel/py-xarray@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}xarray011>=0.10.7:devel/py-xarray011@${PY_FLAVOR}

 USES=		python
 USE_PYTHON=	autoplist concurrent distutils
--- a/audio/suil/Makefile
+++ b/audio/suil/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	suil
 PORTVERSION=	0.10.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	audio
 MASTER_SITES=	http://download.drobilla.net/

@ -18,24 +18,14 @@ LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 RUN_DEPENDS=	lv2>=1.14.0:audio/lv2

-USES=		gnome pkgconfig python:build tar:bzip2 waf
+USES=		compiler:c++11-lang gnome pkgconfig python:build qt:5 tar:bzip2 waf
 USE_GNOME=	atk cairo gdkpixbuf2 glib20 gtk20 gtk30 pango
+USE_QT=		core gui widgets
+USE_XORG=	x11
 USE_LDCONFIG=	yes

 PLIST_SUB=	SUILVERSION=${PORTVERSION}

-OPTIONS_DEFINE=		QT4 QT5
-OPTIONS_DEFAULT=	QT5
-OPTIONS_SUB=		yes
-QT4_CONFIGURE_OFF=	--no-qt4
-QT4_LIB_DEPENDS=	libQtCore.so:devel/qt4-corelib \
-			libQtGui.so:x11-toolkits/qt4-gui
-QT5_CONFIGURE_OFF=	--no-qt5
-QT5_LIB_DEPENDS=	libQt5Core.so:devel/qt5-core \
-			libQt5Gui.so:x11-toolkits/qt5-gui \
-			libQt5Widgets.so:x11-toolkits/qt5-widgets
-QT5_USES=	compiler:c++11-lang
-
 post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libsuil-0.so.${PORTVERSION}
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/suil-0/*.so
--- a/audio/suil/pkg-plist
+++ b/audio/suil/pkg-plist
@ -2,13 +2,10 @@ include/suil-0/suil/suil.h
 lib/libsuil-0.so
 lib/libsuil-0.so.0
 lib/libsuil-0.so.%%SUILVERSION%%
-%%QT4%%lib/suil-0/libsuil_gtk2_in_qt4.so
-%%QT5%%lib/suil-0/libsuil_gtk2_in_qt5.so
-%%QT4%%lib/suil-0/libsuil_qt4_in_gtk2.so
-%%QT5%%lib/suil-0/libsuil_qt5_in_gtk2.so
+lib/suil-0/libsuil_gtk2_in_qt5.so
+lib/suil-0/libsuil_qt5_in_gtk2.so
 lib/suil-0/libsuil_x11_in_gtk2.so
 lib/suil-0/libsuil_x11_in_gtk3.so
-%%QT4%%lib/suil-0/libsuil_x11_in_qt4.so
-%%QT5%%lib/suil-0/libsuil_x11_in_qt5.so
+lib/suil-0/libsuil_x11_in_qt5.so
 lib/suil-0/libsuil_x11.so
 libdata/pkgconfig/suil-0.pc
--- a/cad/zcad/Makefile
+++ b/cad/zcad/Makefile
@ -45,10 +45,6 @@ OPTIONS_DEFINE=		DOCS
 MAKE_ENV+=	GUI=gtk2
 .endif

-.if ${FLAVOR:Uqt4:Mqt4}
-MAKE_ENV+=	GUI=qt
-.endif
-
 post-patch:
 	@${EGREP} -lR 'IFN?DEF LINUX' ${BUILD_WRKSRC} | ${XARGS} \
 		${REINPLACE_CMD} -E '/IFN?DEF LINUX/s,LINUX,UNIX,g'
--- a/comms/cqrlog/Makefile
+++ b/comms/cqrlog/Makefile
@ -13,8 +13,6 @@ COMMENT=	Amateur Radio logging application

 LICENSE=	GPLv2

-BROKEN=		Fatal: (10022) Can't find unit GL used by TAOpenGL
-
 LIB_DEPENDS=	libhamlib.so:comms/hamlib

 USES=		fpc lazarus:flavors shebangfix ssl:run dos2unix mysql
@ -25,7 +23,7 @@ LLD_UNSAFE=	yes
 SHEBANG_FILES=	tools/cqrlog-apparmor-fix \
 		voice_keyer/voice_keyer.sh
 USE_FPC=	cairo fcl-base chm fcl-db fcl-image fcl-json fcl-net fcl-web \
-		fcl-registry rtl-extra fcl-xml mysql numlib openssl \
+		fcl-registry rtl-extra fcl-xml mysql numlib opengl openssl \
 		pasjpeg regexpr x11

 ALL_TARGET=	${PORTNAME}
--- a/converters/pdf2djvu/Makefile
+++ b/converters/pdf2djvu/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	pdf2djvu
 PORTVERSION=	0.9.12
+PORTREVISION=	1
 CATEGORIES=	converters
 MASTER_SITES=	https://github.com/jwilk/${PORTNAME}/releases/download/${PORTVERSION}/

--- a/databases/mongodb34/Makefile
+++ b/databases/mongodb34/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	mongodb
 DISTVERSIONPREFIX=	r
-DISTVERSION=	3.4.19
+DISTVERSION=	3.4.20
 CATEGORIES=	databases net
 MASTER_SITES=	https://fastdl.mongodb.org/src/ \
 		http://fastdl.mongodb.org/src/ \
--- a/databases/mongodb34/distinfo
+++ b/databases/mongodb34/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1549286501
-SHA256 (mongodb-src-r3.4.19.tar.gz) = a05938cc118fb796ae37bb22503979a1ca3a0a5016040f3daf388ca21e9bfcba
-SIZE (mongodb-src-r3.4.19.tar.gz) = 40145107
+TIMESTAMP = 1552747719
+SHA256 (mongodb-src-r3.4.20.tar.gz) = e0c37a2c25b1bb7712ed2a29625a3db14f27e5c7edd8c20306ffea3515cc5b95
+SIZE (mongodb-src-r3.4.20.tar.gz) = 40150928
--- a/databases/py-agate-sql/Makefile
+++ b/databases/py-agate-sql/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	agate-sql
-PORTVERSION=	0.5.3
+PORTVERSION=	0.5.4
 CATEGORIES=	databases textproc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/databases/py-agate-sql/distinfo
+++ b/databases/py-agate-sql/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1517209981
-SHA256 (agate-sql-0.5.3.tar.gz) = 877b7b85adb5f0325455bba8d50a1623fa32af33680b554feca7c756a15ad9b4
-SIZE (agate-sql-0.5.3.tar.gz) = 6131
+TIMESTAMP = 1552822603
+SHA256 (agate-sql-0.5.4.tar.gz) = 9277490ba8b8e7c747a9ae3671f52fe486784b48d4a14e78ca197fb0e36f281b
+SIZE (agate-sql-0.5.4.tar.gz) = 6340
--- a/deskutils/gnome-photos/Makefile
+++ b/deskutils/gnome-photos/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gnome-photos
 PORTVERSION=	3.28.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	deskutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- a/deskutils/kdeconnect-kde/Makefile
+++ b/deskutils/kdeconnect-kde/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	kdeconnect-kde
 DISTVERSION=	1.3.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	deskutils kde
 MASTER_SITES=	KDE/stable/kdeconnect/${DISTVERSION}/src/
 DIST_SUBDIR=	KDE
--- a/deskutils/pinot/Makefile
+++ b/deskutils/pinot/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	pinot
 PORTVERSION=	1.09
-PORTREVISION=	17
+PORTREVISION=	18
 CATEGORIES=	deskutils

 MAINTAINER=	thierry@FreeBSD.org
--- a/devel/Makefile
+++ b/devel/Makefile
@ -1295,6 +1295,7 @@
    SUBDIR += kdev-python
    SUBDIR += kdevelop
    SUBDIR += kdevelop-pg-qt
+    SUBDIR += kerl
    SUBDIR += kf5-extra-cmake-modules
    SUBDIR += kf5-kapidox
    SUBDIR += kf5-kauth
@ -2960,6 +2961,7 @@
    SUBDIR += p5-Module-Load
    SUBDIR += p5-Module-Load-Conditional
    SUBDIR += p5-Module-Loaded
+    SUBDIR += p5-Module-Loader
    SUBDIR += p5-Module-Manifest
    SUBDIR += p5-Module-Math-Depends
    SUBDIR += p5-Module-Metadata
@ -5278,6 +5280,7 @@
    SUBDIR += py-wsgiutils
    SUBDIR += py-wsme
    SUBDIR += py-xarray
+    SUBDIR += py-xarray011
    SUBDIR += py-xattr
    SUBDIR += py-xcaplib
    SUBDIR += py-xdg
--- a/devel/cpu_features/Makefile
+++ b/devel/cpu_features/Makefile
@ -11,6 +11,9 @@ COMMENT=	Cross platform C99 library to get cpu features at runtime

 LICENSE=	APACHE20

+NOT_FOR_ARCHS=		aarch64 armv6 armv7 mips mips64
+NOT_FOR_ARCHS_REASON=	assumes android if on ARM or MIPS
+
 USES=	cmake:insource
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
--- a/devel/eastl/Makefile
+++ b/devel/eastl/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	eastl
-DISTVERSION=	3.13.03
+DISTVERSION=	3.13.04
 CATEGORIES=	devel

 MAINTAINER=	yuri@FreeBSD.org
--- a/devel/eastl/distinfo
+++ b/devel/eastl/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1551406920
-SHA256 (electronicarts-EASTL-3.13.03_GH0.tar.gz) = 8315458c954f3a63814ef93a9d3c4a11c230edebc7236d60764b8496c9d9acf4
-SIZE (electronicarts-EASTL-3.13.03_GH0.tar.gz) = 1172391
+TIMESTAMP = 1552857732
+SHA256 (electronicarts-EASTL-3.13.04_GH0.tar.gz) = 1f6279fb4347cbe2c28a7d4f62401db9347686b8e940b02ac8bb67b080f0324f
+SIZE (electronicarts-EASTL-3.13.04_GH0.tar.gz) = 1174093
--- a/devel/kerl/Makefile
+++ b/devel/kerl/Makefile
@ -0,0 +1,45 @@
+# $FreeBSD$
+
+PORTNAME=	kerl
+DISTVERSION=	1.8.5
+PORTREVISION=	1
+CATEGORIES=	devel
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
+MAINTAINER=	olgeni@FreeBSD.org
+COMMENT=	Virtualenv-like tool for Erlang/OTP
+
+RUN_DEPENDS=	${LOCALBASE}/bin/curl:ftp/curl
+
+USE_GITHUB=	yes
+
+NO_BUILD=	yes
+
+OPTIONS_DEFINE=	BASH DOCS ZSH
+OPTIONS_DEFAULT=BASH DOCS ZSH
+
+PLIST_FILES=	bin/kerl
+PORTDOCS=	README.md
+
+BASH_PLIST_FILES=	share/bash-completion/completions/kerl
+ZSH_PLIST_FILES=	share/zsh/site-functions/_kerl
+
+do-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_SCRIPT} ${WRKSRC}/kerl ${STAGEDIR}${PREFIX}/bin
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+
+do-install-BASH-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
+	${INSTALL_DATA} ${WRKSRC}/bash_completion/kerl \
+		${STAGEDIR}${PREFIX}/share/bash-completion/completions/
+
+do-install-ZSH-on:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
+	${INSTALL_DATA} ${WRKSRC}/zsh_completion/_kerl \
+		${STAGEDIR}${PREFIX}/share/zsh/site-functions/
+
+.include <bsd.port.mk>
--- a/devel/kerl/distinfo
+++ b/devel/kerl/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1552821971
+SHA256 (kerl-kerl-1.8.5_GH0.tar.gz) = 1dbbabbddc1373837578e2d7c0c0f832291ec9fe1b4181ba0e7da8ca4b8f81ed
+SIZE (kerl-kerl-1.8.5_GH0.tar.gz) = 30009
--- a/devel/kerl/pkg-descr
+++ b/devel/kerl/pkg-descr
@ -0,0 +1,9 @@
+Easy building and installing of Erlang/OTP instances.
+
+Kerl aims to be shell agnostic and its only dependencies, excluding
+what's required to actually build Erlang/OTP, are curl and git.
+
+All is done so that, once a specific release has been built, creating
+a new installation is as fast as possible.
+
+WWW: https://github.com/kerl/kerl
--- a/devel/kf5-kfilemetadata/Makefile
+++ b/devel/kf5-kfilemetadata/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	kfilemetadata
 DISTVERSION=	${KDE_FRAMEWORKS_VERSION}
+PORTREVISION=	1
 CATEGORIES=	devel kde kde-frameworks

 MAINTAINER=	kde@FreeBSD.org
--- a/devel/kio-extras/Makefile
+++ b/devel/kio-extras/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	kio-extras
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel kde kde-applications # kde kde-applications-plasma

 MAINTAINER=	kde@FreeBSD.org
--- a/devel/libdbusmenu-qt/Makefile
+++ b/devel/libdbusmenu-qt/Makefile
@ -11,7 +11,7 @@ PKGNAMESUFFIX=	5
 DISTNAME=	${PORTNAME}_${MAJOR_VER}+${SNAPSHOT_VER}.orig

 MAINTAINER=	kde@FreeBSD.org
-COMMENT?=	Qt4 implementation of the DBusMenu protocol
+COMMENT=	Qt5 implementation of the DBusMenu protocol

 LICENSE=	LGPL20

--- a/devel/p5-Module-Loader/Makefile
+++ b/devel/p5-Module-Loader/Makefile
@ -0,0 +1,26 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	Module-Loader
+PORTVERSION=	0.03
+CATEGORIES=	devel perl5
+MASTER_SITES=	CPAN
+PKGNAMEPREFIX=	p5-
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	Finding and loading modules in a given namespace
+
+LICENSE=	ART10 GPLv1+
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	${RUN_DEPENDS}
+RUN_DEPENDS=	p5-Module-Runtime>=0:devel/p5-Module-Runtime \
+		p5-Path-Iterator-Rule>=0:devel/p5-Path-Iterator-Rule
+
+USES=		perl5
+USE_PERL5=	configure
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
--- a/devel/p5-Module-Loader/distinfo
+++ b/devel/p5-Module-Loader/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1552830485
+SHA256 (Module-Loader-0.03.tar.gz) = 5a96fc5dc8494a0a87170a5451c53d62b801a8d9cad7cbbde5a109a8f520f3e0
+SIZE (Module-Loader-0.03.tar.gz) = 12061
--- a/devel/p5-Module-Loader/pkg-descr
+++ b/devel/p5-Module-Loader/pkg-descr
@ -0,0 +1,9 @@
+Module::Loader provides methods for finding modules in a given namespace, and
+then loading them. It is intended for use in situations where you're looking for
+plugins, and then loading one or more of them.
+
+This module was inspired by Mojo::Loader, which I have used in a number of
+projects. But some people were wary of requiring Mojolicious just to get a
+module loader, which prompted me to create Module::Loader.
+
+WWW: https://metacpan.org/release/Module-Loader
--- a/devel/p5-Module-Loader/pkg-plist
+++ b/devel/p5-Module-Loader/pkg-plist
@ -0,0 +1,2 @@
+%%SITE_PERL%%/Module/Loader.pm
+%%PERL5_MAN3%%/Module::Loader.3.gz
--- a/devel/py-medikit/Makefile
+++ b/devel/py-medikit/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	medikit
-PORTVERSION=	0.6.3
+PORTVERSION=	0.7.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -13,10 +13,10 @@ COMMENT=	Automated release engineer assistant
 LICENSE=	APACHE20

 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.9:devel/py-Jinja2@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}git_semver>=0.2.1:devel/py-git_semver@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}git_semver>=0.2.3:devel/py-git_semver@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}mondrian>=0.7:devel/py-mondrian@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}packaging>=17.0:devel/py-packaging@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pip-tools>=2.0.1:devel/py-pip-tools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}packaging>=19.0:devel/py-packaging@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pip-tools>=2.0.2:devel/py-pip-tools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}stevedore>=1.28:devel/py-stevedore@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}whistle>=1.0:devel/py-whistle@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yapf>=0.20:textproc/py-yapf@${PY_FLAVOR}
--- a/devel/py-medikit/distinfo
+++ b/devel/py-medikit/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1529768360
-SHA256 (medikit-0.6.3.tar.gz) = 7cdfaa59bb027a5d81197aba786417109d0b34eae02eb00a81d726926141aabf
-SIZE (medikit-0.6.3.tar.gz) = 38548
+TIMESTAMP = 1552819685
+SHA256 (medikit-0.7.0.tar.gz) = e2969169aa6f572520b23be7638d8870a8c91635b378b868db22ebf27729f28e
+SIZE (medikit-0.7.0.tar.gz) = 39410
--- a/devel/py-responses/Makefile
+++ b/devel/py-responses/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	responses
-PORTVERSION=	0.10.5
-PORTREVISION=	1
+PORTVERSION=	0.10.6
 CATEGORIES=	devel www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-responses/distinfo
+++ b/devel/py-responses/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1546268417
-SHA256 (responses-0.10.5.tar.gz) = c85882d2dc608ce6b5713a4e1534120f4a0dc6ec79d1366570d2b0c909a50c87
-SIZE (responses-0.10.5.tar.gz) = 19314
+TIMESTAMP = 1552819688
+SHA256 (responses-0.10.6.tar.gz) = 502d9c0c8008439cfcdef7e251f507fcfdd503b56e8c0c87c3c3e3393953f790
+SIZE (responses-0.10.6.tar.gz) = 22102
--- a/devel/py-xarray/Makefile
+++ b/devel/py-xarray/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	xarray
-PORTVERSION=	0.11.3
+PORTVERSION=	0.12.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -17,15 +17,9 @@ RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}pandas>=0.19.2:math/py-pandas@${PY_FLAVOR}
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.7.1:devel/py-pytest@${PY_FLAVOR}

-USES=		python
-USE_PYTHON=	autoplist concurrent distutils
+USES=		python:3.5+
+USE_PYTHON=	autoplist distutils

 NO_ARCH=	yes

-.include <bsd.port.pre.mk>
-
-.if ${PYTHON_REL} < 3000
-TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/devel/py-xarray/distinfo
+++ b/devel/py-xarray/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1548611911
-SHA256 (xarray-0.11.3.tar.gz) = cc3dceb680d67746168c46771e4aa7d2624519a7faf120421f16d6ddfdb984dd
-SIZE (xarray-0.11.3.tar.gz) = 1720693
+TIMESTAMP = 1552819693
+SHA256 (xarray-0.12.0.tar.gz) = 856fd062c55208a248ac3784cac8d3524b355585387043efc92a4188eede57f3
+SIZE (xarray-0.12.0.tar.gz) = 1742146
--- a/devel/py-xarray011/Makefile
+++ b/devel/py-xarray011/Makefile
@ -0,0 +1,34 @@
+# Created by: Po-Chuan Hsieh <sunpoet@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	xarray
+PORTVERSION=	0.11.3
+CATEGORIES=	devel python
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+PKGNAMESUFFIX=	011
+
+MAINTAINER=	sunpoet@FreeBSD.org
+COMMENT=	N-D labeled arrays and datasets in Python
+
+LICENSE=	APACHE20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYNUMPY} \
+		${PYTHON_PKGNAMEPREFIX}pandas>=0.19.2:math/py-pandas@${PY_FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>=2.7.1:devel/py-pytest@${PY_FLAVOR}
+
+USES=		python
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
+PORTSCOUT=	limit:^0\.11\.
+
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 3000
+TEST_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR}
+.endif
+
+.include <bsd.port.post.mk>
--- a/devel/py-xarray011/distinfo
+++ b/devel/py-xarray011/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1548611911
+SHA256 (xarray-0.11.3.tar.gz) = cc3dceb680d67746168c46771e4aa7d2624519a7faf120421f16d6ddfdb984dd
+SIZE (xarray-0.11.3.tar.gz) = 1720693
--- a/devel/py-xarray011/pkg-descr
+++ b/devel/py-xarray011/pkg-descr
@ -0,0 +1,12 @@
+xarray (formerly xray) is an open source project and Python package that aims to
+bring the labeled data power of pandas to the physical sciences, by providing
+N-dimensional variants of the core pandas data structures.
+
+Our goal is to provide a pandas-like and pandas-compatible toolkit for analytics
+on multi-dimensional arrays, rather than the tabular data for which pandas
+excels. Our approach adopts the Common Data Model for self- describing
+scientific data in widespread use in the Earth sciences: xarray.Dataset is an
+in-memory representation of a netCDF file.
+
+WWW: https://pypi.org/project/xarray/
+WWW: https://github.com/pydata/xarray
--- a/devel/qca/Makefile
+++ b/devel/qca/Makefile
@ -30,7 +30,7 @@ USE_QT=	core buildtools_build qmake_build

 PLIST_SUB=	SHLIB_VER=${PORTVERSION}

-OPTIONS_DEFINE=	GNUPG OPENSSL SASL
+OPTIONS_DEFINE=	GNUPG OPENSSL SASL TEST
 OPTIONS_DEFAULT=GNUPG OPENSSL
 OPTIONS_SUB=	yes

@ -43,8 +43,8 @@ OPENSSL_USES=		ssl
 SASL_CMAKE_ON=		-DWITH_cyrus-sasl_PLUGIN=yes
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2

-post-patch:
-# Qt Network module is used for tests only
-	${REINPLACE_CMD} 's,Core Network,Core,' ${WRKSRC}/CMakeLists.txt
+TEST_CMAKE_BOOL=	BUILD_TESTS
+TEST_TEST_TARGET=	test
+TEST_USE=		QT=network,testlib

 .include <bsd.port.mk>
--- a/devel/qt5/pkg-descr
+++ b/devel/qt5/pkg-descr
@ -6,4 +6,4 @@ with one code base. The modular C++ class library and developer tools
 easily enables developers to create applications for one platform and
 easily build and run to deploy on another platform.

-WWW: http://qt-project.org
+WWW: https://www.qt.io/
--- a/devel/rebar3/Makefile
+++ b/devel/rebar3/Makefile
@ -3,13 +3,14 @@
 PORTNAME=	rebar3
 PORTVERSION=	3.9.1
 PORTEPOCH=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES+=	LOCAL/olgeni:deps \
 		http://olgeni.olgeni.com/~olgeni/distfiles/:deps \
 		https://repo.hex.pm/tarballs/:hex
-DISTFILES=	rebar3-cache-${CACHE_VERSION}${EXTRACT_SUFX}:deps
+DISTFILES=	rebar3-cache-${PORTVERSION}${EXTRACT_SUFX}:deps
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
-		rebar3-cache-${CACHE_VERSION}${EXTRACT_SUFX}
+		rebar3-cache-${PORTVERSION}${EXTRACT_SUFX}

 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Build tool for Erlang
@ -21,6 +22,7 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang \
 RUN_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang

 OPTIONS_DEFINE=	BASH ZSH EXAMPLES
+OPTIONS_DEFAULT=BASH ZSH

 USE_GITHUB=	yes
 GH_ACCOUNT=	rebar
@ -31,7 +33,6 @@ PORTEXAMPLES=	rebar.config.sample
 BASH_PLIST_FILES=	share/bash-completion/completions/rebar3
 ZSH_PLIST_FILES=	share/zsh/site-functions/_rebar3

-CACHE_VERSION=	22
 # from rebar.config
 REBAR_DEPS=	bbmustache-1.6.0 \
 		certifi-2.3.1 \
@ -49,14 +50,12 @@ REBAR_DEPS=	bbmustache-1.6.0 \
 DISTFILES+=	${_dep}.tar:hex
 .endfor

-.include <bsd.port.options.mk>
-
 # convenience target to rebuild the rebar3 cache file
 build-cache:
-	cd ${WRKDIR} && ${TAR} -c -v -z -f rebar3-cache-${CACHE_VERSION}${EXTRACT_SUFX} .cache
+	cd ${WRKDIR} && ${TAR} -c -v -z -f rebar3-cache-${PORTVERSION}${EXTRACT_SUFX} .cache

 post-extract:
-	@${REINPLACE_CMD} -e 's/{vsn, "git"}/{vsn, "${GH_TAGNAME}"}/' ${WRKSRC}/src/rebar.app.src
+	@${REINPLACE_CMD} -e 's/{ *vsn,.*}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 .for _dep in ${REBAR_DEPS}
 	${MKDIR} ${WRKSRC}/_build/default/lib/${_dep:C/-.*//}
 	${TAR} xOf ${DISTDIR}/${_dep}.tar contents.tar.gz |\
@ -67,7 +66,6 @@ post-extract:
 	${TAR} xOf ${DISTDIR}/${_dep}.tar contents.tar.gz |\
 		${TAR} xfz - -C ${WRKSRC}/_build/default/plugins/${_dep:C/-.*//}
 .endfor
-
 	@${MKDIR} ${WRKSRC}/_build/bootstrap/lib
 	@${MKDIR} ${WRKSRC}/_build/bootstrap/plugins
 .for _dep in ${REBAR_DEPS}
@ -83,16 +81,18 @@ do-build:

 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
-.if ${PORT_OPTIONS:MBASH}
+
+do-install-BASH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/bash-completion/completions
 	${INSTALL_DATA} ${WRKSRC}/priv/shell-completion/bash/rebar3 \
 		${STAGEDIR}${PREFIX}/share/bash-completion/completions/rebar3
-.endif
-.if ${PORT_OPTIONS:MZSH}
+
+do-install-ZSH-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 	${INSTALL_DATA} ${WRKSRC}/priv/shell-completion/zsh/_rebar3 \
 		${STAGEDIR}${PREFIX}/share/zsh/site-functions/
-.endif
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/rebar.config.sample ${STAGEDIR}${EXAMPLESDIR}

--- a/devel/rebar3/distinfo
+++ b/devel/rebar3/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1552732753
-SHA256 (rebar3-cache-22.tar.gz) = 86afa24c82e4b472a5443ebb62615508bf97160723218fa9fd0d44e3ee0bdc97
-SIZE (rebar3-cache-22.tar.gz) = 3483012
+TIMESTAMP = 1552738297
+SHA256 (rebar3-cache-3.9.1.tar.gz) = 13d50077d2105aecddcb4ee2ba2ec358dcf5154d898d3b003bb3429bb9d7dbda
+SIZE (rebar3-cache-3.9.1.tar.gz) = 8066
 SHA256 (bbmustache-1.6.0.tar) = 53e02d296512a57be03a98c91541b34d2ca64930268030b2d12364a0332015df
 SIZE (bbmustache-1.6.0.tar) = 15360
 SHA256 (certifi-2.3.1.tar) = e12d667d042c11d130594bae2b0097e63836fe8b1e6d6b2cc48f8bb7a2cf7d68
--- a/devel/relx/Makefile
+++ b/devel/relx/Makefile
@ -3,13 +3,14 @@
 PORTNAME=	relx
 PORTVERSION=	3.29.0
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES+=	LOCAL/olgeni:deps \
 		http://olgeni.olgeni.com/~olgeni/distfiles/:deps \
 		https://repo.hex.pm/tarballs/:hex
-DISTFILES=	relx-cache-${CACHE_VERSION}${EXTRACT_SUFX}:deps
+DISTFILES=	relx-cache-${PORTVERSION}${EXTRACT_SUFX}:deps
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX} \
-		relx-cache-${CACHE_VERSION}${EXTRACT_SUFX}
+		relx-cache-${PORTVERSION}${EXTRACT_SUFX}

 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Sane, simple release creation for Erlang
@ -20,6 +21,8 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/erl:lang/erlang \
 		rebar3>=0:devel/rebar3
 RUN_DEPENDS:=	${BUILD_DEPENDS}

+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 PLIST_SUB=	VERSION="${PORTVERSION}"

 # Use either erlware or tsloughter, depending on who actually
@ -27,7 +30,6 @@ PLIST_SUB=	VERSION="${PORTVERSION}"
 USE_GITHUB=	yes
 GH_ACCOUNT=	erlware

-CACHE_VERSION=	22
 # from rebar.config
 REBAR_DEPS=	bbmustache-1.6.1 \
 		cf-0.3.1 \
@ -39,27 +41,22 @@ REBAR_DEPS=	bbmustache-1.6.1 \
 DISTFILES+=	${_dep}.tar:hex
 .endfor

-OPTIONS_DEFINE=	DOCS EXAMPLES
-
 # convenience target to rebuild the relx cache file
 build-cache:
-	cd ${WRKDIR} && ${TAR} -c -v -z -f relx-cache-${CACHE_VERSION}${EXTRACT_SUFX} .cache
+	cd ${WRKDIR} && ${TAR} -c -v -z -f relx-cache-${PORTVERSION}${EXTRACT_SUFX} .cache

 # rebar3 insists on downloading dependencies, and some kind of package
 # index into the user's HOME. We need to trick it into behaving by
 # providing both before building.

 post-extract:
+	@${REINPLACE_CMD} -e 's/{ *vsn,.*}/{vsn, "${PORTVERSION}"}/' ${WRKSRC}/src/*.app.src
 .for _dep in ${REBAR_DEPS}
-	@${MKDIR} ${WRKSRC}/_build/default/lib/${_dep:C/-.*//}
-	@${TAR} xOf ${DISTDIR}/${_dep}.tar contents.tar.gz |\
+	${MKDIR} ${WRKSRC}/_build/default/lib/${_dep:C/-.*//}
+	${TAR} xOf ${DISTDIR}/${_dep}.tar contents.tar.gz |\
 		${TAR} xfz - -C ${WRKSRC}/_build/default/lib/${_dep:C/-.*//}
 .endfor

-post-patch:
-	@${REINPLACE_CMD} -i '' -e 's/{ *vsn,.*}/{vsn, "${PORTVERSION}"}/' \
-		${WRKSRC}/src/${PORTNAME}.app.src
-
 do-build:
 	@${RM} ${WRKSRC}/rebar.lock
 	@cd ${WRKSRC} && HOME=${WRKDIR} rebar3 compile
@ -84,6 +81,7 @@ do-install:
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
--- a/devel/relx/distinfo
+++ b/devel/relx/distinfo
@ -1,6 +1,6 @@
-TIMESTAMP = 1552732427
-SHA256 (relx-cache-22.tar.gz) = 862d2ac871955552d75e2a9a3528dc9676204e503d8a539e1701d918003c8c98
-SIZE (relx-cache-22.tar.gz) = 3214611
+TIMESTAMP = 1552739223
+SHA256 (relx-cache-3.29.0.tar.gz) = 65b7c3051faf570b2090b8f1dcc8d6e704df732d8e37b5bc527dd2c38b92de56
+SIZE (relx-cache-3.29.0.tar.gz) = 2961
 SHA256 (bbmustache-1.6.1.tar) = 238ba8df312869782abde3e9474e94b5704fb6bbb990c03f1afefdc8a4ad3a49
 SIZE (bbmustache-1.6.1.tar) = 15360
 SHA256 (cf-0.3.1.tar) = 315e8d447d3a4b02bcdbfa397ad03bbb988a6e0aa6f44d3add0f4e3c3bf97672
--- a/devel/rubygem-pkg-config/Makefile
+++ b/devel/rubygem-pkg-config/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	pkg-config
-PORTVERSION=	1.3.6
+PORTVERSION=	1.3.7
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-pkg-config/distinfo
+++ b/devel/rubygem-pkg-config/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1552202543
-SHA256 (rubygem/pkg-config-1.3.6.gem) = fa78f18ee45320b2b6ce5d14825438e97e62159219b832845d883709fd128666
-SIZE (rubygem/pkg-config-1.3.6.gem) = 20992
+TIMESTAMP = 1552819695
+SHA256 (rubygem/pkg-config-1.3.7.gem) = 216fdf7ecd753dcc258cf516e1843f8e354c155b0aef2428f36e60c840f5a6e8
+SIZE (rubygem/pkg-config-1.3.7.gem) = 20992
--- a/devel/rubygem-tty-pager/Makefile
+++ b/devel/rubygem-tty-pager/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	tty-pager
-PORTVERSION=	0.12.0
+PORTVERSION=	0.12.1
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG

--- a/devel/rubygem-tty-pager/distinfo
+++ b/devel/rubygem-tty-pager/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1546271484
-SHA256 (rubygem/tty-pager-0.12.0.gem) = 92111a5009c0c1992ec00236ecdd8edd1c173628e330d451897d831288280f90
-SIZE (rubygem/tty-pager-0.12.0.gem) = 14336
+TIMESTAMP = 1552819698
+SHA256 (rubygem/tty-pager-0.12.1.gem) = 42b9dd3fc2db6dd247a0057743d06fb0b570b58be08dae832ce21aa59813f619
+SIZE (rubygem/tty-pager-0.12.1.gem) = 14336
--- a/dns/dnsdist/Makefile
+++ b/dns/dnsdist/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	dnsdist
 DISTVERSION=	1.3.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	dns net
 MASTER_SITES=	https://downloads.powerdns.com/releases/ \
 		LOCAL/cpm
--- a/dns/dnsdist/files/patch-dnsdist-lua-vars.cc
+++ b/dns/dnsdist/files/patch-dnsdist-lua-vars.cc
@ -0,0 +1,11 @@
+--- dnsdist-lua-vars.cc.orig	2018-10-03 09:48:10 UTC
+++ dnsdist-lua-vars.cc
+@@ -22,6 +22,8 @@
+ #include "dnsdist.hh"
+ #include "ednsoptions.hh"
+ 
+#undef BADSIG // signal.h SIG_ERR
+
+ void setupLuaVars()
+ {
+   g_lua.writeVariable("DNSAction", std::unordered_map<string,int>{
--- a/emulators/wine-devel/distinfo
+++ b/emulators/wine-devel/distinfo
@ -1,3 +1,5 @@
-TIMESTAMP = 1552772128
+TIMESTAMP = 1552823001
 SHA256 (wine-4.4.tar.xz) = db3a09cf4b0b4329ffed8014073c9868b5ecb4826adfb4a91aa49bd2841207b0
 SIZE (wine-4.4.tar.xz) = 21805668
+SHA256 (v4.4.tar.gz) = 83de1def6167e79418527a8d120e70cc2904889a47b10b1a21f26bfc26edc306
+SIZE (v4.4.tar.gz) = 9882230
--- a/finance/p5-Business-MaxMind-CreditCardFraudDetection/Makefile
+++ b/finance/p5-Business-MaxMind-CreditCardFraudDetection/Makefile
@ -13,25 +13,16 @@ DISTNAME=	Business-MaxMind-${PORTVERSION}
 MAINTAINER=	vivek@khera.org
 COMMENT=	Interface to MaxMind minFraud service

-RUN_DEPENDS+=	p5-libwww>0.0:www/p5-libwww \
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+RUN_DEPENDS=	p5-libwww>0.0:www/p5-libwww \
 		p5-LWP-Protocol-https>0.0:www/p5-LWP-Protocol-https
-BUILD_DEPENDS+=	p5-libwww>0.0:www/p5-libwww
+BUILD_DEPENDS=	p5-libwww>0.0:www/p5-libwww

 USES=		perl5 shebangfix
 SHEBANG_FILES=	example*.pl
 USE_PERL5=	configure
 NO_ARCH=	yes

-PLIST_FILES=	\
-	%%SITE_PERL%%/Business/MaxMind.pm \
-	%%SITE_PERL%%/Business/MaxMind/CreditCardFraudDetection.pm \
-	%%SITE_PERL%%/Business/MaxMind/HTTPBase.pm \
-	%%SITE_PERL%%/Business/MaxMind/TelephoneVerification.pm \
-	%%SITE_PERL%%/Business/example.pl \
-	%%SITE_PERL%%/Business/example_telv.pl \
-	%%PERL5_MAN3%%/Business::MaxMind.3.gz \
-	%%PERL5_MAN3%%/Business::MaxMind::CreditCardFraudDetection.3.gz \
-	%%PERL5_MAN3%%/Business::MaxMind::HTTPBase.3.gz \
-	%%PERL5_MAN3%%/Business::MaxMind::TelephoneVerification.3.gz
-
 .include <bsd.port.mk>
--- a/finance/p5-Business-MaxMind-CreditCardFraudDetection/pkg-plist
+++ b/finance/p5-Business-MaxMind-CreditCardFraudDetection/pkg-plist
@ -0,0 +1,10 @@
+%%SITE_PERL%%/Business/MaxMind.pm
+%%SITE_PERL%%/Business/MaxMind/CreditCardFraudDetection.pm
+%%SITE_PERL%%/Business/MaxMind/HTTPBase.pm
+%%SITE_PERL%%/Business/MaxMind/TelephoneVerification.pm
+%%SITE_PERL%%/Business/example.pl
+%%SITE_PERL%%/Business/example_telv.pl
+%%PERL5_MAN3%%/Business::MaxMind.3.gz
+%%PERL5_MAN3%%/Business::MaxMind::CreditCardFraudDetection.3.gz
+%%PERL5_MAN3%%/Business::MaxMind::HTTPBase.3.gz
+%%PERL5_MAN3%%/Business::MaxMind::TelephoneVerification.3.gz
--- a/games/arx-libertatis/Makefile
+++ b/games/arx-libertatis/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	arx-libertatis
 PORTVERSION=	1.1.2
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	games
 MASTER_SITES=	http://downloads.sourceforge.net/arx/ \
 		http://arx-libertatis.org/files/
@ -22,30 +22,17 @@ USE_SDL=	sdl
 USE_GL=		gl glew
 LLD_UNSAFE=	yes
 CMAKE_ARGS=	-DDATA_DIR=arx \
-		-DSTRICT_USE=ON
+		-DSTRICT_USE=ON \
+		-DBUILD_CRASHREPORTER=OFF
 CFLAGS_powerpc64+=	-mminimal-toc

 SUB_FILES=	pkg-message

 PORTDOCS=	AUTHORS CHANGELOG README.md

-OPTIONS_DEFINE=	CRASHREPORTER DOCS
+OPTIONS_DEFINE=	DOCS
 OPTIONS_SUB=	yes

-CRASHREPORTER_DESC=	Build crash reporter (requires Qt4)
-CRASHREPORTER_USES=	qt:4
-CRASHREPORTER_USE=	QT=corelib,gui,network \
-			QT=rcc_build,moc_build,uic_build,qmake_build
-CRASHREPORTER_CMAKE_ON=	-DBUILD_CRASHREPORTER=ON -DUSE_QT5=OFF
-CRASHREPORTER_CMAKE_OFF=-DBUILD_CRASHREPORTER=OFF
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MCRASHREPORTER}
-DEPRECATED=		Qt4 has been EOL since december 2015
-EXPIRATION_DATE=	2019-03-15
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/CMakeLists.txt

--- a/games/arx-libertatis/pkg-plist
+++ b/games/arx-libertatis/pkg-plist
@ -2,7 +2,6 @@ bin/arx
 bin/arx-install-data
 bin/arxsavetool
 bin/arxunpak
-%%CRASHREPORTER%%libexec/arxcrashreporter
 man/man1/arxsavetool.1.gz
 man/man1/arxunpak.1.gz
 man/man6/arx.6.gz
--- a/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp
+++ b/games/springlobby/files/patch-src-lsl-src-lslutils-misc.cpp
@ -1,8 +1,10 @@
--- src/lsl/src/lslutils/misc.cpp.orig	2013-08-31 14:17:00.000000000 +0400
-+++ src/lsl/src/lslutils/misc.cpp	2013-12-10 04:20:26.887107289 +0400
-@@ -3,6 +3,7 @@
+--- src/lsl/src/lslutils/misc.cpp.orig	2013-08-31 10:17:00 UTC
+++ src/lsl/src/lslutils/misc.cpp
+@@ -2,7 +2,9 @@
+ #include "conversion.h"
 
 #include <boost/filesystem.hpp>
+#include <boost/shared_ptr.hpp>
 #include <fstream>
 +#include <cmath>
 
--- a/graphics/Makefile
+++ b/graphics/Makefile
@ -611,6 +611,7 @@
    SUBDIR += osg-devel
    SUBDIR += osgearth
    SUBDIR += ossim
+    SUBDIR += oyranos
    SUBDIR += p5-Acme-Steganography-Image-Png
    SUBDIR += p5-Algorithm-Line-Bresenham
    SUBDIR += p5-Alien-Gimp
--- a/graphics/commons-utilities/Makefile
+++ b/graphics/commons-utilities/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	commons-utilities
 PORTVERSION=	1.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	http://devio.us/~dereckson/software/commons-utilities/

--- a/graphics/darktable/Makefile
+++ b/graphics/darktable/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	darktable
 PORTVERSION=	2.6.1
+PORTREVISION=	1
 CATEGORIES=	graphics
 MASTER_SITES=	https://github.com/darktable-org/${PORTNAME}/releases/download/release-${PORTVERSION:C/\.rc/rc/}/

--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	digikam
 DISTVERSION=	6.0.0
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}
 DIST_SUBDIR=	KDE/digikam/${PORTVERSION}
--- a/graphics/drawpile/Makefile
+++ b/graphics/drawpile/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	Drawpile
-DISTVERSION=	2.1.2
+DISTVERSION=	2.1.3
 CATEGORIES=	graphics python

 MAINTAINER=	yuri@FreeBSD.org
--- a/graphics/drawpile/distinfo
+++ b/graphics/drawpile/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1552195043
-SHA256 (drawpile-Drawpile-2.1.2_GH0.tar.gz) = 2a8f3e2f882ead664939cfc53fdae2b52ba5a324e2bfaa3e354e9d3e18c0a7d2
-SIZE (drawpile-Drawpile-2.1.2_GH0.tar.gz) = 2404560
+TIMESTAMP = 1552857701
+SHA256 (drawpile-Drawpile-2.1.3_GH0.tar.gz) = ec0eef1ab4ca10379c35c188b67bfc3eeac20bb1f361910d2af57c3bfae5de64
+SIZE (drawpile-Drawpile-2.1.3_GH0.tar.gz) = 2410482
--- a/graphics/drawpile/pkg-plist
+++ b/graphics/drawpile/pkg-plist
@ -65,6 +65,7 @@ share/drawpile/drawpile/theme/dark/format-text-italic.svg
 share/drawpile/drawpile/theme/dark/format-text-strikethrough.svg
 share/drawpile/drawpile/theme/dark/format-text-underline.svg
 share/drawpile/drawpile/theme/dark/go-jump.svg
+share/drawpile/drawpile/theme/dark/help-whatsthis.svg
 share/drawpile/drawpile/theme/dark/im-ban-user.svg
 share/drawpile/drawpile/theme/dark/im-kick-user.svg
 share/drawpile/drawpile/theme/dark/im-user.svg
@ -137,6 +138,7 @@ share/drawpile/drawpile/theme/light/format-text-italic.svg
 share/drawpile/drawpile/theme/light/format-text-strikethrough.svg
 share/drawpile/drawpile/theme/light/format-text-underline.svg
 share/drawpile/drawpile/theme/light/go-jump.svg
+share/drawpile/drawpile/theme/light/help-whatsthis.svg
 share/drawpile/drawpile/theme/light/im-ban-user.svg
 share/drawpile/drawpile/theme/light/im-kick-user.svg
 share/drawpile/drawpile/theme/light/im-user.svg
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@ -2,9 +2,8 @@
 # $FreeBSD$

 PORTNAME=	exiv2
-DISTVERSION=	0.26
-PORTREVISION=	1
-DISTVERSIONSUFFIX=	-trunk
+DISTVERSION=	0.27.0
+DISTVERSIONSUFFIX=	a-Source
 PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.exiv2.org/builds/
@ -23,12 +22,17 @@ USE_LDCONFIG=	yes
 LDFLAGS+=	-lintl

 CMAKE_ON=	EXIV2_ENABLE_VIDEO \
-		EXIV2_ENABLE_BUILD_PO
-CMAKE_OFF=	EXIV2_ENABLE_BUILD_SAMPLES \
-		EXIV2_ENABLE_LIBXMP
+		EXIV2_BUILD_PO
+CMAKE_OFF=	EXIV2_ENABLE_LIBXMP
+
+OPTIONS_DEFINE=	SAMPLE
+OPTIONS_SUB=	yes
+
+SAMPLE_DESC=	Include samle applications
+SAMPLE_CMAKE_BOOL=	EXIV2_BUILD_SAMPLES

 PATHFIX_CMAKELISTSTXT=	CMakeChecks.txt

-WRKSRC=		${WRKDIR}/${PORTNAME}-trunk
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-Source

 .include <bsd.port.mk>
--- a/graphics/exiv2/distinfo
+++ b/graphics/exiv2/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1523892704
-SHA256 (exiv2-0.26-trunk.tar.gz) = c75e3c4a0811bf700d92c82319373b7a825a2331c12b8b37d41eb58e4f18eafb
-SIZE (exiv2-0.26-trunk.tar.gz) = 5677925
+TIMESTAMP = 1550640374
+SHA256 (exiv2-0.27.0a-Source.tar.gz) = a4adfa7aaf295b0383adead476f8e0493b9d6c6c7570d5884d2ebf8a2871902f
+SIZE (exiv2-0.27.0a-Source.tar.gz) = 27168207
--- a/graphics/exiv2/files/patch-src_CMakeLists.txt
+++ b/graphics/exiv2/files/patch-src_CMakeLists.txt
@ -1,22 +0,0 @@
-FreeBSD does hat have -ldl. 
- 
-Instead of unconditionally passing 'dl' to the linker, use cmakes 'CMAKE_DL_LIBS' [1] 
-which handles that properly on all systems.
-
-[1] https://cmake.org/cmake/help/v3.6/variable/CMAKE_DL_LIBS.html
-
--- src/CMakeLists.txt.orig        2017-03-27 09:04:12 UTC
-+++ src/CMakeLists.txt
-@@ -265,9 +265,9 @@ if ( MSVC )
-     TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${SSH_LIBRARIES} )
- else()
-     if ( UNIX AND NOT FREEBSD )
-        TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${EXPAT_LIBRARIES} )
-        TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${CURL_LIBRARIES} )
-        TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} dl ${SSH_LIBRARIES} )
-+        TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${EXPAT_LIBRARIES} )
-+        TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${CURL_LIBRARIES} )
-+        TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CMAKE_DL_LIBS} ${SSH_LIBRARIES} )
-     else()
-         TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${EXPAT_LIBRARIES} )
-         TARGET_LINK_LIBRARIES( exiv2lib ${PRIVATE_VAR} ${CURL_LIBRARIES} )
--- a/graphics/exiv2/files/patch-src_actions.cpp
+++ b/graphics/exiv2/files/patch-src_actions.cpp
@ -1,16 +0,0 @@
-FreeBSD does not know either 
-* PTHREAD_RECURSIVE_MUTEX_INITIALIZER nor 
-* PTHREAD_RECUSRIVE_MUTEX_INITIALIZER_NP
-
-
--- src/actions.cpp.orig        2017-03-08 20:42:28 UTC
-+++ src/actions.cpp
-@@ -2048,6 +2048,8 @@ namespace {
-  #if defined(__APPLE__)
-   /* This is the critical section object (statically allocated). */
-   static pthread_mutex_t cs =  PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
-+ #elif defined(__FreeBSD__)
-+  static pthread_mutex_t cs =  PTHREAD_MUTEX_INITIALIZER;
-  #else
-   static pthread_mutex_t cs =  PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-  #endif
--- a/graphics/exiv2/pkg-plist
+++ b/graphics/exiv2/pkg-plist
@ -1,6 +1,40 @@
+%%SAMPLE%%bin/addmoddel
+%%SAMPLE%%bin/convert-test
+%%SAMPLE%%bin/easyaccess-test
+%%SAMPLE%%bin/exifcomment
+%%SAMPLE%%bin/exifdata
+%%SAMPLE%%bin/exifdata-test
+%%SAMPLE%%bin/exifprint
+%%SAMPLE%%bin/exifvalue
 bin/exiv2
+%%SAMPLE%%bin/exiv2json
+%%SAMPLE%%bin/geotag
+%%SAMPLE%%bin/ini-test
+%%SAMPLE%%bin/iotest
+%%SAMPLE%%bin/iptceasy
+%%SAMPLE%%bin/iptcprint
+%%SAMPLE%%bin/iptctest
+%%SAMPLE%%bin/key-test
+%%SAMPLE%%bin/largeiptc-test
+%%SAMPLE%%bin/metacopy
+%%SAMPLE%%bin/mmap-test
+%%SAMPLE%%bin/mrwthumb
+%%SAMPLE%%bin/path-test
+%%SAMPLE%%bin/prevtest
+%%SAMPLE%%bin/stringto-test
+%%SAMPLE%%bin/taglist
+%%SAMPLE%%bin/tiff-test
+%%SAMPLE%%bin/werror-test
+%%SAMPLE%%bin/write-test
+%%SAMPLE%%bin/write2-test
+%%SAMPLE%%bin/xmpdump
+%%SAMPLE%%bin/xmpparse
+%%SAMPLE%%bin/xmpparser-test
+%%SAMPLE%%bin/xmpprint
+%%SAMPLE%%bin/xmpsample
 include/exiv2/asfvideo.hpp
 include/exiv2/basicio.hpp
+include/exiv2/bigtiffimage.hpp
 include/exiv2/bmpimage.hpp
 include/exiv2/config.h
 include/exiv2/convert.hpp
@ -12,6 +46,7 @@ include/exiv2/epsimage.hpp
 include/exiv2/error.hpp
 include/exiv2/exif.hpp
 include/exiv2/exiv2.hpp
+include/exiv2/exiv2lib_export.h
 include/exiv2/exv_conf.h
 include/exiv2/futils.hpp
 include/exiv2/gifimage.hpp
@ -35,7 +70,8 @@ include/exiv2/rafimage.hpp
 include/exiv2/riffvideo.hpp
 include/exiv2/rw2image.hpp
 include/exiv2/rwlock.hpp
-include/exiv2/svn_version.h
+include/exiv2/slice.hpp
+include/exiv2/ssh.hpp
 include/exiv2/tags.hpp
 include/exiv2/tgaimage.hpp
 include/exiv2/tiffimage.hpp
@ -44,15 +80,19 @@ include/exiv2/utilsvideo.hpp
 include/exiv2/value.hpp
 include/exiv2/version.hpp
 include/exiv2/webpimage.hpp
-include/exiv2/xmp.hpp
+include/exiv2/xmp_exiv2.hpp
 include/exiv2/xmpsidecar.hpp
 lib/libexiv2.so
-lib/libexiv2.so.26
-lib/libexiv2.so.26.0.0
-libdata/pkgconfig/exiv2.lsm
+lib/libexiv2.so.0.27.0
+lib/libexiv2.so.27
+lib/libxmp.a
 libdata/pkgconfig/exiv2.pc
 man/man1/exiv2.1.gz
+%%SAMPLE%%man/man1/exiv2samples.1.gz
+%%DATADIR%%/cmake/exiv2Config-%%CMAKE_BUILD_TYPE%%.cmake
+%%DATADIR%%/cmake/exiv2Config.cmake
 share/locale/bs/LC_MESSAGES/exiv2.mo
+share/locale/ca/LC_MESSAGES/exiv2.mo
 share/locale/de/LC_MESSAGES/exiv2.mo
 share/locale/es/LC_MESSAGES/exiv2.mo
 share/locale/fi/LC_MESSAGES/exiv2.mo
--- a/graphics/geeqie/Makefile
+++ b/graphics/geeqie/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	geeqie
 PORTVERSION=	1.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.geeqie.org/

--- a/graphics/gegl/Makefile
+++ b/graphics/gegl/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gegl
 PORTVERSION=	0.4.12
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics
 MASTER_SITES=	GIMP

--- a/graphics/gexiv2/Makefile
+++ b/graphics/gexiv2/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gexiv2
 PORTVERSION=	0.10.9
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME

--- a/graphics/gimp-lensfun-plugin/Makefile
+++ b/graphics/gimp-lensfun-plugin/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	lensfun
 DISTVERSION=	0.2.4-dev
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics
 PKGNAMEPREFIX=	gimp-
 PKGNAMESUFFIX=	-plugin
--- a/graphics/gnome-color-manager/Makefile
+++ b/graphics/gnome-color-manager/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	gnome-color-manager
 PORTVERSION=	3.28.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome
--- a/graphics/gthumb/Makefile
+++ b/graphics/gthumb/Makefile
@ -4,7 +4,7 @@

 PORTNAME=	gthumb
 PORTVERSION=	3.6.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	gwenview
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kde kde-applications

 MAINTAINER=	kde@FreeBSD.org
--- a/graphics/hugin/Makefile
+++ b/graphics/hugin/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	hugin
 PORTVERSION=	2018.0.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	graphics
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}

--- a/graphics/kphotoalbum/Makefile
+++ b/graphics/kphotoalbum/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	kphotoalbum
 DISTVERSION=	5.4.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${PORTVERSION}/
 DIST_SUBDIR=	KDE
--- a/graphics/krita/Makefile
+++ b/graphics/krita/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	krita
 DISTVERSION=	4.1.8
+PORTREVISION=	1
 CATEGORIES=	graphics kde
 MASTER_SITES=	KDE/stable/${PORTNAME}/${DISTVERSION}
 DIST_SUBDIR=	KDE/${PORTNAME}
--- a/graphics/libkexiv2/Makefile
+++ b/graphics/libkexiv2/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	libkexiv2
 DISTVERSION=	${KDE_APPLICATIONS_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	graphics kde kde-applications

 MAINTAINER=	kde@FreeBSD.org
--- a/graphics/luminance-qt5/Makefile
+++ b/graphics/luminance-qt5/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	luminance-hdr
 DISTVERSION=	2.4.0
-PORTREVISION=	28
+PORTREVISION=	29
 CATEGORIES=	graphics
 MASTER_SITES=	SF/qtpfsgui/luminance/${DISTVERSION}
 PKGNAMESUFFIX=	-qt5
--- a/graphics/nomacs/Makefile
+++ b/graphics/nomacs/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	nomacs
 PORTVERSION=	3.6.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics

 MAINTAINER=	bsd@tuxproject.de
--- a/graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp
+++ b/graphics/nomacs/files/patch-src_DkCore_DkMetaData.cpp
@ -0,0 +1,11 @@
+--- src/DkCore/DkMetaData.cpp.orig	2019-03-08 21:53:21 UTC
+++ src/DkCore/DkMetaData.cpp
+@@ -1262,7 +1262,7 @@ void DkMetaDataT::printMetaData() const {
+ 
+ 	std::string xmpPacket;
+ 	if (0 != Exiv2::XmpParser::encode(xmpPacket, xmpData)) {
+-		throw Exiv2::Error(1, "Failed to serialize XMP data");
+		throw Exiv2::Error(Exiv2::ErrorCode::kerErrorMessage, "Failed to serialize XMP data");
+ 	}
+ 	std::cout << xmpPacket << "\n";
+ }
--- a/graphics/oyranos/Makefile
+++ b/graphics/oyranos/Makefile
@ -0,0 +1,61 @@
+# $FreeBSD$
+
+PORTNAME=	oyranos
+PORTVERSION=	0.9.6
+PORTREVISION=	8
+CATEGORIES=	graphics
+
+MAINTAINER=	bsam@FreeBSD.org
+COMMENT=	Colour Management System (CMS)
+
+LICENSE=	BSD3CLAUSE
+
+RUN_DEPENDS=	${LOCALBASE}/share/color/icc/OpenICC/sRGB.icc:graphics/icc-profiles-openicc \
+		${LOCALBASE}/share/color/icc/basICColor/ISOcoated_v2_300_bas.ICC:graphics/icc-profiles-basiccolor \
+		xcalib:x11/xcalib
+LIB_DEPENDS=	libraw.so:graphics/libraw \
+		libexiv2.so:graphics/exiv2 \
+		libpng.so:graphics/png \
+		libcairo.so:graphics/cairo \
+		libyajl.so:devel/yajl \
+		libfltk.so:x11-toolkits/fltk \
+		libcups.so:print/cups \
+		libxdot.so:graphics/graphviz \
+		liblcms.so:graphics/lcms \
+		liblcms2.so:graphics/lcms2 \
+		libXcm.so:x11/libXcm \
+		libltdl.so:devel/libltdl \
+		libfontconfig.so:x11-fonts/fontconfig \
+		libOpenICC.so:graphics/openicc-config
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	oyranos-cms
+USES=		cmake compiler:c++11-lib desktop-file-utils gettext iconv jpeg pkgconfig qt:5
+USE_GL=		gl
+USE_LDCONFIG=	yes
+USE_GNOME=	libxml2
+USE_QT=		core gui widgets x11extras \
+		buildtools_build qmake_build
+USE_XORG=	ice sm x11 xcursor xext xfixes xinerama xrandr xrender xft xxf86vm
+CMAKE_ARGS+=	-DXDG_CONFIG_DIR=${PREFIX}/etc/xdg
+LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
+MAKE_JOBS_UNSAFE=yes
+
+OPTIONS_DEFINE=	DOXYGEN DOCS
+DOXYGEN_IMPLIES=	DOCS
+DOXYGEN_BUILD_DEPENDS=	${LOCALBASE}/bin/doxygen:devel/doxygen
+
+PORTDOCS=	*
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${PORTVERSION}
+
+PLIST_SUB+=	VER=${PORTVERSION}
+
+.if !exists(/usr/bin/clang)
+USE_GCC=   yes
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|lib|libdata|' \
+		${WRKSRC}/extras/CMakeLists.txt
+
+.include <bsd.port.mk>
--- a/graphics/oyranos/distinfo
+++ b/graphics/oyranos/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1482605955
+SHA256 (oyranos-cms-oyranos-0.9.6_GH0.tar.gz) = 44b0e451ccd80617484eaa824ce609bf2982f523ffc4c6350bca755037a52b9b
+SIZE (oyranos-cms-oyranos-0.9.6_GH0.tar.gz) = 2247841
--- a/graphics/oyranos/files/patch-CMakeLists.txt
+++ b/graphics/oyranos/files/patch-CMakeLists.txt
@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2016-12-09 13:36:53.000000000 +0300
+++ CMakeLists.txt	2016-12-26 17:57:38.831330000 +0300
+@@ -66,6 +66,10 @@
+   ENDIF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_COMPILER_IS_CLANG)
+ ENDIF(UNIX)
+ 
+# Add /usr/local/include to search path
+IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+  SET(CMAKE_REQUIRED_INCLUDES "/usr/local/include" "/usr/include")
+ENDIF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
+ 
+ # detect top level projects
+ IF(USE_SYSTEM_YAJL)
--- a/graphics/oyranos/files/patch-doc_CMakeLists.txt
+++ b/graphics/oyranos/files/patch-doc_CMakeLists.txt
@ -0,0 +1,13 @@
+--- doc/CMakeLists.txt.orig	2013-04-30 18:54:44.363878845 +0400
+++ doc/CMakeLists.txt	2013-04-30 18:55:06.496874403 +0400
+@@ -30,8 +30,8 @@ SET( MAN3_PAGES
+      man/oyranos-config.3
+    )
+ 
+-INSTALL( FILES ${MAN1_PAGES} DESTINATION share/man/man1 )
+-INSTALL( FILES ${MAN3_PAGES} DESTINATION share/man/man3 )
+INSTALL( FILES ${MAN1_PAGES} DESTINATION man/man1 )
+INSTALL( FILES ${MAN3_PAGES} DESTINATION man/man3 )
+ 
+ FIND_PACKAGE( Doxygen )
+ IF( DOXYGEN_FOUND )
--- a/graphics/oyranos/files/patch-src_API_generated_oyProfile_s.h
+++ b/graphics/oyranos/files/patch-src_API_generated_oyProfile_s.h
@ -0,0 +1,10 @@
+--- src/API_generated/oyProfile_s.h.orig	2013-01-19 14:14:14.000000000 +0400
+++ src/API_generated/oyProfile_s.h	2013-04-30 18:50:50.999894240 +0400
+@@ -31,6 +31,7 @@
+ 
+ 
+ 
+#include <inttypes.h>
+ #include <icc34.h>
+   
+ #include <oyranos_object.h>
--- a/graphics/oyranos/files/patch-src_CMakeLists.txt
+++ b/graphics/oyranos/files/patch-src_CMakeLists.txt
@ -0,0 +1,10 @@
+--- src/CMakeLists.txt.orig	2016-12-09 13:36:53.000000000 +0300
+++ src/CMakeLists.txt	2016-12-24 23:59:33.793724000 +0300
+@@ -63,7 +63,6 @@
+   FIND_PATH(DL_INCLUDE_DIR dlfcn.h)
+   IF(DL_INCLUDE_DIR)
+     SET( HAVE_DL 1 )
+-    SET( EXTRA_LIBS ${EXTRA_LIBS} dl )
+   ENDIF(DL_INCLUDE_DIR)
+ ENDIF(HAVE_DL)
+ 
--- a/graphics/oyranos/files/patch-src_examples_oforms_CMakeLists.txt
+++ b/graphics/oyranos/files/patch-src_examples_oforms_CMakeLists.txt
@ -0,0 +1,8 @@
+--- src/examples/oforms/CMakeLists.txt.orig	2013-05-01 18:22:36.000000000 +0400
+++ src/examples/oforms/CMakeLists.txt	2013-05-01 18:22:55.000000000 +0400
+@@ -7,5 +7,5 @@
+ 
+ MESSAGE( "-- OY_OFORMS_LIB: ${OY_OFORMS_LIB}" )
+ 
+-INSTALL (FILES ./oyranos-xforms-modules.1 DESTINATION share/man/man1 )
+INSTALL (FILES ./oyranos-xforms-modules.1 DESTINATION man/man1 )
--- a/graphics/oyranos/files/patch-src_modules_color_modules_devices_oyranoscmmoyRE.cpp
+++ b/graphics/oyranos/files/patch-src_modules_color_modules_devices_oyranoscmmoyRE.cpp
@ -0,0 +1,11 @@
+--- src/modules/color/modules/devices/oyranos_cmm_oyRE.cpp.orig	2018-01-15 20:16:42 UTC
+++ src/modules/color/modules/devices/oyranos_cmm_oyRE.cpp
+@@ -482,7 +482,7 @@ oyProfile_s * createMatrixProfile      ( libraw_colord
+       oyOptions_s * result = 0;
+ 
+       oyOptions_SetFromInt( &opts, "///icc_profile_flags", icc_profile_flags, 0, OY_CREATE_NEW );
+-      const char * reg = "//"OY_TYPE_STD"/create_profile.color_matrix.icc";
+      const char * reg = "//" OY_TYPE_STD "/create_profile.color_matrix.icc";
+       oyOptions_Handle( reg, opts, "create_profile.icc_profile.color_matrix",
+                         &result );
+ 
--- a/graphics/oyranos/pkg-descr
+++ b/graphics/oyranos/pkg-descr
@ -0,0 +1,10 @@
+The Colour Management System (CMS) Oyranos (gr. sky) allows the coordination of
+device specific Informations (ICC profiles) and system wide settings. Features:
+.  configuration for cross application colour agreement;
+.  plugable and selectable modules (known as CMM's);
+.  pixel conversions;
+.  profile handling;
+.  named colours;
+.  device profile assignment.
+
+WWW: http://www.oyranos.org/
--- a/graphics/oyranos/pkg-plist
+++ b/graphics/oyranos/pkg-plist
@ -0,0 +1,143 @@
+bin/oyranos-config
+bin/oyranos-config-fltk
+bin/oyranos-icc
+bin/oyranos-image-display
+bin/oyranos-monitor
+bin/oyranos-monitor-daemon
+bin/oyranos-policy
+bin/oyranos-profile
+bin/oyranos-profile-graph
+bin/oyranos-profile-install
+bin/oyranos-profiles
+bin/oyranos-xforms
+bin/oyranos-xforms-fltk
+bin/oyranos-xforms-modules
+bin/qcmsevents
+etc/xdg/autostart/oyranos-monitor-setup.desktop
+include/oyranos/alpha/oyranos_alpha.h
+include/oyranos/icc34.h
+include/oyranos/oyArray2d_s.h
+include/oyranos/oyBlob_s.h
+include/oyranos/oyCMM_s.h
+include/oyranos/oyCMMapi4_s.h
+include/oyranos/oyCMMapi7_s.h
+include/oyranos/oyCMMapiFilter_s.h
+include/oyranos/oyCMMapiFilters_s.h
+include/oyranos/oyCMMapi_s.h
+include/oyranos/oyCMMapis_s.h
+include/oyranos/oyCMMui_s.h
+include/oyranos/oyConfig_s.h
+include/oyranos/oyConfigs_s.h
+include/oyranos/oyConnectorImaging_s.h
+include/oyranos/oyConnector_s.h
+include/oyranos/oyConversion_s.h
+include/oyranos/oyFilterCore_s.h
+include/oyranos/oyFilterGraph_s.h
+include/oyranos/oyFilterNode_s.h
+include/oyranos/oyFilterNodes_s.h
+include/oyranos/oyFilterPlug_s.h
+include/oyranos/oyFilterPlugs_s.h
+include/oyranos/oyFilterSocket_s.h
+include/oyranos/oyHash_s.h
+include/oyranos/oyImage_s.h
+include/oyranos/oyName_s.h
+include/oyranos/oyNamedColor_s.h
+include/oyranos/oyNamedColors_s.h
+include/oyranos/oyObject_s.h
+include/oyranos/oyObserver_s.h
+include/oyranos/oyOption_s.h
+include/oyranos/oyOptions_s.h
+include/oyranos/oyPixelAccess_s.h
+include/oyranos/oyPointer_s.h
+include/oyranos/oyProfileTag_s.h
+include/oyranos/oyProfile_s.h
+include/oyranos/oyProfiles_s.h
+include/oyranos/oyRectangle_s.h
+include/oyranos/oyStructList_s.h
+include/oyranos/oyStruct_s.h
+include/oyranos/oyranos.h
+include/oyranos/oyranos_color.h
+include/oyranos/oyranos_conversion.h
+include/oyranos/oyranos_core.h
+include/oyranos/oyranos_definitions.h
+include/oyranos/oyranos_devices.h
+include/oyranos/oyranos_generic.h
+include/oyranos/oyranos_icc.h
+include/oyranos/oyranos_image.h
+include/oyranos/oyranos_module.h
+include/oyranos/oyranos_object.h
+include/oyranos/oyranos_profile.h
+include/oyranos/oyranos_threads.h
+include/oyranos/oyranos_types.h
+include/oyranos/oyranos_version.h
+lib/cmake/oyranos/OyranosConfig.cmake
+lib/color/modules/liboyranos_CUPS_cmm_module.so
+lib/color/modules/liboyranos_lcm2_cmm_module.so
+lib/color/modules/liboyranos_lcms_cmm_module.so
+lib/color/modules/liboyranos_lraw_cmm_module.so
+lib/color/modules/liboyranos_oJPG_cmm_module.so
+lib/color/modules/liboyranos_oPNG_cmm_module.so
+lib/color/modules/liboyranos_oiDB_cmm_module.so
+lib/color/modules/liboyranos_oicc_cmm_module.so
+lib/color/modules/liboyranos_oyRE_cmm_module.so
+lib/color/modules/liboyranos_oyX1_cmm_module.so
+lib/color/modules/liboyranos_oydi_cmm_module.so
+lib/color/modules/liboyranos_oyra_cmm_module.so
+lib/color/modules/liboyranos_trds_cmm_module.so
+lib/libOyranos.so
+lib/libOyranos.so.0
+lib/libOyranos.so.%%VER%%
+lib/libOyranosConfig.so
+lib/libOyranosConfig.so.0
+lib/libOyranosConfig.so.%%VER%%
+lib/libOyranosCore.so
+lib/libOyranosCore.so.0
+lib/libOyranosCore.so.%%VER%%
+lib/libOyranosModules.so
+lib/libOyranosModules.so.0
+lib/libOyranosModules.so.%%VER%%
+lib/libOyranosObject.so
+lib/libOyranosObject.so.0
+lib/libOyranosObject.so.%%VER%%
+lib/liboyranos-static.a
+lib/liboyranos_config-static.a
+lib/liboyranos_core-static.a
+lib/liboyranos_modules-static.a
+lib/liboyranos_object-static.a
+lib/oyranos-meta/liboyranos_oyIM_cmm_module.so
+libdata/pkgconfig/oyranos.pc
+man/man1/oyranos-config-fltk.1.gz
+man/man1/oyranos-monitor-daemon.1.gz
+man/man1/oyranos-monitor.1.gz
+man/man1/oyranos-policy.1.gz
+man/man1/oyranos-profile-graph.1.gz
+man/man1/oyranos-profile-install.1.gz
+man/man1/oyranos-profile.1.gz
+man/man1/oyranos-profiles.1.gz
+man/man1/oyranos-xforms-modules.1.gz
+man/man1/qcmsevents-qt4.1.gz
+man/man1/qcmsevents.1.gz
+man/man3/oyranos-config.3.gz
+man/man3/oyranos.3.gz
+share/applications/oyranos-image-display.desktop
+share/applications/oyranos-profile-install.desktop
+share/applications/qcmsevents-applet.desktop
+share/color/rank-map/config.icc_profile.monitor.oyX1.qarz.json
+share/color/rank-map/config.icc_profile.printer.CUPS.json
+share/color/rank-map/config.icc_profile.raw-image.oyRE.json
+share/color/settings/designer.policy.xml
+share/color/settings/office.policy.xml
+share/color/settings/photographer.policy.xml
+share/color/settings/prepress.policy.xml
+share/locale/cs/LC_MESSAGES/oyranos.mo
+share/locale/de/LC_MESSAGES/oyranos.mo
+share/locale/eo/LC_MESSAGES/oyranos.mo
+share/locale/eu/LC_MESSAGES/oyranos.mo
+share/locale/fr/LC_MESSAGES/oyranos.mo
+share/locale/ru/LC_MESSAGES/oyranos.mo
+share/man/man1/oyranos-image-display.1
+share/man/man1/oyranos-xforms-fltk.1
+share/man/man1/oyranos-xforms-modules.1
+share/pixmaps/lcms_logo2.png
+share/pixmaps/oyranos_logo.png
+share/pixmaps/qcmsevents.svg
--- a/graphics/photivo/Makefile
+++ b/graphics/photivo/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	photivo
 PORTVERSION=	0.0.2015.03.21
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	graphics
 MASTER_SITES=	https://storage.googleapis.com/google-code-archive-source/v2/code.google.com/${PORTNAME}/
 DISTNAME=	source-archive
--- a/graphics/photoqt/Makefile
+++ b/graphics/photoqt/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	photoqt
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics

 MAINTAINER=	melanhit@gmail.com
--- a/graphics/phototonic/Makefile
+++ b/graphics/phototonic/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	phototonic
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics

 MAINTAINER=	ports@FreeBSD.org
--- a/graphics/py-exiv2/Makefile
+++ b/graphics/py-exiv2/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	exiv2
 PORTVERSION=	0.3.2
-PORTREVISION=	15
+PORTREVISION=	16
 CATEGORIES=	graphics python
 MASTER_SITES=	https://launchpadlibrarian.net/83595798/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -21,6 +21,7 @@ USE_LDCONFIG=	yes
 CXXFLAGS+=	-I${LOCALBASE}/include
 MAKE_ARGS+=	prefix=${PREFIX} use_env=1 BOOSTLIB="${PY_BOOST_LIB}"

+BROKEN=		Does not work with exiv2 > 0.26
 DEPRECATED=	py-exiv2 has been deprecated in favour of GExiv2
 EXPIRATION_DATE=	2019-03-31

--- a/graphics/rawstudio/Makefile
+++ b/graphics/rawstudio/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	rawstudio
 PORTVERSION=	2.0
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	graphics
 MASTER_SITES=	http://rawstudio.org/files/release/

--- a/graphics/shotwell/Makefile
+++ b/graphics/shotwell/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	shotwell
 PORTVERSION=	0.30.2
+PORTREVISION=	1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	GNOME

--- a/graphics/ufraw/Makefile
+++ b/graphics/ufraw/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	ufraw
 PORTVERSION=	0.22
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	graphics

 MAINTAINER=	rodrigo@FreeBSD.org
--- a/graphics/viewnior/Makefile
+++ b/graphics/viewnior/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	viewnior
 PORTVERSION=	1.6
 DISTVERSIONPREFIX=	${PORTNAME}-
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	graphics

 MAINTAINER=	ports@FreeBSD.org
--- a/Show More
+++ b/Show More