*/*: sync with upstream

Taken from: HardenedBSD

audio/GxSwitchlessWah-lv2/Makefile

@@ -0,0 +1,35 @@
+# $FreeBSD$
+
+PORTNAME=	GxSwitchlessWah
+DISTVERSION=	g20171206
+CATEGORIES=	audio
+PKGNAMESUFFIX=	-lv2
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Analog wah emulation with switchless activation
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+BUILD_DEPENDS=	lv2>0:audio/lv2
+
+USES=		gmake localbase
+USE_GITHUB=	yes
+GH_ACCOUNT=	brummer10
+GH_PROJECT=	${PORTNAME}.lv2
+GH_TAGNAME=	6977568
+
+SSE_FLAGS_i386=		"-msse -mfpmath=sse"
+SSE_FLAGS_amd64=	"-msse2 -mfpmath=sse"
+SSE_FLAGS_armv7=	"-march=armv7 -mfpu=vfpv3"
+
+MAKE_ARGS=	SSE_CFLAGS=${SSE_FLAGS_${ARCH}}
+
+PLIST_FILES=	lib/lv2/GxSwitchlessWah.lv2/gx_switchless_wah.so \
+		lib/lv2/GxSwitchlessWah.lv2/gx_switchless_wah.ttl \
+		lib/lv2/GxSwitchlessWah.lv2/manifest.ttl
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lv2/GxSwitchlessWah.lv2/gx_switchless_wah.so
+
+.include <bsd.port.mk>

audio/GxSwitchlessWah-lv2/distinfo

@@ -0,0 +1,3 @@
+TIMESTAMP = 1512578914
+SHA256 (brummer10-GxSwitchlessWah.lv2-g20171206-6977568_GH0.tar.gz) = 5d7a67c58fd44848e317a55496a1421183ac1654eb703ebd8618d2b03ce0a831
+SIZE (brummer10-GxSwitchlessWah.lv2-g20171206-6977568_GH0.tar.gz) = 17415

audio/GxSwitchlessWah-lv2/files/patch-Makefile

@@ -0,0 +1,47 @@
+--- Makefile.orig	2017-12-08 06:25:07 UTC
++++ Makefile
+@@ -8,25 +8,25 @@
+ 	endif
+ 
+ 	# check CPU and supported optimization flags
+-	ifneq ($(shell cat /proc/cpuinfo | grep sse3 ) , )
+-		SSE_CFLAGS = -msse3 -mfpmath=sse
+-	else ifneq ($(shell cat /proc/cpuinfo | grep sse2 ) , )
+-		SSE_CFLAGS = -msse2 -mfpmath=sse
+-	else ifneq ($(shell cat /proc/cpuinfo | grep sse ) , )
+-		SSE_CFLAGS = -msse -mfpmath=sse
+-		else ifneq ($(shell cat /proc/cpuinfo | grep ARM ) , )
+-		ifneq ($(shell cat /proc/cpuinfo | grep ARMv7 ) , )
+-			ifneq ($(shell cat /proc/cpuinfo | grep vfpd32 ) , )
+-				SSE_CFLAGS = -march=armv7 -mfpu=vfpv3 
+-			else ifneq ($(shell cat /proc/cpuinfo | grep vfpv3 ) , )
+-				SSE_CFLAGS = -march=armv7 -mfpu=vfpv3
+-			endif
+-		else
+-			ARMCPU = "YES"
+-		endif
+-	else
+-		SSE_CFLAGS =
+-	endif
++	#ifneq ($(shell cat /proc/cpuinfo | grep sse3 ) , )
++	#	SSE_CFLAGS = -msse3 -mfpmath=sse
++	#else ifneq ($(shell cat /proc/cpuinfo | grep sse2 ) , )
++	#	SSE_CFLAGS = -msse2 -mfpmath=sse
++	#else ifneq ($(shell cat /proc/cpuinfo | grep sse ) , )
++	#	SSE_CFLAGS = -msse -mfpmath=sse
++	#	else ifneq ($(shell cat /proc/cpuinfo | grep ARM ) , )
++	#	ifneq ($(shell cat /proc/cpuinfo | grep ARMv7 ) , )
++	#		ifneq ($(shell cat /proc/cpuinfo | grep vfpd32 ) , )
++	#			SSE_CFLAGS = -march=armv7 -mfpu=vfpv3 
++	#		else ifneq ($(shell cat /proc/cpuinfo | grep vfpv3 ) , )
++	#			SSE_CFLAGS = -march=armv7 -mfpu=vfpv3
++	#		endif
++	#	else
++	#		ARMCPU = "YES"
++	#	endif
++	#else
++	#	SSE_CFLAGS =
++	#endif
+ 
+ 	# set bundle name
+ 	NAME = gx_switchless_wah

audio/GxSwitchlessWah-lv2/pkg-descr

@@ -0,0 +1,7 @@
+Analog wah emulator allowing to alter sound in a way to create a distinctive
+sound, mimicking the human voice saying the onomatopoeic name "wah-wah".
+
+See the corresponding article on Wikipedia:
+https://en.wikipedia.org/wiki/Wah-wah_pedal
+
+WWW: https://github.com/brummer10/GxSwitchlessWah.lv2

audio/Makefile

@@ -3,6 +3,7 @@
 
     COMMENT = Audio tools
 
+    SUBDIR += GxSwitchlessWah-lv2
     SUBDIR += HVSC-Update
     SUBDIR += Maaate
     SUBDIR += aacgain

audio/cmus/Makefile

@@ -46,6 +46,7 @@ _CMUS_CONFIGURE_OPTS=	AAC ALSA AO ARTS CDDB CDIO COREAUDIO CUE DISCID	\
 CONFIGURE_ARGS+=	CONFIG_${opt}=n
 .endfor
 
+OPTIONS_DEFINE=		EXAMPLES
 OPTIONS_DEFAULT=	AAC FFMPEG FLAC MAD MODPLUG MP4 OPUS OSS SNDIO VORBIS WAV
 OPTIONS_SUB=	yes
 

converters/rubygem-json-ld/pkg-descr

@@ -3,4 +3,4 @@ compaction and framing API interfaces.  It can now be used to create a context
 from an RDFS/OWL definition, and optionally include a JSON-LD representation of
 the ontology itself.
 
-WWW: http://github.com/ruby-rdf/json-ld
+WWW: https://github.com/ruby-rdf/json-ld

databases/galera/Makefile

@@ -56,27 +56,9 @@ OPTIONS_DEFINE=	BOOSTPOOL BPOSTATIC DEBUG
 BOOSTPOOL_DESC=	Use boost pool allocator
 BPOSTATIC_DESC=	Use static boost_program_options
 
-.include <bsd.port.pre.mk>
+BOOSTPOOL_MAKE_ARGS=	boost_pool=1
-
+BPOSTATIC_MAKE_ARGS=	bpostatic=${LOCALBASE}/lib/libboost_program_options.a
-# Clang is available on FreeBSD 9.x but the default
+DEBUG_MAKE_ARGS=	debug=0
-# compiler (e.g. /usr/bin/cc) is GCC. Force the usage of Clang.
-.if ${OSVERSION} < 1000024
-CC=		clang
-CXX=		clang++
-CPP=		clang-cpp
-.endif
-
-.if ${PORT_OPTIONS:MBOOSTPOOL}
-MAKE_ARGS+=	boost_pool=1
-.endif
-
-.if ${PORT_OPTIONS:MBPOSTATIC}
-MAKE_ARGS+=	bpostatic=${LOCALBASE}/lib/libboost_program_options.a
-.endif
-
-.if ${PORT_OPTIONS:MDEBUG}
-MAKE_ARGS+=	debug=0
-.endif
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/garb/garbd ${STAGEDIR}${PREFIX}/bin/
@@ -84,4 +66,4 @@ do-install:
 	@(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf libgalera_smm.so \
 		libgalera.so)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

databases/galera/pkg-descr

@@ -2,4 +2,4 @@ Galera wsrep provider library for Galera Cluster for MySQL, an easy-to-use
 high-availability solution with high system up-time, no data loss,
 and scalability for future growth.
 
-WWW: http://galeracluster.com
+WWW: http://galeracluster.com/

databases/ruby-gdbm/Makefile

@@ -28,8 +28,15 @@ MAKE_ARGS=	sitelibdir='$$(rubylibdir)' \
 		INSTALL_PROG="${INSTALL_PROGRAM}" \
 		INSTALL_DATA="${INSTALL_DATA}"
 
+.include <bsd.port.pre.mk>
+
+.if ${RUBY_VER} >= 2.4
+post-patch:
+	@${REINPLACE_CMD} -e '/\/include\/ruby.h/d' ${WRKSRC}/depend
+.endif
+
 do-extract:
 	${MKDIR} ${WRKDIR}
 	${LN} -sf `cd ${PORTSDIR}/${RUBY_PORT}; ${MAKE} -V WRKDIR`/${PORTNAME} ${WRKDIR}/
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

deskutils/pypanel/Makefile

@@ -33,8 +33,9 @@ post-patch:
 		 s|/usr/bin/imlib2-config|${LOCALBASE}/bin/imlib2-config|; \
 		 s|/usr/X11R6/include|${LOCALBASE}/include|; \
 		 s|"COPYING", "README", ||' ${WRKSRC}/setup.py
-	@${REINPLACE_CMD} -e 's|sysconfig\.get_python_lib()|"${PREFIX}/share"|' \
+	@${REINPLACE_CMD} -e \
-		${WRKSRC}/setup.py ${WRKSRC}/pypanel
+		's|sysconfig\.get_python_lib()|"${PREFIX}/share"|' \
+			${WRKSRC}/setup.py ${WRKSRC}/pypanel
 	@${REINPLACE_CMD} -e \
 		's|/usr/lib/libImlib2.so.1|${LOCALBASE}/lib/libImlib2.so|' \
 		${WRKSRC}/setup.py ${WRKSRC}/ppmodule.c

devel/cppcheck/Makefile

@@ -44,7 +44,7 @@ RULES_USES=		localbase:ldflags
 TEST_CMAKE_BOOL=	BUILD_TESTS
 
 HTMLREPORT_DESC=	Install cppcheck-htmlreport
-HTMLREPORT_USES=	python:2,${PYUSE:C/ /,/W}
+HTMLREPORT_USES=	python:${PYUSE:C/ /,/W}
 HTMLREPORT_RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pygments>0:textproc/py-pygments@${PY_FLAVOR}
 HTMLREPORT_PLIST_FILES=	bin/cppcheck-htmlreport
 HTMLREPORT_VARS=	PYUSE+=run
@@ -54,7 +54,7 @@ MANPAGES_BUILD_DEPENDS=	xsltproc:textproc/libxslt \
 
 MATCHCOMPILER_DESC=	Build-time optimizations via Python
 MATCHCOMPILER_CMAKE_BOOL=	USE_MATCHCOMPILER
-MATCHCOMPILER_USES=	python:2,${PYUSE:C/ /,/W}
+MATCHCOMPILER_USES=	python:${PYUSE:C/ /,/W}
 MATCHCOMPILER_VARS=	PYUSE+=build
 
 post-install-HTMLREPORT-on:

devel/grpc/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grpc
-PORTVERSION=	1.8.0
+PORTVERSION=	1.8.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 

devel/grpc/distinfo

@@ -1,5 +1,5 @@
-TIMESTAMP = 1513174933
+TIMESTAMP = 1513345089
-SHA256 (grpc-grpc-v1.8.0_GH0.tar.gz) = 7d1c646c2012bdd0af275215c3fc882c598a1eb664c1012a49a81e4faf27a504
+SHA256 (grpc-grpc-v1.8.1_GH0.tar.gz) = ae34c8255ea0aa4f893b9b2cb9f02d8e13bd9d7f2a90d1c39d56a5d6143a9f44
-SIZE (grpc-grpc-v1.8.0_GH0.tar.gz) = 4636987
+SIZE (grpc-grpc-v1.8.1_GH0.tar.gz) = 4636161
 SHA256 (google-benchmark-v1.3.0_GH0.tar.gz) = f19559475a592cbd5ac48b61f6b9cedf87f0b6775d1443de54cfe8f53940b28d
 SIZE (google-benchmark-v1.3.0_GH0.tar.gz) = 105485

devel/pecl-grpc/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	grpc
-PORTVERSION=	1.7.0
+PORTVERSION=	1.8.0
 CATEGORIES=	devel net
 
 MAINTAINER=	vanilla@FreeBSD.org

devel/pecl-grpc/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1510723140
+TIMESTAMP = 1513349287
-SHA256 (PECL/grpc-1.7.0.tgz) = 0583129a618f186c90ec81b41d3d259e195fbd7f0979a74a8b13f46a64b96686
+SHA256 (PECL/grpc-1.8.0.tgz) = cec11452d2938da8d7c5a5b11bc7df6c11469ece18c0954fd12edd34a3321dab
-SIZE (PECL/grpc-1.7.0.tgz) = 2326462
+SIZE (PECL/grpc-1.8.0.tgz) = 2304860

devel/pecl-grpc/files/patch-src_core_tsi_ssl__transport__security.c

@@ -1,10 +0,0 @@
---- src/core/tsi/ssl_transport_security.c.orig	2017-08-29 09:34:33 UTC
-+++ src/core/tsi/ssl_transport_security.c
-@@ -35,6 +35,7 @@
- 
- #include <grpc/support/port_platform.h>
- 
-+#include <sys/socket.h>
- #include <limits.h>
- #include <string.h>
- 

devel/pecl-grpc/files/patch-src_core_tsi_ssl__transport__security.cc

@@ -0,0 +1,11 @@
+--- src/core/tsi/ssl_transport_security.cc.orig	2017-12-15 14:58:10 UTC
++++ src/core/tsi/ssl_transport_security.cc
+@@ -19,7 +19,7 @@
+ #include "src/core/tsi/ssl_transport_security.h"
+ 
+ #include <grpc/support/port_platform.h>
+-
++#include <sys/socket.h>
+ #include <limits.h>
+ #include <string.h>
+ 

devel/pycharm-ce/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pycharm-ce
-PORTVERSION=	2017.2.4
+PORTVERSION=	2017.3
 CATEGORIES=	devel java python
 MASTER_SITES=	https://download.jetbrains.com/python/ \
 		http://download.jetbrains.com/python/
@@ -41,7 +41,7 @@ do-install:
 	@${RM} -r ${STAGEDIR}${DATADIR}/jre64
 	@${RM} -r ${STAGEDIR}${DATADIR}/helpers/pydev/pydevd_attach_to_process
 	@${RM} ${STAGEDIR}${DATADIR}/lib/pty4j-0.5.jar
-	${INSTALL_SCRIPT} ${WRKDIR}/pycharm ${STAGEDIR}${PREFIX}/bin/
+	${INSTALL_SCRIPT} ${WRKDIR}/pycharm ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop ${STAGEDIR}${PREFIX}/share/applications/
 	#cd ${WRKSRC}/lib && ${JAVA_HOME}/bin/jar xf icons.jar
 # TODO: Remove and enable fsnotifier when devel/libinotify is fixed

devel/pycharm-ce/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1509539301
+TIMESTAMP = 1513173904
-SHA256 (pycharm-community-2017.2.4.tar.gz) = a72045c348981640a12fb9739e04d4985163248006150d4fd3b3c09d34216ea4
+SHA256 (pycharm-community-2017.3.tar.gz) = b973581cb3de0f0f5a203231f67b21a45b7dd58968393cef49d48403cb1b8ad1
-SIZE (pycharm-community-2017.2.4.tar.gz) = 200392450
+SIZE (pycharm-community-2017.3.tar.gz) = 282451011

devel/pycharm-ce/pkg-plist

@@ -1,4 +1,4 @@
-bin/pycharm
+bin/pycharm-ce
 share/applications/pycharm-ce.desktop
 %%DATADIR%%/Install-Linux-tar.txt
 %%DATADIR%%/bin/format.sh
@@ -245,6 +245,8 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/pockets/iterators.py
 %%DATADIR%%/helpers/pockets/string.py
 %%DATADIR%%/helpers/profiler/__init__.py
+%%DATADIR%%/helpers/profiler/_imps/__init__.py
+%%DATADIR%%/helpers/profiler/_imps/_pydev_pkgutil_old.py
 %%DATADIR%%/helpers/profiler/_prof_imports.py
 %%DATADIR%%/helpers/profiler/load_pstat.py
 %%DATADIR%%/helpers/profiler/ply/__init__.py
@@ -254,10 +256,10 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/profiler/ply/yacc.py
 %%DATADIR%%/helpers/profiler/ply/ygen.py
 %%DATADIR%%/helpers/profiler/prof_io.py
+%%DATADIR%%/helpers/profiler/prof_six.py
 %%DATADIR%%/helpers/profiler/prof_util.py
 %%DATADIR%%/helpers/profiler/profiler.thrift
 %%DATADIR%%/helpers/profiler/run_profiler.py
-%%DATADIR%%/helpers/profiler/six.py
 %%DATADIR%%/helpers/profiler/thriftpy/__init__.py
 %%DATADIR%%/helpers/profiler/thriftpy/_compat.py
 %%DATADIR%%/helpers/profiler/thriftpy/contrib/__init__.py
@@ -651,6 +653,8 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/py3only/docutils/writers/s5_html/themes/small-white/pretty.css
 %%DATADIR%%/helpers/py3only/docutils/writers/xetex/__init__.py
 %%DATADIR%%/helpers/pycharm/__init__.py
+%%DATADIR%%/helpers/pycharm/__jb.for_twisted/twisted/plugins/README.txt
+%%DATADIR%%/helpers/pycharm/__jb.for_twisted/twisted/plugins/teamcity_plugin.py
 %%DATADIR%%/helpers/pycharm/_bdd_utils.py
 %%DATADIR%%/helpers/pycharm/_jb_create_folder.py
 %%DATADIR%%/helpers/pycharm/_jb_django_project_creator.py
@@ -660,6 +664,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/pycharm/_jb_pytest_runner.py
 %%DATADIR%%/helpers/pycharm/_jb_runner_tools.py
 %%DATADIR%%/helpers/pycharm/_jb_tox_runner.py
+%%DATADIR%%/helpers/pycharm/_jb_trialtest_runner.py
 %%DATADIR%%/helpers/pycharm/_jb_unittest_runner.py
 %%DATADIR%%/helpers/pycharm/_jb_utils.py
 %%DATADIR%%/helpers/pycharm/appcfg_fetcher.py
@@ -708,6 +713,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/pycharm/teamcity/__init__.py
 %%DATADIR%%/helpers/pycharm/teamcity/common.py
 %%DATADIR%%/helpers/pycharm/teamcity/context_managers.py
+%%DATADIR%%/helpers/pycharm/teamcity/diff_tools.py
 %%DATADIR%%/helpers/pycharm/teamcity/django.py
 %%DATADIR%%/helpers/pycharm/teamcity/flake8_plugin.py
 %%DATADIR%%/helpers/pycharm/teamcity/flake8_v2_plugin.py
@@ -724,6 +730,9 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/pycharm_generator_utils/pyparsing.py
 %%DATADIR%%/helpers/pycharm_generator_utils/pyparsing_py3.py
 %%DATADIR%%/helpers/pycharm_generator_utils/util_methods.py
+%%DATADIR%%/helpers/pycharm_matplotlib_backend/__init__.py
+%%DATADIR%%/helpers/pycharm_matplotlib_backend/backend_interagg.py
+%%DATADIR%%/helpers/pycharm_matplotlib_backend/sitecustomize.py
 %%DATADIR%%/helpers/pycodestyle.py
 %%DATADIR%%/helpers/pydev/LICENSE
 %%DATADIR%%/helpers/pydev/README.rst
@@ -782,6 +791,13 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_custom_frames.py
 %%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_cython.c
 %%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_cython.pyx
+%%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_26_64.so
+%%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_27_64.so
+%%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_34_64.so
+%%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_35_64.cpython-35m-darwin.so
+%%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_cython_darwin_36_64.cpython-36m-darwin.so
+%%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_26_32.pyd
+%%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_26_64.pyd
 %%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_27_32.pyd
 %%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_27_64.pyd
 %%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_cython_win32_34_32.pyd
@@ -795,6 +811,8 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_dont_trace_files.py
 %%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_exec.py
 %%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_exec2.py
+%%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_extension_api.py
+%%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_extension_utils.py
 %%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_frame.py
 %%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_frame_utils.py
 %%DATADIR%%/helpers/pydev/_pydevd_bundle/pydevd_import_class.py
@@ -823,17 +841,20 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator.c
 %%DATADIR%%/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator.pxd
 %%DATADIR%%/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator.pyx
+%%DATADIR%%/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_darwin_36_64.cpython-36m-darwin.so
 %%DATADIR%%/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_36_32.cp36-win32.pyd
 %%DATADIR%%/helpers/pydev/_pydevd_frame_eval/pydevd_frame_evaluator_win32_36_64.cp36-win_amd64.pyd
 %%DATADIR%%/helpers/pydev/_pydevd_frame_eval/pydevd_frame_tracing.py
 %%DATADIR%%/helpers/pydev/_pydevd_frame_eval/pydevd_modify_bytecode.py
-%%DATADIR%%/helpers/pydev/build.gradle
 %%DATADIR%%/helpers/pydev/build_tools/build.py
+%%DATADIR%%/helpers/pydev/build_tools/build_binaries_osx.py
 %%DATADIR%%/helpers/pydev/build_tools/build_binaries_windows.py
 %%DATADIR%%/helpers/pydev/build_tools/generate_code.py
 %%DATADIR%%/helpers/pydev/build_tools/names_to_rename.py
 %%DATADIR%%/helpers/pydev/build_tools/rename_pep8.py
 %%DATADIR%%/helpers/pydev/interpreterInfo.py
+%%DATADIR%%/helpers/pydev/jython_test_deps/ant.jar
+%%DATADIR%%/helpers/pydev/jython_test_deps/junit.jar
 %%DATADIR%%/helpers/pydev/merge_pydev_pycharm.txt
 %%DATADIR%%/helpers/pydev/pycharm-readme.txt
 %%DATADIR%%/helpers/pydev/pycompletionserver.py
@@ -867,6 +888,13 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/pydev/pydevd_file_utils.py
 %%DATADIR%%/helpers/pydev/pydevd_plugins/__init__.py
 %%DATADIR%%/helpers/pydev/pydevd_plugins/django_debug.py
+%%DATADIR%%/helpers/pydev/pydevd_plugins/extensions/README.md
+%%DATADIR%%/helpers/pydev/pydevd_plugins/extensions/__init__.py
+%%DATADIR%%/helpers/pydev/pydevd_plugins/extensions/types/README.md
+%%DATADIR%%/helpers/pydev/pydevd_plugins/extensions/types/__init__.py
+%%DATADIR%%/helpers/pydev/pydevd_plugins/extensions/types/pydevd_helpers.py
+%%DATADIR%%/helpers/pydev/pydevd_plugins/extensions/types/pydevd_plugin_numpy_types.py
+%%DATADIR%%/helpers/pydev/pydevd_plugins/extensions/types/pydevd_plugins_django_form_str.py
 %%DATADIR%%/helpers/pydev/pydevd_plugins/jinja2_debug.py
 %%DATADIR%%/helpers/pydev/runfiles.py
 %%DATADIR%%/helpers/pydev/setup.py
@@ -915,8 +943,10 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/_debugger_case56.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/_debugger_case7.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/_debugger_case89.py
+%%DATADIR%%/helpers/pydev/tests_pydevd_python/_debugger_case_event_ext.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/_debugger_case_m_switch.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/_debugger_case_m_switch_2.py
+%%DATADIR%%/helpers/pydev/tests_pydevd_python/_debugger_case_module_entry_point.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/_debugger_case_qthread1.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/_debugger_case_qthread2.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/_debugger_case_qthread3.py
@@ -925,6 +955,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/_debugger_case_remote_1.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/_debugger_case_remote_2.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/_debugger_case_set_next_statement.py
+%%DATADIR%%/helpers/pydev/tests_pydevd_python/_debugger_case_type_ext.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/_performance_1.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/_performance_2.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/_performance_3.py
@@ -932,8 +963,10 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/my_django_proj_17/manage.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/__init__.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/admin.py
+%%DATADIR%%/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/forms.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/models.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/templates/my_app/index.html
+%%DATADIR%%/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/templates/my_app/name.html
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/tests.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/urls.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_app/views.py
@@ -941,10 +974,15 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/settings.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/urls.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/my_django_proj_17/my_django_proj_17/wsgi.py
+%%DATADIR%%/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/__init__.py
+%%DATADIR%%/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/extensions/__init__.py
+%%DATADIR%%/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/extensions/pydevd_plugin_test_events.py
+%%DATADIR%%/helpers/pydev/tests_pydevd_python/my_extensions/pydevd_plugins/extensions/pydevd_plugin_test_exttype.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/performance_check.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/test_additional_thread_info.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/test_bytecode_modification.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/test_debugger.py
+%%DATADIR%%/helpers/pydev/tests_pydevd_python/test_frame_eval_and_tracing.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/test_process_command_line.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/test_pydev_monkey.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_python/test_save_locals.py
@@ -968,6 +1006,15 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/pydev/tests_pydevd_runfiles/test_pydevd_property.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_runfiles/test_pydevdio.py
 %%DATADIR%%/helpers/pydev/tests_pydevd_runfiles/test_runfiles.py
+%%DATADIR%%/helpers/pydev/third_party/isort_container/isort/__init__.py
+%%DATADIR%%/helpers/pydev/third_party/isort_container/isort/__main__.py
+%%DATADIR%%/helpers/pydev/third_party/isort_container/isort/hooks.py
+%%DATADIR%%/helpers/pydev/third_party/isort_container/isort/isort.py
+%%DATADIR%%/helpers/pydev/third_party/isort_container/isort/main.py
+%%DATADIR%%/helpers/pydev/third_party/isort_container/isort/natural.py
+%%DATADIR%%/helpers/pydev/third_party/isort_container/isort/pie_slice.py
+%%DATADIR%%/helpers/pydev/third_party/isort_container/isort/pylama_isort.py
+%%DATADIR%%/helpers/pydev/third_party/isort_container/isort/settings.py
 %%DATADIR%%/helpers/pydev/third_party/pep8/autopep8.py
 %%DATADIR%%/helpers/pydev/third_party/pep8/lib2to3/lib2to3/Grammar.txt
 %%DATADIR%%/helpers/pydev/third_party/pep8/lib2to3/lib2to3/PatternGrammar.txt
@@ -1043,7 +1090,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/pydev/third_party/pep8/lib2to3/lib2to3/pygram.py
 %%DATADIR%%/helpers/pydev/third_party/pep8/lib2to3/lib2to3/pytree.py
 %%DATADIR%%/helpers/pydev/third_party/pep8/lib2to3/lib2to3/refactor.py
-%%DATADIR%%/helpers/pydev/third_party/pep8/pep8.py
+%%DATADIR%%/helpers/pydev/third_party/pep8/pycodestyle.py
 %%DATADIR%%/helpers/pydev/third_party/wrapped_for_pydev/ctypes/__init__.py
 %%DATADIR%%/helpers/pydev/third_party/wrapped_for_pydev/ctypes/_ctypes.dll
 %%DATADIR%%/helpers/pydev/third_party/wrapped_for_pydev/ctypes/_endian.py
@@ -1173,6 +1220,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/2/Cookie.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/HTMLParser.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/Queue.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/SimpleHTTPServer.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/SocketServer.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/StringIO.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/UserDict.pyi
@@ -1196,6 +1244,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/2/_sre.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/_struct.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/_symtable.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/_threading_local.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/_warnings.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/_weakref.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/_weakrefset.pyi
@@ -1221,10 +1270,12 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/2/distutils/__init__.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/distutils/emxccompiler.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/doctest.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/dummy_thread.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/email/MIMEText.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/email/__init__.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/email/_parseaddr.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/email/mime/__init__.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/email/mime/application.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/email/mime/base.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/email/mime/multipart.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/email/mime/nonmultipart.pyi
@@ -1257,23 +1308,30 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/2/itertools.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/json.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/linecache.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/macpath.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/markupbase.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/md5.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/mimetools.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/multiprocessing/__init__.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/multiprocessing/process.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/multiprocessing/util.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/mutex.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/ntpath.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/nturl2path.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/optparse.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/os/__init__.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/os/path.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/os2emxpath.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/pdb.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/pickle.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/pipes.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/platform.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/popen2.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/posix.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/posixpath.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/pprint.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/pwd.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/pydoc.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/random.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/re.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/repr.pyi
@@ -1282,6 +1340,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/2/robotparser.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/runpy.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/select.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/sets.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/sha.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/shelve.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/shlex.pyi
@@ -1289,11 +1348,15 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/2/signal.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/smtplib.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/socket.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/spwd.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/sqlite3/__init__.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/sqlite3/dbapi2.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/sre_constants.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/sre_parse.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/ssl.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/stat.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/string.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/stringold.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/strop.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/struct.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/subprocess.pyi
@@ -1303,6 +1366,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/2/textwrap.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/thread.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/time.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/toaiff.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/token.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/tokenize.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/types.pyi
@@ -1311,27 +1375,46 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/2/urllib.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/urllib2.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/urlparse.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/user.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/uuid.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/weakref.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/whichdb.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/wsgiref/__init__.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/wsgiref/types.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/wsgiref/validate.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2/xmlrpclib.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2/zlib.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/__future__.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/_bisect.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/_codecs.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/_csv.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/_heapq.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/_random.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/_weakref.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/_weakrefset.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/argparse.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/asynchat.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/asyncore.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/base64.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/binascii.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/binhex.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/bisect.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/bz2.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/cProfile.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/calendar.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/cgi.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/chunk.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/cmath.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/cmd.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/code.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/codecs.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/codeop.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/colorsys.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/contextlib.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/copy.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/crypt.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/csv.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/difflib.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/dis.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/distutils/__init__.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/distutils/archive_util.pyi
@@ -1379,12 +1462,28 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/distutils/unixccompiler.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/distutils/util.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/distutils/version.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/doctest.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/errno.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/filecmp.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/fileinput.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/formatter.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/fractions.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/ftplib.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/grp.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/hmac.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/keyword.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/lib2to3/__init__.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/lib2to3/pgen2/__init__.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/lib2to3/pgen2/driver.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/lib2to3/pgen2/grammar.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/lib2to3/pgen2/literals.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/lib2to3/pgen2/parse.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/lib2to3/pgen2/pgen.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/lib2to3/pgen2/token.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/lib2to3/pgen2/tokenize.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/lib2to3/pygram.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/lib2to3/pytree.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/linecache.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/locale.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/logging/__init__.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/logging/config.pyi
@@ -1396,19 +1495,32 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/numbers.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/opcode.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/operator.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/optparse.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/pdb.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/pickle.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/pickletools.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/pkgutil.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/plistlib.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/poplib.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/pprint.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/profile.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/pstats.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/pty.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/pwd.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/py_compile.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/pyclbr.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/quopri.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/readline.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/rlcompleter.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/sched.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/select.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/site.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/smtpd.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/sndhdr.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/socket.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/spwd.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/stringprep.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/struct.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/sunau.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/symtable.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/sysconfig.pyi
@@ -1419,13 +1531,16 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/termios.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/threading.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/timeit.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/token.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/trace.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/traceback.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/tty.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/unicodedata.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/uu.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/uuid.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/warnings.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/wave.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/weakref.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/webbrowser.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/xdrlib.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/xml/__init__.pyi
@@ -1440,6 +1555,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/xml/sax/xmlreader.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/zipfile.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/2and3/zipimport.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/2and3/zlib.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3.3/ipaddress.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3.4/_stat.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3.4/_tracemalloc.pyi
@@ -1467,6 +1583,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/3/_compression.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/_curses.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/_dummy_thread.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/3/_imp.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/_importlib_modulespec.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/_json.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/_markupbase.pyi
@@ -1475,6 +1592,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/3/_random.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/_subprocess.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/_thread.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/3/_threading_local.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/_warnings.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/abc.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/array.pyi
@@ -1512,6 +1630,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/3/email/iterators.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/email/message.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/email/mime/__init__.py
+%%DATADIR%%/helpers/typeshed/stdlib/3/email/mime/__init__.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/email/mime/application.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/email/mime/audio.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/email/mime/base.pyi
@@ -1555,12 +1674,20 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/3/io.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/itertools.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/json.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/3/json/__init__.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/3/json/decoder.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/3/json/encoder.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/linecache.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/3/macpath.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/msvcrt.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/multiprocessing/__init__.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/3/multiprocessing/context.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/multiprocessing/managers.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/multiprocessing/pool.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/multiprocessing/process.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/3/nntplib.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/3/ntpath.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/3/nturl2path.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/os/__init__.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/os/path.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/pdb.pyi
@@ -1574,6 +1701,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/3/queue.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/random.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/re.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/3/reprlib.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/resource.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/runpy.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/select.pyi
@@ -1584,8 +1712,11 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/3/smtplib.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/socket.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/socketserver.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/3/spwd.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/sqlite3/__init__.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/sqlite3/dbapi2.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/3/sre_constants.pyi
+%%DATADIR%%/helpers/typeshed/stdlib/3/sre_parse.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/ssl.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/stat.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/string.pyi
@@ -1618,6 +1749,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/stdlib/3/wsgiref/validate.pyi
 %%DATADIR%%/helpers/typeshed/stdlib/3/zlib.pyi
 %%DATADIR%%/helpers/typeshed/tests/mypy_blacklist.txt
+%%DATADIR%%/helpers/typeshed/tests/mypy_selftest.py
 %%DATADIR%%/helpers/typeshed/tests/mypy_test.py
 %%DATADIR%%/helpers/typeshed/tests/pytype_blacklist.txt
 %%DATADIR%%/helpers/typeshed/tests/pytype_test.py
@@ -1839,6 +1971,9 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/third_party/2and3/boto/ec2/__init__.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/boto/elb/__init__.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/boto/exception.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/boto/kms/__init__.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/boto/kms/exceptions.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/boto/kms/layer1.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/boto/plugin.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/boto/regioninfo.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/boto/s3/__init__.pyi
@@ -1858,8 +1993,21 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/third_party/2and3/boto/s3/tagging.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/boto/s3/user.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/boto/s3/website.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/boto/utils.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/certifi.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/characteristic/__init__.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/click/README.md
+%%DATADIR%%/helpers/typeshed/third_party/2and3/click/__init__.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/click/core.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/click/decorators.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/click/exceptions.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/click/formatting.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/click/globals.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/click/parser.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/click/termui.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/click/types.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/click/utils.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/emoji.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/jinja2/__init__.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/jinja2/_compat.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/jinja2/_stringdefs.pyi
@@ -1904,6 +2052,19 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/third_party/2and3/pymysql/err.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/pymysql/times.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/pymysql/util.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/pynamodb/__init__.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/pynamodb/attributes.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/pynamodb/connection/__init__.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/pynamodb/connection/base.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/pynamodb/connection/table.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/pynamodb/connection/util.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/pynamodb/constants.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/pynamodb/exceptions.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/pynamodb/indexes.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/pynamodb/models.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/pynamodb/settings.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/pynamodb/throttle.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/pynamodb/types.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/pytz/__init__.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/pytz/lazy.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/requests/__init__.pyi
@@ -1943,7 +2104,24 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/third_party/2and3/requests/structures.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/requests/utils.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/singledispatch.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/typing_extensions.pyi
 %%DATADIR%%/helpers/typeshed/third_party/2and3/ujson.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/__init__.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/composer.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/constructor.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/dumper.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/emitter.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/error.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/events.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/loader.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/nodes.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/parser.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/reader.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/representer.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/resolver.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/scanner.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/serializer.pyi
+%%DATADIR%%/helpers/typeshed/third_party/2and3/yaml/tokens.pyi
 %%DATADIR%%/helpers/typeshed/third_party/3.6/click/README.md
 %%DATADIR%%/helpers/typeshed/third_party/3.6/click/__init__.pyi
 %%DATADIR%%/helpers/typeshed/third_party/3.6/click/core.pyi
@@ -1971,6 +2149,12 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/typeshed/third_party/3/docutils/parsers/rst/states.pyi
 %%DATADIR%%/helpers/typeshed/third_party/3/enum.pyi
 %%DATADIR%%/helpers/typeshed/third_party/3/itsdangerous.pyi
+%%DATADIR%%/helpers/typeshed/third_party/3/jwt/__init__.pyi
+%%DATADIR%%/helpers/typeshed/third_party/3/jwt/algorithms.pyi
+%%DATADIR%%/helpers/typeshed/third_party/3/jwt/contrib/__init__.pyi
+%%DATADIR%%/helpers/typeshed/third_party/3/jwt/contrib/algorithms/__init__.pyi
+%%DATADIR%%/helpers/typeshed/third_party/3/jwt/contrib/algorithms/py_ecdsa.pyi
+%%DATADIR%%/helpers/typeshed/third_party/3/jwt/contrib/algorithms/pycrypto.pyi
 %%DATADIR%%/helpers/typeshed/third_party/3/lxml/__init__.pyi
 %%DATADIR%%/helpers/typeshed/third_party/3/lxml/etree.pyi
 %%DATADIR%%/helpers/typeshed/third_party/3/lxml/objectify.pyi
@@ -2035,6 +2219,31 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/helpers/virtualenv-1.11.6.tar.gz
 %%DATADIR%%/helpers/virtualenv-1.7.2.tar.gz
 %%DATADIR%%/helpers/virtualenv-15.1.0.tar.gz
+%%DATADIR%%/index/Python/id-index.input
+%%DATADIR%%/index/Python/id-index.input.keystream
+%%DATADIR%%/index/Python/id-index.input.keystream.len
+%%DATADIR%%/index/Python/id-index.input.len
+%%DATADIR%%/index/Python/id-index.input.values
+%%DATADIR%%/index/Python/id-index.input.values.at
+%%DATADIR%%/index/Python/id-index.input.values.s
+%%DATADIR%%/index/Python/id-index.input_i
+%%DATADIR%%/index/Python/id-index.input_i.len
+%%DATADIR%%/index/Python/sdk-stubs.input
+%%DATADIR%%/index/Python/sdk-stubs.input.keystream
+%%DATADIR%%/index/Python/sdk-stubs.input.keystream.len
+%%DATADIR%%/index/Python/sdk-stubs.input.len
+%%DATADIR%%/index/Python/sdk-stubs.input.values
+%%DATADIR%%/index/Python/sdk-stubs.input.values.at
+%%DATADIR%%/index/Python/sdk-stubs.input.values.s
+%%DATADIR%%/index/Python/sdk-stubs.input_i
+%%DATADIR%%/index/Python/sdk-stubs.input_i.len
+%%DATADIR%%/index/Python/sdk-stubs.names
+%%DATADIR%%/index/Python/sdk-stubs.names.keystream
+%%DATADIR%%/index/Python/sdk-stubs.names.keystream.len
+%%DATADIR%%/index/Python/sdk-stubs.names.len
+%%DATADIR%%/index/Python/sdk-stubs.names_i
+%%DATADIR%%/index/Python/sdk-stubs.names_i.len
+%%DATADIR%%/index/Python/sdk-stubs.version
 %%DATADIR%%/lib/annotations.jar
 %%DATADIR%%/lib/asm-all.jar
 %%DATADIR%%/lib/automaton.jar
@@ -2048,13 +2257,15 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/lib/common-io-3.2.1.jar
 %%DATADIR%%/lib/common-lang-3.2.1.jar
 %%DATADIR%%/lib/commons-codec-1.9.jar
+%%DATADIR%%/lib/commons-compress-1.10.jar
 %%DATADIR%%/lib/commons-httpclient-3.1-patched.jar
+%%DATADIR%%/lib/commons-imaging-1.0-RC.jar
 %%DATADIR%%/lib/commons-logging-1.2.jar
 %%DATADIR%%/lib/extensions.jar
 %%DATADIR%%/lib/fluent-hc-4.5.2.jar
 %%DATADIR%%/lib/forms_rt.jar
-%%DATADIR%%/lib/groovy-all-2.4.6.jar
+%%DATADIR%%/lib/groovy-all-2.4.12.jar
-%%DATADIR%%/lib/gson-2.5.jar
+%%DATADIR%%/lib/gson-2.8.2.jar
 %%DATADIR%%/lib/guava-21.0.jar
 %%DATADIR%%/lib/httpclient-4.5.2.jar
 %%DATADIR%%/lib/httpcore-4.4.5.jar
@@ -2083,6 +2294,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/lib/jsch.agentproxy.sshagent.jar
 %%DATADIR%%/lib/jsch.agentproxy.usocket-jna.jar
 %%DATADIR%%/lib/jsch.agentproxy.usocket-nc.jar
+%%DATADIR%%/lib/jsoup-1.10.3.jar
 %%DATADIR%%/lib/jsr173_1.0_api.jar
 %%DATADIR%%/lib/kotlin-reflect.jar
 %%DATADIR%%/lib/kotlin-runtime.jar
@@ -2093,7 +2305,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/lib/miglayout-core-5.0.jar
 %%DATADIR%%/lib/miglayout-swing-5.0.jar
 %%DATADIR%%/lib/nanoxml-2.2.3.jar
-%%DATADIR%%/lib/netty-all-4.1.10.Final.jar
+%%DATADIR%%/lib/netty-all-4.1.13.Final.jar
 %%DATADIR%%/lib/openapi.jar
 %%DATADIR%%/lib/oromatcher.jar
 %%DATADIR%%/lib/picocontainer.jar
@@ -2106,7 +2318,6 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/lib/resources.jar
 %%DATADIR%%/lib/resources_en.jar
 %%DATADIR%%/lib/rngom-20051226-patched.jar
-%%DATADIR%%/lib/sanselan-0.98-snapshot.jar
 %%DATADIR%%/lib/serviceMessages.jar
 %%DATADIR%%/lib/slf4j-api-1.7.10.jar
 %%DATADIR%%/lib/slf4j-log4j12-1.7.10.jar
@@ -2114,7 +2325,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/lib/sqlite-jdbc-3.16.1.jar
 %%DATADIR%%/lib/src/pycharm-openapi-src.zip
 %%DATADIR%%/lib/src/pycharm-pydev-src.zip
-%%DATADIR%%/lib/streamex-0.6.2.jar
+%%DATADIR%%/lib/streamex-0.6.5.jar
 %%DATADIR%%/lib/swingx-core-1.6.2.jar
 %%DATADIR%%/lib/trang-core.jar
 %%DATADIR%%/lib/trilead-ssh2.jar
@@ -2124,7 +2335,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/lib/winp-1.23.jar
 %%DATADIR%%/lib/xbean.jar
 %%DATADIR%%/lib/xercesImpl.jar
-%%DATADIR%%/lib/xml-apis.jar
+%%DATADIR%%/lib/xml-apis-ext.jar
 %%DATADIR%%/lib/xmlgraphics-commons-1.5.jar
 %%DATADIR%%/lib/xmlrpc-2.0.jar
 %%DATADIR%%/lib/xpp3-1.1.4-min.jar
@@ -2135,6 +2346,7 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/license/ant_license.txt
 %%DATADIR%%/license/asm_license.txt
 %%DATADIR%%/license/eclipse_license.txt
+%%DATADIR%%/license/eclipse_license2.txt
 %%DATADIR%%/license/growl.license
 %%DATADIR%%/license/gson_license.txt
 %%DATADIR%%/license/imgscalr_license.txt
@@ -2153,7 +2365,6 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/license/nanoxml_license.txt
 %%DATADIR%%/license/oromatcher_license.txt
 %%DATADIR%%/license/picoContainer_license.txt
-%%DATADIR%%/license/sanselan_license.txt
 %%DATADIR%%/license/saxon-conditions.html
 %%DATADIR%%/license/sqljet-license.txt
 %%DATADIR%%/license/svnkit-license.txt
@@ -2184,6 +2395,8 @@ share/applications/pycharm-ce.desktop
 %%DATADIR%%/plugins/ipnb/lib/ipnb.jar
 %%DATADIR%%/plugins/ipnb/lib/java_websocket.jar
 %%DATADIR%%/plugins/ipnb/lib/resources_en.jar
+%%DATADIR%%/plugins/properties/lib/properties.jar
+%%DATADIR%%/plugins/properties/lib/resources_en.jar
 %%DATADIR%%/plugins/python-rest/lib/python-rest.jar
 %%DATADIR%%/plugins/python-terminal/lib/python-terminal.jar
 %%DATADIR%%/plugins/rest/lib/resources_en.jar

dns/powerdns-recursor/Makefile

@@ -60,4 +60,10 @@ SETUID_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-setuid
 
 SUB_FILES=	pkg-message
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 1003506
+IGNORE=		no _cxa_thread_atexit() support in FreeBSD libc < 10.4
+.endif
+
+.include <bsd.port.post.mk>

games/dhewm3/Makefile

@@ -15,9 +15,6 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libogg.so:audio/libogg \
 		libvorbis.so:audio/libvorbis
 
-BROKEN_armv6=		dumps core: Assertion failed: (!NodePtr->isKnownSentinel()), function operator*, file ilist_iterator.h
-BROKEN_armv7=		dumps core: Assertion failed: (!NodePtr->isKnownSentinel()), function operator*, file ilist_iterator.h
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	dhewm
 

games/lightyears/Makefile

@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 RUN_DEPENDS=	${PYGAME}
 
-USES=		python:2 shebangfix tar:bz2
+USES=		python:2.7 shebangfix tar:bz2
 SHEBANG_FILES=	${PORTNAME}
 
 NO_ARCH=	yes

graphics/darknock/Makefile

@@ -20,22 +20,18 @@ USE_QT4=	gui linguisttools_build moc_build rcc_build uic_build
 PORTDOCS=	changelog
 PLIST_FILES=	bin/darknock share/pixmaps/darknock.png
 
-DESKTOP_ENTRIES=	"${PORTNAME}" \
+DESKTOP_ENTRIES="${PORTNAME}" \
-			"${COMMENT}" \
+		"" \
-			"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
+		"${PREFIX}/share/pixmaps/${PORTNAME}.png" \
-			"${PORTNAME}" \
+		"${PORTNAME}" \
-			"Graphics;Qt;" \
+		"Graphics;Qt;" \
-			"true"
+		"true"
 
 OPTIONS_DEFINE=	DOCS NLS
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MNLS}
 .for lang in fr it pl ro sv tr
-PLIST_FILES+=	%%DATADIR%%/locale/darknock_${lang}.qm
+NLS_PLIST_FILES+=	%%DATADIR%%/locale/darknock_${lang}.qm
 .endfor
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/share/darknock|${DATADIR}|g' \
@@ -47,13 +43,13 @@ pre-configure:
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/images/${PORTNAME}.png ${STAGEDIR}${PREFIX}/share/pixmaps
-.if ${PORT_OPTIONS:MNLS}
+
+do-install-NLS-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/locale
 	${INSTALL_DATA} ${WRKSRC}/locale/*.qm ${STAGEDIR}${DATADIR}/locale
-.endif
+
-.if ${PORT_OPTIONS:MDOCS}
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/changelog ${STAGEDIR}${DOCSDIR}
-.endif
 
 .include <bsd.port.mk>

graphics/geeqie/files/patch-configure.in

@@ -0,0 +1,15 @@
+--- configure.in.orig	2017-11-27 13:02:57 UTC
++++ configure.in
+@@ -277,7 +277,11 @@ for dir in `echo "$withval" | tr : ' '`;
+ HAVE_LIRC=no
+ if test "x${lirc}" != "xno" ; then
+   AC_CHECK_HEADER(lirc/lirc_client.h,
+-    [AC_CHECK_LIB(lirc_client,lirc_init,[HAVE_LIRC=yes;LIBS=-llirc_client $LIBS;AC_DEFINE([HAVE_LIRC],[],[Define to 1 if LIRC must be used])],,)],)
++    [AC_CHECK_LIB(lirc_client,lirc_init,[
++      HAVE_LIRC=yes
++      LIBS="-llirc_client $LIBS"
++      AC_DEFINE([HAVE_LIRC],[],[Define to 1 if LIRC must be used])
++    ],,)],)
+ fi
+ AM_CONDITIONAL(HAVE_LIRC, [test "x$HAVE_LIRC" = xyes])
+ 

java/intellij-ultimate/Makefile

@@ -4,11 +4,11 @@
 # Based on the java/intellij port
 
 PORTNAME=	intellij-ultimate
-PORTVERSION=	2016.2.5
+PORTVERSION=	2017.2.5
 CATEGORIES=	java devel
 MASTER_SITES=	https://download.jetbrains.com/idea/ \
 		http://download.jetbrains.com/idea/
-DISTNAME=	ideaIU-${PORTVERSION}
+DISTNAME=	ideaIU-${PORTVERSION}-no-jdk
 
 MAINTAINER=	andoriyu@gmail.com
 COMMENT=	IntelliJ IDEA Ultimate Edition
@@ -21,40 +21,47 @@ LICENSE_PERMS=	dist-mirror pkg-mirror auto-accept
 RUN_DEPENDS=	intellij-fsnotifier>0:java/intellij-fsnotifier \
 		intellij-pty4j>0:java/intellij-pty4j
 
+USES=	python:run shebangfix
 USE_JAVA=	yes
 JAVA_VERSION=	1.8+
+SHEBANG_FILES=	bin/printenv.py bin/restart.py
 
 NO_ARCH=	yes
 NO_ARCH_IGNORE=	libnative_auth.so libnative_console.so libnative_filesystem.so \
-		libnative_misc.so libnative_synchronization.so
+		libnative_misc.so libnative_synchronization.so \
+		native-platform-freebsd-amd64-libcpp-0.14.jar native-platform-freebsd-amd64-libstdcpp-0.14.jar \
+		native-platform-freebsd-i386-libcpp-0.14.jar native-platform-freebsd-i386-libstdcpp-0.14.jar
 NO_BUILD=	yes
 USE_LDCONFIG=	${IDEA_HOME}/plugins/tfsIntegration/lib/native/freebsd/x86_64/
 USE_LDCONFIG32=	${IDEA_HOME}/plugins/tfsIntegration/lib/native/freebsd/x86/
 
-WRKDIST=	${WRKDIR}/idea-IU-162.2228.15
+WRKSRC=	${WRKDIR}/idea-IU-172.4343.14
 
 .include "${.CURDIR}/../intellij/common.mk"
 
 PLIST_SUB+=	IDEA_HOME=${IDEA_HOME}
 SUB_FILES+=	idea idea.desktop pkg-message
 SUB_LIST+=	IDEA_HOME=${IDEA_HOME}
-CONFLICTS=	intellij-2016*
+CONFLICTS=	intellij-20*
 do-install:
 	${MKDIR} ${STAGEDIR}${IDEA_HOME}
-	@${TAR} -czf - -C ${WRKDIST} . | ${TAR} xzf - -C ${STAGEDIR}${IDEA_HOME}
+	@${TAR} -czf - -C ${WRKSRC} . | ${TAR} xzf - -C ${STAGEDIR}${IDEA_HOME}
 # Linux/Windows/OS X only so remove them
 	@${RM} ${STAGEDIR}${IDEA_HOME}/bin/fsnotifier \
 		${STAGEDIR}${IDEA_HOME}/bin/fsnotifier-arm \
 		${STAGEDIR}${IDEA_HOME}/bin/fsnotifier64 \
 		${STAGEDIR}${IDEA_HOME}/bin/libbreakgen.so \
 		${STAGEDIR}${IDEA_HOME}/bin/libbreakgen64.so \
-		${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-linux-amd64-0.10.jar \
-		${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-linux-i386-0.10.jar \
-		${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-osx-amd64-0.10.jar \
-		${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-osx-i386-0.10.jar \
-		${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-windows-amd64-0.10.jar \
-		${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-windows-i386-0.10.jar \
 		${STAGEDIR}${IDEA_HOME}/bin/libyjpagent-linux.so \
+		${STAGEDIR}${IDEA_HOME}/plugins/android/lib/gluegen-rt-natives-linux-*.jar \
+		${STAGEDIR}${IDEA_HOME}/plugins/android/lib/gluegen-rt-natives-macosx-universal.jar \
+		${STAGEDIR}${IDEA_HOME}/plugins/android/lib/gluegen-rt-natives-windows-*.jar \
+		${STAGEDIR}${IDEA_HOME}/plugins/android/lib/jogl-all-natives-linux-*.jar \
+		${STAGEDIR}${IDEA_HOME}/plugins/android/lib/jogl-all-natives-macosx-universal.jar \
+		${STAGEDIR}${IDEA_HOME}/plugins/android/lib/jogl-all-natives-windows-*.jar \
+		${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-linux-*.jar \
+		${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-osx-*.jar \
+		${STAGEDIR}${IDEA_HOME}/plugins/gradle/lib/native-platform-windows-*.jar \
 		${STAGEDIR}${IDEA_HOME}/bin/libyjpagent-linux64.so
 	@${RM} -r ${STAGEDIR}${IDEA_HOME}/plugins/tfsIntegration/lib/native/hpux/ \
 		${STAGEDIR}${IDEA_HOME}/plugins/tfsIntegration/lib/native/linux/ \
@@ -62,8 +69,6 @@ do-install:
 		${STAGEDIR}${IDEA_HOME}/plugins/tfsIntegration/lib/native/solaris/ \
 		${STAGEDIR}${IDEA_HOME}/plugins/tfsIntegration/lib/native/win32/ \
 		${STAGEDIR}${IDEA_HOME}/plugins/tfsIntegration/lib/native/aix/
-#	${STRIP_CMD} ${STAGEDIR}${IDEA_HOME}/plugins/tfsIntegration/lib/native/freebsd/x86/*.so
-#	${STRIP_CMD} ${STAGEDIR}${IDEA_HOME}/plugins/tfsIntegration/lib/native/freebsd/x86_64/*.so
 # Remove the bundled native Pty4J support libraries, they are replaced
 # by java/intellij-pty4j
 	@${RM} -r ${STAGEDIR}${IDEA_HOME}/lib/libpty
@@ -72,12 +77,12 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/idea ${STAGEDIR}${PREFIX}/bin/idea
 	${INSTALL_MAN} ${FILESDIR}/idea.1 ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_DATA} ${WRKDIR}/idea.desktop ${STAGEDIR}${PREFIX}/share/applications/
-	cd ${WRKDIST}/lib && ${JAVA_HOME}/bin/jar xf icons.jar
+	cd ${WRKSRC}/lib && ${JAVA_HOME}/bin/jar xf icons.jar
-	${INSTALL_DATA} ${WRKDIST}/lib/icon.png ${STAGEDIR}${IDEA_HOME}/idea.png
+	${INSTALL_DATA} ${WRKSRC}/lib/icon.png ${STAGEDIR}${IDEA_HOME}/idea.png
 # TODO: Remove and enable fsnotifier when devel/libinotify is fixed
 # Disable filewatcher warning message on IDEA startup
 	${ECHO} "idea.filewatcher.disabled=true" >> ${STAGEDIR}${IDEA_HOME}/bin/idea.properties
 # Use fsnotifier replacement provided by java/intellij-fsnotifier
-#	${ECHO} "idea.filewatcher.executable.path=${IDEA_HOME}/bin/fsnotifier" >> ${STAGEDIR}${IDEA_HOME}/bin/idea.properties
+	${ECHO} "idea.filewatcher.executable.path=${IDEA_HOME}/bin/fsnotifier" >> ${STAGEDIR}${IDEA_HOME}/bin/idea.properties
 
 .include <bsd.port.mk>

java/intellij-ultimate/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1476812452
+TIMESTAMP = 1509834217
-SHA256 (ideaIU-2016.2.5.tar.gz) = 30a4ddf82b8393fc22803c9335d6cb00087116dd09915e44f40f0433b81b1b3d
+SHA256 (ideaIU-2017.2.5-no-jdk.tar.gz) = 6649ec545093be46ebf2bf2d76e4b67597b2c92ea9ad80fe354db130994de45e
-SIZE (ideaIU-2016.2.5.tar.gz) = 509791849
+SIZE (ideaIU-2017.2.5-no-jdk.tar.gz) = 552916197

java/intellij/Makefile

@@ -5,7 +5,7 @@
 # Vadim Zhukov <zhuk@openbsd.org>
 
 PORTNAME=	intellij
-PORTVERSION=	2017.3
+PORTVERSION=	2017.3.1
 CATEGORIES=	java devel
 MASTER_SITES=	https://download.jetbrains.com/idea/ \
 		http://download.jetbrains.com/idea/
@@ -28,7 +28,7 @@ NO_ARCH=	yes
 NO_BUILD=	yes
 INSTALL_TARGET=	install-strip
 
-WRKSRC=		${WRKDIR}/idea-IC-173.3727.127
+WRKSRC=		${WRKDIR}/idea-IC-173.3942.27
 
 .include "common.mk"
 

java/intellij/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1512077415
+TIMESTAMP = 1513246744
-SHA256 (ideaIC-2017.3-no-jdk.tar.gz) = b1de839a03cb875f6b49bcd361c107c3c2659285cf15b9824c106f3b93d23928
+SHA256 (ideaIC-2017.3.1-no-jdk.tar.gz) = 961a880a720f7c3d99bd8eea3450a20b76bd275a8a68827198c78cbcff7e9e84
-SIZE (ideaIC-2017.3-no-jdk.tar.gz) = 383087035
+SIZE (ideaIC-2017.3.1-no-jdk.tar.gz) = 383147065

lang/erlang-runtime20/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	erlang
-PORTVERSION=	20.2
+PORTVERSION=	20.2.1
 CATEGORIES=	lang parallel java
 MASTER_SITES=	http://www.erlang.org/download/:erlangorg		\
 		http://erlang.stacken.kth.se/download/:erlangorg	\
@@ -19,7 +19,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://olgeni.olgeni.com/~olgeni/distfiles/ \
 		LOCAL/olgeni
-PATCHFILES=
+PATCHFILES=	patch-otp-20.2.1
 
 MAINTAINER=	olgeni@FreeBSD.org
 COMMENT=	Functional programming language from Ericsson
@@ -70,7 +70,7 @@ USE_PERL5=	build
 GNU_CONFIGURE=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-APP_UPGRADE=
+APP_UPGRADE=	lib/ssh 4.6.3 4.6.4
 
 .include <bsd.port.options.mk>
 

lang/erlang-runtime20/distinfo

@@ -1,9 +1,11 @@
-TIMESTAMP = 1513163813
+TIMESTAMP = 1513348145
 SHA256 (erlang/otp_src_20.2.tar.gz) = 24d9895e84b800bf0145d6b3042c2f2087eb31780a4a45565206844b41eb8f23
 SIZE (erlang/otp_src_20.2.tar.gz) = 87136848
 SHA256 (erlang/otp_doc_man_20.2.tar.gz) = 950e088f9e47fc10a98e3f67d6420a990650836c648686a2f5dafe331747cbdf
 SIZE (erlang/otp_doc_man_20.2.tar.gz) = 1337652
-SHA256 (erlang/preloaded-20.2.tar.gz) = 2415b8f15bc3b58b4ecc56fd8446a08ef9e91d5b6ce992be86b6c988fab90176
+SHA256 (erlang/preloaded-20.2.1.tar.gz) = 62d30a31ea8e61586c93d4229b7836bce977807adc431e4298c05f37e1ae0667
-SIZE (erlang/preloaded-20.2.tar.gz) = 335076
+SIZE (erlang/preloaded-20.2.1.tar.gz) = 335076
 SHA256 (erlang/otp_doc_html_20.2.tar.gz) = 7f5e7d4cd0c58e15d7d29231931c2a710f7f5fdfcb0ff8edb8142969520c4256
 SIZE (erlang/otp_doc_html_20.2.tar.gz) = 33570484
+SHA256 (erlang/patch-otp-20.2.1) = 9623138f41f101ca8ae214d253bf8800c1beb837c6416bd5492b45d8a493b556
+SIZE (erlang/patch-otp-20.2.1) = 7734

lang/gcc6-devel/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	6.4.1.s20171206
+PORTVERSION=	6.4.1.s20171213
 CATEGORIES=	lang java
 MASTER_SITES=	GCC/snapshots/${DIST_VERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel

lang/gcc6-devel/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1512649924
+TIMESTAMP = 1513283168
-SHA256 (gcc-6-20171206.tar.xz) = d0a766414329660b4a46277deaa60ff3a467c808d1f644c05ecc7089bc7f003f
+SHA256 (gcc-6-20171213.tar.xz) = 490cb40e2826acd7233fca3b51d8ed5949205fb3f8744017c1a633585c03ed15
-SIZE (gcc-6-20171206.tar.xz) = 72612796
+SIZE (gcc-6-20171213.tar.xz) = 72606832

lang/ocaml/Makefile

@@ -18,7 +18,7 @@ LICENSE_NAME_QPL10=	Q Public License, Version 1.0
 LICENSE_FILE_QPL10=	${WRKSRC}/LICENSE
 LICENSE_PERMS_QPL10=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-BROKEN_aarch64=		Does not build: No rule to make target aarch64.o, needed by libasmrun.a
+BROKEN_aarch64=		Does not build: sh: as: not found
 BROKEN_armv7=		Does not build: hasgot.c: undefined reference to `tgetent'
 BROKEN_powerpc64=	Does not build: error: too few arguments to function gethostbyname_r
 BROKEN_sparc64=	ocamlc.opt seg-faults, please try to fix
@@ -99,10 +99,7 @@ CONFIGURE_ARGS+=-no-graph
 .include <bsd.port.pre.mk>
 .include "${FILESDIR}/manfiles"
 
-OCAML_ARCH=	${ARCH:S/x86_64/amd64/:S/powerpc/power/:C/armv.*/arm/}
+.if defined(NO_PROFILE) || ${ARCH:Mpowerpc} || ${ARCH:Mamd64}
-
-.if defined(NO_PROFILE) || ${OCAML_ARCH:Mpower} || ${OCAML_ARCH:Mamd64}
-
 PLIST_SUB+=	PROF="@comment "
 .else
 PLIST_SUB+=	PROF=""
