*/*: sync with upstream

Taken from: FreeBSD
2017-02-06 05:57:52 +01:00 · 2017-02-06 05:57:52 +01:00 · c0ce196c0c
commit c0ce196c0c
parent 2787625f4d
207 changed files with 2749 additions and 4201 deletions
--- a/accessibility/py-papi/Makefile
+++ b/accessibility/py-papi/Makefile
@ -11,6 +11,9 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ATK accessibility wrapper for python

+LICENSE=	BSD2CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 USES=		pkgconfig python:2
 USE_GNOME=	atk
 USE_PYTHON=	autoplist distutils
@ -21,11 +24,11 @@ EXAMPLES=	atkaction.py atkapplication.py atkcapi.c atktext.py atkvalue.py \
 OPTIONS_DEFINE=	EXAMPLES

 post-patch:
-	${REINPLACE_CMD} -i "" -e 's|: docfiles|: []|g' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -i "" -e 's|: docfiles|: []|g' ${WRKSRC}/setup.py

-post-install:
-	@${INSTALL} -d ${STAGEDIR}${EXAMPLESDIR}/
-	@cd ${WRKSRC}/doc/examples && \
+post-install-EXAMPLES-on:
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
+	cd ${WRKSRC}/doc/examples && \
 		${INSTALL_DATA} ${EXAMPLES} ${STAGEDIR}${EXAMPLESDIR}/

 .include <bsd.port.mk>
--- a/audio/logitechmediaserver/Makefile
+++ b/audio/logitechmediaserver/Makefile
@ -43,8 +43,8 @@ SHEBANG_FILES=	Bin/darwin/check-update.pl \

 # Defaults support playback of relativly unrestricted formats on SB2 or
 # SB3 devices and wired SB1 devices.
-OPTIONS_DEFINE=	APE FAAD FLAC LAME SHORTEN SOX DOCS
-OPTIONS_DEFAULT=APE FAAD FLAX SOX
+OPTIONS_DEFINE=	APE FAAD FLAC LAME SHORTEN SOX TEST DOCS
+OPTIONS_DEFAULT=APE FAAD FLAX SOX TEST
 SHORTEN_DESC=	Support Shorten input
 SOX_DESC=	Support OGG Vorbis input via SoX (SliMP3 and SB1)

@ -54,6 +54,7 @@ FLAC_RUN_DEPENDS=	flac:audio/flac
 LAME_RUN_DEPENDS=	lame:audio/lame
 SHORTEN_RUN_DEPENDS=	shorten:audio/shorten
 SOX_RUN_DEPENDS=	sox:audio/sox
+TEST_VARS_OFF=		CONTRIB_FLAGS=-t

 USE_RC_SUBR=	logitechmediaserver
 DOCFILES=	Changelog*.html Installation.txt License*.txt
@ -101,7 +102,7 @@ PLIST_SUB+=	AMD64_ONLY="@comment "
 .endif

 do-build:
-	cd ${WRKSRC_vendor}/CPAN && ./buildme.sh
+	cd ${WRKSRC_vendor}/CPAN && ./buildme.sh ${CONTRIB_FLAGS}
 	cd ${WRKSRC}/CPAN/arch && ${CP} -R 5.22 5.24

 do-install:
--- a/audio/mp3c/Makefile
+++ b/audio/mp3c/Makefile
@ -33,6 +33,6 @@ post-patch:
 		${WRKSRC}/src/conf.c

 post-install:
-	${INSTALL_SCRIPT} ${FILESDIR}/cdrip.sh ${STAGEDIR}${LOCALBASE}/bin
+	${INSTALL_SCRIPT} ${FILESDIR}/cdrip.sh ${STAGEDIR}${PREFIX}/bin

 .include <bsd.port.mk>
--- a/audio/openal-soft/Makefile
+++ b/audio/openal-soft/Makefile
@ -9,13 +9,14 @@ MASTER_SITES=	http://kcat.strangesoft.net/openal-releases/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Software implementation of the OpenAL specification

-LICENSE=	LGPL20
+LICENSE=	LGPL20+
+LICENSE_FILE=	${WRKSRC}/COPYING

 CONFLICTS=	openal-200[0-9]*

 USES=		tar:bzip2 cmake compiler:c11
 USE_LDCONFIG=	yes
-CMAKE_ARGS+=	-DSHARE_INSTALL_DIR:STRING=${ETCDIR} \
+CMAKE_ARGS=	-DSHARE_INSTALL_DIR:STRING=${ETCDIR} \
 		-DALSOFT_REQUIRE_JACK:BOOL=OFF \
 		-DALSOFT_REQUIRE_OSS:BOOL=ON \
 		-DALSOFT_REQUIRE_SOLARIS:BOOL=OFF \
--- a/audio/py-al/Makefile
+++ b/audio/py-al/Makefile
@ -10,9 +10,12 @@ DISTNAME=	PyAL-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	PyAL is a binding of OpenAL for Python

-LICENSE=	ZLIB
+LICENSE=	PD ZLIB
+LICENSE_COMB=	dual
+LICENSE_FILE=	${WRKSRC}/doc/copying.rst

 USES=		openal:al python
 USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes

 .include <bsd.port.mk>
--- a/audio/smasher/Makefile
+++ b/audio/smasher/Makefile
@ -19,6 +19,7 @@ LIB_DEPENDS=	libsndfile.so:audio/libsndfile \

 GNU_CONFIGURE=	yes
 USES=		desktop-file-utils gmake pkgconfig
+USE_CXXSTD=	c++11
 USE_GCC=	yes
 USE_WX=		2.8
 WX_CONF_ARGS=	absolute
--- a/benchmarks/wrk/Makefile
+++ b/benchmarks/wrk/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	wrk
 PORTVERSION=	4.0.2
+PORTREVISION=	1
 CATEGORIES=	benchmarks www

 MAINTAINER=	osa@FreeBSD.org
@ -15,11 +16,9 @@ LIB_DEPENDS=	libluajit-5.1.so:lang/luajit
 USE_GITHUB=	yes
 GH_ACCOUNT=	wg

-USES=		gmake
-USE_OPENSSL=	yes
-WITH_OPENSSL_PORT=	yes
+USES=		gmake ssl
 CFLAGS+=	-std=c99 -D_DECLARE_C99_LDBL_MATH
-MAKE_ENV+=	WITH_OPENSSL=${LOCALBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION}
+MAKE_ENV+=	WITH_OPENSSL=${OPENSSLBASE} WITH_LUAJIT=${LOCALBASE} VER=${PORTVERSION}

 PLIST_FILES=	bin/wrk

--- a/biology/diamond/Makefile
+++ b/biology/diamond/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	diamond
-PORTVERSION=	0.8.34
+PORTVERSION=	0.8.35
 DISTVERSIONPREFIX=v
 CATEGORIES=	biology

@ -11,7 +11,7 @@ COMMENT=	BLAST-compatible local sequence aligner
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/src/COPYING

-ONLY_FOR_ARCHS=	amd64
+ONLY_FOR_ARCHS=	amd64 i386

 USES=		cmake:outsource compiler:c++11-lang

--- a/biology/diamond/distinfo
+++ b/biology/diamond/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1485010368
-SHA256 (bbuchfink-diamond-v0.8.34_GH0.tar.gz) = 695c33c43beab64de75f14cccec84d75477a37d02bad1ffef9eb19321e19794b
-SIZE (bbuchfink-diamond-v0.8.34_GH0.tar.gz) = 342441
+TIMESTAMP = 1486332438
+SHA256 (bbuchfink-diamond-v0.8.35_GH0.tar.gz) = d6b94a5943a3b0d2d6e1bbcb2c1aac1c243705293672d6584164ed9412ab68f0
+SIZE (bbuchfink-diamond-v0.8.35_GH0.tar.gz) = 342724
--- a/comms/linpsk/Makefile
+++ b/comms/linpsk/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	linpsk
 PORTVERSION=	1.2
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}

--- a/comms/linpsk/files/patch-gui_crxdisplay.cpp
+++ b/comms/linpsk/files/patch-gui_crxdisplay.cpp
@ -0,0 +1,13 @@
+Fix bogus pointer comparison.
+
+--- gui/crxdisplay.cpp.orig	2017-01-22 12:03:47 UTC
+++ gui/crxdisplay.cpp
+@@ -98,7 +98,7 @@ bool CRxDisplay::start_process_loop()
+     }
+     else
+       Sound = new CSound ( settings.serial );
+-    if ( Sound <= NULL )
+    if ( !Sound )
+       return false;
+ 
+     connect ( Sound, SIGNAL ( samplesAvailable() ), this, SLOT ( process_rxdata() ) );
--- a/comms/linpsk/files/patch-gui_linpsk.cpp
+++ b/comms/linpsk/files/patch-gui_linpsk.cpp
@ -0,0 +1,22 @@
+Fix bogus pointer comparison.
+
+--- gui/linpsk.cpp.orig	2017-01-22 12:03:55 UTC
+++ gui/linpsk.cpp
+@@ -387,7 +387,7 @@ void LinPSK::startTx()
+       Info = "BPSK";
+       break;
+   }
+-  if ( Sound <= NULL ) // Only create Sound Device once for output
+  if ( !Sound ) // Only create Sound Device once for output
+   {
+     if ( settings.DemoMode )
+     {
+@@ -401,7 +401,7 @@ void LinPSK::startTx()
+       Sound = new CSound ( settings.serial );
+     connect ( Sound, SIGNAL ( samplesAvailable() ), this, SLOT ( process_txdata() ) );
+   }
+-  if ( Sound <= NULL )
+  if ( !Sound )
+   {
+     QMessageBox::critical ( 0, " Programm Error! LinPsk", "Could not create Sound Device for Output" );
+     TxDisplay->TxFunctions->setStatus ( ON );
--- a/databases/WWWdb/pkg-descr
+++ b/databases/WWWdb/pkg-descr
@ -1,4 +1,4 @@
 A flexible web-enabled frontend and application-server for different
 databases ...  that is WWWdb

-WWW: http://www.wwwdb.org/
+WWW: https://sourceforge.net/projects/wwwdb/
--- a/databases/mariadb100-client/files/patch-cmake_ssl.cmake
+++ b/databases/mariadb100-client/files/patch-cmake_ssl.cmake
@ -0,0 +1,24 @@
+--- cmake/ssl.cmake.orig	2016-08-24 15:07:34 UTC
+++ cmake/ssl.cmake
+@@ -141,11 +141,6 @@ MACRO (MYSQL_CHECK_SSL)
+       MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}")
+     ENDIF()
+ 
+-    # On mac this list is <.dylib;.so;.a>
+-    # We prefer static libraries, so we revert it here.
+-    IF (WITH_SSL_PATH)
+-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+-    ENDIF()
+     MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
+     FIND_LIBRARY(OPENSSL_LIBRARIES
+                  NAMES ssl ssleay32 ssleay32MD
+@@ -153,9 +148,6 @@ MACRO (MYSQL_CHECK_SSL)
+     FIND_LIBRARY(CRYPTO_LIBRARY
+                  NAMES crypto libeay32
+                  HINTS ${OPENSSL_ROOT_DIR}/lib)
+-    IF (WITH_SSL_PATH)
+-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+-    ENDIF()
+ 
+     IF(OPENSSL_INCLUDE_DIR AND
+        OPENSSL_LIBRARIES   AND
--- a/databases/mariadb100-server/Makefile
+++ b/databases/mariadb100-server/Makefile
@ -2,6 +2,7 @@

 PORTNAME?=	mariadb
 PORTVERSION=	10.0.29
+PORTREVISION=	1
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
@ -95,8 +96,6 @@ OPTIONS_SUB=	yes
 .endif

 FASTMTX_CMAKE_ON=	-DWITH_FAST_MUTEXES=1
-# See PR209419, MariaDB 10.0 fails to build with base SSL libs
-WITH_OPENSSL_PORT=	yes

 .if defined(CLIENT_ONLY)
 # MySQL-Client part
--- a/databases/mariadb100-server/files/patch-cmake_ssl.cmake
+++ b/databases/mariadb100-server/files/patch-cmake_ssl.cmake
@ -0,0 +1,24 @@
+--- cmake/ssl.cmake.orig	2016-08-24 15:07:34 UTC
+++ cmake/ssl.cmake
+@@ -141,11 +141,6 @@ MACRO (MYSQL_CHECK_SSL)
+       MESSAGE(STATUS "OPENSSL_APPLINK_C ${OPENSSL_APPLINK_C}")
+     ENDIF()
+ 
+-    # On mac this list is <.dylib;.so;.a>
+-    # We prefer static libraries, so we revert it here.
+-    IF (WITH_SSL_PATH)
+-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+-    ENDIF()
+     MESSAGE(STATUS "suffixes <${CMAKE_FIND_LIBRARY_SUFFIXES}>")
+     FIND_LIBRARY(OPENSSL_LIBRARIES
+                  NAMES ssl ssleay32 ssleay32MD
+@@ -153,9 +148,6 @@ MACRO (MYSQL_CHECK_SSL)
+     FIND_LIBRARY(CRYPTO_LIBRARY
+                  NAMES crypto libeay32
+                  HINTS ${OPENSSL_ROOT_DIR}/lib)
+-    IF (WITH_SSL_PATH)
+-      LIST(REVERSE CMAKE_FIND_LIBRARY_SUFFIXES)
+-    ENDIF()
+ 
+     IF(OPENSSL_INCLUDE_DIR AND
+        OPENSSL_LIBRARIES   AND
--- a/databases/puppetdb-terminus/Makefile
+++ b/databases/puppetdb-terminus/Makefile
@ -10,6 +10,9 @@ DISTNAME=	puppetdb-${PORTVERSION}
 MAINTAINER=	freebsd@geoffgarside.co.uk
 COMMENT=	PuppetDB storeconfigs backend terminus module

+DEPRECATED=	Depends on expired sysutils/puppet38, use puppetdb-terminus[34]
+EXPIRATION_DATE=2017-04-05
+
 LICENSE=	APACHE20

 BUILD_DEPENDS=	puppet38>=0:sysutils/puppet38
--- a/databases/puppetdb/Makefile
+++ b/databases/puppetdb/Makefile
@ -9,6 +9,9 @@ MASTER_SITES=	http://downloads.puppetlabs.com/puppetdb/
 MAINTAINER=	freebsd@zleslie.info
 COMMENT=	PuppetDB storeconfigs backend

+DEPRECATED=	Depends on expired sysutils/puppet38, use puppetdb[34] instead
+EXPIRATION_DATE=2017-04-05
+
 LICENSE=	APACHE20

 RUN_DEPENDS=	bash:shells/bash \
--- a/deskutils/owncloudclient/Makefile
+++ b/deskutils/owncloudclient/Makefile
@ -38,17 +38,6 @@ DEBUG_CMAKE_ON=		-DCMAKE_BUILD_TYPE:STRING=Debug

 PLIST_SUB=	VERSION=${PORTVERSION}

-.include <bsd.port.options.mk>
-
-.if ${OPSYS} != FreeBSD
-WITH_OPENSSL_PORT=	yes
-
-# CMake 3.3.x will use $PATH when looking for headers and libraries by default,
-# and OpenSSL from base will end up being used. Make sure ${LOCALBASE} is
-# preferred over $PATH.
-CMAKE_ARGS+=		-DCMAKE_PREFIX_PATH=${LOCALBASE}
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|.lst |.lst.sample |' ${WRKSRC}/CMakeLists.txt
--- a/devel/Makefile
+++ b/devel/Makefile
@ -1267,8 +1267,8 @@
    SUBDIR += libee
    SUBDIR += libeio
    SUBDIR += libelf
-    SUBDIR += libepp-nicbr
    SUBDIR += libepoll-shim
+    SUBDIR += libepp-nicbr
    SUBDIR += libesedb
    SUBDIR += libestr
    SUBDIR += libev
@ -2617,7 +2617,6 @@
    SUBDIR += p5-Iterator-Misc
    SUBDIR += p5-Iterator-Simple
    SUBDIR += p5-Iterator-Util
-    SUBDIR += p5-JIRA-Client
    SUBDIR += p5-JIRA-REST
    SUBDIR += p5-JQuery
    SUBDIR += p5-JSON-Hyper
@ -4242,6 +4241,11 @@
    SUBDIR += py-five.globalrequest
    SUBDIR += py-five.localsitemanager
    SUBDIR += py-flake8
+    SUBDIR += py-flake8-builtins
+    SUBDIR += py-flake8-docstrings
+    SUBDIR += py-flake8-import-order
+    SUBDIR += py-flake8-polyfill
+    SUBDIR += py-flake8-quotes
    SUBDIR += py-flask-babel
    SUBDIR += py-flexmock
    SUBDIR += py-foolscap
@ -4501,6 +4505,7 @@
    SUBDIR += py-pycodestyle
    SUBDIR += py-pycparser
    SUBDIR += py-pydenticon
+    SUBDIR += py-pydocstyle
    SUBDIR += py-pydoop
    SUBDIR += py-pyechonest
    SUBDIR += py-pyee
@ -4867,6 +4872,11 @@
    SUBDIR += py3-click
    SUBDIR += py3-dbus
    SUBDIR += py3-flake8
+    SUBDIR += py3-flake8-builtins
+    SUBDIR += py3-flake8-docstrings
+    SUBDIR += py3-flake8-import-order
+    SUBDIR += py3-flake8-polyfill
+    SUBDIR += py3-flake8-quotes
    SUBDIR += py3-gobject3
    SUBDIR += py3-hgtools
    SUBDIR += py3-jsonschema
@ -4876,6 +4886,7 @@
    SUBDIR += py3-nose
    SUBDIR += py3-py
    SUBDIR += py3-pycodestyle
+    SUBDIR += py3-pydocstyle
    SUBDIR += py3-pyflakes
    SUBDIR += py3-pyicu
    SUBDIR += py3-pylru-cache
--- a/devel/efl/Makefile
+++ b/devel/efl/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	efl
 PORTVERSION=	1.18.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/

@ -129,7 +129,6 @@ PLIST_SUB+=			AUDIO="@comment "

 .if ${PORT_OPTIONS:MSSL}
 USES+=				ssl
-WITH_OPENSSL_PORT=		yes
 .else
 CONFIGURE_ARGS+=		--with-crypto=none
 .endif
--- a/devel/efl/files/extra-patch-configure.ac
+++ b/devel/efl/files/extra-patch-configure.ac
@ -1,11 +0,0 @@
--- configure.ac.orig	2014-12-11 10:36:05.000000000 +0100
-+++ configure.ac	2014-12-28 00:57:35.000000000 +0100
-@@ -351,7 +351,7 @@
-       ;;
- 
-    openssl)
-      EFL_DEPEND_PKG([crypto], [OPENSSL], [openssl])
-+      requirements_libs_crypto="${ECORE_CON_LIBS} ${requirements_libs_crypto}"
-       ;;
- esac
- AM_CONDITIONAL([HAVE_CRYPTO_GNUTLS], [test "${build_crypto}" = "gnutls"])
--- a/devel/efl/files/patch-configure.ac
+++ b/devel/efl/files/patch-configure.ac
@ -1,6 +1,16 @@
--- configure.ac.orig	2015-06-12 05:40:48.754367679 -0700
-+++ configure.ac	2015-06-12 05:45:05.521352761 -0700
-@@ -414,12 +414,12 @@
+--- configure.ac.orig	2016-12-07 14:25:43 UTC
+++ configure.ac
+@@ -386,7 +386,8 @@ case "$build_crypto" in
+       ;;
+ 
+    openssl)
+-      EFL_DEPEND_PKG([crypto], [OPENSSL], [openssl])
+      AC_DEFINE([HAVE_OPENSSL], [1], [Have OpenSSL])
+      requirements_libs_crypto="-lssl -lcrypto ${requirements_libs_crypto}"
+       ;;
+ esac
+ AM_CONDITIONAL([HAVE_CRYPTO_GNUTLS], [test "${build_crypto}" = "gnutls"])
+@@ -442,12 +443,12 @@ AC_CHECK_HEADERS([ \
 execinfo.h \
 mcheck.h \
 sys/epoll.h \
@ -14,7 +24,7 @@
 ])
 
 EFL_CHECK_PATH_MAX
-@@ -3995,6 +3995,7 @@
+@@ -4732,6 +4733,7 @@ EFL_ADD_LIBS([EIO], [-lm])
 ### Checks for linker characteristics
 
 ### Checks for library functions
--- a/devel/efl/files/patch-m4_efl.m4
+++ b/devel/efl/files/patch-m4_efl.m4
@ -0,0 +1,11 @@
+--- m4/efl.m4.orig	2016-09-13 07:23:52 UTC
+++ m4/efl.m4
+@@ -219,7 +219,7 @@ AC_DEFUN([EFL_CRYPTO_DEPEND],
+ [dnl
+ m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
+ requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_crypto} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
+-requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_crypto} ${requirements_pc_deps_[][]m4_defn([DOWNEFL])}"
+requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_crypto}${requirements_pc_deps_crypto:+ }${requirements_pc_deps_[][]m4_defn([DOWNEFL])}"
+ requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_crypto} ${requirements_libs_[][]m4_defn([DOWNEFL])}"
+ requirements_cflags_[]m4_defn([DOWNEFL])="${requirements_cflags_crypto} ${requirements_cflags_[][]m4_defn([DOWNEFL])}"
+ m4_popdef([DOWNEFL])dnl
--- a/devel/kore/Makefile
+++ b/devel/kore/Makefile
@ -13,11 +13,13 @@ COMMENT=	Web application framework for writing web APIs in C
 LICENSE=	ISCL
 LICENSE_FILE=	${WRKSRC}/LICENSE

-USES=	gmake
+USES=		compiler gmake

 USE_GITHUB=	yes
 GH_ACCOUNT=	jorisvink

+CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
+CFLAGS_clang=	-Wno-error=c11-extensions # 12.0 + -pedantic
 MAKE_ARGS=	INSTALL_DIR="${STAGEDIR}${PREFIX}/bin" \
 		INCLUDE_DIR="${STAGEDIR}${PREFIX}/include/kore"

@ -54,7 +56,6 @@ post-patch:
 # FreeBSD 12.0-CURRENT after r308264
 	@${REINPLACE_CMD} -e 's|CFLAGS+=-O|#|g' \
 		-e 's|/usr/local/|${LOCALBASE}/|g' \
-		-e 's|-pedantic|-pedantic -Wno-error=c11-extensions|g' \
 		${WRKSRC}/Makefile

 pre-install:
--- a/devel/libbde/Makefile
+++ b/devel/libbde/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	libbde
-DISTVERSION=	alpha-20160731
+DISTVERSION=	alpha-20170204
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libbde/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
@ -14,18 +14,22 @@ LICENSE=	LGPL3+
 LICENSE_FILE=	${WRKSRC}/COPYING

 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE}
-USES=		fuse gettext libtool pathfix pkgconfig python ssl
+CONFIGURE_ARGS=	--enable-python
+USES=		fuse libtool pathfix pkgconfig python ssl
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 LIBS+=		-L${OPENSSLLIB}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:E}

+OPTIONS_DEFINE=	DOCS NLS
+
+NLS_USES=	gettext
+NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
+NLS_CONFIGURE_OFF=	--disable-nls
+
 PORTDOCS=	AUTHORS ChangeLog

-OPTIONS_DEFINE=	DOCS
-
-post-install-DOCS-on:
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}

--- a/devel/libbde/distinfo
+++ b/devel/libbde/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1470083347
-SHA256 (libbde-alpha-20160731.tar.gz) = 7d7dcd17adf9941e9c8ae56ca7b6b938d0ff2b5c672b26b441e63ab0084acc95
-SIZE (libbde-alpha-20160731.tar.gz) = 1653822
+TIMESTAMP = 1486311298
+SHA256 (libbde-alpha-20170204.tar.gz) = 5a23a6a602993a74f60af724a31241ded051a65f6715d38afd8a67c1fe05d0ad
+SIZE (libbde-alpha-20170204.tar.gz) = 1656035
--- a/devel/libbde/files/patch-pybde_Makefile.in
+++ b/devel/libbde/files/patch-pybde_Makefile.in
@ -1,8 +1,8 @@
 # Allow building when an older version of libbde is installed

--- pybde/Makefile.in.orig	2016-08-01 20:29:29 UTC
+--- pybde/Makefile.in.orig	2017-02-05 12:42:14 UTC
 +++ pybde/Makefile.in
-@@ -192,7 +192,7 @@ AM_V_at = $(am__v_at_@AM_V@)
+@@ -191,7 +191,7 @@ AM_V_at = $(am__v_at_@AM_V@)
 am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
 am__v_at_0 = @
 am__v_at_1 = 
--- a/devel/libscca/Makefile
+++ b/devel/libscca/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	libscca
-DISTVERSION=	alpha-20161031
+DISTVERSION=	alpha-20170205
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/libyal/libscca/releases/download/${PORTVERSION:E}/ \
 		LOCAL/antoine
@ -16,17 +16,21 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 LIB_DEPENDS=	libfwnt.so:devel/libfwnt

 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--enable-python --with-libintl-prefix=${LOCALBASE} --with-libfwnt=${LOCALBASE}
-USES=		gettext libtool pathfix python
+CONFIGURE_ARGS=	--enable-python --with-libfwnt=${LOCALBASE}
+USES=		libtool pathfix python
 USE_LDCONFIG=	yes
 INSTALL_TARGET=	install-strip
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:E}

+OPTIONS_DEFINE=	DOCS NLS
+
+NLS_USES=	gettext
+NLS_CONFIGURE_ON=	--with-libintl-prefix=${LOCALBASE}
+NLS_CONFIGURE_OFF=	--disable-nls
+
 PORTDOCS=	AUTHORS ChangeLog

-OPTIONS_DEFINE=	DOCS
-
-post-install-DOCS-on:
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}

--- a/devel/libscca/distinfo
+++ b/devel/libscca/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1478185133
-SHA256 (libscca-alpha-20161031.tar.gz) = 200a618fe84ac3909bcc0eda1ef3f5081c5a66527859e36c63c0dde45ff79b16
-SIZE (libscca-alpha-20161031.tar.gz) = 1577006
+TIMESTAMP = 1486311444
+SHA256 (libscca-alpha-20170205.tar.gz) = abde72db7b1401fc6b65232bb7caa0c20bb3f54862373713677105bc82b5478a
+SIZE (libscca-alpha-20170205.tar.gz) = 1548233
--- a/devel/p5-JIRA-Client/Makefile
+++ b/devel/p5-JIRA-Client/Makefile
@ -1,28 +0,0 @@
-# Created by: Greg Larkin <glarkin@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	JIRA-Client
-PORTVERSION=	0.45
-CATEGORIES=	devel perl5
-MASTER_SITES=	CPAN
-PKGNAMEPREFIX=	p5-
-
-MAINTAINER=	perl@FreeBSD.org
-COMMENT=	Extended interface to JIRA's SOAP API
-
-LICENSE=	ART10 GPLv1
-LICENSE_COMB=	dual
-LICENSE_FILE=	${WRKSRC}/LICENSE
-
-RUN_DEPENDS=	p5-Data-Util>=0:devel/p5-Data-Util \
-		p5-SOAP-Lite>=0:net/p5-SOAP-Lite
-BUILD_DEPENDS:=	${RUN_DEPENDS}
-
-DEPRECATED=	Deprecated by upstream due to deprecated JIRA's SOAP API
-EXPIRATION_DATE=2017-01-31
-
-NO_ARCH=	yes
-USES=		perl5
-USE_PERL5=	configure
-
-.include <bsd.port.mk>
--- a/devel/p5-JIRA-Client/distinfo
+++ b/devel/p5-JIRA-Client/distinfo
@ -1,3 +0,0 @@
-TIMESTAMP = 1481544551
-SHA256 (JIRA-Client-0.45.tar.gz) = 688b800765c748f31a132f663370f2f382bec83d15048a12320ca22f8f8fc068
-SIZE (JIRA-Client-0.45.tar.gz) = 29600
--- a/devel/p5-JIRA-Client/pkg-descr
+++ b/devel/p5-JIRA-Client/pkg-descr
@ -1,11 +0,0 @@
-JIRA is a proprietary bug tracking system from Atlassian
-(http://www.atlassian.com/software/jira/).
-
-This module implements an Object Oriented wrapper around JIRA's SOAP API.
-Moreover, it implements some other methods to make it easier to do some common
-operations.
-
-NOTE: This module has been deprecated in favour of devel/p5-JIRA-REST; see WWW
-below for details.
-
-WWW: http://search.cpan.org/dist/JIRA-Client/
--- a/devel/p5-JIRA-Client/pkg-plist
+++ b/devel/p5-JIRA-Client/pkg-plist
@ -1,2 +0,0 @@
-%%SITE_PERL%%/JIRA/Client.pm
-%%PERL5_MAN3%%/JIRA::Client.3.gz
--- a/devel/p5-SVN-Hooks/Makefile
+++ b/devel/p5-SVN-Hooks/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	SVN-Hooks
 PORTVERSION=	1.31
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@ -11,16 +11,12 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Framework for implementing Subversion hooks

-DEPRECATED=	Depends on expired devel/p5-JIRA-Client
-EXPIRATION_DATE=2017-04-01
-
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual

 BUILD_DEPENDS=	p5-Data-Util>=0:devel/p5-Data-Util \
 		p5-SVN-Look>=0:devel/p5-SVN-Look \
 		p5-SVN-Notify>=0:devel/p5-SVN-Notify \
-		p5-JIRA-Client>=0:devel/p5-JIRA-Client \
 		p5-XMLRPC-Lite>0:net/p5-XMLRPC-Lite \
 		subversion>=1.4.0:devel/subversion
 RUN_DEPENDS:=	${BUILD_DEPENDS}
--- a/devel/pecl-swoole/Makefile
+++ b/devel/pecl-swoole/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	swoole
-PORTVERSION=	1.8.13
-PORTREVISION=	1
+PORTVERSION=	1.9.5
 CATEGORIES=	devel net
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
@ -15,15 +14,20 @@ COMMENT=	Asynchronous & concurrent & distributed networking framework
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE

-USES=		php:ext ssl tar:tgz
+USES=		execinfo php:ext ssl tar:tgz
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 USE_PHP=	pcre

-OPTIONS_DEFINE=	HTTP2 REDIS
+OPTIONS_DEFINE=	HTTP2 REDIS RING_BUFFER SOCKETS
 HTTP2_LIB_DEPENDS=	libnghttp2.so:www/libnghttp2
 HTTP2_CONFIGURE_ON=	--enable-http2 --enable-openssl
 REDIS_LIB_DEPENDS=	libhiredis.so:databases/hiredis
-REDIS_CONFIGURE_ON=	--enable-async-redis --enable-coroutine
+REDIS_CONFIGURE_ON=	--enable-async-redis
+RING_BUFFER_DESC=	Use ring buffer pool
+RING_BUFFER_CONFIGURE_ON=	--enable-ringbuffer
+SOCKETS_USE=		PHP=sockets:build
+SOCKETS_DESC=	Use native php sockets extension
+SOCKETS_CONFIGURE_ON=	--enable-sockets

 .include <bsd.port.mk>
--- a/devel/pecl-swoole/distinfo
+++ b/devel/pecl-swoole/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1477449966
-SHA256 (PECL/swoole-1.8.13.tgz) = 54ceae0287d1c3bb1aaa5ea4e16f40f9f2301afe1c517c16cc3b5e9876b682be
-SIZE (PECL/swoole-1.8.13.tgz) = 523667
+TIMESTAMP = 1486302935
+SHA256 (PECL/swoole-1.9.5.tgz) = ffc11770606478938e7c5437b29e486d1737ddc3ebb4a8f51bcebe127c5d1a45
+SIZE (PECL/swoole-1.9.5.tgz) = 542481
--- a/devel/pecl-swoole/files/patch-config.m4
+++ b/devel/pecl-swoole/files/patch-config.m4
@ -0,0 +1,11 @@
+--- config.m4.orig	2017-02-05 15:08:47 UTC
+++ config.m4
+@@ -178,7 +178,7 @@ if test "$PHP_SWOOLE" != "no"; then
+     AC_CHECK_LIB(c, poll, AC_DEFINE(HAVE_POLL, 1, [have poll]))
+     AC_CHECK_LIB(c, sendfile, AC_DEFINE(HAVE_SENDFILE, 1, [have sendfile]))
+     AC_CHECK_LIB(c, kqueue, AC_DEFINE(HAVE_KQUEUE, 1, [have kqueue]))
+-    AC_CHECK_LIB(c, backtrace, AC_DEFINE(HAVE_EXECINFO, 1, [have execinfo]))
+    AC_CHECK_LIB(execinfo, backtrace, AC_DEFINE(HAVE_EXECINFO, 1, [have execinfo]))
+     AC_CHECK_LIB(c, daemon, AC_DEFINE(HAVE_DAEMON, 1, [have daemon]))
+     AC_CHECK_LIB(c, mkostemp, AC_DEFINE(HAVE_MKOSTEMP, 1, [have mkostemp]))
+     AC_CHECK_LIB(c, inotify_init, AC_DEFINE(HAVE_INOTIFY, 1, [have inotify]))
--- a/devel/pecl-swoole/files/patch-swoole__config.h
+++ b/devel/pecl-swoole/files/patch-swoole__config.h
@ -1,4 +1,4 @@
--- swoole_config.h.orig	2015-09-03 15:27:08 UTC
+--- swoole_config.h.orig	2017-01-24 02:05:48 UTC
 +++ swoole_config.h
@@ -19,7 +19,7 @@
 #ifndef __clang__
--- a/devel/py-boto/Makefile
+++ b/devel/py-boto/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	boto
 PORTVERSION=	2.45.0
+PORTREVISION=	1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -14,7 +15,7 @@ LICENSE=	MIT

 NO_ARCH=	yes
 USES=		python:2.7+
-USE_PYTHON=	autoplist distutils
+USE_PYTHON=	autoplist concurrent distutils

 CONFLICTS_INSTALL=	p5-Net-Amazon-Route53-[0-9]*

--- a/devel/py-flake8-builtins/Makefile
+++ b/devel/py-flake8-builtins/Makefile
@ -0,0 +1,22 @@
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	flake8-builtins
+PORTVERSION=	0.2
+CATEGORIES=	devel
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	amdmi3@FreeBSD.org
+COMMENT=	Check for python builtins being used as variables or parameters
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8
+
+USES?=		python
+USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
--- a/devel/py-flake8-builtins/distinfo
+++ b/devel/py-flake8-builtins/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1486303184
+SHA256 (flake8-builtins-0.2.tar.gz) = d426403d6c73e19af6e9f720da8329809ccd454d046872e674c3b2bd0ac9666b
+SIZE (flake8-builtins-0.2.tar.gz) = 15049
--- a/devel/py-flake8-builtins/pkg-descr
+++ b/devel/py-flake8-builtins/pkg-descr
@ -0,0 +1,3 @@
+Check for python builtins being used as variables or parameters
+
+WWW: https://pypi.python.org/pypi/flake8-builtins
--- a/devel/py-flake8-docstrings/Makefile
+++ b/devel/py-flake8-docstrings/Makefile
@ -0,0 +1,24 @@
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	flake8-docstrings
+PORTVERSION=	1.0.3
+CATEGORIES=	devel
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	amdmi3@FreeBSD.org
+COMMENT=	Extension for flake8 which uses pydocstyle to check docstrings
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8 \
+		${PYTHON_PKGNAMEPREFIX}flake8-polyfill>=0:devel/py-flake8-polyfill \
+		${PYTHON_PKGNAMEPREFIX}pydocstyle>=0:devel/py-pydocstyle
+
+USES?=		python
+USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
--- a/devel/py-flake8-docstrings/distinfo
+++ b/devel/py-flake8-docstrings/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1486303498
+SHA256 (flake8-docstrings-1.0.3.tar.gz) = 5783a90476e4521b2f9815b5ce734adfd1046071e0238d1df2670354ae3153ae
+SIZE (flake8-docstrings-1.0.3.tar.gz) = 4532
--- a/devel/py-flake8-docstrings/pkg-descr
+++ b/devel/py-flake8-docstrings/pkg-descr
@ -0,0 +1,3 @@
+Extension for flake8 which uses pydocstyle to check docstrings
+
+WWW: https://pypi.python.org/pypi/flake8-docstrings
--- a/devel/py-flake8-import-order/Makefile
+++ b/devel/py-flake8-import-order/Makefile
@ -0,0 +1,22 @@
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	flake8-import-order
+PORTVERSION=	0.11
+CATEGORIES=	devel
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	amdmi3@FreeBSD.org
+COMMENT=	Flake8 and pylama plugin that checks the ordering of import statements
+
+LICENSE=	LGPL3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}pycodestyle>=0:devel/py-pycodestyle
+
+USES?=		python
+USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
--- a/devel/py-flake8-import-order/distinfo
+++ b/devel/py-flake8-import-order/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1486302501
+SHA256 (flake8-import-order-0.11.tar.gz) = b56ca2793e27bd99c46f59a0a51f4847ddc1fed22697a505add882a9db2b8613
+SIZE (flake8-import-order-0.11.tar.gz) = 16206
--- a/devel/py-flake8-import-order/pkg-descr
+++ b/devel/py-flake8-import-order/pkg-descr
@ -0,0 +1,3 @@
+Flake8 and pylama plugin that checks the ordering of import statements
+
+WWW: https://pypi.python.org/pypi/flake8-import-order
--- a/devel/py-flake8-polyfill/Makefile
+++ b/devel/py-flake8-polyfill/Makefile
@ -0,0 +1,22 @@
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	flake8-polyfill
+PORTVERSION=	1.0.1
+CATEGORIES=	devel
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	amdmi3@FreeBSD.org
+COMMENT=	Polyfill package for Flake8 plugins
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8
+
+USES?=		python
+USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
--- a/devel/py-flake8-polyfill/distinfo
+++ b/devel/py-flake8-polyfill/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1486303750
+SHA256 (flake8-polyfill-1.0.1.tar.gz) = c77056b1e2cfce7b39d7634370062baf02438962a7d176ea717627b83b17f609
+SIZE (flake8-polyfill-1.0.1.tar.gz) = 8094
--- a/devel/py-flake8-polyfill/pkg-descr
+++ b/devel/py-flake8-polyfill/pkg-descr
@ -0,0 +1,5 @@
+flake8-polyfill is a package that provides some compatibility helpers
+for Flake8 plugins that intend to support Flake8 2.x and 3.x
+simultaneously.
+
+WWW: https://pypi.python.org/pypi/flake8-polyfill
--- a/devel/py-flake8-quotes/Makefile
+++ b/devel/py-flake8-quotes/Makefile
@ -0,0 +1,22 @@
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	flake8-quotes
+PORTVERSION=	0.9.0
+CATEGORIES=	devel
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	amdmi3@FreeBSD.org
+COMMENT=	Flake8 lint for quotes
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py-flake8
+
+USES?=		python
+USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
--- a/devel/py-flake8-quotes/distinfo
+++ b/devel/py-flake8-quotes/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1486300843
+SHA256 (flake8-quotes-0.9.0.tar.gz) = e853d7d009d6b66fb3a4091bca606e2f458e4bf0f608804e10a6f4ac2ba8ba06
+SIZE (flake8-quotes-0.9.0.tar.gz) = 6113
--- a/devel/py-flake8-quotes/pkg-descr
+++ b/devel/py-flake8-quotes/pkg-descr
@ -0,0 +1,3 @@
+Flake8 lint for quotes.
+
+WWW: https://pypi.python.org/pypi/flake8-quotes
--- a/devel/py-grab/Makefile
+++ b/devel/py-grab/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	grab
-PORTVERSION=	0.6.33
+PORTVERSION=	0.6.34
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@ -16,7 +16,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}lxml>0:devel/py-lxml \
 		${PYTHON_PKGNAMEPREFIX}weblib>0:devel/py-weblib \
 		${PYTHON_PKGNAMEPREFIX}selection>0:devel/py-selection \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six \
-		${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent
+		${PYTHON_PKGNAMEPREFIX}user_agent>0:www/py-user_agent \
+		${PYTHON_PKGNAMEPREFIX}defusedxml>0:devel/py-defusedxml

 NO_ARCH=	yes
 USES=		python
--- a/devel/py-grab/distinfo
+++ b/devel/py-grab/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1485593110
-SHA256 (grab-0.6.33.tar.gz) = db8bff3e25c0fa891d0741d6a44d499346b562d1344f7efd7e20095bdfc34b7e
-SIZE (grab-0.6.33.tar.gz) = 63752
+TIMESTAMP = 1486310044
+SHA256 (grab-0.6.34.tar.gz) = 5007fd7272b621f8ad8b734edc30fc46dc7b5bdd2fea787958289a26d84cdfc1
+SIZE (grab-0.6.34.tar.gz) = 62425
--- a/devel/py-natsort/Makefile
+++ b/devel/py-natsort/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	natsort
-PORTVERSION=	5.0.1
+PORTVERSION=	5.0.2
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-natsort/distinfo
+++ b/devel/py-natsort/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1467249855
-SHA256 (natsort-5.0.1.tar.gz) = 4ad6b4d1153451e345967989bd3ca30abf33f615b116eeadfcc51a456e6974a9
-SIZE (natsort-5.0.1.tar.gz) = 68053
+TIMESTAMP = 1485998413
+SHA256 (natsort-5.0.2.tar.gz) = 765edf99a8cf673cb6c78feec0bfa1f25b560ec046aff19eb6f2aa882890062e
+SIZE (natsort-5.0.2.tar.gz) = 133738
--- a/devel/py-pydocstyle/Makefile
+++ b/devel/py-pydocstyle/Makefile
@ -0,0 +1,20 @@
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	pydocstyle
+PORTVERSION=	1.1.1
+CATEGORIES=	devel
+MASTER_SITES=	CHEESESHOP
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	amdmi3@FreeBSD.org
+COMMENT=	Python docstring style checker
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE-MIT
+
+USES?=		python zip
+USE_PYTHON=	autoplist distutils
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
--- a/devel/py-pydocstyle/distinfo
+++ b/devel/py-pydocstyle/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1486304287
+SHA256 (pydocstyle-1.1.1.zip) = f808d8fc23952fe93c2d85598732bfa854cb5ee8a25f8191f60600710f898e8d
+SIZE (pydocstyle-1.1.1.zip) = 26570
--- a/devel/py-pydocstyle/pkg-descr
+++ b/devel/py-pydocstyle/pkg-descr
@ -0,0 +1,13 @@
+Python docstring style checker
+
+(formerly pep257)
+
+pydocstyle is a static analysis tool for checking compliance with
+Python docstring conventions.
+
+pydocstyle supports most of PEP 257 out of the box, but it should
+not be considered a reference implementation.
+
+pydocstyle supports Python 2.6, 2.7, 3.3, 3.4, 3.5, pypy and pypy3.
+
+WWW: https://pypi.python.org/pypi/pydocstyle
--- a/devel/py-python-gist/Makefile
+++ b/devel/py-python-gist/Makefile
@ -2,7 +2,7 @@
 # $FreeBSD$

 PORTNAME=	python-gist
-PORTVERSION=	0.4.5
+PORTVERSION=	0.4.7
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-python-gist/distinfo
+++ b/devel/py-python-gist/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1482774542
-SHA256 (jdowner-gist-v0.4.5_GH0.tar.gz) = 42cf39871b21e12d27478bcf042ff1da55ee3f67f7fd9dd2779dd706b4ba05c3
-SIZE (jdowner-gist-v0.4.5_GH0.tar.gz) = 17536
+TIMESTAMP = 1485998853
+SHA256 (jdowner-gist-v0.4.7_GH0.tar.gz) = 41e9762780e71ca35c0080a55df4d9425a2ed71d1658e2ab22478a8731c1b91a
+SIZE (jdowner-gist-v0.4.7_GH0.tar.gz) = 17698
--- a/devel/py-weblib/Makefile
+++ b/devel/py-weblib/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	weblib
-PORTVERSION=	0.1.23
+PORTVERSION=	0.1.24
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-weblib/distinfo
+++ b/devel/py-weblib/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1484335313
-SHA256 (weblib-0.1.23.tar.gz) = ad49067d4bed1f5571e34b165ee8e90d2b8022e206f57b49f60908bd5b19bda4
-SIZE (weblib-0.1.23.tar.gz) = 30280
+TIMESTAMP = 1486309904
+SHA256 (weblib-0.1.24.tar.gz) = f2619d698c482d01046b6da8782839334c1e3822f4034a847680f1bd3d763525
+SIZE (weblib-0.1.24.tar.gz) = 30855
--- a/devel/py-zc.buildout/Makefile
+++ b/devel/py-zc.buildout/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	zc.buildout
-PORTVERSION=	2.5.3
+PORTVERSION=	2.7.1
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/devel/py-zc.buildout/distinfo
+++ b/devel/py-zc.buildout/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1477858079
-SHA256 (zope/zc.buildout-2.5.3.tar.gz) = 3e5f3afcc64416604c5efc554c2fa0901b60657e012a710c320e2eb510efcfb9
-SIZE (zope/zc.buildout-2.5.3.tar.gz) = 305163
+TIMESTAMP = 1486309521
+SHA256 (zope/zc.buildout-2.7.1.tar.gz) = 89c7b438879ca30637f8c159d81ae7e198d236e7e67e68d2a1f2cd89291b2230
+SIZE (zope/zc.buildout-2.7.1.tar.gz) = 311156
--- a/devel/py3-flake8-builtins/Makefile
+++ b/devel/py3-flake8-builtins/Makefile
@ -0,0 +1,10 @@
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-flake8-builtins
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8
+
+USES=		python:3
+
+.include "${MASTERDIR}/Makefile"
--- a/devel/py3-flake8-docstrings/Makefile
+++ b/devel/py3-flake8-docstrings/Makefile
@ -0,0 +1,12 @@
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-flake8-docstrings
+
+RUN_DEPENDS?=	${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8 \
+		${PYTHON_PKGNAMEPREFIX}flake8-polyfill>=0:devel/py3-flake8-polyfill \
+		${PYTHON_PKGNAMEPREFIX}pydocstyle>=0:devel/py3-pydocstyle
+
+USES=		python:3
+
+.include "${MASTERDIR}/Makefile"
--- a/devel/py3-flake8-import-order/Makefile
+++ b/devel/py3-flake8-import-order/Makefile
@ -0,0 +1,10 @@
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-flake8-import-order
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pycodestyle>=0:devel/py3-pycodestyle
+
+USES=		python:3
+
+.include "${MASTERDIR}/Makefile"
--- a/devel/py3-flake8-polyfill/Makefile
+++ b/devel/py3-flake8-polyfill/Makefile
@ -0,0 +1,10 @@
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-flake8-polyfill
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8
+
+USES=		python:3
+
+.include "${MASTERDIR}/Makefile"
--- a/devel/py3-flake8-quotes/Makefile
+++ b/devel/py3-flake8-quotes/Makefile
@ -0,0 +1,10 @@
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-flake8-quotes
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}flake8>=0:devel/py3-flake8
+
+USES=		python:3
+
+.include "${MASTERDIR}/Makefile"
--- a/devel/py3-pydocstyle/Makefile
+++ b/devel/py3-pydocstyle/Makefile
@ -0,0 +1,8 @@
+# Created by: Dmitry Marakasov <amdmi3@FreeBSD.org>
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-pydocstyle
+
+USES=		python:3 zip
+
+.include "${MASTERDIR}/Makefile"
--- a/dns/knot1/Makefile
+++ b/dns/knot1/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	knot
 PORTVERSION=	1.6.8
+PORTREVISION=	1
 CATEGORIES=	dns ipv6
 MASTER_SITES=	https://secure.nic.cz/files/knot-dns/ \
 		http://dns-lab.com/downloads/knot-dns/
@ -18,14 +19,12 @@ LIB_DEPENDS=	liburcu.so:sysutils/liburcu

 CONFLICTS=	knot-2.* knot2-.*

-USES=		alias bison libtool pkgconfig tar:xz
+USES=		alias bison libtool pkgconfig ssl tar:xz
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-storage=/var/db/knot \
 		--with-rundir=/var/run/knot \
 		--with-openssl=${OPENSSLBASE}
 USE_LDCONFIG=	yes
-USE_OPENSSL=	yes
-WITH_OPENSSL_PORT=	yes

 INSTALL_TARGET=	install-strip

--- a/dns/validns/Makefile
+++ b/dns/validns/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	validns
 PORTVERSION=	0.8
+PORTREVISION=	1
 CATEGORIES=	dns security
 MASTER_SITES=	http://www.validns.net/download/

@ -14,7 +15,6 @@ LICENSE=	BSD2CLAUSE
 LIB_DEPENDS=	libJudy.so:devel/judy

 USE_OPENSSL=	yes
-WITH_OPENSSL_PORT=yes

 ALL_TARGET=

@ -31,16 +31,14 @@ OPTIONS_DEFINE=	DOCS

 .include <bsd.port.options.mk>

+.if ${SSL_DEFAULT:Mopenssl-devel}
+BROKEN=		Does not build with openssl-devel
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/*.1 ${STAGEDIR}${MAN1PREFIX}/man/man1/
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/

-.include <bsd.port.pre.mk>
-
-.if ${SSL_DEFAULT:Mopenssl-devel}
-BROKEN=		Does not build with openssl-devel
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@ -12,33 +12,29 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Simple GTK-based text/HTML editor

-LICENSE=	GPLv2 GPLv3
-LICENSE_COMB=	dual
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING

 USE_XORG=	xpm
 USE_GNOME=	gnomeprefix gtk12
-USES=		gettext
+USES=		gettext localbase:ldflags
 GNU_CONFIGURE=	yes

-CONFIGURE_ARGS=	--disable-gnome
-
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+CONFIGURE_ARGS=	--disable-gnome --disable-nls

 DOCVERSION=	1.2.0

-OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFINE=	DOCS NLS
 OPTIONS_SUB=	yes

+NLS_USES=	gettext
+NLS_CONFIGURE_ENABLE=	nls
+
 DOCS_DISTFILES=	${PORTNAME}-help-${DOCVERSION}${EXTRACT_SUFX}:doc

-.include <bsd.port.options.mk>
-
-post-extract:
-.if ${PORT_OPTIONS:MDOCS}
+post-extract-DOCS-on:
 	@${MV} ${WRKSRC}/docs ${WRKSRC}/docs.old
 	@${CP} -R ${WRKDIR}/${PORTNAME}-help-${DOCVERSION}/docs ${WRKSRC}/docs
-.endif

 post-patch:
 	@${REINPLACE_CMD} -e 's|\(use_gtkhtml=\)yes|\1no|g' ${WRKSRC}/configure
--- a/editors/gnotepad+/pkg-plist
+++ b/editors/gnotepad+/pkg-plist
@ -146,6 +146,6 @@ share/gnome/help/gnotepad+/C/topic.dat
 %%DATADIR%%/xpm/tb_unordered.xpm
 %%DATADIR%%/xpm/tb_winclose.xpm
 %%DATADIR%%/xpm/tb_winnew.xpm
-share/locale/da/LC_MESSAGES/gnotepad+.mo
-share/locale/fr/LC_MESSAGES/gnotepad+.mo
-share/locale/ja/LC_MESSAGES/gnotepad+.mo
+%%NLS%%share/locale/da/LC_MESSAGES/gnotepad+.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/gnotepad+.mo
+%%NLS%%share/locale/ja/LC_MESSAGES/gnotepad+.mo
--- a/emulators/qemu-riscv/Makefile
+++ b/emulators/qemu-riscv/Makefile
@ -2,19 +2,19 @@

 PORTNAME=	qemu
 PORTVERSION=	2.7.50
-PORTREVISION=	20170203
+PORTREVISION=	20170205
 CATEGORIES=	emulators
 PKGNAMESUFFIX?=	-riscv

 MAINTAINER=	lwhsu@FreeBSD.org
-COMMENT=	QEMU with RISC-V (RV64G, RV32G) emulation support
+COMMENT=	QEMU with RISC-V (RV64GC, RV32GC) emulation support

 LICENSE=	GPLv2

 USE_GITHUB=	yes
 GH_ACCOUNT=	riscv
 GH_PROJECT=	riscv-qemu
-GH_TAGNAME=	e28f4c8
+GH_TAGNAME=	5eb41d4

 HAS_CONFIGURE=	yes
 USES=	gmake libtool makeinfo pkgconfig python:2,build
--- a/emulators/qemu-riscv/distinfo
+++ b/emulators/qemu-riscv/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1486130471
-SHA256 (riscv-riscv-qemu-2.7.50-e28f4c8_GH0.tar.gz) = 63bf19970fe6782800e5c458ec831f9794d45e40b7299ed49fce689b614f27b8
-SIZE (riscv-riscv-qemu-2.7.50-e28f4c8_GH0.tar.gz) = 12958828
+TIMESTAMP = 1486326148
+SHA256 (riscv-riscv-qemu-2.7.50-5eb41d4_GH0.tar.gz) = e045cc1de08079e0222fdc8c74926840acf9c8e872b0a8eaae1e9835c0a57bd3
+SIZE (riscv-riscv-qemu-2.7.50-5eb41d4_GH0.tar.gz) = 12959920
--- a/graphics/rawtherapee-devel/Makefile
+++ b/graphics/rawtherapee-devel/Makefile
@ -2,9 +2,9 @@
 # $FreeBSD$

 PORTNAME=	rawtherapee
-PORTVERSION=	5.0
+PORTVERSION=	5.0.1
 DISTVERSIONSUFFIX=	-gtk3
-PORTREVISION=	0
+DISTNAME=	${PORTNAME}-${PORTVERSION:R}-r${PORTVERSION:E}${DISTVERSIONSUFFIX}
 CATEGORIES=	graphics
 MASTER_SITES=	http://rawtherapee.com/shared/source/
 PKGNAMESUFFIX=	-devel
--- a/graphics/swfmill/Makefile
+++ b/graphics/swfmill/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	swfmill
 PORTVERSION=	0.3.3
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://swfmill.org/releases/

--- a/graphics/swfmill/files/patch-src_codegen_parsexml.xsl
+++ b/graphics/swfmill/files/patch-src_codegen_parsexml.xsl
@ -5,7 +5,7 @@
 		size_t len = strlen((const char *)from_str);
 		iconv_t cd = iconv_open(ctx-&gt;swf_encoding, "UTF-8");
 -		if (cd &lt; 0) {
-+		if (cd == NULL) {
+		if (cd == (iconv_t)-1) {
 			fprintf(stderr, "iconv_open failed.\n");
 			char *buf = new char[1];
 			buf[0] = '\0';
--- a/graphics/swfmill/files/patch-src_codegen_writexml.xsl
+++ b/graphics/swfmill/files/patch-src_codegen_writexml.xsl
@ -5,7 +5,7 @@
 		size_t len = strlen(from_str);
 		iconv_t cd = iconv_open("UTF-8", ctx-&gt;swf_encoding);
 -		if (cd &lt; 0) {
-+		if (cd == NULL) {
+		if (cd == (iconv_t)-1) {
 			fprintf(stderr, "iconv_open failed.\n");
 			return xmlCharStrdup("");
 		}
--- a/irc/irssi-fish/Makefile
+++ b/irc/irssi-fish/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	irssi-fish
 DISTVERSION=	1.4.20160122
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	irc security

 MAINTAINER=	ashish@FreeBSD.org
@ -18,15 +18,15 @@ GH_PROJECT=	FiSH-irssi
 GH_ACCOUNT=	falsovsky
 GH_TAGNAME=	2b0c1c09

-USES=		cmake pkgconfig
+USES=		cmake pkgconfig ssl
+CMAKE_ARGS=	-D__pkg_config_checked_OPENSSL=1 -DOPENSSL_FOUND=1 \
+		-DOPENSSL_INCLUDE_DIRS=${OPENSSLINC} \
+		-DOPENSSL_LIBRARY_DIRS=${OPENSSLLIB}
 USE_LDCONFIG=	yes

 PLIST_FILES=	lib/irssi/modules/libfish.so
 PORTDOCS=	README.md FiSH-irssi.txt

-USE_OPENSSL=	yes
-WITH_OPENSSL_PORT=	yes
-
 post-patch:
 	${REINPLACE_CMD} -e "s,/usr/local,${LOCALBASE},g" \
 			 -e "s,share/doc/FiSH-irssi,${DOCSDIR_REL},g" ${WRKSRC}/CMakeLists.txt
--- a/irc/irssi-otr/Makefile
+++ b/irc/irssi-otr/Makefile
@ -2,19 +2,19 @@
 # $FreeBSD$

 PORTNAME=	irssi-otr
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	irc

 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Plugin for irssi for Off-the-Record (OTR) messaging

-LICENSE=	GPLv2
+LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE

 BUILD_DEPENDS=	${LOCALBASE}/include/irssi/src/common.h:irc/irssi \
 		${LOCALBASE}/bin/libgcrypt-config:security/libgcrypt
-LIB_DEPENDS=	libotr.so.5:security/libotr \
+LIB_DEPENDS=	libotr.so:security/libotr \
 		libgcrypt.so:security/libgcrypt
 RUN_DEPENDS=	irssi:irc/irssi

@ -31,4 +31,7 @@ INSTALL_TARGET=	install-strip
 PLIST_FILES=	lib/irssi/modules/libotr.so \
 		share/irssi/help/otr

+post-patch:
+	${GREP} -Rl '$$(oldincludedir)' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} 's,$$(oldincludedir),${LOCALBASE}/include,g'
+
 .include <bsd.port.mk>
--- a/irc/irssi-otr/distinfo
+++ b/irc/irssi-otr/distinfo
@ -1,2 +1,3 @@
-SHA256 (cryptodotis-irssi-otr-v1.0.1_GH0.tar.gz) = 3b6baa39adab360cd4f6519b6d4a53db4eee7b070d6a9e716f1655245d3ca89d
-SIZE (cryptodotis-irssi-otr-v1.0.1_GH0.tar.gz) = 40334
+TIMESTAMP = 1486319780
+SHA256 (cryptodotis-irssi-otr-v1.0.2_GH0.tar.gz) = 4619208b9c9171aa97a41960b3e892390b6473e2988a056b9fe8e110daa1ae9c
+SIZE (cryptodotis-irssi-otr-v1.0.2_GH0.tar.gz) = 40947
--- a/irc/irssi-otr/files/patch-help_Makefile.am
+++ b/irc/irssi-otr/files/patch-help_Makefile.am
@ -1,10 +0,0 @@
--- help/Makefile.am.orig	2014-02-12 18:50:45.000000000 -0600
-+++ help/Makefile.am	2014-07-21 17:08:26.543319563 -0500
-@@ -1,6 +1,6 @@
- # The day Irssi will be able to check in $(prefix), this will change. Until
- # then, it's hardcoded.
-helpdir = /usr/share/irssi/help
-+helpdir = /usr/local/share/irssi/help
- help_DATA = otr
- 
- EXTRA_DIST = otr
--- a/irc/irssi-otr/files/patch-src_Makefile.am
+++ b/irc/irssi-otr/files/patch-src_Makefile.am
@ -1,10 +0,0 @@
--- src/Makefile.am.orig	2014-02-12 18:50:45.000000000 -0600
-+++ src/Makefile.am	2014-07-21 16:43:34.653319339 -0500
-@@ -1,6 +1,6 @@
- AM_CFLAGS = $(LIBOTR_CFLAGS) $(LIBGCRYPT_CFLAGS) $(PACKAGE_FLAGS)
- 
-IRSSI_DIST=/usr/include/irssi
-+IRSSI_DIST=/usr/local/include/irssi
- IRSSI_INCLUDE = -I$(IRSSI_DIST) \
- 				-I$(IRSSI_DIST)/src \
- 				-I$(IRSSI_DIST)/src/fe-common/core \
--- a/irc/irssi-otr/files/patch-src_module.c
+++ b/irc/irssi-otr/files/patch-src_module.c
@ -1,6 +1,6 @@
--- src/module.c	2014-02-12 18:50:45.000000000 -0600
-+++ src/module.c	2016-04-07 17:35:00.000000000 +0530
-@@ -32,6 +32,7 @@
+--- src/module.c.orig	2016-12-07 21:24:08 UTC
+++ src/module.c
+@@ -33,6 +33,7 @@
 #include "otr.h"
 #include "otr-formats.h"
 #include "utils.h"
@ -8,7 +8,7 @@
 
 GCRY_THREAD_OPTION_PTHREAD_IMPL;
 
-@@ -90,8 +91,13 @@ static void sig_server_sendmsg(SERVER_REC *server, const char *target,
+@@ -91,8 +92,13 @@ end:
 /*
  * Pipes all incoming private messages through OTR
  */
