diff --git a/audio/libechonest/Makefile b/audio/libechonest/Makefile
index 3e616b6d79a..4e4809fb81f 100644
--- a/audio/libechonest/Makefile
+++ b/audio/libechonest/Makefile
@@ -3,13 +3,14 @@
 
 PORTNAME=	libechonest
 PORTVERSION=	2.3.1
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	audio
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Collection of C++/Qt classes designed to use the APIs of The Echo Nest
 
-LICENSE=	GPLv2
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libqjson.so:devel/qjson
 
@@ -19,12 +20,12 @@ OPTIONS_DEFINE=	TEST
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
-TEST_CMAKE_OFF=	-DECHONEST_BUILD_TESTS:BOOL=OFF
-TEST_USE=	qt4=qtestlib_build
+TEST_CMAKE_BOOL=ECHONEST_BUILD_TESTS
+TEST_USE=	qt4=qtestlib_build,xml_build
 
 USES=		cmake pkgconfig
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
-USE_QT4=	qmake_build moc_build network rcc_build
+USE_QT4=	corelib qmake_build moc_build network rcc_build
 
 .include <bsd.port.mk>
diff --git a/audio/mixxx/Makefile b/audio/mixxx/Makefile
index 0ae6e74d2a5..73b909dd7b9 100644
--- a/audio/mixxx/Makefile
+++ b/audio/mixxx/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	mixxx
-PORTVERSION=	1.11.0
+PORTVERSION=	2.0.0
 DISTVERSIONSUFFIX=	-src
-PORTREVISION=	15
 CATEGORIES=	audio
 MASTER_SITES=	http://downloads.mixxx.org/${PORTNAME}-${PORTVERSION}/
 
@@ -14,11 +13,14 @@ COMMENT=	DJ mixing application
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libFLAC.so:audio/flac \
+LIB_DEPENDS=	libchromaprint.so:audio/chromaprint \
+		libFLAC.so:audio/flac \
 		libid3tag.so:audio/libid3tag \
 		libmad.so:audio/libmad \
 		libportaudio.so:audio/portaudio \
+		librubberband.so:audio/rubberband \
 		libsndfile.so:audio/libsndfile \
+		libvamp-sdk.so:audio/vamp-plugin-sdk \
 		libvorbisfile.so:audio/libvorbis \
 		libtag.so:audio/taglib \
 		libprotobuf.so:devel/protobuf
@@ -27,18 +29,20 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 BROKEN_aarch64=		Fails to compile: Exception("invalid machine type")
 
-USES=		scons iconv
-USE_QT4=	corelib gui network opengl script sql svg xml \
-		linguisttools_build moc_build qmake_build rcc_build uic_build
-USE_GL=		glu
-MAKE_ARGS=	qtdir="${PREFIX}" optimize=0
+USES=		scons iconv pkgconfig
+USE_QT4=	corelib gui network opengl script scripttools sql svg \
+		testlib xml xmlpatterns linguisttools_build moc_build \
+		qmake_build rcc_build uic_build
+USE_GL=		gl glu
+MAKE_ARGS=	qtdir="${PREFIX}" install_root="${PREFIX}" \
+		build=release optimize=native
 LATE_INSTALL_ARGS=	--install-sandbox=${STAGEDIR}
 
 PORTDATA=	*
 PORTDOCS=	*
 
-OPTIONS_DEFINE=		DOCS FAAD GPERFTOOLS LAME SHOUTCAST WAVPACK
-OPTIONS_DEFAULT=	FAAD SHOUTCAST WAVPACK
+OPTIONS_DEFINE=		DOCS FAAD GPERFTOOLS HID LAME OPUS SHOUTCAST WAVPACK
+OPTIONS_DEFAULT=	FAAD HID SHOUTCAST OPUS WAVPACK
 OPTIONS_SUB=		yes
 
 FAAD_LIB_DEPENDS=	libfaad.so:audio/faad \
@@ -48,7 +52,14 @@ FAAD_MAKE_ARGS_OFF=	faad=0
 GPERFTOOLS_LIB_DEPENDS=	libtcmalloc.so:devel/google-perftools
 GPERFTOOLS_MAKE_ARGS=	perftools=1
 GPERFTOOLS_MAKE_ARGS_OFF=	perftools=0
+HID_DESC=			USB HID controllers support
+HID_MAKE_ARGS=		hid=1
+HID_MAKE_ARGS_OFF=	hid=0
 LAME_RUN_DEPENDS=	lame:audio/lame
+OPUS_LIB_DEPENDS=	libopus.so:audio/opus \
+		libopusfile.so:audio/opusfile
+OPUS_MAKE_ARGS=		opus=1
+OPUS_MAKE_ARGS_OFF=	opus=0
 SHOUTCAST_LIB_DEPENDS=	libshout.so:audio/libshout
 SHOUTCAST_MAKE_ARGS=	shoutcast=1
 SHOUTCAST_MAKE_ARGS_OFF=	shoutcast=0
@@ -66,7 +77,7 @@ post-patch:
 		${WRKSRC}/src/SConscript
 	@${REINPLACE_CMD} -e "s|^Exec=.*|Exec=mixxx| ; \
 		 s|^Icon=.*|Icon=${PREFIX}/share/pixmaps/mixxx-icon.png|" \
-		${WRKSRC}/src/mixxx.desktop
+		${WRKSRC}/res/linux/mixxx.desktop
 .for i in midi/midimessage.h qtscript-bytearray/bytearrayclass.h
 	@${ECHO_CMD} >> ${WRKSRC}/src/controllers/${i}
 .endfor
@@ -76,7 +87,7 @@ post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mixxx/plugins/*/*.so
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/mixxx/plugins/soundsource
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in Mixxx-Manual.pdf README README.macro
+.for i in Mixxx-Manual.pdf README README.md
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} \
 		${STAGEDIR}${DOCSDIR})
 .endfor
diff --git a/audio/mixxx/distinfo b/audio/mixxx/distinfo
index 908cfae5889..6a36aee32e0 100644
--- a/audio/mixxx/distinfo
+++ b/audio/mixxx/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mixxx-1.11.0-src.tar.gz) = 00961b5d6c1e6d6686d76e55de474b943bbeff4e59b163dddd3d9940dc1b0331
-SIZE (mixxx-1.11.0-src.tar.gz) = 24473835
+TIMESTAMP = 1483555438
+SHA256 (mixxx-2.0.0-src.tar.gz) = e1b8f33bba35046608578095ed3209967034579252d84c99e6bc03ec030f676d
+SIZE (mixxx-2.0.0-src.tar.gz) = 25300881
diff --git a/audio/mixxx/files/patch-build_depends.py b/audio/mixxx/files/patch-build_depends.py
index 2125e9f8771..f9a75801029 100644
--- a/audio/mixxx/files/patch-build_depends.py
+++ b/audio/mixxx/files/patch-build_depends.py
@@ -1,113 +1,64 @@
---- build/depends.py.orig	2013-05-08 23:20:26 UTC
+--- build/depends.py.orig	2015-12-29 16:10:41 UTC
 +++ build/depends.py
-@@ -150,7 +150,7 @@ class FLAC(Dependence):
+@@ -262,7 +262,7 @@ class Qt(Dependence):
  
- class Qt(Dependence):
-     DEFAULT_QTDIRS = {'linux': '/usr/share/qt4',
--                      'bsd': '/usr/local/lib/qt4',
-+                      'bsd': '%%LOCALBASE%%/lib/qt4',
-                       'osx': '/Library/Frameworks',
-                       'windows': 'C:\\qt\\4.6.0'}
- 
-@@ -219,6 +219,7 @@ class Qt(Dependence):
-             build.env.Append(LIBS = 'QtOpenGL')
-             build.env.Append(LIBS = 'QtXml')
-             build.env.Append(LIBS = 'QtNetwork')
-+            build.env.Append(LIBS = 'QtSql')
-             build.env.Append(LIBS = 'QtScript')
-             if use_qtwebkit:
-                 build.env.Append(LIBS = 'QtWebKit')
-@@ -264,16 +265,16 @@ class Qt(Dependence):
- 
-         # Set Qt include paths for non-OSX
-         if not build.platform_is_osx:
--            include_paths = ['$QTDIR/include/QtCore',
--                             '$QTDIR/include/QtGui',
--                             '$QTDIR/include/QtOpenGL',
--                             '$QTDIR/include/QtXml',
--                             '$QTDIR/include/QtNetwork',
--                             '$QTDIR/include/QtSql',
--                             '$QTDIR/include/QtScript',
--                             '$QTDIR/include/Qt']
-+            include_paths = ['$QTDIR/include/qt4/QtCore',
-+                             '$QTDIR/include/qt4/QtGui',
-+                             '$QTDIR/include/qt4/QtOpenGL',
-+                             '$QTDIR/include/qt4/QtXml',
-+                             '$QTDIR/include/qt4/QtNetwork',
-+                             '$QTDIR/include/qt4/QtSql',
-+                             '$QTDIR/include/qt4/QtScript',
-+                             '$QTDIR/include/qt4/Qt']
-             if use_qtwebkit:
--                include_paths.append('$QTDIR/include/QtWebKit')
-+                include_paths.append('$QTDIR/include/qt4/QtWebKit')
+         elif build.platform_is_bsd:
+             build.env.Append(LIBS=qt_modules)
+-            include_paths = ['$QTDIR/include/%s' % module
++            include_paths = ['%%LOCALBASE%%/include/qt4/%s' % module
+                              for module in qt_modules]
              build.env.Append(CPPPATH=include_paths)
+         elif build.platform_is_osx:
+@@ -358,7 +358,7 @@ class Qt(Dependence):
+         if not build.platform_is_windows and not (using_104_sdk or compiling_on_104):
+             qtdir = build.env['QTDIR']
+             framework_path = Qt.find_framework_libdir(qtdir, qt5)
+-            if os.path.isdir(framework_path):
++            if framework_path and os.path.isdir(framework_path):
+                 build.env.Append(LINKFLAGS="-Wl,-rpath," + framework_path)
+                 build.env.Append(LINKFLAGS="-L" + framework_path)
  
-         # Set the rpath for linux/bsd/osx.
-@@ -387,7 +388,7 @@ class TagLib(Dependence):
-         # the files correctly. Adding this folder ot the include path should fix
-         # it, though might cause issues. This is safe to remove once we
-         # deprecate Karmic support. rryan 2/2011
--        build.env.Append(CPPPATH='/usr/include/taglib/')
-+        build.env.Append(CPPPATH='%%LOCALBASE%%/include/taglib/')
+@@ -1045,7 +1045,6 @@ class MixxxCore(Feature):
  
-         if build.platform_is_windows and build.static_dependencies:
-             build.env.Append(CPPDEFINES = 'TAGLIB_STATIC')
-@@ -782,14 +783,9 @@ class MixxxCore(Feature):
          if build.toolchain_is_gnu:
              # Default GNU Options
-             # TODO(XXX) always generate debugging info?
--            build.env.Append(CCFLAGS = '-pipe')
-             build.env.Append(CCFLAGS = '-Wall')
-             build.env.Append(CCFLAGS = '-Wextra')
--            build.env.Append(CCFLAGS = '-g')
+-            build.env.Append(CCFLAGS='-pipe')
+             build.env.Append(CCFLAGS='-Wall')
+             build.env.Append(CCFLAGS='-Wextra')
  
--            # Check that g++ is present (yeah, SCONS is a bit dumb here)
--            if os.system("which g++ > /dev/null"): #Checks for non-zero return code
--                raise Exception("Did not find g++.")
-         elif build.toolchain_is_msvs:
-             # Validate the specified winlib directory exists
-             mixxx_lib_path = SCons.ARGUMENTS.get('winlib', '..\\..\\..\\mixxx-win32lib-msvc100-release')
-@@ -851,16 +847,19 @@ class MixxxCore(Feature):
+@@ -1146,11 +1145,13 @@ class MixxxCore(Feature):
  
          elif build.platform_is_bsd:
              build.env.Append(CPPDEFINES='__BSD__')
 -            build.env.Append(CPPPATH=['/usr/include',
 -                                      '/usr/local/include',
--                                      '/usr/X11R6/include/'])
--            build.env.Append(LIBPATH=['/usr/lib/',
--                                      '/usr/local/lib',
--                                      '/usr/X11R6/lib'])
-             build.env.Append(LIBS='pthread')
 +            build.env.Append(CPPPATH=['%%LOCALBASE%%/include/portaudio2',
 +                                      '%%LOCALBASE%%/include/qt4',
-+                                      '%%LOCALBASE%%/include'])
++                                      '%%LOCALBASE%%/include',
+                                       '/usr/X11R6/include/'])
+-            build.env.Append(LIBPATH=['/usr/lib/',
+-                                      '/usr/local/lib',
 +            build.env.Append(LIBPATH=['%%LOCALBASE%%/lib/portaudio2',
 +                                      '%%LOCALBASE%%/lib/qt4',
-+                                      '%%LOCALBASE%%/lib'])
-+            build.env.Append(LINKFLAGS=['%%LOCALBASE%%/lib/libportaudio.so',
-+                                        '-Wl,-rpath,%%LOCALBASE%%/lib/qt4',
-+                                        '-Wl,-rpath,%%LOCALBASE%%/lib'])
++                                      '%%LOCALBASE%%/lib',
+                                       '/usr/X11R6/lib'])
+             build.env.Append(LIBS='pthread')
              # why do we need to do this on OpenBSD and not on Linux?  if we
-             # don't then CheckLib("vorbisfile") fails
--            build.env.Append(LIBS=['ogg', 'vorbis'])
-+            # build.env.Append(LIBS=['ogg', 'vorbis'])
- 
-         # Define for things that would like to special case UNIX (Linux or BSD)
-         if build.platform_is_bsd or build.platform_is_linux:
-@@ -897,14 +896,14 @@ class MixxxCore(Feature):
+@@ -1188,7 +1189,7 @@ class MixxxCore(Feature):
          # Say where to find resources on Unix. TODO(XXX) replace this with a
          # RESOURCE_PATH that covers Win and OSX too:
          if build.platform_is_linux or build.platform_is_bsd:
 -            prefix = SCons.ARGUMENTS.get('prefix', '/usr/local')
 +            prefix = SCons.ARGUMENTS.get('prefix', '%%PREFIX%%')
-             share_path = os.path.join(prefix, 'share/mixxx')
-             build.env.Append(CPPDEFINES=('UNIX_SHARE_PATH', r'\"%s\"' % share_path))
-             lib_path = os.path.join(prefix, 'lib/mixxx')
-             build.env.Append(CPPDEFINES=('UNIX_LIB_PATH', r'\"%s\"' % lib_path))
+             share_path = os.path.join (prefix, build.env.get(
+                 'SHAREDIR', default='share'), 'mixxx')
+             build.env.Append(
+@@ -1199,7 +1200,7 @@ class MixxxCore(Feature):
+                 CPPDEFINES=('UNIX_LIB_PATH', r'\"%s\"' % lib_path))
  
      def depends(self, build):
--        return [SoundTouch, ReplayGain, PortAudio, PortMIDI, Qt,
-+        return [SoundTouch, ReplayGain, PortAudio, Qt,
-                 FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf]
+-        return [SoundTouch, ReplayGain, PortAudio, PortMIDI, Qt, TestHeaders,
++        return [SoundTouch, ReplayGain, PortAudio, Qt, TestHeaders,
+                 FidLib, SndFile, FLAC, OggVorbis, OpenGL, TagLib, ProtoBuf,
+                 Chromaprint, RubberBand, SecurityFramework, CoreServices, FpClassify]
  
-     def post_dependency_check_configure(self, build, conf):
diff --git a/audio/mixxx/files/patch-build_features.py b/audio/mixxx/files/patch-build_features.py
index e86985c496d..3f0f038449c 100644
--- a/audio/mixxx/files/patch-build_features.py
+++ b/audio/mixxx/files/patch-build_features.py
@@ -1,25 +1,25 @@
---- build/features.py.orig	2013-05-08 23:20:26 UTC
+--- build/features.py.orig	2015-12-29 16:10:41 UTC
 +++ build/features.py
-@@ -83,6 +83,9 @@ class HID(Feature):
+@@ -87,6 +87,9 @@ class HID(Feature):
+             raise Exception('Did not find the setupapi library, exiting.')
          elif build.platform_is_osx:
-             build.env.Append(LINKFLAGS='-framework IOKit')
-             build.env.Append(LINKFLAGS='-framework CoreFoundation')
+             build.env.AppendUnique(FRAMEWORKS=['IOKit', 'CoreFoundation'])
 +        elif build.platform_is_bsd:
 +            conf.CheckLib(['usb', 'libusb'])
 +            conf.CheckLib(['usbhid', 'libusbhid'])
  
-         build.env.Append(CPPDEFINES = '__HID__')
+         build.env.Append(CPPDEFINES='__HID__')
  
-@@ -95,7 +98,7 @@ class HID(Feature):
-             # Requires setupapi.lib which is included by the above check for
+@@ -100,7 +103,7 @@ class HID(Feature):
              # setupapi.
-             sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
+             sources.append(
+                 os.path.join(self.HIDAPI_INTERNAL_PATH, "windows/hid.c"))
 -        elif build.platform_is_linux:
 +        elif build.platform_is_linux or build.platform_is_bsd:
-             sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'linux/hid-libusb.c'))
-         elif build.platform_is_osx:
-             sources.append(os.path.join(self.HIDAPI_INTERNAL_PATH, 'mac/hid.c'))
-@@ -108,24 +111,27 @@ class Bulk(Feature):
+             # hidapi compiles the libusb implementation by default on Linux
+             sources.append(
+                 os.path.join(self.HIDAPI_INTERNAL_PATH, 'libusb/hid.c'))
+@@ -117,14 +120,14 @@ class Bulk(Feature):
      def enabled(self, build):
          # For now only make Bulk default on Linux only. Turn on for all
          # platforms after the 1.11.0 release.
@@ -33,23 +33,28 @@
      def add_options(self, build, vars):
 -        is_default = 1 if build.platform_is_linux else 0
 +        is_default = 1 if build.platform_is_linux or build.platform_is_bsd else 0
-         vars.Add('bulk', 'Set to 1 to enable USB Bulk controller support.', is_default)
+         vars.Add('bulk',
+                  'Set to 1 to enable USB Bulk controller support.', is_default)
  
-     def configure(self, build, conf):
+@@ -132,12 +135,15 @@ class Bulk(Feature):
          if not self.enabled(build):
              return
  
--        build.env.ParseConfig('pkg-config libusb-1.0 --silence-errors --cflags --libs')
+-        build.env.ParseConfig(
+-            'pkg-config libusb-1.0 --silence-errors --cflags --libs')
 -        if (not conf.CheckLib(['libusb-1.0', 'usb-1.0']) or
--            not conf.CheckHeader('libusb-1.0/libusb.h')):
--            raise Exception('Did not find the libusb 1.0 development library or its header file, exiting!')
+-                not conf.CheckHeader('libusb-1.0/libusb.h')):
+-            raise Exception(
+-                'Did not find the libusb 1.0 development library or its header file, exiting!')
 +        if build.platform_is_linux:
-+            build.env.ParseConfig('pkg-config libusb-1.0 --silence-errors --cflags --libs')
++            build.env.ParseConfig(
++                'pkg-config libusb-1.0 --silence-errors --cflags --libs')
 +            if (not conf.CheckLib(['libusb-1.0', 'usb-1.0']) or
-+                not conf.CheckHeader('libusb-1.0/libusb.h')):
-+                raise Exception('Did not find the libusb 1.0 development library or its header file, exiting!')
++                    not conf.CheckHeader('libusb-1.0/libusb.h')):
++                raise Exception(
++                    'Did not find the libusb 1.0 development library or its header file, exiting!')
 +        elif build.platform_is_bsd:
 +            conf.CheckLib(['usb', 'libusb'])
  
-         build.env.Append(CPPDEFINES = '__BULK__')
+         build.env.Append(CPPDEFINES='__BULK__')
  
diff --git a/audio/mixxx/files/patch-build_mixxx.py b/audio/mixxx/files/patch-build_mixxx.py
new file mode 100644
index 00000000000..15bb70d2a82
--- /dev/null
+++ b/audio/mixxx/files/patch-build_mixxx.py
@@ -0,0 +1,14 @@
+--- build/mixxx.py.orig	2015-12-29 16:10:41 UTC
++++ build/mixxx.py
+@@ -380,9 +380,9 @@ class MixxxBuild(object):
+             self.env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+ 
+         # Allow installation directories to be specified.
+-        prefix = Script.ARGUMENTS.get('prefix', '/usr/local')
++        prefix = Script.ARGUMENTS.get('prefix', '%%PREFIX%%')
+         if os.environ.has_key('LIBDIR'):
+-            self.env['LIBDIR'] = os.path.relpath(os.environ['LIBDIR'], prefix)
++            self.env['LIBDIR'] = 'lib' # os.path.relpath(os.environ['LIBDIR'], prefix)
+         if os.environ.has_key('BINDIR'):
+             self.env['BINDIR'] = os.path.relpath(os.environ['BINDIR'], prefix)
+         if os.environ.has_key('SHAREDIR'):
diff --git a/audio/mixxx/files/patch-build_qt4.py b/audio/mixxx/files/patch-build_qt4.py
deleted file mode 100644
index 2a3ccd22bce..00000000000
--- a/audio/mixxx/files/patch-build_qt4.py
+++ /dev/null
@@ -1,13 +0,0 @@
---- build/qt4.py.orig	2013-05-08 23:20:26 UTC
-+++ build/qt4.py
-@@ -246,8 +246,8 @@ def generate(env):
- 	env.Replace(
- #		QTDIR  = _detect(env),
- 		QT4_BINPATH = os.path.join('$QTDIR', 'bin'),
--		QT4_CPPPATH = os.path.join('$QTDIR', 'include'),
--		QT4_LIBPATH = os.path.join('$QTDIR', 'lib'),
-+		QT4_CPPPATH = os.path.join('$QTDIR', 'include', 'qt4', 'Qt'),
-+		QT4_LIBPATH = os.path.join('$QTDIR', 'lib', 'qt4'),
- 		# TODO: This is not reliable to QTDIR value changes but needed in order to support '-qt4' variants
- 		QT4_MOC = locateQt4Command(env,'moc', env['QTDIR']),
- 		QT4_UIC = locateQt4Command(env,'uic', env['QTDIR']),
diff --git a/audio/mixxx/files/patch-lib_hidapi-0.8.0-pre_linux_hid-libusb.c b/audio/mixxx/files/patch-lib_hidapi-0.8.0-pre_linux_hid-libusb.c
deleted file mode 100644
index 9ef29ab1275..00000000000
--- a/audio/mixxx/files/patch-lib_hidapi-0.8.0-pre_linux_hid-libusb.c
+++ /dev/null
@@ -1,42 +0,0 @@
---- lib/hidapi-0.8.0-pre/linux/hid-libusb.c.orig	2013-05-08 23:20:26 UTC
-+++ lib/hidapi-0.8.0-pre/linux/hid-libusb.c
-@@ -48,6 +48,12 @@
- 
- #include "hidapi.h"
- 
-+#ifdef __FreeBSD__
-+#define LIBUSB_GET_STRING_DESCRIPTOR(h,i,l,d,n)	libusb_get_string_descriptor_ascii(h,i,d,n)
-+#else
-+#define LIBUSB_GET_STRING_DESCRIPTOR(h,i,l,d,n)	libusb_get_string_descriptor(h,i,l,d,n)
-+#endif
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-@@ -264,7 +270,7 @@ static uint16_t get_first_language(libus
- 	int len;
- 	
- 	/* Get the string from libusb. */
--	len = libusb_get_string_descriptor(dev,
-+	len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
- 			0x0, /* String ID */
- 			0x0, /* Language */
- 			(unsigned char*)buf,
-@@ -282,7 +288,7 @@ static int is_language_supported(libusb_
- 	int i;
- 	
- 	/* Get the string from libusb. */
--	len = libusb_get_string_descriptor(dev,
-+	len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
- 			0x0, /* String ID */
- 			0x0, /* Language */
- 			(unsigned char*)buf,
-@@ -327,7 +333,7 @@ static wchar_t *get_usb_string(libusb_de
- 		lang = get_first_language(dev);
- 		
- 	/* Get the string from libusb. */
--	len = libusb_get_string_descriptor(dev,
-+	len = LIBUSB_GET_STRING_DESCRIPTOR(dev,
- 			idx,
- 			lang,
- 			(unsigned char*)buf,
diff --git a/audio/mixxx/files/patch-lib_hidapi-0.8.0-rc1_libusb_hid.c b/audio/mixxx/files/patch-lib_hidapi-0.8.0-rc1_libusb_hid.c
new file mode 100644
index 00000000000..262647d3ea6
--- /dev/null
+++ b/audio/mixxx/files/patch-lib_hidapi-0.8.0-rc1_libusb_hid.c
@@ -0,0 +1,11 @@
+--- lib/hidapi-0.8.0-rc1/libusb/hid.c.orig	2015-12-29 16:10:41 UTC
++++ lib/hidapi-0.8.0-rc1/libusb/hid.c
+@@ -258,7 +258,7 @@ static int get_usage(uint8_t *report_des
+    Note that the data parameter is Unicode in UTF-16LE encoding.
+    Return value is the number of bytes in data, or LIBUSB_ERROR_*.
+  */
+-static inline int libusb_get_string_descriptor(libusb_device_handle *dev,
++inline int libusb_get_string_descriptor(libusb_device_handle *dev,
+ 	uint8_t descriptor_index, uint16_t lang_id,
+ 	unsigned char *data, int length)
+ {
diff --git a/audio/mixxx/files/patch-src_controllers_controllermanager.cpp b/audio/mixxx/files/patch-src_controllers_controllermanager.cpp
index be14f60d1d0..d83e88ba17b 100644
--- a/audio/mixxx/files/patch-src_controllers_controllermanager.cpp
+++ b/audio/mixxx/files/patch-src_controllers_controllermanager.cpp
@@ -1,18 +1,7 @@
---- src/controllers/controllermanager.cpp.orig	2013-05-08 23:20:26 UTC
+--- src/controllers/controllermanager.cpp.orig	2015-12-29 16:10:41 UTC
 +++ src/controllers/controllermanager.cpp
-@@ -12,7 +12,10 @@
- #include "controllers/defs_controllers.h"
- #include "controllers/controllerlearningeventfilter.h"
- 
-+#ifdef __PORTMIDI__
- #include "controllers/midi/portmidienumerator.h"
-+#endif
-+
- #ifdef __HSS1394__
-     #include "controllers/midi/hss1394enumerator.h"
- #endif
-@@ -78,7 +81,9 @@ ControllerManager::ControllerManager(Con
-     m_pPresetInfoManager = new PresetInfoEnumerator(m_pConfig);
+@@ -83,7 +83,9 @@ ControllerManager::ControllerManager(Con
+     m_pMainThreadPresetEnumerator = new PresetInfoEnumerator(presetSearchPaths);
  
      // Instantiate all enumerators
 +#ifdef __PORTMIDI__
diff --git a/audio/mixxx/files/patch-src_controllers_controllerpresetfilehandler.cpp b/audio/mixxx/files/patch-src_controllers_controllerpresetfilehandler.cpp
new file mode 100644
index 00000000000..464b33c32d4
--- /dev/null
+++ b/audio/mixxx/files/patch-src_controllers_controllerpresetfilehandler.cpp
@@ -0,0 +1,14 @@
+--- src/controllers/controllerpresetfilehandler.cpp.orig	2015-12-29 16:10:41 UTC
++++ src/controllers/controllerpresetfilehandler.cpp
+@@ -43,7 +43,11 @@ ControllerPresetPointer ControllerPreset
+         pHandler = new MidiControllerPresetFileHandler();
+     } else if (scriptPath.endsWith(HID_PRESET_EXTENSION, Qt::CaseInsensitive) ||
+                scriptPath.endsWith(BULK_PRESET_EXTENSION, Qt::CaseInsensitive)) {
++#if __HID__
+         pHandler = new HidControllerPresetFileHandler();
++#else
++        return ControllerPresetPointer();
++#endif
+     }
+ 
+     if (pHandler == NULL) {
diff --git a/audio/mixxx/files/patch-src_defs.h b/audio/mixxx/files/patch-src_defs.h
deleted file mode 100644
index 04ef41da2eb..00000000000
--- a/audio/mixxx/files/patch-src_defs.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/defs.h.orig	2013-05-08 23:20:26 UTC
-+++ src/defs.h
-@@ -87,6 +87,8 @@ inline double zap_denormal(double x)
- #define math_min(a,b)            (((a) < (b)) ? (a) : (b))
- #endif
- 
-+#if !defined(__GNUC__)
-+
- // MSVC 2005/2008 needs these
- #ifndef fmax
- #define fmax math_max
-@@ -98,3 +100,5 @@ inline double zap_denormal(double x)
- 
- #endif
- 
-+#endif
-+
diff --git a/audio/mixxx/files/patch-src_musicbrainz_chromaprinter.cpp b/audio/mixxx/files/patch-src_musicbrainz_chromaprinter.cpp
new file mode 100644
index 00000000000..f8bb7f19870
--- /dev/null
+++ b/audio/mixxx/files/patch-src_musicbrainz_chromaprinter.cpp
@@ -0,0 +1,17 @@
+--- src/musicbrainz/chromaprinter.cpp.orig	2015-12-29 16:10:41 UTC
++++ src/musicbrainz/chromaprinter.cpp
+@@ -57,12 +57,12 @@ QString ChromaPrinter::calcFingerPrint(c
+     }
+     chromaprint_finish(ctx);
+ 
+-    void* fprint = NULL;
++    unsigned int* fprint = NULL;
+     int size = 0;
+     int ret = chromaprint_get_raw_fingerprint(ctx, &fprint, &size);
+     QByteArray fingerprint;
+     if (ret == 1) {
+-        void* encoded = NULL;
++        char* encoded = NULL;
+         int encoded_size = 0;
+         chromaprint_encode_fingerprint(fprint, size,
+                                        CHROMAPRINT_ALGORITHM_DEFAULT,
diff --git a/audio/mixxx/files/patch-src_recording_encodermp3.cpp b/audio/mixxx/files/patch-src_recording_encodermp3.cpp
deleted file mode 100644
index 5c4c83fd9b3..00000000000
--- a/audio/mixxx/files/patch-src_recording_encodermp3.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/recording/encodermp3.cpp.orig	2013-05-08 23:20:26 UTC
-+++ src/recording/encodermp3.cpp
-@@ -85,7 +85,7 @@ EncoderMp3::EncoderMp3(EngineAbstractRec
-      */
-     QStringList libnames;
-     QString libname = "";
--#ifdef __LINUX__
-+#if defined(__BSD__) || defined(__LINUX__)
-        libnames << "mp3lame";
- #elif __WINDOWS__
-     libnames << "lame_enc.dll";
-@@ -108,7 +108,7 @@ EncoderMp3::EncoderMp3(EngineAbstractRec
-         props->setType(DLG_WARNING);
-         props->setTitle(tr("Encoder"));
-         QString key = "";
--#ifdef __LINUX__
-+#if defined(__BSD__) || defined(__LINUX__)
-         key = tr("<html>Mixxx cannot record or stream in MP3 without the MP3 encoder &quot;lame&quot;. Due to licensing issues, we cannot include this with Mixxx. To record or stream in MP3, you must download <b>libmp3lame</b> and install it on your system. <p>See <a href='http://mixxx.org/wiki/doku.php/internet_broadcasting#linux'>Mixxx Wiki</a> for more information. </html>");
-         props->setText(key);
- #elif __WINDOWS__
diff --git a/audio/mixxx/files/patch-src_sounddeviceportaudio.cpp b/audio/mixxx/files/patch-src_sounddeviceportaudio.cpp
deleted file mode 100644
index ff34f62cef2..00000000000
--- a/audio/mixxx/files/patch-src_sounddeviceportaudio.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- src/sounddeviceportaudio.cpp.orig	2013-05-08 23:20:26 UTC
-+++ src/sounddeviceportaudio.cpp
-@@ -182,10 +182,10 @@ int SoundDevicePortAudio::open()
-         qDebug() << "Opened PortAudio stream successfully... starting";
-     }
- 
--#ifdef __LINUX__
-+#if defined(__BSD__) || defined(__LINUX__)
-     //Attempt to dynamically load and resolve stuff in the PortAudio library
-     //in order to enable RT priority with ALSA.
--    QLibrary portaudio("libportaudio.so.2");
-+    QLibrary portaudio("libportaudio.so");
-     if (!portaudio.load())
-        qWarning() << "Failed to dynamically load PortAudio library";
-     else
diff --git a/audio/mixxx/files/patch-src_soundmanager.cpp b/audio/mixxx/files/patch-src_soundmanager.cpp
deleted file mode 100644
index 626f63cb0d0..00000000000
--- a/audio/mixxx/files/patch-src_soundmanager.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
---- src/soundmanager.cpp.orig	2013-05-08 23:20:26 UTC
-+++ src/soundmanager.cpp
-@@ -234,7 +234,7 @@ void SoundManager::queryDevices() {
- #ifdef __PORTAUDIO__
-     PaError err = paNoError;
-     if (!m_paInitialized) {
--#ifdef Q_OS_LINUX
-+#if defined(__BSD__) || defined(Q_OS_LINUX)
-         setJACKName();
- #endif
-         err = Pa_Initialize();
-@@ -626,9 +626,9 @@ QList<AudioInput> SoundManager::register
- 
- void SoundManager::setJACKName() const {
- #ifdef __PORTAUDIO__
--#ifdef Q_OS_LINUX
-+#if defined(__BSD__) || defined(Q_OS_LINUX)
-     typedef PaError (*SetJackClientName)(const char *name);
--    QLibrary portaudio("libportaudio.so.2");
-+    QLibrary portaudio("libportaudio.so");
-     if (portaudio.load()) {
-         SetJackClientName func(
-             reinterpret_cast<SetJackClientName>(
diff --git a/audio/mixxx/files/patch-src_soundmanagerconfig.cpp b/audio/mixxx/files/patch-src_soundmanagerconfig.cpp
deleted file mode 100644
index 3eb0c22cfdd..00000000000
--- a/audio/mixxx/files/patch-src_soundmanagerconfig.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/soundmanagerconfig.cpp.orig	2013-05-08 23:20:26 UTC
-+++ src/soundmanagerconfig.cpp
-@@ -290,7 +290,7 @@ void SoundManagerConfig::loadDefaults(So
-     if (flags & SoundManagerConfig::API) {
-         QList<QString> apiList = soundManager->getHostAPIList();
-         if (!apiList.isEmpty()) {
--#ifdef __LINUX__
-+#if defined(__BSD__) || defined(__LINUX__)
-             //Check for JACK and use that if it's available, otherwise use ALSA
-             if (apiList.contains(MIXXX_PORTAUDIO_JACK_STRING)) {
-                 m_api = MIXXX_PORTAUDIO_JACK_STRING;
diff --git a/audio/mixxx/files/patch-src_soundsourceoggvorbis.cpp b/audio/mixxx/files/patch-src_soundsourceoggvorbis.cpp
deleted file mode 100644
index 5e3d66439f1..00000000000
--- a/audio/mixxx/files/patch-src_soundsourceoggvorbis.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/soundsourceoggvorbis.cpp.orig	2013-05-08 23:20:26 UTC
-+++ src/soundsourceoggvorbis.cpp
-@@ -32,6 +32,15 @@
- #endif
- #endif
- 
-+#ifdef __BSD__
-+#include <sys/endian.h>
-+#if _BYTE_ORDER == _LITTLE_ENDIAN
-+#define OV_ENDIAN_ARG 0
-+#else
-+#define OV_ENDIAN_ARG 1
-+#endif
-+#endif
-+
- #ifdef __LINUX__
- #include <endian.h>
- #if __BYTE_ORDER == __LITTLE_ENDIAN
diff --git a/audio/mixxx/files/patch-src_soundsourceproxy.cpp b/audio/mixxx/files/patch-src_soundsourceproxy.cpp
deleted file mode 100644
index 56423ca4d62..00000000000
--- a/audio/mixxx/files/patch-src_soundsourceproxy.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/soundsourceproxy.cpp.orig	2013-05-08 23:20:26 UTC
-+++ src/soundsourceproxy.cpp
-@@ -84,7 +84,7 @@ void SoundSourceProxy::loadPlugins()
-         qDebug() << "Adding plugin path from commandline arg:" << pluginPath;
-         pluginDirs.append(QDir(pluginPath));
-     }
--#ifdef __LINUX__
-+#if defined(__BSD__) || defined(__LINUX__)
-     QDir libPath(UNIX_LIB_PATH);
-     if (libPath.cd("plugins") && libPath.cd("soundsource")) {
- 	pluginDirs.append(libPath.absolutePath());
diff --git a/audio/mixxx/files/patch-src_upgrade.cpp b/audio/mixxx/files/patch-src_upgrade.cpp
new file mode 100644
index 00000000000..76525df942b
--- /dev/null
+++ b/audio/mixxx/files/patch-src_upgrade.cpp
@@ -0,0 +1,11 @@
+--- src/upgrade.cpp.orig	2015-12-29 16:10:41 UTC
++++ src/upgrade.cpp
+@@ -43,7 +43,7 @@ Upgrade::~Upgrade() {
+ 
+ // static 
+ QString Upgrade::mixxx17HomePath() {
+-#ifdef __LINUX__
++#if defined(__LINUX__) || defined(__BSD__)
+     return QDir::homePath().append("/").append(".mixxx/");
+ #elif __WINDOWS__
+     return QDir::homePath().append("/").append("Local Settings/Application Data/Mixxx/");
diff --git a/audio/mixxx/files/patch-src_widget_wdisplay.cpp b/audio/mixxx/files/patch-src_widget_wdisplay.cpp
deleted file mode 100644
index 806c99c008f..00000000000
--- a/audio/mixxx/files/patch-src_widget_wdisplay.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-Fix bogus pointer comparison.
-
---- src/widget/wdisplay.cpp.orig	2013-05-08 23:20:26 UTC
-+++ src/widget/wdisplay.cpp
-@@ -86,7 +86,7 @@ void WDisplay::setPixmap(int iPos, const
- 
- void WDisplay::paintEvent(QPaintEvent *)
- {
--    if (m_pPixmaps>0)
-+    if (m_pPixmaps)
-     {
-         int idx = (int)(m_fValue*(float)(m_iNoPos)/128.);
-         // Range check
diff --git a/audio/mixxx/pkg-plist b/audio/mixxx/pkg-plist
index a9b10e0b9fa..053fec2033c 100644
--- a/audio/mixxx/pkg-plist
+++ b/audio/mixxx/pkg-plist
@@ -2,5 +2,7 @@ bin/mixxx
 %%FAAD%%lib/mixxx/plugins/soundsource/libsoundsourcem4a.so
 %%WAVPACK%%lib/mixxx/plugins/soundsource/libsoundsourcewv.so
 lib/mixxx/plugins/vamp/libmixxxminimal.so
+share/appdata/mixxx.appdata.xml
 share/applications/mixxx.desktop
 share/pixmaps/mixxx-icon.png
+@dir lib/mixxx/plugins/soundsource
diff --git a/benchmarks/bombardier/Makefile b/benchmarks/bombardier/Makefile
index c82c05b8163..aa1f097c023 100644
--- a/benchmarks/bombardier/Makefile
+++ b/benchmarks/bombardier/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bombardier
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 DISTVERSIONPREFIX=	v
 CATEGORIES=	benchmarks
 
diff --git a/benchmarks/bombardier/distinfo b/benchmarks/bombardier/distinfo
index 21b71e73d9d..668be709419 100644
--- a/benchmarks/bombardier/distinfo
+++ b/benchmarks/bombardier/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488384668
-SHA256 (codesenberg-bombardier-v1.0.1_GH0.tar.gz) = 83837649a8e5fe5cba219fbae5f88e384b9282877d33b82235db3f032a22aea6
-SIZE (codesenberg-bombardier-v1.0.1_GH0.tar.gz) = 467942
+TIMESTAMP = 1488742985
+SHA256 (codesenberg-bombardier-v1.0.2_GH0.tar.gz) = 5fc8a34e355c1273888b750e0bc599a6edf6d974d4bd90d23cbdd36fa91e8757
+SIZE (codesenberg-bombardier-v1.0.2_GH0.tar.gz) = 468114
diff --git a/chinese/gcin/Makefile b/chinese/gcin/Makefile
index 6ab28de2554..6d8ffd6ab0f 100644
--- a/chinese/gcin/Makefile
+++ b/chinese/gcin/Makefile
@@ -68,6 +68,7 @@ post-patch:
 		${WRKSRC}/scripts/utf8-edit
 	@${REINPLACE_CMD} -e '/make/ d' ${WRKSRC}/IMdkit/lib/Makefile
 	@${REINPLACE_CMD} -e 's,/usr/X11R6/lib,${LOCALBASE}/lib,' ${WRKSRC}/im-client/Makefile
+
 post-patch-DOCS-off:
 	@${REINPLACE_CMD} '/install.*DOC_DIR/d' ${WRKSRC}/Makefile
 
diff --git a/chinese/gcin/files/patch-Makefile b/chinese/gcin/files/patch-Makefile
index 68c5731387c..f97b3bc273c 100644
--- a/chinese/gcin/files/patch-Makefile
+++ b/chinese/gcin/files/patch-Makefile
@@ -1,5 +1,5 @@
---- Makefile.orig	2014-01-26 06:41:39 UTC
-+++ Makefile
+--- Makefile.orig	2014-01-26 14:41:39.000000000 +0800
++++ Makefile	2014-04-12 10:55:35.584554559 +0800
 @@ -4,8 +4,11 @@ include config.mak
  include suffixes-rule
  
@@ -38,13 +38,13 @@
  
  gcin:   $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
 -	$(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
-+	$(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB)
++	$(CCLD) $(EXTRA_LDFLAGS) $(gcc_ld_run_path) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L%%PREFIX%%/$(LIB)
  	rm -f core.* vgcore.*
  	ln -sf $@ $@.test
  
  gcin-nocur:   $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV)
 -	$(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/X11R6/$(LIB)
-+	$(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L/usr/local/$(LIB)
++	$(CCLD) -Wl,-rpath,$(gcinlibdir) $(EXTRA_LDFLAGS) -o $@ $(OBJS) $(IMdkitLIB) $(OBJ_IMSRV) -lXtst $(LDFLAGS) -L%%PREFIX%%/$(LIB)
  	rm -f core.*
  
 -tslearn:        $(OBJS_TSLEARN)
@@ -86,7 +86,7 @@
  	$(CCLD) $(gcc_ld_run_path) -o $@ $(OBJS_gcin_message) -L./im-client -lgcin-im-client $(LDFLAGS)
  
  pin-juyin:	$(OBJS_pin_juyin)
-@@ -223,22 +231,18 @@ install:
+@@ -223,12 +231,12 @@ install:
  	$(MAKE) -C data install
  	$(MAKE) -C im-client install
  	$(MAKE) -C gtk-im install
@@ -97,22 +97,12 @@
  	if [ $(QT4_IM) = 'Y' ]; then $(MAKE) -C qt4-im install; fi
 -	if [ $(prefix) = /usr/local ]; then \
 -	   install -m 644 gcin.png /usr/share/icons/hicolor/64x64/apps; \
--	   install -d $(DOC_DIR); \
--	   install -m 644 README.html Changelog.html $(DOC_DIR); \
 +	if [ $(prefix) = /nonstaged ]; then \
 +	   install -m 644 gcin.png $(prefix)/share/icons/hicolor/64x64/apps; \
+ 	   install -d $(DOC_DIR); \
+ 	   install -m 644 README.html Changelog.html $(DOC_DIR); \
  	   install $(PROGS) $(bindir); \
- 	   rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
- 	   rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \
- 	   rm -f $(bindir)/ts-contribute-en; ln -sf ts-edit $(bindir)/ts-contribute-en; \
- 	   rm -f $(bindir)/ts-edit-en; ln -sf ts-edit $(bindir)/ts-edit-en; \
- 	else \
--	   install -d $(DOC_DIR_i); \
--	   install -m 644 README.html Changelog.html $(DOC_DIR_i); \
- 	   install -s $(PROGS) $(bindir); \
- 	   rm -f $(bindir)/trad2sim; ln -sf sim2trad $(bindir)/trad2sim; \
- 	   rm -f $(bindir)/ts-contribute; ln -sf ts-edit $(bindir)/ts-contribute; \
-@@ -246,6 +250,7 @@ install:
+@@ -246,6 +254,7 @@ install:
  	   rm -f $(bindir)/ts-edit-en; ln -sf ts-edit $(bindir)/ts-edit-en; \
  	fi
  	$(MAKE) -C scripts install
@@ -120,7 +110,7 @@
  	$(MAKE) -C menu install
  	if [ $(USE_I18N) = 'Y' ]; then $(MAKE) -C po install; fi
  
-@@ -279,4 +284,4 @@ gcin-fedora.spec:	gcin-fedora.spec.in VE
+@@ -279,4 +288,4 @@ gcin-fedora.spec:	gcin-fedora.spec.in VE
  	rm -f $@
  	sed -e "s/__gcin_version__/$(GCIN_VERSION)/" < $< > $@
  
diff --git a/comms/wy60/Makefile b/comms/wy60/Makefile
index b4ee7751f9b..c3164175f58 100644
--- a/comms/wy60/Makefile
+++ b/comms/wy60/Makefile
@@ -11,7 +11,8 @@ LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
-GH_TUPLE=	mieko:wy60:8e082bf
+GH_ACCOUNT=	mieko
+GH_TAGNAME=	8e082bf
 
 USES=		ncurses
 GNU_CONFIGURE=	yes
diff --git a/databases/Makefile b/databases/Makefile
index f1239fc2bac..e75d2e1fdb5 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -965,6 +965,7 @@
     SUBDIR += sqlite3
     SUBDIR += sqlitebrowser
     SUBDIR += sqlitebrowser-qt5
+    SUBDIR += sqliteconvert
     SUBDIR += sqliteman
     SUBDIR += sqlitemanager
     SUBDIR += sqliteodbc
diff --git a/databases/cassandra2/Makefile b/databases/cassandra2/Makefile
index a82b638954c..c14f017b9cc 100644
--- a/databases/cassandra2/Makefile
+++ b/databases/cassandra2/Makefile
@@ -13,6 +13,8 @@ COMMENT=	Open source distributed database management system
 
 LICENSE=	APACHE20
 
+BROKEN=		crash with current OpenJDK
+
 JAVA_VERSION=	1.7
 JAVA_VENDOR=	openjdk
 REINPLACE_ARGS=	-i ''
diff --git a/databases/cego/Makefile b/databases/cego/Makefile
index 0ac7bf36507..a33d9992d05 100644
--- a/databases/cego/Makefile
+++ b/databases/cego/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cego
-PORTVERSION=	2.32.8
+PORTVERSION=	2.32.11
 CATEGORIES=	databases
 MASTER_SITES=	http://www.lemke-it.com/
 
diff --git a/databases/cego/distinfo b/databases/cego/distinfo
index 33fe9eb67d5..2f09ae07ac5 100644
--- a/databases/cego/distinfo
+++ b/databases/cego/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485681108
-SHA256 (cego-2.32.8.tar.gz) = c59a6d4cbaa7a060ad85a83c71e2edb82146d0e8e73935ac550c9a123e0b03d1
-SIZE (cego-2.32.8.tar.gz) = 1396470
+TIMESTAMP = 1488708824
+SHA256 (cego-2.32.11.tar.gz) = 684fa8c239bc6fbe61b575c59aa4ea0f3a2a130c8fc0498b7d7238ffbc3e2e6c
+SIZE (cego-2.32.11.tar.gz) = 1394544
diff --git a/databases/cegobridge/Makefile b/databases/cegobridge/Makefile
index 0b1bdaa75fe..034623f9518 100644
--- a/databases/cegobridge/Makefile
+++ b/databases/cegobridge/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	cegobridge
-PORTVERSION=	1.1.2
+PORTVERSION=	1.1.3
 CATEGORIES=	databases
 MASTER_SITES=	http://www.lemke-it.com/
 
diff --git a/databases/cegobridge/distinfo b/databases/cegobridge/distinfo
index 3e337317128..10ac6323dcc 100644
--- a/databases/cegobridge/distinfo
+++ b/databases/cegobridge/distinfo
@@ -1,2 +1,3 @@
-SHA256 (cegobridge-1.1.2.tar.gz) = 117922e147fca49ee498e558c7f88182448a6dc7b5a2023c3c718bfb1be8ea8d
-SIZE (cegobridge-1.1.2.tar.gz) = 962307
+TIMESTAMP = 1488709322
+SHA256 (cegobridge-1.1.3.tar.gz) = 53352ba3c8e2abc725612084eac628367ddec39747150bfe6bcad2c4a672ff4a
+SIZE (cegobridge-1.1.3.tar.gz) = 551872
diff --git a/databases/mysql-connector-c++/Makefile b/databases/mysql-connector-c++/Makefile
index 609e903ac39..b184528840a 100644
--- a/databases/mysql-connector-c++/Makefile
+++ b/databases/mysql-connector-c++/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mysql-connector-c++
-PORTVERSION=	1.1.7
-PORTREVISION=	5
+PORTVERSION=	1.1.8
 CATEGORIES=	databases
 MASTER_SITES=	MYSQL/Connector-C++
 
@@ -15,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs
 
-USES=		cmake:outsource mysql
+USES=		cmake:outsource mysql ssl
 USE_LDCONFIG=	yes
 CMAKE_ARGS=	-DDOC_DESTINATION="${DOCSDIR}"
 
diff --git a/databases/mysql-connector-c++/distinfo b/databases/mysql-connector-c++/distinfo
index f77771f33b5..61d04d8f304 100644
--- a/databases/mysql-connector-c++/distinfo
+++ b/databases/mysql-connector-c++/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mysql-connector-c++-1.1.7.tar.gz) = 5b353fbcd26f607a2a0987ce78a4b811f8971813d46b0f4ae6fa07887e9fc763
-SIZE (mysql-connector-c++-1.1.7.tar.gz) = 518469
+TIMESTAMP = 1488666014
+SHA256 (mysql-connector-c++-1.1.8.tar.gz) = 85ff10bd056128562f92b440eb27766cfcd558b474bfddc1153f7dd8feb5f963
+SIZE (mysql-connector-c++-1.1.8.tar.gz) = 528954
diff --git a/databases/mysql-connector-c++/files/patch-driver_mysql__resultbind.cpp b/databases/mysql-connector-c++/files/patch-driver_mysql__resultbind.cpp
deleted file mode 100644
index 4e7c14c21e8..00000000000
--- a/databases/mysql-connector-c++/files/patch-driver_mysql__resultbind.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- driver/mysql_resultbind.cpp.orig	2016-01-12 18:42:38 UTC
-+++ driver/mysql_resultbind.cpp
-@@ -86,7 +86,9 @@ static struct st_buffer_size_type
-     case MYSQL_TYPE_BLOB:
-     case MYSQL_TYPE_STRING:
-     case MYSQL_TYPE_VAR_STRING:
-+#ifdef MYSQL_TYPE_JSON
-     case MYSQL_TYPE_JSON:
-+#endif
-       return st_buffer_size_type(new char[field->max_length + 1], field->max_length + 1, field->type);
- 
-     case MYSQL_TYPE_DECIMAL:
diff --git a/databases/mysql-connector-c++/files/patch-driver_mysql__util.cpp b/databases/mysql-connector-c++/files/patch-driver_mysql__util.cpp
deleted file mode 100644
index d33afe8049b..00000000000
--- a/databases/mysql-connector-c++/files/patch-driver_mysql__util.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- driver/mysql_util.cpp.orig	2016-01-12 18:42:38 UTC
-+++ driver/mysql_util.cpp
-@@ -431,8 +431,10 @@ mysql_type_to_datatype(const MYSQL_FIELD
-       return sql::DataType::SET;
-     case MYSQL_TYPE_GEOMETRY:
-       return sql::DataType::GEOMETRY;
-+#ifdef MYSQL_TYPE_JSON
-     case MYSQL_TYPE_JSON:
-       return sql::DataType::JSON;
-+#endif
-     default:
-       return sql::DataType::UNKNOWN;
-   }
-@@ -645,8 +647,10 @@ mysql_type_to_string(const MYSQL_FIELD *
-       return "SET";
-     case MYSQL_TYPE_GEOMETRY:
-       return "GEOMETRY";
-+#ifdef MYSQL_TYPE_JSON
-     case MYSQL_TYPE_JSON:
-       return "JSON";
-+#endif
-     default:
-       return "UNKNOWN";
-   }
diff --git a/databases/postgresql-odbc/Makefile b/databases/postgresql-odbc/Makefile
index 1fa29f2018f..431dd45baef 100644
--- a/databases/postgresql-odbc/Makefile
+++ b/databases/postgresql-odbc/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql
-PORTVERSION=	09.05.0400
+PORTVERSION=	09.06.0100
 CATEGORIES=	databases
 MASTER_SITES=	PGSQL/odbc/versions/src
 PKGNAMESUFFIX=	-odbc
diff --git a/databases/postgresql-odbc/distinfo b/databases/postgresql-odbc/distinfo
index e7ae9ef5ee2..18bbfc83eaf 100644
--- a/databases/postgresql-odbc/distinfo
+++ b/databases/postgresql-odbc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1470771983
-SHA256 (postgresql/psqlodbc-09.05.0400.tar.gz) = c9fde1c104065e81813d79eb29bb7e715d64697bdda031ff01e40e3ad59e3ad3
-SIZE (postgresql/psqlodbc-09.05.0400.tar.gz) = 812613
+TIMESTAMP = 1488673839
+SHA256 (postgresql/psqlodbc-09.06.0100.tar.gz) = 050c80b25eb6553a718b9ab4ac00dcbadf7a13ee5ae637c30f7dcde8f4a6c962
+SIZE (postgresql/psqlodbc-09.06.0100.tar.gz) = 886110
diff --git a/databases/postgresql-odbc/files/patch-odbcapi.c b/databases/postgresql-odbc/files/patch-odbcapi.c
index dc711d62689..105f368b53e 100644
--- a/databases/postgresql-odbc/files/patch-odbcapi.c
+++ b/databases/postgresql-odbc/files/patch-odbcapi.c
@@ -1,10 +1,10 @@
---- odbcapi.c.orig	2016-01-10 13:25:14 UTC
+--- odbcapi.c.orig	2017-02-03 13:05:10 UTC
 +++ odbcapi.c
 @@ -913,11 +913,7 @@ RETCODE		SQL_API
  SQLExtendedFetch(HSTMT hstmt,
  				 SQLUSMALLINT fFetchType,
  				 SQLLEN irow,
--#if defined(WITH_UNIXODBC) && (SIZEOF_LONG != 8)
+-#if defined(WITH_UNIXODBC) && (SIZEOF_LONG_INT != 8)
 -				 SQLROWSETSIZE *pcrow,
 -#else
  				 SQLULEN *pcrow,
diff --git a/databases/postgresql-odbc/files/patch-psqlodbc.h b/databases/postgresql-odbc/files/patch-psqlodbc.h
index 36723ac09f8..0408d3fa7de 100644
--- a/databases/postgresql-odbc/files/patch-psqlodbc.h
+++ b/databases/postgresql-odbc/files/patch-psqlodbc.h
@@ -1,16 +1,16 @@
---- psqlodbc.h.orig	2016-01-10 13:25:14 UTC
+--- psqlodbc.h.orig	2017-02-03 13:05:10 UTC
 +++ psqlodbc.h
-@@ -175,13 +175,8 @@ typedef	unsigned long long ULONG_PTR;
- #if (SIZEOF_LONG == 8)
- #define	FORMAT_INTEGER	"%d"	/* SQLINTEGER */
+@@ -174,13 +174,8 @@ typedef	unsigned long long ULONG_PTR;
  #define	FORMAT_UINTEGER	"%u"	/* SQLUINTEGER */
+ #define	FORMATI64	"%ld"	/* SQLBIGINT */
+ #define	FORMATI64U	"%lu"	/* SQLUBIGINT */
 -#if defined(WITH_UNIXODBC) && defined(BUILD_LEGACY_64_BIT_MODE)
 -#define FORMAT_LEN	"%d"	/* SQLLEN */
 -#define FORMAT_ULEN	"%u"	/* SQLULEN */
--#else
+-#else /* WITH_UNIXODBC */
  #define FORMAT_LEN	"%ld"	/* SQLLEN */
  #define FORMAT_ULEN	"%lu"	/* SQLULEN */
 -#endif /* WITH_UNIXODBC */
- #else
- #define	FORMAT_LEN	"%ld"	/* SQLLEN */
- #define	FORMAT_ULEN	"%lu"	/* SQLULEN */
+ #else /* SIZEOF_LONG */
+ #define	FORMAT_INTEGER	"%ld"	/* SQLINTEGER */
+ #define	FORMAT_UINTEGER	"%lu"	/* SQLUINTEGER */
diff --git a/databases/postgresql-repmgr/Makefile b/databases/postgresql-repmgr/Makefile
index c1167f246f7..2b37b6762a7 100644
--- a/databases/postgresql-repmgr/Makefile
+++ b/databases/postgresql-repmgr/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	postgresql-repmgr
-PORTVERSION=	3.1.5
+PORTVERSION=	3.3
 CATEGORIES=	databases
 MASTER_SITES=	http://www.repmgr.org/download/
 DISTNAME=	repmgr-${PORTVERSION}
diff --git a/databases/postgresql-repmgr/distinfo b/databases/postgresql-repmgr/distinfo
index c30cd397de3..29414c9f9fb 100644
--- a/databases/postgresql-repmgr/distinfo
+++ b/databases/postgresql-repmgr/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471377483
-SHA256 (repmgr-3.1.5.tar.gz) = d821fdd427d82a89e455553967f1bc205d73b2daf0899c74a5be1f22aab65b4f
-SIZE (repmgr-3.1.5.tar.gz) = 129541
+TIMESTAMP = 1488675286
+SHA256 (repmgr-3.3.tar.gz) = d96bf300c84eff3cefcc8f6b97cddd607971b4c6841426cb1cfcbd7f9c45604b
+SIZE (repmgr-3.3.tar.gz) = 159039
diff --git a/databases/postgresql-repmgr/files/repmgrd.in b/databases/postgresql-repmgr/files/repmgrd.in
index 33f7b336890..50d80287828 100644
--- a/databases/postgresql-repmgr/files/repmgrd.in
+++ b/databases/postgresql-repmgr/files/repmgrd.in
@@ -22,12 +22,13 @@ rcvar=repmgrd_enable
 load_rc_config $name
 
 : ${repmgrd_enable:="NO"}
+: ${repmgrd_user:="pgsql"}
 : ${repmgrd_config="%%PREFIX%%/etc/repmgr.conf"}
 
 command=%%PREFIX%%/sbin/${name}
 pidfile=/var/run/${name}.pid
 
-command_args="-p $pidfile -f $repmgrd_config"
+command_args="-m -d -p $pidfile -f $repmgrd_config"
 
 run_rc_command "$1"
 
diff --git a/databases/py-bsddb3/Makefile b/databases/py-bsddb3/Makefile
index 16671dee82c..f03d0aa837f 100644
--- a/databases/py-bsddb3/Makefile
+++ b/databases/py-bsddb3/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bsddb3
-PORTVERSION=	6.2.1
+PORTVERSION=	6.2.4
 CATEGORIES=	databases python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/databases/py-bsddb3/distinfo b/databases/py-bsddb3/distinfo
index 9a7c947b76a..c9445fc0733 100644
--- a/databases/py-bsddb3/distinfo
+++ b/databases/py-bsddb3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464481552
-SHA256 (bsddb3-6.2.1.tar.gz) = 319a599236b0843a36c17749c0041c18a07ef28dbe9539064fd7c0fff972567c
-SIZE (bsddb3-6.2.1.tar.gz) = 228558
+TIMESTAMP = 1488710574
+SHA256 (bsddb3-6.2.4.tar.gz) = 4866aa32ad6ec6d5ff401d9aec8da07c4e84502298dc27f7c758545e243550e6
+SIZE (bsddb3-6.2.4.tar.gz) = 242397
diff --git a/databases/py-mysql-connector-python2/Makefile b/databases/py-mysql-connector-python2/Makefile
index 8136b51ab58..02c4c60749e 100644
--- a/databases/py-mysql-connector-python2/Makefile
+++ b/databases/py-mysql-connector-python2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=		mysql-connector-python
-PORTVERSION=		2.2.0
+PORTVERSION=		2.2.2
 CATEGORIES=		databases python
 MASTER_SITES=		MYSQL/Connector-Python
 PKGNAMEPREFIX=		${PYTHON_PKGNAMEPREFIX}
diff --git a/databases/py-mysql-connector-python2/distinfo b/databases/py-mysql-connector-python2/distinfo
index c7a22cb8c2a..e9ba045033e 100644
--- a/databases/py-mysql-connector-python2/distinfo
+++ b/databases/py-mysql-connector-python2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471036814
-SHA256 (mysql-connector-python-2.2.0.tar.gz) = 4f86db62cc064159e6f691995b314537a008e5b7624797d9b2988e9250e39abf
-SIZE (mysql-connector-python-2.2.0.tar.gz) = 11825908
+TIMESTAMP = 1488711732
+SHA256 (mysql-connector-python-2.2.2.tar.gz) = 768cfe8c9a16159b9ba6c44db88220110987916439375a288e3761f49d1c3624
+SIZE (mysql-connector-python-2.2.2.tar.gz) = 11842859
diff --git a/databases/py-sqlalchemy08/Makefile b/databases/py-sqlalchemy08/Makefile
index 31a5658bf39..d70b37a8a75 100644
--- a/databases/py-sqlalchemy08/Makefile
+++ b/databases/py-sqlalchemy08/Makefile
@@ -14,6 +14,9 @@ COMMENT=	Python SQL toolkit and Object Relational Mapper 0.8.x
 
 LICENSE=	MIT
 
+DEPRECATED=	Upstream has declared this version EoL: please migrate to databases/py-sqlalchemy10
+EXPIRATION_DATE=	2017-04-01
+
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:devel/py-nose \
 		${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock
 
diff --git a/databases/sqliteconvert/Makefile b/databases/sqliteconvert/Makefile
new file mode 100644
index 00000000000..c50ace0fd2b
--- /dev/null
+++ b/databases/sqliteconvert/Makefile
@@ -0,0 +1,23 @@
+# $FreeBSD$
+
+PORTNAME=	sqliteconvert
+DISTVERSIONPREFIX=	VERSION_
+DISTVERSION=	0_1_2
+CATEGORIES=	databases
+
+MAINTAINER=	tobik@FreeBSD.org
+COMMENT=	Tools to convert SQLite3 schema files into documentation
+
+LICENSE=	ISCL
+LICENSE_FILE=	${WRKSRC}/LICENSE.md
+
+RUN_DEPENDS=	dot:graphics/graphviz
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	kristapsdz
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/sqlite2html \
+		${STAGEDIR}${PREFIX}/bin/sqlite2dot
+
+.include <bsd.port.mk>
diff --git a/databases/sqliteconvert/distinfo b/databases/sqliteconvert/distinfo
new file mode 100644
index 00000000000..70ced0cf108
--- /dev/null
+++ b/databases/sqliteconvert/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1488713412
+SHA256 (kristapsdz-sqliteconvert-VERSION_0_1_2_GH0.tar.gz) = df89d3e858dcd0aa4e16fce28ce6075df0e6594932b1dcca238d34c5d3a044e0
+SIZE (kristapsdz-sqliteconvert-VERSION_0_1_2_GH0.tar.gz) = 26833
diff --git a/databases/sqliteconvert/pkg-descr b/databases/sqliteconvert/pkg-descr
new file mode 100644
index 00000000000..4afe79713c8
--- /dev/null
+++ b/databases/sqliteconvert/pkg-descr
@@ -0,0 +1,7 @@
+Sqliteconvert is a set of tools to convert SQLite3 schema files into
+documentation.  It includes sqlite2dot(1), which converts into a
+graphviz file; sqlite2html(1), which converts into an HTML5 fragment;
+and sqliteconvert(1), which pulls these tools together with some sane
+default templates.
+
+WWW: https://kristaps.bsd.lv/sqliteconvert/
diff --git a/databases/sqliteconvert/pkg-plist b/databases/sqliteconvert/pkg-plist
new file mode 100644
index 00000000000..d8f51de4e82
--- /dev/null
+++ b/databases/sqliteconvert/pkg-plist
@@ -0,0 +1,7 @@
+bin/sqlite2dot
+bin/sqlite2html
+bin/sqliteconvert
+man/man1/sqlite2dot.1.gz
+man/man1/sqlite2html.1.gz
+man/man1/sqliteconvert.1.gz
+%%DATADIR%%/schema.xml
diff --git a/deskutils/gbirthday/Makefile b/deskutils/gbirthday/Makefile
index 1c21140ca1a..b6ee8056fda 100644
--- a/deskutils/gbirthday/Makefile
+++ b/deskutils/gbirthday/Makefile
@@ -12,7 +12,8 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 USE_GITHUB=	yes
-GH_TUPLE=	lafrech:gbirthday:7b431aa
+GH_ACCOUNT=	lafrech
+GH_TAGNAME=	7b431aa
 
 OPTIONS_DEFINE=		MYSQL NLS NOTIFY THUNDERBIRD
 OPTIONS_SUB=		yes
diff --git a/devel/Makefile b/devel/Makefile
index 8c287af809e..10b3bc0ca04 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -320,6 +320,7 @@
     SUBDIR += covtool
     SUBDIR += cpan-upload
     SUBDIR += cpan-upload-http
+    SUBDIR += cpp-hocon
     SUBDIR += cpp-netlib
     SUBDIR += cppcheck
     SUBDIR += cppi
@@ -403,6 +404,7 @@
     SUBDIR += devtodo
     SUBDIR += dfuife-curses
     SUBDIR += dia2code
+    SUBDIR += dia2code+
     SUBDIR += diffuse
     SUBDIR += ding-libs
     SUBDIR += directfb
@@ -1199,6 +1201,7 @@
     SUBDIR += kickassembler
     SUBDIR += kimwitu
     SUBDIR += kore
+    SUBDIR += ksql
     SUBDIR += kyra
     SUBDIR += kyua
     SUBDIR += lasi
diff --git a/devel/arduino-builder/Makefile b/devel/arduino-builder/Makefile
index d8a1fa3c550..0acd142a434 100644
--- a/devel/arduino-builder/Makefile
+++ b/devel/arduino-builder/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	go:lang/go
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	arduino
-GH_SUBDIR=	src/github.com/${GH_ACCOUNT}/${PORTNAME}
+GH_SUBDIR=	src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
 GH_TUPLE=	go-errors:errors:a418503:goerrors/src/github.com/go-errors/errors \
 		stretchr:testify:v1.1.3:stretchr/src/github.com/stretchr/testify \
 		jstemmer:go-junit-report:833f8ea:jstemmer/src/github.com/jstemmer/go-junit-report
diff --git a/devel/artifactory/Makefile b/devel/artifactory/Makefile
index c7e8f7612e0..ddc05968989 100644
--- a/devel/artifactory/Makefile
+++ b/devel/artifactory/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	artifactory
-PORTVERSION=	4.16.0
+PORTVERSION=	5.1.0
 CATEGORIES=	devel java
 MASTER_SITES=	https://bintray.com/artifact/download/jfrog/artifactory/
 DISTNAME=	jfrog-${PORTNAME}-oss-${PORTVERSION}
diff --git a/devel/artifactory/distinfo b/devel/artifactory/distinfo
index 39ea4af2fc1..81312239f67 100644
--- a/devel/artifactory/distinfo
+++ b/devel/artifactory/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484640740
-SHA256 (jfrog-artifactory-oss-4.16.0.zip) = f5711536cdf0a597799e01c570bbd38e6f5f3ffb6935cde21d38119be6592f16
-SIZE (jfrog-artifactory-oss-4.16.0.zip) = 41455447
+TIMESTAMP = 1488721092
+SHA256 (jfrog-artifactory-oss-5.1.0.zip) = 16b15b1a0f983c4dc1acb04425d7e6f77185276ab7e4fc2fa562e75278896e03
+SIZE (jfrog-artifactory-oss-5.1.0.zip) = 44833503
diff --git a/devel/artifactory/pkg-plist b/devel/artifactory/pkg-plist
index 331ef7219f4..e8c42a87ebe 100644
--- a/devel/artifactory/pkg-plist
+++ b/devel/artifactory/pkg-plist
@@ -32,6 +32,7 @@
 %%APP_HOME%%/misc/tomcat/logging.properties
 %%APP_HOME%%/misc/tomcat/server.xml
 %%APP_HOME%%/misc/tomcat/web.xml
+%%APP_HOME%%/misc/%%APP_HOME%%.config.template.yml
 %%APP_HOME%%/tomcat/LICENSE
 %%APP_HOME%%/tomcat/NOTICE
 %%APP_HOME%%/tomcat/RELEASE-NOTES
@@ -78,6 +79,7 @@
 %%VARDIR%%/tomcat/webapps/ROOT/index.html
 %%VARDIR%%/etc/artifactory.config.xml
 %%VARDIR%%/etc/artifactory.system.properties
+%%VARDIR%%/etc/binarystore.xml
 %%VARDIR%%/etc/mimetypes.xml
 %%VARDIR%%/etc/logback.xml
 @dir %%VARDIR%%/tomcat/work
diff --git a/devel/ccache/Makefile b/devel/ccache/Makefile
index e432b965f61..c4506720dde 100644
--- a/devel/ccache/Makefile
+++ b/devel/ccache/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	ccache
 PORTVERSION=	3.3.4
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.samba.org/ftp/ccache/ \
 		LOCAL/bdrewery
diff --git a/devel/ccache/files/ccache-update-links.sh.in b/devel/ccache/files/ccache-update-links.sh.in
index ce49ce71890..233a4748a5d 100644
--- a/devel/ccache/files/ccache-update-links.sh.in
+++ b/devel/ccache/files/ccache-update-links.sh.in
@@ -29,6 +29,22 @@ in
 	;;
 esac
 
+strip_path() {
+	local IFS=":"
+	local path
+	set -- ${PATH}
+	while [ $# -gt 0 ]; do
+		if ! [ "${1}" = "${PREFIX}/libexec/ccache" ]; then
+			path="${path}${path:+:}${1}"
+		fi
+		shift
+	done
+	echo "${path}"
+}
+
+# Remove ccache wrappers from PATH
+PATH=$(strip_path)
+
 # create compiler links
 for comp in ${CCACHE_COMPILERS}
 do
diff --git a/devel/cityhash/Makefile b/devel/cityhash/Makefile
index 5269e74ba9c..29b88173c29 100644
--- a/devel/cityhash/Makefile
+++ b/devel/cityhash/Makefile
@@ -5,8 +5,6 @@ PORTNAME=	cityhash
 PORTVERSION=	1.1.1
 PORTREVISION=	1
 CATEGORIES=	devel
-USE_GITHUB=	yes
-GH_TUPLE=	google:cityhash:8af9b8c
 
 MAINTAINER=	vg@FreeBSD.org
 COMMENT=	Family of hash functions
@@ -19,4 +17,8 @@ CPE_VENDOR=	google
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
+USE_GITHUB=	yes
+GH_ACCOUNT=	google
+GH_TAGNAME=	8af9b8c
+
 .include <bsd.port.mk>
diff --git a/devel/cpp-hocon/Makefile b/devel/cpp-hocon/Makefile
new file mode 100644
index 00000000000..3cc32f0bf3e
--- /dev/null
+++ b/devel/cpp-hocon/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PORTNAME=	cpp-hocon
+PORTVERSION=	0.1.4
+CATEGORIES=	devel
+
+MAINTAINER=	jslagle@gmail.com
+COMMENT=	C++ configuration library
+
+LICENSE=	APACHE20
+
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libleatherman_util.so:devel/leatherman
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	puppetlabs
+
+USES=		cmake
+CMAKE_ARGS=	-DCPP_HOCON_SHARED:BOOL=ON
+
+.include <bsd.port.mk>
diff --git a/devel/cpp-hocon/distinfo b/devel/cpp-hocon/distinfo
new file mode 100644
index 00000000000..6df68ceefcb
--- /dev/null
+++ b/devel/cpp-hocon/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1477237793
+SHA256 (puppetlabs-cpp-hocon-0.1.4_GH0.tar.gz) = 2274b99dc098122b6e3d2c8d23173d21893555190c5a008e5a9a7d84875c7275
+SIZE (puppetlabs-cpp-hocon-0.1.4_GH0.tar.gz) = 157988
diff --git a/devel/cpp-hocon/files/patch-lib_CMakeLists.txt b/devel/cpp-hocon/files/patch-lib_CMakeLists.txt
new file mode 100644
index 00000000000..a42dd7c1b29
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_CMakeLists.txt
@@ -0,0 +1,32 @@
+--- lib/CMakeLists.txt.orig	2016-09-23 20:45:10 UTC
++++ lib/CMakeLists.txt
+@@ -75,20 +75,23 @@ set(PROJECT_SOURCES
+ ## Without the intermediate target, unexported symbols can't be tested.
+ add_library(libprojectsrc OBJECT ${PROJECT_SOURCES})
+ set_target_properties(libprojectsrc PROPERTIES POSITION_INDEPENDENT_CODE true)
+-
+-add_library(lib${PROJECT_NAME} $<TARGET_OBJECTS:libprojectsrc>)
+-set_target_properties(lib${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+-target_link_libraries(lib${PROJECT_NAME}
++if(CPP_HOCON_SHARED)
++	add_library(${PROJECT_NAME} SHARED $<TARGET_OBJECTS:libprojectsrc>)
++else()
++	add_library(${PROJECT_NAME} $<TARGET_OBJECTS:libprojectsrc>)
++endif()
++set_target_properties(${PROJECT_NAME} PROPERTIES VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
++target_link_libraries(${PROJECT_NAME}
+     ${LEATHERMAN_LIBRARIES}
+     ${Boost_LIBRARIES}
+     )
+ 
+ # Generate the export header for restricting symbols exported from the library.
+ # Restricting symbols has several advantages, noted at https://gcc.gnu.org/wiki/Visibility.
+-symbol_exports(lib${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h")
++symbol_exports(${PROJECT_NAME} "${CMAKE_CURRENT_LIST_DIR}/inc/hocon/export.h")
+ 
+ # This correctly handles DLL installation on Windows.
+-leatherman_install(lib${PROJECT_NAME})
++leatherman_install(${PROJECT_NAME})
+ install(DIRECTORY inc/hocon DESTINATION include)
+ 
+ add_subdirectory(tests)
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_config.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_config.hpp
new file mode 100644
index 00000000000..151ce3e8b56
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_config.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/config.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/config.hpp
+@@ -169,7 +169,7 @@ namespace hocon {
+      * interface is likely to grow new methods over time, so third-party
+      * implementations will break.
+      */
+-    class LIBCPP_HOCON_EXPORT config : public config_mergeable, public std::enable_shared_from_this<config> {
++    class CPP_HOCON_EXPORT config : public config_mergeable, public std::enable_shared_from_this<config> {
+         friend class config_object;
+         friend class config_value;
+         friend class config_parseable;
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_config__include__context.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__include__context.hpp
new file mode 100644
index 00000000000..5918d25b684
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__include__context.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/config_include_context.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/config_include_context.hpp
+@@ -18,7 +18,7 @@ namespace hocon {
+      * interface is likely to grow new methods over time, so third-party
+      * implementations will break.
+      */
+-    class LIBCPP_HOCON_EXPORT config_include_context {
++    class CPP_HOCON_EXPORT config_include_context {
+     public:
+         /**
+          * Tries to find a name relative to whatever is doing the including, for
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_config__includer.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__includer.hpp
new file mode 100644
index 00000000000..9af9ca1f4ac
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__includer.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/config_includer.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/config_includer.hpp
+@@ -12,7 +12,7 @@ namespace hocon {
+      * customize handling of {@code include} statements in config files. You may
+      * also want to implement {@link config_includer_file} and {@link config_includer_URL}, or not.
+      */
+-    class LIBCPP_HOCON_EXPORT config_includer {
++    class CPP_HOCON_EXPORT config_includer {
+     public:
+         /**
+          * Returns a new includer that falls back to the given includer. This is how
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_config__includer__file.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__includer__file.hpp
new file mode 100644
index 00000000000..71a207927ac
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__includer__file.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/config_includer_file.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/config_includer_file.hpp
+@@ -11,7 +11,7 @@ namespace hocon {
+      * If you do not implement this but do implement {@link config_includer},
+      * attempts to load files will use the default includer.
+      */
+-    class LIBCPP_HOCON_EXPORT config_includer_file {
++    class CPP_HOCON_EXPORT config_includer_file {
+     public:
+         /**
+          * Parses another item to be included. The returned object typically would
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_config__list.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__list.hpp
new file mode 100644
index 00000000000..29d068d76a2
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__list.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/config_list.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/config_list.hpp
+@@ -34,7 +34,7 @@ namespace hocon {
+      *
+      */
+ 
+-    class LIBCPP_HOCON_EXPORT config_list : public config_value {
++    class CPP_HOCON_EXPORT config_list : public config_value {
+     public:
+         config_list(shared_origin origin) : config_value(move(origin)) {}
+ 
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_config__mergeable.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__mergeable.hpp
new file mode 100644
index 00000000000..f3d7452d7f9
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__mergeable.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/config_mergeable.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/config_mergeable.hpp
+@@ -5,7 +5,7 @@
+ 
+ namespace hocon {
+ 
+-    class LIBCPP_HOCON_EXPORT config_mergeable {
++    class CPP_HOCON_EXPORT config_mergeable {
+         friend class config_value;
+     public:
+         /**
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_config__object.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__object.hpp
new file mode 100644
index 00000000000..1ef29f17fa1
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__object.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/config_object.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/config_object.hpp
+@@ -8,7 +8,7 @@
+ 
+ namespace hocon {
+ 
+-    class LIBCPP_HOCON_EXPORT config_object : public config_value {
++    class CPP_HOCON_EXPORT config_object : public config_value {
+         friend class config;
+         friend class config_value;
+         friend class simple_config_object;
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_config__origin.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__origin.hpp
new file mode 100644
index 00000000000..9b7d0626dd6
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__origin.hpp
@@ -0,0 +1,47 @@
+--- lib/inc/hocon/config_origin.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/config_origin.hpp
+@@ -36,7 +36,7 @@ namespace hocon {
+          *
+          * @return string describing the origin
+          */
+-        LIBCPP_HOCON_EXPORT virtual std::string const& description() const = 0;
++        CPP_HOCON_EXPORT virtual std::string const& description() const = 0;
+ 
+         /**
+          * Returns a {@code ConfigOrigin} based on this one, but with the given
+@@ -55,7 +55,7 @@ namespace hocon {
+          * @param lineNumber the new line number
+          * @return the created ConfigOrigin
+          */
+-        LIBCPP_HOCON_EXPORT virtual shared_origin with_line_number(int line_number) const = 0;
++        CPP_HOCON_EXPORT virtual shared_origin with_line_number(int line_number) const = 0;
+ 
+         /**
+          * Returns a line number where the value or exception originated. This will
+@@ -63,7 +63,7 @@ namespace hocon {
+          *
+          * @return line number or -1 if none is available
+          */
+-        LIBCPP_HOCON_EXPORT virtual int line_number() const = 0;
++        CPP_HOCON_EXPORT virtual int line_number() const = 0;
+ 
+         /**
+          * Returns any comments that appeared to "go with" this place in the file.
+@@ -75,7 +75,7 @@ namespace hocon {
+          * @return any comments that seemed to "go with" this origin, empty list if
+          *         none
+          */
+-        LIBCPP_HOCON_EXPORT virtual std::vector<std::string> const& comments() const = 0;
++        CPP_HOCON_EXPORT virtual std::vector<std::string> const& comments() const = 0;
+ 
+         /**
+          * Returns a {@code config_origin} based on this one, but with the given
+@@ -92,7 +92,7 @@ namespace hocon {
+          * @param comments the comments used on the returned origin
+          * @return the config_origin with the given comments
+          */
+-        LIBCPP_HOCON_EXPORT virtual shared_origin with_comments(std::vector<std::string> comments) const = 0;
++        CPP_HOCON_EXPORT virtual shared_origin with_comments(std::vector<std::string> comments) const = 0;
+     };
+ 
+ }  // namespace hocon
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_config__parse__options.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__parse__options.hpp
new file mode 100644
index 00000000000..45b8ef7167a
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__parse__options.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/config_parse_options.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/config_parse_options.hpp
+@@ -22,7 +22,7 @@ namespace hocon {
+      *
+      * ClassLoader is Java-specific, so it was not ported to C++.
+      */
+-    class LIBCPP_HOCON_EXPORT config_parse_options {
++    class CPP_HOCON_EXPORT config_parse_options {
+     public:
+         /**
+          * Gets an instance of <code>config_parse_options</code> with all fields
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_config__parseable.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__parseable.hpp
new file mode 100644
index 00000000000..adde77404f4
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__parseable.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/config_parseable.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/config_parseable.hpp
+@@ -16,7 +16,7 @@ namespace hocon {
+      * interface is likely to grow new methods over time, so third-party
+      * implementations will break.
+      */
+-    class LIBCPP_HOCON_EXPORT config_parseable {
++    class CPP_HOCON_EXPORT config_parseable {
+     public:
+         /**
+          * Parse whatever it is. The options should come from
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_config__render__options.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__render__options.hpp
new file mode 100644
index 00000000000..ed2796cd80f
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__render__options.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/config_render_options.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/config_render_options.hpp
+@@ -17,7 +17,7 @@ namespace hocon {
+      *         config_render_options().set_comments(false)
+      * </pre>
+      */
+-    class LIBCPP_HOCON_EXPORT config_render_options {
++    class CPP_HOCON_EXPORT config_render_options {
+     public:
+         /** Leaving the default arguments will result in a verbose rendering,
+          * which contains comments and therefore is not valid JSON.
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_config__resolve__options.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__resolve__options.hpp
new file mode 100644
index 00000000000..d071230a5e0
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__resolve__options.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/config_resolve_options.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/config_resolve_options.hpp
+@@ -27,7 +27,7 @@ namespace hocon {
+      * environment variables or other external system information. (Right now,
+      * environment variables are the only example.)
+      */
+-    class LIBCPP_HOCON_EXPORT config_resolve_options {
++    class CPP_HOCON_EXPORT config_resolve_options {
+     public:
+         /**
+          * Returns the default resolve options. By default the system environment
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_config__value.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__value.hpp
new file mode 100644
index 00000000000..ce7296825c7
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__value.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/config_value.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/config_value.hpp
+@@ -36,7 +36,7 @@ namespace hocon {
+      * Also, this interface is likely to grow new methods over time, so third-party
+      * implementations will break.
+      */
+-    class LIBCPP_HOCON_EXPORT config_value : public config_mergeable, public std::enable_shared_from_this<config_value> {
++    class CPP_HOCON_EXPORT config_value : public config_mergeable, public std::enable_shared_from_this<config_value> {
+         friend class token;
+         friend class value;
+         friend class default_transformer;
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_config__value__factory.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__value__factory.hpp
new file mode 100644
index 00000000000..ff244d45672
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_config__value__factory.hpp
@@ -0,0 +1,14 @@
+--- lib/inc/hocon/config_value_factory.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/config_value_factory.hpp
+@@ -2,9 +2,10 @@
+ 
+ #include "types.hpp"
+ #include "export.h"
++#include <string>
+ 
+ namespace hocon {
+-    class LIBCPP_HOCON_EXPORT config_value_factory {
++    class CPP_HOCON_EXPORT config_value_factory {
+          public:
+          /**
+           * Creates a {@link ConfigValue} from a plain value, which may be
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_parser_config__document.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_parser_config__document.hpp
new file mode 100644
index 00000000000..77db63b1de2
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_parser_config__document.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/parser/config_document.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/parser/config_document.hpp
+@@ -23,7 +23,7 @@ namespace hocon {
+      * Also, this interface is likely to grow new methods over time, so third-party
+      * implementations will break.
+      */
+-    class LIBCPP_HOCON_EXPORT config_document {
++    class CPP_HOCON_EXPORT config_document {
+     public:
+         /**
+          * Returns a new config_document that is a copy of the current config_document,
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_parser_config__document__factory.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_parser_config__document__factory.hpp
new file mode 100644
index 00000000000..6d00cdd8a74
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_parser_config__document__factory.hpp
@@ -0,0 +1,28 @@
+--- lib/inc/hocon/parser/config_document_factory.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/parser/config_document_factory.hpp
+@@ -18,11 +18,11 @@ namespace hocon { namespace config_docum
+      *       parse options to control how the file is interpreted
+      * @return the parsed configuration
+      */
+-    LIBCPP_HOCON_EXPORT std::shared_ptr<config_document> parse_file(std::string input_file_path,
++    CPP_HOCON_EXPORT std::shared_ptr<config_document> parse_file(std::string input_file_path,
+                                                                     config_parse_options options);
+ 
+     /** Parses a file into a config_document instance using default options. */
+-    LIBCPP_HOCON_EXPORT std::shared_ptr<config_document> parse_file(std::string input_file_path);
++    CPP_HOCON_EXPORT std::shared_ptr<config_document> parse_file(std::string input_file_path);
+ 
+     /**
+      * Parses a string which should be valid HOCON or JSON.
+@@ -31,9 +31,9 @@ namespace hocon { namespace config_docum
+      * @param options parse options
+      * @return the parsed configuration
+      */
+-    LIBCPP_HOCON_EXPORT std::shared_ptr<config_document> parse_string(std::string s, config_parse_options options);
++    CPP_HOCON_EXPORT std::shared_ptr<config_document> parse_string(std::string s, config_parse_options options);
+ 
+     /** Parses a string into a config_document instance using default options. */
+-    LIBCPP_HOCON_EXPORT std::shared_ptr<config_document> parse_string(std::string s);
++    CPP_HOCON_EXPORT std::shared_ptr<config_document> parse_string(std::string s);
+ 
+ }}  // namespace hocon::config_document_factory
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_parser_config__node.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_parser_config__node.hpp
new file mode 100644
index 00000000000..f5fbcff5b2c
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_parser_config__node.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/parser/config_node.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/parser/config_node.hpp
+@@ -18,7 +18,7 @@ namespace hocon {
+      * Also, this interface is likely to grow new methods over time, so third-party
+      * implementations will break.
+      */
+-    class LIBCPP_HOCON_EXPORT config_node {
++    class CPP_HOCON_EXPORT config_node {
+     public:
+         /**
+          * The original text of the input which was used to form this particular
diff --git a/devel/cpp-hocon/files/patch-lib_inc_hocon_path.hpp b/devel/cpp-hocon/files/patch-lib_inc_hocon_path.hpp
new file mode 100644
index 00000000000..0fa53ae9cdf
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_inc_hocon_path.hpp
@@ -0,0 +1,11 @@
+--- lib/inc/hocon/path.hpp.orig	2016-09-23 20:45:10 UTC
++++ lib/inc/hocon/path.hpp
+@@ -10,7 +10,7 @@
+ 
+ namespace hocon {
+ 
+-    class LIBCPP_HOCON_EXPORT path {
++    class CPP_HOCON_EXPORT path {
+     public:
+         path();
+         explicit path(std::string first, path const& remainder);
diff --git a/devel/cpp-hocon/files/patch-lib_src_config__value__factory.cc b/devel/cpp-hocon/files/patch-lib_src_config__value__factory.cc
new file mode 100644
index 00000000000..592982846c9
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_src_config__value__factory.cc
@@ -0,0 +1,63 @@
+--- lib/src/config_value_factory.cc.orig	2016-09-23 20:45:10 UTC
++++ lib/src/config_value_factory.cc
+@@ -17,27 +17,27 @@ namespace hocon {
+         // TODO: If use cases of from_any_ref require other types to produce config_nulls,
+         // we can revise this behavior
+         shared_value operator()(boost::blank null_value) const {
+-            return make_shared<const config_null>(nullptr);
++            return make_shared<config_null>(nullptr);
+         }
+ 
+         shared_value operator()(string str) const {
+-            return make_shared<const config_string>(nullptr, str, config_string_type::QUOTED);
++            return make_shared<config_string>(nullptr, str, config_string_type::QUOTED);
+         }
+ 
+         shared_value operator()(int64_t num) const {
+-            return make_shared<const config_long>(nullptr, num, "");
++            return make_shared<config_long>(nullptr, num, "");
+         }
+ 
+         shared_value operator()(double num) const {
+-            return make_shared<const config_double>(nullptr, num, "");
++            return make_shared<config_double>(nullptr, num, "");
+         }
+ 
+         shared_value operator()(int num) const {
+-            return make_shared<const config_int>(nullptr, num, "");
++            return make_shared<config_int>(nullptr, num, "");
+         }
+ 
+         shared_value operator()(bool boolean) const {
+-            return make_shared<const config_boolean>(nullptr, boolean);
++            return make_shared<config_boolean>(nullptr, boolean);
+         }
+ 
+         shared_value operator()(vector<unwrapped_value> value_list) const {
+@@ -45,7 +45,7 @@ namespace hocon {
+             for (unwrapped_value v : value_list) {
+                 config_values.emplace_back(boost::apply_visitor(config_value_visitor(), v));
+             }
+-            return make_shared<const simple_config_list>(nullptr, config_values);
++            return make_shared<simple_config_list>(nullptr, config_values);
+         }
+ 
+         shared_value operator()(unordered_map<string, unwrapped_value> value_map) const {
+@@ -53,7 +53,7 @@ namespace hocon {
+             for (auto pair : value_map) {
+                 config_map[pair.first] = boost::apply_visitor(config_value_visitor(), pair.second);
+             }
+-            return make_shared<const simple_config_object>(nullptr, config_map);
++            return make_shared<simple_config_object>(nullptr, config_map);
+         }
+     };
+ 
+@@ -62,7 +62,7 @@ namespace hocon {
+         if (origin.empty()) {
+             origin = "hardcoded value";
+         }
+-        auto conf_origin = make_shared<const simple_config_origin>(origin);
++        auto conf_origin = make_shared<simple_config_origin>(origin);
+         return boost::apply_visitor(config_value_visitor(), value)->with_origin(conf_origin);
+     }
+ }  // namespace hocon
diff --git a/devel/cpp-hocon/files/patch-lib_tests_CMakeLists.txt b/devel/cpp-hocon/files/patch-lib_tests_CMakeLists.txt
new file mode 100644
index 00000000000..9273fafa82a
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_tests_CMakeLists.txt
@@ -0,0 +1,31 @@
+--- lib/tests/CMakeLists.txt.orig	2016-09-23 20:45:10 UTC
++++ lib/tests/CMakeLists.txt
+@@ -18,23 +18,23 @@ set(TEST_CASES
+     program_options.cc
+ )
+ 
+-add_executable(lib${PROJECT_NAME}_test $<TARGET_OBJECTS:libprojectsrc> ${TEST_CASES} main.cc)
++add_executable(${PROJECT_NAME}_test $<TARGET_OBJECTS:libprojectsrc> ${TEST_CASES} main.cc)
+ 
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" OR ${CMAKE_SYSTEM_NAME} MATCHES "SunOS")
+-    target_link_libraries(lib${PROJECT_NAME}_test rt)
++    target_link_libraries(${PROJECT_NAME}_test rt)
+ endif()
+ 
+-target_link_libraries(lib${PROJECT_NAME}_test
++target_link_libraries(${PROJECT_NAME}_test
+     ${Boost_LIBRARIES}
+     ${LEATHERMAN_LIBRARIES}
+     ${CMAKE_THREAD_LIBS_INIT}
+ )
+ 
+ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" AND BOOST_STATIC AND LEATHERMAN_USE_LOCALES)
+-    target_link_libraries(lib${PROJECT_NAME}_test iconv)
++    target_link_libraries(${PROJECT_NAME}_test iconv)
+ endif()
+ 
+-add_test(NAME "unit_tests" COMMAND lib${PROJECT_NAME}_test)
++add_test(NAME "unit_tests" COMMAND ${PROJECT_NAME}_test)
+ 
+ configure_file (
+     "${CMAKE_CURRENT_LIST_DIR}/fixtures.hpp.in"
diff --git a/devel/cpp-hocon/files/patch-lib_tests_config__value__test.cc b/devel/cpp-hocon/files/patch-lib_tests_config__value__test.cc
new file mode 100644
index 00000000000..3cb67ae67c1
--- /dev/null
+++ b/devel/cpp-hocon/files/patch-lib_tests_config__value__test.cc
@@ -0,0 +1,20 @@
+--- lib/tests/config_value_test.cc.orig	2016-09-23 20:45:10 UTC
++++ lib/tests/config_value_test.cc
+@@ -91,7 +91,7 @@ TEST_CASE("config object unwraps") {
+     auto value2 = config_int::new_number(fake_origin(), int64_t(2), "2");
+     auto value3 = config_int::new_number(fake_origin(), int64_t(3), "3");
+     unordered_map<string, shared_value> org {{"a", value1}, {"b", value2}, {"c", value3}};
+-    auto obj = make_shared<const simple_config_object>(fake_origin(), org);
++    auto obj = make_shared<simple_config_object>(fake_origin(), org);
+     unordered_map<string, unwrapped_value> map {{"a", 1}, {"b", 2}, {"c", 3}};
+     unwrapped_value expected(map);
+     bool test = expected == obj->unwrapped();
+@@ -103,7 +103,7 @@ TEST_CASE("config list unwraps") {
+     auto value2 = config_int::new_number(fake_origin(), int64_t(2), "2");
+     auto value3 = config_int::new_number(fake_origin(), int64_t(3), "3");
+     vector<shared_value> data { value1, value2, value3 };
+-    auto list = make_shared<const simple_config_list>(fake_origin(), data);
++    auto list = make_shared<simple_config_list>(fake_origin(), data);
+     vector<unwrapped_value> v { 1,2,3 };
+     unwrapped_value expected(v);
+     bool test = expected == list->unwrapped();
diff --git a/devel/cpp-hocon/pkg-descr b/devel/cpp-hocon/pkg-descr
new file mode 100644
index 00000000000..9b2552771a0
--- /dev/null
+++ b/devel/cpp-hocon/pkg-descr
@@ -0,0 +1,3 @@
+A C++ implementation of the HOCON configuration file format.
+
+WWW: https://github.com/puppetlabs/cpp-hocon
diff --git a/devel/cpp-hocon/pkg-plist b/devel/cpp-hocon/pkg-plist
new file mode 100644
index 00000000000..a5bb0d50dbb
--- /dev/null
+++ b/devel/cpp-hocon/pkg-plist
@@ -0,0 +1,28 @@
+include/hocon/config.hpp
+include/hocon/config_exception.hpp
+include/hocon/config_include_context.hpp
+include/hocon/config_includer.hpp
+include/hocon/config_includer_file.hpp
+include/hocon/config_list.hpp
+include/hocon/config_mergeable.hpp
+include/hocon/config_object.hpp
+include/hocon/config_origin.hpp
+include/hocon/config_parse_options.hpp
+include/hocon/config_parseable.hpp
+include/hocon/config_render_options.hpp
+include/hocon/config_resolve_options.hpp
+include/hocon/config_syntax.hpp
+include/hocon/config_value.hpp
+include/hocon/config_value_factory.hpp
+include/hocon/config_value_factory.hpp.orig
+include/hocon/export.h
+include/hocon/functional_list.hpp
+include/hocon/parser/config_document.hpp
+include/hocon/parser/config_document_factory.hpp
+include/hocon/parser/config_node.hpp
+include/hocon/path.hpp
+include/hocon/program_options.hpp
+include/hocon/types.hpp
+include/hocon/version.h
+lib/libcpp-hocon.so
+lib/libcpp-hocon.so.0.1.2
diff --git a/devel/dia2code+/Makefile b/devel/dia2code+/Makefile
new file mode 100644
index 00000000000..c5fecf4111a
--- /dev/null
+++ b/devel/dia2code+/Makefile
@@ -0,0 +1,29 @@
+# Created by: Muhammad Moinur Rahman <bofh@FreeBSD.org>
+# $FreeBSD$
+
+PORTNAME=	dia2code+
+PORTVERSION=	1.0.0
+CATEGORIES=	devel
+MASTER_SITES=	SF/dia2code/dia2code+/${PORTVERSION}
+DISTNAME=	dia2code-${PORTVERSION}
+
+MAINTAINER=	bofh@FreeBSD.org
+COMMENT=	Complete rewrite of dia2code in C++
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USES=		autoreconf:build compiler:gcc-c++11-lib iconv
+USE_GNOME=	libxml2
+GNU_CONFIGURE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+PLIST_FILES=	bin/dia2code \
+		man/man1/dia2code.1.gz
+
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/docs/dia2code.1 ${STAGEDIR}${MANPREFIX}/man/man1
+
+.include <bsd.port.mk>
diff --git a/devel/dia2code+/distinfo b/devel/dia2code+/distinfo
new file mode 100644
index 00000000000..59eb89e2733
--- /dev/null
+++ b/devel/dia2code+/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1488715576
+SHA256 (dia2code-1.0.0.tar.gz) = c7746379cd15267fc3f600af16f77490e28f3becd260b7440f53776239ad491d
+SIZE (dia2code-1.0.0.tar.gz) = 946967
diff --git a/devel/dia2code+/pkg-descr b/devel/dia2code+/pkg-descr
new file mode 100644
index 00000000000..7065b7859a0
--- /dev/null
+++ b/devel/dia2code+/pkg-descr
@@ -0,0 +1,17 @@
+Dia2Code is a small utility used to generate code from a Dia diagram.
+Dia is a program to make diagrams (ports/graphics/dia)
+
+   - Reads UML diagrams.
+   - Can handle UML - Generalization, UML - Realization and UML - Implements.
+   - Selective code generation.
+   - User-defined output directory.
+   - Stereotype handling: interfaces, abstract classes.
+   - "Import" and "include" based on the parent classes, the type of
+     attributes and return type of methods if they're declared in the same
+     diagram.
+   - Support for JavaBeans(tm): will create automagically methods to access
+     and modify each attribute.
+
+This is a complete rewrite of dia2code in C++ contributed by Vincent Le Garrec.
+
+WWW: http://dia2code.sourceforge.net/
diff --git a/devel/dia2code/Makefile b/devel/dia2code/Makefile
index 9242ed31a63..dd6fefa3a69 100644
--- a/devel/dia2code/Makefile
+++ b/devel/dia2code/Makefile
@@ -12,6 +12,8 @@ COMMENT=	Small utility used to generate code from a Dia diagram
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+PORTSCOUT=	limit:^0\.
+
 USES=		iconv
 USE_GNOME=	libxml2
 GNU_CONFIGURE=	yes
diff --git a/devel/google-gdata/Makefile b/devel/google-gdata/Makefile
index 648ec51ea2d..f9736f4cd16 100644
--- a/devel/google-gdata/Makefile
+++ b/devel/google-gdata/Makefile
@@ -14,7 +14,8 @@ LICENSE=	APACHE20
 BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/Newtonsoft.Json.pc:devel/newtonsoft-json
 
 USE_GITHUB=	yes
-GH_TUPLE=	google:google-gdata:edcd096379
+GH_ACCOUNT=	google
+GH_TAGNAME=	edcd096379
 
 USES=		dos2unix gmake mono pathfix
 PATHFIX_MAKEFILEIN=	Makefile
diff --git a/devel/gsoap/Makefile b/devel/gsoap/Makefile
index e67c5dae1b4..151e0c76551 100644
--- a/devel/gsoap/Makefile
+++ b/devel/gsoap/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gsoap
-PORTVERSION=	2.8.43
+PORTVERSION=	2.8.44
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}2/gsoap-2.8
 DISTNAME=	${PORTNAME}_${PORTVERSION}
diff --git a/devel/gsoap/distinfo b/devel/gsoap/distinfo
index 7f74e4fe01d..0fb05ca22d0 100644
--- a/devel/gsoap/distinfo
+++ b/devel/gsoap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486809614
-SHA256 (gsoap_2.8.43.zip) = 75e898933432968cabfe1173278956a978d10152d51755a91e2c7578ca3ab66f
-SIZE (gsoap_2.8.43.zip) = 36710317
+TIMESTAMP = 1488717745
+SHA256 (gsoap_2.8.44.zip) = c61dd4d228e55177b6251bcde6d37c834eeedae434c43ad3af07e38e4b84f94e
+SIZE (gsoap_2.8.44.zip) = 36197714
diff --git a/devel/jenkins/Makefile b/devel/jenkins/Makefile
index 089d0f0ed9e..b0d3d2ad5f6 100644
--- a/devel/jenkins/Makefile
+++ b/devel/jenkins/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	jenkins
-PORTVERSION=	2.47
+PORTVERSION=	2.49
 CATEGORIES=	devel java
 MASTER_SITES=	http://mirrors.jenkins-ci.org/war/${PORTVERSION}/
 DISTNAME=	jenkins
diff --git a/devel/jenkins/distinfo b/devel/jenkins/distinfo
index 5aff5a69ceb..d94b54dfc50 100644
--- a/devel/jenkins/distinfo
+++ b/devel/jenkins/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487568234
-SHA256 (jenkins/2.47/jenkins.war) = df8203812375f9ba6cfc4d5a3ef278836fe00973f5e02a8326b8141ece56cc24
-SIZE (jenkins/2.47/jenkins.war) = 68676619
+TIMESTAMP = 1488863542
+SHA256 (jenkins/2.49/jenkins.war) = 2329d5cce5a57fc9778179a61074d670e04eb13631d448e0eb2ff3837ab6f830
+SIZE (jenkins/2.49/jenkins.war) = 68682753
diff --git a/devel/ksql/Makefile b/devel/ksql/Makefile
new file mode 100644
index 00000000000..0c0267bf7e6
--- /dev/null
+++ b/devel/ksql/Makefile
@@ -0,0 +1,19 @@
+# $FreeBSD$
+
+PORTNAME=	ksql
+PORTVERSION=	0.0.9
+CATEGORIES=	devel databases
+MASTER_SITES=	http://kristaps.bsd.lv/ksql/snapshots/
+
+MAINTAINER=	tobik@FreeBSD.org
+COMMENT=	Lazy man's wrapper for the SQLite C API
+
+LICENSE=	ISCL
+
+LIB_DEPENDS=	libsqlite3.so:databases/sqlite3
+
+USES=	localbase
+MAKE_ARGS=	PREFIX="${STAGEDIR}${PREFIX}"
+ALL_TARGET=	libksql.a
+
+.include <bsd.port.mk>
diff --git a/devel/ksql/distinfo b/devel/ksql/distinfo
new file mode 100644
index 00000000000..b4f9a3f76fb
--- /dev/null
+++ b/devel/ksql/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1488715533
+SHA256 (ksql-0.0.9.tar.gz) = 052706ece35ca780be87ec2b645d91e62366d3bc8ee7acad50ddb12a35b2da08
+SIZE (ksql-0.0.9.tar.gz) = 11669
diff --git a/devel/ksql/pkg-descr b/devel/ksql/pkg-descr
new file mode 100644
index 00000000000..78a9c5a5af4
--- /dev/null
+++ b/devel/ksql/pkg-descr
@@ -0,0 +1,8 @@
+Ksql is a "lazy man's" wrapper for the SQLite C API.  It is written to
+make sure sloppy programming won't cause your SQLite database to be
+inconsistent (transactions and statements open on exit and certain
+signals).  Specifically, it exits on any database errors; and upon
+exit (or signal), cleans up open statements, transactions, and
+databases.
+
+WWW: https://kristaps.bsd.lv/ksql/
diff --git a/devel/ksql/pkg-plist b/devel/ksql/pkg-plist
new file mode 100644
index 00000000000..19a46ee0b80
--- /dev/null
+++ b/devel/ksql/pkg-plist
@@ -0,0 +1,16 @@
+include/ksql.h
+lib/libksql.a
+man/man3/ksql.3.gz
+man/man3/ksql_alloc.3.gz
+man/man3/ksql_bind_double.3.gz
+man/man3/ksql_close.3.gz
+man/man3/ksql_exec.3.gz
+man/man3/ksql_free.3.gz
+man/man3/ksql_lastid.3.gz
+man/man3/ksql_open.3.gz
+man/man3/ksql_stmt_alloc.3.gz
+man/man3/ksql_stmt_double.3.gz
+man/man3/ksql_stmt_free.3.gz
+man/man3/ksql_stmt_reset.3.gz
+man/man3/ksql_trans_commit.3.gz
+man/man3/ksql_trans_open.3.gz
diff --git a/devel/lfcbase/Makefile b/devel/lfcbase/Makefile
index f6e710c9dc8..10f7df3e0e9 100644
--- a/devel/lfcbase/Makefile
+++ b/devel/lfcbase/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	lfcbase
-PORTVERSION=	1.8.12
+PORTVERSION=	1.9.0
 CATEGORIES=	devel
 MASTER_SITES=	http://www.lemke-it.com/
 
diff --git a/devel/lfcbase/distinfo b/devel/lfcbase/distinfo
index 7bf29737e8d..e24e2e48591 100644
--- a/devel/lfcbase/distinfo
+++ b/devel/lfcbase/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485681093
-SHA256 (lfcbase-1.8.12.tar.gz) = ac87b4b52e864cf870cd28b44d7f7c6dfb1cec7a83970d273af219c9642a0660
-SIZE (lfcbase-1.8.12.tar.gz) = 602384
+TIMESTAMP = 1488708749
+SHA256 (lfcbase-1.9.0.tar.gz) = 6952bcfd6144b4a6be315729f9669f829fa5461a73e4f41db28695447e609f6f
+SIZE (lfcbase-1.9.0.tar.gz) = 613129
diff --git a/devel/lfcbase/pkg-plist b/devel/lfcbase/pkg-plist
index f2b2742a5b2..7f361e97156 100644
--- a/devel/lfcbase/pkg-plist
+++ b/devel/lfcbase/pkg-plist
@@ -17,9 +17,11 @@ include/lfcbase/Host.h
 include/lfcbase/ListT.h
 include/lfcbase/Logger.h
 include/lfcbase/Matcher.h
+include/lfcbase/Monitor.h
 include/lfcbase/NanoTimer.h
 include/lfcbase/Net.h
 include/lfcbase/NetHandler.h
+include/lfcbase/Pager.h
 include/lfcbase/Process.h
 include/lfcbase/Semaphore.h
 include/lfcbase/SetT.h
diff --git a/devel/liblognorm/Makefile b/devel/liblognorm/Makefile
index 91c414d750e..0d62fd424ea 100644
--- a/devel/liblognorm/Makefile
+++ b/devel/liblognorm/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	liblognorm
-PORTVERSION=	2.0.1
+PORTVERSION=	2.0.2
 CATEGORIES=	devel net security
 MASTER_SITES=	http://www.liblognorm.com/download/files/download/
 
diff --git a/devel/liblognorm/distinfo b/devel/liblognorm/distinfo
index f7f2f000c2f..26c569429b7 100644
--- a/devel/liblognorm/distinfo
+++ b/devel/liblognorm/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471038996
-SHA256 (liblognorm-2.0.1.tar.gz) = 6a7fda0da2791a87c808fbfde1af20e6463e3ff73496aae7756e3440f3bc5b75
-SIZE (liblognorm-2.0.1.tar.gz) = 657390
+TIMESTAMP = 1488722259
+SHA256 (liblognorm-2.0.2.tar.gz) = 1689453feb4fa5343475cc08379d9e3f0f4c767a3669aa6adb553905d14447db
+SIZE (liblognorm-2.0.2.tar.gz) = 658976
diff --git a/devel/libsearpc/Makefile b/devel/libsearpc/Makefile
index ca7a75d3160..febcf3233d6 100644
--- a/devel/libsearpc/Makefile
+++ b/devel/libsearpc/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	libsearpc
 PORTVERSION=	3.1.0
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	ultima1252@gmail.com
@@ -23,22 +24,4 @@ USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 
-HAIWENDIR=	www/haiwen
-SEAFILE_SERVER=	${HAIWENDIR}/seafile-server
-SEALIB=		${SEAFILE_SERVER}/seafile/lib
-
-USERS=		seafile
-GROUPS=		${USERS}
-
-PLIST_SUB=	USERS=${USERS} \
-		GROUPS=${GROUPS} \
-		SEAFILE_SERVER=${SEAFILE_SERVER} \
-		HAIWENDIR=${HAIWENDIR}
-
-post-install:
-	@${MKDIR} ${STAGEDIR}${SEALIB}
-	(cd ${STAGEDIR}${PREFIX}/lib && \
-		${COPYTREE_SHARE} ${PYTHON_VERSION} ${STAGEDIR}${PREFIX}/${SEALIB})
-	${RM} -r ${STAGEDIR}${PREFIX}/lib/${PYTHON_VERSION}
-
 .include <bsd.port.mk>
diff --git a/devel/libsearpc/pkg-plist b/devel/libsearpc/pkg-plist
index 66c8f235b33..16b01a3dafa 100644
--- a/devel/libsearpc/pkg-plist
+++ b/devel/libsearpc/pkg-plist
@@ -9,16 +9,15 @@ lib/libsearpc.so
 lib/libsearpc.so.1
 lib/libsearpc.so.1.0.2
 libdata/pkgconfig/libsearpc.pc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/__init__.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/__init__.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/__init__.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/client.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/client.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/client.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/common.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/common.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/common.pyo
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/server.py
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/server.pyc
-%%SEAFILE_SERVER%%/seafile/%%PYTHON_SITELIBDIR%%/pysearpc/server.pyo
-@dir(%%USERS%%,%%GROUPS%%,755) %%HAIWENDIR%%
+%%PYTHON_SITELIBDIR%%/pysearpc/__init__.py
+%%PYTHON_SITELIBDIR%%/pysearpc/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pysearpc/client.py
+%%PYTHON_SITELIBDIR%%/pysearpc/client.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/client.pyo
+%%PYTHON_SITELIBDIR%%/pysearpc/common.py
+%%PYTHON_SITELIBDIR%%/pysearpc/common.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/common.pyo
+%%PYTHON_SITELIBDIR%%/pysearpc/server.py
+%%PYTHON_SITELIBDIR%%/pysearpc/server.pyc
+%%PYTHON_SITELIBDIR%%/pysearpc/server.pyo
diff --git a/devel/liteide/Makefile b/devel/liteide/Makefile
index 30dae76cd59..a0d52e1f91a 100644
--- a/devel/liteide/Makefile
+++ b/devel/liteide/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	liteide
-PORTVERSION=	30.3
+PORTVERSION=	31
 DISTVERSIONPREFIX=	x
 CATEGORIES=	devel editors
 
diff --git a/devel/liteide/distinfo b/devel/liteide/distinfo
index 89976f3d886..110de9666c5 100644
--- a/devel/liteide/distinfo
+++ b/devel/liteide/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481413618
-SHA256 (visualfc-liteide-x30.3_GH0.tar.gz) = 4fa77c0e2f35f8dc4a7f8636560afb0f5dca09bfde99b56c30516f5790096971
-SIZE (visualfc-liteide-x30.3_GH0.tar.gz) = 2323139
+TIMESTAMP = 1488552551
+SHA256 (visualfc-liteide-x31_GH0.tar.gz) = e71ea7d119d6788ea94025231d466a2e881d864cdd03eb3a4d851910271ce459
+SIZE (visualfc-liteide-x31_GH0.tar.gz) = 2329597
diff --git a/devel/monodevelop/Makefile b/devel/monodevelop/Makefile
index ca345d5dd07..f1799854355 100644
--- a/devel/monodevelop/Makefile
+++ b/devel/monodevelop/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	monodevelop
 PORTVERSION=	6.1.2.44
+DISTVERSIONPREFIX=	${PORTNAME}-
 CATEGORIES=	devel
 
 MAINTAINER=	mono@FreeBSD.org
@@ -42,8 +43,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-release --disable-update-mimedb --disable-update-desktopdb \
 		--enable-maintainer-mode --enable-gnomeplatform --enable-git
 USE_GITHUB=	yes
-GH_TUPLE=	mono:${PORTNAME}:${PORTNAME}-${PORTVERSION} \
-		icsharpcode:RefactoringEssentials:cbd2d9e:RefactoringEssentials \
+GH_ACCOUNT=	mono
+GH_TUPLE=	icsharpcode:RefactoringEssentials:cbd2d9e:RefactoringEssentials \
 		mono:cecil:cd2ff63:cecil \
 		mono:debugger-libs:4a74b2c:debugger_libs \
 		mono:guiunit:2670780:guiunit \
diff --git a/devel/monodevelop/distinfo b/devel/monodevelop/distinfo
index c8bc231f509..4a4cf168840 100644
--- a/devel/monodevelop/distinfo
+++ b/devel/monodevelop/distinfo
@@ -1,4 +1,4 @@
-TIMESTAMP = 1479565189
+TIMESTAMP = 1488700997
 SHA256 (extcore.0.8.45.nupkg) = aadcbc638765cfe4a4d1c569b721cb9a01403872cbc5071a811e04af95cea7d0
 SIZE (extcore.0.8.45.nupkg) = 2579195
 SHA256 (fsharp.compiler.codedom.0.9.2.nupkg) = 92b9a538956775efd989517a608a366b2b926beae6be752a394f7457f77ac933
@@ -25,8 +25,8 @@ SHA256 (nunit.runners.2.6.4.nupkg) = 44877aeb399ffb14b30ecca1c073813aab71dcf9a92
 SIZE (nunit.runners.2.6.4.nupkg) = 573341
 SHA256 (newtonsoft.json.6.0.8.nupkg) = 88b57d994035a83080c7f049e93f7aba2554fe14b686b678c2eb1a8be23e6851
 SIZE (newtonsoft.json.6.0.8.nupkg) = 1562062
-SHA256 (mono-monodevelop-6.1.2.44-monodevelop-6.1.2.44_GH0.tar.gz) = 06b7b21aea806be39e876635b88a2c9ced8962ead464852724134ca67214d5a5
-SIZE (mono-monodevelop-6.1.2.44-monodevelop-6.1.2.44_GH0.tar.gz) = 16476228
+SHA256 (mono-monodevelop-monodevelop-6.1.2.44_GH0.tar.gz) = 06b7b21aea806be39e876635b88a2c9ced8962ead464852724134ca67214d5a5
+SIZE (mono-monodevelop-monodevelop-6.1.2.44_GH0.tar.gz) = 16476228
 SHA256 (icsharpcode-RefactoringEssentials-cbd2d9e_GH0.tar.gz) = a51ac4e62200a51329279347e31f3233ebc8e3afa8d8bb92af33cc870b1b2074
 SIZE (icsharpcode-RefactoringEssentials-cbd2d9e_GH0.tar.gz) = 3154094
 SHA256 (mono-cecil-cd2ff63_GH0.tar.gz) = 417709d1547b1995c8a3fb787b288b78f9bf5c3605baef2f829f35ee869a9642
diff --git a/devel/newtonsoft-json/Makefile b/devel/newtonsoft-json/Makefile
index 9eeecc3c527..f89954ba904 100644
--- a/devel/newtonsoft-json/Makefile
+++ b/devel/newtonsoft-json/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	newtonsoft-json
 PORTVERSION=	9.0.1
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	bofh@FreeBSD.org
@@ -18,6 +19,8 @@ GH_PROJECT=	Newtonsoft.Json
 
 SUB_FILES=	Newtonsoft.Json.pc
 
+NO_ARCH=	yes
+
 PLIST_FILES=	lib/mono/Newtonsoft.Json/Newtonsoft.Json.dll \
 		lib/mono/gac/Newtonsoft.Json/7.0.0.0__b9a188c8922137c6/Newtonsoft.Json.dll \
 		lib/mono/gac/Newtonsoft.Json/7.0.0.0__b9a188c8922137c6/Newtonsoft.Json.dll.mdb \
diff --git a/devel/newtonsoft-json/files/Newtonsoft.Json.pc.in b/devel/newtonsoft-json/files/Newtonsoft.Json.pc.in
index 0482b6a04cf..85af176f0bb 100644
--- a/devel/newtonsoft-json/files/Newtonsoft.Json.pc.in
+++ b/devel/newtonsoft-json/files/Newtonsoft.Json.pc.in
@@ -4,5 +4,5 @@ libdir=${exec_prefix}/lib
 
 Name: Newtonsoft JSON
 Description: Popular high-performance JSON framework for .NET.
-Version: 6.0.5
-Libs: -r:${libdir}/mono/newtonsoft.json/Newtonsoft.Json.dll
+Version: 9.0.1
+Libs: -r:${libdir}/mono/Newtonsoft.Json/Newtonsoft.Json.dll
diff --git a/devel/p5-Class-Multimethods/Makefile b/devel/p5-Class-Multimethods/Makefile
index f36fb1b8cd1..80ab890aaa3 100644
--- a/devel/p5-Class-Multimethods/Makefile
+++ b/devel/p5-Class-Multimethods/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Class-Multimethods
-PORTVERSION=	1.70
-PORTREVISION=	1
+PORTVERSION=	1.701
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -14,7 +13,9 @@ COMMENT=	Support multimethods and function overloading in Perl
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-1.700
 USES=		perl5
 USE_PERL5=	configure
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Class-Multimethods/distinfo b/devel/p5-Class-Multimethods/distinfo
index eee120475c8..8ffd63f0d46 100644
--- a/devel/p5-Class-Multimethods/distinfo
+++ b/devel/p5-Class-Multimethods/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Class-Multimethods-1.70.tar.gz) = e6f2fe15530d9e03629c6f42d538bbf81419965dc47094fd0e36ce8302069c23
-SIZE (Class-Multimethods-1.70.tar.gz) = 28316
+TIMESTAMP = 1488723381
+SHA256 (Class-Multimethods-1.701.tar.gz) = eec283d159bf05fecfcdf72e84ea814c8320022bca6ce7c70760e72231f8758c
+SIZE (Class-Multimethods-1.701.tar.gz) = 31394
diff --git a/devel/p5-Class-Multimethods/pkg-plist b/devel/p5-Class-Multimethods/pkg-plist
index 8eccd987c58..b1c35a4285f 100644
--- a/devel/p5-Class-Multimethods/pkg-plist
+++ b/devel/p5-Class-Multimethods/pkg-plist
@@ -1,3 +1,2 @@
 %%PERL5_MAN3%%/Class::Multimethods.3.gz
 %%SITE_PERL%%/Class/Multimethods.pm
-%%SITE_PERL%%/Class/Multimethods.pod
diff --git a/devel/p5-Config-Model-Tester/Makefile b/devel/p5-Config-Model-Tester/Makefile
index 731b9e632f5..75491cd5ee7 100644
--- a/devel/p5-Config-Model-Tester/Makefile
+++ b/devel/p5-Config-Model-Tester/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Config-Model-Tester
-PORTVERSION=	2.059
+PORTVERSION=	2.060
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Model-Tester/distinfo b/devel/p5-Config-Model-Tester/distinfo
index 0b669754931..3db434ea5a3 100644
--- a/devel/p5-Config-Model-Tester/distinfo
+++ b/devel/p5-Config-Model-Tester/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487007335
-SHA256 (Config-Model-Tester-2.059.tar.gz) = 6831d5734e1fc2a77157a450e92a33ecf79de78c83655656e051c309206f0b23
-SIZE (Config-Model-Tester-2.059.tar.gz) = 23552
+TIMESTAMP = 1488809750
+SHA256 (Config-Model-Tester-2.060.tar.gz) = a0640a8d36a7b2ce0e19d9d85ff41c3ef2b1bf7b1980c8a5a581aae26ffcb5e4
+SIZE (Config-Model-Tester-2.060.tar.gz) = 23830
diff --git a/devel/p5-Config-Model/Makefile b/devel/p5-Config-Model/Makefile
index 9ac9970f05c..84d1754cf40 100644
--- a/devel/p5-Config-Model/Makefile
+++ b/devel/p5-Config-Model/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Config-Model
-PORTVERSION=	2.098
+PORTVERSION=	2.099
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Config-Model/distinfo b/devel/p5-Config-Model/distinfo
index 4e73f5f3bc2..d83c8cb6942 100644
--- a/devel/p5-Config-Model/distinfo
+++ b/devel/p5-Config-Model/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488200465
-SHA256 (Config-Model-2.098.tar.gz) = 8ae47641889e4d1ea87c009d322b2fe0a0cc0c32a36391377994213cb267bdf2
-SIZE (Config-Model-2.098.tar.gz) = 341704
+TIMESTAMP = 1488784260
+SHA256 (Config-Model-2.099.tar.gz) = f27254c42c2cbf7e27e8dd908cec08808fa3ce55f4f36e1d5924aeea33088c0a
+SIZE (Config-Model-2.099.tar.gz) = 341958
diff --git a/devel/p5-DateTime-Locale/Makefile b/devel/p5-DateTime-Locale/Makefile
index c0d126134ef..e0c29be73ae 100644
--- a/devel/p5-DateTime-Locale/Makefile
+++ b/devel/p5-DateTime-Locale/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	DateTime-Locale
-PORTVERSION=	1.12
+PORTVERSION=	1.14
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-DateTime-Locale/distinfo b/devel/p5-DateTime-Locale/distinfo
index 975523f8190..8d3563ffe6d 100644
--- a/devel/p5-DateTime-Locale/distinfo
+++ b/devel/p5-DateTime-Locale/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485797807
-SHA256 (DateTime-Locale-1.12.tar.gz) = de8fbe233c81c099c1a0550dfb71a7bb3699bed685d944ef96dceca6e8b358cf
-SIZE (DateTime-Locale-1.12.tar.gz) = 1015364
+TIMESTAMP = 1488780831
+SHA256 (DateTime-Locale-1.14.tar.gz) = 41a84e5bcdca87e01c8edb82bcc089df70f201c894c7def715259624a8306cdd
+SIZE (DateTime-Locale-1.14.tar.gz) = 1024226
diff --git a/devel/p5-MCE/Makefile b/devel/p5-MCE/Makefile
index 70fcc325377..6481f89b6b2 100644
--- a/devel/p5-MCE/Makefile
+++ b/devel/p5-MCE/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	MCE
-PORTVERSION=	1.818
+PORTVERSION=	1.819
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 MASTER_SITE_SUBDIR=	CPAN:MARIOROY
diff --git a/devel/p5-MCE/distinfo b/devel/p5-MCE/distinfo
index 032693cb4bf..fc1f09fc089 100644
--- a/devel/p5-MCE/distinfo
+++ b/devel/p5-MCE/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488533279
-SHA256 (MCE-1.818.tar.gz) = a2339bab85a74908e1807881e64a7d58e6926b45928368ce14d496ebeeb31ec3
-SIZE (MCE-1.818.tar.gz) = 175329
+TIMESTAMP = 1488737608
+SHA256 (MCE-1.819.tar.gz) = 2d67d3c4d3c33a244251bc815dde7fb960cda4574c1b42c21af07cf38337e4a3
+SIZE (MCE-1.819.tar.gz) = 175406
diff --git a/devel/p5-MooseX-StrictConstructor/Makefile b/devel/p5-MooseX-StrictConstructor/Makefile
index f56c9f4064b..fadd60f5bf6 100644
--- a/devel/p5-MooseX-StrictConstructor/Makefile
+++ b/devel/p5-MooseX-StrictConstructor/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	MooseX-StrictConstructor
-PORTVERSION=	0.19
-PORTREVISION=	1
+PORTVERSION=	0.21
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -20,5 +19,6 @@ TEST_DEPENDS=	p5-Test-Fatal>=0:devel/p5-Test-Fatal
 
 USES=		perl5
 USE_PERL5=	configure
+NO_ARCH=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/p5-MooseX-StrictConstructor/distinfo b/devel/p5-MooseX-StrictConstructor/distinfo
index 697f81828d0..ab5691bc6c0 100644
--- a/devel/p5-MooseX-StrictConstructor/distinfo
+++ b/devel/p5-MooseX-StrictConstructor/distinfo
@@ -1,2 +1,3 @@
-SHA256 (MooseX-StrictConstructor-0.19.tar.gz) = 486573c16901e83c081da3d90a544281af1baa40bbf036337d6fa91994e48a31
-SIZE (MooseX-StrictConstructor-0.19.tar.gz) = 10242
+TIMESTAMP = 1488725275
+SHA256 (MooseX-StrictConstructor-0.21.tar.gz) = c72a5ae9583706ccdec71d401dcb3054013a7536b750df1436613d858ea2920d
+SIZE (MooseX-StrictConstructor-0.21.tar.gz) = 26792
diff --git a/devel/p5-SVN-Access/Makefile b/devel/p5-SVN-Access/Makefile
index 898094c06b4..5389e3c2a82 100644
--- a/devel/p5-SVN-Access/Makefile
+++ b/devel/p5-SVN-Access/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	SVN-Access
-PORTVERSION=	0.10
+PORTVERSION=	0.11
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
@@ -19,6 +19,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 USES=		perl5
 USE_PERL5=	configure
+NO_ARCH=	yes
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/devel/p5-SVN-Access/distinfo b/devel/p5-SVN-Access/distinfo
index 820e047d96d..2165cfa5366 100644
--- a/devel/p5-SVN-Access/distinfo
+++ b/devel/p5-SVN-Access/distinfo
@@ -1,2 +1,3 @@
-SHA256 (SVN-Access-0.10.tar.gz) = 89e66540f51e7406e090b1140d312ab571b5104f90673ce88313cf82ba7a0cbc
-SIZE (SVN-Access-0.10.tar.gz) = 11456
+TIMESTAMP = 1488741886
+SHA256 (SVN-Access-0.11.tar.gz) = adb9d5c960d43f1271b8e18e7a30984a4cad4bc1d6d177f4556c3be74e93ce7d
+SIZE (SVN-Access-0.11.tar.gz) = 12819
diff --git a/devel/p5-Test-Expect/Makefile b/devel/p5-Test-Expect/Makefile
index 8529edaad02..720a41de96f 100644
--- a/devel/p5-Test-Expect/Makefile
+++ b/devel/p5-Test-Expect/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Test-Expect
-PORTVERSION=	0.33
+PORTVERSION=	0.34
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Expect/distinfo b/devel/p5-Test-Expect/distinfo
index b8c5a6f5af2..9706afbe006 100644
--- a/devel/p5-Test-Expect/distinfo
+++ b/devel/p5-Test-Expect/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Test-Expect-0.33.tar.gz) = 421f5347a6cb1295abbb033ff8ee954bcf796a7bacaaf060c0cf760547608fe3
-SIZE (Test-Expect-0.33.tar.gz) = 4800
+TIMESTAMP = 1488748895
+SHA256 (Test-Expect-0.34.tar.gz) = 2628fcecdda5f649bd25323f646b96a1a07e4557cadcb327c9bad4dc41bbb999
+SIZE (Test-Expect-0.34.tar.gz) = 4817
diff --git a/devel/p5-Test-Script/Makefile b/devel/p5-Test-Script/Makefile
index 9a5feaa6431..e2f337c2bd8 100644
--- a/devel/p5-Test-Script/Makefile
+++ b/devel/p5-Test-Script/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	Test-Script
-PORTVERSION=	1.15
+PORTVERSION=	1.16
 CATEGORIES=	devel perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/devel/p5-Test-Script/distinfo b/devel/p5-Test-Script/distinfo
index e3df5efd9dd..99e28ce5c06 100644
--- a/devel/p5-Test-Script/distinfo
+++ b/devel/p5-Test-Script/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487074195
-SHA256 (Test-Script-1.15.tar.gz) = 8e47d307020fc0a9d5b8e72e47320d28dc34a8d7115df117a79a35f2c78900c4
-SIZE (Test-Script-1.15.tar.gz) = 22507
+TIMESTAMP = 1488809779
+SHA256 (Test-Script-1.16.tar.gz) = 9a38d46d8c19d92330d5a6be2547ed709ba6f2fc2758556d9e191754f264df06
+SIZE (Test-Script-1.16.tar.gz) = 23247
diff --git a/devel/pear-PHP_TokenStream/Makefile b/devel/pear-PHP_TokenStream/Makefile
index 23820c63c0b..139389e72d1 100644
--- a/devel/pear-PHP_TokenStream/Makefile
+++ b/devel/pear-PHP_TokenStream/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	PHP_TokenStream
-PORTVERSION=	1.1.5
+PORTVERSION=	1.4.11
 CATEGORIES=	devel pear
-MASTER_SITES=	http://pear.phpunit.de/get/
 PKGNAMEPREFIX=	pear-
 
 MAINTAINER=	joneum@bsdproject.de
@@ -12,10 +11,18 @@ COMMENT=	Wrapper around PHP tokenizer extension
 
 LICENSE=	BSD3CLAUSE
 
-BUILD_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
-RUN_DEPENDS=	${PEARDIR}/.channels/pear.phpunit.de.reg:devel/pear-channel-phpunit
+USE_GITHUB=	yes
+GH_ACCOUNT=	sebastianbergmann
+GH_PROJECT=	php-token-stream
 
-USES=	pear
-PEAR_CHANNEL=	phpunit
+NO_BUILD=	yes
+
+PHP_DIR=	share/PHP
+PLIST_FILES=	${PHP_DIR}/${PORTNAME}/Token.php
+
+do-install:
+	${MKDIR} ${STAGEDIR}${PREFIX}/${PHP_DIR}/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/src/Token.php \
+	${STAGEDIR}${PREFIX}/${PHP_DIR}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/devel/pear-PHP_TokenStream/distinfo b/devel/pear-PHP_TokenStream/distinfo
index e702ba25c8e..8e4e57a7233 100644
--- a/devel/pear-PHP_TokenStream/distinfo
+++ b/devel/pear-PHP_TokenStream/distinfo
@@ -1,2 +1,3 @@
-SHA256 (PEAR/PHP_TokenStream-1.1.5.tgz) = 9ac8f3c2345d5a65920dd176cbe4334b8f4e52511bcb617967cc925e4a8b7945
-SIZE (PEAR/PHP_TokenStream-1.1.5.tgz) = 9859
+TIMESTAMP = 1488485031
+SHA256 (sebastianbergmann-php-token-stream-1.4.11_GH0.tar.gz) = 6b95960c1a162d321da8b7d42bc9361bdcc991478e0db93a659a433c2b6a9008
+SIZE (sebastianbergmann-php-token-stream-1.4.11_GH0.tar.gz) = 13388
diff --git a/devel/py-pyparsing/Makefile b/devel/py-pyparsing/Makefile
index 24b9610f9bd..09e443c505a 100644
--- a/devel/py-pyparsing/Makefile
+++ b/devel/py-pyparsing/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pyparsing
-PORTVERSION=	2.1.10
+PORTVERSION=	2.2.0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-pyparsing/distinfo b/devel/py-pyparsing/distinfo
index 3da06a8beb5..206245ce348 100644
--- a/devel/py-pyparsing/distinfo
+++ b/devel/py-pyparsing/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1479405290
-SHA256 (pyparsing-2.1.10.tar.gz) = 811c3e7b0031021137fc83e051795025fcb98674d07eb8fe922ba4de53d39188
-SIZE (pyparsing-2.1.10.tar.gz) = 1230829
+TIMESTAMP = 1488809761
+SHA256 (pyparsing-2.2.0.tar.gz) = 0832bcf47acd283788593e7a0f542407bd9550a55a8a8435214a1960e04bcb04
+SIZE (pyparsing-2.2.0.tar.gz) = 1232522
diff --git a/devel/rubygem-dynflow/Makefile b/devel/rubygem-dynflow/Makefile
index b5d221bcdaa..3ea3664c53d 100644
--- a/devel/rubygem-dynflow/Makefile
+++ b/devel/rubygem-dynflow/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	dynflow
-PORTVERSION=	0.8.20
-PORTREVISION=	1
+PORTVERSION=	0.8.21
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-dynflow/distinfo b/devel/rubygem-dynflow/distinfo
index d8011b94fb2..fafa519d79e 100644
--- a/devel/rubygem-dynflow/distinfo
+++ b/devel/rubygem-dynflow/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487995177
-SHA256 (rubygem/dynflow-0.8.20.gem) = 4779b891c9bd1e88603c27fdb6109fa5c9afe77853fe87720c00ca50d8b7eac9
-SIZE (rubygem/dynflow-0.8.20.gem) = 946688
+TIMESTAMP = 1488809788
+SHA256 (rubygem/dynflow-0.8.21.gem) = 63b2febd8c7802e79761accf7a63f0fcb273c09bb0cd96b90d641835c4935447
+SIZE (rubygem/dynflow-0.8.21.gem) = 946688
diff --git a/devel/rubygem-grape/Makefile b/devel/rubygem-grape/Makefile
index 1f8d0a7643c..c84c6d6cb34 100644
--- a/devel/rubygem-grape/Makefile
+++ b/devel/rubygem-grape/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	grape
 PORTVERSION=	0.19.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
diff --git a/devel/rubygem-grape/files/patch-gemspec b/devel/rubygem-grape/files/patch-gemspec
new file mode 100644
index 00000000000..df65bfc6fe9
--- /dev/null
+++ b/devel/rubygem-grape/files/patch-gemspec
@@ -0,0 +1,11 @@
+--- grape.gemspec.orig	2017-03-05 19:37:55 UTC
++++ grape.gemspec
+@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
+ 
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+       s.add_runtime_dependency(%q<rack>.freeze, [">= 1.3.0"])
+-      s.add_runtime_dependency(%q<mustermann-grape>.freeze, ["~> 0.4.0"])
++      s.add_runtime_dependency(%q<mustermann-grape>.freeze, [">= 0.4.0"])
+       s.add_runtime_dependency(%q<rack-accept>.freeze, [">= 0"])
+       s.add_runtime_dependency(%q<activesupport>.freeze, [">= 0"])
+       s.add_runtime_dependency(%q<multi_json>.freeze, [">= 1.3.2"])
diff --git a/devel/rubygem-mustermann-grape/Makefile b/devel/rubygem-mustermann-grape/Makefile
index 787b07b431c..a34281f96e6 100644
--- a/devel/rubygem-mustermann-grape/Makefile
+++ b/devel/rubygem-mustermann-grape/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mustermann-grape
-PORTVERSION=	0.4.0
+PORTVERSION=	1.0.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -11,7 +11,7 @@ COMMENT=	Adds Grape style patterns to Mustermman
 
 LICENSE=	MIT
 
-RUN_DEPENDS=	rubygem-mustermann>=0.4.0:devel/rubygem-mustermann
+RUN_DEPENDS=	rubygem-mustermann>=1.0.0:devel/rubygem-mustermann
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-mustermann-grape/distinfo b/devel/rubygem-mustermann-grape/distinfo
index e93ff7206d8..ef167483b60 100644
--- a/devel/rubygem-mustermann-grape/distinfo
+++ b/devel/rubygem-mustermann-grape/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480771011
-SHA256 (rubygem/mustermann-grape-0.4.0.gem) = 6a3bb1834ec4264d2a1600623cd8b5f12e76969f867cf0dd476e823dca71d3bc
-SIZE (rubygem/mustermann-grape-0.4.0.gem) = 9728
+TIMESTAMP = 1488737601
+SHA256 (rubygem/mustermann-grape-1.0.0.gem) = f9c3bab00b676b1a028aa894fbd0fffde7c7691891ae7bb0ca1651d9da7bad83
+SIZE (rubygem/mustermann-grape-1.0.0.gem) = 10752
diff --git a/devel/rubygem-mustermann/Makefile b/devel/rubygem-mustermann/Makefile
index 05af72ee009..287a6d9509d 100644
--- a/devel/rubygem-mustermann/Makefile
+++ b/devel/rubygem-mustermann/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mustermann
-PORTVERSION=	0.4.0
+PORTVERSION=	1.0.0
 CATEGORIES=	devel rubygems
 MASTER_SITES=	RG
 
@@ -10,8 +10,7 @@ MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Lbrary implementing patterns that behave like regular expressions
 
 LICENSE=	MIT
-
-RUN_DEPENDS=	rubygem-tool>=0.2:devel/rubygem-tool
+LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NO_ARCH=	yes
 USE_RUBY=	yes
diff --git a/devel/rubygem-mustermann/distinfo b/devel/rubygem-mustermann/distinfo
index ee8c8675d14..07ddbbfc9cd 100644
--- a/devel/rubygem-mustermann/distinfo
+++ b/devel/rubygem-mustermann/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480770404
-SHA256 (rubygem/mustermann-0.4.0.gem) = 28d2471ac8498d82f505b912d8886ac29e279abf43567b4a8095da3aee3fa24e
-SIZE (rubygem/mustermann-0.4.0.gem) = 46592
+TIMESTAMP = 1488737596
+SHA256 (rubygem/mustermann-1.0.0.gem) = d47fe0be49ba6997a2f57fc1a1e3d5ef66f18950e2e82d4e1d511c37036ded5a
+SIZE (rubygem/mustermann-1.0.0.gem) = 51200
diff --git a/emulators/citra/Makefile b/emulators/citra/Makefile
index 71e96e7ee41..fe8b061d30c 100644
--- a/emulators/citra/Makefile
+++ b/emulators/citra/Makefile
@@ -28,8 +28,9 @@ ONLY_FOR_ARCHS=	amd64
 ONLY_FOR_ARCHS_REASON=	https://github.com/MerryMage/dynarmic/issues/35
 
 USE_GITHUB=	yes
-GH_TUPLE=	citra-emu:${PORTNAME}:e971f17bb \
-		citra-emu:ext-soundtouch:5274ec4:soundtouch/externals/soundtouch \
+GH_ACCOUNT=	citra-emu
+GH_TAGNAME=	e971f17bb
+GH_TUPLE=	citra-emu:ext-soundtouch:5274ec4:soundtouch/externals/soundtouch \
 		MerryMage:dynarmic:358cf7c:dynarmic/externals/dynarmic \
 		fmtlib:fmt:3.0.0-146-g796beaa:fmt/externals/dynarmic/externals/fmt \
 		herumi:xbyak:v5.40:xbyak/externals/xbyak \
diff --git a/emulators/dosbox/files/patch-src_gui_sdlmain.cpp b/emulators/dosbox/files/patch-src_gui_sdlmain.cpp
new file mode 100644
index 00000000000..c70ff6adb77
--- /dev/null
+++ b/emulators/dosbox/files/patch-src_gui_sdlmain.cpp
@@ -0,0 +1,25 @@
+*** src/gui/sdlmain.cpp.orig	Mon Mar  6 03:02:24 2017
+--- src/gui/sdlmain.cpp	Mon Mar  6 03:03:21 2017
+***************
+*** 1134,1143 ****
+  #endif
+  	const char * gl_ext = (const char *)glGetString (GL_EXTENSIONS);
+  	if(gl_ext && *gl_ext){
+! 		sdl.opengl.packed_pixel=(strstr(gl_ext,"EXT_packed_pixels") > 0);
+! 		sdl.opengl.paletted_texture=(strstr(gl_ext,"EXT_paletted_texture") > 0);
+  #if defined(NVIDIA_PixelDataRange)
+! 		sdl.opengl.pixel_data_range=(strstr(gl_ext,"GL_NV_pixel_data_range") >0 ) &&
+  			glPixelDataRangeNV && db_glAllocateMemoryNV && db_glFreeMemoryNV;
+  		sdl.opengl.pixel_data_range = 0;
+  #endif
+--- 1134,1143 ----
+  #endif
+  	const char * gl_ext = (const char *)glGetString (GL_EXTENSIONS);
+  	if(gl_ext && *gl_ext){
+! 		sdl.opengl.packed_pixel=(strstr(gl_ext,"EXT_packed_pixels") != 0);
+! 		sdl.opengl.paletted_texture=(strstr(gl_ext,"EXT_paletted_texture") != 0);
+  #if defined(NVIDIA_PixelDataRange)
+! 		sdl.opengl.pixel_data_range=(strstr(gl_ext,"GL_NV_pixel_data_range") != 0 ) &&
+  			glPixelDataRangeNV && db_glAllocateMemoryNV && db_glFreeMemoryNV;
+  		sdl.opengl.pixel_data_range = 0;
+  #endif
diff --git a/emulators/qemu-riscv/Makefile b/emulators/qemu-riscv/Makefile
index fc24868114c..6a85728ccf2 100644
--- a/emulators/qemu-riscv/Makefile
+++ b/emulators/qemu-riscv/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	qemu
 PORTVERSION=	2.7.50
-PORTREVISION=	20170220
+PORTREVISION=	20170306
 CATEGORIES=	emulators
 PKGNAMESUFFIX?=	-riscv
 
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 USE_GITHUB=	yes
 GH_ACCOUNT=	riscv
 GH_PROJECT=	riscv-qemu
-GH_TAGNAME=	d2d8d80
+GH_TAGNAME=	2094f39
 
 HAS_CONFIGURE=	yes
 USES=	gmake libtool makeinfo pkgconfig python:2,build
diff --git a/emulators/qemu-riscv/distinfo b/emulators/qemu-riscv/distinfo
index 77977222e5e..5354700038b 100644
--- a/emulators/qemu-riscv/distinfo
+++ b/emulators/qemu-riscv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487749108
-SHA256 (riscv-riscv-qemu-2.7.50-d2d8d80_GH0.tar.gz) = 25cfb14ee2d60ce1ff5ee7e2b6a2162568e77d5f6517ee201620016c8d3ec957
-SIZE (riscv-riscv-qemu-2.7.50-d2d8d80_GH0.tar.gz) = 12960276
+TIMESTAMP = 1488789558
+SHA256 (riscv-riscv-qemu-2.7.50-2094f39_GH0.tar.gz) = 683dbed0d3db73a7681f6318846f7259da06770879db27fc950ff22b942d3d39
+SIZE (riscv-riscv-qemu-2.7.50-2094f39_GH0.tar.gz) = 12960091
diff --git a/finance/ktoblzcheck/Makefile b/finance/ktoblzcheck/Makefile
index 9b847502b8d..f868bc5771f 100644
--- a/finance/ktoblzcheck/Makefile
+++ b/finance/ktoblzcheck/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ktoblzcheck
-PORTVERSION=	1.48
-PORTREVISION=	2
+PORTVERSION=	1.49
 CATEGORIES=	finance german
 MASTER_SITES=	SF/${PORTNAME}
 
diff --git a/finance/ktoblzcheck/distinfo b/finance/ktoblzcheck/distinfo
index 8ec3400768e..c87a9d87810 100644
--- a/finance/ktoblzcheck/distinfo
+++ b/finance/ktoblzcheck/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ktoblzcheck-1.48.tar.gz) = 0f4e66d3a880355b1afc88870d224755e078dfaf192242d9c6acb8853f5bcf58
-SIZE (ktoblzcheck-1.48.tar.gz) = 561054
+TIMESTAMP = 1488563018
+SHA256 (ktoblzcheck-1.49.tar.gz) = e8971bc6689ea72b174c194bd43ba2c0b65112b0c3f9fd2371562e0c3ab57d29
+SIZE (ktoblzcheck-1.49.tar.gz) = 561501
diff --git a/finance/ktoblzcheck/pkg-plist b/finance/ktoblzcheck/pkg-plist
index 38ace8ea770..27b2cdd5d20 100644
--- a/finance/ktoblzcheck/pkg-plist
+++ b/finance/ktoblzcheck/pkg-plist
@@ -3,7 +3,7 @@ include/iban.h
 include/ktoblzcheck.h
 lib/libktoblzcheck.so
 lib/libktoblzcheck.so.1
-lib/libktoblzcheck.so.1.5.25
+lib/libktoblzcheck.so.1.5.26
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/ktoblzcheck.py
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/ktoblzcheck.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/ktoblzcheck.pyo
diff --git a/finance/py-ystockquote/Makefile b/finance/py-ystockquote/Makefile
index 85bea578f88..f053def0b05 100644
--- a/finance/py-ystockquote/Makefile
+++ b/finance/py-ystockquote/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ystockquote
-PORTVERSION=	0.2.4
+PORTVERSION=	0.2.5
 CATEGORIES=	finance python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/finance/py-ystockquote/distinfo b/finance/py-ystockquote/distinfo
index b8d91ac0f78..27f2c7c30f7 100644
--- a/finance/py-ystockquote/distinfo
+++ b/finance/py-ystockquote/distinfo
@@ -1,2 +1,3 @@
-SHA256 (ystockquote-0.2.4.tar.gz) = 5d0f65bc8cb1d5c9198deae098ee7641d8a9e2203379422c07fce5900be7d8da
-SIZE (ystockquote-0.2.4.tar.gz) = 4225
+TIMESTAMP = 1488809473
+SHA256 (ystockquote-0.2.5.tar.gz) = 32533ebdadcc521d589de845256e3dfab603a4ca6889f98e8fe9ed03dbc05146
+SIZE (ystockquote-0.2.5.tar.gz) = 4818
diff --git a/games/bunnysay/Makefile b/games/bunnysay/Makefile
index b2d2bad7123..0fdd96426f7 100644
--- a/games/bunnysay/Makefile
+++ b/games/bunnysay/Makefile
@@ -2,25 +2,29 @@
 # $FreeBSD$
 
 PORTNAME=	bunnysay
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	games
 
 MAINTAINER=	ben.lavery@hashbang0.com
-COMMENT=	Bunny Sign for terminals
+COMMENT=	Bunny Sign for terminals with UTF-8 support
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake compiler:c++11-lang dos2unix
-DOS2UNIX_FILES=	src/BunnySay.cpp src/BunnySay.h
+USES=		gmake
+
+ALL_TARGET=	bunnysay
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	co60ca
 
 PLIST_FILES=	bin/bunnysay
 
+post-extract:
+	@${MV} ${WRKSRC}/makefile ${WRKSRC}/Makefile
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_PROGRAM} ${WRKSRC}/bunnysay ${STAGEDIR}${PREFIX}/bin/${PORTNAME} 
 
 .include <bsd.port.mk>
diff --git a/games/bunnysay/distinfo b/games/bunnysay/distinfo
index bee071274dd..2dc7427a0a0 100644
--- a/games/bunnysay/distinfo
+++ b/games/bunnysay/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473266065
-SHA256 (co60ca-bunnysay-v1.0_GH0.tar.gz) = 81fe0b57fb307d6e6ae8ab660f0f7720a16f83b271c477812af84a3c23081e77
-SIZE (co60ca-bunnysay-v1.0_GH0.tar.gz) = 14703
+TIMESTAMP = 1488747822
+SHA256 (co60ca-bunnysay-v1.1_GH0.tar.gz) = 556752ff31633c54b2a6984dbab21bd2a79a94022277c0c2dc2f1590c8f2dbfe
+SIZE (co60ca-bunnysay-v1.1_GH0.tar.gz) = 17307
diff --git a/games/bunnysay/files/patch-src_BunnySay.cpp b/games/bunnysay/files/patch-src_BunnySay.cpp
deleted file mode 100644
index 752791f4dab..00000000000
--- a/games/bunnysay/files/patch-src_BunnySay.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/BunnySay.cpp.orig	2016-08-31 12:47:32 UTC
-+++ src/BunnySay.cpp
-@@ -34,8 +34,9 @@ L"/ 　 づ";
- // Writes wstring input to the stdout after chunking it and converting
- // all characters to their wide counterparts in unicode
- void BunnySay::writeBunnySay(std::wstring input) {
-+  std::wstring_convert<std::codecvt_utf8<wchar_t>,wchar_t> convert;
-   input = replaceString(input);
--  std::wcout << bunny;
-+  std::cout << convert.to_bytes(bunny);
-   bool left = true;
-   std::vector<std::wstring> vs;
-   vs = splitAtWidth(input + L"　", width);
-@@ -54,9 +55,9 @@ void BunnySay::writeBunnySay(std::wstrin
- 
-     // Add the pipes
-     curstring = L"｜" + curstring + L"｜\n";
--    std::wcout << curstring;
-+    std::cout << convert.to_bytes(curstring);
-    } 
--    std::wcout << bunny2 << std::endl;
-+    std::cout << convert.to_bytes(bunny2) << std::endl;
- }
- // Helper function to split a sentance delimited with fixed-width spaces
- // into strings 10 chars or less
diff --git a/games/bunnysay/files/patch-src_BunnySay.h b/games/bunnysay/files/patch-src_BunnySay.h
deleted file mode 100644
index 6594b808cb9..00000000000
--- a/games/bunnysay/files/patch-src_BunnySay.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/BunnySay.h.orig	2016-08-31 12:47:32 UTC
-+++ src/BunnySay.h
-@@ -30,6 +30,7 @@
- #include <stack>
- #include <vector>
- #include <sstream>
-+#include <codecvt>
- namespace bunnysay {
- 
- class BunnySay {
diff --git a/games/bunnysay/files/patch-src_bunnysay.cc b/games/bunnysay/files/patch-src_bunnysay.cc
new file mode 100644
index 00000000000..a39173cca76
--- /dev/null
+++ b/games/bunnysay/files/patch-src_bunnysay.cc
@@ -0,0 +1,19 @@
+--- src/bunnysay.cc.orig	2017-02-28 03:26:39 UTC
++++ src/bunnysay.cc
+@@ -99,7 +99,7 @@ void fullWidth(std::vector<std::vector<R
+ }
+ 
+ void padTo(std::vector<std::vector<Rune>> *input, size_t width) {
+-  bool left = false;
++  bool left = true;
+   for (auto &rv: *input) {
+     while(rv.size() < width) {
+       if (left) {
+@@ -109,6 +109,7 @@ void padTo(std::vector<std::vector<Rune>
+       }
+       left = !left;
+     }
++    left = true;
+   }
+ }
+ 
diff --git a/games/bunnysay/files/patch-src_runbunnysay.cc b/games/bunnysay/files/patch-src_runbunnysay.cc
new file mode 100644
index 00000000000..2482ea70115
--- /dev/null
+++ b/games/bunnysay/files/patch-src_runbunnysay.cc
@@ -0,0 +1,24 @@
+--- src/runbunnysay.cc.orig	2017-02-28 03:26:39 UTC
++++ src/runbunnysay.cc
+@@ -20,7 +20,6 @@
+ */
+ #include "bunnysay.h"
+ #include <iostream>
+-#include <iterator>
+ #include <string>
+ 
+ void usage(char *prog) {
+@@ -33,9 +32,10 @@ void usage(char *prog) {
+ int main(int argc, char **argv) {
+   std::string buff;
+   if (argc >= 2 && std::string(argv[1]) == "--") {
+-    std::istream_iterator<char> it(std::cin);
+-    std::istream_iterator<char> end;
+-    buff = std::string(it, end);
++    std::string line;
++    while (std::getline(std::cin, line)) {
++      buff += std::string(line);
++    }
+   } else if (argc >= 2) {
+     for (int i = 1; i < argc; i++) {
+       if (i != 1) {
diff --git a/games/bunnysay/pkg-descr b/games/bunnysay/pkg-descr
index 7ea4b9010ed..512f59b68c8 100644
--- a/games/bunnysay/pkg-descr
+++ b/games/bunnysay/pkg-descr
@@ -1,3 +1,3 @@
-Bunny Sign for terminals with wchar support.
+Bunny Sign for terminals with UTF-8 support
 
 WWW: https://github.com/co60ca/bunnysay
diff --git a/games/cake/Makefile b/games/cake/Makefile
index e839ce66057..a0cb7749cd5 100644
--- a/games/cake/Makefile
+++ b/games/cake/Makefile
@@ -39,8 +39,9 @@ post-patch: .SILENT
 		${WRKSRC}/cake/sound.h
 # Use traditional mapping for console key (tilde)
 	${REINPLACE_CMD} -e 's/167/96/' ${WRKSRC}/main.cpp
-# Fix for GCC 4.x
+# Fixes for GCC 4.x and Clang 4.0
 	${REINPLACE_CMD} -e 's/Mat3x2:://' ${WRKSRC}/cake/math.h
+	${REINPLACE_CMD} -e '2852s/numverts/&[0]/' ${WRKSRC}/cake/q3bsp.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/main ${STAGEDIR}${PREFIX}/bin/cake
diff --git a/games/minecraft-server/Makefile b/games/minecraft-server/Makefile
index f9faf139286..6dc8f843a75 100644
--- a/games/minecraft-server/Makefile
+++ b/games/minecraft-server/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	minecraft-server
-PORTVERSION=	1.11
+PORTVERSION=	1.11.2
 CATEGORIES=	games java
 MASTER_SITES=	https://s3.amazonaws.com/Minecraft.Download/versions/${PORTVERSION}/
 DISTFILES=	minecraft_server.${PORTVERSION}.jar
diff --git a/games/minecraft-server/distinfo b/games/minecraft-server/distinfo
index 6a51e428921..331c0c9f678 100644
--- a/games/minecraft-server/distinfo
+++ b/games/minecraft-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481043573
-SHA256 (minecraft_server.1.11.jar) = 3277965fd83d26944dfbd1b9740d95cf206985da330a1b3733868e4de7dc6f83
-SIZE (minecraft_server.1.11.jar) = 9713666
+TIMESTAMP = 1488796790
+SHA256 (minecraft_server.1.11.2.jar) = dec47d36b429fd05076b90b1f42c2a25138bc39204aa51b9674ef2a98d64d88a
+SIZE (minecraft_server.1.11.2.jar) = 9720835
diff --git a/games/openomf/Makefile b/games/openomf/Makefile
index 277f7de7990..6af7c296e60 100644
--- a/games/openomf/Makefile
+++ b/games/openomf/Makefile
@@ -20,8 +20,9 @@ LIB_DEPENDS=	libconfuse.so:devel/libconfuse \
 EXTRACT_DEPENDS=	unrar:archivers/unrar
 
 USE_GITHUB=	yes
-GH_TUPLE=	omf2097:openomf:c36c421 \
-		omf2097:libShadowDive:b2c34a6:shadow \
+GH_ACCOUNT=	omf2097
+GH_TAGNAME=	c36c421
+GH_TUPLE=	omf2097:libShadowDive:b2c34a6:shadow \
 		kode54:dumb:238f23c:libdumb
 
 USES=		cmake compiler:c++11-lang gettext
diff --git a/games/pink-pony/Makefile b/games/pink-pony/Makefile
index 89bc541f66e..344d2f29cc5 100644
--- a/games/pink-pony/Makefile
+++ b/games/pink-pony/Makefile
@@ -21,7 +21,7 @@ LIB_DEPENDS=	libIL.so:graphics/devil \
 USE_GITHUB=	yes
 GH_ACCOUNT=	ginkgo
 
-USES=		pkgconfig scons tar:bzip2
+USES=		pkgconfig scons
 USE_GL=		gl glu
 USE_SDL=	mixer
 SUB_FILES=	pink-pony.sh
diff --git a/games/pioneer/Makefile b/games/pioneer/Makefile
index 0e8c953dd8c..078d49df481 100644
--- a/games/pioneer/Makefile
+++ b/games/pioneer/Makefile
@@ -36,7 +36,7 @@ LIB_DEPENDS=	libcurl.so:ftp/curl \
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pioneerspacesim
-GH_TAGNAME=	20161129
+GH_TAGNAME=	20170304
 
 USES=		autoreconf compiler:c++11-lib gmake pkgconfig
 USE_GL=		gl
diff --git a/games/pioneer/distinfo b/games/pioneer/distinfo
index 2fab7f3780e..bce14e21754 100644
--- a/games/pioneer/distinfo
+++ b/games/pioneer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1480334476
-SHA256 (pioneerspacesim-pioneer-0.0.20161129-20161129_GH0.tar.gz) = 1c6fcc9a16da2c6d664ab88764718b94d7fdf5016bc5b4f97d7b00f8eccd9336
-SIZE (pioneerspacesim-pioneer-0.0.20161129-20161129_GH0.tar.gz) = 194432978
+TIMESTAMP = 1488555232
+SHA256 (pioneerspacesim-pioneer-0.0.20170304-20170304_GH0.tar.gz) = 45d448a5ac53c9e230522600f03dad7abc70788367d09c3edcb4ae4285050004
+SIZE (pioneerspacesim-pioneer-0.0.20170304-20170304_GH0.tar.gz) = 194776151
diff --git a/games/trigger-rally/Makefile b/games/trigger-rally/Makefile
index d5fb0e09913..1b4210c801d 100644
--- a/games/trigger-rally/Makefile
+++ b/games/trigger-rally/Makefile
@@ -2,40 +2,47 @@
 # $FreeBSD$
 
 PORTNAME=	trigger-rally
-PORTVERSION=	0.6.1
-DISTVERSIONSUFFIX=	-src
+PORTVERSION=	0.6.5
 CATEGORIES=	games
 MASTER_SITES=	SF/trigger-rally/trigger-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	alfix86@gmail.com
 COMMENT=	Rally car racing game
 
-BUILD_DEPENDS=	jam:devel/jam
-LIB_DEPENDS=	libphysfs.so:devel/physfs
-RUN_DEPENDS=	${LOCALBASE}/${DATADIR_REL}/trigger.config.defs:games/trigger-data
+LICENSE=	GPLv2
 
-USES=		openal:al,alut tar:bzip2
-USE_SDL=	sdl image
-USE_GL=		glu
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--datadir=${DATADIR} \
-		--with-libAlut=${LOCALBASE} \
-		--with-libPhysFS=${LOCALBASE}
+LIB_DEPENDS=	libphysfs.so:devel/physfs
+LIB_DEPENDS+=	libalut.so:audio/freealut
+
+WRKSRC_SUBDIR=	src
+USES=		gmake openal:al,alut
+USE_SDL=	sdl2 image2
+USE_GL=		glu gl glew
+MAKEFILE=	GNUmakefile
+ALL_TARGET=	build
+
+WORKINGSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
+DATADIR=	${PREFIX}/share/games/trigger-rally
 
 DESKTOP_ENTRIES="Trigger" "" "trigger" \
-		"trigger" "" false
+		"trigger-rally" "" false
 
-PLIST_FILES=	bin/trigger
-PORTDOCS=	README-stereo.txt README.txt
-
-OPTIONS_DEFINE=	DOCS
-
-do-build:
-	@cd ${BUILD_WRKSRC} && ${LOCALBASE}/bin/jam
+PORTDOCS=	README-stereo.txt README.txt DATA_AUTHORS.txt
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/trigger ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WORKINGSRC}/bin/trigger-rally ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DATADIR}
+	cd ${WORKINGSRC}/bin && ${CP} trigger-rally.config.defs ${STAGEDIR}${DATADIR}
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	cd ${WORKINGSRC}/doc && ${INSTALL_MAN} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
+	cd ${WORKINGSRC}/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}
+.for i in 16 22 24 32 36 48 64 72 96 128 192 256
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/ && \
+	${MV} ${STAGEDIR}${DATADIR}/icon/trigger-${i}.png \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/${i}x${i}/apps/trigger.png
+.endfor
+	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/ && \
+	${MV} ${STAGEDIR}${DATADIR}/icon/trigger-rally-icons.svg \
+		${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/trigger-rally-icons.svg
 
 .include <bsd.port.mk>
diff --git a/games/trigger-rally/distinfo b/games/trigger-rally/distinfo
index 9db77a0d510..0237709aee7 100644
--- a/games/trigger-rally/distinfo
+++ b/games/trigger-rally/distinfo
@@ -1,2 +1,3 @@
-SHA256 (trigger-rally-0.6.1-src.tar.bz2) = 5ac2d2cbaa5aa472abd99e76aefa2cec3389accbfe79e441af94f15568336bbb
-SIZE (trigger-rally-0.6.1-src.tar.bz2) = 368032
+TIMESTAMP = 1488474378
+SHA256 (trigger-rally-0.6.5.tar.gz) = f2db8784d8c0dd51c7a2812a9d294db05bb2e9df992038b3a232060dba26ba24
+SIZE (trigger-rally-0.6.5.tar.gz) = 82290843
diff --git a/games/trigger-rally/files/patch-GNUmakefile b/games/trigger-rally/files/patch-GNUmakefile
new file mode 100644
index 00000000000..db931b65efc
--- /dev/null
+++ b/games/trigger-rally/files/patch-GNUmakefile
@@ -0,0 +1,17 @@
+--- GNUmakefile.orig	2016-11-05 17:27:10 UTC
++++ GNUmakefile
+@@ -125,7 +125,7 @@ $(TR_EXEFILE): $(OBJFILES)
+ 		printf "\t%s\n" $$file; \
+ 		done;
+ 	@printf "\t-> %s\n" $@
+-	@$(CXX) -o $@ $(OBJFILES) $(LDFLAGS)
++	@$(CXX) `sdl2-config --libs`  -o $@ $(OBJFILES) $(LDFLAGS)
+ 	@printf "strip\t%s\n" $@
+ 	@strip $@
+ 
+@@ -155,4 +155,4 @@ clean:
+ #
+ %.o: %.cpp GNUmakefile
+ 	@printf "%s\t%s -> %s\n" $(CXX) $< $@
+-	@$(CXX) $(CXXFLAGS) $(CPPFLAGS) -MMD -MP -c $< -o $@
++	@$(CXX) `sdl2-config --cflags` $(CXXFLAGS) $(CPPFLAGS) -MMD -MP -c $< -o $@
diff --git a/games/trigger-rally/files/patch-Trigger_main.cpp b/games/trigger-rally/files/patch-Trigger_main.cpp
new file mode 100644
index 00000000000..704f7fc8b43
--- /dev/null
+++ b/games/trigger-rally/files/patch-Trigger_main.cpp
@@ -0,0 +1,11 @@
+--- Trigger/main.cpp.orig	2017-03-02 19:21:27 UTC
++++ Trigger/main.cpp
+@@ -469,7 +469,7 @@ void MainApp::loadConfig()
+   if (!PHYSFS_exists(cfgfilename.c_str())) {
+ #ifdef UNIX
+     const std::vector<std::string> cfghidingplaces {
+-        "/usr/share/games/trigger-rally/"
++        "/usr/local/share/games/trigger-rally/"
+     };
+ 
+     for (const std::string &cfgpath: cfghidingplaces)
diff --git a/games/trigger-rally/pkg-plist b/games/trigger-rally/pkg-plist
new file mode 100644
index 00000000000..fb42059018e
--- /dev/null
+++ b/games/trigger-rally/pkg-plist
@@ -0,0 +1,20 @@
+bin/trigger-rally
+%%DATADIR%%/data.md5
+%%DATADIR%%/data.zip
+%%DATADIR%%/icon/trigger-rally-win.ico
+%%DATADIR%%/trigger-rally.config.defs
+share/icons/hicolor/128x128/apps/trigger.png
+share/icons/hicolor/16x16/apps/trigger.png
+share/icons/hicolor/192x192/apps/trigger.png
+share/icons/hicolor/22x22/apps/trigger.png
+share/icons/hicolor/24x24/apps/trigger.png
+share/icons/hicolor/256x256/apps/trigger.png
+share/icons/hicolor/32x32/apps/trigger.png
+share/icons/hicolor/36x36/apps/trigger.png
+share/icons/hicolor/48x48/apps/trigger.png
+share/icons/hicolor/64x64/apps/trigger.png
+share/icons/hicolor/72x72/apps/trigger.png
+share/icons/hicolor/96x96/apps/trigger.png
+share/icons/hicolor/scalable/apps/trigger-rally-icons.svg
+@dir %%DATADIR%%/defplayers
+@dir %%DATADIR%%/plugins
diff --git a/german/mythes/Makefile b/german/mythes/Makefile
index 478a45a8ec4..358e370cc66 100644
--- a/german/mythes/Makefile
+++ b/german/mythes/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mythes
-PORTVERSION=	2017.02.12
+PORTVERSION=	2017.03.05
 CATEGORIES=	german textproc
 MASTER_SITES=	LOCAL/sunpoet/${PORTNAME}/
 DISTNAME=	Deutscher-Thesaurus-${PORTVERSION:C/\.//g}
diff --git a/german/mythes/distinfo b/german/mythes/distinfo
index 797ee24fc76..46c27d75f9a 100644
--- a/german/mythes/distinfo
+++ b/german/mythes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486956230
-SHA256 (mythes/Deutscher-Thesaurus-20170212.oxt) = 39591f08ac0b09cbab65721b7b8501e47b101b1682470160b4afc784a0e1b6f1
-SIZE (mythes/Deutscher-Thesaurus-20170212.oxt) = 8299469
+TIMESTAMP = 1488810248
+SHA256 (mythes/Deutscher-Thesaurus-20170305.oxt) = 55aa5ca2db272fd58a92971403f5d74b333315dadb6df6f4e2325079ce6aa9df
+SIZE (mythes/Deutscher-Thesaurus-20170305.oxt) = 8354303
diff --git a/graphics/openjump/Makefile b/graphics/openjump/Makefile
index 7beb9e55ad7..513ee363676 100644
--- a/graphics/openjump/Makefile
+++ b/graphics/openjump/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	OpenJUMP
-PORTVERSION=	1.9.1
+PORTVERSION=	1.10
 CATEGORIES=	graphics java geography
 MASTER_SITES=	SF/jump-pilot/OpenJUMP/${PORTVERSION}
 DISTNAME=	${PORTNAME}-Portable-${PORTVERSION}-r${PLUS_REV}-PLUS
@@ -41,12 +41,12 @@ LICENSE_PERMS_JYTHON=	auto-accept
 
 TARGET_DIR=	${STAGEDIR}${PREFIX}/${PORTNAME}
 USE_JAVA=	yes
-JAVA_VERSION=	1.6+
+JAVA_VERSION=	1.7+
 USES=		zip
 NO_BUILD=	yes
 NO_ARCH=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-r${PLUS_REV}-PLUS
-PLUS_REV=	4840
+PLUS_REV=	5336
 
 do-install:
 	@${ECHO_CMD} "--->  Installing JAR files"
diff --git a/graphics/openjump/distinfo b/graphics/openjump/distinfo
index 6d853bb8b15..f5dbc1812df 100644
--- a/graphics/openjump/distinfo
+++ b/graphics/openjump/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1466351799
-SHA256 (OpenJUMP-Portable-1.9.1-r4840-PLUS.zip) = ac2fa50260ee0293dafbee55bdac71765beb9e4cadc0946835034fe8da5180ee
-SIZE (OpenJUMP-Portable-1.9.1-r4840-PLUS.zip) = 53414805
+TIMESTAMP = 1488733286
+SHA256 (OpenJUMP-Portable-1.10-r5336-PLUS.zip) = 9199c9617df41db66be58b7974e9c7a93fedaa1a91297c619f7c1e825b7a057f
+SIZE (OpenJUMP-Portable-1.10-r5336-PLUS.zip) = 55506041
diff --git a/graphics/openjump/files/patch-bin_oj__linux.sh b/graphics/openjump/files/patch-bin_oj__linux.sh
index 59e7e79f71c..a2f7cdb8deb 100644
--- a/graphics/openjump/files/patch-bin_oj__linux.sh
+++ b/graphics/openjump/files/patch-bin_oj__linux.sh
@@ -1,4 +1,4 @@
---- bin/oj_linux.sh.orig	2016-01-08 09:30:28 UTC
+--- bin/oj_linux.sh.orig	2016-05-29 14:45:28 UTC
 +++ bin/oj_linux.sh
 @@ -4,9 +4,11 @@
  ## if unset defaults to
@@ -28,11 +28,12 @@
    cp -R -a "$1"/bin/OpenJUMP.app/Contents "$1" &&\
    awk '{sub(/..\/oj_/,"bin/oj_",$0)}1' "$1"/bin/OpenJUMP.app/Contents/Resources/script > "$1"/Contents/Resources/script &&\
    echo patched oj.app
-@@ -110,13 +114,19 @@ esac
+@@ -109,14 +113,20 @@ case "$1" in
+ esac
  
  ## cd into jump home
- OLD_DIR=`pwd`
 +echo "#####  pwd = '$OLD_DIR'"
+ OLD_DIR=`pwd`
  cd "$JUMP_HOME"
 +PWD_DIR=`pwd`
 +echo "##### cd '$JUMP_HOME', pwd = '$PWD_DIR'"
@@ -212,8 +213,3 @@
    # output info
    echo set max. memory limit to $MEM_MAX_MB MiB
  fi
-@@ -318,3 +360,4 @@ cd "$OLD_DIR"
- 
- ## run end function
- end
-+
diff --git a/graphics/openjump/pkg-plist b/graphics/openjump/pkg-plist
index 9e45fc0eb94..fb2dce10119 100644
--- a/graphics/openjump/pkg-plist
+++ b/graphics/openjump/pkg-plist
@@ -2,7 +2,7 @@ OpenJUMP/bin/default-plugins.xml
 OpenJUMP/bin/log4j.xml
 OpenJUMP/bin/openjump
 OpenJUMP/bin/readme.txt
-OpenJUMP/lib/OpenJUMP-1.9.1-r4840-nosrc.jar
+OpenJUMP/lib/OpenJUMP-1.10-r5336-nosrc.jar
 OpenJUMP/lib/batik-awt-util-1.6.jar
 OpenJUMP/lib/batik-bridge-1.6.jar
 OpenJUMP/lib/batik-css-1.6.jar
@@ -21,11 +21,11 @@ OpenJUMP/lib/batik-util-1.6.jar
 OpenJUMP/lib/batik-xml-1.6.jar
 OpenJUMP/lib/bsh-2.0b4.jar
 OpenJUMP/lib/buoy-1.8.jar
-OpenJUMP/lib/commons-codec-1.2.jar
-OpenJUMP/lib/commons-compress-1.9.jar
+OpenJUMP/lib/commons-codec-1.10.jar
+OpenJUMP/lib/commons-compress-1.12.jar
 OpenJUMP/lib/commons-imaging-1.0-20130811.122228-3.jar
-OpenJUMP/lib/commons-io-2.4.jar
-OpenJUMP/lib/commons-lang-2.4.jar
+OpenJUMP/lib/commons-io-2.5.jar
+OpenJUMP/lib/commons-lang3-3.5.jar
 OpenJUMP/lib/commons-logging-1.2.jar
 OpenJUMP/lib/ext/BeanTools/0-Help.bsh
 OpenJUMP/lib/ext/BeanTools/1-HelloWorld.bsh
@@ -40,8 +40,8 @@ OpenJUMP/lib/ext/BeanTools/8-GetInvalidShapefileRings.bsh
 OpenJUMP/lib/ext/BeanTools/9-Display_WMS_URL.bsh
 OpenJUMP/lib/ext/BeanTools/RefreshScriptsMenu.bsh
 OpenJUMP/lib/ext/BeanTools/SaveViewAsBeanTool.bsh
-OpenJUMP/lib/ext/CTSPlugIn-0.1.1.jar
-OpenJUMP/lib/ext/ColorChooser-0.6.jar
+OpenJUMP/lib/ext/CTSPlugIn-0.1.3.jar
+OpenJUMP/lib/ext/ColorChooser-0.8.jar
 OpenJUMP/lib/ext/ConcaveHull-0.2.jar
 OpenJUMP/lib/ext/ConcaveHull-Readme.txt
 OpenJUMP/lib/ext/FillPatterns/40S-TWEED_C1_064_A_RGB.JPG
@@ -202,7 +202,7 @@ OpenJUMP/lib/ext/JumpFillPattern.jar
 OpenJUMP/lib/ext/JumpPrinter.jar
 OpenJUMP/lib/ext/MeasureToolbox_11.jar
 OpenJUMP/lib/ext/PirolCsv.jar
-OpenJUMP/lib/ext/SetAttributes-0.7.0.jar
+OpenJUMP/lib/ext/SetAttributes-0.7.1.jar
 OpenJUMP/lib/ext/SkyPrinterPlugIn-1.0.1.jar
 OpenJUMP/lib/ext/TableLayout-bin-jdk1.5-2007-04-21.jar
 OpenJUMP/lib/ext/VertexImages/bore_01.wkt
@@ -271,46 +271,54 @@ OpenJUMP/lib/ext/VertexImages/vector_18.wkt
 OpenJUMP/lib/ext/VertexImages/vector_19.wkt
 OpenJUMP/lib/ext/VertexImages/vector_20.wkt
 OpenJUMP/lib/ext/VertexSymbols.jar
-OpenJUMP/lib/ext/aggregation-0.2.8.jar
+OpenJUMP/lib/ext/ViewManager-0.3.4.jar
+OpenJUMP/lib/ext/aggregation-0.2.10.jar
 OpenJUMP/lib/ext/bsheditor4jump-0.2.4.jar
 OpenJUMP/lib/ext/csv-driver-0.9.2.jar
-OpenJUMP/lib/ext/cts-1.3.2-SNAPSHOT.jar
 OpenJUMP/lib/ext/dbdatastore/mariadb-java-client-1.3.4.jar
 OpenJUMP/lib/ext/dbdatastore/mysql-connector-java-5.1.38-bin.jar
 OpenJUMP/lib/ext/dbdatastore/readme.txt
 OpenJUMP/lib/ext/dbdatastore/sqlite-jdbc-3.8.11.2.jar
 OpenJUMP/lib/ext/dbquery.properties
-OpenJUMP/lib/ext/driver-dxf-0.8.0.jar
-OpenJUMP/lib/ext/graph-toolbox-0.2.0.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalarcbinarygrid-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalarcgrid-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalbsb-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldoq1-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldoq2-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldted-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalecw-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalecwjp2-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalehdr-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalenvihdr-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalenvisat-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalerdasimg-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalgeotiff-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalidrisi-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaljpeg-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalkakadujp2-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalmrsid-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalmrsidjp2-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalnitf-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-imagereadmt-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-kakadu-1.1.7.jar
+OpenJUMP/lib/ext/driver-dxf-0.8.1.jar
+OpenJUMP/lib/ext/graph-toolbox-0.4.0.jar
+OpenJUMP/lib/ext/imageio-ext/commons-lang-2.4.jar
+OpenJUMP/lib/ext/imageio-ext/gdal-2.1.0.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-arcgrid-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalarcbinarygrid-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalarcgrid-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalbsb-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldoq1-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldoq2-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaldted-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalecw-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalecwjp2-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalehdr-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalenvihdr-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalenvisat-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalerdasimg-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalframework-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalgeotiff-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalidrisi-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdaljpeg-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalkakadujp2-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalmrsid-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalmrsidjp2-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-gdalnitf-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-geocore-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-imagereadmt-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-kakadu-1.1.16.jar
 OpenJUMP/lib/ext/imageio-ext/imageio-ext-kakadujni-5.2.6.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-nitf-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/imageio-ext-turbojpeg-1.1.7.jar
-OpenJUMP/lib/ext/imageio-ext/nitf-bindings-2.7-dev-r1130.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-nitf-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-png-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-streams-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-tiff-1.1.13.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-turbojpeg-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/imageio-ext-utilities-1.1.16.jar
+OpenJUMP/lib/ext/imageio-ext/nitf-bindings-2.7-r1269.jar
+OpenJUMP/lib/ext/imageio-ext/pngj-2.0.1.jar
 OpenJUMP/lib/ext/imageio-ext/turbojpeg-wrapper-1.2.1.1.jar
 OpenJUMP/lib/ext/itext-2.1.7.jar
-OpenJUMP/lib/ext/jgrapht-jdk1.5.jar
-OpenJUMP/lib/ext/jump-jgrapht-0.5.jar
 OpenJUMP/lib/ext/jumpdbquery-1.1.1/CONTRIBUTORS.txt
 OpenJUMP/lib/ext/jumpdbquery-1.1.1/COPYING
 OpenJUMP/lib/ext/jumpdbquery-1.1.1/LICENSE.txt
@@ -352,8 +360,14 @@ OpenJUMP/lib/ext/jython/images/shape_distribute_vertical.png
 OpenJUMP/lib/ext/jython/startup.py
 OpenJUMP/lib/ext/kml-driver-0.2.4.jar
 OpenJUMP/lib/ext/kml/ProjectStringsList.pjl
+OpenJUMP/lib/ext/lib/cts-1.4.0-SNAPSHOT.jar
+OpenJUMP/lib/ext/lib/jgrapht-core-0.9.2.jar
+OpenJUMP/lib/ext/lib/jump-jgrapht-0.7.jar
+OpenJUMP/lib/ext/lib/slf4j-api-1.7.7.jar
+OpenJUMP/lib/ext/lib/slf4j-simple-1.7.7.jar
 OpenJUMP/lib/ext/oj_osm_reader_v1-0-4.jar
-OpenJUMP/lib/ext/ojsextante_binding_mar2015.jar
+OpenJUMP/lib/ext/ojmapcoloring-0.5.jar
+OpenJUMP/lib/ext/ojsextante_binding_dec2016c.jar
 OpenJUMP/lib/ext/pbaseClasses.jar
 OpenJUMP/lib/ext/readme.txt
 OpenJUMP/lib/ext/set_attributes/DocumentedSample.xml
@@ -494,6 +508,568 @@ OpenJUMP/lib/ext/set_attributes/img/zoo-24.png
 OpenJUMP/lib/ext/set_attributes/maxspeed.xml
 OpenJUMP/lib/ext/sextante/gishur_core.jar
 OpenJUMP/lib/ext/sextante/gishur_x.jar
+OpenJUMP/lib/ext/sextante/help/Compute_Ripley-Rasson_spatial_domain.rsx
+OpenJUMP/lib/ext/sextante/help/Create_random_sampling_grid.rsx
+OpenJUMP/lib/ext/sextante/help/Create_regular_sampling_grid.rsx
+OpenJUMP/lib/ext/sextante/help/F_function_-_distance_from_a_point_to nearest event.rsx
+OpenJUMP/lib/ext/sextante/help/G_function_-_distance to nearest event.rsx
+OpenJUMP/lib/ext/sextante/help/K_function_-_Ripley_K.rsx
+OpenJUMP/lib/ext/sextante/help/Kolmogorov-Smirnov_normality_test.rsx
+OpenJUMP/lib/ext/sextante/help/Quadrat_analysis.rsx
+OpenJUMP/lib/ext/sextante/help/en/de.ifgi.sextante.simulationTools.channels/simulationchannelnetwork.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.accCost/acccost.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.accCost/costeAcumIsotropico_punto_mas_cercano.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.accCost/costeAcumuladoIsotropico_vias.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.accCostAnisotropic/acccostanisotropic.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.accCostAnisotropic/costeAcumAnisotropico_ecuacion.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.accCostCombined/acccostcombined.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.ahp/ahp.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.ahp/jerarquias_analisiticas_ahp.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.cluster/clasificacion_no_supervisada_clustering.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.cluster/clasificacion_no_supervisada_clustering2.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.cluster/cluster.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.costInRoutes/costinroutes.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.costInRoutesAnisotropic/costeAcumAnisotropico_ecuacion.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.costInRoutesAnisotropic/costinroutesanisotropic.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.cva/change_vector_analysis.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.cva/cva.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.fuzzify/MemberFunctionFuzzyLinear.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.fuzzify/fuzzify.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.owa/owa.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.polarToRect/polares_a_rectangulares_x.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.polarToRect/polares_a_rectangulares_y.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.polarToRect/polartorect.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.predictiveModels/modelosPred_1metodo.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.predictiveModels/modelosPred_2metodo.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.predictiveModels/modelosPred_3metodo.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.predictiveModels/predictivemodels.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.rectToPolar/recttopolar.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.roc/curva_roc.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.roc/roc.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.sumOfCostFromAllPoints/sumofcostfromallpoints.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.supervisedClassification/clasSuper.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.supervisedClassification/clasSuper_distancia_minima.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.supervisedClassification/clasSuper_landsat_b4.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.supervisedClassification/clasSuper_maxima_similitud.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.supervisedClassification/clasSuper_paralelepipedo.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.supervisedClassification/supervisedclassification.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridAnalysis.supervisedClassificationB/supervisedclassificationb.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.constantGrid/constantgrid.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.generateRandomBernoulli/generaterandombernoulli.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.generateRandomNormal/generar_grid_aleatorio_normal_funcion.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.generateRandomNormal/generaterandomnormal.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.generateRandomUniform/generaterandomuniform.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.generateTerrain/generar_mdt_artificial.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.generateTerrain/generateterrain.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.gridCalculator/gridcalculator.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.gridFromFunction/grid_funcion_matematica3.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.gridFromFunction/grid_funcion_matematica4.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.gridFromFunction/gridfromfunction.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.kernelFilter/filtro3x3_definido_por_el_usuario1.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.kernelFilter/filtro3x3_definido_por_el_usuario2.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.kernelFilter/filtro3x3_usuario_tabla.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.kernelFilter/kernelfilter.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.normalize/normalize.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.volume/calculo_de_volumenes.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.volume/volume.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCalculus.volumeBetweenGrids/volumebetweengrids.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.aggregationIndex/aggregationindex.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.aggregationIndex/indice_de_agregacion.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.aggregationIndex/indice_de_agregacion2.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.classStatistics/classstatistics.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.classStatistics/estadisticas_clases2.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.combineGrids/combinegrids.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.crossClassification/crossclassification.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.crossClassification/index_agreement.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.filterClumps/filterclumps.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.fragstatsArea/fragstats_area_densidad.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.fragstatsArea/fragstatsarea.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.fragstatsDiversity/fragstats_metrica_diversidad_con10clases.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.fragstatsDiversity/fragstatsdiversity.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.lacunarity/lacunarity.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.reclassify/reclassify.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.reclassifyConsecutive/reclassifyconsecutive.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.reclassifyDisjoint/reclasificar_en_clases_disjuntas1.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.reclassifyDisjoint/reclasificar_en_clases_disjuntas2.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.reclassifyDisjoint/reclassifydisjoint.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.reclassifyEqualAmplitude/dividir_n_clases_amplitud_entrada.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.reclassifyEqualAmplitude/dividir_n_clases_amplitud_salida.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.reclassifyEqualAmplitude/reclassifyequalamplitude.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.reclassifyEqualArea/dividir_n_clases_area_entrada.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.reclassifyEqualArea/diviidir_n_clases_area_salida.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridCategorical.reclassifyEqualArea/reclassifyequalarea.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridCountGreaterThan/multigridcountgreaterthan.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridCountLowerThan/multigridcountlowerthan.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridKurtosis/kurtosis.gif
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridKurtosis/multigridkurtosis.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridMajority/multigridmajority.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridMaxValue/multigridmaxvalue.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridMaxValueGrid/multigridmaxvaluegrid.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridMeanValue/multigridmeanvalue.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridMedian/multigridmedian.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridMinValue/multigridminvalue.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridMinValueGrid/multigridminvaluegrid.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridMinority/multigridminority.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridRange/multigridrange.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridSkewness/formula.gif
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridSkewness/multigridskewness.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridVariance/multigridvariance.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.multiGridcountEqualTo/multigridcountequalto.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodCountEqualTo/neighborhoodcountequalto.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodCountGreaterThan/neighborhoodcountgreaterthan.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodCountLowerThan/neighborhoodcountlowerthan.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodDiversity/diversidad_formula.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodDiversity/neighborhooddiversity.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodDominance/neighborhooddominance.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodFragmentation/neighborhoodfragmentation.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodKurtosis/kurtosis.gif
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodKurtosis/neighborhoodkurtosis.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodMajority/neighborhoodmajority.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodMaxValue/neighborhoodmaxvalue.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodMeanValue/neighborhoodmeanvalue.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodMedian/neighborhoodmedian.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodMinValue/neighborhoodminvalue.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodMinority/neighborhoodminority.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodNumberOfClasses/neighborhoodnumberofclasses.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodRange/neighborhoodrange.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodSkewness/formula_asimetria_por_vecindad.gif
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodSkewness/neighborhoodskewness.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodVariance/neighborhoodvariance.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.neighborhoodVarianceRadius/neighborhoodvarianceradius.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridStatistics.semivariances/semivariances.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.aggregate/aggregate.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.aggregate/agregar.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.bboxGrid/bboxgrid.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.changeDataType/changedatatype.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.clipBBoxGrid/clipbboxgrid.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.clipGrid/clipgrid.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.clipGrid/cortar_grids_con_capa_de_poligonos1.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.clipGrid/cortar_grids_con_capa_de_poligonos2.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.closeGaps/closegaps.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.closeGaps/filled.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.closeGaps/tofill.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.closeGapsNN/closegapsnn.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.correlation/correlacion_entre_capas.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.correlation/correlation.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.cropToValidData/croptovaliddata.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.density/densidad.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.density/densidad_dos.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.density/densidad_uno.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.density/density.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.gradientLines/gradiente.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.gradientLines/gradientlines.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.gridBasicStats/estadisticas_basicas.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.gridBasicStats/gridbasicstats.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.gridCompletion/completar_grid.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.gridCompletion/gridcompletion.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.gridOrientation/gridorientation.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.gridOrientation/reflejar_invertir.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.gridsFromTableAndGrid/gridsfromtableandgrid.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.histogram/histogram.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.histogram/histograma.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.invertNoData/invertir_mascara1.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.invertNoData/invertir_mascara2.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.invertNoData/invertnodata.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.kernelDensity/densidad_kernel.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.kernelDensity/kerneldensity.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.locateExtremeValues/locateextremevalues.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.mergeGrids/mergegrids.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.rasterBuffer/rasterbuffer.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.rasterBuffer/zona_de_influencia_distanciafija.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.sortRaster/sortraster.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.thresholdBuffer/leame.txt
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.thresholdBuffer/thresholdbuffer.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gridTools.thresholdBuffer/zona_de_influencia_mediante_umbral.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.gvsigspecific.reproject/reproject.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.accFlow/accflow.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.accFlow/acumulacion de flujo_D8.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.accFlow/acumulacion de flujo_Dinfinity.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.accFlow/acumulacion de flujo_MFD.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.accFlow/acumulacion de flujo_Rho8.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.burnStreams/burnstreams.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.cFactorFromNDVI/cfactorfromndvi.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.cellBalance/balance_neto_por_celdas.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.cellBalance/cellbalance.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.channelNetwork/channelnetwork.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.channelNetwork/red de drenaje_raster.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.channelNetwork/red de drenaje_vectorial.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.distToChannelNetwork/distancia_a_red_de_drenaje.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.distToChannelNetwork/disttochannelnetwork.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.edgeContamination/contaminacion_de_borde.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.edgeContamination/edgecontamination.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.fillSinks/fillsinks.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.heightOverChannelNetwork/elevacion_sobre_la_red_de_drenaje.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.heightOverChannelNetwork/heightoverchannelnetwork.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.isocrones/isocrones.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.isocrones/isocrones.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.maxValueUphill/maxvalueuphill.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.meanValueUphill/meanvalueuphill.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.slopeLength/longitud_de_pendiente.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.slopeLength/slopelength.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.strahlerOrder/orden_de_strahler.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.strahlerOrder/strahlerorder.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.topographicIndices/factor_ls.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.topographicIndices/indice_de_humedad_topografica.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.topographicIndices/indice_de_potencia_de_cauce.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.topographicIndices/topographicindices.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.upslopeAreaFromArea/upslopeareafromarea.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.upslopeAreaFromPoint/cuenca_vertiente_a_un_punto_dado.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.upslopeAreaFromPoint/upslopeareafrompoint.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.usped/usped.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.watersheds/cuencas.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.watersheds/watersheds.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.watershedsBySize/watershedsbysize.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.calibrate/calibrate.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.calibrateRegression/calibrateregression.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.contrastStretching/contraststretching.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.equalize/ecualizacion_entrada.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.equalize/ecualizacion_salida.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.equalize/equalize.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.erosionDilation/erosion_dilatacion_imgBase.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.erosionDilation/erosion_dilatacion_salidas.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.erosionDilation/erosiondilation.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.his2rgb/his2rgb.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.rgb2his/rgb2his.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.texture.features/textureasm.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.texture.features/texturecontrast.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.texture.quantization/quantization.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.thinning/adelgazamiento.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.thinning/thinning.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.vectorizeTrees/detectar_arboles.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.imageAnalysis.vectorizeTrees/vectorizetrees.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.lighting.hillshade/Relieve sombreado.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.lighting.hillshade/hillshade.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.lighting.horizonBlockage/hor_vis_angulo.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.lighting.horizonBlockage/hor_vis_distancia.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.lighting.horizonBlockage/horizonblockage.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.lighting.horizonBlockage/horizonte_visible_salida.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.lighting.los/linea_de_vision.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.lighting.los/los.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.lighting.solarRadiation/radiacion_solar.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.lighting.solarRadiation/solarradiation.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.lighting.visibility/visibility.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.lighting.visualExposure/Exposicion visual.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.lighting.visualExposure/visualexposure.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.locate.locateAllocate/locateallocate.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.locate.locateAllocate/locateallocate_input.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.locate.locateAllocate/locateallocate_output.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.anisotropicCoefficientOfVariation/acv.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.anisotropicCoefficientOfVariation/coeficiente_variacion_anisotropica.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.aspect/aspect.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.aspect/orientacion.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.convergence/Indice de convergencia.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.convergence/convergence.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.curvatures/Curvatura.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.curvatures/CurvaturaClasificacion.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.curvatures/CurvaturaHorizontal.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.curvatures/CurvaturaVertical.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.curvatures/curvatures.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.elevationReliefIndex/elevationreliefindex.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.elevationReliefIndex/indice_elevacion_relieve.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.fillElevationValues/fillelevationvalues.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.hypsometry/hipsometria.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.hypsometry/hypsometry.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.protectionIndex/indice_proteccion.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.protectionIndex/protectionindex.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.realArea/area_real.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.realArea/realarea.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.slope/pendiente.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.slope/slope.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.morphometry.surfaceSpecificPoints/surfacespecificpoints.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.nearestNeighbour/nninterpolation.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.nonSpatial.calculator/calculator.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.distanceMatrix/distance_matrix.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.distanceMatrix/distancematrix.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.meanCenter/centro_media_y_distancia_tipica.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.meanCenter/meancenter.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.medianCenter/centro_mediano.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.medianCenter/mediancenter.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.nearestNeighbour/analisis_de_vecino_mas_proximo.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.nearestNeighbour/nnanalysis.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.quadrat/analisis_por_cuadrantes.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.quadrat/quadrat.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.ripleysK/k_de_ripley.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.ripleysK/ripleysk.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.spatialCorrelation/autocorrelacion_espacial.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.spatialCorrelation/nube_del_variograma.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.pointAnalysis.spatialCorrelation/spatialcorrelation.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.profiles.crossSections/crosssections.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.profiles.crossSections/secciones_transversales.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.profiles.flowLineProfile/flowlineprofile.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.profiles.flowLineProfile/pefil_segun_linea_de_flujo.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.profiles.flowLineProfile/pefil_segun_linea_de_flujo_grafico.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.profiles.flowLineProfile/pefil_segun_linea_de_flujo_tabla.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.profiles.leastCostPath/leastcostpath.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.profiles.leastCostPath/ruta_de_minimo_coste.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.profiles.profile/perfil_longitudinal_figura.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.profiles.profile/profile.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.profiles.profile/profile_graph.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.directionToClosestPoint/directiontoclosestpoint.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.euclideanDistance/euclideandistance.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.idw/distancia_inversa.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.idw/distancia_inversa_2.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.idw/idw.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.idw/idw_eq.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.kriging/kriging.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.kriging/kriging_interpolado.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.kriging/kriging_tabla.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.kriging/kriging_varianzas.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.linearDecrease/decremento_lineal.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.linearDecrease/decremento_lineal2.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.linearDecrease/decremento_lineal_exponente.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.linearDecrease/lineardecrease.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.nearestNeighbour/nninterpolation.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.nearestNeighbour/vecindad2.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.rasterizeVectorLayer/rasterizevectorlayer.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.rasterizeVectorLayer/raterizar_capa_vectorial.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.universalKriging/kriging_uni_interpolado.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.universalKriging/kriging_uni_tabla.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.universalKriging/kriging_uni_varianza.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.rasterize.universalKriging/universalkriging.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.covarianceMatrix/covariancematrix.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.multipleRegression/multipleregression.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.multipleRegression/regresion_mul1.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.pca/pca.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.pdfBinomial/dis_prob_binomial.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.pdfBinomial/pdfbinomial.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.pdfChiSquared/dis_prob_chiCuadradado_formula.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.pdfChiSquared/pdfchisquared.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.pdfExponential/dis_prob_exponencial.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.pdfExponential/pdfexponential.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.pdfNormal/dis_prob_normal3.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.pdfNormal/pdfnormal.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.pdfStudent/dis_prob_tstudent1.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.pdfStudent/pdfstudent.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.regression/regresion.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.statisticalMethods.regression/regression.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.tables.createEquivalentNumericalClass/createequivalentnumericalclass.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.tables.filterVector/filtervector.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.tables.normalityTest/normalitytest.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.tables.tableBasicStats/tablebasicstats.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.tables.tableFieldCorrelation/tablefieldcorrelation.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.tables.vectorBasicStats/vectorbasicstats.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.tables.vectorFieldCalculator/vectorfieldcalculator.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.tables.vectorFieldCorrelation/vectorfieldcorrelation.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.tables.vectorHistogram/vectorhistogram.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.topology.checkLineDirectionCoherence/checklinedirectioncoherence.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.topology.checkLineDirectionCoherence/checklines.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.topology.joinAdjacentLines/joinadjacentlines.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.topology.joinAdjacentLines/joinlines.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.topology.nodeLines/nodelines.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.topology.nodeLines/nodes.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.tridimensional.grid3DFromFunction/grid3dfromfunction.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.InPolygonSpatialJoin/inpolygonspatialjoin.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.InPolygonSpatialJoin/panel.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.addEventTheme/addeventtheme.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.autoincrementValue/autoincrementvalue.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.boundingbox/boundingbox.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.boundingbox/boundingbox.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.buffer/buffer.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.buffer/zona_de_influencia.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.centroids/centroides.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.centroids/centroids.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.changeLineDirection/changelinedirection.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.changeLineDirection/invertir_sentido_lineas.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.cleanPointsLayer/cleanpointslayer.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.cleanVectorLayer/cleanvectorlayer.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.clip/clip.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.clip/cortar.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.clip/diff.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.clipByRectangle/clipByRectangle.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.clipByRectangle/clipbyrectangle.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.constrainedDelaunay/constraineddelaunay.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.countPoints/contar_puntos_en_poligonos1.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.countPoints/contar_puntos_en_poligonos2.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.countPoints/countpoints.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.delaunay/delaunay.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.delaunay/delaunay.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.difference/difference.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.dissolve/Disolver.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.dissolve/dissolve.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.dissolveMultiple/dissolvemultiple.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.distanceTableBuffer/distancetablebuffer.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.exportVector/exportvector.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.extendLinesLayerWithGrids/extendlineslayerwithgrids.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.extendPointsLayerWithGrids/extendpointslayerwithgrids.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.fitNPointsInPolygon/ajustar_n_puntos_en_poligono_aleatoria.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.fitNPointsInPolygon/ajustar_n_puntos_en_poligono_mallaregular.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.fitNPointsInPolygon/fitnpointsinpolygon.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.fixedDistanceBuffer/fixeddistancebuffer.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.fixedDistanceBuffer/zona_de_influencia.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.generateRoutes/generar_rutas_alternativas_mov_browniano.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.generateRoutes/generar_rutas_alternativas_recombinacion.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.generateRoutes/generateroutes.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.geometricProperties/geometricproperties.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.geometricPropertiesLines/geometricpropertieslines.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.geometriesToPoints/geometriestopoints.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.graticuleBuilder/crear_reticula.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.graticuleBuilder/graticulebuilder.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.gridStatisticsInPolygons/gridstatisticsinpolygons.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.intersection/interseccion.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.intersection/intersection.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.linesToEquispacedPoints/Convertir lineas en puntos equiespaciados.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.linesToEquispacedPoints/linestoequispacedpoints.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.medialAxis/medialaxis.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.medialAxis/medialaxis.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.merge/juntar.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.merge/merge.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.minimumEnclosingPolygon/minima_envolvente_convexa.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.minimumEnclosingPolygon/minimo_circulo.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.minimumEnclosingPolygon/minimo_rectangulo.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.minimumEnclosingPolygon/minimumenclosingpolygon.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.perturbatePointsLayer/perturbatepointslayer.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.placePointsOnLines/placepointsonlines.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.pointCoordinates/pointcoordinates.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.pointsToLine/pointstoline.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.polygonStatisticsFromPoints/polygonstatisticsfrompoints.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.polygonsToPolylines/Convertir poligonos en polilineas1.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.polygonsToPolylines/Convertir poligonos en polilineas2.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.polygonsToPolylines/polygonstopolylines.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.polylinesToPolygons/Convertir_polilineas_en_poligonosDos.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.polylinesToPolygons/Convertir_polilineas_en_poligonosUno.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.polylinesToPolygons/polylinestopolygons.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.polylinesToSingleSegments/polylinestosinglesegments.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.randomVector/randomvector.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.removeHoles/removeHoles.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.removeHoles/removeholes.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.removeRepeatedGeometries/removerepeatedgeometries.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.resolvePolygonHoles/holes.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.resolvePolygonHoles/resolvepolygonholes.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.saveToWKT/savetowkt.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.simplifyLines/Simplificar lineas.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.simplifyLines/simplifylines.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.simplifyPolygons/simplifypolygons.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.sinuosity/sinuosity.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.sinuosity/sinuosity.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.smoothLines/lines.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.smoothLines/smoothlines.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.snapPoints/ajustar_capa_de_puntos_a_otra_capa.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.snapPoints/snappoints.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.splitLinesWithPoints/fragmentar_lineas_con_capas_puntos.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.splitLinesWithPoints/splitlineswithpoints.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.splitMultipart/capaEntada.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.splitMultipart/capaSalida.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.splitMultipart/splitmultipart.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.splitPolylinesAtNodes/splitpolylinesatnodes.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.transform/transform.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.variableDistanceBuffer/variabledistancebuffer.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.variableDistanceBuffer/zona_de_influencia.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.vectorCluster/vectorcluster.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.vectorMean/media_direccional.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.vectorMean/vectormean.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.vectorSpatialCluster/vectorspatialcluster.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.voronoi/600px-Coloured_Voronoi_2D.svg.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorTools.voronoi/voronoi.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorize.contourLines/contourlines.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorize.contourLines/curvas_de_nivel1.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorize.rasterToPoints/capa_raster_a_capa_puntos.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorize.rasterToPoints/rastertopoints.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorize.vectorize/vectorizar_capa_raster1.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorize.vectorize/vectorizar_capa_raster2.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorize.vectorize/vectorize.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorize.vectorizeLines/vectorizar_capas_raster_lineas.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vectorize.vectorizeLines/vectorizelines.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.ctvi/ctvi.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.ctvi/ctvi.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.ndvi/ndvi.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.ndvi/ndvi.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.ndvi/ndvi_formula.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.nrvi/nrvi.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.nrvi/nrvi.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.pviPerry/linea_suelo.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.pviPerry/pvi_perry_formula.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.pviPerry/pviperry.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.pviQi/linea_suelo.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.pviQi/pvi_qi_et_al.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.pviQi/pviqi.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.pviRichardson/linea_suelo.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.pviRichardson/pvirichardson.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.pviWalther/linea_suelo.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.pviWalther/pvi_walther.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.pviWalther/pviwalther.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.ttvi/ttvi.jpg
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.ttvi/ttvi.xml
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.tvi/tvi.png
+OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.vegetationIndices.tvi/tvi.xml
+OpenJUMP/lib/ext/sextante/help/en/general/IntroductionToSEXTANTE.css
+OpenJUMP/lib/ext/sextante/help/en/general/about.htm
+OpenJUMP/lib/ext/sextante/help/en/general/accumulated_cost_anisotropic.png
+OpenJUMP/lib/ext/sextante/help/en/general/batch.html
+OpenJUMP/lib/ext/sextante/help/en/general/batch_processing.png
+OpenJUMP/lib/ext/sextante/help/en/general/batch_processing2.png
+OpenJUMP/lib/ext/sextante/help/en/general/batch_processing3.png
+OpenJUMP/lib/ext/sextante/help/en/general/batch_processing4.png
+OpenJUMP/lib/ext/sextante/help/en/general/batch_processing_bands.png
+OpenJUMP/lib/ext/sextante/help/en/general/batch_processing_executing.png
+OpenJUMP/lib/ext/sextante/help/en/general/batch_processing_filepath.png
+OpenJUMP/lib/ext/sextante/help/en/general/batch_processing_output.png
+OpenJUMP/lib/ext/sextante/help/en/general/batch_processing_save.png
+OpenJUMP/lib/ext/sextante/help/en/general/cmd.html
+OpenJUMP/lib/ext/sextante/help/en/general/command_line.png
+OpenJUMP/lib/ext/sextante/help/en/general/config_dialog.png
+OpenJUMP/lib/ext/sextante/help/en/general/config_groups.png
+OpenJUMP/lib/ext/sextante/help/en/general/coordinates.html
+OpenJUMP/lib/ext/sextante/help/en/general/coords.png
+OpenJUMP/lib/ext/sextante/help/en/general/explorer.html
+OpenJUMP/lib/ext/sextante/help/en/general/explorer.png
+OpenJUMP/lib/ext/sextante/help/en/general/extent_from_layer.png
+OpenJUMP/lib/ext/sextante/help/en/general/extent_from_view.png
+OpenJUMP/lib/ext/sextante/help/en/general/fit_to_input_layers.png
+OpenJUMP/lib/ext/sextante/help/en/general/fixed_table.png
+OpenJUMP/lib/ext/sextante/help/en/general/footnode.html
+OpenJUMP/lib/ext/sextante/help/en/general/graphic.png
+OpenJUMP/lib/ext/sextante/help/en/general/graphical_modeler.png
+OpenJUMP/lib/ext/sextante/help/en/general/help.png
+OpenJUMP/lib/ext/sextante/help/en/general/help_edition.png
+OpenJUMP/lib/ext/sextante/help/en/general/help_slope.png
+OpenJUMP/lib/ext/sextante/help/en/general/history.html
+OpenJUMP/lib/ext/sextante/help/en/general/history.png
+OpenJUMP/lib/ext/sextante/help/en/general/information_square.png
+OpenJUMP/lib/ext/sextante/help/en/general/intro.html
+OpenJUMP/lib/ext/sextante/help/en/general/logos.jpg
+OpenJUMP/lib/ext/sextante/help/en/general/modeler.html
+OpenJUMP/lib/ext/sextante/help/en/general/models.png
+OpenJUMP/lib/ext/sextante/help/en/general/models_icon.png
+OpenJUMP/lib/ext/sextante/help/en/general/models_parameters.png
+OpenJUMP/lib/ext/sextante/help/en/general/models_parameters2.png
+OpenJUMP/lib/ext/sextante/help/en/general/models_parameters3.png
+OpenJUMP/lib/ext/sextante/help/en/general/models_parameters4.png
+OpenJUMP/lib/ext/sextante/help/en/general/models_parameters5.png
+OpenJUMP/lib/ext/sextante/help/en/general/models_parameters6.png
+OpenJUMP/lib/ext/sextante/help/en/general/multiple_selection.png
+OpenJUMP/lib/ext/sextante/help/en/general/numerical_table.png
+OpenJUMP/lib/ext/sextante/help/en/general/oj1.png
+OpenJUMP/lib/ext/sextante/help/en/general/oj2.png
+OpenJUMP/lib/ext/sextante/help/en/general/oj3.png
+OpenJUMP/lib/ext/sextante/help/en/general/openjump.html
+OpenJUMP/lib/ext/sextante/help/en/general/previous_parameters.png
+OpenJUMP/lib/ext/sextante/help/en/general/providers.html
+OpenJUMP/lib/ext/sextante/help/en/general/providers_old.html
+OpenJUMP/lib/ext/sextante/help/en/general/results.html
+OpenJUMP/lib/ext/sextante/help/en/general/results_html.png
+OpenJUMP/lib/ext/sextante/help/en/general/results_image.png
+OpenJUMP/lib/ext/sextante/help/en/general/results_table.png
+OpenJUMP/lib/ext/sextante/help/en/general/selcoords.png
+OpenJUMP/lib/ext/sextante/help/en/general/sextante.png
+OpenJUMP/lib/ext/sextante/help/en/general/sextante_algo.html
+OpenJUMP/lib/ext/sextante/help/en/general/sextante_objects.png
+OpenJUMP/lib/ext/sextante/help/en/general/slope.png
+OpenJUMP/lib/ext/sextante/help/en/general/toolbox.html
+OpenJUMP/lib/ext/sextante/help/en/general/toolbox.png
+OpenJUMP/lib/ext/sextante/help/en/general/user_defined.png
+OpenJUMP/lib/ext/sextante/help/en/general/warning.png
+OpenJUMP/lib/ext/sextante/help/en/it.falciano.sextante.polygonize/input_lines.png
+OpenJUMP/lib/ext/sextante/help/en/it.falciano.sextante.polygonize/output_polygons.png
+OpenJUMP/lib/ext/sextante/help/en/it.falciano.sextante.polygonize/polygonize.xml
+OpenJUMP/lib/ext/sextante/help/en/it.falciano.sextante.vectorAddField/vectoraddfield.xml
+OpenJUMP/lib/ext/sextante/help/en/it.falciano.sextante.vectorDeleteField/vectordeletefield.xml
+OpenJUMP/lib/ext/sextante/help/en/it.falciano.sextante.vectorRenameField/vectorrenamefield.xml
+OpenJUMP/lib/ext/sextante/help/hipsometry.model
+OpenJUMP/lib/ext/sextante/help/hipsometry.model.xml
+OpenJUMP/lib/ext/sextante/help/slope.model
+OpenJUMP/lib/ext/sextante/help/slopemean.bsh
+OpenJUMP/lib/ext/sextante/help/watershed.model
+OpenJUMP/lib/ext/sextante/help/watershed.model.xml
 OpenJUMP/lib/ext/sextante/japura-1.14.0.jar
 OpenJUMP/lib/ext/sextante/jcommon-1.0.14.jar
 OpenJUMP/lib/ext/sextante/jep-2.4.0.jar
@@ -504,579 +1080,29 @@ OpenJUMP/lib/ext/sextante/libMath.jar
 OpenJUMP/lib/ext/sextante/sextante.jar
 OpenJUMP/lib/ext/sextante/sextante_algorithms.jar
 OpenJUMP/lib/ext/sextante/sextante_gui.jar
-OpenJUMP/lib/ext/sextante/terminal.png
+OpenJUMP/lib/ext/sextante/sextante_new_algorithms.jar
 OpenJUMP/lib/ext/sextante/trove-0.1.8.jar
-OpenJUMP/lib/ext/sextante_help/Compute_Ripley-Rasson_spatial_domain.rsx
-OpenJUMP/lib/ext/sextante_help/Create_random_sampling_grid.rsx
-OpenJUMP/lib/ext/sextante_help/Create_regular_sampling_grid.rsx
-OpenJUMP/lib/ext/sextante_help/F_function_-_distance_from_a_point_to nearest event.rsx
-OpenJUMP/lib/ext/sextante_help/G_function_-_distance to nearest event.rsx
-OpenJUMP/lib/ext/sextante_help/K_function_-_Ripley_K.rsx
-OpenJUMP/lib/ext/sextante_help/Kolmogorov-Smirnov_normality_test.rsx
-OpenJUMP/lib/ext/sextante_help/Quadrat_analysis.rsx
-OpenJUMP/lib/ext/sextante_help/en/de.ifgi.sextante.simulationTools.channels/simulationchannelnetwork.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.accCost/acccost.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.accCost/costeAcumIsotropico_punto_mas_cercano.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.accCost/costeAcumuladoIsotropico_vias.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.accCostAnisotropic/acccostanisotropic.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.accCostAnisotropic/costeAcumAnisotropico_ecuacion.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.accCostCombined/acccostcombined.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.ahp/ahp.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.ahp/jerarquias_analisiticas_ahp.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.cluster/clasificacion_no_supervisada_clustering.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.cluster/clasificacion_no_supervisada_clustering2.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.cluster/cluster.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.costInRoutes/costinroutes.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.costInRoutesAnisotropic/costeAcumAnisotropico_ecuacion.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.costInRoutesAnisotropic/costinroutesanisotropic.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.cva/change_vector_analysis.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.cva/cva.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.fuzzify/MemberFunctionFuzzyLinear.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.fuzzify/fuzzify.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.owa/owa.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.polarToRect/polares_a_rectangulares_x.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.polarToRect/polares_a_rectangulares_y.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.polarToRect/polartorect.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.predictiveModels/modelosPred_1metodo.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.predictiveModels/modelosPred_2metodo.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.predictiveModels/modelosPred_3metodo.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.predictiveModels/predictivemodels.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.rectToPolar/recttopolar.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.roc/curva_roc.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.roc/roc.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.sumOfCostFromAllPoints/sumofcostfromallpoints.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.supervisedClassification/clasSuper.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.supervisedClassification/clasSuper_distancia_minima.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.supervisedClassification/clasSuper_landsat_b4.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.supervisedClassification/clasSuper_maxima_similitud.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.supervisedClassification/clasSuper_paralelepipedo.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.supervisedClassification/supervisedclassification.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridAnalysis.supervisedClassificationB/supervisedclassificationb.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.constantGrid/constantgrid.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.generateRandomBernoulli/generaterandombernoulli.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.generateRandomNormal/generar_grid_aleatorio_normal_funcion.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.generateRandomNormal/generaterandomnormal.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.generateRandomUniform/generaterandomuniform.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.generateTerrain/generar_mdt_artificial.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.generateTerrain/generateterrain.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.gridCalculator/gridcalculator.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.gridFromFunction/grid_funcion_matematica3.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.gridFromFunction/grid_funcion_matematica4.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.gridFromFunction/gridfromfunction.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.kernelFilter/filtro3x3_definido_por_el_usuario1.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.kernelFilter/filtro3x3_definido_por_el_usuario2.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.kernelFilter/filtro3x3_usuario_tabla.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.kernelFilter/kernelfilter.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.normalize/normalize.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.volume/calculo_de_volumenes.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.volume/volume.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCalculus.volumeBetweenGrids/volumebetweengrids.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.aggregationIndex/aggregationindex.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.aggregationIndex/indice_de_agregacion.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.aggregationIndex/indice_de_agregacion2.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.classStatistics/classstatistics.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.classStatistics/estadisticas_clases2.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.combineGrids/combinegrids.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.crossClassification/crossclassification.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.crossClassification/index_agreement.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.filterClumps/filterclumps.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.fragstatsArea/fragstats_area_densidad.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.fragstatsArea/fragstatsarea.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.fragstatsDiversity/fragstats_metrica_diversidad_con10clases.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.fragstatsDiversity/fragstatsdiversity.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.lacunarity/lacunarity.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.reclassify/reclassify.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.reclassifyConsecutive/reclassifyconsecutive.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.reclassifyDisjoint/reclasificar_en_clases_disjuntas1.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.reclassifyDisjoint/reclasificar_en_clases_disjuntas2.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.reclassifyDisjoint/reclassifydisjoint.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.reclassifyEqualAmplitude/dividir_n_clases_amplitud_entrada.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.reclassifyEqualAmplitude/dividir_n_clases_amplitud_salida.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.reclassifyEqualAmplitude/reclassifyequalamplitude.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.reclassifyEqualArea/dividir_n_clases_area_entrada.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.reclassifyEqualArea/diviidir_n_clases_area_salida.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridCategorical.reclassifyEqualArea/reclassifyequalarea.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridCountGreaterThan/multigridcountgreaterthan.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridCountLowerThan/multigridcountlowerthan.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridKurtosis/kurtosis.gif
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridKurtosis/multigridkurtosis.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridMajority/multigridmajority.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridMaxValue/multigridmaxvalue.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridMaxValueGrid/multigridmaxvaluegrid.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridMeanValue/multigridmeanvalue.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridMedian/multigridmedian.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridMinValue/multigridminvalue.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridMinValueGrid/multigridminvaluegrid.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridMinority/multigridminority.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridRange/multigridrange.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridSkewness/formula.gif
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridSkewness/multigridskewness.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridVariance/multigridvariance.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.multiGridcountEqualTo/multigridcountequalto.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodCountEqualTo/neighborhoodcountequalto.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodCountGreaterThan/neighborhoodcountgreaterthan.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodCountLowerThan/neighborhoodcountlowerthan.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodDiversity/diversidad_formula.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodDiversity/neighborhooddiversity.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodDominance/neighborhooddominance.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodFragmentation/neighborhoodfragmentation.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodKurtosis/kurtosis.gif
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodKurtosis/neighborhoodkurtosis.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodMajority/neighborhoodmajority.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodMaxValue/neighborhoodmaxvalue.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodMeanValue/neighborhoodmeanvalue.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodMedian/neighborhoodmedian.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodMinValue/neighborhoodminvalue.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodMinority/neighborhoodminority.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodNumberOfClasses/neighborhoodnumberofclasses.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodRange/neighborhoodrange.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodSkewness/formula_asimetria_por_vecindad.gif
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodSkewness/neighborhoodskewness.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodVariance/neighborhoodvariance.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.neighborhoodVarianceRadius/neighborhoodvarianceradius.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridStatistics.semivariances/semivariances.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.aggregate/aggregate.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.aggregate/agregar.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.bboxGrid/bboxgrid.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.changeDataType/changedatatype.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.clipBBoxGrid/clipbboxgrid.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.clipGrid/clipgrid.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.clipGrid/cortar_grids_con_capa_de_poligonos1.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.clipGrid/cortar_grids_con_capa_de_poligonos2.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.closeGaps/closegaps.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.closeGaps/filled.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.closeGaps/tofill.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.closeGapsNN/closegapsnn.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.correlation/correlacion_entre_capas.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.correlation/correlation.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.cropToValidData/croptovaliddata.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.density/densidad.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.density/densidad_dos.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.density/densidad_uno.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.density/density.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.gradientLines/gradiente.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.gradientLines/gradientlines.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.gridBasicStats/estadisticas_basicas.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.gridBasicStats/gridbasicstats.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.gridCompletion/completar_grid.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.gridCompletion/gridcompletion.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.gridOrientation/gridorientation.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.gridOrientation/reflejar_invertir.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.gridsFromTableAndGrid/gridsfromtableandgrid.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.histogram/histogram.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.histogram/histograma.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.invertNoData/invertir_mascara1.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.invertNoData/invertir_mascara2.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.invertNoData/invertnodata.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.kernelDensity/densidad_kernel.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.kernelDensity/kerneldensity.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.locateExtremeValues/locateextremevalues.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.mergeGrids/mergegrids.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.rasterBuffer/rasterbuffer.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.rasterBuffer/zona_de_influencia_distanciafija.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.sortRaster/sortraster.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.thresholdBuffer/leame.txt
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.thresholdBuffer/thresholdbuffer.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gridTools.thresholdBuffer/zona_de_influencia_mediante_umbral.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.gvsigspecific.reproject/reproject.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.accFlow/accflow.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.accFlow/acumulacion de flujo_D8.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.accFlow/acumulacion de flujo_Dinfinity.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.accFlow/acumulacion de flujo_MFD.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.accFlow/acumulacion de flujo_Rho8.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.burnStreams/burnstreams.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.cFactorFromNDVI/cfactorfromndvi.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.cellBalance/balance_neto_por_celdas.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.cellBalance/cellbalance.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.channelNetwork/channelnetwork.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.channelNetwork/red de drenaje_raster.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.channelNetwork/red de drenaje_vectorial.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.distToChannelNetwork/distancia_a_red_de_drenaje.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.distToChannelNetwork/disttochannelnetwork.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.edgeContamination/contaminacion_de_borde.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.edgeContamination/edgecontamination.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.fillSinks/fillsinks.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.heightOverChannelNetwork/elevacion_sobre_la_red_de_drenaje.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.heightOverChannelNetwork/heightoverchannelnetwork.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.isocrones/isocrones.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.isocrones/isocrones.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.maxValueUphill/maxvalueuphill.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.meanValueUphill/meanvalueuphill.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.slopeLength/longitud_de_pendiente.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.slopeLength/slopelength.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.strahlerOrder/orden_de_strahler.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.strahlerOrder/strahlerorder.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.topographicIndices/factor_ls.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.topographicIndices/indice_de_humedad_topografica.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.topographicIndices/indice_de_potencia_de_cauce.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.topographicIndices/topographicindices.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.upslopeAreaFromArea/upslopeareafromarea.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.upslopeAreaFromPoint/cuenca_vertiente_a_un_punto_dado.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.upslopeAreaFromPoint/upslopeareafrompoint.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.usped/usped.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.watersheds/cuencas.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.watersheds/watersheds.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.watershedsBySize/watershedsbysize.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.calibrate/calibrate.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.calibrateRegression/calibrateregression.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.contrastStretching/contraststretching.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.equalize/ecualizacion_entrada.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.equalize/ecualizacion_salida.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.equalize/equalize.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.erosionDilation/erosion_dilatacion_imgBase.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.erosionDilation/erosion_dilatacion_salidas.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.erosionDilation/erosiondilation.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.his2rgb/his2rgb.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.rgb2his/rgb2his.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.texture.features/textureasm.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.texture.features/texturecontrast.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.texture.quantization/quantization.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.thinning/adelgazamiento.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.thinning/thinning.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.vectorizeTrees/detectar_arboles.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.imageAnalysis.vectorizeTrees/vectorizetrees.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.lighting.hillshade/Relieve sombreado.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.lighting.hillshade/hillshade.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.lighting.horizonBlockage/hor_vis_angulo.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.lighting.horizonBlockage/hor_vis_distancia.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.lighting.horizonBlockage/horizonblockage.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.lighting.horizonBlockage/horizonte_visible_salida.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.lighting.los/linea_de_vision.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.lighting.los/los.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.lighting.solarRadiation/radiacion_solar.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.lighting.solarRadiation/solarradiation.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.lighting.visibility/visibility.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.lighting.visualExposure/Exposicion visual.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.lighting.visualExposure/visualexposure.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.locate.locateAllocate/locateallocate.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.locate.locateAllocate/locateallocate_input.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.locate.locateAllocate/locateallocate_output.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.anisotropicCoefficientOfVariation/acv.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.anisotropicCoefficientOfVariation/coeficiente_variacion_anisotropica.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.aspect/aspect.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.aspect/orientacion.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.convergence/Indice de convergencia.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.convergence/convergence.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.curvatures/Curvatura.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.curvatures/CurvaturaClasificacion.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.curvatures/CurvaturaHorizontal.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.curvatures/CurvaturaVertical.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.curvatures/curvatures.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.elevationReliefIndex/elevationreliefindex.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.elevationReliefIndex/indice_elevacion_relieve.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.fillElevationValues/fillelevationvalues.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.hypsometry/hipsometria.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.hypsometry/hypsometry.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.protectionIndex/indice_proteccion.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.protectionIndex/protectionindex.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.realArea/area_real.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.realArea/realarea.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.slope/pendiente.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.slope/slope.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.morphometry.surfaceSpecificPoints/surfacespecificpoints.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.nearestNeighbour/nninterpolation.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.nonSpatial.calculator/calculator.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.distanceMatrix/distance_matrix.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.distanceMatrix/distancematrix.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.meanCenter/centro_media_y_distancia_tipica.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.meanCenter/meancenter.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.medianCenter/centro_mediano.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.medianCenter/mediancenter.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.nearestNeighbour/analisis_de_vecino_mas_proximo.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.nearestNeighbour/nnanalysis.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.quadrat/analisis_por_cuadrantes.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.quadrat/quadrat.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.ripleysK/k_de_ripley.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.ripleysK/ripleysk.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.spatialCorrelation/autocorrelacion_espacial.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.spatialCorrelation/nube_del_variograma.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.pointAnalysis.spatialCorrelation/spatialcorrelation.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.profiles.crossSections/crosssections.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.profiles.crossSections/secciones_transversales.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.profiles.flowLineProfile/flowlineprofile.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.profiles.flowLineProfile/pefil_segun_linea_de_flujo.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.profiles.flowLineProfile/pefil_segun_linea_de_flujo_grafico.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.profiles.flowLineProfile/pefil_segun_linea_de_flujo_tabla.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.profiles.leastCostPath/leastcostpath.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.profiles.leastCostPath/ruta_de_minimo_coste.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.profiles.profile/perfil_longitudinal_figura.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.profiles.profile/profile.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.profiles.profile/profile_graph.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.directionToClosestPoint/directiontoclosestpoint.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.euclideanDistance/euclideandistance.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.idw/distancia_inversa.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.idw/distancia_inversa_2.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.idw/idw.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.idw/idw_eq.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.kriging/kriging.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.kriging/kriging_interpolado.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.kriging/kriging_tabla.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.kriging/kriging_varianzas.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.linearDecrease/decremento_lineal.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.linearDecrease/decremento_lineal2.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.linearDecrease/decremento_lineal_exponente.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.linearDecrease/lineardecrease.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.nearestNeighbour/nninterpolation.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.nearestNeighbour/vecindad2.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.rasterizeVectorLayer/rasterizevectorlayer.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.rasterizeVectorLayer/raterizar_capa_vectorial.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.universalKriging/kriging_uni_interpolado.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.universalKriging/kriging_uni_tabla.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.universalKriging/kriging_uni_varianza.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.rasterize.universalKriging/universalkriging.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.covarianceMatrix/covariancematrix.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.multipleRegression/multipleregression.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.multipleRegression/regresion_mul1.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.pca/pca.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.pdfBinomial/dis_prob_binomial.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.pdfBinomial/pdfbinomial.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.pdfChiSquared/dis_prob_chiCuadradado_formula.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.pdfChiSquared/pdfchisquared.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.pdfExponential/dis_prob_exponencial.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.pdfExponential/pdfexponential.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.pdfNormal/dis_prob_normal3.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.pdfNormal/pdfnormal.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.pdfStudent/dis_prob_tstudent1.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.pdfStudent/pdfstudent.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.regression/regresion.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.statisticalMethods.regression/regression.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.tables.createEquivalentNumericalClass/createequivalentnumericalclass.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.tables.filterVector/filtervector.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.tables.normalityTest/normalitytest.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.tables.tableBasicStats/tablebasicstats.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.tables.tableFieldCorrelation/tablefieldcorrelation.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.tables.vectorBasicStats/vectorbasicstats.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.tables.vectorFieldCalculator/vectorfieldcalculator.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.tables.vectorFieldCorrelation/vectorfieldcorrelation.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.tables.vectorHistogram/vectorhistogram.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.topology.checkLineDirectionCoherence/checklinedirectioncoherence.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.topology.checkLineDirectionCoherence/checklines.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.topology.joinAdjacentLines/joinadjacentlines.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.topology.joinAdjacentLines/joinlines.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.topology.nodeLines/nodelines.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.topology.nodeLines/nodes.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.InPolygonSpatialJoin/inpolygonspatialjoin.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.InPolygonSpatialJoin/panel.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.addEventTheme/addeventtheme.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.autoincrementValue/autoincrementvalue.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.boundingbox/boundingbox.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.boundingbox/boundingbox.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.buffer/buffer.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.buffer/zona_de_influencia.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.centroids/centroides.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.centroids/centroids.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.changeLineDirection/changelinedirection.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.changeLineDirection/invertir_sentido_lineas.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.cleanPointsLayer/cleanpointslayer.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.cleanVectorLayer/cleanvectorlayer.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.clip/clip.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.clip/cortar.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.clip/diff.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.clipByRectangle/clipByRectangle.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.clipByRectangle/clipbyrectangle.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.constrainedDelaunay/constraineddelaunay.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.countPoints/contar_puntos_en_poligonos1.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.countPoints/contar_puntos_en_poligonos2.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.countPoints/countpoints.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.delaunay/delaunay.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.delaunay/delaunay.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.difference/difference.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.dissolve/Disolver.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.dissolve/dissolve.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.dissolveMultiple/dissolvemultiple.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.distanceTableBuffer/distancetablebuffer.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.exportVector/exportvector.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.extendLinesLayerWithGrids/extendlineslayerwithgrids.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.extendPointsLayerWithGrids/extendpointslayerwithgrids.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.fitNPointsInPolygon/ajustar_n_puntos_en_poligono_aleatoria.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.fitNPointsInPolygon/ajustar_n_puntos_en_poligono_mallaregular.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.fitNPointsInPolygon/fitnpointsinpolygon.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.fixedDistanceBuffer/fixeddistancebuffer.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.fixedDistanceBuffer/zona_de_influencia.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.generateRoutes/generar_rutas_alternativas_mov_browniano.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.generateRoutes/generar_rutas_alternativas_recombinacion.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.generateRoutes/generateroutes.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.geometricProperties/geometricproperties.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.geometricPropertiesLines/geometricpropertieslines.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.geometriesToPoints/geometriestopoints.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.graticuleBuilder/crear_reticula.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.graticuleBuilder/graticulebuilder.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.gridStatisticsInPolygons/gridstatisticsinpolygons.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.intersection/interseccion.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.intersection/intersection.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.linesToEquispacedPoints/Convertir lineas en puntos equiespaciados.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.linesToEquispacedPoints/linestoequispacedpoints.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.medialAxis/medialaxis.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.medialAxis/medialaxis.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.merge/juntar.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.merge/merge.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.minimumEnclosingPolygon/minima_envolvente_convexa.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.minimumEnclosingPolygon/minimo_circulo.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.minimumEnclosingPolygon/minimo_rectangulo.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.minimumEnclosingPolygon/minimumenclosingpolygon.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.perturbatePointsLayer/perturbatepointslayer.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.placePointsOnLines/placepointsonlines.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.pointCoordinates/pointcoordinates.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.pointsToLine/pointstoline.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.polygonStatisticsFromPoints/polygonstatisticsfrompoints.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.polygonsToPolylines/Convertir poligonos en polilineas1.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.polygonsToPolylines/Convertir poligonos en polilineas2.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.polygonsToPolylines/polygonstopolylines.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.polylinesToPolygons/Convertir_polilineas_en_poligonosDos.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.polylinesToPolygons/Convertir_polilineas_en_poligonosUno.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.polylinesToPolygons/polylinestopolygons.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.polylinesToSingleSegments/polylinestosinglesegments.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.randomVector/randomvector.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.removeHoles/removeHoles.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.removeHoles/removeholes.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.removeRepeatedGeometries/removerepeatedgeometries.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.resolvePolygonHoles/holes.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.resolvePolygonHoles/resolvepolygonholes.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.saveToWKT/savetowkt.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.simplifyLines/Simplificar lineas.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.simplifyLines/simplifylines.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.simplifyPolygons/simplifypolygons.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.sinuosity/sinuosity.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.sinuosity/sinuosity.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.smoothLines/lines.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.smoothLines/smoothlines.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.snapPoints/ajustar_capa_de_puntos_a_otra_capa.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.snapPoints/snappoints.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.splitLinesWithPoints/fragmentar_lineas_con_capas_puntos.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.splitLinesWithPoints/splitlineswithpoints.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.splitMultipart/capaEntada.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.splitMultipart/capaSalida.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.splitMultipart/splitmultipart.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.splitPolylinesAtNodes/splitpolylinesatnodes.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.transform/transform.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.variableDistanceBuffer/variabledistancebuffer.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.variableDistanceBuffer/zona_de_influencia.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.vectorCluster/vectorcluster.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.vectorMean/media_direccional.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.vectorMean/vectormean.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.vectorSpatialCluster/vectorspatialcluster.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.voronoi/600px-Coloured_Voronoi_2D.svg.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorTools.voronoi/voronoi.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorize.contourLines/contourlines.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorize.contourLines/curvas_de_nivel1.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorize.rasterToPoints/capa_raster_a_capa_puntos.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorize.rasterToPoints/rastertopoints.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorize.vectorize/vectorizar_capa_raster1.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorize.vectorize/vectorizar_capa_raster2.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorize.vectorize/vectorize.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorize.vectorizeLines/vectorizar_capas_raster_lineas.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vectorize.vectorizeLines/vectorizelines.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.ctvi/ctvi.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.ctvi/ctvi.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.ndvi/ndvi.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.ndvi/ndvi.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.ndvi/ndvi_formula.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.nrvi/nrvi.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.nrvi/nrvi.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.pviPerry/linea_suelo.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.pviPerry/pvi_perry_formula.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.pviPerry/pviperry.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.pviQi/linea_suelo.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.pviQi/pvi_qi_et_al.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.pviQi/pviqi.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.pviRichardson/linea_suelo.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.pviRichardson/pvirichardson.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.pviWalther/linea_suelo.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.pviWalther/pvi_walther.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.pviWalther/pviwalther.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.ttvi/ttvi.jpg
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.ttvi/ttvi.xml
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.tvi/tvi.png
-OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.vegetationIndices.tvi/tvi.xml
-OpenJUMP/lib/ext/sextante_help/en/general/IntroductionToSEXTANTE.css
-OpenJUMP/lib/ext/sextante_help/en/general/accumulated_cost_anisotropic.png
-OpenJUMP/lib/ext/sextante_help/en/general/batch.html
-OpenJUMP/lib/ext/sextante_help/en/general/batch_processing.png
-OpenJUMP/lib/ext/sextante_help/en/general/batch_processing2.png
-OpenJUMP/lib/ext/sextante_help/en/general/batch_processing3.png
-OpenJUMP/lib/ext/sextante_help/en/general/batch_processing4.png
-OpenJUMP/lib/ext/sextante_help/en/general/batch_processing_bands.png
-OpenJUMP/lib/ext/sextante_help/en/general/batch_processing_executing.png
-OpenJUMP/lib/ext/sextante_help/en/general/batch_processing_filepath.png
-OpenJUMP/lib/ext/sextante_help/en/general/batch_processing_output.png
-OpenJUMP/lib/ext/sextante_help/en/general/batch_processing_save.png
-OpenJUMP/lib/ext/sextante_help/en/general/cmd.html
-OpenJUMP/lib/ext/sextante_help/en/general/command_line.png
-OpenJUMP/lib/ext/sextante_help/en/general/config_dialog.png
-OpenJUMP/lib/ext/sextante_help/en/general/config_groups.png
-OpenJUMP/lib/ext/sextante_help/en/general/extent_from_layer.png
-OpenJUMP/lib/ext/sextante_help/en/general/extent_from_view.png
-OpenJUMP/lib/ext/sextante_help/en/general/fit_to_input_layers.png
-OpenJUMP/lib/ext/sextante_help/en/general/fixed_table.png
-OpenJUMP/lib/ext/sextante_help/en/general/footnode.html
-OpenJUMP/lib/ext/sextante_help/en/general/graphic.png
-OpenJUMP/lib/ext/sextante_help/en/general/graphical_modeler.png
-OpenJUMP/lib/ext/sextante_help/en/general/help.png
-OpenJUMP/lib/ext/sextante_help/en/general/help_edition.png
-OpenJUMP/lib/ext/sextante_help/en/general/help_slope.png
-OpenJUMP/lib/ext/sextante_help/en/general/history.html
-OpenJUMP/lib/ext/sextante_help/en/general/history.png
-OpenJUMP/lib/ext/sextante_help/en/general/information_square.png
-OpenJUMP/lib/ext/sextante_help/en/general/intro.html
-OpenJUMP/lib/ext/sextante_help/en/general/modeler.html
-OpenJUMP/lib/ext/sextante_help/en/general/models.png
-OpenJUMP/lib/ext/sextante_help/en/general/models_icon.png
-OpenJUMP/lib/ext/sextante_help/en/general/models_parameters.png
-OpenJUMP/lib/ext/sextante_help/en/general/models_parameters2.png
-OpenJUMP/lib/ext/sextante_help/en/general/models_parameters3.png
-OpenJUMP/lib/ext/sextante_help/en/general/models_parameters4.png
-OpenJUMP/lib/ext/sextante_help/en/general/models_parameters5.png
-OpenJUMP/lib/ext/sextante_help/en/general/models_parameters6.png
-OpenJUMP/lib/ext/sextante_help/en/general/multiple_selection.png
-OpenJUMP/lib/ext/sextante_help/en/general/numerical_table.png
-OpenJUMP/lib/ext/sextante_help/en/general/previous_parameters.png
-OpenJUMP/lib/ext/sextante_help/en/general/providers.html
-OpenJUMP/lib/ext/sextante_help/en/general/sextante_algo.html
-OpenJUMP/lib/ext/sextante_help/en/general/sextante_objects.png
-OpenJUMP/lib/ext/sextante_help/en/general/slope.png
-OpenJUMP/lib/ext/sextante_help/en/general/toolbox.html
-OpenJUMP/lib/ext/sextante_help/en/general/toolbox.png
-OpenJUMP/lib/ext/sextante_help/en/general/user_defined.png
-OpenJUMP/lib/ext/sextante_help/en/general/warning.png
-OpenJUMP/lib/ext/sextante_help/en/it.falciano.sextante.polygonize/input_lines.png
-OpenJUMP/lib/ext/sextante_help/en/it.falciano.sextante.polygonize/output_polygons.png
-OpenJUMP/lib/ext/sextante_help/en/it.falciano.sextante.polygonize/polygonize.xml
-OpenJUMP/lib/ext/sextante_help/en/it.falciano.sextante.vectorAddField/vectoraddfield.xml
-OpenJUMP/lib/ext/sextante_help/en/it.falciano.sextante.vectorDeleteField/vectordeletefield.xml
-OpenJUMP/lib/ext/sextante_help/en/it.falciano.sextante.vectorRenameField/vectorrenamefield.xml
-OpenJUMP/lib/ext/sextante_help/hipsometry.model
-OpenJUMP/lib/ext/sextante_help/hipsometry.model.xml
-OpenJUMP/lib/ext/sextante_help/slope.model
-OpenJUMP/lib/ext/sextante_help/slopemean.bsh
-OpenJUMP/lib/ext/sextante_help/watershed.model
-OpenJUMP/lib/ext/sextante_help/watershed.model.xml
-OpenJUMP/lib/ext/slf4j-api-1.7.7.jar
-OpenJUMP/lib/ext/slf4j-simple-1.7.7.jar
-OpenJUMP/lib/ext/topology-0.8.1.jar
+OpenJUMP/lib/ext/topology-0.9.1.jar
 OpenJUMP/lib/ext/wfs/commons-httpclient-3.1.jar
 OpenJUMP/lib/ext/wfs/deegree2-core-2.6-pre2-20140511.220246-596.jar
 OpenJUMP/lib/ext/wfs/jaxen-1.1.1.jar
 OpenJUMP/lib/ext/wfs/vecmath-1.5.2.jar
 OpenJUMP/lib/ext/workbench-properties.xml
 OpenJUMP/lib/ext/xbean-2.2.0.jar
+OpenJUMP/lib/hamcrest-core-1.3.jar
 OpenJUMP/lib/icons/oj.ico
 OpenJUMP/lib/icons/oj.png
-OpenJUMP/lib/imageio-ext-arcgrid-1.1.7.jar
-OpenJUMP/lib/imageio-ext-gdal-bindings-1.9.2.jar
-OpenJUMP/lib/imageio-ext-gdalframework-1.1.7.jar
-OpenJUMP/lib/imageio-ext-geocore-1.1.7.jar
-OpenJUMP/lib/imageio-ext-streams-1.1.7.jar
-OpenJUMP/lib/imageio-ext-tiff-1.1.7.jar
-OpenJUMP/lib/imageio-ext-utilities-1.1.7.jar
 OpenJUMP/lib/jai_codec-1.1.3.jar
 OpenJUMP/lib/jai_core-1.1.3.jar
 OpenJUMP/lib/jai_imageio-1.1.jar
 OpenJUMP/lib/jama-1.0.2.jar
-OpenJUMP/lib/jdom-1.1.3.jar
+OpenJUMP/lib/jdom2-2.0.6.jar
 OpenJUMP/lib/jmatharray-20070905.jar
 OpenJUMP/lib/jmathplot-20070905.jar
 OpenJUMP/lib/js-1.5R4.1.jar
+OpenJUMP/lib/json-simple-1.1.1.jar
 OpenJUMP/lib/jts-core-1.14.0.jar
+OpenJUMP/lib/jts-io-1.14.0.jar
 OpenJUMP/lib/jython-2.2.jar
 OpenJUMP/lib/log4j-1.2.17.jar
 OpenJUMP/lib/native/jecw-0.0.7.jar
@@ -1088,4 +1114,4 @@ OpenJUMP/lib/xmlParserAPIs-2.0.2.jar
 OpenJUMP/lib/xz-1.5.jar
 bin/openjump
 %%PORTDOCS%%%%DOCSDIR%%/Changes.txt
-@dir OpenJUMP/lib/ext/sextante_help/en/es.unex.sextante.hydrology.createHyetogram
+@dir OpenJUMP/lib/ext/sextante/help/en/es.unex.sextante.hydrology.createHyetogram
diff --git a/graphics/pqiv/Makefile b/graphics/pqiv/Makefile
index 0da59fa5604..ddf796cdf49 100644
--- a/graphics/pqiv/Makefile
+++ b/graphics/pqiv/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	pqiv
-PORTVERSION=	2.8.2
+PORTVERSION=	2.8.3
 CATEGORIES=	graphics
 
 MAINTAINER=	danilo@FreeBSD.org
diff --git a/graphics/pqiv/distinfo b/graphics/pqiv/distinfo
index c2a0d84cfb4..99e5e085f4f 100644
--- a/graphics/pqiv/distinfo
+++ b/graphics/pqiv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488459030
-SHA256 (phillipberndt-pqiv-2.8.2_GH0.tar.gz) = 4953e5627581720ba385913e1a8129ef9b312a93d2ce3d632a6fcad98d6db2dc
-SIZE (phillipberndt-pqiv-2.8.2_GH0.tar.gz) = 108475
+TIMESTAMP = 1488637298
+SHA256 (phillipberndt-pqiv-2.8.3_GH0.tar.gz) = b90c45d829eb180459dcfbf1420b8feb670dc9bb542fe307adbc4ff201445bbd
+SIZE (phillipberndt-pqiv-2.8.3_GH0.tar.gz) = 108525
diff --git a/graphics/proj/Makefile b/graphics/proj/Makefile
index ab17690d677..4528dc68325 100644
--- a/graphics/proj/Makefile
+++ b/graphics/proj/Makefile
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	proj
-PORTVERSION=	4.9.2
+PORTVERSION=	4.9.3
 CATEGORIES=	graphics geography
-MASTER_SITES=	ftp://ftp.remotesensing.org/proj/ \
-		http://download.osgeo.org/proj/
+MASTER_SITES=	http://download.osgeo.org/proj/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DATUM_GRID_FILES}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -17,13 +16,27 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 EXTRACT_DEPENDS=	${UNZIP_CMD}:archivers/unzip
 
-DATUM_GRID_FILES=	proj-datumgrid-1.6RC1.zip
+DATUM_GRID_FILES=	proj-datumgrid-1.6.zip
 
 GNU_CONFIGURE=	yes
-USES=		gmake libtool pathfix
+USES=		compiler gmake libtool pathfix
 USE_LDCONFIG=	yes
 
+FMAN1=	cs2cs.1 geod.1 proj.1
+FMAN3=	geodesic.3 pj_init.3
+
+INSTALL_TARGET=	install-strip
+
 post-extract:
 	@${UNZIP_CMD} -q ${DISTDIR}/${DATUM_GRID_FILES} -d ${WRKSRC}/nad
 
+pre-configure:
+	@${REINPLACE_CMD} -e 's|gcc|${COMPILER_TYPE}|' \
+		${WRKSRC}/cmake/Proj4SystemInfo.cmake
+
+post-install:
+.for m in 1 3
+	(cd ${STAGEDIR}${MANPREFIX}/man/man${m} && ${GZIP_CMD} ${FMAN${m}})
+.endfor
+
 .include <bsd.port.mk>
diff --git a/graphics/proj/distinfo b/graphics/proj/distinfo
index 1527aa167c6..b74252b4351 100644
--- a/graphics/proj/distinfo
+++ b/graphics/proj/distinfo
@@ -1,4 +1,5 @@
-SHA256 (proj-4.9.2.tar.gz) = 60bf9ad1ed1c18158e652dfff97865ba6fb2b67f1511bc8dceae4b3c7e657796
-SIZE (proj-4.9.2.tar.gz) = 874816
-SHA256 (proj-datumgrid-1.6RC1.zip) = 054e7b63b474926c79f25fbe5cd8760351e8d93e5a167b5473e993c01bb08866
-SIZE (proj-datumgrid-1.6RC1.zip) = 2766762
+TIMESTAMP = 1483895414
+SHA256 (proj-4.9.3.tar.gz) = 6984542fea333488de5c82eea58d699e4aff4b359200a9971537cd7e047185f7
+SIZE (proj-4.9.3.tar.gz) = 921448
+SHA256 (proj-datumgrid-1.6.zip) = 054e7b63b474926c79f25fbe5cd8760351e8d93e5a167b5473e993c01bb08866
+SIZE (proj-datumgrid-1.6.zip) = 2766762
diff --git a/graphics/proj/files/patch-src-pj_mutex.c b/graphics/proj/files/patch-src-pj_mutex.c
index e0dd8112f0f..55346aef46f 100644
--- a/graphics/proj/files/patch-src-pj_mutex.c
+++ b/graphics/proj/files/patch-src-pj_mutex.c
@@ -1,14 +1,11 @@
---- src/pj_mutex.c.orig	2015-09-10 13:41:24 UTC
+--- src/pj_mutex.c.orig	2016-08-29 18:47:58 UTC
 +++ src/pj_mutex.c
-@@ -122,11 +122,7 @@ void pj_acquire_lock()
+@@ -124,7 +124,7 @@ void pj_acquire_lock()
          pthread_mutex_lock( &pj_precreated_lock);
  
          pthread_mutexattr_init(&mutex_attr);
 -#ifdef HAVE_PTHREAD_MUTEX_RECURSIVE
++#if defined(HAVE_PTHREAD_MUTEX_RECURSIVE) || defined(__FreeBSD__)
          pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE);
--#else
--        pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
--#endif
-         pthread_mutex_init(&pj_core_lock, &mutex_attr);
-         pj_core_lock_created = 1;
- 
+ #else
+         pthread_mutexattr_settype(&mutex_attr, PTHREAD_MUTEX_RECURSIVE_NP);
diff --git a/graphics/proj/pkg-plist b/graphics/proj/pkg-plist
index ce22ba18a93..19d402150e9 100644
--- a/graphics/proj/pkg-plist
+++ b/graphics/proj/pkg-plist
@@ -11,8 +11,8 @@ include/proj_api.h
 include/projects.h
 lib/libproj.a
 lib/libproj.so
-lib/libproj.so.9
-lib/libproj.so.9.1.0
+lib/libproj.so.12
+lib/libproj.so.12.0.0
 libdata/pkgconfig/proj.pc
 man/man1/cs2cs.1.gz
 man/man1/geod.1.gz
diff --git a/graphics/rubygem-mini_magick/Makefile b/graphics/rubygem-mini_magick/Makefile
index 2c6a8e6fd50..cc8ccce2441 100644
--- a/graphics/rubygem-mini_magick/Makefile
+++ b/graphics/rubygem-mini_magick/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mini_magick
-PORTVERSION=	4.6.0
+PORTVERSION=	4.6.1
 CATEGORIES=	graphics rubygems
 MASTER_SITES=	RG
 
diff --git a/graphics/rubygem-mini_magick/distinfo b/graphics/rubygem-mini_magick/distinfo
index 0e05d5a0614..4e9aa517f56 100644
--- a/graphics/rubygem-mini_magick/distinfo
+++ b/graphics/rubygem-mini_magick/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486790053
-SHA256 (rubygem/mini_magick-4.6.0.gem) = 8ae961e986adc9827464c7aecb7c33e259b8d547cb20586dfec2947f331ab962
-SIZE (rubygem/mini_magick-4.6.0.gem) = 16896
+TIMESTAMP = 1487007421
+SHA256 (rubygem/mini_magick-4.6.1.gem) = 6945dc0ac6bc4e5c19eb7b3be6fa065887ef353835a63481aee8a7d1f50fea6a
+SIZE (rubygem/mini_magick-4.6.1.gem) = 16896
diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index 1b410a66f66..798db259bbb 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chicken
-PORTVERSION=	4.11.0
+PORTVERSION=	4.12.0
 PORTEPOCH=	1
 CATEGORIES=	lang scheme
 MASTER_SITES=	http://code.call-cc.org/releases/${PORTVERSION}/
diff --git a/lang/chicken/distinfo b/lang/chicken/distinfo
index f3a40700f12..d28405035ea 100644
--- a/lang/chicken/distinfo
+++ b/lang/chicken/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464444057
-SHA256 (chicken-4.11.0.tar.gz) = e3dc2b8f95b6a3cd59c85b5bb6bdb2bd9cefc45b5d536a20cad74e3c63f4ad89
-SIZE (chicken-4.11.0.tar.gz) = 4201815
+TIMESTAMP = 1488700400
+SHA256 (chicken-4.12.0.tar.gz) = 605ace459bc66e8c5f82abb03d9b1c9ca36f1c2295931d244d03629a947a6989
+SIZE (chicken-4.12.0.tar.gz) = 4240266
diff --git a/lang/gcc7-devel/Makefile b/lang/gcc7-devel/Makefile
index d9aa0a7c4ad..73a9532213f 100644
--- a/lang/gcc7-devel/Makefile
+++ b/lang/gcc7-devel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	7.0.1.s20170226
+PORTVERSION=	7.0.1.s20170305
 CATEGORIES=	lang
 MASTER_SITES=	GCC/snapshots/${DISTVERSION}
 PKGNAMESUFFIX=	${SUFFIX}-devel
diff --git a/lang/gcc7-devel/distinfo b/lang/gcc7-devel/distinfo
index addb19a97a6..02f451ea828 100644
--- a/lang/gcc7-devel/distinfo
+++ b/lang/gcc7-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488154572
-SHA256 (gcc-7-20170226.tar.bz2) = 2bd18baa03596f04acea8efb90603ac17ab61b1ed5af95f0f773db7a75203c24
-SIZE (gcc-7-20170226.tar.bz2) = 79471111
+TIMESTAMP = 1488822662
+SHA256 (gcc-7-20170305.tar.bz2) = ea44ed9c765acacf3ae03a33ea386e70af98f51e97f4506c5bc7b54ded56d19e
+SIZE (gcc-7-20170305.tar.bz2) = 79675641
diff --git a/lang/perl5-devel/Makefile b/lang/perl5-devel/Makefile
index fefde50da77..f57eac9e77f 100644
--- a/lang/perl5-devel/Makefile
+++ b/lang/perl5-devel/Makefile
@@ -34,7 +34,7 @@ TEST_ENV=	${MAKE_ENV} TEST_JOBS=${MAKE_JOBS_NUMBER} \
 USE_GITHUB=	yes
 GH_ACCOUNT=	Perl
 GH_PROJECT=	perl5
-GH_TAGNAME=	v5.25.10-41-gaa9ac6c
+GH_TAGNAME=	v5.25.10-52-g39f2cbe
 
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/lang/perl5-devel/distinfo b/lang/perl5-devel/distinfo
index 89dbf1e3416..cba0e04627f 100644
--- a/lang/perl5-devel/distinfo
+++ b/lang/perl5-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488189615
-SHA256 (perl/perl-5.25.10-41_GH0.tar.gz) = 18659f929d820da5350bb6ad3befc3e9abca4b4ca50307eb300dbec33f4797cf
-SIZE (perl/perl-5.25.10-41_GH0.tar.gz) = 18469807
+TIMESTAMP = 1488798837
+SHA256 (perl/perl-5.25.10-52_GH0.tar.gz) = 0a15104359ed9691d69c980a564b3b2cbc174555dd11b638a20b5832555a7ba1
+SIZE (perl/perl-5.25.10-52_GH0.tar.gz) = 18472058
diff --git a/lang/rust-nightly/pkg-plist.amd64 b/lang/rust-nightly/pkg-plist.amd64
deleted file mode 100644
index 25063938321..00000000000
--- a/lang/rust-nightly/pkg-plist.amd64
+++ /dev/null
@@ -1,111 +0,0 @@
-bin/rust-gdb
-bin/rust-lldb
-bin/rustc
-bin/rustdoc
-lib/libarena-8d2cc8030f9f9e51.so
-lib/libflate-973fda46ca6065f1.so
-lib/libfmt_macros-9d6e7242f0ddcbf7.so
-lib/libgetopts-14c98bbc4ab8bc3f.so
-lib/libgraphviz-aa6a755e4919c93d.so
-lib/liblog-e4305648ec68a46a.so
-lib/libproc_macro-4730696f57bacfa3.so
-lib/libproc_macro_plugin-69bd7c91eac0c254.so
-lib/librustc-6b01deb37863e1ca.so
-lib/librustc_back-427e3c868150f7b0.so
-lib/librustc_borrowck-a304a1e74e918d6b.so
-lib/librustc_const_eval-c69c066c119845ac.so
-lib/librustc_const_math-ccd5fbe2ff37b8d0.so
-lib/librustc_data_structures-b9404b12fbed1c74.so
-lib/librustc_driver-c04abcc58e3ffb91.so
-lib/librustc_errors-e031f7e8a7282cec.so
-lib/librustc_incremental-eb1b3a9ccd2d69f4.so
-lib/librustc_lint-2c84223e05fa41a5.so
-lib/librustc_llvm-2e9edcc4f41d6f9e.so
-lib/librustc_metadata-68c02ba8ed31bcbb.so
-lib/librustc_mir-d1ade9f855a3dd4e.so
-lib/librustc_passes-440684124770790d.so
-lib/librustc_platform_intrinsics-800e3ffa1075bf42.so
-lib/librustc_plugin-ea33519f778627e0.so
-lib/librustc_privacy-0e49074db03edd68.so
-lib/librustc_resolve-8f93f3b7cce6c6c6.so
-lib/librustc_save_analysis-bacd5488c3595e4e.so
-lib/librustc_trans-6e517a0c43def43a.so
-lib/librustc_typeck-0cda1f5e9ab6ae7e.so
-lib/librustdoc-4a80fdb0177544ad.so
-lib/libserialize-c2845ef911babcca.so
-lib/libstd-f2f8780747d93445.so
-lib/libsyntax-03351f557e53af0e.so
-lib/libsyntax_ext-6a1c3c07e6d676fa.so
-lib/libsyntax_pos-255190cc0bcdb455.so
-lib/libterm-eb27c73a2d4a57e7.so
-lib/libtest-b971548dd4e94068.so
-lib/rustlib/components
-lib/rustlib/etc/debugger_pretty_printers_common.py
-lib/rustlib/etc/gdb_load_rust_pretty_printers.py
-lib/rustlib/etc/gdb_rust_pretty_printing.py
-lib/rustlib/etc/lldb_rust_formatters.py
-%%PORTDOCS%%lib/rustlib/manifest-rust-docs
-lib/rustlib/manifest-rust-std-%%RUST_TARGET%%
-lib/rustlib/manifest-rustc
-lib/rustlib/rust-installer-version
-lib/rustlib/uninstall.sh
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc-a8d9cdd7f7eb8506.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_jemalloc-313310930119e25e.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_system-f4d8f5b6d6a973bb.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libarena-8d2cc8030f9f9e51.so
-lib/rustlib/%%RUST_TARGET%%/lib/libcollections-2bdf2b02dc8a8446.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcompiler_builtins-9b730c300ba40434.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcore-da4919c977412e22.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libflate-973fda46ca6065f1.so
-lib/rustlib/%%RUST_TARGET%%/lib/libfmt_macros-9d6e7242f0ddcbf7.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-14c98bbc4ab8bc3f.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-14c98bbc4ab8bc3f.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgraphviz-aa6a755e4919c93d.so
-lib/rustlib/%%RUST_TARGET%%/lib/liblibc-ea4991e691e95619.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-e4305648ec68a46a.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-e4305648ec68a46a.so
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_abort-b7a2099b7d96488a.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_unwind-335959aa35b8bd5d.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro-4730696f57bacfa3.so
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro_plugin-69bd7c91eac0c254.so
-lib/rustlib/%%RUST_TARGET%%/lib/librand-5013d660cd4b44f7.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc-6b01deb37863e1ca.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_back-427e3c868150f7b0.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_bitflags-2af44cfa8afa54e9.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_borrowck-a304a1e74e918d6b.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_eval-c69c066c119845ac.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_math-ccd5fbe2ff37b8d0.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_data_structures-b9404b12fbed1c74.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_driver-c04abcc58e3ffb91.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_errors-e031f7e8a7282cec.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_incremental-eb1b3a9ccd2d69f4.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_lint-2c84223e05fa41a5.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_llvm-2e9edcc4f41d6f9e.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_metadata-68c02ba8ed31bcbb.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_mir-d1ade9f855a3dd4e.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_passes-440684124770790d.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_platform_intrinsics-800e3ffa1075bf42.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_plugin-ea33519f778627e0.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_privacy-0e49074db03edd68.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_resolve-8f93f3b7cce6c6c6.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_save_analysis-bacd5488c3595e4e.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_trans-6e517a0c43def43a.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_typeck-0cda1f5e9ab6ae7e.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustdoc-4a80fdb0177544ad.so
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-c2845ef911babcca.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-c2845ef911babcca.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-f2f8780747d93445.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-f2f8780747d93445.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_shim-93e35d7db5ebf466.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_unicode-c9431ed85229e521.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax-03351f557e53af0e.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_ext-6a1c3c07e6d676fa.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_pos-255190cc0bcdb455.so
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-eb27c73a2d4a57e7.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-eb27c73a2d4a57e7.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-b971548dd4e94068.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-b971548dd4e94068.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest_shim-6ea79bb2723d4a41.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libunwind-1602582b55d57366.rlib
-man/man1/rustc.1.gz
-man/man1/rustdoc.1.gz
diff --git a/lang/rust-nightly/pkg-plist.i386 b/lang/rust-nightly/pkg-plist.i386
deleted file mode 100644
index 967c463be48..00000000000
--- a/lang/rust-nightly/pkg-plist.i386
+++ /dev/null
@@ -1,111 +0,0 @@
-bin/rust-gdb
-bin/rust-lldb
-bin/rustc
-bin/rustdoc
-lib/libarena-cdf0295c70746a79.so
-lib/libflate-b9a5040f96aa402b.so
-lib/libfmt_macros-b3074e0c5da3df6d.so
-lib/libgetopts-d8895d105d310e76.so
-lib/libgraphviz-0059e64abf2c24b2.so
-lib/liblog-f9832bc037a53dcb.so
-lib/libproc_macro-a4c3e2756e12fcc8.so
-lib/libproc_macro_plugin-45d25669fd5fb1a5.so
-lib/librustc-4b28b6ad6d82e49f.so
-lib/librustc_back-2c1449f7f387d224.so
-lib/librustc_borrowck-6ac2c9c72eceeeda.so
-lib/librustc_const_eval-487905d175c99446.so
-lib/librustc_const_math-238fdc253dd7af24.so
-lib/librustc_data_structures-31344ba5b5be7057.so
-lib/librustc_driver-084f8accf1cc2bd1.so
-lib/librustc_errors-beefbf0f0264a079.so
-lib/librustc_incremental-6d23576ccbfa6527.so
-lib/librustc_lint-5a028635ff692d5b.so
-lib/librustc_llvm-6509896b779098aa.so
-lib/librustc_metadata-48efb0507a83f497.so
-lib/librustc_mir-188dca836b5f1b12.so
-lib/librustc_passes-198fc6e3469ee0e1.so
-lib/librustc_platform_intrinsics-fb42969088db1e17.so
-lib/librustc_plugin-f1ae7a111ce0ec6f.so
-lib/librustc_privacy-9ff96d587ab182b2.so
-lib/librustc_resolve-e44fc7af7ebcb411.so
-lib/librustc_save_analysis-54b37819ddd48dc5.so
-lib/librustc_trans-621f14613d5d3296.so
-lib/librustc_typeck-615f7784c66ad9b3.so
-lib/librustdoc-d30d7b89914f7571.so
-lib/libserialize-526524dfd837403a.so
-lib/libstd-d97890d0e362897a.so
-lib/libsyntax-4a8d4ba093890bd8.so
-lib/libsyntax_ext-c7946296933228f1.so
-lib/libsyntax_pos-a856932aa4fd541e.so
-lib/libterm-eb7b0c50c4d22983.so
-lib/libtest-0c4c2bc2990af5ab.so
-lib/rustlib/components
-lib/rustlib/etc/debugger_pretty_printers_common.py
-lib/rustlib/etc/gdb_load_rust_pretty_printers.py
-lib/rustlib/etc/gdb_rust_pretty_printing.py
-lib/rustlib/etc/lldb_rust_formatters.py
-%%PORTDOCS%%lib/rustlib/manifest-rust-docs
-lib/rustlib/manifest-rust-std-%%RUST_TARGET%%
-lib/rustlib/manifest-rustc
-lib/rustlib/rust-installer-version
-lib/rustlib/uninstall.sh
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc-c57a879ed7447180.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_jemalloc-ab82c164a23e3c08.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_system-5ca4345bce998522.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libarena-cdf0295c70746a79.so
-lib/rustlib/%%RUST_TARGET%%/lib/libcollections-39e9e502ffbb788e.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcompiler_builtins-9c20a1b3f18accdf.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcore-b4d29dc3993f010d.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libflate-b9a5040f96aa402b.so
-lib/rustlib/%%RUST_TARGET%%/lib/libfmt_macros-b3074e0c5da3df6d.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-d8895d105d310e76.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-d8895d105d310e76.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgraphviz-0059e64abf2c24b2.so
-lib/rustlib/%%RUST_TARGET%%/lib/liblibc-9d9d8e3c62702f96.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-f9832bc037a53dcb.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-f9832bc037a53dcb.so
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_abort-13d54537255281fa.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_unwind-f3eae4bff39c5871.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro-a4c3e2756e12fcc8.so
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro_plugin-45d25669fd5fb1a5.so
-lib/rustlib/%%RUST_TARGET%%/lib/librand-e74bb9084f28dd26.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc-4b28b6ad6d82e49f.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_back-2c1449f7f387d224.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_bitflags-ebfe699cf089f29e.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_borrowck-6ac2c9c72eceeeda.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_eval-487905d175c99446.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_math-238fdc253dd7af24.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_data_structures-31344ba5b5be7057.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_driver-084f8accf1cc2bd1.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_errors-beefbf0f0264a079.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_incremental-6d23576ccbfa6527.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_lint-5a028635ff692d5b.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_llvm-6509896b779098aa.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_metadata-48efb0507a83f497.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_mir-188dca836b5f1b12.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_passes-198fc6e3469ee0e1.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_platform_intrinsics-fb42969088db1e17.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_plugin-f1ae7a111ce0ec6f.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_privacy-9ff96d587ab182b2.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_resolve-e44fc7af7ebcb411.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_save_analysis-54b37819ddd48dc5.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_trans-621f14613d5d3296.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_typeck-615f7784c66ad9b3.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustdoc-d30d7b89914f7571.so
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-526524dfd837403a.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-526524dfd837403a.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-d97890d0e362897a.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-d97890d0e362897a.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_shim-41972075c970f4a3.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_unicode-41233be8ebe06116.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax-4a8d4ba093890bd8.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_ext-c7946296933228f1.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_pos-a856932aa4fd541e.so
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-eb7b0c50c4d22983.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-eb7b0c50c4d22983.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-0c4c2bc2990af5ab.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-0c4c2bc2990af5ab.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest_shim-60bc9f5650ac5401.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libunwind-9da81a987ecdaf90.rlib
-man/man1/rustc.1.gz
-man/man1/rustdoc.1.gz
diff --git a/lang/rust/Makefile b/lang/rust/Makefile
index 43f9ae17aec..b2829ffa570 100644
--- a/lang/rust/Makefile
+++ b/lang/rust/Makefile
@@ -21,7 +21,6 @@ DISTFILES+=	${CARGO_REGISTRY}:registry
 .endif
 DIST_SUBDIR?=	rust
 EXTRACT_ONLY?=	${DISTFILES:N*\:*bootstrap:C/:.*//}
-PLIST=		${.CURDIR}/pkg-plist.${ARCH}
 
 MAINTAINER?=	riggs@FreeBSD.org
 COMMENT=	Language with a focus on memory safety and concurrency
@@ -75,8 +74,6 @@ CONFIGURE_ARGS=	--disable-valgrind \
 		--mandir=${MANPREFIX}/man \
 		--release-channel=${RUST_CHANNEL}
 
-PORTDOCS=	*
-
 MAKE_ARGS+=	VERBOSE=1
 
 OPTIONS_DEFINE=		DOCS GDB LLNEXTGEN PORT_LLVM
@@ -98,6 +95,18 @@ LLVM_PREFIX=			${LOCALBASE}/llvm${LLVM_VER}
 TEST_TARGET=	check
 TEST_ENV+=	ALLOW_NONZERO_RLIMIT_CORE=1
 
+# Rust manifests list all files and directories installed by rust-installer.
+# We use them in:
+#     - pre-install to cleanup the ${STAGEDIR}
+#     - post-install to populate the ${TMPPLIST}
+RUST_MANIFESTS=		lib/rustlib/manifest-rustc \
+			lib/rustlib/manifest-rust-std-${RUST_TARGET}
+RUST_DOCS_MANIFESTS=	lib/rustlib/manifest-rust-docs
+DOCS_VARS=		rust_manifests+=${RUST_DOCS_MANIFESTS}
+
+PLIST_FILES=		lib/rustlib/components \
+			lib/rustlib/rust-installer-version
+
 pre-fetch:
 	# FIXME: This is the same check for CONFLICTS as the standard
 	# one, except port origins are not compared. This allows
@@ -145,37 +154,50 @@ post-patch:
 # new ones. Otherwise, the staging directory is polluted with unneeded
 # files.
 pre-install:
-	@for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \
-	    if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; then \
-		${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \
-		< ${STAGEDIR}${PREFIX}/lib/rustlib/$$f \
-		| ${XARGS} ${RM}; \
+	@for f in ${RUST_MANIFESTS} ${RUST_DOCS_MANIFESTS}; do \
+	    if test -f "${STAGEDIR}${PREFIX}/$$f"; then \
+	        ${SED} -E -e 's,^(file|dir):,${STAGEDIR},' \
+	            < "${STAGEDIR}${PREFIX}/$$f" \
+	            | ${XARGS} ${RM} -r; \
+	        ${RM} "${STAGEDIR}${PREFIX}/$$f"; \
 	    fi; \
 	done
+	@for f in ${PLIST_FILES}; do \
+	    ${RM} "${STAGEDIR}${PREFIX}/$$f"; \
+	done
+
+# In post-install, we use the manifests generated during Rust install
+# to in turn generate the PLIST. We do that, instead of the regular
+# `pkg-plist`, because several libraries have a computed filename based
+# on the absolute path of the source files. As it is user-specific, we
+# can't know their filename in advance.
+#
+# We fix manpage entries in the generated manifests because Rust
+# installs them uncompressed but the Ports framework compresses them.
+post-install:
+	for f in ${RUST_MANIFESTS}; do \
+	    ${REINPLACE_CMD} -E \
+	        -e 's|:${STAGEDIR}|:|' \
+	        -e 's|(man/man[1-9]/.*\.[0-9])|\1.gz|' \
+	        ${STAGEDIR}${PREFIX}/$$f; \
+	    ${RM} ${STAGEDIR}${PREFIX}/$$f.bak; \
+	    ${ECHO} "${PREFIX}/$$f" >> ${TMPPLIST}; \
+	    ${AWK} '\
+	        /^file:/ { \
+	            file=$$0; \
+	            sub(/^file:/, "", file); \
+	            print file; \
+	        } \
+	        /^dir:/ { \
+	            dir=$$0; \
+	            sub(/^dir:/, "", dir); \
+	            system("find ${STAGEDIR}" dir " -type f | ${SED} -E -e \"s|${STAGEDIR}||\""); \
+	        }' \
+	        ${STAGEDIR}${PREFIX}/$$f >> ${TMPPLIST}; \
+	done
 	@${RM} \
-		${STAGEDIR}${PREFIX}/lib/rustlib/components \
-		${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rustc \
-		${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rust-std-${RUST_TARGET} \
-		${STAGEDIR}${PREFIX}/lib/rustlib/rust-installer-version \
-		${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh
-
-pre-install-DOCS-on:
-	@for f in manifest-rust-docs; do \
-	    if test -f ${STAGEDIR}${PREFIX}/lib/rustlib/$$f; then \
-		${SED} -E -e 's,^(dir|file:),${STAGEDIR},' \
-		< ${STAGEDIR}${PREFIX}/lib/rustlib/$$f \
-		| ${XARGS} ${RM}; \
-	    fi; \
-	done
-	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/manifest-rust-docs
-
-post-install:
-	@for f in manifest-rustc manifest-rust-std-${RUST_TARGET}; do \
-		${REINPLACE_CMD} -e 's|${STAGEDIR}||' \
-			${STAGEDIR}${PREFIX}/lib/rustlib/$$f; \
-		${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/$$f.bak; \
-	done
-	@${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/install.log
+	    ${STAGEDIR}${PREFIX}/lib/rustlib/install.log \
+	    ${STAGEDIR}${PREFIX}/lib/rustlib/uninstall.sh
 # FIXME: Static libraries in lib/rustlib/*/lib/*.rlib are not stripped,
 # but they contain non-object files which make strip(1) unhappy.
 	@${STRIP_CMD} \
@@ -184,13 +206,6 @@ post-install:
 		${STAGEDIR}${PREFIX}/lib/*.so \
 		${STAGEDIR}${PREFIX}/lib/rustlib/*/lib/*.so
 
-post-install-DOCS-on:
-	@for f in manifest-rust-docs; do \
-		${REINPLACE_CMD} -e 's|${STAGEDIR}||' \
-			${STAGEDIR}${PREFIX}/lib/rustlib/$$f; \
-		${RM} ${STAGEDIR}${PREFIX}/lib/rustlib/$$f.bak; \
-	done
-
 .include <bsd.port.mk>
 
 # "make gen-registry" is a special target to ease this port update.
diff --git a/lang/rust/pkg-plist.amd64 b/lang/rust/pkg-plist.amd64
deleted file mode 100644
index dd9f253cd60..00000000000
--- a/lang/rust/pkg-plist.amd64
+++ /dev/null
@@ -1,113 +0,0 @@
-bin/rust-gdb
-bin/rust-lldb
-bin/rustc
-bin/rustdoc
-lib/libarena-22adfce669fd9832.so
-lib/libflate-e1e6e55ceb7251ef.so
-lib/libfmt_macros-ba80d211c09981a2.so
-lib/libgetopts-09faa2be228f2ddb.so
-lib/libgraphviz-6303af3dd8d718e9.so
-lib/liblog-761db57e43e641cb.so
-lib/libproc_macro-964c3339f3f8acda.so
-lib/libproc_macro_plugin-d9ebf1627378b721.so
-lib/libproc_macro_tokens-adc448e5e4f62f44.so
-lib/librustc-4221de92f27e804b.so
-lib/librustc_back-e247e25402404c1f.so
-lib/librustc_borrowck-68ef6be666920880.so
-lib/librustc_const_eval-14677cc7d4f412a3.so
-lib/librustc_const_math-7d31310a940ce777.so
-lib/librustc_data_structures-a29777375c573c9a.so
-lib/librustc_driver-9b159e7b54809b23.so
-lib/librustc_errors-da09828277bc171a.so
-lib/librustc_incremental-f9cea8a2dfb1093f.so
-lib/librustc_lint-ac6a304d2924921f.so
-lib/librustc_llvm-7a749f3ba5ac01da.so
-lib/librustc_metadata-0df9306a450c5744.so
-lib/librustc_mir-af6ee715a1ae6a07.so
-lib/librustc_passes-bdfaafb6f5c7f3fe.so
-lib/librustc_platform_intrinsics-12515fe496f9a823.so
-lib/librustc_plugin-4df4f6f2ea0b06f0.so
-lib/librustc_privacy-1ffbe0ad74c952f8.so
-lib/librustc_resolve-601ffa89350be577.so
-lib/librustc_save_analysis-8af316349017fac6.so
-lib/librustc_trans-3b154e537bd519a6.so
-lib/librustc_typeck-53963a21e3839eea.so
-lib/librustdoc-f458f9d50b770dc5.so
-lib/libserialize-967d73ca1a0a7c40.so
-lib/libstd-da49a473256a3892.so
-lib/libsyntax-2336662cab7e706b.so
-lib/libsyntax_ext-712f41e1ed978e55.so
-lib/libsyntax_pos-8802a44eb3221178.so
-lib/libterm-bed969971b58b7ed.so
-lib/libtest-098357d8bb203fcf.so
-lib/rustlib/components
-lib/rustlib/etc/debugger_pretty_printers_common.py
-lib/rustlib/etc/gdb_load_rust_pretty_printers.py
-lib/rustlib/etc/gdb_rust_pretty_printing.py
-lib/rustlib/etc/lldb_rust_formatters.py
-%%PORTDOCS%%lib/rustlib/manifest-rust-docs
-lib/rustlib/manifest-rust-std-%%RUST_TARGET%%
-lib/rustlib/manifest-rustc
-lib/rustlib/rust-installer-version
-lib/rustlib/uninstall.sh
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc-332ff7daeb7e06b8.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_jemalloc-e7607c19125f8392.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_system-571dfebbf0f85a9f.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libarena-22adfce669fd9832.so
-lib/rustlib/%%RUST_TARGET%%/lib/libcollections-de8c3abb6b7777b0.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcompiler_builtins-68612d8d1095fd06.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcore-1bab58525600a9f4.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libflate-e1e6e55ceb7251ef.so
-lib/rustlib/%%RUST_TARGET%%/lib/libfmt_macros-ba80d211c09981a2.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-09faa2be228f2ddb.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-09faa2be228f2ddb.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgraphviz-6303af3dd8d718e9.so
-lib/rustlib/%%RUST_TARGET%%/lib/liblibc-50f5b97a91634cfd.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-761db57e43e641cb.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-761db57e43e641cb.so
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_abort-b8f4cf2e638f3233.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_unwind-9739badf374daa6e.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro-964c3339f3f8acda.so
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro_plugin-d9ebf1627378b721.so
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro_tokens-adc448e5e4f62f44.so
-lib/rustlib/%%RUST_TARGET%%/lib/librand-6dbadb1aa1c9735d.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc-4221de92f27e804b.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_back-e247e25402404c1f.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_bitflags-9aa402a167df535a.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_borrowck-68ef6be666920880.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_eval-14677cc7d4f412a3.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_math-7d31310a940ce777.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_data_structures-a29777375c573c9a.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_driver-9b159e7b54809b23.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_errors-da09828277bc171a.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_incremental-f9cea8a2dfb1093f.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_lint-ac6a304d2924921f.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_llvm-7a749f3ba5ac01da.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_metadata-0df9306a450c5744.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_mir-af6ee715a1ae6a07.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_passes-bdfaafb6f5c7f3fe.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_platform_intrinsics-12515fe496f9a823.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_plugin-4df4f6f2ea0b06f0.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_privacy-1ffbe0ad74c952f8.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_resolve-601ffa89350be577.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_save_analysis-8af316349017fac6.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_trans-3b154e537bd519a6.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_typeck-53963a21e3839eea.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustdoc-f458f9d50b770dc5.so
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-967d73ca1a0a7c40.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-967d73ca1a0a7c40.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-da49a473256a3892.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-da49a473256a3892.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_shim-51999e83180cf6a6.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_unicode-df6dca325cb80ddd.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax-2336662cab7e706b.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_ext-712f41e1ed978e55.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_pos-8802a44eb3221178.so
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-bed969971b58b7ed.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-bed969971b58b7ed.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-098357d8bb203fcf.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-098357d8bb203fcf.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest_shim-0dc4520584a37d49.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libunwind-58a2f7d37c62243d.rlib
-man/man1/rustc.1.gz
-man/man1/rustdoc.1.gz
diff --git a/lang/rust/pkg-plist.i386 b/lang/rust/pkg-plist.i386
deleted file mode 100644
index 5e852ecdfd9..00000000000
--- a/lang/rust/pkg-plist.i386
+++ /dev/null
@@ -1,113 +0,0 @@
-bin/rust-gdb
-bin/rust-lldb
-bin/rustc
-bin/rustdoc
-lib/libarena-ff1b7a84bcfdf760.so
-lib/libflate-593505a091887d87.so
-lib/libfmt_macros-3b37f50c62e6879b.so
-lib/libgetopts-76aca13fa3c5ab82.so
-lib/libgraphviz-c246a6038857cc02.so
-lib/liblog-b025f6f08041d5ae.so
-lib/libproc_macro-61265b57ac238074.so
-lib/libproc_macro_plugin-3f881dfbbe60023f.so
-lib/libproc_macro_tokens-d4c016c5d91f26d3.so
-lib/librustc-3be965331bee4385.so
-lib/librustc_back-d2aaddf0636c6b47.so
-lib/librustc_borrowck-5360c3c94abd1039.so
-lib/librustc_const_eval-890d78250c35270e.so
-lib/librustc_const_math-e84456ed7e440c62.so
-lib/librustc_data_structures-41f19b174f869c45.so
-lib/librustc_driver-06f2b6dd1bcc4892.so
-lib/librustc_errors-da184ffe215e7e54.so
-lib/librustc_incremental-50d96f380ba89180.so
-lib/librustc_lint-6f9e571feb339ec3.so
-lib/librustc_llvm-92e7137623905fa8.so
-lib/librustc_metadata-c94950116e85a3a0.so
-lib/librustc_mir-b22a6896fdf0b64e.so
-lib/librustc_passes-eb0b4d3624709e93.so
-lib/librustc_platform_intrinsics-78262421afd85968.so
-lib/librustc_plugin-57e2f5d43c674558.so
-lib/librustc_privacy-b95d58910b29b7ee.so
-lib/librustc_resolve-e611aaa3d7f399a0.so
-lib/librustc_save_analysis-263a19155a17ca7d.so
-lib/librustc_trans-0b6c26ae33fcf4c8.so
-lib/librustc_typeck-5539f5895b1f44d6.so
-lib/librustdoc-4209e3d6ae14c061.so
-lib/libserialize-2b52638bfc0f80e7.so
-lib/libstd-574531589af3c21e.so
-lib/libsyntax-bbf5e8a99bfb4e8e.so
-lib/libsyntax_ext-39d6e52a8379a63d.so
-lib/libsyntax_pos-4d2925de87172be9.so
-lib/libterm-6d57aeb80cfa0ae6.so
-lib/libtest-8c54fc4bb6e4c286.so
-lib/rustlib/components
-lib/rustlib/etc/debugger_pretty_printers_common.py
-lib/rustlib/etc/gdb_load_rust_pretty_printers.py
-lib/rustlib/etc/gdb_rust_pretty_printing.py
-lib/rustlib/etc/lldb_rust_formatters.py
-%%PORTDOCS%%lib/rustlib/manifest-rust-docs
-lib/rustlib/manifest-rust-std-%%RUST_TARGET%%
-lib/rustlib/manifest-rustc
-lib/rustlib/rust-installer-version
-lib/rustlib/uninstall.sh
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc-a16da6fd7e8ddd56.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_jemalloc-9c834651c476c20c.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liballoc_system-8c7ed5c105a2d49c.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libarena-ff1b7a84bcfdf760.so
-lib/rustlib/%%RUST_TARGET%%/lib/libcollections-37f2a19c7c5ff141.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcompiler_builtins-ed22b885db526530.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libcore-f24536e370a195a6.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libflate-593505a091887d87.so
-lib/rustlib/%%RUST_TARGET%%/lib/libfmt_macros-3b37f50c62e6879b.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-76aca13fa3c5ab82.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libgetopts-76aca13fa3c5ab82.so
-lib/rustlib/%%RUST_TARGET%%/lib/libgraphviz-c246a6038857cc02.so
-lib/rustlib/%%RUST_TARGET%%/lib/liblibc-422a8f7af3c61a81.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-b025f6f08041d5ae.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/liblog-b025f6f08041d5ae.so
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_abort-d58097d72328afe0.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libpanic_unwind-1951cb7c97d883d9.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro-61265b57ac238074.so
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro_plugin-3f881dfbbe60023f.so
-lib/rustlib/%%RUST_TARGET%%/lib/libproc_macro_tokens-d4c016c5d91f26d3.so
-lib/rustlib/%%RUST_TARGET%%/lib/librand-fd4f15a07d76026a.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc-3be965331bee4385.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_back-d2aaddf0636c6b47.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_bitflags-505d809102284de5.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_borrowck-5360c3c94abd1039.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_eval-890d78250c35270e.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_const_math-e84456ed7e440c62.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_data_structures-41f19b174f869c45.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_driver-06f2b6dd1bcc4892.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_errors-da184ffe215e7e54.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_incremental-50d96f380ba89180.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_lint-6f9e571feb339ec3.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_llvm-92e7137623905fa8.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_metadata-c94950116e85a3a0.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_mir-b22a6896fdf0b64e.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_passes-eb0b4d3624709e93.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_platform_intrinsics-78262421afd85968.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_plugin-57e2f5d43c674558.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_privacy-b95d58910b29b7ee.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_resolve-e611aaa3d7f399a0.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_save_analysis-263a19155a17ca7d.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_trans-0b6c26ae33fcf4c8.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustc_typeck-5539f5895b1f44d6.so
-lib/rustlib/%%RUST_TARGET%%/lib/librustdoc-4209e3d6ae14c061.so
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-2b52638bfc0f80e7.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libserialize-2b52638bfc0f80e7.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-574531589af3c21e.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd-574531589af3c21e.so
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_shim-2d8f031ada4a6211.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libstd_unicode-d367db81941ad466.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax-bbf5e8a99bfb4e8e.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_ext-39d6e52a8379a63d.so
-lib/rustlib/%%RUST_TARGET%%/lib/libsyntax_pos-4d2925de87172be9.so
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-6d57aeb80cfa0ae6.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libterm-6d57aeb80cfa0ae6.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-8c54fc4bb6e4c286.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libtest-8c54fc4bb6e4c286.so
-lib/rustlib/%%RUST_TARGET%%/lib/libtest_shim-c9eea788e3cffe13.rlib
-lib/rustlib/%%RUST_TARGET%%/lib/libunwind-4a71218e512785be.rlib
-man/man1/rustc.1.gz
-man/man1/rustdoc.1.gz
diff --git a/mail/imapfilter/Makefile b/mail/imapfilter/Makefile
index a843c5c32f6..1759680edb4 100644
--- a/mail/imapfilter/Makefile
+++ b/mail/imapfilter/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	imapfilter
 PORTVERSION=	2.6.10
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	mail
 
diff --git a/mail/imapfilter/files/patch-auth.c b/mail/imapfilter/files/patch-auth.c
new file mode 100644
index 00000000000..fdd3e687248
--- /dev/null
+++ b/mail/imapfilter/files/patch-auth.c
@@ -0,0 +1,20 @@
+--- src/auth.c.orig	2017-02-27 08:30:09 UTC
++++ src//auth.c
+@@ -20,7 +20,7 @@ auth_cram_md5(const char *user, const ch
+ 	unsigned char *resp, *buf, *out;
+ 	unsigned char md[EVP_MAX_MD_SIZE], mdhex[EVP_MAX_MD_SIZE * 2 + 1];
+ 	unsigned int mdlen;
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#ifdef HAVE_OPAQUE_STRUCTS
+ 	HMAC_CTX *ctx;
+ #else
+ 	HMAC_CTX ctx;
+@@ -32,7 +32,7 @@ auth_cram_md5(const char *user, const ch
+ 
+ 	EVP_DecodeBlock(resp, chal, strlen((char *)(chal)));
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#ifdef HAVE_OPAQUE_STRUCTS
+ 	ctx = HMAC_CTX_new();
+ 	HMAC_Init_ex(ctx, (const unsigned char *)pass, strlen(pass),
+ 	    EVP_md5(), NULL);
diff --git a/mail/imapfilter/files/patch-imapfilter.c b/mail/imapfilter/files/patch-imapfilter.c
new file mode 100644
index 00000000000..b526de9969f
--- /dev/null
+++ b/mail/imapfilter/files/patch-imapfilter.c
@@ -0,0 +1,38 @@
+--- src/imapfilter.c.orig	2017-02-27 08:19:40 UTC
++++ src/imapfilter.c
+@@ -21,7 +21,7 @@
+ 
+ extern buffer ibuf, obuf, nbuf, cbuf;
+ extern regexp responses[];
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL || LIBRESSL_VERSION_NUMBER
+ extern SSL_CTX *sslctx;
+ #else
+ extern SSL_CTX *ssl23ctx;
+@@ -131,7 +131,7 @@ main(int argc, char *argv[])
+ 
+ 	SSL_library_init();
+ 	SSL_load_error_strings();
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL || LIBRESSL_VERSION_NUMBER
+ 	sslctx = SSL_CTX_new(TLS_method());
+ #else
+ 	ssl23ctx = SSL_CTX_new(SSLv23_client_method());
+@@ -152,7 +152,7 @@ main(int argc, char *argv[])
+ 		capath = opts.truststore;
+ 	else if (exists_file(opts.truststore))
+ 		cafile = opts.truststore;
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL || LIBRESSL_VERSION_NUMBER
+ 	if (sslctx)
+ 		SSL_CTX_load_verify_locations(sslctx, cafile, capath);
+ #else
+@@ -193,7 +193,7 @@ main(int argc, char *argv[])
+ #endif
+ 	stop_lua();
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x1010000fL
++#if OPENSSL_VERSION_NUMBER >= 0x1010000fL || LIBRESSL_VERSION_NUMBER
+ 	if (sslctx)
+ 		SSL_CTX_free(sslctx);
+ #else
diff --git a/mail/rspamd-devel/Makefile b/mail/rspamd-devel/Makefile
index 6eaf407f32a..3ef2a70d20d 100644
--- a/mail/rspamd-devel/Makefile
+++ b/mail/rspamd-devel/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	rspamd
-PORTVERSION=	1.5.0.b1.20170301
+PORTVERSION=	1.5.2.b1.20170306
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
@@ -20,17 +20,18 @@ BUILD_DEPENDS=	ragel:devel/ragel
 
 CONFLICTS_INSTALL=	rspamd
 
-RSPAMD_VERSION=	1.5.0
+RSPAMD_VERSION=	1.5.2
 USE_GITHUB=	yes
 GH_ACCOUNT=	vstakhov
-GH_TAGNAME=	fa5bd55
+GH_TAGNAME=	30d96d3
 
-OPTIONS_DEFINE=	GPERF REDIRECTOR HYPERSCAN GD
+OPTIONS_DEFINE=	GPERF REDIRECTOR HYPERSCAN GD CGP
 OPTIONS_DEFAULT=	GD
 GPERF_DESC=		Google perf-tools profiling
 REDIRECTOR_DESC=	Install HTTP redirector
 HYPERSCAN_DESC=		Use hyperscan optimizations (amd64 only)
 GD_DESC=		Enable libgd support for images fuzzy hashes
+CGP_DESC=		Install Communigate Pro(tm) helper
 
 USE_RC_SUBR=	rspamd
 
@@ -94,12 +95,23 @@ WITH_DEBUG=	yes
 	p5-POE-Component-Server-HTTP>=0:www/p5-POE-Component-Server-HTTP \
 	p5-Cache-Memcached-Fast>=0:databases/p5-Cache-Memcached-Fast \
 	p5-Proc-PidUtil>=0:sysutils/p5-Proc-PidUtil \
-	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon \
-	p5-SWF-File>=0:graphics/p5-SWF-File
+	p5-Proc-Daemon>=0:devel/p5-Proc-Daemon
 .else
  PLIST_SUB+=	REDIRECTOR="@comment "
 .endif
 
+.if ${PORT_OPTIONS:MCGP}
+ USE_PERL5+=	run
+ PLIST_SUB+=	CGP=""
+ RUN_DEPENDS+=	\
+	p5-AnyEvent-HTTP>=0:www/p5-AnyEvent-HTTP \
+	p5-AnyEvent>=0:devel/p5-AnyEvent \
+	p5-EV>=0:devel/p5-EV \
+	p5-JSON-XS>=0:converters/p5-JSON-XS
+.else
+ PLIST_SUB+=	CGP="@comment "
+.endif
+
 post-install:
 	@${MKDIR} \
 		${STAGEDIR}/var/log/rspamd \
@@ -112,5 +124,8 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/rspamd.newsyslog.conf.sample ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
 	${LN} -s ${ETCDIR}/rspamd.newsyslog.conf ${STAGEDIR}${PREFIX}/etc/newsyslog.conf.d
+.if ${PORT_OPTIONS:MCGP}
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/cgp_rspamd.pl ${STAGEDIR}${PREFIX}/bin/rspamd-cgp-helper
+.endif
 
 .include <bsd.port.mk>
diff --git a/mail/rspamd-devel/distinfo b/mail/rspamd-devel/distinfo
index 58904575487..0bc96b74474 100644
--- a/mail/rspamd-devel/distinfo
+++ b/mail/rspamd-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488362335
-SHA256 (vstakhov-rspamd-1.5.0.b1.20170301-fa5bd55_GH0.tar.gz) = 406b66588fb2f9f22f450612a2cfd1b445d7ae21aac2ed61c27ecc4c6abbee27
-SIZE (vstakhov-rspamd-1.5.0.b1.20170301-fa5bd55_GH0.tar.gz) = 2362114
+TIMESTAMP = 1488811771
+SHA256 (vstakhov-rspamd-1.5.2.b1.20170306-30d96d3_GH0.tar.gz) = ef676543e73dba0522c5b6555f0bea8a567b8a332ee559d4f53a5a685c8ab417
+SIZE (vstakhov-rspamd-1.5.2.b1.20170306-30d96d3_GH0.tar.gz) = 2372085
diff --git a/mail/rspamd-devel/pkg-plist b/mail/rspamd-devel/pkg-plist
index 9a79edb4e47..05ccc3b91f8 100644
--- a/mail/rspamd-devel/pkg-plist
+++ b/mail/rspamd-devel/pkg-plist
@@ -6,6 +6,7 @@ bin/rspamadm
 bin/rspamc-%%RSPAMDVERSION%%
 bin/rspamc
 %%REDIRECTOR%%bin/rspamd-redirector
+%%CGP%%bin/rspamd-cgp-helper
 @sample %%ETCDIR%%/2tld.inc.sample
 @sample %%ETCDIR%%/mime_types.inc.sample
 @sample %%ETCDIR%%/common.conf.sample
@@ -16,11 +17,13 @@ bin/rspamc
 @sample %%ETCDIR%%/metrics.conf.sample
 @sample %%ETCDIR%%/mid.inc.sample
 @sample %%ETCDIR%%/modules.conf.sample
+%%ETCDIR%%/modules.d/antivirus.conf
 %%ETCDIR%%/modules.d/asn.conf
 %%ETCDIR%%/modules.d/chartable.conf
 %%ETCDIR%%/modules.d/clickhouse.conf
 %%ETCDIR%%/modules.d/dcc.conf
 %%ETCDIR%%/modules.d/dkim.conf
+%%ETCDIR%%/modules.d/dkim_signing.conf
 %%ETCDIR%%/modules.d/dmarc.conf
 %%ETCDIR%%/modules.d/emails.conf
 %%ETCDIR%%/modules.d/fann_redis.conf
@@ -36,16 +39,20 @@ bin/rspamc
 %%ETCDIR%%/modules.d/mime_types.conf
 %%ETCDIR%%/modules.d/mid.conf
 %%ETCDIR%%/modules.d/multimap.conf
+%%ETCDIR%%/modules.d/mx_check.conf
 %%ETCDIR%%/modules.d/once_received.conf
 %%ETCDIR%%/modules.d/phishing.conf
 %%ETCDIR%%/modules.d/ratelimit.conf
 %%ETCDIR%%/modules.d/rbl.conf
 %%ETCDIR%%/modules.d/redis.conf
 %%ETCDIR%%/modules.d/regexp.conf
+%%ETCDIR%%/modules.d/replies.conf
 %%ETCDIR%%/modules.d/rmilter_headers.conf
 %%ETCDIR%%/modules.d/rspamd_update.conf
+%%ETCDIR%%/modules.d/spamassassin.conf
 %%ETCDIR%%/modules.d/spf.conf
 %%ETCDIR%%/modules.d/surbl.conf
+%%ETCDIR%%/modules.d/trie.conf
 %%ETCDIR%%/modules.d/url_redirector.conf
 %%ETCDIR%%/modules.d/url_reputation.conf
 %%ETCDIR%%/modules.d/url_tags.conf
diff --git a/math/muparser/Makefile b/math/muparser/Makefile
index 3e55217a524..79d4d401c40 100644
--- a/math/muparser/Makefile
+++ b/math/muparser/Makefile
@@ -2,53 +2,53 @@
 # $FreeBSD$
 
 PORTNAME=	muparser
-PORTVERSION=	2.2.3
+PORTVERSION=	2.2.5
+DISTVERSIONPREFIX=	v
 CATEGORIES=	math devel
-MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/Version%20${PORTVERSION}
-DISTNAME=	${PORTNAME}_v${PORTVERSION:S/./_/g}
 
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Mathematical expressions parser library written in C++
 
 LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/License.txt
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	beltoforion
+
+USES=		dos2unix pathfix
+USE_LDCONFIG=	yes
 
 ALL_TARGET=	lib
+GNU_CONFIGURE=	yes
+# otherwise it fails to build when the EXAMPLES option is ON
+MAKE_JOBS_UNSAFE=	yes
 
-DOCS_CONFIGURE_ON=	--docdir=${DOCSDIR}
+OPTIONS_DEFINE=		DOXYGEN EXAMPLES
+
+DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen \
+			dot:graphics/graphviz
+DOXYGEN_ALL_TARGET=	documentation
+DOXYGEN_PORTDOCS=	*
+# PORTDOCS macro won't work if NOPORTDOCS is defined or if DOCS is disabled
+DOXYGEN_IMPLIES=	DOCS
+.undef NOPORTDOCS
 
 EXAMPLES_CONFIGURE_ENABLE=	samples
 EXAMPLES_ALL_TARGET=	samples
 
-GNU_CONFIGURE=	yes
-
-# otherwise it fails to build when the EXAMPLES option is ON
-MAKE_JOBS_UNSAFE=yes
-
-OPTIONS_DEFINE=	DOCS EXAMPLES
-
-USE_LDCONFIG=	yes
-USES=	pathfix zip
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CFLAGS+=	-fPIC
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -E 's,^(CXXFLAGS|LDFLAGS) = ,\1 ?= ,g' \
 		${WRKSRC}/Makefile.in
 
-post-install:
+post-install-DOXYGEN-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/docs/html && \
 	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
-.if ${PORT_OPTIONS:MEXAMPLES}
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/samples/example1 && \
 	${INSTALL_PROGRAM} example1 ${STAGEDIR}${EXAMPLESDIR} && \
 	${INSTALL_DATA} example1.cpp ${STAGEDIR}${EXAMPLESDIR})
-.endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/muparser/distinfo b/math/muparser/distinfo
index aa2d2fa3d2e..50bd26eb79b 100644
--- a/math/muparser/distinfo
+++ b/math/muparser/distinfo
@@ -1,2 +1,3 @@
-SHA256 (muparser_v2_2_3.zip) = dfe831b69392ab0b1eb59d3601b7b1575554a85057cf2f234f64f930c4148902
-SIZE (muparser_v2_2_3.zip) = 1481359
+TIMESTAMP = 1484386394
+SHA256 (beltoforion-muparser-v2.2.5_GH0.tar.gz) = 0666ef55da72c3e356ca85b6a0084d56b05dd740c3c21d26d372085aa2c6e708
+SIZE (beltoforion-muparser-v2.2.5_GH0.tar.gz) = 761315
diff --git a/math/muparser/files/patch-docs_Doxyfile b/math/muparser/files/patch-docs_Doxyfile
new file mode 100644
index 00000000000..1fc059a3ae8
--- /dev/null
+++ b/math/muparser/files/patch-docs_Doxyfile
@@ -0,0 +1,38 @@
+--- docs/Doxyfile.orig	2015-08-16 14:23:14 UTC
++++ docs/Doxyfile
+@@ -31,7 +31,7 @@ PROJECT_NAME           = "muParser API -
+ # This could be handy for archiving the generated documentation or 
+ # if some version control system is used.
+ 
+-PROJECT_NUMBER         = 1.35
++PROJECT_NUMBER         = 2.2.5
+ 
+ # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
+ # base path where the generated documentation will be put. 
+@@ -47,7 +47,7 @@ OUTPUT_DIRECTORY       = html/
+ # source files, where putting all generated files in the same directory would 
+ # otherwise cause performance problems for the file system.
+ 
+-CREATE_SUBDIRS         = YES
++CREATE_SUBDIRS         = NO
+ 
+ # The OUTPUT_LANGUAGE tag is used to specify the language in which all 
+ # documentation generated by doxygen is written. Doxygen will use this 
+@@ -778,7 +778,7 @@ GENERATE_HTML          = YES
+ # If a relative path is entered the value of OUTPUT_DIRECTORY will be 
+ # put in front of it. If left blank `html' will be used as the default path.
+ 
+-HTML_OUTPUT            = classdocu/
++HTML_OUTPUT            = 
+ 
+ # The HTML_FILE_EXTENSION tag can be used to specify the file extension for 
+ # each generated HTML page (for example: .htm,.php,.asp). If it is left blank 
+@@ -796,7 +796,7 @@ HTML_HEADER            = 
+ # each generated HTML page. If it is left blank doxygen will generate a 
+ # standard footer.
+ 
+-HTML_FOOTER            = html/misc/footer.html
++HTML_FOOTER            = 
+ 
+ # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
+ # style sheet that is used by each HTML page. It can be used to 
diff --git a/math/muparser/pkg-plist b/math/muparser/pkg-plist
index 4a68a37f212..7adc9e8ebfc 100644
--- a/math/muparser/pkg-plist
+++ b/math/muparser/pkg-plist
@@ -14,82 +14,7 @@ include/muParserToken.h
 include/muParserTokenReader.h
 lib/libmuparser.so
 lib/libmuparser.so.2
-lib/libmuparser.so.2.2.3
+lib/libmuparser.so.2.2.4
 libdata/pkgconfig/muparser.pc
-%%PORTDOCS%%%%DOCSDIR%%/images/api.png
-%%PORTDOCS%%%%DOCSDIR%%/images/api_dark.png
-%%PORTDOCS%%%%DOCSDIR%%/images/back_idx.png
-%%PORTDOCS%%%%DOCSDIR%%/images/bench2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/blocks.png
-%%PORTDOCS%%%%DOCSDIR%%/images/build.png
-%%PORTDOCS%%%%DOCSDIR%%/images/bytecode.png
-%%PORTDOCS%%%%DOCSDIR%%/images/caption.png
-%%PORTDOCS%%%%DOCSDIR%%/images/diff.png
-%%PORTDOCS%%%%DOCSDIR%%/images/download_muparser.png
-%%PORTDOCS%%%%DOCSDIR%%/images/download_muparser_.png
-%%PORTDOCS%%%%DOCSDIR%%/images/grad2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/help.png
-%%PORTDOCS%%%%DOCSDIR%%/images/home.png
-%%PORTDOCS%%%%DOCSDIR%%/images/home_dark.png
-%%PORTDOCS%%%%DOCSDIR%%/images/info.png
-%%PORTDOCS%%%%DOCSDIR%%/images/list.png
-%%PORTDOCS%%%%DOCSDIR%%/images/mathparser.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/mathparser_small.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/muparsernet.png
-%%PORTDOCS%%%%DOCSDIR%%/images/muparsernet_.png
-%%PORTDOCS%%%%DOCSDIR%%/images/muparsersse.png
-%%PORTDOCS%%%%DOCSDIR%%/images/muparsersse_.png
-%%PORTDOCS%%%%DOCSDIR%%/images/muparserx.png
-%%PORTDOCS%%%%DOCSDIR%%/images/muparserx_.png
-%%PORTDOCS%%%%DOCSDIR%%/images/osi.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/question.png
-%%PORTDOCS%%%%DOCSDIR%%/images/related (Kopie).png
-%%PORTDOCS%%%%DOCSDIR%%/images/related.png
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_gct.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_geodes.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_kst.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_matrix.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_meshlab.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_pasimodo.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_qtiplot.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_tm2.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/thumb_trini.jpg
-%%PORTDOCS%%%%DOCSDIR%%/images/warning.gif
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/misc/Main.txt
-%%PORTDOCS%%%%DOCSDIR%%/misc/calc.cpp
-%%PORTDOCS%%%%DOCSDIR%%/misc/example.txt
-%%PORTDOCS%%%%DOCSDIR%%/misc/footer.html
-%%PORTDOCS%%%%DOCSDIR%%/misc/header.html
-%%PORTDOCS%%%%DOCSDIR%%/misc/list_expr_var.cpp
-%%PORTDOCS%%%%DOCSDIR%%/misc/listvar.cpp
-%%PORTDOCS%%%%DOCSDIR%%/mup_features.html
-%%PORTDOCS%%%%DOCSDIR%%/mup_interface.html
-%%PORTDOCS%%%%DOCSDIR%%/mup_intro.html
-%%PORTDOCS%%%%DOCSDIR%%/mup_licence.html
-%%PORTDOCS%%%%DOCSDIR%%/mup_links.html
-%%PORTDOCS%%%%DOCSDIR%%/mup_locale.html
-%%PORTDOCS%%%%DOCSDIR%%/mup_usage.html
-%%PORTDOCS%%%%DOCSDIR%%/mup_version.html
-%%PORTDOCS%%%%DOCSDIR%%/script/functions.js
-%%PORTDOCS%%%%DOCSDIR%%/sources/build_page.sh
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_features.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_features_meta.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_interface.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_interface_meta.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_intro.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_intro_meta.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_licence.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_licence_meta.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_links.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_links_meta.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_locale.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_locale_meta.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_usage.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_usage_meta.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_version.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/mup_version_meta.html
-%%PORTDOCS%%%%DOCSDIR%%/sources/navigation.html
-%%PORTDOCS%%%%DOCSDIR%%/style/formate.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/example1.cpp
diff --git a/misc/amanda-server/Makefile b/misc/amanda-server/Makefile
index 4dd27604fcc..3721dcd8f55 100644
--- a/misc/amanda-server/Makefile
+++ b/misc/amanda-server/Makefile
@@ -122,7 +122,7 @@ CONFIGURE_ARGS+=	--without-gnuplot
 .endif
 
 .if ${PORT_OPTIONS:MSAMBA}
-SAMBA_PORT?=	samba36
+SAMBA_PORT?=	samba44
 BUILD_DEPENDS+=	smbclient:net/${SAMBA_PORT}
 RUN_DEPENDS+=	smbclient:net/${SAMBA_PORT}
 CONFIGURE_ARGS+=	--with-smbclient=${LOCALBASE}/bin/smbclient
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index 4421aa30c0f..45ba5d63d03 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -2,14 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	mc
-PORTVERSION=	4.8.18
+PORTVERSION=	4.8.19
+PORTREVISION=	1
 CATEGORIES=	misc shells
 MASTER_SITES=	http://ftp.midnight-commander.org/ \
-		http://ftp.osuosl.org/pub/midnightcommander/ \
-		SF/nemysisfreebsdp/misc/:icons
-DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
-		${PORTNAME}.png:icons
-EXTRACT_ONLY=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
+		http://ftp.osuosl.org/pub/midnightcommander/
 
 MAINTAINER=	woodsb02@FreeBSD.org
 COMMENT=	Midnight Commander, a free Norton Commander Clone
@@ -84,13 +81,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|SUBDIRS = intl|SUBDIRS =|' ${WRKSRC}/Makefile.in
 
 post-install:
-	${INSTALL_DATA} ${_DISTDIR}/${PORTNAME}.png \
-		${STAGEDIR}${PREFIX}/share/pixmaps/
-	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
-
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR2}
 	${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2}
+post-install-X11-on:
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.png \
+		${STAGEDIR}${PREFIX}/share/pixmaps/
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${STAGEDIR}${DESKTOPDIR}
 
 .include <bsd.port.mk>
diff --git a/misc/mc/distinfo b/misc/mc/distinfo
index 311497413e1..7a94a2cb0cc 100644
--- a/misc/mc/distinfo
+++ b/misc/mc/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1476432152
-SHA256 (mc-4.8.18.tar.xz) = f7636815c987c1719c4f5de2dcd156a0e7d097b1d10e4466d2bdead343d5bece
-SIZE (mc-4.8.18.tar.xz) = 2462080
-SHA256 (mc.png) = 6bd935ea11c45da5c11e60542e30b4a05396d75b81401f28b3a68a82cafbf8fe
-SIZE (mc.png) = 6466
+TIMESTAMP = 1488787262
+SHA256 (mc-4.8.19.tar.xz) = eb9e56bbb5b2893601d100d0e0293983049b302c5ab61bfb544ad0ee2cc1f2df
+SIZE (mc-4.8.19.tar.xz) = 2521808
diff --git a/misc/mc/files/mc.png b/misc/mc/files/mc.png
new file mode 100644
index 00000000000..4bee53d244c
Binary files /dev/null and b/misc/mc/files/mc.png differ
diff --git a/misc/mc/files/patch-lib_tty_tty-ncurses.c b/misc/mc/files/patch-lib_tty_tty-ncurses.c
index 2f17f44180c..b02b8edf68f 100644
--- a/misc/mc/files/patch-lib_tty_tty-ncurses.c
+++ b/misc/mc/files/patch-lib_tty_tty-ncurses.c
@@ -1,6 +1,6 @@
---- lib/tty/tty-ncurses.c.orig	2016-05-07 15:42:52 UTC
+--- lib/tty/tty-ncurses.c.orig	2017-03-04 17:51:38 UTC
 +++ lib/tty/tty-ncurses.c
-@@ -233,7 +233,7 @@ tty_shutdown (void)
+@@ -245,7 +245,7 @@ tty_shutdown (void)
  void
  tty_enter_ca_mode (void)
  {
@@ -9,7 +9,7 @@
      {
          fprintf (stdout, /* ESC_STR ")0" */ ESC_STR "7" ESC_STR "[?47h");
          fflush (stdout);
-@@ -245,7 +245,7 @@ tty_enter_ca_mode (void)
+@@ -257,7 +257,7 @@ tty_enter_ca_mode (void)
  void
  tty_exit_ca_mode (void)
  {
diff --git a/misc/mc/pkg-plist b/misc/mc/pkg-plist
index c829b164103..b51ddce4d49 100644
--- a/misc/mc/pkg-plist
+++ b/misc/mc/pkg-plist
@@ -85,7 +85,7 @@ man/man1/mcview.1.gz
 %%NLS%%man/pl/man1/mc.1.gz
 %%NLS%%man/ru/man1/mc.1.gz
 %%NLS%%man/sr/man1/mc.1.gz
-share/applications/mc.desktop
+%%X11%%share/applications/mc.desktop
 %%NLS%%share/locale/az/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/be/LC_MESSAGES/mc.mo
 %%NLS%%share/locale/bg/LC_MESSAGES/mc.mo
@@ -223,7 +223,13 @@ share/applications/mc.desktop
 %%DATADIR%%/skins/modarin256root.ini
 %%DATADIR%%/skins/nicedark.ini
 %%DATADIR%%/skins/sand256.ini
+%%DATADIR%%/skins/seasons-autumn16M.ini
+%%DATADIR%%/skins/seasons-spring16M.ini
+%%DATADIR%%/skins/seasons-summer16M.ini
+%%DATADIR%%/skins/seasons-winter16M.ini
 %%DATADIR%%/skins/xoria256.ini
+%%DATADIR%%/skins/yadt256-defbg.ini
+%%DATADIR%%/skins/yadt256.ini
 %%EDITOR%%%%DATADIR%%/syntax/PKGBUILD.syntax
 %%EDITOR%%%%DATADIR%%/syntax/Syntax
 %%EDITOR%%%%DATADIR%%/syntax/ada95.syntax
@@ -277,6 +283,8 @@ share/applications/mc.desktop
 %%EDITOR%%%%DATADIR%%/syntax/nemerle.syntax
 %%EDITOR%%%%DATADIR%%/syntax/nroff.syntax
 %%EDITOR%%%%DATADIR%%/syntax/octave.syntax
+%%EDITOR%%%%DATADIR%%/syntax/opencl.syntax
+%%EDITOR%%%%DATADIR%%/syntax/osl.syntax
 %%EDITOR%%%%DATADIR%%/syntax/pascal.syntax
 %%EDITOR%%%%DATADIR%%/syntax/perl.syntax
 %%EDITOR%%%%DATADIR%%/syntax/php.syntax
@@ -286,6 +294,7 @@ share/applications/mc.desktop
 %%EDITOR%%%%DATADIR%%/syntax/properties.syntax
 %%EDITOR%%%%DATADIR%%/syntax/puppet.syntax
 %%EDITOR%%%%DATADIR%%/syntax/python.syntax
+%%EDITOR%%%%DATADIR%%/syntax/r.syntax
 %%EDITOR%%%%DATADIR%%/syntax/ruby.syntax
 %%EDITOR%%%%DATADIR%%/syntax/sh.syntax
 %%EDITOR%%%%DATADIR%%/syntax/slang.syntax
@@ -302,6 +311,7 @@ share/applications/mc.desktop
 %%EDITOR%%%%DATADIR%%/syntax/verilog.syntax
 %%EDITOR%%%%DATADIR%%/syntax/vhdl.syntax
 %%EDITOR%%%%DATADIR%%/syntax/xml.syntax
+%%EDITOR%%%%DATADIR%%/syntax/yaml.syntax
 %%EDITOR%%%%DATADIR%%/syntax/yum-repo.syntax
 %%EDITOR%%%%DATADIR%%/syntax/yxx.syntax
-share/pixmaps/mc.png
+%%X11%%share/pixmaps/mc.png
diff --git a/misc/py-powerline-status/Makefile b/misc/py-powerline-status/Makefile
index fe253f3a757..b8e370f259b 100644
--- a/misc/py-powerline-status/Makefile
+++ b/misc/py-powerline-status/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	powerline-status
-PORTVERSION=	2.4
+PORTVERSION=	2.5.2
 CATEGORIES=	misc python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/misc/py-powerline-status/distinfo b/misc/py-powerline-status/distinfo
index f6810b02e64..7c551b645cf 100644
--- a/misc/py-powerline-status/distinfo
+++ b/misc/py-powerline-status/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464396818
-SHA256 (powerline-status-2.4.tar.gz) = 1781335de3ad5285b9baf26642674cd03df91c35ba2324c9b5b23df869a8ec4a
-SIZE (powerline-status-2.4.tar.gz) = 244603
+TIMESTAMP = 1488843377
+SHA256 (powerline-status-2.5.2.tar.gz) = b0d842ca362c0a91e907a913459f38b1afda5c69861e8a9c9483c768d6f84fb8
+SIZE (powerline-status-2.5.2.tar.gz) = 249579
diff --git a/multimedia/mpc-qt/Makefile b/multimedia/mpc-qt/Makefile
index 5b5d646b034..c1689a2e825 100644
--- a/multimedia/mpc-qt/Makefile
+++ b/multimedia/mpc-qt/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mpc-qt
-DISTVERSION=	0.0.0.s20170221
+DISTVERSION=	0.0.0.s20170305
 CATEGORIES=	multimedia audio
 MASTER_SITES=	https://aur.archlinux.org/cgit/aur.git/plain/${PORTNAME}.desktop?h=${PORTNAME}-git&id=b1a6b91&dummy=/:desktop
 DISTFILES=	${PORTNAME}.desktop:desktop
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libmpv.so:multimedia/mpv
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	cmdrkotori
-GH_TAGNAME=	1aee565
+GH_TAGNAME=	7ffd261
 
 USES=		compiler:c++11-lib desktop-file-utils pkgconfig qmake
 USE_QT5=	qmake_build buildtools_build core gui network widgets x11extras
diff --git a/multimedia/mpc-qt/distinfo b/multimedia/mpc-qt/distinfo
index 320b7c073b5..cf085240c0a 100644
--- a/multimedia/mpc-qt/distinfo
+++ b/multimedia/mpc-qt/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1487648805
+TIMESTAMP = 1488718880
 SHA256 (mpc-qt.desktop) = 7694745aac0e52c050a6bc069a0686b025e509136919d985d3c4495eec0f1c9d
 SIZE (mpc-qt.desktop) = 1270
-SHA256 (cmdrkotori-mpc-qt-0.0.0.s20170221-1aee565_GH0.tar.gz) = 6782050e74561f02572100e909788da0fdda0cc2cadbca11889fd95c98df717a
-SIZE (cmdrkotori-mpc-qt-0.0.0.s20170221-1aee565_GH0.tar.gz) = 232813
+SHA256 (cmdrkotori-mpc-qt-0.0.0.s20170305-7ffd261_GH0.tar.gz) = ba83913b92497b8cf6c8e47fb2fd4153def48bb19cb7ff573493a2bd2abadbed
+SIZE (cmdrkotori-mpc-qt-0.0.0.s20170305-7ffd261_GH0.tar.gz) = 234091
diff --git a/multimedia/smtube/Makefile b/multimedia/smtube/Makefile
index 8b31bfbf694..30e9a0a92d2 100644
--- a/multimedia/smtube/Makefile
+++ b/multimedia/smtube/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	smtube
 PORTVERSION=	17.1.0
+PORTREVISION=	1
 CATEGORIES=	multimedia
 MASTER_SITES=	SF/smtube/SMTube/${PORTVERSION}/
 
@@ -12,18 +13,37 @@ COMMENT=	SMPlayer YouTube browser
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/Copying.txt
 
-RUN_DEPENDS=	smplayer:multimedia/smplayer
-
 USES=		gmake tar:bzip2
 ALL_TARGET=	#empty
-USE_QT4=	corelib gui linguisttools_build moc_build network qmake_build \
-		rcc_build script uic_build webkit
 MAKE_ARGS=	DATA_PATH=${DATADIR} DOC_PATH=${DOCSDIR} \
 		LRELEASE=${LRELEASE} MAKE=${MAKE_CMD}
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	DOCS
+OPTIONS_SINGLE=		TOOLKIT
+OPTIONS_SINGLE_TOOLKIT=	QT4 QT5
+OPTIONS_MULTI=		PLAYER
+OPTIONS_MULTI_PLAYER=	MPLAYER MPV SMPLAYER VLC
+OPTIONS_DEFINE=		DOCS
+OPTIONS_DEFAULT=	QT4 SMPLAYER
+
+TOOLKIT_DESC=	Qt toolkit version
+PLAYER_DESC=	Video player
+MPLAYER_DESC=	MPlayer dependency for video playback
+MPV_DESC=	mpv dependency for video playback
+SMPLAYER_DESC=	SMPlayer dependency for video playback
+VLC_DESC=	VLC dependency for video playback
+
+QT4_USE=	qt4=qmake_build,moc_build,rcc_build,uic_build
+QT4_USE+=	qt4=corelib,network,script,gui,webkit,linguisttools_build
+
+QT5_USE=	qt5=qmake_build,buildtools_build,linguisttools_build
+QT5_USE+=	qt5=core,network,script,gui,webkit,widgets
+
+MPLAYER_RUN_DEPENDS=		mplayer:multimedia/mplayer
+MPV_RUN_DEPENDS=		mpv:multimedia/mpv
+SMPLAYER_RUN_DEPENDS=		smplayer:multimedia/smplayer
+VLC_RUN_DEPENDS=		vlc:multimedia/vlc
 
 post-patch:
 	@${REINPLACE_CMD} '/^QMAKE/ s|qmake|${QMAKE} ${QMAKE_ARGS:S,\$(,\$\$(,g}|' \
diff --git a/multimedia/vdr-plugin-epgsearch/Makefile b/multimedia/vdr-plugin-epgsearch/Makefile
index 2e7371d4ccb..6e526360968 100644
--- a/multimedia/vdr-plugin-epgsearch/Makefile
+++ b/multimedia/vdr-plugin-epgsearch/Makefile
@@ -12,16 +12,22 @@ DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:snapshot
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Video Disk Recorder - EPG search plugin
 
-LIB_DEPENDS+=	libpcre.so:devel/pcre \
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+LIB_DEPENDS=	libpcre.so:devel/pcre \
 		libtre.so:textproc/libtre
 
 USES=		pkgconfig tar:bzip2
 PATCH_STRIP=	-p1
-PORTDOCS=	COPYING README HISTORY
 WRKSRC=		${WRKDIR}/vdr-plugin-${PLUGIN}
-MAKE_ARGS+=	INCLUDES="-I${LOCALBASE}/include -I${LOCALBASE}/include/vdr -I${WRKSRC}"
+MAKE_ARGS=	INCLUDES="-I${LOCALBASE}/include -I${LOCALBASE}/include/vdr -I${WRKSRC}"
 
-.include	"${.CURDIR}/../vdr/Makefile.plugins"
+PORTDOCS=	README HISTORY
+
+OPTIONS_DEFINE=	DOCS NLS
+
+.include "${.CURDIR}/../vdr/Makefile.plugins"
 
 post-patch: post-patch-plugin
 	@${REINPLACE_CMD} -e 's/^#\(HAVE_PCREPOSIX=\)/\1/;' \
@@ -29,10 +35,12 @@ post-patch: post-patch-plugin
 		${WRKSRC}/Makefile
 
 pre-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr
 
 post-install: post-install-pluginlocales
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
+
+post-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/ccnet-client/Makefile b/net-mgmt/ccnet-client/Makefile
index 4efd4b60ec2..bdaadc9b52b 100644
--- a/net-mgmt/ccnet-client/Makefile
+++ b/net-mgmt/ccnet-client/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	ccnet-client
-PORTVERSION=	6.0.2
+PORTVERSION=	6.0.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 CATEGORIES=	net-mgmt devel
 
 MAINTAINER=	ultima1252@gmail.com
diff --git a/net-mgmt/ccnet-client/distinfo b/net-mgmt/ccnet-client/distinfo
index cf313b006f5..be5fdc925d4 100644
--- a/net-mgmt/ccnet-client/distinfo
+++ b/net-mgmt/ccnet-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484493215
-SHA256 (haiwen-ccnet-v6.0.2_GH0.tar.gz) = c78e4bc7b42fbaa8afae4edc5d474da72ae2d4c06745e3452e4926316d832862
-SIZE (haiwen-ccnet-v6.0.2_GH0.tar.gz) = 176698
+TIMESTAMP = 1487830917
+SHA256 (haiwen-ccnet-v6.0.4_GH0.tar.gz) = 2156787fc9ae1e4293493f0ce398aa8b97d84b9f0201d2fd6986b736bd249b04
+SIZE (haiwen-ccnet-v6.0.4_GH0.tar.gz) = 178939
diff --git a/net-mgmt/ccnet-client/pkg-plist b/net-mgmt/ccnet-client/pkg-plist
index 2b218734a2e..a506d3ac73d 100644
--- a/net-mgmt/ccnet-client/pkg-plist
+++ b/net-mgmt/ccnet-client/pkg-plist
@@ -1,4 +1,5 @@
 bin/ccnet
+bin/ccnet-init
 include/ccnet.h
 include/ccnet/async-rpc-proc.h
 include/ccnet/ccnet-client.h
diff --git a/net-mgmt/seafile-client/Makefile b/net-mgmt/seafile-client/Makefile
index a511a35d65f..a55fff4d032 100644
--- a/net-mgmt/seafile-client/Makefile
+++ b/net-mgmt/seafile-client/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	seafile-client
-PORTVERSION=	6.0.3
+PORTVERSION=	6.0.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	net-mgmt
 
 MAINTAINER=	ultima1252@gmail.com
diff --git a/net-mgmt/seafile-client/distinfo b/net-mgmt/seafile-client/distinfo
index 421c375aeea..391544c0c17 100644
--- a/net-mgmt/seafile-client/distinfo
+++ b/net-mgmt/seafile-client/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486886572
-SHA256 (haiwen-seafile-v6.0.3_GH0.tar.gz) = fca3858fa7aebfd764e64dafdc78fcc276d2cf235d64a1a3137eda505afb147b
-SIZE (haiwen-seafile-v6.0.3_GH0.tar.gz) = 454398
+TIMESTAMP = 1487830959
+SHA256 (haiwen-seafile-v6.0.4_GH0.tar.gz) = b3919bff1e0f974483df129e500868332e752dec6380556839e006bf9d5b425e
+SIZE (haiwen-seafile-v6.0.4_GH0.tar.gz) = 454474
diff --git a/net-mgmt/seafile-gui/Makefile b/net-mgmt/seafile-gui/Makefile
index d1fffbc5b6f..8cd07a31230 100644
--- a/net-mgmt/seafile-gui/Makefile
+++ b/net-mgmt/seafile-gui/Makefile
@@ -1,9 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	seafile-gui
-PORTVERSION=	6.0.3
+PORTVERSION=	6.0.4
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	net-mgmt devel
 
 MAINTAINER=	ultima1252@gmail.com
diff --git a/net-mgmt/seafile-gui/distinfo b/net-mgmt/seafile-gui/distinfo
index cb4af2e7629..cf46ac5bf1a 100644
--- a/net-mgmt/seafile-gui/distinfo
+++ b/net-mgmt/seafile-gui/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486886617
-SHA256 (haiwen-seafile-client-v6.0.3_GH0.tar.gz) = 4de4d8f9633af28c1421d38180d3f33f78fcfd3b7cb0e8d82d1ede7515aa8992
-SIZE (haiwen-seafile-client-v6.0.3_GH0.tar.gz) = 2170583
+TIMESTAMP = 1487831002
+SHA256 (haiwen-seafile-client-v6.0.4_GH0.tar.gz) = 530c9f12176b69117f319fb3cfd5d2624825df20a44ea6760530a47bf60ba535
+SIZE (haiwen-seafile-client-v6.0.4_GH0.tar.gz) = 2173354
diff --git a/net-p2p/libtorrent-rasterbar/Makefile b/net-p2p/libtorrent-rasterbar/Makefile
index 4ec061be2d4..1d97abe087c 100644
--- a/net-p2p/libtorrent-rasterbar/Makefile
+++ b/net-p2p/libtorrent-rasterbar/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libtorrent-rasterbar
-PORTVERSION=	1.1.1
-PORTREVISION=	3
+PORTVERSION=	1.1.2
 CATEGORIES?=	net-p2p ipv6
 MASTER_SITES=	https://github.com/arvidn/libtorrent/releases/download/libtorrent-${PORTVERSION:S/./_/g}/
 
@@ -28,7 +27,6 @@ CONFIGURE_ARGS=	--disable-static \
 		--enable-pool-allocators \
 		--enable-deprecated-functions \
 		--with-boost=${LOCALBASE} \
-		--with-boost-system=boost_system \
 		--with-libiconv \
 		--with-openssl=${OPENSSLBASE}
 
@@ -39,17 +37,19 @@ DOCFILES=	AUTHORS ChangeLog
 PORTDOCS=	${DOCFILES} docs/*
 PORTEXAMPLES=	*.cpp
 
-OPTIONS_DEFINE=	DEBUG DOCS EXAMPLES TEST
-TEST_DESC=	Build and run tests (increases library size)
+OPTIONS_DEFINE=	DEBUG DOCS EXAMPLES LOGGING TEST
+OPTIONS_SUB=	yes
+LOGGING_DESC=	Enable disk stat logging and logging to disk
 
-DEBUG_CONFIGURE_ENABLE=	debug
-TEST_CONFIGURE_ENABLE=	tests
+DEBUG_CONFIGURE_ENABLE=		debug
+EXAMPLES_CONFIGURE_ENABLE=	examples
+LOGGING_CONFIGURE_ENABLE=	logging disk-stats
+TEST_CONFIGURE_ENABLE=		tests
 
 .include <bsd.port.options.mk>
 
 .if defined(SLAVE_PORT) && ${SLAVE_PORT:tl} == "yes" && defined(USE_PYTHON)
-CONFIGURE_ARGS+=	--enable-python-binding \
-			--with-boost-python=boost_python
+CONFIGURE_ARGS+=	--enable-python-binding
 .else
 CONFIGURE_ARGS+=	--disable-python-binding
 .endif
@@ -74,6 +74,7 @@ post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${DOCFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} docs ${STAGEDIR}${DOCSDIR})
+	${RM} ${STAGEDIR}${DOCSDIR}/docs/._*
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/net-p2p/libtorrent-rasterbar/distinfo b/net-p2p/libtorrent-rasterbar/distinfo
index 6c325dc1d38..e7b320bdb21 100644
--- a/net-p2p/libtorrent-rasterbar/distinfo
+++ b/net-p2p/libtorrent-rasterbar/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1472088233
-SHA256 (libtorrent-rasterbar-1.1.1.tar.gz) = f70c82367b0980460ef95aff3e117fd4a174477892d529beec434f74d615b31f
-SIZE (libtorrent-rasterbar-1.1.1.tar.gz) = 3641815
+TIMESTAMP = 1488630247
+SHA256 (libtorrent-rasterbar-1.1.2.tar.gz) = 45e55f2374507bb67a9b9125f6b8d1c45e6cd33849c62b1d9cb56657354e359a
+SIZE (libtorrent-rasterbar-1.1.2.tar.gz) = 3909420
diff --git a/net-p2p/libtorrent-rasterbar/pkg-plist b/net-p2p/libtorrent-rasterbar/pkg-plist
index 01cc4d62851..8b6b7cedcd8 100644
--- a/net-p2p/libtorrent-rasterbar/pkg-plist
+++ b/net-p2p/libtorrent-rasterbar/pkg-plist
@@ -1,3 +1,13 @@
+%%TEST%%bin/bt_get
+%%TEST%%bin/bt_get2
+%%TEST%%bin/client_test
+%%TEST%%bin/connection_tester
+%%TEST%%bin/dump_torrent
+%%TEST%%bin/fuzz_torrent
+%%TEST%%bin/make_torrent
+%%TEST%%bin/simple_client
+%%TEST%%bin/stats_counters
+%%TEST%%bin/upnp_test
 include/libtorrent/ConvertUTF.h
 include/libtorrent/add_torrent_params.hpp
 include/libtorrent/address.hpp
diff --git a/net/Makefile b/net/Makefile
index 1488583cf5e..763441bd037 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -448,6 +448,7 @@
     SUBDIR += netcat
     SUBDIR += netdude
     SUBDIR += netembryo
+    SUBDIR += nethogs
     SUBDIR += netmap
     SUBDIR += netpipes
     SUBDIR += netscript
@@ -1314,7 +1315,6 @@
     SUBDIR += tcpcat
     SUBDIR += tcpdstat
     SUBDIR += tcpdump
-    SUBDIR += tcpdump398
     SUBDIR += tcpflow
     SUBDIR += tcpick
     SUBDIR += tcpillust
diff --git a/net/chrony/Makefile b/net/chrony/Makefile
index bb2d5891b87..916b7d86f4c 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	chrony
-PORTVERSION=	3.0
+PORTVERSION=	3.1
 CATEGORIES=	net
 MASTER_SITES=	http://download.tuxfamily.org/chrony/
 
@@ -42,8 +42,6 @@ OPTIONS_DEFINE=		IPV6
 IPV6_CATEGORIES=	ipv6
 IPV6_CONFIGURE_OFF=	--disable-ipv6
 
-BROKEN_aarch64=		Fails to compile: invalid operands to binary expression (double and double)
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/chronyc
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/chronyd
diff --git a/net/chrony/distinfo b/net/chrony/distinfo
index 79cf4a79212..38348f935d6 100644
--- a/net/chrony/distinfo
+++ b/net/chrony/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484669147
-SHA256 (chrony-3.0.tar.gz) = a0387b91a20f047856a56d6541a1cf920c91b53b32f74c123bcb70f1a5d2cd6d
-SIZE (chrony-3.0.tar.gz) = 421433
+TIMESTAMP = 1488375273
+SHA256 (chrony-3.1.tar.gz) = 9d9107dcdb7768a03dc129d33b2a7a25f1eea2f5620bc85eb00cfea07c1b6075
+SIZE (chrony-3.1.tar.gz) = 424109
diff --git a/net/chrony/files/patch-examples_chrony.conf.example1 b/net/chrony/files/patch-examples_chrony.conf.example1
index fc005cd87ba..d5167768d89 100644
--- a/net/chrony/files/patch-examples_chrony.conf.example1
+++ b/net/chrony/files/patch-examples_chrony.conf.example1
@@ -1,4 +1,4 @@
---- examples/chrony.conf.example1.orig	2015-10-19 09:18:37 UTC
+--- examples/chrony.conf.example1.orig	2017-01-31 10:22:11 UTC
 +++ examples/chrony.conf.example1
 @@ -1,8 +1,8 @@
  # Use public NTP servers from the pool.ntp.org project.
@@ -9,5 +9,5 @@
 -driftfile /var/lib/chrony/drift
 +driftfile /var/db/chrony/drift
  
- # In first three updates step the system clock instead of slew
- # if the adjustment is larger than 1 second.
+ # Allow the system clock to be stepped in the first three updates
+ # if its offset is larger than 1 second.
diff --git a/net/chrony/files/patch-examples_chrony.conf.example2 b/net/chrony/files/patch-examples_chrony.conf.example2
index 14de65fac95..bbb5bb6dbc1 100644
--- a/net/chrony/files/patch-examples_chrony.conf.example2
+++ b/net/chrony/files/patch-examples_chrony.conf.example2
@@ -1,4 +1,4 @@
---- examples/chrony.conf.example2.orig	2015-10-19 09:18:37 UTC
+--- examples/chrony.conf.example2.orig	2017-01-31 10:22:11 UTC
 +++ examples/chrony.conf.example2
 @@ -1,9 +1,9 @@
  # Use public servers from the pool.ntp.org project.
@@ -10,14 +10,14 @@
 -driftfile /var/lib/chrony/drift
 +driftfile /var/db/chrony/drift
  
- # In first three updates step the system clock instead of slew
- # if the adjustment is larger than 1 second.
-@@ -19,7 +19,7 @@ rtcsync
+ # Allow the system clock to be stepped in the first three updates
+ # if its offset is larger than 1 second.
+@@ -26,7 +26,7 @@ rtcsync
  #local stratum 10
  
  # Specify file containing keys for NTP authentication.
 -#keyfile /etc/chrony.keys
 +#keyfile /usr/local/etc/chrony.keys
  
- # Disable logging of client accesses.
- noclientlog
+ # Specify directory for log files.
+ logdir /var/log/chrony
diff --git a/net/chrony/files/patch-examples_chrony.conf.example3 b/net/chrony/files/patch-examples_chrony.conf.example3
index 273e15d7504..707c03dc3da 100644
--- a/net/chrony/files/patch-examples_chrony.conf.example3
+++ b/net/chrony/files/patch-examples_chrony.conf.example3
@@ -1,4 +1,4 @@
---- examples/chrony.conf.example3.orig	2015-10-19 09:18:37 UTC
+--- examples/chrony.conf.example3.orig	2017-01-31 10:22:11 UTC
 +++ examples/chrony.conf.example3
 @@ -1,7 +1,7 @@
  #######################################################################
@@ -9,7 +9,7 @@
  # want to enable.  The more obscure options are not included.  Refer
  # to the documentation for these.
  #
-@@ -47,7 +47,9 @@
+@@ -31,7 +31,9 @@
  ! server bar.example.net iburst
  ! server baz.example.net iburst
  
@@ -18,18 +18,9 @@
 +# a workstation with a full-time internet connection:
 +pool 0.freebsd.pool.ntp.org iburst
   
- # However, for dial-up use you probably want these instead.  The word
- # 'offline' means that the server is not visible at boot time.  Use
-@@ -58,7 +60,7 @@
- ! server bar.example.net offline
- ! server baz.example.net offline
- 
--! pool pool.ntp.org offline
-+! pool 0.freebsd.pool.ntp.org offline
- 
- # You may want to specify NTP 'peers' instead.  If you run a network
- # with a lot of computers and want several computers running chrony to
-@@ -93,12 +95,12 @@
+ #######################################################################
+ ### AVOIDING POTENTIALLY BOGUS CHANGES TO YOUR CLOCK
+@@ -65,12 +67,12 @@
  # immediately so that it doesn't gain or lose any more time.  You
  # generally want this, so it is uncommented.
  
@@ -44,7 +35,7 @@
  
  # chronyd can save the measurement history for the servers to files when
  # it it exits.  This is useful in 2 situations:
-@@ -116,7 +118,7 @@ driftfile /var/lib/chrony/drift
+@@ -88,7 +90,7 @@ driftfile /var/lib/chrony/drift
  # Enable these two options to use this.
  
  ! dumponexit
@@ -53,7 +44,7 @@
  
  # chronyd writes its process ID to a file.  If you try to start a second
  # copy of chronyd, it will detect that the process named in the file is
-@@ -145,6 +147,10 @@ driftfile /var/lib/chrony/drift
+@@ -117,6 +119,10 @@ driftfile /var/lib/chrony/drift
  # only need this if you really enjoy looking at the logs, you want to
  # produce some graphs of your system's timekeeping performance, or you
  # need help in debugging a problem.
@@ -64,7 +55,7 @@
  
  ! logdir /var/log/chrony
  ! log measurements statistics tracking
-@@ -259,7 +265,7 @@ driftfile /var/lib/chrony/drift
+@@ -253,7 +259,7 @@ driftfile /var/lib/chrony/drift
  # You need to have 'enhanced RTC support' compiled into your Linux
  # kernel.  (Note, these options apply only to Linux.)
  
diff --git a/net/chrony/files/patch-util.c b/net/chrony/files/patch-util.c
new file mode 100644
index 00000000000..abee9f8bbfe
--- /dev/null
+++ b/net/chrony/files/patch-util.c
@@ -0,0 +1,11 @@
+--- util.c.orig	2017-01-31 10:22:11 UTC
++++ util.c
+@@ -738,7 +738,7 @@ UTI_TimespecToNtp64(struct timespec *src
+     hi = lo = 0;
+   } else {
+     hi = htonl(sec + JAN_1970);
+-    lo = htonl(NSEC_PER_NTP64 * nsec);
++    lo = htonl((uint32_t)(NSEC_PER_NTP64 * nsec));
+ 
+     /* Add the fuzz */
+     if (fuzz) {
diff --git a/net/delegate/files/patch-src_env.c b/net/delegate/files/patch-src_env.c
new file mode 100644
index 00000000000..62744d59b67
--- /dev/null
+++ b/net/delegate/files/patch-src_env.c
@@ -0,0 +1,11 @@
+--- src/env.c.orig	2017-03-05 22:10:09 UTC
++++ src/env.c
+@@ -2080,7 +2080,7 @@ static void confCGI(Connection *Conn,DYC
+ 	if( *ereq ){
+ 		putenv(ereq);
+ 	}
+-	if( 0 <= esock ){
++	if( esock != NULL ){
+ 		sprintf(esock,"CLSOCK=%d",ClientSock);
+ 		putenv(esock);
+ 	}
diff --git a/net/nethogs/Makefile b/net/nethogs/Makefile
new file mode 100644
index 00000000000..ac97421a3f8
--- /dev/null
+++ b/net/nethogs/Makefile
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+PORTNAME=	nethogs
+PORTVERSION=	0.8.5
+DISTVERSIONPREFIX=	v
+CATEGORIES=	net
+
+MAINTAINER=	anastasios@mageirias.com
+COMMENT=	Small net top tool
+
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	raboof
+
+USES=	gmake shebangfix
+
+SHEBANG_FILES=	determineVersion.sh
+bash_CMD=	${SH}
+
+PLIST_FILES=	man/man8/nethogs.8.gz \
+		sbin/nethogs
+
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/sbin/nethogs
+
+.include <bsd.port.mk>
diff --git a/net/nethogs/distinfo b/net/nethogs/distinfo
new file mode 100644
index 00000000000..b3e21916547
--- /dev/null
+++ b/net/nethogs/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1488685002
+SHA256 (raboof-nethogs-v0.8.5_GH0.tar.gz) = 6a9392726feca43228b3f0265379154946ef0544c2ca2cac59ec35a24f469dcc
+SIZE (raboof-nethogs-v0.8.5_GH0.tar.gz) = 112385
diff --git a/net/nethogs/pkg-descr b/net/nethogs/pkg-descr
new file mode 100644
index 00000000000..334112f41c2
--- /dev/null
+++ b/net/nethogs/pkg-descr
@@ -0,0 +1,5 @@
+NetHogs is a small 'net top' tool. Instead of breaking the traffic down 
+per protocol or per subnet, like most tools do, it groups bandwidth by 
+process.
+
+WWW: https://github.com/raboof/nethogs
diff --git a/net/nethogs/pkg-message b/net/nethogs/pkg-message
new file mode 100644
index 00000000000..d20e3012349
--- /dev/null
+++ b/net/nethogs/pkg-message
@@ -0,0 +1,10 @@
+In order for nethogs to work properly add the following entry to 
+/etc/fstab:
+
+proc		/proc		procfs	rw,noauto	0	0
+
+noauto prevents /proc from being automatically mounted at boot.
+
+To mount the file system without rebooting:
+
+# mount /proc
diff --git a/net/qt5-network/Makefile b/net/qt5-network/Makefile
index eb9ab0289c7..a6709a233ad 100644
--- a/net/qt5-network/Makefile
+++ b/net/qt5-network/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	network
 DISTVERSION=	${QT5_VERSION}
+PORTREVISION=	1
 CATEGORIES=	net ipv6
 PKGNAMEPREFIX=	qt5-
 
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp
index dcbacd5cb00..3f3a6577692 100644
--- a/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp
+++ b/net/qt5-network/files/patch-src_network_ssl_qsslcontext__openssl.cpp
@@ -1,14 +1,10 @@
 * Instead of using the SSL_CTRL_SET_CURVES macros which only exists in OpenSSL,
-* call the SSL_CTX_set1_curves functions as suggested by BoringSSL porting docs
-* and which is the function in OpenSSL that is called through the replaced macro.
-* LibreSSL has a SSL_CTX_set1_groups functions and provides a compat macro.
-* Unfortunately, since Qt resolves the symbols at runtime, we cannot call through
-* that macro and must instead explicitly call SSL_CTX_set1_groups if the library
-* doesn't export a function called SSL_CTX_set1_curves, as in the case of LibreSSL.
+* call the SSL_CTX_set1_groups function, which exists in LibreSSL as well as in 
+* OpenSSL and is what would be called through the macro 
 *
 --- src/network/ssl/qsslcontext_openssl.cpp.orig	2016-12-01 08:17:04 UTC
 +++ src/network/ssl/qsslcontext_openssl.cpp
-@@ -350,14 +350,24 @@ init_context:
+@@ -350,12 +350,9 @@ init_context:
  #if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
          // Set the curves to be used
          if (q_SSLeay() >= 0x10002000L) {
@@ -18,26 +14,9 @@
 -                                SSL_CTRL_SET_CURVES,
 -                                qcurves.size(),
 -                                const_cast<int *>(reinterpret_cast<const int *>(qcurves.data())))) {
--                sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl());
--                sslContext->errorCode = QSslError::UnspecifiedError;
-+            switch (q_SSL_CTX_set1_curves(sslContext->ctx,
-+                                          const_cast<int *>(reinterpret_cast<const int *>(qcurves.data())),
-+                                          qcurves.size())) {
-+                case 1:
-+                default:
-+                    break;
-+                case 0:
-+                    sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl());
-+                    sslContext->errorCode = QSslError::UnspecifiedError;
-+                    break;
-+                case -1:
-+                    if (q_SSL_CTX_set1_groups(sslContext->ctx,
-+                                              reinterpret_cast<const int *>(qcurves.data()),
-+                                              qcurves.size()) < 1) {
-+                        sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl());
-+                        sslContext->errorCode = QSslError::UnspecifiedError;
-+                    }
-+                    break;
++            if (!q_SSL_CTX_set1_groups(sslContext->ctx,
++                                       const_cast<int *>(reinterpret_cast<const int *>(qcurves.data())),
++                                       qcurves.size())) {
+                 sslContext->errorStr = msgErrorSettingEllipticCurves(QSslSocketBackendPrivate::getErrorsFromOpenSsl());
+                 sslContext->errorCode = QSslError::UnspecifiedError;
              }
-         } else
- #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp
new file mode 100644
index 00000000000..7c24c88a074
--- /dev/null
+++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl.cpp
@@ -0,0 +1,20 @@
+* check macro is defined instead of version, LibreSSL < 2.5 doesn't have SSL_CTRL_GET_SERVER_TMP_KEY
+*
+--- src/network/ssl/qsslsocket_openssl.cpp.orig	2016-12-01 08:17:04 UTC
++++ src/network/ssl/qsslsocket_openssl.cpp
+@@ -1587,13 +1587,13 @@ void QSslSocketBackendPrivate::continueH
+     }
+ #endif // OPENSSL_VERSION_NUMBER >= 0x1000100fL ...
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
++#if defined(SSL_CTRL_GET_SERVER_TMP_KEY)
+     if (q_SSLeay() >= 0x10002000L && mode == QSslSocket::SslClientMode) {
+         EVP_PKEY *key;
+         if (q_SSL_get_server_tmp_key(ssl, &key))
+             configuration.ephemeralServerKey = QSslKey(key, QSsl::PublicKey);
+     }
+-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L ...
++#endif // defined(SSL_CTRL_GET_SERVER_TMP_KEY)
+ 
+     connectionEncrypted = true;
+     emit q->encrypted();
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
index 8f506286df0..119ec0cabb9 100644
--- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
+++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols.cpp
@@ -1,20 +1,19 @@
-* Boilerplate for SSL_CTX_set1_curves/groups() used in qsslcontext_openssl.cpp
+* Boilerplate for SSL_CTX_set1_groups() used in qsslcontext_openssl.cpp
 *
 * Prepend the path of the SSL libraries used for building so the same libraries are
 * found and loaded at runtime. Normal search finds base SSL libraries before ports.
 *
---- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2016-09-16 05:49:42 UTC
+--- src/network/ssl/qsslsocket_openssl_symbols.cpp.orig	2016-12-01 08:17:04 UTC
 +++ src/network/ssl/qsslsocket_openssl_symbols.cpp
-@@ -424,6 +424,8 @@ DEFINEFUNC(void, EC_KEY_free, EC_KEY *ec
+@@ -430,6 +430,7 @@ DEFINEFUNC(void, EC_KEY_free, EC_KEY *ec
  DEFINEFUNC2(size_t, EC_get_builtin_curves, EC_builtin_curve * r, r, size_t nitems, nitems, return 0, return)
  #if OPENSSL_VERSION_NUMBER >= 0x10002000L
  DEFINEFUNC(int, EC_curve_nist2nid, const char *name, name, return 0, return)
-+DEFINEFUNC3(int, SSL_CTX_set1_curves, SSL_CTX *a, a, int *b, b, int c, c, return -1, return)
-+DEFINEFUNC3(int, SSL_CTX_set1_groups, SSL_CTX *a, a, const int *b, b, size_t c, c, return -1, return)
++DEFINEFUNC3(int, SSL_CTX_set1_groups, SSL_CTX *a, a, int *b, b, int c, c, return -1, return)
  #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
  #endif // OPENSSL_NO_EC
  
-@@ -652,8 +654,8 @@ static QPair<QLibrary*, QLibrary*> loadO
+@@ -658,8 +659,8 @@ static QPair<QLibrary*, QLibrary*> loadO
  #endif
  #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so
      // first attempt: the canonical name is libssl.so.<SHLIB_VERSION_NUMBER>
@@ -25,7 +24,7 @@
      if (libcrypto->load() && libssl->load()) {
          // libssl.so.<SHLIB_VERSION_NUMBER> and libcrypto.so.<SHLIB_VERSION_NUMBER> found
          return pair;
-@@ -670,8 +672,8 @@ static QPair<QLibrary*, QLibrary*> loadO
+@@ -676,8 +677,8 @@ static QPair<QLibrary*, QLibrary*> loadO
      //  OS X's /usr/lib/libssl.dylib, /usr/lib/libcrypto.dylib will be picked up in the third
      //    attempt, _after_ <bundle>/Contents/Frameworks has been searched.
      //  iOS does not ship a system libssl.dylib, libcrypto.dylib in the first place.
@@ -36,14 +35,13 @@
      if (libcrypto->load() && libssl->load()) {
          // libssl.so.0 and libcrypto.so.0 found
          return pair;
-@@ -976,8 +978,11 @@ bool q_resolveOpenSslSymbols()
+@@ -982,8 +983,10 @@ bool q_resolveOpenSslSymbols()
      RESOLVEFUNC(EC_KEY_free)
      RESOLVEFUNC(EC_get_builtin_curves)
  #if OPENSSL_VERSION_NUMBER >= 0x10002000L
 -    if (q_SSLeay() >= 0x10002000L)
 +    if (q_SSLeay() >= 0x10002000L) {
          RESOLVEFUNC(EC_curve_nist2nid)
-+        RESOLVEFUNC(SSL_CTX_set1_curves)
 +        RESOLVEFUNC(SSL_CTX_set1_groups)
 +	}
  #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
diff --git a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
index 4487221331b..e14e252cd41 100644
--- a/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
+++ b/net/qt5-network/files/patch-src_network_ssl_qsslsocket__openssl__symbols__p.h
@@ -1,13 +1,21 @@
-* Boilerplate for SSL_CTX_set1_curves/groups() used in qsslcontext_openssl.cpp
+* Boilerplate for SSL_CTX_set1_groups() used in qsslcontext_openssl.cpp
 *
---- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2016-09-16 05:49:42 UTC
+* check macro is defined instead of version, LibreSSL < 2.5 doesn't have SSL_CTRL_GET_SERVER_TMP_KEY
+*
+--- src/network/ssl/qsslsocket_openssl_symbols_p.h.orig	2016-12-01 08:17:04 UTC
 +++ src/network/ssl/qsslsocket_openssl_symbols_p.h
-@@ -481,6 +481,8 @@ void q_EC_KEY_free(EC_KEY *ecdh);
+@@ -487,11 +487,12 @@ void q_EC_KEY_free(EC_KEY *ecdh);
  size_t q_EC_get_builtin_curves(EC_builtin_curve *r, size_t nitems);
  #if OPENSSL_VERSION_NUMBER >= 0x10002000L
  int q_EC_curve_nist2nid(const char *name);
-+int q_SSL_CTX_set1_curves(SSL_CTX *a, int *b, int c);
-+int q_SSL_CTX_set1_groups(SSL_CTX *a, const int *b, size_t c);
++int q_SSL_CTX_set1_groups(SSL_CTX *a, int *b, int c);
  #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
  #endif // OPENSSL_NO_EC
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
++#if defined(SSL_CTRL_GET_SERVER_TMP_KEY)
+ #define q_SSL_get_server_tmp_key(ssl, key) q_SSL_ctrl((ssl), SSL_CTRL_GET_SERVER_TMP_KEY, 0, (char *)key)
+-#endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
++#endif // defined(SSL_CTRL_GET_SERVER_TMP_KEY)
  
+ // PKCS#12 support
+ int q_PKCS12_parse(PKCS12 *p12, const char *pass, EVP_PKEY **pkey, X509 **cert, STACK_OF(X509) **ca);
diff --git a/net/tcpdump398/Makefile b/net/tcpdump398/Makefile
deleted file mode 100644
index 3932413979b..00000000000
--- a/net/tcpdump398/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-# Created by: Edwin Groothuis <edwin@mavetju.org>
-# $FreeBSD$
-
-PORTNAME=	tcpdump398
-PORTVERSION=	1.0
-CATEGORIES=	net ipv6
-MASTER_SITES=	http://www.mavetju.org/download/adopted/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Ubiquitous network traffic analysis tool - FreeBSD 7 version for FreeBSD 8
-
-LICENSE=	BSD3CLAUSE
-LICENSE_FILE=	${WRKSRC}/contrib/LICENSE
-
-FORBIDDEN=	multiple security vulnerabilities
-DEPRECATED=	multiple security vulnerabilities; not updated since 2009
-EXPIRATION_DATE=2017-03-05
-
-USES=		ssl tar:bzip2
-
-PLIST_FILES=	bin/tcpdump398 man/man1/tcpdump398.1.gz
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/tcpdump ${STAGEDIR}${PREFIX}/bin/tcpdump398
-	${INSTALL_MAN} ${WRKSRC}/tcpdump.1.gz ${STAGEDIR}${MAN1PREFIX}/man/man1/tcpdump398.1.gz
-
-.include <bsd.port.mk>
diff --git a/net/tcpdump398/distinfo b/net/tcpdump398/distinfo
deleted file mode 100644
index 4176dbca1fc..00000000000
--- a/net/tcpdump398/distinfo
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (tcpdump398-1.0.tar.bz2) = d863b13a05b9153b556368c754839eb032fe778f5caedc3b47aeb012a657e57c
-SIZE (tcpdump398-1.0.tar.bz2) = 583024
diff --git a/net/tcpdump398/files/patch-Makefile b/net/tcpdump398/files/patch-Makefile
deleted file mode 100644
index cc161e2eb26..00000000000
--- a/net/tcpdump398/files/patch-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- Makefile.orig	2009-10-01 11:35:40 UTC
-+++ Makefile
-@@ -38,7 +38,7 @@ CFLAGS+= -I${.CURDIR} -I${TCPDUMP_DISTDI
- CFLAGS+= -DHAVE_CONFIG_H
- CFLAGS+= -D_U_="__attribute__((unused))"
- 
--.if ${MK_INET6_SUPPORT} != "no"
-+.if empty(MK_INET6_SUPPORT:Mno)
- SRCS+=	print-ip6.c print-ip6opts.c print-mobility.c print-ripng.c \
- 	print-icmp6.c print-frag6.c print-rt6.c print-ospf6.c print-dhcp6.c
- CFLAGS+=	-DINET6
-@@ -49,14 +49,14 @@ CFLAGS+=	-DLBL_ALIGN
- 
- DPADD=	${LIBL} ${LIBPCAP}
- LDADD=	-ll -lpcap
--.if ${MK_OPENSSL} != "no" && !defined(RELEASE_CRUNCH)
-+.if empty(MK_OPENSSL:Mno) && !defined(RELEASE_CRUNCH)
- DPADD+= ${LIBCRYPTO}
- LDADD+= -lcrypto
- CFLAGS+= -I${DESTDIR}/usr/include/openssl
- CFLAGS+= -DHAVE_LIBCRYPTO -DHAVE_RC5_H -DHAVE_CAST_H -DHAVE_OPENSSL_EVP_H
- .endif
- 
--.if ${MK_PF} != "no"
-+.if empty(MK_PF:Mno)
- SRCS+=	print-pflog.c
- CFLAGS+= -DHAVE_NET_PFVAR_H
- .endif
diff --git a/net/tcpdump398/pkg-descr b/net/tcpdump398/pkg-descr
deleted file mode 100644
index 1a8a03d86b9..00000000000
--- a/net/tcpdump398/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-tcpdump is a ubiquitous network traffic capture tool available in a wide
-variety of BSD, Linux and UN*X distributions.
-
-This is the version 3.9.8 which is currently shipped with FreeBSD
-7. FreeBSD 8.0 is shipping with version 4.0.0 which gives a different
-output with some items missing.
diff --git a/polish/hunspell/Makefile b/polish/hunspell/Makefile
index efd2b4be50d..f7d4d7fd9a7 100644
--- a/polish/hunspell/Makefile
+++ b/polish/hunspell/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hunspell
-PORTVERSION=	20170212
+PORTVERSION=	20170305
 CATEGORIES=	polish textproc
 MASTER_SITES=	LOCAL/sunpoet/${PORTNAME}
 DISTNAME=	sjp-myspell-pl-${PORTVERSION}
diff --git a/polish/hunspell/distinfo b/polish/hunspell/distinfo
index 7a173cfdc3f..f62d81a82d9 100644
--- a/polish/hunspell/distinfo
+++ b/polish/hunspell/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486964539
-SHA256 (hunspell/sjp-myspell-pl-20170212.zip) = 859f6e0e3392b53fde9b7e41e4cbe92bc10e5d729c14dc71ddd7f8762447e417
-SIZE (hunspell/sjp-myspell-pl-20170212.zip) = 1160500
+TIMESTAMP = 1488810241
+SHA256 (hunspell/sjp-myspell-pl-20170305.zip) = f3812993fdfb1789a736e28afc1add861640b59b6d99af4e87af65cf7e95e02f
+SIZE (hunspell/sjp-myspell-pl-20170305.zip) = 1161718
diff --git a/ports-mgmt/poudriere-devel/Makefile b/ports-mgmt/poudriere-devel/Makefile
index e5788ae2947..3118889f672 100644
--- a/ports-mgmt/poudriere-devel/Makefile
+++ b/ports-mgmt/poudriere-devel/Makefile
@@ -1,8 +1,8 @@
 # $FreeBSD$
 
 PORTNAME=	poudriere
-DISTVERSION=	3.1.99.20170221
-PORTREVISION=	1
+DISTVERSION=	3.1.99.20170306
+PORTREVISION=	0
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	LOCAL/bdrewery/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
@@ -18,7 +18,7 @@ CONFLICTS_INSTALL=	poudriere-[0-9]*
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	freebsd
-GH_TAGNAME=	3.0-1822-ge8f0d3e
+GH_TAGNAME=	3.0-1957-gb3d3e0c2
 #DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${GH_TAGNAME}
 
 GNU_CONFIGURE=	yes
@@ -34,6 +34,19 @@ RUN_DEPENDS+=	freebsd-release-manifests>0:misc/freebsd-release-manifests
 QEMU_DESC=	Add qemu-user-static to compile ports for non-x86 architectures
 QEMU_RUN_DEPENDS=	qemu-user-static>0:emulators/qemu-user-static
 
+.include <bsd.port.options.mk>
+
+# rm -x support came in 10.0.  A bundled rm is used if not supported in base.
+# While <10 is technically not supported in the Ports Tree, Poudriere
+# detects this and it being a package build tool it should still be
+# supported as a user may be installing this to build packages for upgrading
+# their system to a supported release.
+.if ${OSVERSION} < 1000000
+PLIST_SUB+=	RM=""
+.else
+PLIST_SUB+=	RM="@comment "
+.endif
+
 post-install:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/share/zsh/site-functions/
 	${INSTALL_DATA} ${WRKSRC}/completions/zsh/_poudriere \
diff --git a/ports-mgmt/poudriere-devel/distinfo b/ports-mgmt/poudriere-devel/distinfo
index 00ae0073366..2b1c83b5f5e 100644
--- a/ports-mgmt/poudriere-devel/distinfo
+++ b/ports-mgmt/poudriere-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487697127
-SHA256 (freebsd-poudriere-3.1.99.20170221-3.0-1822-ge8f0d3e_GH0.tar.gz) = 6f2702bd7f4f753c40a43df6599a46657766d39deda83a2e2df746d1525fb68a
-SIZE (freebsd-poudriere-3.1.99.20170221-3.0-1822-ge8f0d3e_GH0.tar.gz) = 2952866
+TIMESTAMP = 1488859216
+SHA256 (freebsd-poudriere-3.1.99.20170306-3.0-1957-gb3d3e0c2_GH0.tar.gz) = f614fea1cb572f290a1606fa18c047ac698004f3879880b37c3c9d0bacf3744b
+SIZE (freebsd-poudriere-3.1.99.20170306-3.0-1957-gb3d3e0c2_GH0.tar.gz) = 2968774
diff --git a/ports-mgmt/poudriere-devel/files/patch-src__libexec__poudriere__cached__cached.c b/ports-mgmt/poudriere-devel/files/patch-src__libexec__poudriere__cached__cached.c
deleted file mode 100644
index 7cd62e0d6a7..00000000000
--- a/ports-mgmt/poudriere-devel/files/patch-src__libexec__poudriere__cached__cached.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/libexec/poudriere/cached/cached.c.orig	2017-02-20 23:37:27 UTC
-+++ src/libexec/poudriere/cached/cached.c
-@@ -26,6 +26,7 @@
- 
- #include <sys/types.h>
- 
-+#include <inttypes.h>
- #include <unistd.h>
- #include <stdio.h>
- #include <string.h>
diff --git a/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh b/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh
deleted file mode 100644
index 2f9bd636b64..00000000000
--- a/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_common.sh
+++ /dev/null
@@ -1,35 +0,0 @@
---- src/share/poudriere/common.sh.orig	2017-02-22 20:34:08 UTC
-+++ src/share/poudriere/common.sh
-@@ -3216,7 +3216,7 @@ build_pkg() {
- 
- 	if [ ${TMPFS_LOCALBASE} -eq 1 -o ${TMPFS_ALL} -eq 1 ]; then
- 		if [ -f "${mnt}/${LOCALBASE:-/usr/local}/.mounted" ]; then
--			umount -n ${mnt}/${LOCALBASE:-/usr/local}
-+			umount -f ${mnt}/${LOCALBASE:-/usr/local}
- 		fi
- 		mnt_tmpfs localbase ${mnt}/${LOCALBASE:-/usr/local}
- 		do_clone "${MASTERMNT}/${LOCALBASE:-/usr/local}" \
-@@ -3322,7 +3322,7 @@ stop_build() {
- 		_my_path mnt
- 
- 		if [ -f "${mnt}/.npkg_mounted" ]; then
--			umount -n "${mnt}/.npkg"
-+			umount -f "${mnt}/.npkg"
- 			rm -f "${mnt}/.npkg_mounted"
- 		fi
- 		rm -rf "${PACKAGES}/.npkg/${PKGNAME}"
-@@ -4693,12 +4693,12 @@ clean_restricted() {
- 	bset status "clean_restricted:"
- 	# Remount rw
- 	# mount_nullfs does not support mount -u
--	umount -n ${MASTERMNT}/packages
-+	umount -f ${MASTERMNT}/packages
- 	mount_packages
- 	injail /usr/bin/make -s -C /usr/ports -j ${PARALLEL_JOBS} \
- 	    RM="/bin/rm -fv" ECHO_MSG="true" clean-restricted
- 	# Remount ro
--	umount -n ${MASTERMNT}/packages
-+	umount -f ${MASTERMNT}/packages
- 	mount_packages -o ro
- }
- 
diff --git a/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh b/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh
deleted file mode 100644
index ab63945c90b..00000000000
--- a/ports-mgmt/poudriere-devel/files/patch-src_share_poudriere_include_fs.sh
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/share/poudriere/include/fs.sh.orig	2017-02-22 20:34:08 UTC
-+++ src/share/poudriere/include/fs.sh
-@@ -98,7 +98,7 @@ umountfs() {
- 
- 	[ -d "${mnt}" ] || return 0
- 	mnt=$(realpath ${mnt})
--	if ! findmounts "${mnt}" "${pattern}" | xargs umount -n; then
-+	if ! findmounts "${mnt}" "${pattern}" | xargs umount -f; then
- 		findmounts "${mnt}" "${pattern}" | xargs umount -fv || :
- 	fi
- 
-@@ -198,7 +198,7 @@ destroyfs() {
- 	umountfs ${mnt} 1
- 	if [ ${TMPFS_ALL} -eq 1 ]; then
- 		if [ -d "${mnt}" ]; then
--			if ! umount -n "${mnt}" 2>/dev/null; then
-+			if ! umount -f "${mnt}" 2>/dev/null; then
- 				umount -f "${mnt}" 2>/dev/null || :
- 			fi
- 		fi
diff --git a/ports-mgmt/poudriere-devel/pkg-plist b/ports-mgmt/poudriere-devel/pkg-plist
index b88fcc6ddab..30eaf0e189b 100644
--- a/ports-mgmt/poudriere-devel/pkg-plist
+++ b/ports-mgmt/poudriere-devel/pkg-plist
@@ -15,8 +15,10 @@ libexec/poudriere/locked_mkdir
 libexec/poudriere/nc
 libexec/poudriere/poudriered
 libexec/poudriere/ptsort
+libexec/poudriere/pwait
 libexec/poudriere/rename
 libexec/poudriere/rexec
+%%RM%%libexec/poudriere/rm
 libexec/poudriere/sh
 libexec/poudriere/timeout
 libexec/poudriere/timestamp
@@ -72,15 +74,17 @@ man/man8/poudriere.8.gz
 %%DATADIR%%/html/jail.html
 %%DATADIR%%/html/robots.txt
 %%DATADIR%%/image.sh
-%%DATADIR%%/include/common.sh.dragonfly
-%%DATADIR%%/include/common.sh.freebsd
 %%DATADIR%%/include/colors.pre.sh
 %%DATADIR%%/include/colors.sh
+%%DATADIR%%/include/common.sh.dragonfly
+%%DATADIR%%/include/common.sh.freebsd
 %%DATADIR%%/include/display.sh
 %%DATADIR%%/include/fs.sh
 %%DATADIR%%/include/hash.sh
 %%DATADIR%%/include/html.sh
 %%DATADIR%%/include/parallel.sh
+%%DATADIR%%/include/shared_hash.sh
+%%DATADIR%%/include/util.sh
 %%DATADIR%%/jail.sh
 %%DATADIR%%/options.sh
 %%DATADIR%%/pkgclean.sh
diff --git a/science/xfce4-equake-plugin/Makefile b/science/xfce4-equake-plugin/Makefile
index c33619d634e..512315088eb 100644
--- a/science/xfce4-equake-plugin/Makefile
+++ b/science/xfce4-equake-plugin/Makefile
@@ -2,9 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	xfce4-equake-plugin
-PORTVERSION=	1.3.8
+PORTVERSION=	1.3.8.1
 CATEGORIES=	science xfce
-MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:R}
+MASTER_SITES=	XFCE/src/panel-plugins/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	xfce4
 
 MAINTAINER=	xfce@FreeBSD.org
@@ -13,9 +13,13 @@ COMMENT=	Earthquake monitor plugin for the Xfce panel
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+	libfreetype.so:print/freetype2 \
+	libcurl.so:ftp/curl
+
 GNU_CONFIGURE=	yes
 USES=	gettext gmake libtool pkgconfig tar:bzip2 xfce
-USE_GNOME=	glib20 gtk20 intltool intlhack
+USE_GNOME=	glib20 gtk20 intltool cairo
 USE_XFCE=	panel
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
diff --git a/science/xfce4-equake-plugin/distinfo b/science/xfce4-equake-plugin/distinfo
index 895a028b984..b82a84c51fc 100644
--- a/science/xfce4-equake-plugin/distinfo
+++ b/science/xfce4-equake-plugin/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xfce4/xfce4-equake-plugin-1.3.8.tar.bz2) = 431575da3d49fea3afa60f02e83c8d74e20e9a229c9c4ec82c21d45e2c986925
-SIZE (xfce4/xfce4-equake-plugin-1.3.8.tar.bz2) = 395095
+TIMESTAMP = 1488700389
+SHA256 (xfce4/xfce4-equake-plugin-1.3.8.1.tar.bz2) = eff9cfd604d1bd998c5208176fbe2c6da705c250dce572f5e30b2c77f4ec741c
+SIZE (xfce4/xfce4-equake-plugin-1.3.8.1.tar.bz2) = 393086
diff --git a/security/libargon2/Makefile b/security/libargon2/Makefile
index 81b33a2bd6b..761db9313a9 100644
--- a/security/libargon2/Makefile
+++ b/security/libargon2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	libargon2
-PORTVERSION=	20160821
+PORTVERSION=	20161029
 CATEGORIES=	security devel
 
 MAINTAINER=	hsw@bitmark.com
diff --git a/security/libargon2/distinfo b/security/libargon2/distinfo
index 78abd6bd8c3..9baec481655 100644
--- a/security/libargon2/distinfo
+++ b/security/libargon2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471919051
-SHA256 (P-H-C-phc-winner-argon2-20160821_GH0.tar.gz) = f81456ae31337a13a1a1b8ffe994d71ace741833a97a75f0c1a76259639bf3b8
-SIZE (P-H-C-phc-winner-argon2-20160821_GH0.tar.gz) = 1170019
+TIMESTAMP = 1488339902
+SHA256 (P-H-C-phc-winner-argon2-20161029_GH0.tar.gz) = fe0049728b946b58b94cc6db89b34e2d050c62325d16316a534d2bedd78cd5e7
+SIZE (P-H-C-phc-winner-argon2-20161029_GH0.tar.gz) = 1506864
diff --git a/security/lynis/Makefile b/security/lynis/Makefile
index 62df40ac96e..ea5aa5c5517 100644
--- a/security/lynis/Makefile
+++ b/security/lynis/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	lynis
-PORTVERSION=	2.4.2
+PORTVERSION=	2.4.4
 CATEGORIES=	security
 MASTER_SITES=	https://cisofy.com/files/
 
diff --git a/security/lynis/distinfo b/security/lynis/distinfo
index 641f4d0809c..21f014492c0 100644
--- a/security/lynis/distinfo
+++ b/security/lynis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487240892
-SHA256 (lynis-2.4.2.tar.gz) = 1a72be1d4fd599bf47b7ce55aa55ac318232350ee45816c1042b3879fb67f0da
-SIZE (lynis-2.4.2.tar.gz) = 262395
+TIMESTAMP = 1488746467
+SHA256 (lynis-2.4.4.tar.gz) = 771a25238c2b2aa92857096670463801149ce9e13b8d82c53dfe1cad2608316a
+SIZE (lynis-2.4.4.tar.gz) = 261684
diff --git a/security/nss/Makefile b/security/nss/Makefile
index 64fc8627c50..6e537b9dc88 100644
--- a/security/nss/Makefile
+++ b/security/nss/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nss
-PORTVERSION=	3.29.1
+PORTVERSION=	3.29.3
 #DISTVERSIONSUFFIX=	-with-ckbi-1.98
 CATEGORIES=	security
 MASTER_SITES=	MOZILLA/security/${PORTNAME}/releases/${DISTNAME:tu:C/[-.]/_/g}_RTM/src
diff --git a/security/nss/distinfo b/security/nss/distinfo
index 39878ed8fc3..21ef9a7dabc 100644
--- a/security/nss/distinfo
+++ b/security/nss/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487337433
-SHA256 (nss-3.29.1.tar.gz) = 47259bc5c4439d8228d7c577ea652ed140588f27eae8ebb39cc91057aea37366
-SIZE (nss-3.29.1.tar.gz) = 7479324
+TIMESTAMP = 1488812037
+SHA256 (nss-3.29.3.tar.gz) = 35ddcc31251ef829994efeee925011aa1414e32be7e388236970255aa3c8e1eb
+SIZE (nss-3.29.3.tar.gz) = 7479458
diff --git a/security/ssh-vault/Makefile b/security/ssh-vault/Makefile
index 0cc5cb095c5..50b199b84cb 100644
--- a/security/ssh-vault/Makefile
+++ b/security/ssh-vault/Makefile
@@ -16,8 +16,7 @@ BUILD_DEPENDS=  go>=1.7:lang/go \
 USES=           go
 
 USE_GITHUB=     yes
-GH_TUPLE=	ssh-vault:ssh-vault:0.9.1 \
-		ssh-vault:crypto:ae180e0:crypto \
+GH_TUPLE=	ssh-vault:crypto:ae180e0:crypto \
 		ssh-vault:ssh2pem:228a306:ssh2pem \
 		kr:pty:ce7fa45:pty \
 		keybase:go-keychain:fc62173:keychain
diff --git a/sysutils/detox/files/patch-Makefile.in b/sysutils/detox/files/patch-Makefile.in
deleted file mode 100644
index 10af08b6bec..00000000000
--- a/sysutils/detox/files/patch-Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2008-04-12 01:02:47 UTC
-+++ Makefile.in
-@@ -116,7 +116,7 @@ detox.o: detox.c detox_path.h
- # Actions
- #
- 
--install: install-base install-safe-config install-sample-config
-+install: install-base install-sample-config
- 
- force-install: install-base install-unsafe-config install-sample-config
- 
diff --git a/sysutils/py-psutil/Makefile b/sysutils/py-psutil/Makefile
index 3fb6f49b729..4c346e0fe9e 100644
--- a/sysutils/py-psutil/Makefile
+++ b/sysutils/py-psutil/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	psutil
-PORTVERSION=	5.1.3
+PORTVERSION=	5.2.0
 CATEGORIES=	sysutils python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/sysutils/py-psutil/distinfo b/sysutils/py-psutil/distinfo
index ed7ef333912..d055c574b3d 100644
--- a/sysutils/py-psutil/distinfo
+++ b/sysutils/py-psutil/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486591841
-SHA256 (psutil-5.1.3.tar.gz) = 959bd58bdc8152b0a143cb3bd822d4a1b8f7230617b0e3eb2ff6e63812120f2b
-SIZE (psutil-5.1.3.tar.gz) = 341980
+TIMESTAMP = 1488809771
+SHA256 (psutil-5.2.0.tar.gz) = 2fc91d068faa5613c093335f0e758673ef8c722ad4bfa4aded64c13ae69089eb
+SIZE (psutil-5.2.0.tar.gz) = 345519
diff --git a/sysutils/zap/Makefile b/sysutils/zap/Makefile
index bc07fbf0c87..8e95c704693 100644
--- a/sysutils/zap/Makefile
+++ b/sysutils/zap/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	zap
-PORTVERSION=	0.6.7
-PORTREVISION=	1
+PORTVERSION=	0.6.8
 CATEGORIES=	sysutils
 
 MAINTAINER=	jrm@FreeBSD.org
diff --git a/sysutils/zap/distinfo b/sysutils/zap/distinfo
index 05907fbdcdb..0da34cd20bc 100644
--- a/sysutils/zap/distinfo
+++ b/sysutils/zap/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1485731884
-SHA256 (Jehops-zap-0.6.7_GH0.tar.gz) = ef77a22a9f9932418968dfc07ddcbe910d1a04ae94a57a974c35fac48d3a3bd2
-SIZE (Jehops-zap-0.6.7_GH0.tar.gz) = 9054
+TIMESTAMP = 1488832398
+SHA256 (Jehops-zap-0.6.8_GH0.tar.gz) = 76adacf5e7878608407ac4c631df6909149980c4d37995486b2ad0fd65831270
+SIZE (Jehops-zap-0.6.8_GH0.tar.gz) = 9021
diff --git a/sysutils/zap/pkg-message b/sysutils/zap/pkg-message
index 2aa4e0c32fe..a02ad84ee41 100644
--- a/sysutils/zap/pkg-message
+++ b/sysutils/zap/pkg-message
@@ -1,22 +1,7 @@
 =============================================================
-Version 0.6.4
--------------
+See
 
-The replication arguments have changed.  When one or more
-datasets and a destination are supplied, the destination now
-comes before the list of datasets.
+http://ftfl.ca/blog/2016-12-27-zfs-replication.html
 
-   zap rep|replicate [-dLSv] [dest [-r] dataset [[-r]
-   dataset]...].
-
-
-Version 0.6.0
--------------
-
-The command line arguments have changed.  Run zap without
-arguments for the updated format.
-
-The format of zap snapshot names has changed.  This means
-zap snapshots generated by older zap versions must be
-manually destroyed.
+for a description of a replication strategy.
 =============================================================
diff --git a/textproc/Makefile b/textproc/Makefile
index d20f627c98a..5012d3504f1 100644
--- a/textproc/Makefile
+++ b/textproc/Makefile
@@ -325,6 +325,7 @@
     SUBDIR += ibus-m17n
     SUBDIR += ibus-qt
     SUBDIR += ibus-table
+    SUBDIR += ibus-typing-booster
     SUBDIR += icdiff
     SUBDIR += id-aspell
     SUBDIR += id-hyphen
@@ -1323,6 +1324,7 @@
     SUBDIR += py-snowballstemmer
     SUBDIR += py-sparqlwrapper
     SUBDIR += py-sphinx
+    SUBDIR += py-sphinx-hieroglyph
     SUBDIR += py-sphinx-intl
     SUBDIR += py-sphinx-me
     SUBDIR += py-sphinx_numfig
@@ -1370,6 +1372,7 @@
     SUBDIR += py3-hunspell
     SUBDIR += py3-libxml2
     SUBDIR += py3-pager
+    SUBDIR += py3-pystemmer
     SUBDIR += py3-sphinx_rtd_theme
     SUBDIR += pychm
     SUBDIR += qprint
@@ -1541,6 +1544,7 @@
     SUBDIR += rubygem-terminal-table
     SUBDIR += rubygem-text
     SUBDIR += rubygem-tidy
+    SUBDIR += rubygem-truncato
     SUBDIR += rubygem-twitter-text
     SUBDIR += rubygem-unf
     SUBDIR += rubygem-unf_ext
diff --git a/textproc/ibus-typing-booster/Makefile b/textproc/ibus-typing-booster/Makefile
new file mode 100644
index 00000000000..cc2eb4368a4
--- /dev/null
+++ b/textproc/ibus-typing-booster/Makefile
@@ -0,0 +1,80 @@
+# Created by: Thierry Thomas <thierry@pompo.net>
+# $FreeBSD$
+
+PORTNAME=	ibus-typing-booster
+PORTVERSION=	1.5.23
+CATEGORIES=	textproc
+
+MAINTAINER=	thierry@FreeBSD.org
+COMMENT=	Faster typing by context sensitive completion
+
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
+
+BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py3-xdg		\
+		${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py3-gobject3	\
+		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py35-sqlite3
+LIB_DEPENDS=	libibus-1.0.so:textproc/ibus	\
+		libm17n.so:devel/m17n-lib
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/xdg/Menu.py:devel/py3-xdg		\
+		${PYTHON_SITELIBDIR}/dbus/bus.py:devel/py3-dbus		\
+		${PYTHON_SITELIBDIR}/hunspell.so:textproc/py3-hunspell	\
+		${PYTHON_SITELIBDIR}/gi/_gi.so:devel/py3-gobject3	\
+		${LOCALBASE}/share/unicode/ucd/Index.txt:textproc/UCD	\
+		${PYTHON_LIBDIR}/lib-dynload/_sqlite3.so:databases/py35-sqlite3
+TEST_DEPENDS=	${LOCALBASE}/share/hunspell/de_DE.dic:german/hunspell	\
+		${LOCALBASE}/share/hunspell/ko_KR.aff:korean/hunspell	\
+		${LOCALBASE}/share/hunspell/en_US.aff:textproc/en-hunspell
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	mike-fabian
+
+USES=		autoreconf gettext gmake iconv pathfix python:3.3+
+GNU_CONFIGURE=	yes
+NO_ARCH=	yes
+TEST_TARGET=	check
+
+OPTIONS_DEFINE=	HUNSPELL
+OPTIONS_DEFAULT=HUNSPELL
+
+HUNSPELL_RUN_DEPENDS=	hunspell:textproc/hunspell
+
+SPELL2FIX=	engine/hunspell_suggest.py setup/user_transliteration.py	\
+		setup/user_transliteration.py
+DATA2FIX=	setup/main.py engine/tabsqlitedb.py engine/main.py
+PY2FIX=		engine/emoji-picker setup/user_transliteration.py
+M17N2FIX=	setup/main.py
+SHR2FIX=	engine/tabsqlitedb.py engine/itb_util.py engine/itb_emoji.py	\
+		engine/hunspell_table.py engine/main.py setup/user_transliteration.py
+
+pre-configure:
+.for f in ${SPELL2FIX}
+	${REINPLACE_CMD} -e 's|/usr/share/myspell|${LOCALBASE}/share/hunspell|'	\
+		${WRKSRC}/${f}
+.endfor
+.for f in ${PY2FIX}
+	${REINPLACE_CMD} -e 's|/usr/bin/python3| ${PYTHON_CMD}|' ${WRKSRC}/${f}
+.endfor
+.for f in ${DATA2FIX}
+	${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' ${WRKSRC}/${f}
+.endfor
+	${REINPLACE_CMD} -e 's|prefix=/usr|prefix=${PREFIX}|' ${WRKSRC}/engine/emoji-picker
+.for f in ${M17N2FIX}
+	${REINPLACE_CMD} -e 's|/usr/share/m17n|${LOCALBASE}/share/m17n|'	\
+		${WRKSRC}/${f}
+.endfor
+	${REINPLACE_CMD} -e 's|/usr/libexec|${PREFIX}/libexec|'	\
+		${WRKSRC}/hunspell-tables/*.conf ${WRKSRC}/hunspell-tables/template.txt
+.for f in ${SHR2FIX}
+	${REINPLACE_CMD} -e 's|/usr/share/ibus-typing-booster|${DATADIR}|'	\
+		-e 's|/usr/share|${LOCALBASE}/share|' ${WRKSRC}/${f}
+.endfor
+
+post-install:
+	(cd ${STAGEDIR}${PREFIX} \
+	&& ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
+	-d ${PREFIX} -f ${DATADIR:S;${PREFIX}/;;}	\
+	&& ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
+	-d ${PREFIX} -f ${DATADIR:S;${PREFIX}/;;})
+
+.include <bsd.port.mk>
diff --git a/textproc/ibus-typing-booster/distinfo b/textproc/ibus-typing-booster/distinfo
new file mode 100644
index 00000000000..d5a435e902d
--- /dev/null
+++ b/textproc/ibus-typing-booster/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1488485649
+SHA256 (mike-fabian-ibus-typing-booster-1.5.23_GH0.tar.gz) = 5178f986fb70f61dd235525282d9345ebdfb7fa30e27d7dd9ef592bc02b23c68
+SIZE (mike-fabian-ibus-typing-booster-1.5.23_GH0.tar.gz) = 4786798
diff --git a/textproc/ibus-typing-booster/files/patch-setup_ibus-setup-typing-booster.desktop.in.in b/textproc/ibus-typing-booster/files/patch-setup_ibus-setup-typing-booster.desktop.in.in
new file mode 100644
index 00000000000..ec09186f277
--- /dev/null
+++ b/textproc/ibus-typing-booster/files/patch-setup_ibus-setup-typing-booster.desktop.in.in
@@ -0,0 +1,10 @@
+--- setup/ibus-setup-typing-booster.desktop.in.in.orig	2016-12-14 02:45:06 UTC
++++ setup/ibus-setup-typing-booster.desktop.in.in
+@@ -5,4 +5,5 @@ Exec=${LIBEXECDIR}/ibus-setup-typing-boo
+ Icon=${PKGDATADIR}/icons/ibus-hunspell-table.svg
+ NoDisplay=true
+ Type=Application
+-StartupNotify=true
+\ No newline at end of file
++StartupNotify=true
++Categories=Settings;
diff --git a/textproc/ibus-typing-booster/pkg-descr b/textproc/ibus-typing-booster/pkg-descr
new file mode 100644
index 00000000000..d74484377d6
--- /dev/null
+++ b/textproc/ibus-typing-booster/pkg-descr
@@ -0,0 +1,24 @@
+Ibus-typing-booster is a completion input method to speedup typing.
+
+The original purpose was to make typing of Indic languages easier and faster by
+providing completion and spell checking suggestions. Originally it was forked
+from ibus-table.  Since then ibus-typing-booster has been improved to support
+many other languages as well (most languages except Chinese and Japanese are
+supported). Recently the capapility to type different languages at the same time
+without having to switch between languages has been added.
+
+Features
+  - Context sensitive completions.
+  - Learns from user input.
+  - Can be trained by supplying files containing typical user input.
+  - If available, hunspell and hunspell dictionaries will also be used to
+    provide not only completion but also spellchecking suggestions (But it works
+    also without hunspell by learning only from user input).
+  - Can be used with any keyboard layout.
+  - Almost all input methods supplied by libm17n are supported (including the
+    inscript2 input methods).
+  - Several input methods and languages can be used at the same time without
+    switching.
+  - Predicts Unicode symbols and emoji as well.
+
+WWW: https://mike-fabian.github.io/ibus-typing-booster/
diff --git a/textproc/ibus-typing-booster/pkg-message b/textproc/ibus-typing-booster/pkg-message
new file mode 100644
index 00000000000..751a01afd2c
--- /dev/null
+++ b/textproc/ibus-typing-booster/pkg-message
@@ -0,0 +1,2 @@
+
+It is recommanded to install a font with emoji, e.g. x11-fonts/emojione-color-font-ttf .
diff --git a/textproc/ibus-typing-booster/pkg-plist b/textproc/ibus-typing-booster/pkg-plist
new file mode 100644
index 00000000000..9c9cd867779
--- /dev/null
+++ b/textproc/ibus-typing-booster/pkg-plist
@@ -0,0 +1,296 @@
+bin/emoji-picker
+libexec/ibus-engine-typing-booster
+libexec/ibus-setup-typing-booster
+share/appdata/typing-booster.appdata.xml
+share/applications/emoji-picker.desktop
+share/applications/ibus-setup-typing-booster.desktop
+%%DATADIR%%/data/UnicodeData.txt
+%%DATADIR%%/data/af.xml
+%%DATADIR%%/data/am.xml
+%%DATADIR%%/data/ar.xml
+%%DATADIR%%/data/as.xml
+%%DATADIR%%/data/az.xml
+%%DATADIR%%/data/be.xml
+%%DATADIR%%/data/bg.xml
+%%DATADIR%%/data/bn.xml
+%%DATADIR%%/data/bs.xml
+%%DATADIR%%/data/ca.xml
+%%DATADIR%%/data/cs.xml
+%%DATADIR%%/data/da.xml
+%%DATADIR%%/data/de.xml
+%%DATADIR%%/data/de_CH.xml
+%%DATADIR%%/data/el.xml
+%%DATADIR%%/data/emojione.json
+%%DATADIR%%/data/en.xml
+%%DATADIR%%/data/en_001.xml
+%%DATADIR%%/data/en_GB.xml
+%%DATADIR%%/data/es.xml
+%%DATADIR%%/data/es_419.xml
+%%DATADIR%%/data/et.xml
+%%DATADIR%%/data/eu.xml
+%%DATADIR%%/data/fa.xml
+%%DATADIR%%/data/fi.xml
+%%DATADIR%%/data/fil.xml
+%%DATADIR%%/data/fr.xml
+%%DATADIR%%/data/ga.xml
+%%DATADIR%%/data/gl.xml
+%%DATADIR%%/data/gu.xml
+%%DATADIR%%/data/he.xml
+%%DATADIR%%/data/hi.xml
+%%DATADIR%%/data/hr.xml
+%%DATADIR%%/data/hu.xml
+%%DATADIR%%/data/hy.xml
+%%DATADIR%%/data/id.xml
+%%DATADIR%%/data/is.xml
+%%DATADIR%%/data/it.xml
+%%DATADIR%%/data/ja.xml
+%%DATADIR%%/data/ka.xml
+%%DATADIR%%/data/kk.xml
+%%DATADIR%%/data/km.xml
+%%DATADIR%%/data/kn.xml
+%%DATADIR%%/data/ko.xml
+%%DATADIR%%/data/ky.xml
+%%DATADIR%%/data/lo.xml
+%%DATADIR%%/data/lt.xml
+%%DATADIR%%/data/lv.xml
+%%DATADIR%%/data/mk.xml
+%%DATADIR%%/data/ml.xml
+%%DATADIR%%/data/mn.xml
+%%DATADIR%%/data/mr.xml
+%%DATADIR%%/data/ms.xml
+%%DATADIR%%/data/my.xml
+%%DATADIR%%/data/nb.xml
+%%DATADIR%%/data/ne.xml
+%%DATADIR%%/data/nl.xml
+%%DATADIR%%/data/or.xml
+%%DATADIR%%/data/pa.xml
+%%DATADIR%%/data/pl.xml
+%%DATADIR%%/data/pt.xml
+%%DATADIR%%/data/pt_PT.xml
+%%DATADIR%%/data/ro.xml
+%%DATADIR%%/data/root.xml
+%%DATADIR%%/data/ru.xml
+%%DATADIR%%/data/si.xml
+%%DATADIR%%/data/sk.xml
+%%DATADIR%%/data/sl.xml
+%%DATADIR%%/data/sq.xml
+%%DATADIR%%/data/sr.xml
+%%DATADIR%%/data/sr_Latn.xml
+%%DATADIR%%/data/sv.xml
+%%DATADIR%%/data/sw.xml
+%%DATADIR%%/data/ta.xml
+%%DATADIR%%/data/te.xml
+%%DATADIR%%/data/th.xml
+%%DATADIR%%/data/tr.xml
+%%DATADIR%%/data/uk.xml
+%%DATADIR%%/data/ur.xml
+%%DATADIR%%/data/uz.xml
+%%DATADIR%%/data/vi.xml
+%%DATADIR%%/data/zh.xml
+%%DATADIR%%/data/zh_Hant.xml
+%%DATADIR%%/data/zu.xml
+%%DATADIR%%/engine/__pycache__/emoji_picker.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/emoji_picker.cpython-35.pyc
+%%DATADIR%%/engine/__pycache__/factory.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/factory.cpython-35.pyc
+%%DATADIR%%/engine/__pycache__/hunspell_suggest.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/hunspell_suggest.cpython-35.pyc
+%%DATADIR%%/engine/__pycache__/hunspell_table.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/hunspell_table.cpython-35.pyc
+%%DATADIR%%/engine/__pycache__/itb_emoji.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/itb_emoji.cpython-35.pyc
+%%DATADIR%%/engine/__pycache__/itb_nltk.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/itb_nltk.cpython-35.pyc
+%%DATADIR%%/engine/__pycache__/itb_util.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/itb_util.cpython-35.pyc
+%%DATADIR%%/engine/__pycache__/m17n_translit.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/m17n_translit.cpython-35.pyc
+%%DATADIR%%/engine/__pycache__/main.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/main.cpython-35.pyc
+%%DATADIR%%/engine/__pycache__/tabsqlitedb.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/tabsqlitedb.cpython-35.pyc
+%%DATADIR%%/engine/__pycache__/version.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/engine/__pycache__/version.cpython-35.pyc
+%%DATADIR%%/engine/emoji_picker.py
+%%DATADIR%%/engine/factory.py
+%%DATADIR%%/engine/hunspell_suggest.py
+%%DATADIR%%/engine/hunspell_table.py
+%%DATADIR%%/engine/itb_emoji.py
+%%DATADIR%%/engine/itb_nltk.py
+%%DATADIR%%/engine/itb_util.py
+%%DATADIR%%/engine/m17n_translit.py
+%%DATADIR%%/engine/main.py
+%%DATADIR%%/engine/tabsqlitedb.py
+%%DATADIR%%/engine/version.py
+%%DATADIR%%/hunspell-tables/ar_TN.conf
+%%DATADIR%%/hunspell-tables/as_IN.conf
+%%DATADIR%%/hunspell-tables/be_BY.conf
+%%DATADIR%%/hunspell-tables/bg_BG.conf
+%%DATADIR%%/hunspell-tables/bn_IN.conf
+%%DATADIR%%/hunspell-tables/ca_ES.conf
+%%DATADIR%%/hunspell-tables/cs_CZ.conf
+%%DATADIR%%/hunspell-tables/da_DK.conf
+%%DATADIR%%/hunspell-tables/de_AT.conf
+%%DATADIR%%/hunspell-tables/de_CH.conf
+%%DATADIR%%/hunspell-tables/de_DE.conf
+%%DATADIR%%/hunspell-tables/el_GR.conf
+%%DATADIR%%/hunspell-tables/en_AG.conf
+%%DATADIR%%/hunspell-tables/en_AU.conf
+%%DATADIR%%/hunspell-tables/en_BS.conf
+%%DATADIR%%/hunspell-tables/en_BW.conf
+%%DATADIR%%/hunspell-tables/en_BZ.conf
+%%DATADIR%%/hunspell-tables/en_DK.conf
+%%DATADIR%%/hunspell-tables/en_GB.conf
+%%DATADIR%%/hunspell-tables/en_GH.conf
+%%DATADIR%%/hunspell-tables/en_HK.conf
+%%DATADIR%%/hunspell-tables/en_IE.conf
+%%DATADIR%%/hunspell-tables/en_IN.conf
+%%DATADIR%%/hunspell-tables/en_JM.conf
+%%DATADIR%%/hunspell-tables/en_NA.conf
+%%DATADIR%%/hunspell-tables/en_NG.conf
+%%DATADIR%%/hunspell-tables/en_NZ.conf
+%%DATADIR%%/hunspell-tables/en_PH.conf
+%%DATADIR%%/hunspell-tables/en_SG.conf
+%%DATADIR%%/hunspell-tables/en_TT.conf
+%%DATADIR%%/hunspell-tables/en_US.conf
+%%DATADIR%%/hunspell-tables/en_ZA.conf
+%%DATADIR%%/hunspell-tables/en_ZW.conf
+%%DATADIR%%/hunspell-tables/es_ES.conf
+%%DATADIR%%/hunspell-tables/fa_IR.conf
+%%DATADIR%%/hunspell-tables/fr_BE.conf
+%%DATADIR%%/hunspell-tables/fr_CA.conf
+%%DATADIR%%/hunspell-tables/fr_CH.conf
+%%DATADIR%%/hunspell-tables/fr_FR.conf
+%%DATADIR%%/hunspell-tables/fr_LU.conf
+%%DATADIR%%/hunspell-tables/fr_MC.conf
+%%DATADIR%%/hunspell-tables/gu_IN.conf
+%%DATADIR%%/hunspell-tables/he_IL.conf
+%%DATADIR%%/hunspell-tables/hi_IN.conf
+%%DATADIR%%/hunspell-tables/hu_HU.conf
+%%DATADIR%%/hunspell-tables/hy_AM.conf
+%%DATADIR%%/hunspell-tables/is_IS.conf
+%%DATADIR%%/hunspell-tables/it_IT.conf
+%%DATADIR%%/hunspell-tables/km_KH.conf
+%%DATADIR%%/hunspell-tables/kn_IN.conf
+%%DATADIR%%/hunspell-tables/ko_KR.conf
+%%DATADIR%%/hunspell-tables/ku_TR.conf
+%%DATADIR%%/hunspell-tables/mai_IN.conf
+%%DATADIR%%/hunspell-tables/ml_IN.conf
+%%DATADIR%%/hunspell-tables/mr_IN.conf
+%%DATADIR%%/hunspell-tables/nb_NO.conf
+%%DATADIR%%/hunspell-tables/ne_IN.conf
+%%DATADIR%%/hunspell-tables/ne_NP.conf
+%%DATADIR%%/hunspell-tables/nl_NL.conf
+%%DATADIR%%/hunspell-tables/nn_NO.conf
+%%DATADIR%%/hunspell-tables/or_IN.conf
+%%DATADIR%%/hunspell-tables/pa_IN.conf
+%%DATADIR%%/hunspell-tables/pl_PL.conf
+%%DATADIR%%/hunspell-tables/pt_BR.conf
+%%DATADIR%%/hunspell-tables/pt_PT.conf
+%%DATADIR%%/hunspell-tables/ro_RO.conf
+%%DATADIR%%/hunspell-tables/ru_RU.conf
+%%DATADIR%%/hunspell-tables/si_LK.conf
+%%DATADIR%%/hunspell-tables/sv_SE.conf
+%%DATADIR%%/hunspell-tables/ta_IN.conf
+%%DATADIR%%/hunspell-tables/te_IN.conf
+%%DATADIR%%/hunspell-tables/th_TH.conf
+%%DATADIR%%/hunspell-tables/uk_UA.conf
+%%DATADIR%%/hunspell-tables/ur_PK.conf
+%%DATADIR%%/hunspell-tables/yi_US.conf
+%%DATADIR%%/icons/ar_TN.svg
+%%DATADIR%%/icons/as_IN.svg
+%%DATADIR%%/icons/be_BY.svg
+%%DATADIR%%/icons/bg_BG.svg
+%%DATADIR%%/icons/bn_IN.svg
+%%DATADIR%%/icons/ca_ES.svg
+%%DATADIR%%/icons/cs_CZ.svg
+%%DATADIR%%/icons/da_DK.svg
+%%DATADIR%%/icons/de_AT.svg
+%%DATADIR%%/icons/de_CH.svg
+%%DATADIR%%/icons/de_DE.svg
+%%DATADIR%%/icons/el_GR.svg
+%%DATADIR%%/icons/en_AG.svg
+%%DATADIR%%/icons/en_AU.svg
+%%DATADIR%%/icons/en_BS.svg
+%%DATADIR%%/icons/en_BW.svg
+%%DATADIR%%/icons/en_BZ.svg
+%%DATADIR%%/icons/en_DK.svg
+%%DATADIR%%/icons/en_GB.svg
+%%DATADIR%%/icons/en_GH.svg
+%%DATADIR%%/icons/en_HK.svg
+%%DATADIR%%/icons/en_IE.svg
+%%DATADIR%%/icons/en_IN.svg
+%%DATADIR%%/icons/en_JM.svg
+%%DATADIR%%/icons/en_NA.svg
+%%DATADIR%%/icons/en_NG.svg
+%%DATADIR%%/icons/en_NZ.svg
+%%DATADIR%%/icons/en_PH.svg
+%%DATADIR%%/icons/en_SG.svg
+%%DATADIR%%/icons/en_TT.svg
+%%DATADIR%%/icons/en_US.svg
+%%DATADIR%%/icons/en_ZA.svg
+%%DATADIR%%/icons/en_ZW.svg
+%%DATADIR%%/icons/es_ES.svg
+%%DATADIR%%/icons/fa_IR.svg
+%%DATADIR%%/icons/fr_BE.svg
+%%DATADIR%%/icons/fr_CA.svg
+%%DATADIR%%/icons/fr_CH.svg
+%%DATADIR%%/icons/fr_FR.svg
+%%DATADIR%%/icons/fr_LU.svg
+%%DATADIR%%/icons/fr_MC.svg
+%%DATADIR%%/icons/gu_IN.svg
+%%DATADIR%%/icons/he_IL.svg
+%%DATADIR%%/icons/hi_IN.svg
+%%DATADIR%%/icons/hu_HU.svg
+%%DATADIR%%/icons/hy_AM.svg
+%%DATADIR%%/icons/ibus-hunspell-table.svg
+%%DATADIR%%/icons/is_IS.svg
+%%DATADIR%%/icons/it_IT.svg
+%%DATADIR%%/icons/km_KH.svg
+%%DATADIR%%/icons/kn_IN.svg
+%%DATADIR%%/icons/ko_KR.svg
+%%DATADIR%%/icons/ku_TR.svg
+%%DATADIR%%/icons/mai_IN.svg
+%%DATADIR%%/icons/ml_IN.svg
+%%DATADIR%%/icons/mr_IN.svg
+%%DATADIR%%/icons/nb_NO.svg
+%%DATADIR%%/icons/ne_IN.svg
+%%DATADIR%%/icons/ne_NP.svg
+%%DATADIR%%/icons/nl_NL.svg
+%%DATADIR%%/icons/nn_NO.svg
+%%DATADIR%%/icons/or_IN.svg
+%%DATADIR%%/icons/pa_IN.svg
+%%DATADIR%%/icons/pl_PL.svg
+%%DATADIR%%/icons/pt_BR.svg
+%%DATADIR%%/icons/pt_PT.svg
+%%DATADIR%%/icons/ro_RO.svg
+%%DATADIR%%/icons/ru_RU.svg
+%%DATADIR%%/icons/si_LK.svg
+%%DATADIR%%/icons/sv_SE.svg
+%%DATADIR%%/icons/ta_IN.svg
+%%DATADIR%%/icons/te_IN.svg
+%%DATADIR%%/icons/th_TH.svg
+%%DATADIR%%/icons/uk_UA.svg
+%%DATADIR%%/icons/ur_PK.svg
+%%DATADIR%%/icons/yi_US.svg
+%%DATADIR%%/setup/__pycache__/i18n.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/setup/__pycache__/i18n.cpython-35.pyc
+%%DATADIR%%/setup/__pycache__/main.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/setup/__pycache__/main.cpython-35.pyc
+%%DATADIR%%/setup/__pycache__/pkginstall.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/setup/__pycache__/pkginstall.cpython-35.pyc
+%%DATADIR%%/setup/__pycache__/version.cpython-35.%%PYTHON_PYOEXTENSION%%
+%%DATADIR%%/setup/__pycache__/version.cpython-35.pyc
+%%DATADIR%%/setup/i18n.py
+%%DATADIR%%/setup/main.py
+%%DATADIR%%/setup/pkginstall.py
+%%DATADIR%%/setup/setup.glade
+%%DATADIR%%/setup/version.py
+share/ibus/component/typing-booster.xml
+share/locale/ca/LC_MESSAGES/ibus-typing-booster.mo
+share/locale/de/LC_MESSAGES/ibus-typing-booster.mo
+share/locale/fr/LC_MESSAGES/ibus-typing-booster.mo
+share/locale/ja/LC_MESSAGES/ibus-typing-booster.mo
+share/locale/pl/LC_MESSAGES/ibus-typing-booster.mo
+share/locale/pt_BR/LC_MESSAGES/ibus-typing-booster.mo
+share/locale/uk/LC_MESSAGES/ibus-typing-booster.mo
diff --git a/textproc/p5-HTML-Packer/Makefile b/textproc/p5-HTML-Packer/Makefile
index 60128ca649d..d550d838d5c 100644
--- a/textproc/p5-HTML-Packer/Makefile
+++ b/textproc/p5-HTML-Packer/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	HTML-Packer
-PORTVERSION=	2.03
+PORTVERSION=	2.04
 CATEGORIES=	textproc www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-HTML-Packer/distinfo b/textproc/p5-HTML-Packer/distinfo
index b279ceaf08c..12aa6893a2c 100644
--- a/textproc/p5-HTML-Packer/distinfo
+++ b/textproc/p5-HTML-Packer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1464328647
-SHA256 (HTML-Packer-2.03.tar.gz) = c5bb794585c8e5d6ba6aef149d31fbc2db31a60ac615f503f7cfc69752ebf106
-SIZE (HTML-Packer-2.03.tar.gz) = 35372
+TIMESTAMP = 1488737581
+SHA256 (HTML-Packer-2.04.tar.gz) = bb135731e5d6144ee3fe7f68098d1b869fd3347a904e8eebc9f13923fbc81480
+SIZE (HTML-Packer-2.04.tar.gz) = 35834
diff --git a/textproc/p5-PDF-Tiny/Makefile b/textproc/p5-PDF-Tiny/Makefile
index cc9d392cea2..46960d42b94 100644
--- a/textproc/p5-PDF-Tiny/Makefile
+++ b/textproc/p5-PDF-Tiny/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	PDF-Tiny
-DISTVERSION=	0.04
+DISTVERSION=	0.06
 CATEGORIES=	textproc perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
diff --git a/textproc/p5-PDF-Tiny/distinfo b/textproc/p5-PDF-Tiny/distinfo
index 6a5f8696c78..ef9242359e8 100644
--- a/textproc/p5-PDF-Tiny/distinfo
+++ b/textproc/p5-PDF-Tiny/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488502790
-SHA256 (PDF-Tiny-0.04.tar.gz) = 23216683a451217d709e4a5b34a7b0d99048cdba9bfc027a97a5a4feed3ed74c
-SIZE (PDF-Tiny-0.04.tar.gz) = 55455
+TIMESTAMP = 1488780101
+SHA256 (PDF-Tiny-0.06.tar.gz) = 127dac77299ba94f3c53e089a389902486b215d38f791a9850b1e2f057fd2cbf
+SIZE (PDF-Tiny-0.06.tar.gz) = 61143
diff --git a/textproc/py-sphinx-hieroglyph/Makefile b/textproc/py-sphinx-hieroglyph/Makefile
new file mode 100644
index 00000000000..c6d89f71656
--- /dev/null
+++ b/textproc/py-sphinx-hieroglyph/Makefile
@@ -0,0 +1,26 @@
+# Created by: Andreas Sommer <andreas.sommer87@googlemail.com>
+# $FreeBSD$
+
+PORTNAME=	sphinx-hieroglyph
+PORTVERSION=	0.7.1
+CATEGORIES=	textproc python
+PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+
+MAINTAINER=	andreas.sommer87@googlemail.com
+COMMENT=	Sphinx extension which builds HTML presentations
+
+LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=1.3:textproc/py-sphinx
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	nyergler
+GH_PROJECT=	hieroglyph
+
+USES=		python
+USE_PYTHON=	autoplist distutils
+
+NO_ARCH=	yes
+
+.include <bsd.port.mk>
diff --git a/textproc/py-sphinx-hieroglyph/distinfo b/textproc/py-sphinx-hieroglyph/distinfo
new file mode 100644
index 00000000000..d74be59e13e
--- /dev/null
+++ b/textproc/py-sphinx-hieroglyph/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1488614024
+SHA256 (nyergler-hieroglyph-0.7.1_GH0.tar.gz) = 0b6f1dc702481b583d610739b3b780a960f989e3bd02702beef83dcd044a6dc3
+SIZE (nyergler-hieroglyph-0.7.1_GH0.tar.gz) = 2088823
diff --git a/textproc/py-sphinx-hieroglyph/pkg-descr b/textproc/py-sphinx-hieroglyph/pkg-descr
new file mode 100644
index 00000000000..86f7f2c2a7d
--- /dev/null
+++ b/textproc/py-sphinx-hieroglyph/pkg-descr
@@ -0,0 +1,4 @@
+Hieroglyph is an extension for Sphinx which builds HTML presentations from
+ReStructuredText documents.
+
+WWW: https://github.com/nyergler/hieroglyph
diff --git a/textproc/py3-pystemmer/Makefile b/textproc/py3-pystemmer/Makefile
new file mode 100644
index 00000000000..198a71d869e
--- /dev/null
+++ b/textproc/py3-pystemmer/Makefile
@@ -0,0 +1,8 @@
+# Created by: Danilo G. Baio <dbaio@bsd.com.br>
+# $FreeBSD$
+
+MASTERDIR=	${.CURDIR}/../py-pystemmer
+
+USES=	python:3.3+
+
+.include "${MASTERDIR}/Makefile"
diff --git a/textproc/rubygem-truncato/Makefile b/textproc/rubygem-truncato/Makefile
new file mode 100644
index 00000000000..9871c079a72
--- /dev/null
+++ b/textproc/rubygem-truncato/Makefile
@@ -0,0 +1,21 @@
+# $FreeBSD$
+
+PORTNAME=	truncato
+PORTVERSION=	0.7.9
+CATEGORIES=	textproc rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	ruby@FreeBSD.org
+COMMENT=	Truncating HTML strings keeping a valid HTML markup
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE.txt
+
+RUN_DEPENDS=	rubygem-htmlentities>=4.3.1:textproc/rubygem-htmlentities \
+		rubygem-nokogiri>=1.7.0:textproc/rubygem-nokogiri
+
+NO_ARCH=	yes
+USE_RUBY=	yes
+USES=		gem
+
+.include <bsd.port.mk>
diff --git a/textproc/rubygem-truncato/distinfo b/textproc/rubygem-truncato/distinfo
new file mode 100644
index 00000000000..c400e8ede39
--- /dev/null
+++ b/textproc/rubygem-truncato/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1488797547
+SHA256 (rubygem/truncato-0.7.9.gem) = 4844cc2df4095ea6952c964dba8f31773aba60d7f0dc115b1226c2d511543a91
+SIZE (rubygem/truncato-0.7.9.gem) = 8704
diff --git a/textproc/rubygem-truncato/pkg-descr b/textproc/rubygem-truncato/pkg-descr
new file mode 100644
index 00000000000..f03093ff95e
--- /dev/null
+++ b/textproc/rubygem-truncato/pkg-descr
@@ -0,0 +1,4 @@
+Truncato is a tool for truncating HTML strings
+keeping a valid HTML markup
+
+WWW: https://github.com/jorgemanrubia/truncato
diff --git a/textproc/sk-mythes/Makefile b/textproc/sk-mythes/Makefile
index 651fa77512d..37c02551d82 100644
--- a/textproc/sk-mythes/Makefile
+++ b/textproc/sk-mythes/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mythes
-PORTVERSION=	2017.02.12
+PORTVERSION=	2017.03.05
 CATEGORIES=	textproc
 MASTER_SITES=	LOCAL/sunpoet/${PORTNAME}/
 PKGNAMEPREFIX=	sk-
diff --git a/textproc/sk-mythes/distinfo b/textproc/sk-mythes/distinfo
index 7a90eab976e..920affd1639 100644
--- a/textproc/sk-mythes/distinfo
+++ b/textproc/sk-mythes/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1486956236
-SHA256 (mythes/OOo-Thesaurus2-sk_SK-20170212.zip) = 3a3e2fe9c68d73b758eef2a8ae3d3392f2c7f49fc2db40d312868d76856acebb
-SIZE (mythes/OOo-Thesaurus2-sk_SK-20170212.zip) = 239397
+TIMESTAMP = 1488810253
+SHA256 (mythes/OOo-Thesaurus2-sk_SK-20170305.zip) = ab1d3217218a209b7018a993e98e570fd9a923b2bce26f46e1fb588ae3901303
+SIZE (mythes/OOo-Thesaurus2-sk_SK-20170305.zip) = 239473
diff --git a/www/Makefile b/www/Makefile
index eda1be1da5f..d4e62437a52 100644
--- a/www/Makefile
+++ b/www/Makefile
@@ -225,7 +225,6 @@
     SUBDIR += grafana3
     SUBDIR += grafana4
     SUBDIR += grails
-    SUBDIR += graylog-web-interface
     SUBDIR += gregarius
     SUBDIR += groupoffice
     SUBDIR += grr
@@ -1942,6 +1941,7 @@
     SUBDIR += rubygem-d3_rails-rails4
     SUBDIR += rubygem-dashing
     SUBDIR += rubygem-davclient
+    SUBDIR += rubygem-deckar01-task_list
     SUBDIR += rubygem-domainatrix
     SUBDIR += rubygem-dropzonejs-rails
     SUBDIR += rubygem-em-http-request
@@ -1964,6 +1964,7 @@
     SUBDIR += rubygem-gitlab-flowdock-git-hook
     SUBDIR += rubygem-gitlab-gollum-lib
     SUBDIR += rubygem-gitlab-grack
+    SUBDIR += rubygem-gitlab-turbolinks-classic
     SUBDIR += rubygem-gollum-grit_adapter
     SUBDIR += rubygem-gollum-lib
     SUBDIR += rubygem-gollum-lib-gitlab
diff --git a/www/codeigniter/Makefile b/www/codeigniter/Makefile
index 1002fef4f11..2af62dec40d 100644
--- a/www/codeigniter/Makefile
+++ b/www/codeigniter/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	codeigniter
-PORTVERSION=	3.1.2
+PORTVERSION=	3.1.3
 CATEGORIES=	www
 
 MAINTAINER=	junovitch@FreeBSD.org
@@ -19,8 +19,8 @@ CONFLICTS=	codeigniter-1.[0-9]* codeigniter22-2.[0-9]*
 
 NO_ARCH=	yes
 NO_BUILD=	yes
+USES=		php:web
 USE_PHP=	mcrypt pcre session
-WANT_PHP_WEB=	yes
 PLIST_SUB=	WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 CI_SYS_DIR=	system
diff --git a/www/codeigniter/distinfo b/www/codeigniter/distinfo
index 7d96d2b5bcc..b1816687e9d 100644
--- a/www/codeigniter/distinfo
+++ b/www/codeigniter/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483666404
-SHA256 (bcit-ci-CodeIgniter-3.1.2_GH0.tar.gz) = 8de7a4b19ecc14b5beaabedf41e00889c854ac44021f7f84ebbb4bde82cc0d95
-SIZE (bcit-ci-CodeIgniter-3.1.2_GH0.tar.gz) = 2156409
+TIMESTAMP = 1488729060
+SHA256 (bcit-ci-CodeIgniter-3.1.3_GH0.tar.gz) = 86d3536b30c693f20b474f1e5f98c190ce4b13fc2c0f36ad901856660a3b1294
+SIZE (bcit-ci-CodeIgniter-3.1.3_GH0.tar.gz) = 2077745
diff --git a/www/gohugo/Makefile b/www/gohugo/Makefile
index 806af189424..049c59f2ce0 100644
--- a/www/gohugo/Makefile
+++ b/www/gohugo/Makefile
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	hugo
-PORTVERSION=	0.18.1
-PORTREVISION=	1
+PORTVERSION=	0.19
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 PKGNAMEPREFIX=	go
@@ -18,41 +17,42 @@ BUILD_DEPENDS=	go>=1.5.0:lang/go
 USE_GITHUB=	yes
 GH_ACCOUNT=	spf13
 GH_SUBDIR=	src/github.com/${GH_ACCOUNT_DEFAULT}/${PORTNAME}
-GH_TUPLE=	eknkc:amber:9be5e8a:amber/src/github.com/eknkc/amber \
-		spf13:afero:90dd71e:afero/src/github.com/spf13/afero \
-		spf13:jWalterWeatherman:33c24e7:jWalterWeatherman/src/github.com/spf13/jwalterweatherman \
-		spf13:cast:56a7ecb:cast/src/github.com/spf13/cast \
-		spf13:cobra:1dd5ff2:cobra/src/github.com/spf13/cobra \
-		spf13:fsync:cb2da33:fsync/src/github.com/spf13/fsync \
-		spf13:nitro:24d7ef3:nitro/src/github.com/spf13/nitro \
-		spf13:pflag:25f8b5b:pflag/src/github.com/spf13/pflag \
-		spf13:viper:5ed0fc3:viper/src/github.com/spf13/viper \
-		yosssi:ace:ea038f4:ace/src/github.com/yosssi/ace \
-		BurntSushi:toml:9906417:toml/src/github.com/BurntSushi/toml \
+GH_TUPLE=	BurntSushi:toml:9906417:toml/src/github.com/BurntSushi/toml \
 		PuerkitoBio:purell:0bcb03f:purell/src/github.com/PuerkitoBio/purell \
 		PuerkitoBio:urlesc:5bd2802:urlesc/src/github.com/PuerkitoBio/urlesc \
+		bep:gitmap:dcb907b:gitmap/src/github.com/bep/gitmap \
 		bep:inflect:b896c45:inflect/src/github.com/bep/inflect \
+		chaseadamsio:goorgeous:054aba6:goorgeous/src/github.com/chaseadamsio/goorgeous \
+		cpuguy83:go-md2man:a65d4d2:go_md2man/src/github.com/cpuguy83/go-md2man \
 		dchest:cssmin:fb8d9b4:cssmin/src/github.com/dchest/cssmin \
-		fsnotify:fsnotify:fd9ec7d:fsnotify/src/github.com/fsnotify/fsnotify \
-		gorilla:websocket:5ddbd28:websocket/src/github.com/gorilla/websocket \
-		hashicorp:hcl:80e628d:hcl/src/github.com/hashicorp/hcl \
-		kardianos:osext:c2c54e5:osext/src/github.com/kardianos/osext \
-		kyokomi:emoji:7e06b23:emoji/src/github.com/kyokomi/emoji \
-		magiconair:properties:9c47895:properties/src/github.com/magiconair/properties \
+		eknkc:amber:9be5e8a:amber/src/github.com/eknkc/amber \
+		fsnotify:fsnotify:7d7316e:fsnotify/src/github.com/fsnotify/fsnotify \
+		gorilla:websocket:b258b4f:websocket/src/github.com/gorilla/websocket \
+		hashicorp:hcl:630949a:hcl/src/github.com/hashicorp/hcl \
+		kardianos:osext:9b883c5:osext/src/github.com/kardianos/osext \
+		kyokomi:emoji:7ad0be7:emoji/src/github.com/kyokomi/emoji \
+		magiconair:properties:b3b15ef:properties/src/github.com/magiconair/properties \
 		miekg:mmark:2d4f1dd:mmark/src/github.com/miekg/mmark \
-		mitchellh:mapstructure:bfdb1a8:mapstructure/src/github.com/mitchellh/mapstructure \
+		mitchellh:mapstructure:db1efb5:mapstructure/src/github.com/mitchellh/mapstructure \
+		nicksnyder:go-i18n:2c24b78:go_i18n/src/github.com/nicksnyder/go-i18n \
+		pelletier:go-buffruneio:c37440a:go_buffruneio/src/github.com/pelletier/go-buffruneio \
+		pelletier:go-toml:13d49d4:go_toml/src/github.com/pelletier/go-toml \
 		russross:blackfriday:5f33e7b:blackfriday/src/github.com/russross/blackfriday \
 		shurcooL:sanitized_anchor_name:1dba4b3:sanitized_anchor_name/src/github.com/shurcooL/sanitized_anchor_name \
-		golang:sys:d75a526:sys/src/golang.org/x/sys \
-		golang:text:fd889fe:text/src/golang.org/x/text \
-		golang:net:f4b625e:net/src/golang.org/x/net \
-		go-yaml:yaml:a5b47d3:yaml/src/gopkg.in/yaml.v2 \
-		cpuguy83:go-md2man:a65d4d2:go_md2man/src/github.com/cpuguy83/go-md2man \
-		nicksnyder:go-i18n:e6c90c3:go_i18n/src/github.com/nicksnyder/go-i18n \
-		pelletier:go-toml:64ff1ea:go_toml/src/github.com/pelletier/go-toml \
-		pelletier:go-buffruneio:df1e16f:go_buffruneio/src/github.com/pelletier/go-buffruneio \
-		bep:gitmap:a1a71ab:gitmap/src/github.com/bep/gitmap \
-		fortytw2:leaktest:0db74e8:leaktest/src/github.com/fortytw2/leaktest
+		spf13:afero:9be6508:afero/src/github.com/spf13/afero \
+		spf13:cast:ce135a4:cast/src/github.com/spf13/cast \
+		spf13:cobra:fcd0c5a:cobra/src/github.com/spf13/cobra \
+		spf13:fsync:cb2da33:fsync/src/github.com/spf13/fsync \
+		spf13:hugo:d0e2a1f:hugo/src/github.com/spf13/hugo \
+		spf13:jWalterWeatherman:fa7ca7e:jWalterWeatherman/src/github.com/spf13/jwalterweatherman \
+		spf13:nitro:24d7ef3:nitro/src/github.com/spf13/nitro \
+		spf13:pflag:9ff6c69:pflag/src/github.com/spf13/pflag \
+		spf13:viper:7538d73:viper/src/github.com/spf13/viper \
+		yosssi:ace:ea038f4:ace/src/github.com/yosssi/ace \
+		golang:net:d379faa:net/src/golang.org/x/net \
+		golang:sys:e48874b:sys/src/golang.org/x/sys \
+		golang:text:f28f367:text/src/golang.org/x/text \
+		go-yaml:yaml:a3f3340:yaml/src/gopkg.in/yaml.v2
 
 OPTIONS_DEFINE=	MANPAGES
 MANPAGES_DESC=	Build and/or install manual pages
diff --git a/www/gohugo/distinfo b/www/gohugo/distinfo
index 6fd71f978c5..bf065ae20c2 100644
--- a/www/gohugo/distinfo
+++ b/www/gohugo/distinfo
@@ -1,73 +1,75 @@
-TIMESTAMP = 1483364301
-SHA256 (gohugo/spf13-hugo-v0.18.1_GH0.tar.gz) = 29db2524a3042f507162164ec3ce9071277a7608547f4ea4f739d63cac4b39e4
-SIZE (gohugo/spf13-hugo-v0.18.1_GH0.tar.gz) = 9106502
-SHA256 (gohugo/eknkc-amber-9be5e8a_GH0.tar.gz) = 90d1d25805c6fd7dc3e6f4fbc252fffcf5e115f34b1e5d82706c23994d6210ff
-SIZE (gohugo/eknkc-amber-9be5e8a_GH0.tar.gz) = 21589
-SHA256 (gohugo/spf13-afero-90dd71e_GH0.tar.gz) = 757ff8aad0eee37ae373253ce920f67a66196f25a393f1304b33fbf6dba3b69f
-SIZE (gohugo/spf13-afero-90dd71e_GH0.tar.gz) = 40607
-SHA256 (gohugo/spf13-jWalterWeatherman-33c24e7_GH0.tar.gz) = d9c1b2d075d3e642acbc9fdf7a66c78092ca3d596d496cd43a5f724c94a6417f
-SIZE (gohugo/spf13-jWalterWeatherman-33c24e7_GH0.tar.gz) = 5939
-SHA256 (gohugo/spf13-cast-56a7ecb_GH0.tar.gz) = 479a11eaa3c0f3f7595b906b11cb6cfab1566b29b87bfa8baf186980a11daa52
-SIZE (gohugo/spf13-cast-56a7ecb_GH0.tar.gz) = 6428
-SHA256 (gohugo/spf13-cobra-1dd5ff2_GH0.tar.gz) = 6b1442ae9583eae8e64faeb8c551161c18b59cd947f568af4899519083e3d72e
-SIZE (gohugo/spf13-cobra-1dd5ff2_GH0.tar.gz) = 72046
-SHA256 (gohugo/spf13-fsync-cb2da33_GH0.tar.gz) = 55d10cb05ad27685ac9e2ed694d81fe1217d2a54eae4eeb6a9111a66536d1ff5
-SIZE (gohugo/spf13-fsync-cb2da33_GH0.tar.gz) = 4552
-SHA256 (gohugo/spf13-nitro-24d7ef3_GH0.tar.gz) = e64c8d195990c3aa57c47cc4f090b1f575fa712b8b2fa3f8bdb2dc1b76ec440a
-SIZE (gohugo/spf13-nitro-24d7ef3_GH0.tar.gz) = 6741
-SHA256 (gohugo/spf13-pflag-25f8b5b_GH0.tar.gz) = 3269b25947918cb200ff45be57fbc431db70292c5227711a4038528a831f0c89
-SIZE (gohugo/spf13-pflag-25f8b5b_GH0.tar.gz) = 32201
-SHA256 (gohugo/spf13-viper-5ed0fc3_GH0.tar.gz) = fe5d239516de40bed1f54b2d843ed694447e01b9bb264e3b6add3f041367484c
-SIZE (gohugo/spf13-viper-5ed0fc3_GH0.tar.gz) = 29785
-SHA256 (gohugo/yosssi-ace-ea038f4_GH0.tar.gz) = 0d8da272af4618613b62f6f28fff6142d285c70de0658b8c328f588a690e4b85
-SIZE (gohugo/yosssi-ace-ea038f4_GH0.tar.gz) = 23269
+TIMESTAMP = 1488661925
+SHA256 (gohugo/spf13-hugo-v0.19_GH0.tar.gz) = f2d1926b226b4a5d64c4880538eb1bb47c84dd886152660d72c69269f7c5cf6f
+SIZE (gohugo/spf13-hugo-v0.19_GH0.tar.gz) = 9692983
 SHA256 (gohugo/BurntSushi-toml-9906417_GH0.tar.gz) = a980407edcf8275d58651f9af3c74dc802f0aaf702936c78b36059289421de8c
 SIZE (gohugo/BurntSushi-toml-9906417_GH0.tar.gz) = 39914
 SHA256 (gohugo/PuerkitoBio-purell-0bcb03f_GH0.tar.gz) = ade9e6e2a5d1d79daaf2d729f450c482ff0aa316ea0a1d9e5e3f7a753d05c49c
 SIZE (gohugo/PuerkitoBio-purell-0bcb03f_GH0.tar.gz) = 11654
 SHA256 (gohugo/PuerkitoBio-urlesc-5bd2802_GH0.tar.gz) = 351a162da070c2c5e501a0056a904801f659f6933c4103f3b5f50b3b8a90e656
 SIZE (gohugo/PuerkitoBio-urlesc-5bd2802_GH0.tar.gz) = 6783
+SHA256 (gohugo/bep-gitmap-dcb907b_GH0.tar.gz) = a5135d26ca92bbf67bb1a1ad72ed88e1724d52ebe5446004a044ea009f1a1a60
+SIZE (gohugo/bep-gitmap-dcb907b_GH0.tar.gz) = 4458
 SHA256 (gohugo/bep-inflect-b896c45_GH0.tar.gz) = 11918dab4c6b5f81a40830259cacec50b4d671e08a634a24da292040718211ee
 SIZE (gohugo/bep-inflect-b896c45_GH0.tar.gz) = 9661
+SHA256 (gohugo/chaseadamsio-goorgeous-054aba6_GH0.tar.gz) = d0266557ae1d4e69dcbdf4072c36015b34fb82775925c7167784685b63e433a5
+SIZE (gohugo/chaseadamsio-goorgeous-054aba6_GH0.tar.gz) = 31390
+SHA256 (gohugo/cpuguy83-go-md2man-a65d4d2_GH0.tar.gz) = aa57abcc9cc5b034a91479922764bffdcd602d29c8b8ce5512f4dc6bbaab54b9
+SIZE (gohugo/cpuguy83-go-md2man-a65d4d2_GH0.tar.gz) = 40242
 SHA256 (gohugo/dchest-cssmin-fb8d9b4_GH0.tar.gz) = fce78d1a1de9f9e516c24cd38856034f23fce22807ecb3c9566c383602109417
 SIZE (gohugo/dchest-cssmin-fb8d9b4_GH0.tar.gz) = 3354
-SHA256 (gohugo/fsnotify-fsnotify-fd9ec7d_GH0.tar.gz) = 6841ad738e14637194726389faf2bdaf3e72929d7d2c3e4aca497243390069be
-SIZE (gohugo/fsnotify-fsnotify-fd9ec7d_GH0.tar.gz) = 29971
-SHA256 (gohugo/gorilla-websocket-5ddbd28_GH0.tar.gz) = 680ce3dd35a0b6df35bf32cf0f7c4e4b327ff35abff3409db5cadb43aa56b135
-SIZE (gohugo/gorilla-websocket-5ddbd28_GH0.tar.gz) = 39058
-SHA256 (gohugo/hashicorp-hcl-80e628d_GH0.tar.gz) = 392e80115ebad5bb1c968bb649a06559613220547757e7638e6021b6308d4895
-SIZE (gohugo/hashicorp-hcl-80e628d_GH0.tar.gz) = 67712
-SHA256 (gohugo/kardianos-osext-c2c54e5_GH0.tar.gz) = a88e50c075ae7a99dc643ea325992c44324d9b8d7094e77c692ab66b357c1b42
-SIZE (gohugo/kardianos-osext-c2c54e5_GH0.tar.gz) = 4724
-SHA256 (gohugo/kyokomi-emoji-7e06b23_GH0.tar.gz) = 5fa5d5b3122fe8e37b55e02f85e3196d5b5977df91c9379ba51e2a2893d2b1ec
-SIZE (gohugo/kyokomi-emoji-7e06b23_GH0.tar.gz) = 32552
-SHA256 (gohugo/magiconair-properties-9c47895_GH0.tar.gz) = a084f39b7843e3a0c9774f9ea52f94c46bf9d37c7c1548fa8868c50282f0284b
-SIZE (gohugo/magiconair-properties-9c47895_GH0.tar.gz) = 53886
+SHA256 (gohugo/eknkc-amber-9be5e8a_GH0.tar.gz) = 90d1d25805c6fd7dc3e6f4fbc252fffcf5e115f34b1e5d82706c23994d6210ff
+SIZE (gohugo/eknkc-amber-9be5e8a_GH0.tar.gz) = 21589
+SHA256 (gohugo/fsnotify-fsnotify-7d7316e_GH0.tar.gz) = c03fb42e8f5cf115edf43b093f0a8f4f9253004fac3751a1d3dc3fdeaa34bd4c
+SIZE (gohugo/fsnotify-fsnotify-7d7316e_GH0.tar.gz) = 30503
+SHA256 (gohugo/gorilla-websocket-b258b4f_GH0.tar.gz) = 2429d6381a1c7ec45292433045fabec5dfca1e3823c5f9c528ebbb6ff0b2ccea
+SIZE (gohugo/gorilla-websocket-b258b4f_GH0.tar.gz) = 42951
+SHA256 (gohugo/hashicorp-hcl-630949a_GH0.tar.gz) = 6d9f017b26e71c66130431695329d0047f143ba0bcfb4a3060bf6238e4430902
+SIZE (gohugo/hashicorp-hcl-630949a_GH0.tar.gz) = 69191
+SHA256 (gohugo/kardianos-osext-9b883c5_GH0.tar.gz) = 6152f6c512e4807f0721fcd659ed1c2b444f24ba51d100b4a44d4cecb6cc0ee1
+SIZE (gohugo/kardianos-osext-9b883c5_GH0.tar.gz) = 4836
+SHA256 (gohugo/kyokomi-emoji-7ad0be7_GH0.tar.gz) = da4aa9f34e6fc2ea0073bf5b01f180b244ee6d80936502bed3536dfd8d0f759e
+SIZE (gohugo/kyokomi-emoji-7ad0be7_GH0.tar.gz) = 32884
+SHA256 (gohugo/magiconair-properties-b3b15ef_GH0.tar.gz) = b517a820aba5ace736ea4b2e5b5d5b3fc109da41a1bb9967f55cf4073cfc52af
+SIZE (gohugo/magiconair-properties-b3b15ef_GH0.tar.gz) = 26773
 SHA256 (gohugo/miekg-mmark-2d4f1dd_GH0.tar.gz) = 6bb2e95323f65a37dd30c877864db60398759ad052bdfccbf6f48b8781794feb
 SIZE (gohugo/miekg-mmark-2d4f1dd_GH0.tar.gz) = 197672
-SHA256 (gohugo/mitchellh-mapstructure-bfdb1a8_GH0.tar.gz) = f051b0260c2da7213bf8dcab186b9cbb164285acc95624a22d2343809bd8839f
-SIZE (gohugo/mitchellh-mapstructure-bfdb1a8_GH0.tar.gz) = 14947
+SHA256 (gohugo/mitchellh-mapstructure-db1efb5_GH0.tar.gz) = 7f0253dbb6e4c39db0520111a605bccc080b0c4b0c1e2c2aac96aa8721515913
+SIZE (gohugo/mitchellh-mapstructure-db1efb5_GH0.tar.gz) = 15276
+SHA256 (gohugo/nicksnyder-go-i18n-2c24b78_GH0.tar.gz) = d08df390933004d57d32150c4fbaf7093b2b134211545081994ab025051ff5b7
+SIZE (gohugo/nicksnyder-go-i18n-2c24b78_GH0.tar.gz) = 36114
+SHA256 (gohugo/pelletier-go-buffruneio-c37440a_GH0.tar.gz) = d2bdcd763e33d9bdda4058b10dc2b4fc25aeb1b752b7e1bb9b4713dc06e24af4
+SIZE (gohugo/pelletier-go-buffruneio-c37440a_GH0.tar.gz) = 3027
+SHA256 (gohugo/pelletier-go-toml-13d49d4_GH0.tar.gz) = 8fb505b1b974567a0c092ddb0cd06892b36eca1d6c008e48053d827be828fa0f
+SIZE (gohugo/pelletier-go-toml-13d49d4_GH0.tar.gz) = 38748
 SHA256 (gohugo/russross-blackfriday-5f33e7b_GH0.tar.gz) = 30ec0d8bb17b404f7f3a59d574fa5728adc15b0248d433bd14d3ade1b8935b0e
 SIZE (gohugo/russross-blackfriday-5f33e7b_GH0.tar.gz) = 71950
 SHA256 (gohugo/shurcooL-sanitized_anchor_name-1dba4b3_GH0.tar.gz) = 0188ebad02ba0773a70431647bf7f40655dc0fdfccec8a3c682a20e97fd42d36
 SIZE (gohugo/shurcooL-sanitized_anchor_name-1dba4b3_GH0.tar.gz) = 2054
-SHA256 (gohugo/golang-sys-d75a526_GH0.tar.gz) = 1f10fb14776b1927eed8cb8546df0d3878bdb02fb88e98d00cde223c74d84152
-SIZE (gohugo/golang-sys-d75a526_GH0.tar.gz) = 667158
-SHA256 (gohugo/golang-text-fd889fe_GH0.tar.gz) = 04ed6d964e85029f8d6f880f0b46394b2c0d5b92f706b6f59eed8bb139a8e9f6
-SIZE (gohugo/golang-text-fd889fe_GH0.tar.gz) = 4521575
-SHA256 (gohugo/golang-net-f4b625e_GH0.tar.gz) = a7bc082254e9214ef5f3bbb8007b2b9789944e9446ef40c3a83785a1a3d42409
-SIZE (gohugo/golang-net-f4b625e_GH0.tar.gz) = 740383
-SHA256 (gohugo/go-yaml-yaml-a5b47d3_GH0.tar.gz) = 169639b2a29faef0955fb7979f52f22d1384e448ead8fc2dd71d446bc9ca0f42
-SIZE (gohugo/go-yaml-yaml-a5b47d3_GH0.tar.gz) = 60493
-SHA256 (gohugo/cpuguy83-go-md2man-a65d4d2_GH0.tar.gz) = aa57abcc9cc5b034a91479922764bffdcd602d29c8b8ce5512f4dc6bbaab54b9
-SIZE (gohugo/cpuguy83-go-md2man-a65d4d2_GH0.tar.gz) = 40242
-SHA256 (gohugo/nicksnyder-go-i18n-e6c90c3_GH0.tar.gz) = 421ee08e5877cc1ae4d1a6cd1558a3904f8e1c1946e4d4828378253df159b5d5
-SIZE (gohugo/nicksnyder-go-i18n-e6c90c3_GH0.tar.gz) = 35089
-SHA256 (gohugo/pelletier-go-toml-64ff1ea_GH0.tar.gz) = a30a9651cc0585c11694babd7aa158a189e04cdc7c8fc033a87574f505938e6e
-SIZE (gohugo/pelletier-go-toml-64ff1ea_GH0.tar.gz) = 35063
-SHA256 (gohugo/pelletier-go-buffruneio-df1e16f_GH0.tar.gz) = 4a1626ad483e8f500c7a6e322fac571f4f5575a236cc17880c0dc4a0cff89531
-SIZE (gohugo/pelletier-go-buffruneio-df1e16f_GH0.tar.gz) = 2892
-SHA256 (gohugo/bep-gitmap-a1a71ab_GH0.tar.gz) = ddab35393534643a83a7db86eedd8e1de2ce6c5bdcdeab34da064dd3a7c91377
-SIZE (gohugo/bep-gitmap-a1a71ab_GH0.tar.gz) = 4461
-SHA256 (gohugo/fortytw2-leaktest-0db74e8_GH0.tar.gz) = 659cb7b629d3f26d6433c5e8c18129d40c20d2abd98d5263ff3fafabb3f702ad
-SIZE (gohugo/fortytw2-leaktest-0db74e8_GH0.tar.gz) = 3315
+SHA256 (gohugo/spf13-afero-9be6508_GH0.tar.gz) = 6814d3c2e2c55540cbc190def53324924cf44b06ac4ec39b4cb09c3416a5dcb5
+SIZE (gohugo/spf13-afero-9be6508_GH0.tar.gz) = 40630
+SHA256 (gohugo/spf13-cast-ce135a4_GH0.tar.gz) = c9d5973187d2094361d2929194823a27c133bcd755f2db1f1080fafde708f464
+SIZE (gohugo/spf13-cast-ce135a4_GH0.tar.gz) = 9416
+SHA256 (gohugo/spf13-cobra-fcd0c5a_GH0.tar.gz) = b0b08872930b465323ced39c230869f33dba1ce5f9a517457fc6571a8a9017bf
+SIZE (gohugo/spf13-cobra-fcd0c5a_GH0.tar.gz) = 73605
+SHA256 (gohugo/spf13-fsync-cb2da33_GH0.tar.gz) = 55d10cb05ad27685ac9e2ed694d81fe1217d2a54eae4eeb6a9111a66536d1ff5
+SIZE (gohugo/spf13-fsync-cb2da33_GH0.tar.gz) = 4552
+SHA256 (gohugo/spf13-hugo-d0e2a1f_GH0.tar.gz) = c6ff41cbd50ebaa083ad6c23b10a50372087f817565b5ba02b55c0a692c33105
+SIZE (gohugo/spf13-hugo-d0e2a1f_GH0.tar.gz) = 9726588
+SHA256 (gohugo/spf13-jWalterWeatherman-fa7ca7e_GH0.tar.gz) = 15828edcc10b670c78a83a2e29ce86961cf3185e8950b5c9cd8cfe6db3c1bb4f
+SIZE (gohugo/spf13-jWalterWeatherman-fa7ca7e_GH0.tar.gz) = 6255
+SHA256 (gohugo/spf13-nitro-24d7ef3_GH0.tar.gz) = e64c8d195990c3aa57c47cc4f090b1f575fa712b8b2fa3f8bdb2dc1b76ec440a
+SIZE (gohugo/spf13-nitro-24d7ef3_GH0.tar.gz) = 6741
+SHA256 (gohugo/spf13-pflag-9ff6c69_GH0.tar.gz) = c681cdbf4fd4e399059f51a7561c7d3065aee3c3e65cfb4a86e8759de18f9dd6
+SIZE (gohugo/spf13-pflag-9ff6c69_GH0.tar.gz) = 38872
+SHA256 (gohugo/spf13-viper-7538d73_GH0.tar.gz) = d793086bbc8cb68a5b1d2deeabbf6497b97db3b9285cadb2b80335cd81c8d88e
+SIZE (gohugo/spf13-viper-7538d73_GH0.tar.gz) = 29789
+SHA256 (gohugo/yosssi-ace-ea038f4_GH0.tar.gz) = 0d8da272af4618613b62f6f28fff6142d285c70de0658b8c328f588a690e4b85
+SIZE (gohugo/yosssi-ace-ea038f4_GH0.tar.gz) = 23269
+SHA256 (gohugo/golang-net-d379faa_GH0.tar.gz) = 477dfa828ee76e04f02fdd75bc4aa82dfe88eb97ed05b276b54a65b31f938c20
+SIZE (gohugo/golang-net-d379faa_GH0.tar.gz) = 789369
+SHA256 (gohugo/golang-sys-e48874b_GH0.tar.gz) = 7542a4ab49922b4a90c1551c32ceee4d05e6d11c04384c3547ca8840f122142f
+SIZE (gohugo/golang-sys-e48874b_GH0.tar.gz) = 672409
+SHA256 (gohugo/golang-text-f28f367_GH0.tar.gz) = 0ca4c8a4b14b8fedcd9d2aa5e2eb67c326e8b2351757009da7a03f25db820240
+SIZE (gohugo/golang-text-f28f367_GH0.tar.gz) = 4552439
+SHA256 (gohugo/go-yaml-yaml-a3f3340_GH0.tar.gz) = e2a3af32b0d55b2426229ea6efca85e4219209225f05fb57af55834a2dee2d1a
+SIZE (gohugo/go-yaml-yaml-a3f3340_GH0.tar.gz) = 60720
diff --git a/www/ilias/Makefile b/www/ilias/Makefile
index 7b4f49ad35c..4b99395ac85 100644
--- a/www/ilias/Makefile
+++ b/www/ilias/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	ilias
-PORTVERSION=	5.2.0
+PORTVERSION=	5.2.1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	www
 
diff --git a/www/ilias/distinfo b/www/ilias/distinfo
index 8c194a5b0ac..0def574aa0b 100644
--- a/www/ilias/distinfo
+++ b/www/ilias/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1487212236
-SHA256 (ILIAS-eLearning-ILIAS-v5.2.0_GH0.tar.gz) = 951168c5c545e9a16ebf830ad7641d9a0472291234524ba4d4f0cadcc228d190
-SIZE (ILIAS-eLearning-ILIAS-v5.2.0_GH0.tar.gz) = 148554599
+TIMESTAMP = 1488789132
+SHA256 (ILIAS-eLearning-ILIAS-v5.2.1_GH0.tar.gz) = abef2c2ff7edc0333b08baef0483cada408ea0da0d4c1c97c056e5a21a1596cc
+SIZE (ILIAS-eLearning-ILIAS-v5.2.1_GH0.tar.gz) = 148097703
diff --git a/www/nextcloud/Makefile b/www/nextcloud/Makefile
index 25a2dd76cf4..437eeb91628 100644
--- a/www/nextcloud/Makefile
+++ b/www/nextcloud/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	nextcloud
-PORTVERSION=	11.0.1
+PORTVERSION=	11.0.2
 CATEGORIES=	www
 MASTER_SITES=	https://download.nextcloud.com/server/releases/
 
diff --git a/www/nextcloud/distinfo b/www/nextcloud/distinfo
index 0be78d8e2b0..b1c3c00c039 100644
--- a/www/nextcloud/distinfo
+++ b/www/nextcloud/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484557822
-SHA256 (nextcloud-11.0.1.tar.bz2) = 00162bf454914a2acbe6a9ac47c9db9f411b99064f0736b43e73cabbd87f4629
-SIZE (nextcloud-11.0.1.tar.bz2) = 38491955
+TIMESTAMP = 1488198444
+SHA256 (nextcloud-11.0.2.tar.bz2) = 5d1ef19d8f1f340b46c05ba3741dcb043dfc84fc3b9e2cfce1409c71a89b8700
+SIZE (nextcloud-11.0.2.tar.bz2) = 38598274
diff --git a/www/nextcloud/pkg-plist b/www/nextcloud/pkg-plist
index 471743c5eb2..8a05b4464fd 100644
--- a/www/nextcloud/pkg-plist
+++ b/www/nextcloud/pkg-plist
@@ -3117,6 +3117,8 @@
 %%WWWDIR%%/apps/dav/l10n/ru.json
 %%WWWDIR%%/apps/dav/l10n/sl.js
 %%WWWDIR%%/apps/dav/l10n/sl.json
+%%WWWDIR%%/apps/dav/l10n/sq.js
+%%WWWDIR%%/apps/dav/l10n/sq.json
 %%WWWDIR%%/apps/dav/l10n/sv.js
 %%WWWDIR%%/apps/dav/l10n/sv.json
 %%WWWDIR%%/apps/dav/l10n/zh_TW.js
@@ -3736,6 +3738,8 @@
 %%WWWDIR%%/apps/federation/l10n/he.json
 %%WWWDIR%%/apps/federation/l10n/hu_HU.js
 %%WWWDIR%%/apps/federation/l10n/hu_HU.json
+%%WWWDIR%%/apps/federation/l10n/ia.js
+%%WWWDIR%%/apps/federation/l10n/ia.json
 %%WWWDIR%%/apps/federation/l10n/id.js
 %%WWWDIR%%/apps/federation/l10n/id.json
 %%WWWDIR%%/apps/federation/l10n/is.js
@@ -3748,6 +3752,8 @@
 %%WWWDIR%%/apps/federation/l10n/ko.json
 %%WWWDIR%%/apps/federation/l10n/lb.js
 %%WWWDIR%%/apps/federation/l10n/lb.json
+%%WWWDIR%%/apps/federation/l10n/lv.js
+%%WWWDIR%%/apps/federation/l10n/lv.json
 %%WWWDIR%%/apps/federation/l10n/nb_NO.js
 %%WWWDIR%%/apps/federation/l10n/nb_NO.json
 %%WWWDIR%%/apps/federation/l10n/nl.js
@@ -5890,6 +5896,7 @@
 %%WWWDIR%%/apps/files_sharing/l10n/zh_TW.js
 %%WWWDIR%%/apps/files_sharing/l10n/zh_TW.json
 %%WWWDIR%%/apps/files_sharing/lib/Activity/Filter.php
+%%WWWDIR%%/apps/files_sharing/lib/Activity/Providers/Base.php
 %%WWWDIR%%/apps/files_sharing/lib/Activity/Providers/Downloads.php
 %%WWWDIR%%/apps/files_sharing/lib/Activity/Providers/Groups.php
 %%WWWDIR%%/apps/files_sharing/lib/Activity/Providers/PublicLinks.php
@@ -6682,6 +6689,8 @@
 %%WWWDIR%%/apps/files_versions/l10n/hy.json
 %%WWWDIR%%/apps/files_versions/l10n/id.js
 %%WWWDIR%%/apps/files_versions/l10n/id.json
+%%WWWDIR%%/apps/files_versions/l10n/ia.js
+%%WWWDIR%%/apps/files_versions/l10n/ia.json
 %%WWWDIR%%/apps/files_versions/l10n/is.js
 %%WWWDIR%%/apps/files_versions/l10n/is.json
 %%WWWDIR%%/apps/files_versions/l10n/it.js
@@ -7323,7 +7332,6 @@
 %%WWWDIR%%/apps/logreader/package.json
 %%WWWDIR%%/apps/logreader/screenshots/reader.png
 %%WWWDIR%%/apps/logreader/templates/index.php
-%%WWWDIR%%/apps/logreader/webpack/dev-proxy.js
 %%WWWDIR%%/apps/logreader/webpack/dev.config.js
 %%WWWDIR%%/apps/logreader/webpack/prod.config.js
 %%WWWDIR%%/apps/logreader/webpack/utils/notifyStats.js
@@ -7580,6 +7588,37 @@
 %%WWWDIR%%/apps/sharebymail/appinfo/info.xml
 %%WWWDIR%%/apps/sharebymail/appinfo/signature.json
 %%WWWDIR%%/apps/sharebymail/img/app.svg
+%%WWWDIR%%/apps/sharebymail/l10n/.gitkeep
+%%WWWDIR%%/apps/sharebymail/l10n/cs_CZ.js
+%%WWWDIR%%/apps/sharebymail/l10n/cs_CZ.json
+%%WWWDIR%%/apps/sharebymail/l10n/da.js
+%%WWWDIR%%/apps/sharebymail/l10n/da.json
+%%WWWDIR%%/apps/sharebymail/l10n/de.js
+%%WWWDIR%%/apps/sharebymail/l10n/de.json
+%%WWWDIR%%/apps/sharebymail/l10n/de_DE.js
+%%WWWDIR%%/apps/sharebymail/l10n/de_DE.json
+%%WWWDIR%%/apps/sharebymail/l10n/es.js
+%%WWWDIR%%/apps/sharebymail/l10n/es.json
+%%WWWDIR%%/apps/sharebymail/l10n/fr.js
+%%WWWDIR%%/apps/sharebymail/l10n/fr.json
+%%WWWDIR%%/apps/sharebymail/l10n/id.js
+%%WWWDIR%%/apps/sharebymail/l10n/id.json
+%%WWWDIR%%/apps/sharebymail/l10n/is.js
+%%WWWDIR%%/apps/sharebymail/l10n/is.json
+%%WWWDIR%%/apps/sharebymail/l10n/nb_NO.js
+%%WWWDIR%%/apps/sharebymail/l10n/nb_NO.json
+%%WWWDIR%%/apps/sharebymail/l10n/nl.js
+%%WWWDIR%%/apps/sharebymail/l10n/nl.json
+%%WWWDIR%%/apps/sharebymail/l10n/pl.js
+%%WWWDIR%%/apps/sharebymail/l10n/pl.json
+%%WWWDIR%%/apps/sharebymail/l10n/pt_BR.js
+%%WWWDIR%%/apps/sharebymail/l10n/pt_BR.json
+%%WWWDIR%%/apps/sharebymail/l10n/ru.js
+%%WWWDIR%%/apps/sharebymail/l10n/ru.json
+%%WWWDIR%%/apps/sharebymail/l10n/sk_SK.js
+%%WWWDIR%%/apps/sharebymail/l10n/sk_SK.json
+%%WWWDIR%%/apps/sharebymail/l10n/zh_CN.js
+%%WWWDIR%%/apps/sharebymail/l10n/zh_CN.json
 %%WWWDIR%%/apps/sharebymail/lib/Activity.php
 %%WWWDIR%%/apps/sharebymail/lib/Settings.php
 %%WWWDIR%%/apps/sharebymail/lib/ShareByMailProvider.php
@@ -8005,6 +8044,8 @@
 %%WWWDIR%%/apps/twofactor_backupcodes/l10n/ja.json
 %%WWWDIR%%/apps/twofactor_backupcodes/l10n/ko.js
 %%WWWDIR%%/apps/twofactor_backupcodes/l10n/ko.json
+%%WWWDIR%%/apps/twofactor_backupcodes/l10n/lv.js
+%%WWWDIR%%/apps/twofactor_backupcodes/l10n/lv.json
 %%WWWDIR%%/apps/twofactor_backupcodes/l10n/nb_NO.js
 %%WWWDIR%%/apps/twofactor_backupcodes/l10n/nb_NO.json
 %%WWWDIR%%/apps/twofactor_backupcodes/l10n/nl.js
@@ -8088,6 +8129,8 @@
 %%WWWDIR%%/apps/updatenotification/l10n/hu_HU.json
 %%WWWDIR%%/apps/updatenotification/l10n/id.js
 %%WWWDIR%%/apps/updatenotification/l10n/id.json
+%%WWWDIR%%/apps/updatenotification/l10n/ia.js
+%%WWWDIR%%/apps/updatenotification/l10n/ia.json
 %%WWWDIR%%/apps/updatenotification/l10n/is.js
 %%WWWDIR%%/apps/updatenotification/l10n/is.json
 %%WWWDIR%%/apps/updatenotification/l10n/it.js
@@ -8100,6 +8143,8 @@
 %%WWWDIR%%/apps/updatenotification/l10n/lb.json
 %%WWWDIR%%/apps/updatenotification/l10n/lt_LT.js
 %%WWWDIR%%/apps/updatenotification/l10n/lt_LT.json
+%%WWWDIR%%/apps/updatenotification/l10n/lv.js
+%%WWWDIR%%/apps/updatenotification/l10n/lv.json
 %%WWWDIR%%/apps/updatenotification/l10n/mk.js
 %%WWWDIR%%/apps/updatenotification/l10n/mk.json
 %%WWWDIR%%/apps/updatenotification/l10n/nb_NO.js
@@ -8431,6 +8476,7 @@
 %%WWWDIR%%/apps/user_ldap/lib/Command/TestConfig.php
 %%WWWDIR%%/apps/user_ldap/lib/Configuration.php
 %%WWWDIR%%/apps/user_ldap/lib/Connection.php
+%%WWWDIR%%/apps/user_ldap/lib/Controller/ConfigAPIController.php
 %%WWWDIR%%/apps/user_ldap/lib/Exceptions/ConstraintViolationException.php
 %%WWWDIR%%/apps/user_ldap/lib/Exceptions/NotOnLDAP.php
 %%WWWDIR%%/apps/user_ldap/lib/FilesystemHelper.php
@@ -8449,6 +8495,10 @@
 %%WWWDIR%%/apps/user_ldap/lib/Mapping/AbstractMapping.php
 %%WWWDIR%%/apps/user_ldap/lib/Mapping/GroupMapping.php
 %%WWWDIR%%/apps/user_ldap/lib/Mapping/UserMapping.php
+%%WWWDIR%%/apps/user_ldap/lib/Migration/UUIDFix.php
+%%WWWDIR%%/apps/user_ldap/lib/Migration/UUIDFixGroup.php
+%%WWWDIR%%/apps/user_ldap/lib/Migration/UUIDFixInsert.php
+%%WWWDIR%%/apps/user_ldap/lib/Migration/UUIDFixUser.php
 %%WWWDIR%%/apps/user_ldap/lib/Proxy.php
 %%WWWDIR%%/apps/user_ldap/lib/Settings/Admin.php
 %%WWWDIR%%/apps/user_ldap/lib/Settings/Section.php
@@ -8602,6 +8652,8 @@
 %%WWWDIR%%/apps/workflowengine/l10n/it.json
 %%WWWDIR%%/apps/workflowengine/l10n/ja.js
 %%WWWDIR%%/apps/workflowengine/l10n/ja.json
+%%WWWDIR%%/apps/workflowengine/l10n/lv.js
+%%WWWDIR%%/apps/workflowengine/l10n/lv.json
 %%WWWDIR%%/apps/workflowengine/l10n/nb_NO.js
 %%WWWDIR%%/apps/workflowengine/l10n/nb_NO.json
 %%WWWDIR%%/apps/workflowengine/l10n/nl.js
@@ -8618,6 +8670,8 @@
 %%WWWDIR%%/apps/workflowengine/l10n/sq.json
 %%WWWDIR%%/apps/workflowengine/l10n/sv.js
 %%WWWDIR%%/apps/workflowengine/l10n/sv.json
+%%WWWDIR%%/apps/workflowengine/l10n/zh_CN.js
+%%WWWDIR%%/apps/workflowengine/l10n/zh_CN.json
 %%WWWDIR%%/apps/workflowengine/l10n/zh_TW.js
 %%WWWDIR%%/apps/workflowengine/l10n/zh_TW.json
 %%WWWDIR%%/apps/workflowengine/lib/AppInfo/Application.php
@@ -8636,7 +8690,7 @@
 %%WWWDIR%%/apps/workflowengine/lib/Settings/Section.php
 %%WWWDIR%%/apps/workflowengine/templates/admin.php
 %%WWWDIR%%/config/.htaccess
-@sample %%WWWDIR%%/config/config.sample.php %%WWWDIR%%/config/config.php
+%%WWWDIR%%/config/config.sample.php
 @owner
 @group
 %%WWWDIR%%/console.php
@@ -9174,15 +9228,6 @@
 %%WWWDIR%%/core/doc/user/_images/gallery-1.png
 %%WWWDIR%%/core/doc/user/_images/gallery-2.png
 %%WWWDIR%%/core/doc/user/_images/hidden_files.png
-%%WWWDIR%%/core/doc/user/_images/kdes.png
-%%WWWDIR%%/core/doc/user/_images/kdes1.png
-%%WWWDIR%%/core/doc/user/_images/kdes2.png
-%%WWWDIR%%/core/doc/user/_images/kdes3.png
-%%WWWDIR%%/core/doc/user/_images/kdes4.png
-%%WWWDIR%%/core/doc/user/_images/kdes5.png
-%%WWWDIR%%/core/doc/user/_images/kdes6.png
-%%WWWDIR%%/core/doc/user/_images/kdes7.png
-%%WWWDIR%%/core/doc/user/_images/kdes9.png
 %%WWWDIR%%/core/doc/user/_images/oc_connect.png
 %%WWWDIR%%/core/doc/user/_images/oc_personal_settings_dropdown.png
 %%WWWDIR%%/core/doc/user/_images/osx_webdav1.png
@@ -9217,7 +9262,6 @@
 %%WWWDIR%%/core/doc/user/_sources/pim/contacts.txt
 %%WWWDIR%%/core/doc/user/_sources/pim/index.txt
 %%WWWDIR%%/core/doc/user/_sources/pim/sync_ios.txt
-%%WWWDIR%%/core/doc/user/_sources/pim/sync_kde.txt
 %%WWWDIR%%/core/doc/user/_sources/pim/sync_osx.txt
 %%WWWDIR%%/core/doc/user/_sources/pim/sync_thunderbird.txt
 %%WWWDIR%%/core/doc/user/_sources/pim/troubleshooting.txt
@@ -9335,7 +9379,6 @@
 %%WWWDIR%%/core/doc/user/pim/contacts.html
 %%WWWDIR%%/core/doc/user/pim/index.html
 %%WWWDIR%%/core/doc/user/pim/sync_ios.html
-%%WWWDIR%%/core/doc/user/pim/sync_kde.html
 %%WWWDIR%%/core/doc/user/pim/sync_osx.html
 %%WWWDIR%%/core/doc/user/pim/sync_thunderbird.html
 %%WWWDIR%%/core/doc/user/pim/troubleshooting.html
@@ -9413,6 +9456,10 @@
 %%WWWDIR%%/core/img/actions/radio-white.svg
 %%WWWDIR%%/core/img/actions/radio.svg
 %%WWWDIR%%/core/img/actions/rename.svg
+%%WWWDIR%%/core/img/actions/screen-off-white.svg
+%%WWWDIR%%/core/img/actions/screen-off.svg
+%%WWWDIR%%/core/img/actions/screen-white.svg
+%%WWWDIR%%/core/img/actions/screen.svg
 %%WWWDIR%%/core/img/actions/search-white.svg
 %%WWWDIR%%/core/img/actions/search.svg
 %%WWWDIR%%/core/img/actions/settings.svg
@@ -9578,6 +9625,8 @@
 %%WWWDIR%%/core/js/visitortimezone.js
 %%WWWDIR%%/core/l10n/bg_BG.js
 %%WWWDIR%%/core/l10n/bg_BG.json
+%%WWWDIR%%/core/l10n/ca.js
+%%WWWDIR%%/core/l10n/ca.json
 %%WWWDIR%%/core/l10n/cs_CZ.js
 %%WWWDIR%%/core/l10n/cs_CZ.json
 %%WWWDIR%%/core/l10n/da.js
@@ -9592,6 +9641,8 @@
 %%WWWDIR%%/core/l10n/en_GB.json
 %%WWWDIR%%/core/l10n/es.js
 %%WWWDIR%%/core/l10n/es.json
+%%WWWDIR%%/core/l10n/eu.js
+%%WWWDIR%%/core/l10n/eu.json
 %%WWWDIR%%/core/l10n/fi_FI.js
 %%WWWDIR%%/core/l10n/fi_FI.json
 %%WWWDIR%%/core/l10n/fr.js
@@ -9610,6 +9661,8 @@
 %%WWWDIR%%/core/l10n/ja.json
 %%WWWDIR%%/core/l10n/ko.js
 %%WWWDIR%%/core/l10n/ko.json
+%%WWWDIR%%/core/l10n/lv.js
+%%WWWDIR%%/core/l10n/lv.json
 %%WWWDIR%%/core/l10n/nb_NO.js
 %%WWWDIR%%/core/l10n/nb_NO.json
 %%WWWDIR%%/core/l10n/nl.js
@@ -9685,6 +9738,9 @@
 %%WWWDIR%%/core/templates/update.use-cli.php
 %%WWWDIR%%/core/templates/update.user.php
 %%WWWDIR%%/core/vendor/.gitignore
+%%WWWDIR%%/core/vendor/DOMPurify/.bower.json
+%%WWWDIR%%/core/vendor/DOMPurify/LICENSE
+%%WWWDIR%%/core/vendor/DOMPurify/dist/purify.min.js
 %%WWWDIR%%/core/vendor/autosize/.bower.json
 %%WWWDIR%%/core/vendor/autosize/LICENSE.md
 %%WWWDIR%%/core/vendor/autosize/dist/autosize.js
@@ -9730,6 +9786,9 @@
 %%WWWDIR%%/core/vendor/jsTimezoneDetect/.bower.json
 %%WWWDIR%%/core/vendor/jsTimezoneDetect/LICENCE.txt
 %%WWWDIR%%/core/vendor/jsTimezoneDetect/jstz.js
+%%WWWDIR%%/core/vendor/marked/.bower.json
+%%WWWDIR%%/core/vendor/marked/LICENSE
+%%WWWDIR%%/core/vendor/marked/marked.min.js
 %%WWWDIR%%/core/vendor/moment/.bower.json
 %%WWWDIR%%/core/vendor/moment/LICENSE
 %%WWWDIR%%/core/vendor/moment/min/moment-with-locales.js
@@ -9773,18 +9832,28 @@
 %%WWWDIR%%/lib/composer/composer/installed.json
 %%WWWDIR%%/lib/l10n/bg_BG.js
 %%WWWDIR%%/lib/l10n/bg_BG.json
+%%WWWDIR%%/lib/l10n/ca.js
+%%WWWDIR%%/lib/l10n/ca.json
 %%WWWDIR%%/lib/l10n/cs_CZ.js
 %%WWWDIR%%/lib/l10n/cs_CZ.json
 %%WWWDIR%%/lib/l10n/de.js
 %%WWWDIR%%/lib/l10n/de.json
 %%WWWDIR%%/lib/l10n/de_DE.js
 %%WWWDIR%%/lib/l10n/de_DE.json
+%%WWWDIR%%/lib/l10n/el.js
+%%WWWDIR%%/lib/l10n/el.json
 %%WWWDIR%%/lib/l10n/es.js
 %%WWWDIR%%/lib/l10n/es.json
+%%WWWDIR%%/lib/l10n/eu.js
+%%WWWDIR%%/lib/l10n/eu.json
 %%WWWDIR%%/lib/l10n/fr.js
 %%WWWDIR%%/lib/l10n/fr.json
+%%WWWDIR%%/lib/l10n/he.js
+%%WWWDIR%%/lib/l10n/he.json
 %%WWWDIR%%/lib/l10n/hu_HU.js
 %%WWWDIR%%/lib/l10n/hu_HU.json
+%%WWWDIR%%/lib/l10n/is.js
+%%WWWDIR%%/lib/l10n/is.json
 %%WWWDIR%%/lib/l10n/it.js
 %%WWWDIR%%/lib/l10n/it.json
 %%WWWDIR%%/lib/l10n/ja.js
@@ -9805,6 +9874,8 @@
 %%WWWDIR%%/lib/l10n/sq.json
 %%WWWDIR%%/lib/l10n/sv.js
 %%WWWDIR%%/lib/l10n/sv.json
+%%WWWDIR%%/lib/l10n/zh_CN.js
+%%WWWDIR%%/lib/l10n/zh_CN.json
 %%WWWDIR%%/lib/l10n/zh_TW.js
 %%WWWDIR%%/lib/l10n/zh_TW.json
 %%WWWDIR%%/lib/private/Accounts/AccountManager.php
@@ -10662,6 +10733,8 @@
 %%WWWDIR%%/settings/l10n/hu_HU.json
 %%WWWDIR%%/settings/l10n/hy.js
 %%WWWDIR%%/settings/l10n/hy.json
+%%WWWDIR%%/settings/l10n/ia.js
+%%WWWDIR%%/settings/l10n/ia.json
 %%WWWDIR%%/settings/l10n/id.js
 %%WWWDIR%%/settings/l10n/id.json
 %%WWWDIR%%/settings/l10n/is.js
diff --git a/www/p5-CGI-FormBuilder/Makefile b/www/p5-CGI-FormBuilder/Makefile
index ef8a31e932c..e46d25402c6 100644
--- a/www/p5-CGI-FormBuilder/Makefile
+++ b/www/p5-CGI-FormBuilder/Makefile
@@ -2,12 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	CGI-FormBuilder
-PORTVERSION=	3.0900
-PORTREVISION=	1
+PORTVERSION=	3.1000
 CATEGORIES=	www perl5
 MASTER_SITES=	CPAN
 PKGNAMEPREFIX=	p5-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/00$//}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S|00$||}
 
 MAINTAINER=	perl@FreeBSD.org
 COMMENT=	FormBuilder for CGI
@@ -18,8 +17,9 @@ LICENSE_COMB=	dual
 BUILD_DEPENDS=	p5-CGI>=0:www/p5-CGI
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
+NO_ARCH=	yes
 USE_PERL5=	configure
-USES=		perl5 tar:tgz
+USES=		perl5
 
 # Follow upstream order in Makefile.PL
 OPTIONS_DEFINE=	HTML_TEMPLATE TEXT_TEMPLATE TEMPLATE CGI_FAST_TEMPLATE CGI_SSI CGI_SESSION
diff --git a/www/p5-CGI-FormBuilder/distinfo b/www/p5-CGI-FormBuilder/distinfo
index ff3297e962f..9595605a375 100644
--- a/www/p5-CGI-FormBuilder/distinfo
+++ b/www/p5-CGI-FormBuilder/distinfo
@@ -1,2 +1,3 @@
-SHA256 (CGI-FormBuilder-3.09.tgz) = 654907527717c3bbb169c739a9a817f14552054619ab3c93d6a5f808649fa863
-SIZE (CGI-FormBuilder-3.09.tgz) = 163526
+TIMESTAMP = 1488738204
+SHA256 (CGI-FormBuilder-3.10.tar.gz) = aec99be0c0f067a7e7269c5378e5ae6c8d7dd39b368b4f12c0d8463b13ee7198
+SIZE (CGI-FormBuilder-3.10.tar.gz) = 162346
diff --git a/www/pecl-yar1/Makefile b/www/pecl-yar1/Makefile
index d1371965088..2c63a3c0890 100644
--- a/www/pecl-yar1/Makefile
+++ b/www/pecl-yar1/Makefile
@@ -7,6 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://pecl.php.net/get/
 PKGNAMEPREFIX=	pecl-
+PKGNAMESUFFIX=	1
 DIST_SUBDIR=	PECL
 
 MAINTAINER=	johnpupu@gmail.com
diff --git a/www/py-cssutils/Makefile b/www/py-cssutils/Makefile
index 61226c81a40..2ada7e6c99a 100644
--- a/www/py-cssutils/Makefile
+++ b/www/py-cssutils/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cssutils
-PORTVERSION=	1.0.1
+PORTVERSION=	1.0.2
 PORTEPOCH=	1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
@@ -11,7 +11,10 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	CSS Cascading Style Sheets library for Python
 
-LICENSE=	LGPL3
+LICENSE=	GPLv3 LGPL3
+LICENSE_COMB=	dual
+LICENSE_FILE_GPLv3=	${WRKSRC}/COPYING
+LICENSE_FILE_LGPL3=	${WRKSRC}/COPYING.LESSER
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/www/py-cssutils/distinfo b/www/py-cssutils/distinfo
index 43e79e1a32b..152a5f44893 100644
--- a/www/py-cssutils/distinfo
+++ b/www/py-cssutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1483301668
-SHA256 (cssutils-1.0.1.tar.gz) = d8a18b2848ea1011750231f1dd64fe9053dbec1be0b37563c582561e7a529063
-SIZE (cssutils-1.0.1.tar.gz) = 353621
+TIMESTAMP = 1488737589
+SHA256 (cssutils-1.0.2.tar.gz) = a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf
+SIZE (cssutils-1.0.2.tar.gz) = 367038
diff --git a/www/rubygem-deckar01-task_list/Makefile b/www/rubygem-deckar01-task_list/Makefile
new file mode 100644
index 00000000000..ba1655d82c7
--- /dev/null
+++ b/www/rubygem-deckar01-task_list/Makefile
@@ -0,0 +1,22 @@
+# $FreeBSD$
+
+PORTNAME=	deckar01-task_list
+PORTVERSION=	1.0.6
+CATEGORIES=	www rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	ruby@FreeBSD.org
+COMMENT=	Markdown TaskList components
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+RUN_DEPENDS=	rubygem-html-pipeline1>=0:textproc/rubygem-html-pipeline1 \
+		rubygem-activesupport4>=4.0:devel/rubygem-activesupport4 \
+		rubygem-rack16>=1.0:www/rubygem-rack16
+
+NO_ARCH=	yes
+USE_RUBY=	yes
+USES=		gem
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-deckar01-task_list/distinfo b/www/rubygem-deckar01-task_list/distinfo
new file mode 100644
index 00000000000..ffb2de584a8
--- /dev/null
+++ b/www/rubygem-deckar01-task_list/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1488795535
+SHA256 (rubygem/deckar01-task_list-1.0.6.gem) = 38dbe6fcffebee34dd1661439657717b6f341e3f4a60abd369ea9cbc8892cb59
+SIZE (rubygem/deckar01-task_list-1.0.6.gem) = 17920
diff --git a/www/rubygem-deckar01-task_list/pkg-descr b/www/rubygem-deckar01-task_list/pkg-descr
new file mode 100644
index 00000000000..033dd0cdee2
--- /dev/null
+++ b/www/rubygem-deckar01-task_list/pkg-descr
@@ -0,0 +1,4 @@
+Provides various components necessary for integrating Task Lists
+into GitHub-flavored-Markdown user content.
+
+WWW: https://github.com/deckar01/task_list
diff --git a/www/rubygem-gitlab-turbolinks-classic/Makefile b/www/rubygem-gitlab-turbolinks-classic/Makefile
new file mode 100644
index 00000000000..4393bcba615
--- /dev/null
+++ b/www/rubygem-gitlab-turbolinks-classic/Makefile
@@ -0,0 +1,20 @@
+# $FreeBSD$
+
+PORTNAME=	gitlab-turbolinks-classic
+PORTVERSION=	2.5.6
+CATEGORIES=	www rubygems
+MASTER_SITES=	RG
+
+MAINTAINER=	ruby@FreeBSD.org
+COMMENT=	Turbolinks makes following links in your web application faster
+
+LICENSE=	MIT
+LICENSE_FILE=	${WRKSRC}/MIT-LICENSE
+
+RUN_DEPENDS?=	rubygem-coffee-rails4>=4.0.1:devel/rubygem-coffee-rails4
+
+NO_ARCH=	yes
+USE_RUBY=	yes
+USES=		gem
+
+.include <bsd.port.mk>
diff --git a/www/rubygem-gitlab-turbolinks-classic/distinfo b/www/rubygem-gitlab-turbolinks-classic/distinfo
new file mode 100644
index 00000000000..cf222b16b5e
--- /dev/null
+++ b/www/rubygem-gitlab-turbolinks-classic/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1488794275
+SHA256 (rubygem/gitlab-turbolinks-classic-2.5.6.gem) = 2acb127904192ecf1a072c6b2926d65f4cb6487a2ff2dd7df80c427583e2d8fd
+SIZE (rubygem/gitlab-turbolinks-classic-2.5.6.gem) = 22016
diff --git a/www/rubygem-gitlab-turbolinks-classic/pkg-descr b/www/rubygem-gitlab-turbolinks-classic/pkg-descr
new file mode 100644
index 00000000000..8c5d9ea0109
--- /dev/null
+++ b/www/rubygem-gitlab-turbolinks-classic/pkg-descr
@@ -0,0 +1,4 @@
+Turbolinks makes following links in your web application faster (use with Rails
+Asset Pipeline)
+
+WWW: https://gitlab.com/jamedjo/gitlab-turbolinks-classic/
diff --git a/www/rubygem-uglifier/Makefile b/www/rubygem-uglifier/Makefile
index 464afcdff5e..6151e809fbf 100644
--- a/www/rubygem-uglifier/Makefile
+++ b/www/rubygem-uglifier/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	uglifier
-PORTVERSION=	3.1.3
+PORTVERSION=	3.1.4
 CATEGORIES=	www rubygems
 MASTER_SITES=	RG
 
diff --git a/www/rubygem-uglifier/distinfo b/www/rubygem-uglifier/distinfo
index 27cff479af0..562e261814d 100644
--- a/www/rubygem-uglifier/distinfo
+++ b/www/rubygem-uglifier/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1488533293
-SHA256 (rubygem/uglifier-3.1.3.gem) = 54161e37cae0e2e2a78439b8ce7b777824b67ee74e7659f5fa0495ae8d120c93
-SIZE (rubygem/uglifier-3.1.3.gem) = 97792
+TIMESTAMP = 1488809798
+SHA256 (rubygem/uglifier-3.1.4.gem) = a1c010374479eb77bb7501bb1ea30c5d5fb0f854ded1f9dd41904f2088394dd5
+SIZE (rubygem/uglifier-3.1.4.gem) = 98304
diff --git a/www/seahub/Makefile b/www/seahub/Makefile
index ffa1b3b79b0..bb5df6e3fc8 100644
--- a/www/seahub/Makefile
+++ b/www/seahub/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	seahub
-PORTVERSION=	6.0.7
+PORTVERSION=	6.0.8
 DISTVERSIONPREFIX=	v
 DISTVERSIONSUFFIX=	-pro
 CATEGORIES=	www
diff --git a/www/seahub/distinfo b/www/seahub/distinfo
index b6e6b58b725..1e21fa307f0 100644
--- a/www/seahub/distinfo
+++ b/www/seahub/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484783739
-SHA256 (haiwen-seahub-v6.0.7-pro_GH0.tar.gz) = 7c8be740863ea476b1c4409ae23b88b3113d437dc3f8c53c81ad07169f9a20e8
-SIZE (haiwen-seahub-v6.0.7-pro_GH0.tar.gz) = 8450209
+TIMESTAMP = 1488637676
+SHA256 (haiwen-seahub-v6.0.8-pro_GH0.tar.gz) = a43c64dd8e2f94b03b60299e50f05f3b33fb8694a8034e796a287b3c48ae463b
+SIZE (haiwen-seahub-v6.0.8-pro_GH0.tar.gz) = 8384514
diff --git a/www/seahub/pkg-plist b/www/seahub/pkg-plist
index 369bdea9f90..a6c6c7abd82 100644
--- a/www/seahub/pkg-plist
+++ b/www/seahub/pkg-plist
@@ -31,6 +31,8 @@
 %%SEAHUBDIR%%/locale/es_AR/LC_MESSAGES/djangojs.po
 %%SEAHUBDIR%%/locale/es_MX/LC_MESSAGES/django.po
 %%SEAHUBDIR%%/locale/es_MX/LC_MESSAGES/djangojs.po
+%%SEAHUBDIR%%/locale/fi/LC_MESSAGES/django.po
+%%SEAHUBDIR%%/locale/fi/LC_MESSAGES/djangojs.po
 %%SEAHUBDIR%%/locale/fr/LC_MESSAGES/django.po
 %%SEAHUBDIR%%/locale/fr/LC_MESSAGES/djangojs.po
 %%SEAHUBDIR%%/locale/he/LC_MESSAGES/django.po
@@ -97,6 +99,7 @@
 %%SEAHUBDIR%%/media/assets/scripts/app/collections/activities.js
 %%SEAHUBDIR%%/media/assets/scripts/app/collections/devices.ce46433dc2f6.js
 %%SEAHUBDIR%%/media/assets/scripts/app/collections/devices.js
+%%SEAHUBDIR%%/media/assets/scripts/app/collections/dirents.1b18e06eb541.js
 %%SEAHUBDIR%%/media/assets/scripts/app/collections/dirents.js
 %%SEAHUBDIR%%/media/assets/scripts/app/collections/group-discussions.44e990cae2b8.js
 %%SEAHUBDIR%%/media/assets/scripts/app/collections/group-discussions.js
@@ -160,6 +163,7 @@
 %%SEAHUBDIR%%/media/assets/scripts/app/models/share-admin-upload-link.js
 %%SEAHUBDIR%%/media/assets/scripts/app/models/starred-file.bd1fd7cfed45.js
 %%SEAHUBDIR%%/media/assets/scripts/app/models/starred-file.js
+%%SEAHUBDIR%%/media/assets/scripts/app/router.c04d90f490b8.js
 %%SEAHUBDIR%%/media/assets/scripts/app/router.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/account.85f0cf2e10b8.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/account.js
@@ -167,12 +171,15 @@
 %%SEAHUBDIR%%/media/assets/scripts/app/views/activities.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/activity-item.bea485958936.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/activity-item.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/add-group-repo.54094112928d.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/add-group-repo.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/add-pub-repo.6e432a7b9e31.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/add-pub-repo.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/add-pubrepo-item.83b33d2ec341.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/add-pubrepo-item.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/add-repo.2f36e08971d2.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/add-repo.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/create-pub-repo.1e0da660b6c5.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/create-pub-repo.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/details.98bb9832bb1a.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/details.js
@@ -180,6 +187,7 @@
 %%SEAHUBDIR%%/media/assets/scripts/app/views/device.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/devices.f7a71c76de30.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/devices.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/dirent-mvcp.77762360ffbf.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/dirent-mvcp.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/dirent-rename.70f40b075170.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/dirent-rename.js
@@ -191,9 +199,13 @@
 %%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/repo-history-settings.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/repo-share-link-admin.8637bf1be968.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/repo-share-link-admin.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/dir.0138a48429e3.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/dir.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/dirent-grid.1a0e612517e8.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/dirent-grid.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/dirent.7724e9f38f4c.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/dirent.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/fileupload.4f9ef2481950.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/fileupload.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/folder-perm-item.82219b903356.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/folder-perm-item.js
@@ -209,7 +221,7 @@
 %%SEAHUBDIR%%/media/assets/scripts/app/views/group-item.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/group-manage-member.365797e94e66.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/group-manage-member.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/group-manage-members.26c3fd20be85.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/group-manage-members.f046ab1d5855.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/group-manage-members.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/group-member.4ab6f561f5b1.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/group-member.js
@@ -217,8 +229,9 @@
 %%SEAHUBDIR%%/media/assets/scripts/app/views/group-members.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/group-repo.4340a46fb87f.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/group-repo.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/group-settings.5a62968bd674.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/group-settings.29f1bf52d581.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/group-settings.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/group.5a0bfc0e312a.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/group.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/groups.d73e0007af34.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/groups.js
@@ -226,12 +239,15 @@
 %%SEAHUBDIR%%/media/assets/scripts/app/views/invitation.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/invitations.35464fc14b02.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/invitations.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/myhome-repos.7f7e119f5c94.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/myhome-repos.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/myhome-shared-repos.0c824a198fc0.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/myhome-shared-repos.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/notifications.465782b64984.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/notifications.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/organization-repo.d94ba26c26d1.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/organization-repo.js
+%%SEAHUBDIR%%/media/assets/scripts/app/views/organization.f2b8e14eb3f3.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/organization.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/repo-folder-perm.d70918b7033c.js
 %%SEAHUBDIR%%/media/assets/scripts/app/views/repo-folder-perm.js
@@ -273,8 +289,10 @@
 %%SEAHUBDIR%%/media/assets/scripts/app/views/widgets/popover.js
 %%SEAHUBDIR%%/media/assets/scripts/build.a0552a4ed8dc.js
 %%SEAHUBDIR%%/media/assets/scripts/build.js
+%%SEAHUBDIR%%/media/assets/scripts/common.94794a54a518.js
 %%SEAHUBDIR%%/media/assets/scripts/common.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/build.d9508a510082.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/build.fbecce5c5594.txt
 %%SEAHUBDIR%%/media/assets/scripts/dist/build.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/build.txt
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/ca/djangojs.c2528b8e21fb.js
@@ -289,6 +307,8 @@
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es-mx/djangojs.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es/djangojs.a07b2b70fbfa.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/es/djangojs.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fi/djangojs.3a52c64c31bf.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fi/djangojs.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fr/djangojs.a74d8ba43e70.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fr/djangojs.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/he/djangojs.648b3fd2ae90.js
@@ -331,13 +351,15 @@
 %%SEAHUBDIR%%/media/assets/scripts/dist/i18n/zh-tw/djangojs.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/lib/require.75e6d0132deb.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/lib/require.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/main.0266ea23d08f.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/main.js
+%%SEAHUBDIR%%/media/assets/scripts/dist/sysadmin-main.4845ac08db81.js
 %%SEAHUBDIR%%/media/assets/scripts/dist/sysadmin-main.js
 %%SEAHUBDIR%%/media/assets/scripts/file-tree.225c1b52bbee.js
 %%SEAHUBDIR%%/media/assets/scripts/file-tree.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/ca/djangojs.0b7bde8db6d7.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/ca/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/i18n/de/djangojs.71d859f82fc8.js
+%%SEAHUBDIR%%/media/assets/scripts/i18n/de/djangojs.689c37649caf.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/de/djangojs.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/en/djangojs.4fef8f9a3076.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/en/djangojs.js
@@ -347,6 +369,9 @@
 %%SEAHUBDIR%%/media/assets/scripts/i18n/es-mx/djangojs.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/es/djangojs.4024777c311a.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/es/djangojs.js
+%%SEAHUBDIR%%/media/assets/scripts/i18n/fi/djangojs.8d877df126c1.js
+%%SEAHUBDIR%%/media/assets/scripts/i18n/fi/djangojs.js
+%%SEAHUBDIR%%/media/assets/scripts/i18n/fr/djangojs.77d8cedd5115.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/fr/djangojs.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/he/djangojs.f701701595f1.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/he/djangojs.js
@@ -362,9 +387,9 @@
 %%SEAHUBDIR%%/media/assets/scripts/i18n/ko/djangojs.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/lv/djangojs.378231a600de.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/lv/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/i18n/nl/djangojs.9abe7982c380.js
+%%SEAHUBDIR%%/media/assets/scripts/i18n/nl/djangojs.b7b7f3fc6ebd.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/nl/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/i18n/pl/djangojs.1c1364ed92eb.js
+%%SEAHUBDIR%%/media/assets/scripts/i18n/pl/djangojs.e4fdeeb33a06.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/pl/djangojs.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/pt-br/djangojs.0f4d93b902dc.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/pt-br/djangojs.js
@@ -382,7 +407,7 @@
 %%SEAHUBDIR%%/media/assets/scripts/i18n/tr/djangojs.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/uk/djangojs.6e7dad71790d.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/uk/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/i18n/zh-cn/djangojs.53fa30662fde.js
+%%SEAHUBDIR%%/media/assets/scripts/i18n/zh-cn/djangojs.df38cef92053.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/zh-cn/djangojs.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/zh-tw/djangojs.7a3f17ce6df0.js
 %%SEAHUBDIR%%/media/assets/scripts/i18n/zh-tw/djangojs.js
@@ -442,10 +467,16 @@
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/devices.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/dirents.7597b05d5ae1.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/dirents.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/group-members.81d9522e3e0e.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/group-members.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/group-repos.8cdf2c3b2964.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/group-repos.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/groups.58c03af01bab.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/groups.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/repos.da8363c28bdf.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/repos.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/search-groups.73a8835c617a.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/search-groups.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/search-repos.fdd17029d706.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/search-repos.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/collection/search-trash-repos.c40a5fb36795.js
@@ -460,9 +491,13 @@
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/device.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/dirent.3e11739a7edd.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/dirent.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/group-member.7b441252d770.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/group-member.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/group-repo.2f49e550851f.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/group-repo.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/group.730f1455b174.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/group.js
-%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/repo.17195e6a9338.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/repo.fd943053da33.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/repo.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/sysinfo.b8f278d86fba.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/sysinfo.js
@@ -470,7 +505,7 @@
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/system-repo.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/trash-repo.9d15a76965d4.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/models/trash-repo.js
-%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/router.ff2edafab191.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/router.3548ecfdd587.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/router.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/dashboard.d1d112f34d99.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/dashboard.js
@@ -488,6 +523,14 @@
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/dirent.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/folder-share-item.da4cf4aec01f.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/folder-share-item.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/group-member.e38424744e06.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/group-member.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/group-members.60e1de09f267.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/group-members.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/group-repo.ffb78c3023ea.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/group-repo.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/group-repos.a781bd7ea21a.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/group-repos.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/group.ad24c3aafb56.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/group.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/groups.fa0ec646281c.js
@@ -498,13 +541,15 @@
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/repo.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/repos.a46fb75254ba.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/repos.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/search-groups.b1a342937497.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/search-groups.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/search-repos.c79bb4de37d0.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/search-repos.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/search-trash-repos.0e629c870320.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/search-trash-repos.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/share.a4bf27bf31d9.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/share.js
-%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/side-nav.5b0e7e7ca529.js
+%%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/side-nav.25097aa15313.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/side-nav.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/system-repo.712a63b5453b.js
 %%SEAHUBDIR%%/media/assets/scripts/sysadmin-app/views/system-repo.js
@@ -547,6 +592,7 @@
 %%SEAHUBDIR%%/media/css/sf_font2/%%USERS%%-font2.ttf
 %%SEAHUBDIR%%/media/css/sf_font2/%%USERS%%-font2.woff
 %%SEAHUBDIR%%/media/css/spreadsheet_convert.css
+%%SEAHUBDIR%%/media/css/video-js.min.css
 %%SEAHUBDIR%%/media/img/add.png
 %%SEAHUBDIR%%/media/img/admin_in.png
 %%SEAHUBDIR%%/media/img/admin_out.png
@@ -640,22 +686,6 @@
 %%SEAHUBDIR%%/media/js/CryptoJS/components/lib-typedarrays-min.js
 %%SEAHUBDIR%%/media/js/CryptoJS/rollups/aes.js
 %%SEAHUBDIR%%/media/js/CryptoJS/rollups/sha1.js
-%%SEAHUBDIR%%/media/js/Viewer.js/ODFViewerPlugin.js
-%%SEAHUBDIR%%/media/js/Viewer.js/PluginLoader.js
-%%SEAHUBDIR%%/media/js/Viewer.js/TextLayerBuilder.js
-%%SEAHUBDIR%%/media/js/Viewer.js/images/texture.png
-%%SEAHUBDIR%%/media/js/Viewer.js/images/toolbarButton-download.png
-%%SEAHUBDIR%%/media/js/Viewer.js/images/toolbarButton-fullscreen.png
-%%SEAHUBDIR%%/media/js/Viewer.js/images/toolbarButton-menuArrows.png
-%%SEAHUBDIR%%/media/js/Viewer.js/images/toolbarButton-pageDown.png
-%%SEAHUBDIR%%/media/js/Viewer.js/images/toolbarButton-pageUp.png
-%%SEAHUBDIR%%/media/js/Viewer.js/images/toolbarButton-presentation.png
-%%SEAHUBDIR%%/media/js/Viewer.js/images/toolbarButton-zoomIn.png
-%%SEAHUBDIR%%/media/js/Viewer.js/images/toolbarButton-zoomOut.png
-%%SEAHUBDIR%%/media/js/Viewer.js/index.html
-%%SEAHUBDIR%%/media/js/Viewer.js/viewer.css
-%%SEAHUBDIR%%/media/js/Viewer.js/viewer.js
-%%SEAHUBDIR%%/media/js/Viewer.js/webodf.js
 %%SEAHUBDIR%%/media/js/base.js
 %%SEAHUBDIR%%/media/js/bootstrap.min.js
 %%SEAHUBDIR%%/media/js/editormd.min.js
@@ -697,6 +727,8 @@
 %%SEAHUBDIR%%/media/js/thingiview/stats.js
 %%SEAHUBDIR%%/media/js/thingiview/thingiloader.js
 %%SEAHUBDIR%%/media/js/thingiview/thingiview.js
+%%SEAHUBDIR%%/media/js/video-js.swf
+%%SEAHUBDIR%%/media/js/video.min.js
 %%SEAHUBDIR%%/media/rest_framework/css/bootstrap-tweaks.css
 %%SEAHUBDIR%%/media/rest_framework/css/bootstrap.min.css
 %%SEAHUBDIR%%/media/rest_framework/css/default.css
@@ -708,38 +740,6 @@
 %%SEAHUBDIR%%/media/rest_framework/js/default.js
 %%SEAHUBDIR%%/media/rest_framework/js/jquery-1.8.1-min.js
 %%SEAHUBDIR%%/media/rest_framework/js/prettify-min.js
-%%SEAHUBDIR%%/locale/fi/LC_MESSAGES/django.po
-%%SEAHUBDIR%%/locale/fi/LC_MESSAGES/djangojs.po
-%%SEAHUBDIR%%/media/assets/scripts/app/collections/dirents.1b18e06eb541.js
-%%SEAHUBDIR%%/media/assets/scripts/app/router.c04d90f490b8.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/add-group-repo.54094112928d.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/add-repo.2f36e08971d2.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/create-pub-repo.1e0da660b6c5.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/dialogs/dirent-mvcp.77762360ffbf.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/dir.a222baed34b7.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/dirent-grid.1a0e612517e8.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/dirent.7724e9f38f4c.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/fileupload.ecb0c1935018.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/group.5a0bfc0e312a.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/myhome-repos.7f7e119f5c94.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/myhome-shared-repos.0c824a198fc0.js
-%%SEAHUBDIR%%/media/assets/scripts/app/views/organization.f2b8e14eb3f3.js
-%%SEAHUBDIR%%/media/assets/scripts/common.65fe5b3bfef4.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/build.47e68614daea.txt
-%%SEAHUBDIR%%/media/assets/scripts/dist/sysadmin-main.fbb43c3b5181.js
-%%SEAHUBDIR%%/media/assets/scripts/i18n/fi/djangojs.8d877df126c1.js
-%%SEAHUBDIR%%/media/assets/scripts/i18n/fi/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fi/djangojs.3a52c64c31bf.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/i18n/fi/djangojs.js
-%%SEAHUBDIR%%/media/assets/scripts/dist/main.b064ed1a605c.js
-%%SEAHUBDIR%%/media/assets/scripts/i18n/fr/djangojs.b19b80108a06.js
-%%SEAHUBDIR%%/media/css/video-js.min.css
-%%SEAHUBDIR%%/media/js/video-js.swf
-%%SEAHUBDIR%%/media/js/video.min.js
-%%SEAHUBDIR%%/sql/oracle.sql
-%%SEAHUBDIR%%/tests/seahub/forms/test_add_user_form.py
-%%SEAHUBDIR%%/tests/seahub/utils/%%USERS%%-license.txt
-%%SEAHUBDIR%%/tests/seahub/utils/test_license_parse.py
 %%SEAHUBDIR%%/pylintrc
 %%SEAHUBDIR%%/pylintrc.template
 %%SEAHUBDIR%%/pytest.ini
@@ -752,10 +752,13 @@
 %%SEAHUBDIR%%/seahub/api2/endpoints/__init__.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/account.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/__init__.py
+%%SEAHUBDIR%%/seahub/api2/endpoints/admin/default_library.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/device_errors.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/devices.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/file_audit.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/file_update.py
+%%SEAHUBDIR%%/seahub/api2/endpoints/admin/group_libraries.py
+%%SEAHUBDIR%%/seahub/api2/endpoints/admin/group_members.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/groups.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/libraries.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/admin/library_dirents.py
@@ -769,7 +772,6 @@
 %%SEAHUBDIR%%/seahub/api2/endpoints/be_shared_repo.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/dir.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/dir_shared_items.py
-%%SEAHUBDIR%%/seahub/api2/endpoints/dirents_download_link.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/file.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/file_comment.py
 %%SEAHUBDIR%%/seahub/api2/endpoints/file_comments.py
@@ -1127,7 +1129,6 @@
 %%SEAHUBDIR%%/seahub/templates/sysadmin/repoadmin_js.html
 %%SEAHUBDIR%%/seahub/templates/sysadmin/settings.html
 %%SEAHUBDIR%%/seahub/templates/sysadmin/sudo_mode.html
-%%SEAHUBDIR%%/seahub/templates/sysadmin/sys_admin_group_info.html
 %%SEAHUBDIR%%/seahub/templates/sysadmin/sys_inst_admin.html
 %%SEAHUBDIR%%/seahub/templates/sysadmin/sys_inst_info_admins.html
 %%SEAHUBDIR%%/seahub/templates/sysadmin/sys_inst_info_base.html
@@ -1171,7 +1172,6 @@
 %%SEAHUBDIR%%/seahub/templates/view_file_document.html
 %%SEAHUBDIR%%/seahub/templates/view_file_image.html
 %%SEAHUBDIR%%/seahub/templates/view_file_markdown.html
-%%SEAHUBDIR%%/seahub/templates/view_file_opendocument.html
 %%SEAHUBDIR%%/seahub/templates/view_file_pdf.html
 %%SEAHUBDIR%%/seahub/templates/view_file_spreadsheet.html
 %%SEAHUBDIR%%/seahub/templates/view_file_svg.html
@@ -1206,6 +1206,7 @@
 %%SEAHUBDIR%%/seahub/utils/htmldiff.py
 %%SEAHUBDIR%%/seahub/utils/http.py
 %%SEAHUBDIR%%/seahub/utils/ip.py
+%%SEAHUBDIR%%/seahub/utils/ldap.py
 %%SEAHUBDIR%%/seahub/utils/licenseparse.py
 %%SEAHUBDIR%%/seahub/utils/logger.py
 %%SEAHUBDIR%%/seahub/utils/mail.py
@@ -1239,6 +1240,7 @@
 %%SEAHUBDIR%%/setenv.sh.template
 %%SEAHUBDIR%%/sql/README.md
 %%SEAHUBDIR%%/sql/mysql.sql
+%%SEAHUBDIR%%/sql/oracle.sql
 %%SEAHUBDIR%%/sql/sqlite3.sql
 %%SEAHUBDIR%%/static/css/bootstrap.min.css
 %%SEAHUBDIR%%/static/css/magnific-popup.css
@@ -1401,8 +1403,11 @@
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/collection/device-errors.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/collection/devices.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/collection/dirents.js
+%%SEAHUBDIR%%/static/scripts/sysadmin-app/collection/group-members.js
+%%SEAHUBDIR%%/static/scripts/sysadmin-app/collection/group-repos.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/collection/groups.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/collection/repos.js
+%%SEAHUBDIR%%/static/scripts/sysadmin-app/collection/search-groups.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/collection/search-repos.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/collection/search-trash-repos.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/collection/trash-repos.js
@@ -1410,6 +1415,8 @@
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/models/device-error.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/models/device.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/models/dirent.js
+%%SEAHUBDIR%%/static/scripts/sysadmin-app/models/group-member.js
+%%SEAHUBDIR%%/static/scripts/sysadmin-app/models/group-repo.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/models/group.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/models/repo.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/models/sysinfo.js
@@ -1424,11 +1431,16 @@
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/views/dir.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/views/dirent.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/views/folder-share-item.js
+%%SEAHUBDIR%%/static/scripts/sysadmin-app/views/group-member.js
+%%SEAHUBDIR%%/static/scripts/sysadmin-app/views/group-members.js
+%%SEAHUBDIR%%/static/scripts/sysadmin-app/views/group-repo.js
+%%SEAHUBDIR%%/static/scripts/sysadmin-app/views/group-repos.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/views/group.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/views/groups.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/views/mobile-devices.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/views/repo.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/views/repos.js
+%%SEAHUBDIR%%/static/scripts/sysadmin-app/views/search-groups.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/views/search-repos.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/views/search-trash-repos.js
 %%SEAHUBDIR%%/static/scripts/sysadmin-app/views/share.js
@@ -1443,10 +1455,13 @@
 %%SEAHUBDIR%%/tests/api/apitestbase.py
 %%SEAHUBDIR%%/tests/api/endpoints/__init__.py
 %%SEAHUBDIR%%/tests/api/endpoints/admin/__init__.py
+%%SEAHUBDIR%%/tests/api/endpoints/admin/test_default_library.py
 %%SEAHUBDIR%%/tests/api/endpoints/admin/test_device_errors.py
 %%SEAHUBDIR%%/tests/api/endpoints/admin/test_devices.py
 %%SEAHUBDIR%%/tests/api/endpoints/admin/test_file_audit_log.py
 %%SEAHUBDIR%%/tests/api/endpoints/admin/test_file_update_log.py
+%%SEAHUBDIR%%/tests/api/endpoints/admin/test_group_libraries.py
+%%SEAHUBDIR%%/tests/api/endpoints/admin/test_group_members.py
 %%SEAHUBDIR%%/tests/api/endpoints/admin/test_groups.py
 %%SEAHUBDIR%%/tests/api/endpoints/admin/test_login_log.py
 %%SEAHUBDIR%%/tests/api/endpoints/admin/test_perm_audit_log.py
@@ -1456,7 +1471,6 @@
 %%SEAHUBDIR%%/tests/api/endpoints/test_be_shared_repo.py
 %%SEAHUBDIR%%/tests/api/endpoints/test_dir_shared_items.py
 %%SEAHUBDIR%%/tests/api/endpoints/test_dir_view.py
-%%SEAHUBDIR%%/tests/api/endpoints/test_dirents_download_link.py
 %%SEAHUBDIR%%/tests/api/endpoints/test_file_comment.py
 %%SEAHUBDIR%%/tests/api/endpoints/test_file_comments.py
 %%SEAHUBDIR%%/tests/api/endpoints/test_file_comments_counts.py
@@ -1489,7 +1503,6 @@
 %%SEAHUBDIR%%/tests/api/test_default_repo.py
 %%SEAHUBDIR%%/tests/api/test_devices.py
 %%SEAHUBDIR%%/tests/api/test_dir.py
-%%SEAHUBDIR%%/tests/api/test_dir_download.py
 %%SEAHUBDIR%%/tests/api/test_dir_revert.py
 %%SEAHUBDIR%%/tests/api/test_dir_sub_repo.py
 %%SEAHUBDIR%%/tests/api/test_file_revert.py
@@ -1525,13 +1538,15 @@
 %%SEAHUBDIR%%/tests/seahub/base/templatetags/test_seahub_tags.py
 %%SEAHUBDIR%%/tests/seahub/base/test_accounts.py
 %%SEAHUBDIR%%/tests/seahub/base/test_models.py
+%%SEAHUBDIR%%/tests/seahub/forms/test_add_user_form.py
 %%SEAHUBDIR%%/tests/seahub/group/views/test_group.py
 %%SEAHUBDIR%%/tests/seahub/group/views/test_group_check.py
 %%SEAHUBDIR%%/tests/seahub/institutions/test_views.py
 %%SEAHUBDIR%%/tests/seahub/invitations/__init__.py
 %%SEAHUBDIR%%/tests/seahub/invitations/test_models.py
-%%SEAHUBDIR%%/tests/seahub/invitations/test_views.py
 %%SEAHUBDIR%%/tests/seahub/invitations/test_utils.py
+%%SEAHUBDIR%%/tests/seahub/invitations/test_views.py
+%%SEAHUBDIR%%/tests/seahub/notifications/management/commands/test_notify_admins_on_virus.py
 %%SEAHUBDIR%%/tests/seahub/notifications/management/commands/test_send_notices.py
 %%SEAHUBDIR%%/tests/seahub/notifications/test_models.py
 %%SEAHUBDIR%%/tests/seahub/options/__init__.py
@@ -1545,14 +1560,18 @@
 %%SEAHUBDIR%%/tests/seahub/registraion/__init__.py
 %%SEAHUBDIR%%/tests/seahub/registraion/test_can_email_admins_on_registration.py
 %%SEAHUBDIR%%/tests/seahub/registraion/tests.py
+%%SEAHUBDIR%%/tests/seahub/role_permissions/test_utils.py
 %%SEAHUBDIR%%/tests/seahub/share/test_decorators.py
 %%SEAHUBDIR%%/tests/seahub/share/views/test_send_shared_link.py
 %%SEAHUBDIR%%/tests/seahub/share/views/test_send_shared_upload_link.py
 %%SEAHUBDIR%%/tests/seahub/test_accounts.py
 %%SEAHUBDIR%%/tests/seahub/thirdpart/shibboleth/test_backends.py
 %%SEAHUBDIR%%/tests/seahub/thirdpart/shibboleth/test_middleware.py
+%%SEAHUBDIR%%/tests/seahub/utils/%%USERS%%-license.txt
 %%SEAHUBDIR%%/tests/seahub/utils/test_file_size.py
+%%SEAHUBDIR%%/tests/seahub/utils/test_license_parse.py
 %%SEAHUBDIR%%/tests/seahub/utils/test_repo.py
+%%SEAHUBDIR%%/tests/seahub/utils/test_user_permissions.py
 %%SEAHUBDIR%%/tests/seahub/views/__init__.py
 %%SEAHUBDIR%%/tests/seahub/views/ajax/test_get_dirents.py
 %%SEAHUBDIR%%/tests/seahub/views/ajax/test_get_file_upload_url_ul.py
@@ -1596,8 +1615,6 @@
 %%SEAHUBDIR%%/tests/seahub/views/test_list_lib_dir.py
 %%SEAHUBDIR%%/tests/seahub/views/wiki/test_personal_wiki.py
 %%SEAHUBDIR%%/tests/seahubtests.sh
-%%SEAHUBDIR%%/tests/seahub/role_permissions/test_utils.py
-%%SEAHUBDIR%%/tests/seahub/utils/test_user_permissions.py
 %%SEAHUBDIR%%/tests/ui/__init__.py
 %%SEAHUBDIR%%/tests/ui/conftest.py
 %%SEAHUBDIR%%/tests/ui/driver.py
@@ -1754,18 +1771,18 @@
 @owner %%USERS%%
 @group %%GROUPS%%
 %%SEAFILE_SERVER%%/runtime/seahub.conf
-%%SEAFILE_SERVER%%/seahub/setenv.sh
-%%SEAFILE_SERVER%%/seahub/run-seahub.sh
-%%SEAFILE_SERVER%%/seahub/send_user_notifications.sh
+%%SEAHUBDIR%%/setenv.sh
+%%SEAHUBDIR%%/run-seahub.sh
+%%SEAHUBDIR%%/send_user_notifications.sh
 %%SEAHUBDIR%%/media/avatars
 %%HAIWENDIR%%/seahub-data/avatars/default-non-register.jpg
 %%HAIWENDIR%%/seahub-data/avatars/default.png
 %%HAIWENDIR%%/seahub-data/avatars/groups/default.png
-%%SEAFILE_SERVER%%/seahub/seahub/settings.py
+%%SEAHUBDIR%%/seahub/settings.py
 @owner
 @group
 @dir(%%USERS%%,%%GROUPS%%,755) %%SEAFILE_SERVER%%/runtime
-@dir(%%USERS%%,%%GROUPS%%,755) %%SEAFILE_SERVER%%/seahub
+@dir(%%USERS%%,%%GROUPS%%,755) %%SEAHUBDIR%%
 @dir(%%USERS%%,%%GROUPS%%,755) %%HAIWENDIR%%
 @dir(%%USERS%%,%%GROUPS%%,755) %%SEAHUBDIR%%/media
 @dir(%%USERS%%,%%GROUPS%%,755) %%HAIWENDIR%%/seahub-data
diff --git a/x11-drivers/xf86-video-intel/Makefile b/x11-drivers/xf86-video-intel/Makefile
index 150b5f187ed..218ee4e3c87 100644
--- a/x11-drivers/xf86-video-intel/Makefile
+++ b/x11-drivers/xf86-video-intel/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	xf86-video-intel
-PORTVERSION=	2.99.917.20170103
+PORTVERSION=	2.99.917.20170228
 CATEGORIES=	x11-drivers
 MASTER_SITES=	http://cgit.freedesktop.org/xorg/${XORG_CAT}/${PORTNAME}/snapshot/
 DISTNAME=	${PORTNAME}-${COMMIT_ID}
@@ -10,10 +10,13 @@ DISTNAME=	${PORTNAME}-${COMMIT_ID}
 MAINTAINER=	x11@FreeBSD.org
 COMMENT=	Driver for Intel integrated graphics chipsets
 
+LICENSE=	MIT	# various
+LICENSE_FILE=	${WRKSRC}/COPYING
+
 LIB_DEPENDS=	libxcb-util.so:x11/xcb-util \
 		libdrm.so:graphics/libdrm
 
-COMMIT_ID=	028c946df0855728b2a34d1d588701dc6c5ad4c1
+COMMIT_ID=	78d7a09b0343829c81257024b164b0b3764392ac
 
 ONLY_FOR_ARCHS=	amd64 i386
 ONLY_FOR_ARCHS_REASON=	Intel integrated GPU only exists in Intel x86 processors/chipsets
@@ -27,6 +30,17 @@ USE_XORG=	pciaccess pixman x11 xcb xext xrender xv xvmc
 USES+=		cpe autoreconf
 CPE_VENDOR=	x
 
-CONFIGURE_ARGS+=	--with-default-accel=uxa
+OPTIONS_SINGLE=	ACCEL
+OPTIONS_SINGLE_ACCEL=	SNA UXA
+OPTIONS_DEFAULT=	UXA
+
+ACCEL_DESC=	Default AccelMethod (if not specified in xorg.conf)
+SNA_DESC=	SandyBridge's New Acceleration
+UXA_DESC=	Unified Acceleration Architecture
+
+CONFIGURE_ARGS+=	--disable-udev
+
+SNA_CONFIGURE_ON=	--with-default-accel=sna
+UXA_CONFIGURE_ON=	--with-default-accel=uxa
 
 .include <bsd.port.mk>
diff --git a/x11-drivers/xf86-video-intel/distinfo b/x11-drivers/xf86-video-intel/distinfo
index 18185376b64..4d5e7afcf24 100644
--- a/x11-drivers/xf86-video-intel/distinfo
+++ b/x11-drivers/xf86-video-intel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484505738
-SHA256 (xorg/driver/xf86-video-intel-028c946df0855728b2a34d1d588701dc6c5ad4c1.tar.bz2) = 34d00a1c85f33c55a58bc072b59633d84e48776c771cec5e4d313664c3f56f7c
-SIZE (xorg/driver/xf86-video-intel-028c946df0855728b2a34d1d588701dc6c5ad4c1.tar.bz2) = 1236389
+TIMESTAMP = 1488408514
+SHA256 (xorg/driver/xf86-video-intel-78d7a09b0343829c81257024b164b0b3764392ac.tar.bz2) = 00efe1ccff175de207ce46be7d73c249b8ba8ab3ee90284ad7f60a645dbee362
+SIZE (xorg/driver/xf86-video-intel-78d7a09b0343829c81257024b164b0b3764392ac.tar.bz2) = 1236509
diff --git a/x11-drivers/xf86-video-intel/files/patch-i915kms b/x11-drivers/xf86-video-intel/files/patch-i915kms
deleted file mode 100644
index 9d019ca17b9..00000000000
--- a/x11-drivers/xf86-video-intel/files/patch-i915kms
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/intel_device.c.orig	2016-02-16 09:25:09.124344000 +0100
-+++ src/intel_device.c	2016-02-16 09:22:49.541922000 +0100
-@@ -204,6 +207,7 @@
- }
- 
- static const char *kernel_module_names[] ={
-+	"i915kms",
- 	"i915",
- 	NULL,
- };
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c b/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c
index 90bbf79c72a..8d81301780d 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c
+++ b/x11-drivers/xf86-video-intel/files/patch-src_intel__device.c
@@ -1,5 +1,5 @@
---- src/intel_device.c.orig	2014-12-21 20:36:40.268102983 +0100
-+++ src/intel_device.c	2014-12-21 20:36:01.358104504 +0100
+--- src/intel_device.c.orig	2017-02-28 20:52:19 UTC
++++ src/intel_device.c
 @@ -28,6 +28,9 @@
  #include "config.h"
  #endif
@@ -10,3 +10,11 @@
  #include <sys/types.h>
  #include <sys/stat.h>
  #include <assert.h>
+@@ -204,6 +207,7 @@ static inline struct intel_device *intel
+ }
+ 
+ static const char *kernel_module_names[] ={
++	"i915kms",
+ 	"i915",
+ 	NULL,
+ };
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h b/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h
index e7068be9523..56fc9fe3c92 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h
+++ b/x11-drivers/xf86-video-intel/files/patch-src_intel__list.h
@@ -1,6 +1,6 @@
---- src/intel_list.h.orig	2015-12-10 23:29:35.000000000 +0100
-+++ src/intel_list.h	2016-10-24 10:22:57.280379000 +0200
-@@ -305,8 +305,6 @@
+--- src/intel_list.h.orig	2017-02-28 20:52:19 UTC
++++ src/intel_list.h
+@@ -305,8 +305,6 @@ list_is_empty(const struct list *head)
  #define list_last_entry(ptr, type, member) \
      list_entry((ptr)->prev, type, member)
  
@@ -9,7 +9,7 @@
  /**
   * Loop through the list given by head and set pos to struct in the list.
   *
-@@ -325,12 +323,12 @@
+@@ -325,12 +323,12 @@ list_is_empty(const struct list *head)
   *
   */
  #define list_for_each_entry(pos, head, member)				\
@@ -25,7 +25,7 @@
  	 &pos->member != (head);					\
  	 pos = __container_of(pos->member.prev, pos, member))
  
-@@ -342,7 +340,7 @@
+@@ -342,7 +340,7 @@ list_is_empty(const struct list *head)
   * See list_for_each_entry for more details.
   */
  #define list_for_each_entry_safe(pos, tmp, head, member)		\
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c b/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c
index d93f4aed730..e3f23cdaa2d 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c
+++ b/x11-drivers/xf86-video-intel/files/patch-src_sna_kgem.c
@@ -1,12 +1,12 @@
---- src/sna/kgem.c.orig	2014-12-09 17:08:21.000000000 +0100
-+++ src/sna/kgem.c	2015-11-19 00:06:27.883010000 +0100
+--- src/sna/kgem.c.orig	2017-02-28 20:52:19 UTC
++++ src/sna/kgem.c
 @@ -29,6 +29,9 @@
  #include "config.h"
  #endif
-
+ 
 +#define _WITH_GETLINE	/* to expose getline() in stdio.h on FreeBSD */
 +#include <stdio.h>	/* for getline() */
 +
  #include "sna.h"
  #include "sna_reg.h"
-
+ 
diff --git a/x11-drivers/xf86-video-intel/files/patch-src_sna__sna_threads.c b/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__threads.c
similarity index 79%
rename from x11-drivers/xf86-video-intel/files/patch-src_sna__sna_threads.c
rename to x11-drivers/xf86-video-intel/files/patch-src_sna_sna__threads.c
index 05ae926a1b7..68cde27286f 100644
--- a/x11-drivers/xf86-video-intel/files/patch-src_sna__sna_threads.c
+++ b/x11-drivers/xf86-video-intel/files/patch-src_sna_sna__threads.c
@@ -1,12 +1,12 @@
---- src/sna/sna_threads.c.orig	2016-11-18 16:32:46 UTC
+--- src/sna/sna_threads.c.orig	2017-02-28 20:52:19 UTC
 +++ src/sna/sna_threads.c
 @@ -29,6 +29,9 @@
  #include "config.h"
  #endif
-
+ 
 +#define _WITH_GETLINE	/* to expose getline() in stdio.h on FreeBSD */
 +#include <stdio.h>	/* for getline() */
 +
  #include "sna.h"
-
+ 
  #include <unistd.h>
diff --git a/x11-drivers/xf86-video-intel/pkg-descr b/x11-drivers/xf86-video-intel/pkg-descr
index ffbea1fa582..0b1a476ab09 100644
--- a/x11-drivers/xf86-video-intel/pkg-descr
+++ b/x11-drivers/xf86-video-intel/pkg-descr
@@ -1,10 +1,16 @@
-Driver for Intel(R) Integrated Graphics Chipsets:
-  i810, i810-dc100, i810e, i815, i830M, 845G, 854, 852GM/855GM, 865G,
-  915G, E7221 (i915), 915GM, 945G, 945GM, 945GME, Pineview GM,
-  Pineview G, 965G, G35, 965Q, 946GZ, 965GM, 965GME/GLE, G33, Q35, Q33,
-  GM45, 4 Series, G45/G43, Q45/Q43, G41, B43
-Driver for Intel(R) HD Graphics: 2000-5000
-Driver for Intel(R) Iris(TM) Graphics: 5100
-Driver for Intel(R) Iris(TM) Pro Graphics: 5200
+The xf86-video-intel module is an open-source 2D graphics driver for
+the X Window System as implemented by X.org. It supports a variety of
+Intel graphics chipsets including:
 
-WWW: http://www.intellinuxgraphics.com/
+        i810/i810e/i810-dc100,i815,
+        i830M,845G,852GM,855GM,865G,
+        915G/GM,945G/GM/GME,946GZ
+        G/GM/GME/Q965,
+        G/Q33,G/Q35,G41,G/Q43,G/GM/Q45
+        PineView-M (Atom N400 series)
+        PineView-D (Atom D400/D500 series)
+        Intel(R) HD Graphics,
+        Intel(R) Iris(TM) Graphics,
+        Intel(R) Iris(TM) Pro Graphics.
+
+WWW: https://01.org/linuxgraphics/
diff --git a/x11-themes/gtk-qt4-engine/Makefile b/x11-themes/gtk-qt4-engine/Makefile
index 0cebdcf58a4..70cc4be9f23 100644
--- a/x11-themes/gtk-qt4-engine/Makefile
+++ b/x11-themes/gtk-qt4-engine/Makefile
@@ -3,22 +3,28 @@
 
 PORTNAME=	gtk-qt-engine
 PORTVERSION=	1.1
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	x11-themes
-MASTER_SITES=	GOOGLE_CODE
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ 2.x theme engine allowing to use Qt/KDE styles
 
-BROKEN=		Unfetchable (google code has gone away)
-DEPRECATED=	Unfetchable for more than six months (google code has gone away)
-EXPIRATION_DATE=	2017-04-30
+LICENSE=	GPLv2+
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_GNOME=	gtk20
-USE_QT4=	corelib gui moc_build rcc_build uic_build qmake_build
-USES=		cmake gettext kde:4 pkgconfig tar:bzip2
+LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+		libfreetype.so:print/freetype2
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	davidsansome
+GH_TAGNAME=	0dc6c26
+
+USES=		cmake gettext kde:4 pkgconfig
+USE_GNOME=	cairo gdkpixbuf2 gtk20
 USE_KDE=	kdelibs automoc4
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_QT4=	dbus corelib gui moc_build rcc_build uic_build qmake_build svg
+USE_XORG=	x11
+WRKSRC_SUBDIR=	${PORTNAME}
 
 OPTIONS_DEFINE=	BONOBO
 BONOBO_DESC=	Better support for Bonobo (GNOME) framework
diff --git a/x11-themes/gtk-qt4-engine/distinfo b/x11-themes/gtk-qt4-engine/distinfo
index 9725c84d36a..dbf727ed32d 100644
--- a/x11-themes/gtk-qt4-engine/distinfo
+++ b/x11-themes/gtk-qt4-engine/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gtk-qt-engine-1.1.tar.bz2) = 4310f8f179c5ab70cea614a07b0c3e84234d05388dded85596200fa754c290a6
-SIZE (gtk-qt-engine-1.1.tar.bz2) = 58079
+TIMESTAMP = 1488750054
+SHA256 (davidsansome-gtk-qt-engine-1.1-0dc6c26_GH0.tar.gz) = 4e2e0ea791f78a92117b747450ed26d5426d3b8ed5511e19c5795efbd82b5827
+SIZE (davidsansome-gtk-qt-engine-1.1-0dc6c26_GH0.tar.gz) = 73657
diff --git a/x11-themes/gtk-qt4-engine/files/patch-kcm_gtk__CMakeLists.txt b/x11-themes/gtk-qt4-engine/files/patch-kcm_gtk__CMakeLists.txt
index 622bdc58c71..50681aa9cb1 100644
--- a/x11-themes/gtk-qt4-engine/files/patch-kcm_gtk__CMakeLists.txt
+++ b/x11-themes/gtk-qt4-engine/files/patch-kcm_gtk__CMakeLists.txt
@@ -1,6 +1,6 @@
---- ./kcm_gtk/CMakeLists.txt.orig	2008-03-11 04:30:19.000000000 +0300
-+++ ./kcm_gtk/CMakeLists.txt	2008-08-20 02:18:45.000000000 +0400
-@@ -16,7 +16,7 @@
+--- kcm_gtk/CMakeLists.txt.orig	2009-05-04 20:27:52 UTC
++++ kcm_gtk/CMakeLists.txt
+@@ -16,7 +16,7 @@ KDE4_ADD_UI_FILES(kcm_gtk4_SOURCES ${kcm
  
  KDE4_ADD_PLUGIN(kcm_gtk4 ${kcm_gtk4_SOURCES})
  
diff --git a/x11-themes/gtk-qt4-engine/files/patch-src__qt_theme_draw.c b/x11-themes/gtk-qt4-engine/files/patch-src__qt_theme_draw.c
index c28d93e3522..f9a46516a29 100644
--- a/x11-themes/gtk-qt4-engine/files/patch-src__qt_theme_draw.c
+++ b/x11-themes/gtk-qt4-engine/files/patch-src__qt_theme_draw.c
@@ -1,15 +1,9 @@
---- ./src/qt_theme_draw.c.orig	2008-03-11 01:30:19.000000000 +0000
-+++ ./src/qt_theme_draw.c	2013-03-28 12:45:32.271244758 +0000
-@@ -19,11 +19,12 @@
-  ***************************************************************************/
- 
- #include <math.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <gtk/gtkprogressbar.h>
+--- src/qt_theme_draw.c.orig	2009-05-04 20:27:52 UTC
++++ src/qt_theme_draw.c
+@@ -25,6 +25,7 @@
  #include <gdk/gdk.h>
  #include <gtk/gtk.h>
--#include <glib/glist.h>
+ #include <glib/glist.h>
 +#include <glib.h>
  
  #ifdef HAVE_BONOBO
diff --git a/x11-themes/gtk-qt4-engine/pkg-descr b/x11-themes/gtk-qt4-engine/pkg-descr
index fd5803c528f..83e8f240902 100644
--- a/x11-themes/gtk-qt4-engine/pkg-descr
+++ b/x11-themes/gtk-qt4-engine/pkg-descr
@@ -2,4 +2,4 @@ GTK-Qt theme engine allows GTK+ 2.x applications to use Qt4 styles
 so that they fit in more nicely with KDE desktop. The port also
 provides KDE 4 system settings module for GTK+ theme selection.
 
-WWW: http://code.google.com/p/gtk-qt-engine/
+WWW: https://github.com/davidsansome/gtk-qt-engine
diff --git a/x11-themes/gtk-qt4-engine/pkg-plist b/x11-themes/gtk-qt4-engine/pkg-plist
index 84137b4df2a..d9a12b7a2ba 100644
--- a/x11-themes/gtk-qt4-engine/pkg-plist
+++ b/x11-themes/gtk-qt4-engine/pkg-plist
@@ -7,9 +7,16 @@ share/locale/de/LC_MESSAGES/gtkqtengine.mo
 share/locale/es/LC_MESSAGES/gtkqtengine.mo
 share/locale/fr/LC_MESSAGES/gtkqtengine.mo
 share/locale/it/LC_MESSAGES/gtkqtengine.mo
+share/locale/ko/LC_MESSAGES/gtkqtengine.mo
+share/locale/lt/LC_MESSAGES/gtkqtengine.mo
+share/locale/nl/LC_MESSAGES/gtkqtengine.mo
 share/locale/nn/LC_MESSAGES/gtkqtengine.mo
+share/locale/pt_BR/LC_MESSAGES/gtkqtengine.mo
+share/locale/ro/LC_MESSAGES/gtkqtengine.mo
 share/locale/ru/LC_MESSAGES/gtkqtengine.mo
 share/locale/sv/LC_MESSAGES/gtkqtengine.mo
 share/locale/tr/LC_MESSAGES/gtkqtengine.mo
+share/locale/uk/LC_MESSAGES/gtkqtengine.mo
+share/locale/zh_cn/LC_MESSAGES/gtkqtengine.mo
 %%LOCALBASE%%/lib/gtk-2.0/%%GTK2_VERSION%%/engines/libqt4engine.so
 %%LOCALBASE%%/share/themes/Qt4/gtk-2.0/gtkrc
diff --git a/x11/keybinder-gtk3/Makefile b/x11/keybinder-gtk3/Makefile
index 6f277e5cfa0..164e665cabc 100644
--- a/x11/keybinder-gtk3/Makefile
+++ b/x11/keybinder-gtk3/Makefile
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
 PORTNAME=	keybinder
-PORTVERSION=	0.3.1
+PORTVERSION=	0.3.2
 DISTVERSIONPREFIX=	keybinder-3.0-v
 CATEGORIES=	x11
+MASTER_SITES=	https://github.com/kupferlauncher/${PORTNAME}/releases/download/${DISTVERSIONPREFIX}${DISTVERSION}/
 PKGNAMESUFFIX=	-gtk3
+DISTNAME=	${DISTVERSIONPREFIX:S/-v//}-${DISTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Library for registering keyboard shortcuts
@@ -12,22 +14,13 @@ COMMENT=	Library for registering keyboard shortcuts
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BUILD_DEPENDS=	gtkdocize:textproc/gtk-doc
-
-USE_GITHUB=	yes
-GH_ACCOUNT=	engla
-
-USES=		autoreconf gmake libtool pathfix pkgconfig
-USE_GNOME=	gtk30 introspection:build
+USES=		gettext-runtime gmake libtool pathfix pkgconfig
+USE_GNOME=	gtk30 introspection:build cairo gdkpixbuf2
 USE_XORG=	x11 xext xrender
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-gtk-doc
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION="3.0"
 
-pre-configure:
-	@(cd ${CONFIGURE_WRKSRC} && ${LOCALBASE}/bin/gtkdocize)
-
 .include <bsd.port.mk>
diff --git a/x11/keybinder-gtk3/distinfo b/x11/keybinder-gtk3/distinfo
index 5af11eb38ae..572b5983cce 100644
--- a/x11/keybinder-gtk3/distinfo
+++ b/x11/keybinder-gtk3/distinfo
@@ -1,2 +1,3 @@
-SHA256 (engla-keybinder-keybinder-3.0-v0.3.1_GH0.tar.gz) = 0ebd17f026ce4ff6f0fb4248a95c2962d76b60b8cbccf07de28b07d7c5e42204
-SIZE (engla-keybinder-keybinder-3.0-v0.3.1_GH0.tar.gz) = 20345
+TIMESTAMP = 1488710975
+SHA256 (keybinder-3.0-0.3.2.tar.gz) = e6e3de4e1f3b201814a956ab8f16dfc8a262db1937ff1eee4d855365398c6020
+SIZE (keybinder-3.0-0.3.2.tar.gz) = 378942
diff --git a/x11/keybinder-gtk3/pkg-plist b/x11/keybinder-gtk3/pkg-plist
index 26778d1eaea..7b9c7455946 100644
--- a/x11/keybinder-gtk3/pkg-plist
+++ b/x11/keybinder-gtk3/pkg-plist
@@ -5,3 +5,19 @@ lib/libkeybinder-%%VERSION%%.so.0
 lib/libkeybinder-%%VERSION%%.so.0.0.0
 libdata/pkgconfig/keybinder-%%VERSION%%.pc
 share/gir-1.0/Keybinder-%%VERSION%%.gir
+share/gtk-doc/html/keybinder-%%VERSION%%/annotation-glossary.html
+share/gtk-doc/html/keybinder-%%VERSION%%/api-index-full.html
+share/gtk-doc/html/keybinder-%%VERSION%%/ch01.html
+share/gtk-doc/html/keybinder-%%VERSION%%/deprecated-api-index.html
+share/gtk-doc/html/keybinder-%%VERSION%%/home.png
+share/gtk-doc/html/keybinder-%%VERSION%%/index.html
+share/gtk-doc/html/keybinder-%%VERSION%%/keybinder-%%VERSION%%.devhelp2
+share/gtk-doc/html/keybinder-%%VERSION%%/keybinder-keybinder.html
+share/gtk-doc/html/keybinder-%%VERSION%%/left-insensitive.png
+share/gtk-doc/html/keybinder-%%VERSION%%/left.png
+share/gtk-doc/html/keybinder-%%VERSION%%/object-tree.html
+share/gtk-doc/html/keybinder-%%VERSION%%/right-insensitive.png
+share/gtk-doc/html/keybinder-%%VERSION%%/right.png
+share/gtk-doc/html/keybinder-%%VERSION%%/style.css
+share/gtk-doc/html/keybinder-%%VERSION%%/up-insensitive.png
+share/gtk-doc/html/keybinder-%%VERSION%%/up.png