@@ -119,6 +116,7 @@ post-extract:
 .endif
 
 post-patch:
+# Don't hardcode GCC for depend target
 	@${REINPLACE_CMD} \
 		-e '\|MKLIB=|s|ar rc|${AR} rc|' \
 		-e '\|RANLIB|s|ranlib|${RANLIB}|' \
@@ -127,7 +125,11 @@ post-patch:
 		-e '\|mksharedlib=|s|$$bytecc|& $$bytecclinkopts|' \
 		-e 's|-lbfd -ldl|-lbfd $$dllib|' \
 		${WRKSRC}/configure
-# don't hardcode gcc for depend target
+	@${REINPLACE_CMD} -e 's,$$(ARCH),$$(SYSTEM_ARCH),' \
+		${WRKSRC}/Makefile ${WRKSRC}/asmrun/Makefile \
+		${WRKSRC}/otherlibs/systhreads/Makefile \
+		${WRKSRC}/testsuite/makefiles/Makefile.common \
+		${WRKSRC}/testsuite/tests/asmcomp/Makefile
 
 post-configure:
 # CFLAGS safeness
@@ -141,7 +143,6 @@ post-configure:
 # user's umask(1)
 	@${FIND} ${WRKDIR} -type f -name Makefile -print0 | \
 		${XARGS} -0 -n 5 -x ${REINPLACE_CMD} -E \