@ -23,7 +23,7 @@
 {
 	int ret;
 	char *new_msg = NULL;
-@@ -106,7 +112,11 @@ void sig_message_private(SERVER_REC *server, const char *msg,
+@@ -107,7 +113,11 @@ void sig_message_private(SERVER_REC *ser
 
 	if (!new_msg) {
 		/* This message was not OTR */
@ -36,18 +36,3 @@
 	} else {
 		/*
 		 * Check for /me IRC marker and if so, handle it so the user does not
-@@ -371,3 +371,13 @@ void otr_deinit(void)
-  
- 	theme_unregister();
- }
-+
-+#ifdef IRSSI_ABI_VERSION
-+/*
-+ * irssi abicheck()
-+ */
-+void otr_abicheck(int *version)
-+{
-+	*version = IRSSI_ABI_VERSION;
-+}
-+#endif
- 
--- a/irc/irssi-otr/files/patch-src_otr-ops.c
+++ b/irc/irssi-otr/files/patch-src_otr-ops.c
@ -1,5 +1,5 @@
--- src/otr-ops.c	2014-02-12 18:50:45.000000000 -0600
-+++ src/otr-ops.c	2016-04-07 17:35:00.000000000 +0530
+--- src/otr-ops.c.orig	2016-12-07 21:24:08 UTC
+++ src/otr-ops.c
@@ -21,6 +21,7 @@
 
 #include "key.h"
@ -8,7 +8,7 @@
 
 static OtrlPolicy OTR_DEFAULT_POLICY =
 	OTRL_POLICY_MANUAL | OTRL_POLICY_WHITESPACE_START_AKE;
-@@ -206,8 +207,13 @@ static void ops_handle_msg_event(void *opdata, OtrlMessageEvent msg_event,
+@@ -206,8 +207,13 @@ static void ops_handle_msg_event(void *o
 		 * submit a patch or email me a better way.
 		 */
 		signal_remove("message private", (SIGNAL_FUNC) sig_message_private);
--- a/lang/hugs/Makefile
+++ b/lang/hugs/Makefile
@ -17,6 +17,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}

 HUGS_DATE=	Sep2006
 USES=		bison gmake openal:al,alut
+USE_CSTD=	gnu89
 USE_GCC=	yes

 GNU_CONFIGURE=		yes
--- a/mail/roundcube-automatic_addressbook/Makefile
+++ b/mail/roundcube-automatic_addressbook/Makefile
@ -5,7 +5,7 @@ PORTVERSION=	0.4.2
 CATEGORIES=	mail
 PKGNAMEPREFIX=	roundcube-

-MAINTAINER=	anes@anes.su
+MAINTAINER=	andrej@ebert.su
 COMMENT=	Roundcube webmail automatic addressbook plugin

 LICENSE=	GPLv3
--- a/math/plplot-ada/Makefile
+++ b/math/plplot-ada/Makefile
@ -3,7 +3,6 @@

 PORTNAME=	plplot
 PORTVERSION=	${RELEASE}
-PORTREVISION=	1
 CATEGORIES=	math
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source
 PKGNAMESUFFIX=	-ada
--- a/math/plplot-ada/pkg-plist
+++ b/math/plplot-ada/pkg-plist
@ -1,7 +1,8 @@
-include/plplotada/plplot.adb
 include/plplotada/plplot.ads
 include/plplotada/plplot_auxiliary.adb
 include/plplotada/plplot_auxiliary.ads
+include/plplotada/plplot_standard.adb
+include/plplotada/plplot_standard.ads
 include/plplotada/plplot_thin.adb
 include/plplotada/plplot_thin.ads
 include/plplotada/plplot_traditional.adb
@ -10,5 +11,6 @@ lib/gnat/plplot.gpr
 lib/plplotada/libplplotada.a
 lib/plplotada/plplot.ali
 lib/plplotada/plplot_auxiliary.ali
+lib/plplotada/plplot_standard.ali
 lib/plplotada/plplot_thin.ali
 lib/plplotada/plplot_traditional.ali
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@ -2,8 +2,7 @@
 # $FreeBSD$

 PORTNAME=	plplot
-PORTVERSION=	5.11.1
-PORTREVISION=	6
+PORTVERSION=	5.12.0
 CATEGORIES=	math science
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}%20Source

@ -15,14 +14,15 @@ LICENSE=	LGPL21+
 BUILD_DEPENDS=	bash:shells/bash \
 		${FREEFONT_DIR}/FreeMono.ttf:x11-fonts/freefont-ttf
 LIB_DEPENDS=	libLASi.so:devel/lasi \
-		libltdl.so:devel/libltdl \
-		libfreetype.so:print/freetype2
+		libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2 \
+		libltdl.so:devel/libltdl
 RUN_DEPENDS=	bash:shells/bash \
 		${FREEFONT_DIR}/FreeMono.ttf:x11-fonts/freefont-ttf

-USE_GNOME=	pango
+USE_GNOME=	cairo pango
 USE_PERL5=	build
-USES=		cmake ghostscript localbase perl5 pathfix pkgconfig
+USES=		cmake:outsource gettext-runtime ghostscript localbase perl5 pathfix pkgconfig
 CMAKE_ARGS=	-DENABLE_java:BOOL=OFF \
 		-DENABLE_octave:BOOL=OFF \
 		-DENABLE_pdl:BOOL=OFF \
@ -38,47 +38,49 @@ USE_LDCONFIG=	yes

 FREEFONT_DIR=	${LOCALBASE}/share/fonts/freefont-ttf

-OPTIONS_DEFINE=	FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11 DOCS
-OPTIONS_RADIO=	QHULL
+OPTIONS_DEFINE=		DOCS FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11
+OPTIONS_RADIO=		QHULL
 OPTIONS_RADIO_QHULL=	QHULL2015 QHULL2003
 OPTIONS_DEFAULT=	QHULL2015 THREADS X11
-OPTIONS_SUB=	yes
+OPTIONS_SUB=		yes

 FORTRAN_USES=		fortran
+FORTRAN_CMAKE_BOOL=	ENABLE_f95
 FORTRAN_CONFIGURE_ENV=	CMAKE_Fortran_COMPILER="${FC}"
-FORTRAN_CMAKE_ON=	-DENABLE_f95:BOOL=ON
-FORTRAN_CMAKE_OFF=	-DENABLE_f95:BOOL=OFF

-GD_LIB_DEPENDS=		libgd.so:graphics/gd
-GD_CMAKE_ON=		-DPLD_png:BOOL=ON
+GD_LIB_DEPENDS=		libgd.so:graphics/gd \
+			libpng16.so:graphics/png
+GD_USES=		jpeg
+GD_CMAKE_BOOL=		PLD_png

 LUA_USES=		lua:51
+LUA_CMAKE_BOOL=		ENABLE_lua
 LUA_CMAKE_ON=		-DLUA_EXECUTABLE:FILEPATH="${LUA_CMD}"
-LUA_CMAKE_OFF=		-DENABLE_lua:BOOL=OFF

 PYTHON_USES=		python
 PYTHON_BUILD_DEPENDS=	swig:devel/swig13 \
 			${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY}
+PYTHON_CMAKE_BOOL=	ENABLE_python
 PYTHON_CONFIGURE_ENV=	PYTHON_VERSION="${PYTHON_VERSION}"
-PYTHON_CMAKE_OFF=	-DENABLE_python:BOOL=OFF

 QHULL2003_DESC=		Legacy Qhull support
 QHULL2015_DESC=		Latest Qhull support
 QHULL2015_LIB_DEPENDS=	libqhull.so.7:math/qhull
 QHULL2003_LIB_DEPENDS=	libqhull.so.5:math/qhull5
-QHULL2015_CMAKE_ON=	-DQHULL_INCLUDE_DIRS="${LOCALBASE}/include/libqhull"
-QHULL2015_2FIX=		lib/nn/delaunay.c src/plgridd.c
+QHULL2015_CMAKE_ON=	-DQHULL_INCLUDE_DIRS:PATH="${LOCALBASE}/include/libqhull"

 TCLTK_LIB_DEPENDS=	libitk.so:x11-toolkits/itk
 TCLTK_RUN_DEPENDS=	iwidgets>0:x11-toolkits/iwidgets
 TCLTK_USES=		tk
-ITCL_VER=		3.4
+TCLTK_CMAKE_BOOL=	ENABLE_tcl
+TCLTK_IMPLIES=		X11
+ITCL_VER=		3.4.1
 ITK_VER=		3.3
 IWIDGETS_VER=		4.0.1
-TCLTK_CMAKE_ON=		-DPLPLOT_TK_VERSION="${TK_VER}" \
-			-DPLPLOT_ITCL_VERSION="${ITCL_VER}" \
-			-DPLPLOT_ITK_VERSION="${ITK_VER}" \
+TCLTK_CMAKE_ON=		-DPLPLOT_TK_VERSION:STRING="${TK_VER}" \
+			-DPLPLOT_ITCL_VERSION:STRING="${ITCL_VER}" \
+			-DPLPLOT_ITK_VERSION:STRING="${ITK_VER}" \
 			-DIWIDGETS_VERSIONS_LIST:STRING="${IWIDGETS_VER};${ITK_VER};${ITCL_VER}" \
 			-DTCL_TCLSH:FILEPATH="${TCLSH}" \
 			-DTCL_INCLUDE_PATH:PATH="${TCL_INCLUDEDIR}" \
@ -87,38 +89,30 @@ TCLTK_CMAKE_ON=		-DPLPLOT_TK_VERSION="${TK_VER}" \
 			-DTK_INCLUDE_PATH:PATH="${TK_INCLUDEDIR}" \
 			-DITK_INCLUDE_PATH:PATH="${LOCALBASE}/include/itk${ITK_VER}" \
 			-DITK_LIBRARY:FILEPATH="${LOCALBASE}/lib/libitk.so"
-TCLTK_CMAKE_OFF=	-DENABLE_tcl:BOOL=OFF

-THREADS_CMAKE_OFF=	-DTHREADS_HAVE_PTHREAD_ARG:BOOL=OFF
+THREADS_CMAKE_BOOL=	THREADS_HAVE_PTHREAD_ARG

 QT4_USE=		QT4=corelib,gui,svg,xml,moc_build,qmake_build,rcc_build,uic_build
-QT4_CMAKE_OFF=		-DENABLE_qt:BOOL=OFF -DDEFAULT_NO_QT_DEVICES:BOOL=ON
+QT4_CMAKE_BOOL=		ENABLE_qt
+QT4_CMAKE_BOOL_OFF=	DEFAULT_NO_QT_DEVICES

 WXGTK_LIB_DEPENDS=	libagg.so:graphics/agg
-WXGTK_USE=		WX=2.6+
+WXGTK_USE=		WX=3.0+
+WXGTK_CMAKE_BOOL=	ENABLE_wxwidgets
 WXGTK_CMAKE_ON=		-DwxWidgets_CONFIG_EXECUTABLE:FILEPATH="${WX_CONFIG}"
-WXGTK_CMAKE_OFF=	-DENABLE_wxwidgets:BOOL=OFF

 X11_USE=		XORG=ice,sm,x11,xext
-X11_CMAKE_OFF=		-DPLD_xcairo:BOOL=OFF -DPLD_xwin:BOOL=OFF
+X11_CMAKE_BOOL=		PLD_xcairo PLD_xwin

-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MTCLTK} && empty(PORT_OPTIONS:MX11)
-IGNORE=		option TCLTK needs X11 support
-.endif
-
-pre-configure:
+post-patch:
 	${REINPLACE_CMD} -e \
 		's|dl dlopen|c dlopen|' \
 		${WRKSRC}/cmake/modules/FindLTDL.cmake
 	${GREP} -lR "/usr/local" ${WRKSRC}/cmake/modules | ${XARGS} \
 		${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g'
-.if ${PORT_OPTIONS:MQHULL2015}
-. for src in ${QHULL2015_2FIX}
+post-patch-QHULL2015:
 	${REINPLACE_CMD} -e 's|qhull/qhull_a|libqhull/qhull_a|'	\
-		${WRKSRC}/${src}
-. endfor
-.endif
+		${WRKSRC}/lib/nn/delaunay.c \
+		${WRKSRC}/src/plgridd.c

 .include <bsd.port.mk>
--- a/math/plplot/distinfo
+++ b/math/plplot/distinfo
@ -1,2 +1,3 @@
-SHA256 (plplot-5.11.1.tar.gz) = 289dff828c440121e57b70538b3f0fb4056dc47159bc1819ea444321f2ff1c4c
-SIZE (plplot-5.11.1.tar.gz) = 15445404
+TIMESTAMP = 1486185399
+SHA256 (plplot-5.12.0.tar.gz) = 8dc5da5ef80e4e19993d4c3ef2a84a24cc0e44a5dade83201fca7160a6d352ce
+SIZE (plplot-5.12.0.tar.gz) = 16253895
--- a/math/plplot/files/patch-cmake_modules_pkg-config.cmake
+++ b/math/plplot/files/patch-cmake_modules_pkg-config.cmake
@ -1,18 +0,0 @@
-Adjust parameters passed to _pkg_check_modules_internal().
-Required for building with CMake 3.6.0.
-
-Submitted upstream: https://sourceforge.net/p/plplot/patches/33/
--- cmake/modules/pkg-config.cmake.orig	2016-07-16 10:36:31 UTC
-+++ cmake/modules/pkg-config.cmake
-@@ -120,8 +120,10 @@ macro(pkg_check_pkgconfig _package _incl
-   
-   if(CMAKE_VERSION VERSION_LESS "3.1")
-     _pkg_check_modules_internal(0 0 ${_prefix} "${_package}")
-  else(CMAKE_VERSION VERSION_LESS "3.1")
-+  elseif(CMAKE_VERSION VERSION_LESS "3.6")
-     _pkg_check_modules_internal(0 0 0 0 ${_prefix} "${_package}")
-+  else(CMAKE_VERSION VERSION_LESS "3.1")
-+    _pkg_check_modules_internal(0 0 0 0 0 ${_prefix} "${_package}")
-   endif(CMAKE_VERSION VERSION_LESS "3.1")
-     
-   if(${_prefix}_FOUND)
--- a/math/plplot/files/patch-git_db396b
+++ b/math/plplot/files/patch-git_db396b
@ -1,119 +0,0 @@
-From db396b9fbdc9cd54fb8545ea655185ca73a2a07e Mon Sep 17 00:00:00 2001
-From: "Alan W. Irwin" <airwin@users.sourceforge.net>
-Date: Sat, 19 Nov 2016 16:04:28 -0800
-Subject: [PATCH] Build system: Fix if argument dereferencing issue that occurs
- for CMake-3.7.0
-
-My thanks to Tom Schoonjans for reporting this issue.
-
-CMake-3.1 and beyond implements policy CMP0054.  The OLD behaviour of
-this policy (which we are forced to adopt because we currently support
-CMake-3.0.2, ugh) is that quoted strings in if arguments are
-dereferenced if there is a variable of the same name that has been
-defined.
-
-For example in the following if statement
-
-if(BINDING STREQUAL "c")
-
-CMake looks for a variable called c that has been defined and uses the
-value of that variable (which is really a nasty bug in the older
-versions of CMake such as 3.0.2 since it is a huge surprise that that
-dereferencing occurs instead of just using the string as is for the
-comparison).  But we are stuck with that bug (because we support 3.0.2
-which implies the OLD behaviour of CMP0054).
-
-However, modern versions of CMake such as 3.1.x through 3.7.0 do warn
-when this bug shows up. We got no such warning up to 3.6.x, but
-evidentally for CMake-3.7.0, the c variable has been set somewhere in
-the official CMake code (e.g., in the find modules) so for that versin
-we got warnings for the above if statement each time our build system
-code executes the function (pkg_config_file) that contains the above
-statement, and the result was the above if statement failed when
-BINDING derefenced to c, and the pkg-config files that are configured
-by that function were screwed up as a result as noticed by Tom
-Schoonjans.
-
-I have worked around the problem by replacing the above logic with
-
-if("X${BINDING}X" STREQUAL "XcX")
-
-on the assumption that no CMake variable in our own build system logic
-and also the CMake code provided by CMake itself is going to have the name
-XcX, but I have also commented the result with "CMP0054" so it will
-be easy to find and remove this commit once we no longer have to
-support CMake-3.0.2 so that we can use the rational CMP0054 NEW behaviour
-which is that quoted strings such as "c" are not dereferenced in "if"
-statements!
-
-Meanwhile, we rely on sharp-eyed users like Tom to tell us whenever
-there is a message concerning CMP0054 for any CMake version of 3.1 or
-higher since that is a signal that in virtually every case our CMake
-logic will go wrong (as in this 4.7.0 case) do to this OLD CMP0054
-behaviour.
-
-Tested by: Alan W. Irwin <airwin@users.sourceforge.net> on Linux
-(Debian Jessie) by comparing pkg-config files we configure in
-pkgcfg/*.pc with equivalent good *.pc results that were derived with a
-previous version of CMake that did not define the "c" variable that
-triggered this bug.  In all cases for CMake-3.7.0, the file names and
-contents of those files are now identical to the good past results.
-Also, because of this fix all CMP0054 warnings now no longer occur
-with cmake-3.7.0.
---
- cmake/modules/pkg-config.cmake | 21 +++++++++++++--------
- 1 file changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/cmake/modules/pkg-config.cmake b/cmake/modules/pkg-config.cmake
-index 6674efa..05a4a53 100644
--- cmake/modules/pkg-config.cmake
-+++ cmake/modules/pkg-config.cmake
-@@ -1,6 +1,6 @@
- # cmake/modules/pkg-config.cmake
- #
-# Copyright (C) 2006-2015 Alan W. Irwin
-+# Copyright (C) 2006-2016 Alan W. Irwin
- #
- # This file is part of PLplot.
- #
-@@ -415,25 +415,30 @@ function(pkg_config_file BINDING PC_SHORT_NAME PC_LONG_NAME PC_LIBRARY_NAME PC_C
-       message(FATAL_ERROR "pkg_config_file called with wrong number of arguments")
-     endif(ARGC EQUAL 7)
- 
-    if(BINDING STREQUAL "c")
-+    # N.B. all the tests on "X${BINDING}X" below rather than BINDING
-+    # are to beat a potential dereferencing problem for strings in if statements.
-+    # This problem only occurs with old CMake versions that don't
-+    # have CMP0054 set to NEW.
-+    
-+    if("X${BINDING}X" STREQUAL "XcX")
-       set(PC_FILE_SUFFIX "")
-       set(PC_REQUIRES "")
-    elseif(BINDING STREQUAL "wxwidgets")
-+    elseif("X${BINDING}X" STREQUAL "XwxwidgetsX")
-       set(PC_FILE_SUFFIX "-${BINDING}")
-       set(PC_REQUIRES "plplot-c++")
-    else(BINDING STREQUAL "c")
-+    else("X${BINDING}X" STREQUAL "XcX")
-       set(PC_FILE_SUFFIX "-${BINDING}")
-       set(PC_REQUIRES "plplot")
-    endif(BINDING STREQUAL "c")
-+    endif("X${BINDING}X" STREQUAL "XcX")
- 
-     if(NON_TRANSITIVE)
-      if(BINDING STREQUAL "ocaml")
-+      if("X${BINDING}X" STREQUAL "XocamlX")
- 	# Don't know how to do non-transitive linking for
-         # Ocaml binding of PLplot.
- 	set(PC_REQUIRES_TAG "Requires")
-      else(BINDING STREQUAL "ocaml")
-+      else("X${BINDING}X" STREQUAL "XocamlX")
- 	set(PC_REQUIRES_TAG "Requires.private")
-      endif(BINDING STREQUAL "ocaml")
-+      endif("X${BINDING}X" STREQUAL "XocamlX")
-     else(NON_TRANSITIVE)
-       set(PC_REQUIRES_TAG "Requires")
-     endif(NON_TRANSITIVE)
-- 
-2.10.1
-
--- a/math/plplot/pkg-plist
+++ b/math/plplot/pkg-plist
@ -21,6 +21,7 @@ include/plplot/qsastime.h
 include/plplot/qsastimedll.h
 %%QT4%%include/plplot/qt.h
 %%TCLTK%%include/plplot/tclMatrix.h
+%%WXGTK%%include/plplot/wxPLplot_nanosec.h
 %%WXGTK%%include/plplot/wxPLplotstream.h
 %%WXGTK%%include/plplot/wxPLplotwindow.h
 lib/cmake/plplot/export_plplot-%%CMAKE_BUILD_TYPE%%.cmake
@ -28,48 +29,46 @@ lib/cmake/plplot/export_plplot.cmake
 lib/cmake/plplot/plplotConfig.cmake
 %%FORTRAN%%lib/fortran/modules/plplot/plf95demolib.mod
 %%FORTRAN%%lib/fortran/modules/plplot/plplot.mod
+%%FORTRAN%%lib/fortran/modules/plplot/plplot_double.mod
 %%FORTRAN%%lib/fortran/modules/plplot/plplot_graphics.mod
-%%FORTRAN%%lib/fortran/modules/plplot/plplot_str.mod
-%%FORTRAN%%lib/fortran/modules/plplot/plplot_strutils.mod
+%%FORTRAN%%lib/fortran/modules/plplot/plplot_private_exposed.mod
+%%FORTRAN%%lib/fortran/modules/plplot/plplot_private_utilities.mod
+%%FORTRAN%%lib/fortran/modules/plplot/plplot_single.mod
 %%FORTRAN%%lib/fortran/modules/plplot/plplot_types.mod
-%%FORTRAN%%lib/fortran/modules/plplot/plplotp.mod
 lib/libcsirocsa.so
 lib/libcsirocsa.so.0
 lib/libcsirocsa.so.0.0.1
 lib/libcsironn.so
 lib/libcsironn.so.0
-lib/libcsironn.so.0.0.1
+lib/libcsironn.so.0.0.2
 %%FORTRAN%%lib/libplf95demolib.a
 lib/libplplot.so
-lib/libplplot.so.13
-lib/libplplot.so.13.1.2
+lib/libplplot.so.14
+lib/libplplot.so.14.0.0
 lib/libplplotcxx.so
-lib/libplplotcxx.so.12
-lib/libplplotcxx.so.12.0.0
+lib/libplplotcxx.so.13
+lib/libplplotcxx.so.13.0.0
 %%FORTRAN%%lib/libplplotf95.so
-%%FORTRAN%%lib/libplplotf95.so.12
-%%FORTRAN%%lib/libplplotf95.so.12.1.0
-%%FORTRAN%%lib/libplplotf95c.so
-%%FORTRAN%%lib/libplplotf95c.so.12
-%%FORTRAN%%lib/libplplotf95c.so.12.0.0
+%%FORTRAN%%lib/libplplotf95.so.13
+%%FORTRAN%%lib/libplplotf95.so.13.0.0
 %%QT4%%lib/libplplotqt.so
 %%QT4%%lib/libplplotqt.so.2
-%%QT4%%lib/libplplotqt.so.2.0.1
+%%QT4%%lib/libplplotqt.so.2.0.2
 %%TCLTK%%lib/libplplottcltk.so
-%%TCLTK%%lib/libplplottcltk.so.12
-%%TCLTK%%lib/libplplottcltk.so.12.1.1
+%%TCLTK%%lib/libplplottcltk.so.13
+%%TCLTK%%lib/libplplottcltk.so.13.0.0
 %%TCLTK%%lib/libplplottcltk_Main.so
 %%TCLTK%%lib/libplplottcltk_Main.so.1
 %%TCLTK%%lib/libplplottcltk_Main.so.1.0.0
 %%WXGTK%%lib/libplplotwxwidgets.so
 %%WXGTK%%lib/libplplotwxwidgets.so.1
-%%WXGTK%%lib/libplplotwxwidgets.so.1.1.0
+%%WXGTK%%lib/libplplotwxwidgets.so.1.2.0
 lib/libqsastime.so
 lib/libqsastime.so.0
 lib/libqsastime.so.0.0.1
 %%TCLTK%%lib/libtclmatrix.so
 %%TCLTK%%lib/libtclmatrix.so.10
-%%TCLTK%%lib/libtclmatrix.so.10.2.0
+%%TCLTK%%lib/libtclmatrix.so.10.3.0
 libdata/pkgconfig/plplot-c++.pc
 %%FORTRAN%%libdata/pkgconfig/plplot-f95.pc
 %%QT4%%libdata/pkgconfig/plplot-qt.pc
@ -240,6 +239,7 @@ man/man1/pltek.1.gz
 %%DATADIR%%/examples/cmake/modules/plplot_functions.cmake
 %%FORTRAN%%%%DATADIR%%/examples/f95/CMakeLists.txt
 %%FORTRAN%%%%DATADIR%%/examples/f95/Makefile
+%%FORTRAN%%%%DATADIR%%/examples/f95/README_precision
 %%FORTRAN%%%%DATADIR%%/examples/f95/plf95demos.inc
 %%FORTRAN%%%%DATADIR%%/examples/f95/x00f.f90
 %%FORTRAN%%%%DATADIR%%/examples/f95/x01f.f90
@ -275,7 +275,8 @@ man/man1/pltek.1.gz
 %%FORTRAN%%%%DATADIR%%/examples/f95/x30f.f90
 %%FORTRAN%%%%DATADIR%%/examples/f95/x31f.f90
 %%FORTRAN%%%%DATADIR%%/examples/f95/x33f.f90
-%%DATADIR%%/examples/lena.pgm
+%%DATADIR%%/examples/Chloe.pgm
+%%DATADIR%%/examples/README.Chloe
 %%LUA%%%%DATADIR%%/examples/lua/CMakeLists.txt
 %%LUA%%%%DATADIR%%/examples/lua/plplot_examples.lua
 %%LUA%%%%DATADIR%%/examples/lua/x00.lua
@ -318,10 +319,10 @@ man/man1/pltek.1.gz
 %%PYTHON%%%%DATADIR%%/examples/python/README.pythondemos
 %%PYTHON%%%%DATADIR%%/examples/python/README.rendering_tests
 %%PYTHON%%%%DATADIR%%/examples/python/plplot_logo.py
-%%PYTHON%%%%DATADIR%%/examples/python/plplot_py_demos.py
 %%PYTHON%%%%DATADIR%%/examples/python/plplot_python_start.py
 %%PYTHON%%%%DATADIR%%/examples/python/pythondemos.py
 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/pytkdemo
+%%PYTHON%%%%DATADIR%%/examples/python/restore.py
 %%PYTHON%%%%DATADIR%%/examples/python/test_axis_precision.py
 %%PYTHON%%%%DATADIR%%/examples/python/test_circle.py
 %%PYTHON%%%%DATADIR%%/examples/python/test_fill.py
@ -336,6 +337,7 @@ man/man1/pltek.1.gz
 %%PYTHON%%%%DATADIR%%/examples/python/test_type1.py
 %%PYTHON%%%%DATADIR%%/examples/python/testh.py
 %%PYTHON%%%%DATADIR%%/examples/python/x00
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x00.py
 %%PYTHON%%%%DATADIR%%/examples/python/x01
 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x01.py
 %%PYTHON%%%%DATADIR%%/examples/python/x02
@ -375,51 +377,31 @@ man/man1/pltek.1.gz
 %%PYTHON%%%%DATADIR%%/examples/python/x19
 %%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x19.py
 %%PYTHON%%%%DATADIR%%/examples/python/x20
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x20.py
 %%PYTHON%%%%DATADIR%%/examples/python/x21
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x21.py
 %%PYTHON%%%%DATADIR%%/examples/python/x22
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x22.py
 %%PYTHON%%%%DATADIR%%/examples/python/x23
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x23.py
 %%PYTHON%%%%DATADIR%%/examples/python/x24
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x24.py
 %%PYTHON%%%%DATADIR%%/examples/python/x25
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x25.py
 %%PYTHON%%%%DATADIR%%/examples/python/x26
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x26.py
 %%PYTHON%%%%DATADIR%%/examples/python/x27
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x27.py
 %%PYTHON%%%%DATADIR%%/examples/python/x28
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x28.py
 %%PYTHON%%%%DATADIR%%/examples/python/x29
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x29.py
 %%PYTHON%%%%DATADIR%%/examples/python/x30
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x30.py
 %%PYTHON%%%%DATADIR%%/examples/python/x31
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x31.py
 %%PYTHON%%%%DATADIR%%/examples/python/x33
-%%PYTHON%%%%DATADIR%%/examples/python/xw00.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw01.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw02.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw03.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw04.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw05.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw06.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw07.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw08.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw09.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw10.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw11.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw12.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw13.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw14.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw15.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw16.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw17.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw18.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw19.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw20.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw21.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw22.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw23.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw24.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw25.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw26.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw27.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw28.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw29.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw30.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw31.py
-%%PYTHON%%%%DATADIR%%/examples/python/xw33.py
+%%TCLTK%%%%PYTHON%%%%DATADIR%%/examples/python/x33.py
 %%TCLTK%%%%DATADIR%%/examples/tcl/CMakeLists.txt
 %%TCLTK%%%%DATADIR%%/examples/tcl/README.tcldemos
 %%TCLTK%%%%DATADIR%%/examples/tcl/mktclIndex
--- a/Show more
+++ b/Show more