*/*: sync with upstream

Taken from: HardenedBSD

accessibility/Makefile

@@ -11,12 +11,12 @@
     SUBDIR += atkmm
     SUBDIR += caribou
     SUBDIR += eflite
-    SUBDIR += jovie
-    SUBDIR += kaccessible
+    SUBDIR += jovie-kde4
+    SUBDIR += kaccessible-kde4
     SUBDIR += kdeaccessibility-kde4
-    SUBDIR += kmag
-    SUBDIR += kmousetool
-    SUBDIR += kmouth
+    SUBDIR += kmag-kde4
+    SUBDIR += kmousetool-kde4
+    SUBDIR += kmouth-kde4
     SUBDIR += linux-c6-atk
     SUBDIR += linux-c7-atk
     SUBDIR += mousetweaks

accessibility/caribou/Makefile

@@ -3,6 +3,7 @@
 
 PORTNAME=	caribou
 PORTVERSION=	0.4.21
+PORTREVISION=	1
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -18,7 +19,7 @@ LIB_DEPENDS=	libclutter-glx-1.0.so:graphics/clutter \
 		libxklavier.so:x11/libxklavier
 RUN_DEPENDS=	py2?-atspi>=2.1.91:accessibility/py-atspi@${PY_FLAVOR}
 
-USES=		gettext gmake gnome libtool pathfix pkgconfig python:2 \
+USES=		gettext gmake gnome libtool pathfix pkgconfig python:2.7 \
 		shebangfix tar:xz
 USE_GNOME=	gtk30 intlhack introspection:build libxml2 \
 		libxslt:build pygobject3

accessibility/jovie-kde4/Makefile

@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME=	jovie
+PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	3
+CATEGORIES=	accessibility kde kde-kde4
+
+MAINTAINER=	[email protected]
+COMMENT=	KDE text-to-speech system
+
+LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
+
+USES=		cmake:outsource kde:4 tar:xz
+USE_KDE=	kdelibs automoc4
+USE_QT4=	xml qmake_build moc_build uic_build rcc_build
+USE_LDCONFIG=	yes
+
+.include <bsd.port.mk>

accessibility/kaccessible-kde4/Makefile

@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME=	kaccessible
+PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	3
+CATEGORIES=	accessibility kde kde-kde4
+
+MAINTAINER=	[email protected]
+COMMENT=	Accessibility services for KDE
+
+LIB_DEPENDS=	libspeechd.so:accessibility/speech-dispatcher
+
+USES=		cmake:outsource kde:4 tar:xz
+USE_KDE=	kdelibs automoc4
+USE_QT4=	corelib dbus gui xml \
+		qmake_build moc_build rcc_build uic_build
+
+.include <bsd.port.mk>

accessibility/kdeaccessibility-kde4/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	kdeaccessibility
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	accessibility kde
 PKGNAMESUFFIX=	-kde4
 
@@ -16,18 +16,18 @@ OPTIONS_DEFINE=	JOVIE KACCESSIBLE KMAG KMOUSETOOL KMOUTH
 OPTIONS_DEFAULT:=	${OPTIONS_DEFINE}
 
 JOVIE_DESC=		Install Jovie text-to-speech system
-JOVIE_RUN_DEPENDS=	${KDE_PREFIX}/bin/jovie:accessibility/jovie
+JOVIE_RUN_DEPENDS=	${KDE_PREFIX}/bin/jovie:accessibility/jovie-kde4
 
 KACCESSIBLE_DESC=	Install Accessibility services for KDE
-KACCESSIBLE_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/libexec/kaccessibleapp:accessibility/kaccessible
+KACCESSIBLE_RUN_DEPENDS=	${KDE_PREFIX}/lib/kde4/libexec/kaccessibleapp:accessibility/kaccessible-kde4
 
 KMAG_DESC=		Install Screen magnifier
-KMAG_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmag:accessibility/kmag
+KMAG_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmag:accessibility/kmag-kde4
 
 KMOUSETOOL_DESC=	Install Automatic mouse click tool
-KMOUSETOOL_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmousetool:accessibility/kmousetool
+KMOUSETOOL_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmousetool:accessibility/kmousetool-kde4
 
 KMOUTH_DESC=		Install Speech synthesizer frontend
-KMOUTH_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmouth:accessibility/kmouth
+KMOUTH_RUN_DEPENDS=	${KDE_PREFIX}/bin/kmouth:accessibility/kmouth-kde4
 
 .include <bsd.port.mk>

accessibility/kmag-kde4/Makefile

@@ -0,0 +1,18 @@
+# $FreeBSD$
+
+PORTNAME=	kmag
+PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	3
+CATEGORIES=	accessibility kde kde-kde4
+
+MAINTAINER=	[email protected]
+COMMENT=	KDE Screen magnifier
+
+USES=		cmake:outsource kde:4 tar:xz
+USE_KDE=	kdelibs automoc4
+USE_QT4=	qmake_build moc_build rcc_build uic_build
+
+# Somebody has to create port for libkdeaccessibilityclient first
+CMAKE_ARGS+=	-DWITH_QAccessibilityClient=off
+
+.include <bsd.port.mk>

accessibility/kmousetool-kde4/Makefile

@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+PORTNAME=	kmousetool
+PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	3
+CATEGORIES=	accessibility kde kde-kde4
+
+MAINTAINER=	[email protected]
+COMMENT=	Automatic mouse click tool for KDE
+
+USES=		cmake:outsource kde:4 tar:xz
+USE_KDE=	kdelibs automoc4
+USE_QT4=	qmake_build moc_build rcc_build uic_build
+USE_XORG=	xtst
+
+.include <bsd.port.mk>

accessibility/kmouth-kde4/Makefile

@@ -0,0 +1,15 @@
+# $FreeBSD$
+
+PORTNAME=	kmouth
+PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	3
+CATEGORIES=	accessibility kde kde-kde4
+
+MAINTAINER=	[email protected]
+COMMENT=	Speech synthesizer frontend for KDE
+
+USES=		cmake:outsource kde:4 tar:xz
+USE_KDE=	kdelibs automoc4
+USE_QT4=	qmake_build moc_build rcc_build uic_build
+
+.include <bsd.port.mk>

accessibility/py-papi/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	papi
 PORTVERSION=	0.0.9
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	accessibility devel python
 MASTER_SITES=	SF/ocemp/${PORTNAME}/${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -14,7 +14,7 @@ COMMENT=	ATK accessibility wrapper for python
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		pkgconfig python:2
+USES=		pkgconfig python:2.7
 USE_GNOME=	atk
 USE_PYTHON=	autoplist distutils
 

archivers/Makefile

@@ -8,7 +8,7 @@
     SUBDIR += amigadepacker
     SUBDIR += arc
     SUBDIR += arj
-    SUBDIR += ark
+    SUBDIR += ark-kde4
     SUBDIR += atool
     SUBDIR += bicom
     SUBDIR += brotli

archivers/ark-kde4/Makefile

@@ -0,0 +1,36 @@
+# Created by: Martin Wilke <[email protected]>
+# $FreeBSD$
+
+PORTNAME=	ark
+PORTVERSION=	${KDE4_VERSION}
+PORTREVISION=	4
+CATEGORIES=	archivers kde kde-kde4
+
+MAINTAINER=	[email protected]
+COMMENT=	Archiving tool for KDE
+
+LIB_DEPENDS=	libqjson.so:devel/qjson
+
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		cmake:outsource kde:4 libarchive cpe tar:xz
+USE_KDE=	automoc4 kdelibs libkonq
+CPE_VENDOR=	kde
+USE_QT4=	qtestlib qmake_build moc_build rcc_build uic_build
+USE_LDCONFIG=	yes
+
+OPTIONS_DEFINE=	7ZIP RAR ZIP
+
+7ZIP_DESC=	Support for 7-Zip archives
+7ZIP_RUN_DEPENDS=	7z:archivers/p7zip
+
+RAR_DESC=	Support for RAR archives
+RAR_RUN_DEPENDS=	unrar:archivers/unrar \
+			rar:archivers/rar
+
+ZIP_DESC=	Support for ZIP archives
+ZIP_RUN_DEPENDS=	unzip>0:archivers/unzip \
+			zip:archivers/zip
+
+.include <bsd.port.mk>

archivers/peazip/Makefile

@@ -16,7 +16,7 @@ BUILD_DEPENDS=	lazbuild:editors/lazarus \
 		fpcres:lang/fpc-utils
 
 USES=		dos2unix zip
-USE_FPC=	cairo fcl-base fcl-image pasjpeg rtl-objpas x11
+USE_FPC=	cairo chm fcl-base fcl-image pasjpeg rtl-objpas x11
 USE_GNOME=	#
 
 SUB_FILES=	pea pealauncher peazip

archivers/ppmd/Makefile

@@ -14,10 +14,17 @@ PLIST_FILES=	bin/ppmd man/man1/ppmd.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
+.include <bsd.port.pre.mk>
+
+# does not compile with clang 6.0.0
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200056
+USE_GCC=	yes
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

archivers/py-bz2file/Makefile

@@ -7,7 +7,7 @@ CATEGORIES=	archivers python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
-MAINTAINER=	yuri@rawbw.com
+MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Read and write bzip2-compressed files
 
 LICENSE=	APACHE20

archivers/py-lz4/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	lz4
-PORTVERSION=	0.23.2
+PORTVERSION=	1.0.0
 CATEGORIES=	archivers python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}