-		-e 's,\$$\(ARCH\),${OCAML_ARCH},g'	\
 		-e 's,^(${PATTERN}+.*INSTALLDIR),\1\$${BSD_INSTALL_DATA} \4,' \
 		-e 's,^(${PATTERN}+.*BINDIR),\1\$${BSD_INSTALL_PROGRAM} \4,' \
 		-e 's,^(${PATTERN}+.*LIBDIR),\1\$${BSD_INSTALL_DATA} \4,' \

lang/ocaml/files/patch-configure

@@ -80,7 +80,15 @@
      i[3456]86-*-freebsd*)         natdynlink=true;;
      x86_64-*-freebsd*)            natdynlink=true;;
      i[3456]86-*-openbsd*)         natdynlink=true;;
-@@ -844,6 +846,7 @@ case "$target" in
+@@ -804,6 +806,7 @@ if test $with_sharedlibs = "yes"; then
+     arm*-*-linux*)                natdynlink=true;;
+     arm*-*-freebsd*)              natdynlink=true;;
+     aarch64-*-linux*)             natdynlink=true;;
++    aarch64-*-freebsd*)           natdynlink=true;;
+   esac
+ fi
+ 
+@@ -844,6 +847,7 @@ case "$target" in
    i[3456]86-*-gnu*)             arch=i386; system=gnu;;
    i[3456]86-*-mingw*)           arch=i386; system=mingw;;
    powerpc*-*-linux*)            arch=power; model=ppc; system=elf;;
@@ -88,7 +96,7 @@
    powerpc-*-netbsd*)            arch=power; model=ppc; system=elf;;
    powerpc-*-openbsd*)           arch=power; model=ppc; system=bsd_elf;;
    powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
-@@ -862,6 +865,7 @@ case "$target" in
+@@ -862,12 +866,14 @@ case "$target" in
    zaurus*-*-openbsd*)           arch=arm; system=bsd;;
    x86_64-*-linux*)              arch=amd64; system=linux;;
    x86_64-*-gnu*)                arch=amd64; system=gnu;;
@@ -96,7 +104,14 @@
    x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
    x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
    x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
-@@ -889,7 +893,7 @@ else
+   x86_64-*-darwin*)             arch=amd64; system=macosx;;
+   x86_64-*-mingw*)              arch=amd64; system=mingw;;
+   aarch64-*-linux*)             arch=arm64; system=linux;;
++  aarch64-*-freebsd*)           arch=arm64; system=freebsd;;
+   x86_64-*-cygwin*)             arch=amd64; system=cygwin;;
+ esac
+ 
+@@ -889,7 +895,7 @@ else
  fi
  
  nativecccompopts=''
@@ -105,7 +120,7 @@
  # FIXME the naming of nativecclinkopts is broken: these are options for
  # ld (for shared libs), not for cc
  nativeccrpath="$byteccrpath"
-@@ -932,6 +936,8 @@ case "$arch,$system" in
+@@ -932,6 +938,8 @@ case "$arch,$system" in
                    esac;;
    arm,freebsd)    as="${TOOLPREF}cc -c"
                    aspp="${TOOLPREF}cc -c";;
@@ -114,7 +129,7 @@
    *,freebsd)      as="${TOOLPREF}as"
                    aspp="${TOOLPREF}cc -c";;
    amd64,*|arm,*|arm64,*|i386,*|power,bsd*|sparc,*)
-@@ -955,9 +961,11 @@ case "$arch,$system" in
+@@ -955,9 +963,11 @@ case "$arch,$system" in
      case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
    amd64,linux) profiling='prof';;
    amd64,openbsd) profiling='prof';;
@@ -126,7 +141,7 @@
    arm,linux*) profiling='prof';;
    power,elf) profiling='prof';;
    power,bsd*) profiling='prof';;
-@@ -1415,6 +1423,8 @@ if test "$pthread_wanted" = "yes"; then
+@@ -1415,6 +1425,8 @@ if test "$pthread_wanted" = "yes"; then
    case "$target" in
      *-*-solaris*)  pthread_link="-lpthread -lposix4"
                     pthread_caml_link="-cclib -lpthread -cclib -lposix4";;
@@ -135,7 +150,7 @@
      *-*-freebsd*)  pthread_link="-pthread"
                     pthread_caml_link="-cclib -pthread";;
      *-*-openbsd*)  pthread_link="-pthread"
-@@ -1431,7 +1441,7 @@ if test "$pthread_wanted" = "yes"; then
+@@ -1431,7 +1443,7 @@ if test "$pthread_wanted" = "yes"; then
      bytecccompopts="$bytecccompopts -D_REENTRANT"
      nativecccompopts="$nativecccompopts -D_REENTRANT"
      case "$target" in
@@ -144,7 +159,7 @@
            bytecccompopts="$bytecccompopts -D_THREAD_SAFE"
            nativecccompopts="$nativecccompopts -D_THREAD_SAFE";;
        *-*-openbsd*)
-@@ -1601,6 +1611,7 @@ if test "$x11_include" = "not found"; th
+@@ -1601,6 +1613,7 @@ if test "$x11_include" = "not found"; then
        else
          x11_libs="-L$dir"
          case "$target" in
@@ -152,7 +167,7 @@
            *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
            *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
            *) x11_link="-L$dir -lX11";;
-@@ -1644,10 +1655,10 @@ echo "X11_LINK=$x11_link" >> Makefile
+@@ -1644,10 +1657,10 @@ echo "X11_LINK=$x11_link" >> Makefile
  # Look for BFD library
  
  if sh ./hasgot -DPACKAGE=ocaml -i bfd.h && \
@@ -165,7 +180,7 @@
  else
    wrn "BFD library not found, 'objinfo' will be unable to display info on .cmxs files."
    echo "LIBBFD_LINK=" >> Makefile
-@@ -1686,12 +1697,6 @@ if $no_naked_pointers; then
+@@ -1686,12 +1699,6 @@ if $no_naked_pointers; then
    echo "#define NO_NAKED_POINTERS" >> m.h
  fi
  
@@ -178,3 +193,12 @@
  # Final twiddling of compiler options to work around known bugs
  
  nativeccprofopts="$nativecccompopts"
+@@ -1723,7 +1730,7 @@ SYSLIB=-l\$(1)
+ MKLIB=${TOOLPREF}ar rc \$(1) \$(2); ${TOOLPREF}ranlib \$(1)
+ #ml let mklib out files opts = Printf.sprintf "${TOOLPREF}ar rc %s %s %s; ${TOOLPREF}ranlib %s" out opts files out;;
+ EOF
+-echo "ARCH=$arch" >> Makefile
++echo "SYSTEM_ARCH=$arch" >> Makefile
+ echo "MODEL=$model" >> Makefile
+ echo "SYSTEM=$system" >> Makefile
+ echo "NATIVECC=$nativecc" >> Makefile

lang/ruby22/Makefile

@@ -86,7 +86,7 @@ _SUF1=	_${PORTREVISION}
 .endif
 
 .if ${OPSYS} == "FreeBSD"
-.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032) && (${ARCH} == "amd64" || ${ARCH} == "i386")
+.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032) && (${ARCH} == amd64 || ${ARCH} == i386)
 CONFIGURE_ARGS+=	--enable-dtrace
 .else
 CONFIGURE_ARGS+=	--disable-dtrace
@@ -94,15 +94,15 @@ CONFIGURE_ARGS+=	--disable-dtrace
 .endif
 
 # keep in sync with all platforms where libunwind is available
-.if (${ARCH} == "amd64" || ${ARCH} == "i386")
+.if (${ARCH} == amd64 || ${ARCH} == i386)
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 
-.if ${ARCH} == "powerpc64"
+.if ${ARCH} == powerpc64
 USE_GCC=	yes
 .endif
 
-.if ${ARCH} == "armv6" || ${ARCH} == "armv6hf"
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 CONFIGURE_ARGS+=	--with-setjmp-type=_setjmp
 CONFIGURE_ENV+=	ac_cv_func__setjmp=yes
 .endif

lang/ruby23/Makefile

@@ -90,7 +90,7 @@ _SUF2=	,${PORTEPOCH}
 .endif
 
 .if ${OPSYS} == "FreeBSD"
-.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032) && (${ARCH} == "amd64" || ${ARCH} == "i386")
+.if exists(/usr/sbin/dtrace) && (${OSVERSION} > 1100032) && (${ARCH} == amd64 || ${ARCH} == i386)
 CONFIGURE_ARGS+=--enable-dtrace
 .else
 CONFIGURE_ARGS+=--disable-dtrace
@@ -98,15 +98,15 @@ CONFIGURE_ARGS+=--disable-dtrace
 .endif
 
 # keep in sync with all platforms where libunwind is available
-.if (${ARCH} == "amd64" || ${ARCH} == "i386")
+.if (${ARCH} == amd64 || ${ARCH} == i386)
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 
-.if ${ARCH} == "powerpc64"
+.if ${ARCH} == powerpc64
 USE_GCC=	yes
 .endif
 
-.if ${ARCH} == "armv6" || ${ARCH} == "armv6hf"
+.if ${ARCH} == armv6 || ${ARCH} == armv7
 CONFIGURE_ARGS+=--with-setjmp-type=_setjmp
 CONFIGURE_ENV+=	ac_cv_func__setjmp=yes
 .endif

math/sc-im/Makefile

@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	sc-im
-PORTVERSION=	0.6.0
+PORTVERSION=	0.7.0
-PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	math
 
@@ -15,7 +14,7 @@ LIB_DEPENDS=	libxlsreader.so:math/libxls \
 		libzip.so:archivers/libzip \
 		libxlsxwriter.so:math/libxlsxwriter
 
-USES=		gmake pkgconfig lua:51
+USES=		gmake pkgconfig lua:51 ncurses
 USE_GITHUB=	yes
 GH_ACCOUNT=	andmarti1424
 USE_GNOME=	libxml2
@@ -26,10 +25,6 @@ LIBS+=		-lxlsreader -lxlsxwriter
 MAKE_ENV+=	LDLIBS="${LIBS}"
 MAKE_ARGS+=	CC="${CC}" prefix="${PREFIX}" MANDIR="${MANPREFIX}/man/man1"
 
-PLIST_FILES=	bin/scim \
-		man/man1/scim.1.gz \
-		share/scim/scim_help
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/scim
 

math/sc-im/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1492677830
+TIMESTAMP = 1513334880
-SHA256 (andmarti1424-sc-im-v0.6.0_GH0.tar.gz) = 5da644d380ab3752de283b83cce18c3ba12b068d0762c44193c34367a0dcbc38
+SHA256 (andmarti1424-sc-im-v0.7.0_GH0.tar.gz) = 87225918cb6f52bbc068ee6b12eaf176c7c55ba9739b29ca08cb9b6699141cad
-SIZE (andmarti1424-sc-im-v0.6.0_GH0.tar.gz) = 903846
+SIZE (andmarti1424-sc-im-v0.7.0_GH0.tar.gz) = 1109887

math/sc-im/files/patch-Makefile

@@ -1,35 +0,0 @@
---- Makefile.orig	2017-04-20 00:14:03 UTC
-+++ Makefile
-@@ -69,12 +69,10 @@ LDLIBS += -lxlsxwriter
- endif
- 
- # NOTE: lua support
--ifneq ($(shell pkg-config --exists lua51 || echo 'no'),no)
--CFLAGS += -DXLUA $(shell pkg-config --cflags lua51)
--LDLIBS += $(shell pkg-config --libs lua51) -Wl,--export-dynamic
-+ifneq ($(shell pkg-config --exists lua-5.1 || echo 'no'),no)
-+CFLAGS += -DXLUA $(shell pkg-config --cflags lua-5.1)
-+LDLIBS += $(shell pkg-config --libs lua-5.1) -Wl,--export-dynamic
- endif
--# dynamic linking
--LDLIBS += -ldl
- 
- 
- OBJS = $(patsubst %.c, %.o, $(wildcard *.c) $(wildcard utils/*.c)) gram.o
-@@ -88,13 +86,13 @@ install :
- 	install $(name) $(DESTDIR)$(prefix)/bin/$(name)
- 	install -d $(DESTDIR)$(HELPDIR)
- 	install doc $(DESTDIR)$(HELPDIR)/$(name)_help
--	install -d $(DESTDIR)$(prefix)/share/man/man1
--	install -m 644 sc-im.1 $(DESTDIR)$(prefix)/share/man/man1/$(name).1
-+	install -d $(DESTDIR)$(MANDIR)
-+	install -m 644 sc-im.1 $(DESTDIR)$(MANDIR)/$(name).1
- 
- uninstall :
- 	-rm $(DESTDIR)$(prefix)/bin/$(name)
- 	-rm $(DESTDIR)$(HELPDIR)/$(name)_help
--	-rm $(DESTDIR)$(prefix)/share/man/man1/$(name).1
-+	-rm $(DESTDIR)$(prefix)$(MANDIR)/$(name).1
- 
- $(name) : $(OBJS)
- 	$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS)

math/sc-im/pkg-plist

@@ -0,0 +1,7 @@
+bin/scim
+man/man1/scim.1.gz
+share/scim/plot_bar
+share/scim/plot_line
+share/scim/plot_pie
+share/scim/plot_scatter
+share/scim/scim_help

net-im/libpurple/Makefile

@@ -41,13 +41,15 @@ PRPL_MODULES=
 
 CPE_VENDOR=	pidgin
 
-OPTIONS_DEFINE=	BONJOUR DBUS GNUTLS NSS SASL GSTREAMER VV IDN PERL TCLTK
+OPTIONS_DEFINE=	DBUS GNUTLS NSS SASL GSTREAMER VV IDN PERL TCLTK
 OPTIONS_GROUP=		PROTOCOLS
-OPTIONS_GROUP_PROTOCOLS=GG SAMETIME SILC IRC JABBER \
+OPTIONS_RADIO=	TLS
+OPTIONS_RADIO_TLS=	NSS GNUTLS
+OPTIONS_GROUP_PROTOCOLS=BONJOUR GG SAMETIME SILC IRC JABBER \
 			NOVELL OSCAR QQ SIMPLE ZEPHYR
 OPTIONS_DEFAULT=	BONJOUR DBUS NSS GSTREAMER VV IDN GG IRC JABBER \
 			NOVELL OSCAR QQ SIMPLE ZEPHYR
-BONJOUR_DESC=	mDNS support
+BONJOUR_DESC=	mDNS support and Bonjour protocol
 GNUTLS_DESC=	Use GNUTLS for encryption support
 NSS_DESC=	Use Mozilla NSS for encryption support
 SASL_DESC=	Cyrus SASL support (for jabberd)

sysutils/acpica-tools/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	acpica
-PORTVERSION=	20171110
+PORTVERSION=	20171214
 CATEGORIES=	sysutils devel
 MASTER_SITES=	https://acpica.org/sites/acpica/files/ \
 		LOCAL/jkim

sysutils/acpica-tools/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1510335467
+TIMESTAMP = 1513288988
-SHA256 (acpica-unix-20171110.tar.gz) = 56ac1f870db698fc46f9be0698abe6f4b5bf189bfb12cf982302c0a8f920856a
+SHA256 (acpica-unix-20171214.tar.gz) = 8a0c06c2d0528ed192608e60faebbb287c1e78f840dc746b784190aa901ef755
-SIZE (acpica-unix-20171110.tar.gz) = 1767952
+SIZE (acpica-unix-20171214.tar.gz) = 1769044

sysutils/acpica-tools/files/patch-source_compiler_aslsupport.l

@@ -1,23 +0,0 @@
---- source/compiler/aslsupport.l.orig	2017-11-10 16:05:28 UTC
-+++ source/compiler/aslsupport.l
-@@ -525,7 +525,7 @@ static void
- count (
-     int                 Type)
- {
--    int                 i;
-+    char                *p;
- 
- 
-     switch (Type)
-@@ -547,9 +547,9 @@ count (
-         break;
-     }
- 
--    for (i = 0; (yytext[i] != 0) && (yytext[i] != EOF); i++)
-+    for (p = yytext; *p != '\0'; p++)
-     {
--        AslInsertLineBuffer (yytext[i]);
-+        AslInsertLineBuffer (*p);
-         *Gbl_LineBufPtr = 0;
-     }
- }

sysutils/aptly/Makefile

@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	aptly
-PORTVERSION=	1.1.1
+PORTVERSION=	1.2.0
 DISTVERSIONPREFIX=v
 CATEGORIES=	sysutils
 

sysutils/aptly/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1503643522
+TIMESTAMP = 1513350256
-SHA256 (smira-aptly-v1.1.1_GH0.tar.gz) = 92aa5caa12d756cb7469fa5772a03d7631b73d655b7329408a4d597ee8fb0ba4
+SHA256 (smira-aptly-v1.2.0_GH0.tar.gz) = e41ee52ba530b65ff5ec8b1ef3ee9c61882d1c44857d343b9a760e8a8e4230d7
-SIZE (smira-aptly-v1.1.1_GH0.tar.gz) = 18403464
+SIZE (smira-aptly-v1.2.0_GH0.tar.gz) = 19796531

sysutils/synergy/Makefile

@@ -20,6 +20,7 @@ CPE_VENDOR=	synergy-foss
 USE_XORG=	ice xtst x11 sm xext xinerama xrandr xi
 USE_GITHUB=	yes
 GH_ACCOUNT=	symless
+GH_PROJECT=	synergy-core
 
 CFLAGS+=	-I${LOCALBASE}/include -L${LOCALBASE}/lib
 

sysutils/synergy/distinfo

@@ -1,3 +1,3 @@
-TIMESTAMP = 1503033214
+TIMESTAMP = 1511905795
-SHA256 (symless-synergy-v1.8.8-stable_GH0.tar.gz) = 85c388f93881d741981ce3c675e840a52a76883cb2cea1da306c0c453c5d7d9b
+SHA256 (symless-synergy-core-v1.8.8-stable_GH0.tar.gz) = 9ee45aabf9f77925bfab6248e713ae5d9e6bfe6bc246e4a0a6304dc6a30f5f14
-SIZE (symless-synergy-v1.8.8-stable_GH0.tar.gz) = 13498599
+SIZE (symless-synergy-core-v1.8.8-stable_GH0.tar.gz) = 13498827

www/nginx-devel/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	nginx
 PORTVERSION=	1.13.7
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	www
 MASTER_SITES=	http://nginx.org/download/
 MASTER_SITES+=	LOCAL/osa
@@ -524,7 +524,7 @@ CONFIGURE_ARGS+=--add-module=${WRKSRC_eval}
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_FANCYINDEX}
-NGINX_FANCYINDEX_VERSION=	0.4.1
+NGINX_FANCYINDEX_VERSION=	0.4.2
 GH_ACCOUNT+=	aperezdc:fancyindex
 GH_PROJECT+=	ngx-fancyindex:fancyindex
 GH_TAGNAME+=	v${NGINX_FANCYINDEX_VERSION}:fancyindex

www/nginx-devel/distinfo

@@ -1,4 +1,4 @@
-TIMESTAMP = 1512445126
+TIMESTAMP = 1513298617
 SHA256 (nginx-1.13.7.tar.gz) = beb732bc7da80948c43fd0bf94940a21a21b1c1ddfba0bd99a4b88e026220f5c
 SIZE (nginx-1.13.7.tar.gz) = 990836
 SHA256 (ngx_cache_purge-2.3.tar.gz) = 279e0d8a46d3b1521fd43b3f78bc1c08b263899142a7cc5058c1c0361a92c89c
@@ -47,8 +47,8 @@ SHA256 (arut-nginx-dav-ext-module-v0.0.3_GH0.tar.gz) = d428a0236c933779cb40ac8c9
 SIZE (arut-nginx-dav-ext-module-v0.0.3_GH0.tar.gz) = 6260
 SHA256 (openresty-nginx-eval-module-342c812_GH0.tar.gz) = c45f6438474593f0cf5229160327d20c2f2d72e9c0b5c8cf9e0ef8d5295de177
 SIZE (openresty-nginx-eval-module-342c812_GH0.tar.gz) = 14183
-SHA256 (aperezdc-ngx-fancyindex-v0.4.1_GH0.tar.gz) = 2b00d8e0ad2a67152a9cee7b7ee67990c742d501412df912baaf1eee9bb6dc71
+SHA256 (aperezdc-ngx-fancyindex-v0.4.2_GH0.tar.gz) = 8327150864ca267b735d550d3304030efbbd863fdddfe0a94e970f249a8827ee
-SIZE (aperezdc-ngx-fancyindex-v0.4.1_GH0.tar.gz) = 21130
+SIZE (aperezdc-ngx-fancyindex-v0.4.2_GH0.tar.gz) = 22047
 SHA256 (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3493b54460c59370f9f60c6e662862752f1920fc6e684f7a66bb2b3260692813
 SIZE (alibaba-nginx-http-footer-filter-1.2.2_GH0.tar.gz) = 3934
 SHA256 (leev-ngx_http_geoip2_module-2.0_GH0.tar.gz) = ebb4652c4f9a2e1ee31fddefc4c93ff78e651a4b2727d3453d026bccbd708d99

www/nginx-devel/pkg-plist

@@ -6,13 +6,13 @@
 %%ETCDIR%%/win-utf
 @sample %%ETCDIR%%/mime.types-dist %%ETCDIR%%/mime.types
 @sample %%ETCDIR%%/nginx.conf-dist %%ETCDIR%%/nginx.conf
-%%WWWDATA%%@exec mkdir -p -m 755 %D/www/nginx-dist
+%%WWWDATA%%@postexec mkdir -p -m 755 %D/www/nginx-dist
-%%WWWDATA%%@exec if [ ! -d %D/www/nginx/ ] ; then ln -fs %D/www/nginx-dist %D/www/nginx; fi
+%%WWWDATA%%@postexec if [ ! -d %D/www/nginx/ ] ; then ln -fs %D/www/nginx-dist %D/www/nginx; fi
 %%WWWDATA%%www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING
 %%WWWDATA%%www/nginx-dist/index.html
 %%WWWDATA%%www/nginx-dist/50x.html
-%%WWWDATA%%@exec chmod a-w %D/www/nginx-dist
+%%WWWDATA%%@postexec chmod a-w %D/www/nginx-dist
-%%WWWDATA%%@unexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
+%%WWWDATA%%@postunexec if [ -L %D/www/nginx ]; then rm -f %D/www/nginx; fi
 sbin/nginx
 @dir %%NGINX_TMPDIR%%
 @dir %%NGINX_LOGDIR%%

www/stagit/Makefile

@@ -21,6 +21,8 @@ MAKE_ARGS=	CC="${CC}" \
 		CFLAGS="${CFLAGS}" \
 		LDFLAGS="${LDFLAGS} -lgit2"
 
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
 post-patch:
 	@${REINPLACE_CMD} '/strlcat\.o/d; /strlcpy\.o/d' ${WRKSRC}/Makefile
 
@@ -28,7 +30,11 @@ do-install:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${PREFIX}/man/man1
 	${INSTALL_PROGRAM} ${WRKSRC}/stagit ${WRKSRC}/stagit-index ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/stagit.1 ${WRKSRC}/stagit-index.1 ${STAGEDIR}${PREFIX}/man/man1
+
+do-install-DOCS-on:
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
+
+do-install-EXAMPLES-on:
 .for f in example_create.sh example_post-receive.sh favicon.png logo.png style.css
 	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${EXAMPLESDIR}
 .endfor