*/*: sync with upstream

Taken from: HardenedBSD
2019-05-15 04:27:21 +02:00 · 2019-05-15 04:27:21 +02:00 · 5d7ae20405
parent 043bacd557
commit 5d7ae20405
115 changed files with 852 additions and 1720 deletions
--- a/audio/spotifyd/Makefile
+++ b/audio/spotifyd/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	spotifyd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	audio

 MAINTAINER=	tobik@FreeBSD.org
--- a/benchmarks/hyperfine/Makefile
+++ b/benchmarks/hyperfine/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	hyperfine
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.5.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	benchmarks

 MAINTAINER=	pizzamig@FreeBSD.org
--- a/cad/netgen/Makefile
+++ b/cad/netgen/Makefile
@ -61,4 +61,10 @@ post-install:
 	${SH} ${FILESDIR}/netgen_copy_include_for_salome ${WRKSRC} ${STAGEDIR}${PREFIX}
 	${LN} ${STAGEDIR}${PREFIX}/lib/libnglib.so ${STAGEDIR}${PREFIX}/lib/libnglib.so.1

-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1300014
+BROKEN=			does not build with recent versions of FreeBSD
+.endif
+
+.include <bsd.port.post.mk>
--- a/databases/puppetdb-cli/Makefile
+++ b/databases/puppetdb-cli/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	puppetdb-cli
 PORTVERSION=	1.2.5
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	databases

 MAINTAINER=	puppet@FreeBSD.org
--- a/devel/bingrep/Makefile
+++ b/devel/bingrep/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	bingrep
 PORTVERSION=	0.6.2
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
--- a/devel/git-absorb/Makefile
+++ b/devel/git-absorb/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	git-absorb
 DISTVERSION=	0.3.0
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	devel

 MAINTAINER=	greg@unrelenting.technology
--- a/devel/interactive_rebase_tool/Makefile
+++ b/devel/interactive_rebase_tool/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	interactive_rebase_tool
 DISTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	devel

 MAINTAINER=	petteri.valkonen@iki.fi
--- a/devel/pijul/Makefile
+++ b/devel/pijul/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	pijul
 PORTVERSION=	0.12.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	https://pijul.org/releases/
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
--- a/devel/racer/Makefile
+++ b/devel/racer/Makefile
@ -4,6 +4,7 @@
 PORTNAME=	racer
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.1.21
+PORTREVISION=	1
 CATEGORIES=	devel

 MAINTAINER=	beyert@cs.ucr.edu
--- a/devel/racerd/Makefile
+++ b/devel/racerd/Makefile
@ -5,7 +5,7 @@ PORTNAME=	racerd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.1.1-56
 DISTVERSIONSUFFIX=	-g29cd4c6
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel

 MAINTAINER=	ultima@FreeBSD.org
--- a/devel/rust-bindgen/Makefile
+++ b/devel/rust-bindgen/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	bindgen
 DISTVERSION=	0.49.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
 PKGNAMEPREFIX=	rust-
--- a/devel/rust-cbindgen/Makefile
+++ b/devel/rust-cbindgen/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	cbindgen
 DISTVERSION=	0.8.7
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	CRATESIO
 PKGNAMEPREFIX=	rust-
--- a/devel/sccache/Makefile
+++ b/devel/sccache/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	sccache
 DISTVERSION=	0.2.8
-PORTREVISION=	0
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel

--- a/devel/tokei/Makefile
+++ b/devel/tokei/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	tokei
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel

 MAINTAINER=	tobik@FreeBSD.org
--- a/devel/upnp/Makefile
+++ b/devel/upnp/Makefile
@ -2,44 +2,73 @@
 # $FreeBSD$

 PORTNAME=	upnp
-PORTVERSION=	1.6.25
+DISTVERSIONPREFIX=	release-
+DISTVERSION=	1.8.4
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	SF/p${PORTNAME}/p${PORTNAME}/libUPnP%20${PORTVERSION}
-DISTNAME=	lib${PORTNAME}-${PORTVERSION}

 MAINTAINER=	phascolarctos@protonmail.ch
 COMMENT=	Universal Plug and Play Software Development Kit

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

-USES=		cpe libtool pathfix tar:bzip2
+USES=		autoreconf cpe libtool pathfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	mrjimenez
+GH_PROJECT=	pupnp
 USE_LDCONFIG=	yes

-PORTSCOUT=	skipv:1.8.3	# released on 2017-11-14; older than 1.6.25
-
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-device \
+		--enable-gena \
+		--enable-soap \
+		--enable-ssdp \
+		--enable-webserver
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 CPE_VENDOR=	libupnp_project
 CPE_PRODUCT=	libupnp

-PORTDOCS=	ixml/*.html upnp/*.html
+OPTIONS_DEFINE=		CLIENT DEBUG DOCS EXAMPLES IPV6 LARGEFILE OPENSSL \
+			OPTSSDP POSTWRITE REUSEADDR SCRIPTSUPPORT TCP_BLOCK \
+			TEST TOOLS UNSPECIFIED_SERVER
+OPTIONS_DEFAULT=	CLIENT LARGEFILE OPTSSDP REUSEADDR SCRIPTSUPPORT \
+			TCP_BLOCK TOOLS
+OPTIONS_SUB=		yes

-OPTIONS_DEFINE=	DEBUG DOCS IPV6
-OPTIONS_SUB=	yes
+CLIENT_DESC=			Enable control point code
+LARGEFILE_DESC=			Large files support
+OPTSSDP_DESC=			Enable optional SSDP headers support
+POSTWRITE_DESC=			Write to filesystem on unhandled POST requests
+REUSEADDR_DESC=			Bind miniserver socket with reuseaddr
+SCRIPTSUPPORT_DESC=		Enable script support for IXML document tree
+TCP_BLOCK_DESC=			Enable blocking TCP connections
+TEST_DESC=			Perfom a few tests (implies TOOLS)
+TOOLS_DESC=			Enable helpers API in upnptools.h
+UNSPECIFIED_SERVER_DESC=	Enable unspecified SERVER header

-DEBUG_CONFIGURE_ENABLE=	debug
-DOCS_CONFIGURE_WITH=	documentation=${DOCSDIR}
-IPV6_CONFIGURE_ENABLE=	ipv6
-
-pre-configure:
-	${REINPLACE_CMD} -e '386s,docs/dist,,' ${WRKSRC}/Makefile.in
+CLIENT_CONFIGURE_ENABLE=		client
+DEBUG_CONFIGURE_ENABLE=			debug
+EXAMPLES_CONFIGURE_ENABLE=		samples
+IPV6_CONFIGURE_ENABLE=			ipv6
+LARGEFILE_CONFIGURE_ENABLE=		largefile
+OPENSSL_CONFIGURE_ENABLE=		open_ssl
+OPENSSL_USES=				ssl
+OPENSSL_CFLAGS=				-I${OPENSSLINC}
+OPENSSL_LDFLAGS=			-L${OPENSSLLIB} -lssl
+OPTSSDP_CONFIGURE_ENABLE=		optssdp
+POSTWRITE_CONFIGURE_ENABLE=		postwrite
+REUSEADDR_CONFIGURE_ENABLE=		reuseaddr
+SCRIPTSUPPORT_CONFIGURE_ENABLE=		scriptsupport
+TCP_BLOCK_CONFIGURE_ENABLE=		blocking_tcp_connections
+TEST_IMPLIES=				TOOLS
+TOOLS_CONFIGURE_ENABLE=			tools
+UNSPECIFIED_SERVER_CONFIGURE_ENABLE=	unspecified_server

 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/docs/dist/html && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
-	${RM} -r ${STAGEDIR}${DOCSDIR}/examples
+	${INSTALL_MAN} ${WRKSRC}/upnp/doc/UPnP_Programming_Guide.pdf \
+		${STAGEDIR}${DOCSDIR}

 .include <bsd.port.mk>
--- a/devel/upnp/distinfo
+++ b/devel/upnp/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1534737656
-SHA256 (libupnp-1.6.25.tar.bz2) = c5a300b86775435c076d58a79cc0d5a977d76027d2a7d721590729b7f369fa43
-SIZE (libupnp-1.6.25.tar.bz2) = 722731
+TIMESTAMP = 1546614165
+SHA256 (mrjimenez-pupnp-release-1.8.4_GH0.tar.gz) = 976c3e4555604cdd8391ed2f359c08c9dead3b6bf131c24ce78e64d6669af2ed
+SIZE (mrjimenez-pupnp-release-1.8.4_GH0.tar.gz) = 783896
--- a/devel/upnp/files/patch-libupnp.pc.in
+++ b/devel/upnp/files/patch-libupnp.pc.in
@ -1,11 +0,0 @@
--- libupnp.pc.in.orig	2010-10-19 17:31:19 UTC
-+++ libupnp.pc.in
-@@ -6,6 +6,6 @@ includedir=@includedir@
- Name: libupnp
- Description: Linux SDK for UPnP Devices
- Version: @VERSION@
-Libs: @PTHREAD_CFLAGS@ @PTHREAD_LIBS@ -L${libdir} -lupnp -lthreadutil -lixml 
-Cflags: @PTHREAD_CFLAGS@ -I${includedir}/upnp
-+Libs: -pthread -L${libdir} -lupnp -lthreadutil -lixml @LIBS@
-+Cflags: -I${includedir}/upnp
- 
--- a/devel/upnp/files/patch-threadutilincithread.h
+++ b/devel/upnp/files/patch-threadutilincithread.h
@ -1,16 +0,0 @@
--- threadutil/inc/ithread.h.orig	2013-11-14 17:14:44 UTC
-+++ threadutil/inc/ithread.h
-@@ -50,12 +50,9 @@ extern "C" {
- 
- #include <pthread.h>
- 
-#if defined(BSD) && !defined(__GNU__)
-	#define PTHREAD_MUTEX_RECURSIVE_NP PTHREAD_MUTEX_RECURSIVE
-#endif
- 
- 
-#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__)
-+#if defined(PTHREAD_MUTEX_RECURSIVE) || defined(__DragonFly__) || defined(__FreeBSD__)
- 	/* This system has SuS2-compliant mutex attributes.
- 	 * E.g. on Cygwin, where we don't have the old nonportable (NP) symbols
- 	 */
--- a/devel/upnp/files/patch-upnp-src-inc-uuid.h
+++ b/devel/upnp/files/patch-upnp-src-inc-uuid.h
@ -1,17 +0,0 @@
--- upnp/src/inc/uuid.h.orig	2016-01-07 23:32:52 UTC
-+++ upnp/src/inc/uuid.h
-@@ -22,6 +22,14 @@
- 
- #include "sysdep.h"
- 
-+#ifdef __FreeBSD__
-+/* Workaround to avoid picking up different uuid_* fns from FreeBSD's libc */
-+#define uuid_create		libupnp_uuid_create
-+#define uuid_unpack		libupnp_uuid_unpack
-+#define uuid_create_from_name	libupnp_uuid_create_from_name
-+#define uuid_compare		libupnp_uuid_compare
-+#endif
-+
- /*! . */
- typedef struct _uuid_upnp {
- 	/*! . */
--- a/devel/upnp/pkg-plist
+++ b/devel/upnp/pkg-plist
@ -1,7 +1,16 @@
-include/upnp/FreeList.h
-include/upnp/LinkedList.h
-include/upnp/ThreadPool.h
-include/upnp/TimerThread.h
+include/upnp/ActionComplete.h
+include/upnp/ActionRequest.h
+include/upnp/Callback.h
+include/upnp/Discovery.h
+include/upnp/Event.h
+include/upnp/EventSubscribe.h
+include/upnp/FileInfo.h
+include/upnp/StateVarComplete.h
+include/upnp/StateVarRequest.h
+include/upnp/SubscriptionRequest.h
+include/upnp/TemplateInclude.h
+include/upnp/TemplateSource.h
+include/upnp/TemplateUndef.h
 include/upnp/UpnpGlobal.h
 include/upnp/UpnpInet.h
 include/upnp/UpnpIntTypes.h
@ -11,261 +20,19 @@ include/upnp/UpnpUniStd.h
 include/upnp/ithread.h
 include/upnp/ixml.h
 include/upnp/ixmldebug.h
+include/upnp/list.h
+include/upnp/poison.h
 include/upnp/upnp.h
 include/upnp/upnpconfig.h
-include/upnp/upnpdebug.h
-include/upnp/upnptools.h
+%%DEBUG%%include/upnp/upnpdebug.h
+%%TOOLS%%include/upnp/upnptools.h
 lib/libixml.a
 lib/libixml.so
-lib/libixml.so.2
-lib/libixml.so.2.0.8
-lib/libthreadutil.a
-lib/libthreadutil.so
-lib/libthreadutil.so.6
-lib/libthreadutil.so.6.0.4
+lib/libixml.so.10
+lib/libixml.so.10.0.1
 lib/libupnp.a
 lib/libupnp.so
-lib/libupnp.so.6
-lib/libupnp.so.6.4.1
+lib/libupnp.so.13
+lib/libupnp.so.13.0.0
 libdata/pkgconfig/libupnp.pc
-%%PORTDOCS%%%%DOCSDIR%%/AboutCallbacks.html
-%%PORTDOCS%%%%DOCSDIR%%/ConstantsStructuresandTypes.html
-%%PORTDOCS%%%%DOCSDIR%%/Control.html
-%%PORTDOCS%%%%DOCSDIR%%/ControlPointHTTPAPI.html
-%%PORTDOCS%%%%DOCSDIR%%/DOMInterfaces.html
-%%PORTDOCS%%%%DOCSDIR%%/Discovery.html
-%%PORTDOCS%%%%DOCSDIR%%/Errorcodes.html
-%%PORTDOCS%%%%DOCSDIR%%/Eventing.html
-%%PORTDOCS%%%%DOCSDIR%%/General.html
-%%PORTDOCS%%%%DOCSDIR%%/IXMLAPI.html
-%%PORTDOCS%%%%DOCSDIR%%/InitializationandRegistration.html
-%%PORTDOCS%%%%DOCSDIR%%/InterfaceitAttr.html
-%%PORTDOCS%%%%DOCSDIR%%/InterfaceitCDATASection.html
-%%PORTDOCS%%%%DOCSDIR%%/InterfaceitDocument.html
-%%PORTDOCS%%%%DOCSDIR%%/InterfaceitElement.html
-%%PORTDOCS%%%%DOCSDIR%%/InterfaceitNamedNodeMap.html
-%%PORTDOCS%%%%DOCSDIR%%/InterfaceitNode.html
-%%PORTDOCS%%%%DOCSDIR%%/InterfaceitNodeList.html
-%%PORTDOCS%%%%DOCSDIR%%/Introduction.html
-%%PORTDOCS%%%%DOCSDIR%%/License.html
-%%PORTDOCS%%%%DOCSDIR%%/OptionalToolAPIs.html
-%%PORTDOCS%%%%DOCSDIR%%/TheAPI.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNPREG_BUF_DESC.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNPREG_FILENAME_DESC.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNPREG_URL_DESC.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_CONTROL_ACTION_COMPLETE.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_CONTROL_ACTION_REQUEST.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_CONTROL_GET_VAR_COMPLETE.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_CONTROL_GET_VAR_REQUEST.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_DISCOVERY_ADVERTISEMENT_ALIVE.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_DISCOVERY_SEARCH_RESULT.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_DISCOVERY_SEARCH_TIMEOUT.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_EVENT_AUTORENEWAL_FAILED.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_EVENT_RECEIVED.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_EVENT_RENEWAL_COMPLETE.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_EVENT_SUBSCRIBE_COMPLETE.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_EVENT_SUBSCRIPTION_EXPIRED.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_EVENT_SUBSCRIPTION_REQUEST.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_EVENT_UNSUBSCRIBE_COMPLETE.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_ALREADY_REGISTERED-120.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_BAD_HTTPMSG-119.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_BAD_RESPONSE-113.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_CANCELED-210.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_EXT_NOT_XML-504.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_FILE_NOT_FOUND-502.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_FILE_READ_ERROR-503.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_FINISH-116.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_INIT-105.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_INIT_FAILED-117.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_INTERNAL_ERROR-911.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_INVALID_ACTION-115.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_INVALID_ARGUMENT-501.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_INVALID_DESC-107.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_INVALID_HANDLE-100.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_INVALID_PARAM-101.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_INVALID_SERVICE-111.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_INVALID_URL-108.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_LISTEN-206.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_NETWORK_ERROR-200.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_NOTIFY_UNACCEPTED-303.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_NOT_FOUND-507.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_OUTOF_HANDLE-102.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_OUTOF_MEMORY-104.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_OUTOF_SOCKET-205.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_SOCKET_BIND-203.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_SOCKET_CONNECT-204.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_SOCKET_ERROR-208.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_SOCKET_READ-202.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_SOCKET_WRITE-201.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_SUBSCRIBE_UNACCEPTED-301.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_SUCCESS0.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_TIMEDOUT-207.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_E_UNSUBSCRIBE_UNACCEPTED-302.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_S_ALL.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_S_DEVICE.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_S_ROOT.html
-%%PORTDOCS%%%%DOCSDIR%%/UPNP_S_SERVICE.html
-%%PORTDOCS%%%%DOCSDIR%%/UPnP_EventType.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpAcceptSubscription.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpAcceptSubscriptionExt.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpAddToAction.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpAddToActionResponse.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpAddToPropertySet.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpAddVirtualDir.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpCancelHttpGet.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpClient_Handle.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpCloseHttpGet.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpCloseHttpPost.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpCreatePropertySet.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpDevice_Handle.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpDownloadUrlItem.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpDownloadXmlDoc.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpEnableWebserver.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpFinish.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpGetErrorMessage.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpGetServerIpAddress.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpGetServerPort.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpGetServiceVarStatus.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpGetServiceVarStatusAsync.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpHttpGetProgress.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpInit.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpIsWebserverEnabled.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpMakeAction.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpMakeActionResponse.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpNotify.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpNotifyExt.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpOpenHttpGet.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpOpenHttpGetEx.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpOpenHttpGetProxy.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpOpenHttpPost.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpReadHttpGet.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpRegisterClient.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpRegisterRootDevice.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpRegisterRootDevice2.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpRemoveAllVirtualDirs.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpRemoveVirtualDir.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpRenewSubscription.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpRenewSubscriptionAsync.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpResolveURL.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpSearchAsync.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpSendAction.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpSendActionAsync.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpSendActionEx.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpSendActionExAsync.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpSendAdvertisement.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpSetContentLength.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpSetMaxContentLength.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpSetMaxSubscriptionTimeOut.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpSetMaxSubscriptions.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpSetVirtualDirCallbacks.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpSetWebServerRootDir.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpSubscribe.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpSubscribeAsync.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpUnRegisterClient.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpUnRegisterRootDevice.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpUnSubscribe.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpUnSubscribeAsync.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpVirtualDirCallbacks.html
-%%PORTDOCS%%%%DOCSDIR%%/UpnpWriteHttpPost.html
-%%PORTDOCS%%%%DOCSDIR%%/Upnp_Action_Request.html
-%%PORTDOCS%%%%DOCSDIR%%/Upnp_DescType.html
-%%PORTDOCS%%%%DOCSDIR%%/Upnp_Discovery.html
-%%PORTDOCS%%%%DOCSDIR%%/Upnp_Event.html
-%%PORTDOCS%%%%DOCSDIR%%/Upnp_Event_Subscribe.html
-%%PORTDOCS%%%%DOCSDIR%%/Upnp_FunPtr.html
-%%PORTDOCS%%%%DOCSDIR%%/Upnp_SID44.html
-%%PORTDOCS%%%%DOCSDIR%%/Upnp_SType.html
-%%PORTDOCS%%%%DOCSDIR%%/Upnp_State_Var_Complete.html
-%%PORTDOCS%%%%DOCSDIR%%/Upnp_State_Var_Request.html
-%%PORTDOCS%%%%DOCSDIR%%/Upnp_Subscription_Request.html
-%%PORTDOCS%%%%DOCSDIR%%/WebServerAPI.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlAttr_free.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlCDATASection_free.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlCDATASection_init.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlCloneDOMString.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_createAttribute.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_createAttributeEx.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_createAttributeNS.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_createAttributeNSEx.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_createCDATASection.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_createCDATASectionEx.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_createDocument.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_createDocumentEx.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_createElement.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_createElementEx.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_createElementNS.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_createElementNSEx.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_createTextNode.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_createTextNodeEx.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_free.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_getElementById.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_getElementsByTagName.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_getElementsByTagNameNS.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_importNode.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocument_init.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlDocumenttoString.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_free.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_getAttribute.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_getAttributeNS.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_getAttributeNode.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_getAttributeNodeNS.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_getElementsByTagName.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_getElementsByTagNameNS.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_getTagName.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_hasAttribute.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_hasAttributeNS.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_init.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_removeAttribute.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_removeAttributeNS.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_removeAttributeNode.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_setAttribute.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_setAttributeNS.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_setAttributeNode.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlElement_setAttributeNodeNS.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlFreeDOMString.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlLoadDocument.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlLoadDocumentEx.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNamedNodeMap_free.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNamedNodeMap_getLength.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNamedNodeMap_getNamedItem.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNamedNodeMap_getNamedItemNS.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNamedNodeMap_item.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNamedNodeMap_removeNamedItem.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNamedNodeMap_removeNamedItemNS.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNamedNodeMap_setNamedItem.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNamedNodeMap_setNamedItemNS.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNodeList_free.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNodeList_item.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNodeList_length.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_appendChild.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_cloneNode.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_free.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_getAttributes.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_getChildNodes.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_getFirstChild.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_getLastChild.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_getLocalName.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_getNamespaceURI.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_getNextSibling.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_getNodeName.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_getNodeType.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_getNodeValue.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_getOwnerDocument.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_getParentNode.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_getPrefix.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_getPreviousSibling.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_hasAttributes.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_hasChildNodes.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_insertBefore.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_removeChild.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_replaceChild.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNode_setNodeValue.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlNodetoString.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlParseBuffer.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlParseBufferEx.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlPrintDocument.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlPrintNode.html
-%%PORTDOCS%%%%DOCSDIR%%/ixmlRelaxParser.html
-%%PORTDOCS%%%%DOCSDIR%%/toc.html
+%%PORTDOCS%%%%DOCSDIR%%/UPnP_Programming_Guide.pdf
--- a/dns/doh-proxy/Makefile
+++ b/dns/doh-proxy/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	doh-proxy
 DISTVERSION=	0.1.14
+PORTREVISION=	1
 CATEGORIES=	dns

 MAINTAINER=	mat@FreeBSD.org
--- a/editors/kak-lsp/Makefile
+++ b/editors/kak-lsp/Makefile
@ -3,6 +3,7 @@
 PORTNAME=	kak-lsp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	6.2.0
+PORTREVISION=	1
 CATEGORIES=	editors

 MAINTAINER=	tobik@FreeBSD.org
--- a/editors/parinfer-rust/Makefile
+++ b/editors/parinfer-rust/Makefile
@ -3,6 +3,7 @@
 PORTNAME=	parinfer-rust
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.3.1
+PORTREVISION=	1
 CATEGORIES=	editors

 MAINTAINER=	tobik@FreeBSD.org
--- a/editors/xi-core/Makefile
+++ b/editors/xi-core/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	xi-core
 DISTVERSION=	g20190420
+PORTREVISION=	1
 CATEGORIES=	editors

 MAINTAINER=	ed.arrakis@gmail.com
--- a/editors/xi-term/Makefile
+++ b/editors/xi-term/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	xi-term
 DISTVERSION=	g20190328
+PORTREVISION=	1
 CATEGORIES=	editors

 MAINTAINER=	ed.arrakis@gmail.com
--- a/games/genact/Makefile
+++ b/games/genact/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	genact
 DISTVERSION=	0.7.0
+PORTREVISION=	1
 CATEGORIES=	games

 MAINTAINER=	0mp@FreeBSD.org
--- a/games/jaggedalliance2/Makefile
+++ b/games/jaggedalliance2/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	ja2
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.16.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games

 MAINTAINER=	tobik@FreeBSD.org
--- a/graphics/librsvg2-rust/Makefile
+++ b/graphics/librsvg2-rust/Makefile
@ -2,21 +2,18 @@
 # $FreeBSD$

 PORTNAME=	librsvg
-PORTVERSION=	2.45.5
-PORTREVISION=	3
+PORTVERSION=	2.45.6
 CATEGORIES=	graphics gnome
-MASTER_SITES=	GNOME \
-		CRATESIO/libc/0.2.49:libc
+MASTER_SITES=	GNOME
 PKGNAMESUFFIX=	2-rust
-DISTFILES=	gnome2/${DISTNAME}${EXTRACT_SUFX} \
-		rust/crates/libc-0.2.49.tar.gz:libc
+DIST_SUBDIR=	gnome2

 MAINTAINER=	tobik@FreeBSD.org
 COMMENT=	Library for parsing and rendering SVG vector-graphic files

 LICENSE=	LGPL20

-BUILD_DEPENDS=	${RUST_DEFAULT}>=1.27.0:lang/${RUST_DEFAULT} \
+BUILD_DEPENDS=	${RUST_DEFAULT}>=1.30.0:lang/${RUST_DEFAULT} \
 		valac:lang/vala
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libfontconfig.so:x11-fonts/fontconfig \
@ -47,10 +44,6 @@ post-patch:
 # Disable vendor checksums
 	@${REINPLACE_CMD} -e 's/"files":{[^}]*}/"files":{}/' \
 		${WRKSRC}/vendor/*/.cargo-checksum.json
-# Replace vendored libc crate with libc-0.2.49 for tier 2 arch support
-	${RM} -r ${WRKSRC}/vendor/libc
-	${MV} ${WRKDIR}/libc-0.2.49 ${WRKSRC}/vendor/libc
-	@${ECHO_CMD} '{"files":{}}' > ${WRKSRC}/vendor/libc/.cargo-checksum.json

 pre-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ${LOCALBASE}/bin/cargo update
--- a/graphics/librsvg2-rust/distinfo
+++ b/graphics/librsvg2-rust/distinfo
@ -1,5 +1,3 @@
-TIMESTAMP = 1550930141
-SHA256 (gnome2/librsvg-2.45.5.tar.xz) = 600872dc608fe5e01bfd8d5b3046d01b53b99121bc5ab9663531b53630843700
-SIZE (gnome2/librsvg-2.45.5.tar.xz) = 13485044
-SHA256 (rust/crates/libc-0.2.49.tar.gz) = 413f3dfc802c5dc91dc570b05125b6cda9855edfaa9825c9849807876376e70e
-SIZE (rust/crates/libc-0.2.49.tar.gz) = 375486
+TIMESTAMP = 1557889277
+SHA256 (gnome2/librsvg-2.45.6.tar.xz) = 0e6e26cb5c79cfa73c0ddab06808ace4d10c4a626b81c31a75ead37c6cb4df41
+SIZE (gnome2/librsvg-2.45.6.tar.xz) = 12757708
--- a/mail/thunderbird/Makefile
+++ b/mail/thunderbird/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	thunderbird
 DISTVERSION=	60.6.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail news net-im ipv6
 MASTER_SITES=	MOZILLA/${PORTNAME}/releases/${DISTVERSION}/source \
 		MOZILLA/${PORTNAME}/candidates/${DISTVERSION}-candidates/build2/source
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@ -3,8 +3,8 @@

 PORTNAME=	octave
 PORTVERSION=	${OCTAVE_VERSION}
-PORTREVISION=	3
-CATEGORIES=	math java
+PORTREVISION=	5
+CATEGORIES=	math
 MASTER_SITES=	GNU

 MAINTAINER=	stephen@FreeBSD.org
@ -33,7 +33,6 @@ LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick \
 		libumfpack.so:math/suitesparse \
 		libglpk.so:math/glpk \
 		libgl2ps.so:print/gl2ps \
-		libqscintilla2_qt5.so:devel/qscintilla2-qt5 \
 		libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2 \
 		libdrm.so:graphics/libdrm \
@ -42,13 +41,12 @@ LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick \
 		libportaudio.so:audio/portaudio
 #		libsndfile.so:audio/libsndfile # Commented out until this port no longer has vulnerabilities.

-USES=		charsetfix fortran gmake libtool perl5 pkgconfig qt:5 readline \
+USES=		charsetfix fortran gmake libtool perl5 pkgconfig readline \
 		tar:xz compiler:c++14-lang \
 		desktop-file-utils gl iconv
 USE_LDCONFIG=	${PREFIX}/lib/${PORTNAME}/${PORTVERSION}
 USE_PERL5=	build
 GNU_CONFIGURE=	yes
-USE_JAVA=	yes
 JAVA_VERSION=	1.7+
 USE_QT=		core gui help network opengl \
 		qmake_build buildtools_build linguist_build \
@ -79,20 +77,28 @@ CONFIGURE_ARGS=	--host=${GNU_HOST} \
 		--enable-shared \
 		--disable-jit \
 		--disable-openmp \
-		--with-qt=5 \
 		--with-osmesa

 INFO=		octave liboctave

-OPTIONS_DEFINE=	DOCS
+INSTALL_TARGET=	install-strip

-DOCS_CONFIGURE_ENABLE=	docs
+OPTIONS_DEFINE=	DOCS JAVA QT5

 OPTIONS_RADIO=		BLAS
 OPTIONS_RADIO_BLAS=	OPENBLAS NETLIB ATLAS
-OPTIONS_DEFAULT=	OPENBLAS
+OPTIONS_DEFAULT=	JAVA OPENBLAS QT5
+OPTIONS_SUB=		yes
+
+DOCS_CONFIGURE_ENABLE=	docs
+JAVA_CONFIGURE_ENABLE=	java
+QT5_CONFIGURE_WITH=	qt=5 qscintilla
+
+QT5_LIB_DEPENDS=	libqscintilla2_qt5.so:devel/qscintilla2-qt5

 DOCS_USE=	TEX=dvipsk:build,formats:build
+JAVA_USE=	JAVA=yes
+QT5_USES=	qt:5
 OPENBLAS_USES=	blaslapack:openblas
 NETLIB_USES=	blaslapack:netlib
 ATLAS_USES=		blaslapack:atlas
@ -103,7 +109,6 @@ post-patch:

 post-install:
 	(cd ${STAGEDIR}${DATADIR} && ${LN} -s ${PORTVERSION}/imagelib  .)
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/octave/${PORTVERSION}/liboctave.so.7.0.0

 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
--- a/math/octave/pkg-plist
+++ b/math/octave/pkg-plist
@ -752,9 +752,9 @@ include/octave-%%OCTAVE_VERSION%%/octave/zfstream.h
 lib/octave/%%OCTAVE_VERSION%%/liboctave.so
 lib/octave/%%OCTAVE_VERSION%%/liboctave.so.7
 lib/octave/%%OCTAVE_VERSION%%/liboctave.so.7.0.0
-lib/octave/%%OCTAVE_VERSION%%/liboctgui.so
-lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.5
-lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.5.0.0
+%%QT5%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so
+%%QT5%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.5
+%%QT5%%lib/octave/%%OCTAVE_VERSION%%/liboctgui.so.5.0.0
 lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so
 lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so.7
 lib/octave/%%OCTAVE_VERSION%%/liboctinterp.so.7.0.0
@ -765,7 +765,7 @@ lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__fltk_uigetfile__.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__glpk__.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__init_fltk__.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__init_gnuplot__.oct
-lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__init_qt__.oct
+%%QT5%%lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__init_qt__.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__ode15__.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/__voronoi__.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/amd.oct
@ -783,8 +783,8 @@ lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/symbfact.oct
 lib/octave/%%OCTAVE_VERSION%%/oct/%%GNU_HOST%%/symrcm.oct
 libdata/pkgconfig/octave.pc
 libdata/pkgconfig/octinterp.pc
-libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-gui
-libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-svgconvert
+%%QT5%%libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-gui
+%%QT5%%libexec/octave/%%OCTAVE_VERSION%%/exec/%%GNU_HOST%%/octave-svgconvert
 %%PORTDOCS%%man/man1/mkoctfile.1.gz
 %%PORTDOCS%%man/man1/octave-cli.1.gz
 %%PORTDOCS%%man/man1/octave-config.1.gz
@ -805,7 +805,6 @@ share/icons/hicolor/48x48/apps/octave.png
 share/icons/hicolor/512x512/apps/octave.png
 share/icons/hicolor/64x64/apps/octave.png
 share/icons/hicolor/scalable/apps/octave.svg
-%%PORTDOCS%%share/info/dir
 share/metainfo/org.octave.Octave.appdata.xml
 %%DATADIR%%/%%OCTAVE_VERSION%%/data/penny.mat
 %%DATADIR%%/%%OCTAVE_VERSION%%/doc/octave_interpreter.qch
@ -813,7 +812,7 @@ share/metainfo/org.octave.Octave.appdata.xml
 %%DATADIR%%/%%OCTAVE_VERSION%%/etc/CITATION
 %%DATADIR%%/%%OCTAVE_VERSION%%/etc/NEWS
 %%DATADIR%%/%%OCTAVE_VERSION%%/etc/built-in-docstrings
-%%DATADIR%%/%%OCTAVE_VERSION%%/etc/default-qt-settings
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/etc/default-qt-settings
 %%DATADIR%%/%%OCTAVE_VERSION%%/etc/doc-cache
 %%DATADIR%%/%%OCTAVE_VERSION%%/etc/macros.texi
 %%DATADIR%%/%%OCTAVE_VERSION%%/etc/profiler/flat.html
@ -1269,22 +1268,22 @@ share/metainfo/org.octave.Octave.appdata.xml
 %%DATADIR%%/%%OCTAVE_VERSION%%/imagelib/octave-logo.ico
 %%DATADIR%%/%%OCTAVE_VERSION%%/imagelib/octave-logo.svg
 %%DATADIR%%/%%OCTAVE_VERSION%%/imagelib/octave-sombrero.png
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/be_BY.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ca_ES.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/de_DE.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/en_US.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/es_ES.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/eu_ES.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/fr_FR.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/it_IT.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ja_JP.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/lt_LT.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/nl_NL.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_BR.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_PT.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ru_RU.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/uk_UA.qm
-%%DATADIR%%/%%OCTAVE_VERSION%%/locale/zh_CN.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/be_BY.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ca_ES.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/de_DE.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/en_US.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/es_ES.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/eu_ES.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/fr_FR.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/it_IT.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ja_JP.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/lt_LT.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/nl_NL.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_BR.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/pt_PT.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/ru_RU.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/uk_UA.qm
+%%QT5%%%%DATADIR%%/%%OCTAVE_VERSION%%/locale/zh_CN.qm
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/+containers/Map.m
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/+matlab/+lang/makeUniqueStrings.m
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/+matlab/+lang/makeValidName.m
@ -1578,7 +1577,7 @@ share/metainfo/org.octave.Octave.appdata.xml
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/java/javaclasspath.m
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/java/javamem.m
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/java/javarmpath.m
-%%DATADIR%%/%%OCTAVE_VERSION%%/m/java/octave.jar
+%%JAVA%%%%DATADIR%%/%%OCTAVE_VERSION%%/m/java/octave.jar
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/java/usejava.m
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/legacy/findstr.m
 %%DATADIR%%/%%OCTAVE_VERSION%%/m/legacy/flipdim.m
--- a/misc/Makefile
+++ b/misc/Makefile
@ -271,6 +271,7 @@
    SUBDIR += openhmd
    SUBDIR += openmvg
    SUBDIR += openr2
+    SUBDIR += openvdb
    SUBDIR += orange3
    SUBDIR += orion
    SUBDIR += orville-write
--- a/misc/openvdb/Makefile
+++ b/misc/openvdb/Makefile
@ -0,0 +1,37 @@
+# $FreeBSD$
+
+PORTNAME=	openvdb
+DISTVERSIONPREFIX=	v
+DISTVERSION=	6.1.0
+CATEGORIES=	misc
+
+MAINTAINER=	yuri@FreeBSD.org
+COMMENT=	Tools for storage and manipulation of sparse volumetric data
+
+LICENSE=	MPL20
+LICENSE_FILE=	${WRKSRC}/LICENSE
+
+LIB_DEPENDS=	libblosc.so:archivers/c-blosc \
+		libboost_system.so:devel/boost-libs \
+		libHalf.so:graphics/ilmbase \
+		libtbb.so:devel/tbb
+
+USES=		cmake compiler:c++11-lang pkgconfig
+USE_GITHUB=	yes
+GH_ACCOUNT=	AcademySoftwareFoundation
+USE_LDCONFIG=	yes
+
+CMAKE_OFF=	OPENVDB_CORE_STATIC
+
+OPTIONS_DEFINE=		PYTHON
+OPTIONS_DEFAULT=	PYTHON
+OPTIONS_SUB=		yes
+
+PYTHON_USES=		python:2.7 # 3.6 is broken: https://github.com/AcademySoftwareFoundation/openvdb/issues/427
+PYTHON_CMAKE_BOOL=	OPENVDB_BUILD_PYTHON_MODULE
+PYTHON_CMAKE_ON=	-DFREEBSD_PYTHON_VER:STRING=${PYTHON_VER} -DUSE_NUMPY:BOOL=ON
+PYTHON_LIB_DEPENDS=	${PY_BOOST}
+PYTHON_BUILD_DEPENDS=	${PYNUMPY}
+PYTHON_RUN_DEPENDS=	${PYNUMPY}
+
+.include <bsd.port.mk>
--- a/misc/openvdb/distinfo
+++ b/misc/openvdb/distinfo
@ -0,0 +1,3 @@
+TIMESTAMP = 1557552105
+SHA256 (AcademySoftwareFoundation-openvdb-v6.1.0_GH0.tar.gz) = d8803214c245cf0ca14a2c30cd215b183147c03c888c59fc642f213f98b4d68f
+SIZE (AcademySoftwareFoundation-openvdb-v6.1.0_GH0.tar.gz) = 1864024
--- a/misc/openvdb/files/patch-CMakeLists.txt
+++ b/misc/openvdb/files/patch-CMakeLists.txt
@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2019-05-11 05:39:52 UTC
+++ CMakeLists.txt
+@@ -177,7 +177,7 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS
+   set(MINIMUM_ZLIB_VERSION 1.2.7)
+   set(MINIMUM_TBB_VERSION 4.4)
+ 
+-  set(MINIMUM_PYTHON_VERSION 2.7)
+  set(MINIMUM_PYTHON_VERSION ${FREEBSD_PYTHON_VER})
+   set(MINIMUM_NUMPY_VERSION 1.9.2)
+ 
+   set(MINIMUM_CPPUNIT_VERSION 1.10)
--- a/misc/openvdb/pkg-descr
+++ b/misc/openvdb/pkg-descr
@ -0,0 +1,8 @@
+OpenVDB is an Academy Award-winning open-source C++ library comprising a novel
+hierarchical data structure and a suite of tools for the efficient storage and
+manipulation of sparse volumetric data discretized on three-dimensional grids.
+It was developed by DreamWorks Animation for use in volumetric applications
+typically encountered in feature film production and is now maintained by the
+Academy Software Foundation (ASWF).
+
+WWW: https://www.openvdb.org/
--- a/misc/openvdb/pkg-plist
+++ b/misc/openvdb/pkg-plist
@ -0,0 +1,142 @@
+bin/vdb_print
+include/openvdb/Exceptions.h
+include/openvdb/Grid.h
+include/openvdb/MetaMap.h
+include/openvdb/Metadata.h
+include/openvdb/Platform.h
+include/openvdb/PlatformConfig.h
+include/openvdb/Types.h
+include/openvdb/io/Archive.h
+include/openvdb/io/Compression.h
+include/openvdb/io/File.h
+include/openvdb/io/GridDescriptor.h
+include/openvdb/io/Queue.h
+include/openvdb/io/Stream.h
+include/openvdb/io/TempFile.h
+include/openvdb/io/io.h
+include/openvdb/math/BBox.h
+include/openvdb/math/ConjGradient.h
+include/openvdb/math/Coord.h
+include/openvdb/math/DDA.h
+include/openvdb/math/FiniteDifference.h
+include/openvdb/math/LegacyFrustum.h
+include/openvdb/math/Maps.h
+include/openvdb/math/Mat.h
+include/openvdb/math/Mat3.h
+include/openvdb/math/Mat4.h
+include/openvdb/math/Math.h
+include/openvdb/math/Operators.h
+include/openvdb/math/Proximity.h
+include/openvdb/math/QuantizedUnitVec.h
+include/openvdb/math/Quat.h
+include/openvdb/math/Ray.h
+include/openvdb/math/Stats.h
+include/openvdb/math/Stencils.h
+include/openvdb/math/Transform.h
+include/openvdb/math/Tuple.h
+include/openvdb/math/Vec2.h
+include/openvdb/math/Vec3.h
+include/openvdb/math/Vec4.h
+include/openvdb/openvdb.h
+include/openvdb/points/AttributeArray.h
+include/openvdb/points/AttributeArrayString.h
+include/openvdb/points/AttributeGroup.h
+include/openvdb/points/AttributeSet.h
+include/openvdb/points/IndexFilter.h
+include/openvdb/points/IndexIterator.h
+include/openvdb/points/PointAdvect.h
+include/openvdb/points/PointAttribute.h
+include/openvdb/points/PointConversion.h
+include/openvdb/points/PointCount.h
+include/openvdb/points/PointDataGrid.h
+include/openvdb/points/PointDelete.h
+include/openvdb/points/PointGroup.h
+include/openvdb/points/PointMask.h
+include/openvdb/points/PointMove.h
+include/openvdb/points/PointSample.h
+include/openvdb/points/PointScatter.h
+include/openvdb/points/StreamCompression.h
+%%PYTHON%%include/openvdb/python/pyopenvdb.h
+include/openvdb/tools/ChangeBackground.h
+include/openvdb/tools/Clip.h
+include/openvdb/tools/Composite.h
+include/openvdb/tools/Dense.h
+include/openvdb/tools/DenseSparseTools.h
+include/openvdb/tools/Diagnostics.h
+include/openvdb/tools/Filter.h
+include/openvdb/tools/GridOperators.h
+include/openvdb/tools/GridTransformer.h
+include/openvdb/tools/Interpolation.h
+include/openvdb/tools/LevelSetAdvect.h
+include/openvdb/tools/LevelSetFilter.h
+include/openvdb/tools/LevelSetFracture.h
+include/openvdb/tools/LevelSetMeasure.h
+include/openvdb/tools/LevelSetMorph.h
+include/openvdb/tools/LevelSetPlatonic.h
+include/openvdb/tools/LevelSetRebuild.h
+include/openvdb/tools/LevelSetSphere.h
+include/openvdb/tools/LevelSetTracker.h
+include/openvdb/tools/LevelSetUtil.h
+include/openvdb/tools/Mask.h
+include/openvdb/tools/MeshToVolume.h
+include/openvdb/tools/Morphology.h
+include/openvdb/tools/MultiResGrid.h
+include/openvdb/tools/ParticleAtlas.h
+include/openvdb/tools/ParticlesToLevelSet.h
+include/openvdb/tools/PointAdvect.h
+include/openvdb/tools/PointIndexGrid.h
+include/openvdb/tools/PointPartitioner.h
+include/openvdb/tools/PointScatter.h
+include/openvdb/tools/PointsToMask.h
+include/openvdb/tools/PoissonSolver.h
+include/openvdb/tools/PotentialFlow.h
+include/openvdb/tools/Prune.h
+include/openvdb/tools/RayIntersector.h
+include/openvdb/tools/RayTracer.h
+include/openvdb/tools/SignedFloodFill.h
+include/openvdb/tools/Statistics.h
+include/openvdb/tools/TopologyToLevelSet.h
+include/openvdb/tools/ValueTransformer.h
+include/openvdb/tools/VectorTransformer.h
+include/openvdb/tools/VelocityFields.h
+include/openvdb/tools/VolumeAdvect.h
+include/openvdb/tools/VolumeToMesh.h
+include/openvdb/tools/VolumeToSpheres.h
+include/openvdb/tree/InternalNode.h
+include/openvdb/tree/Iterator.h
+include/openvdb/tree/LeafBuffer.h
+include/openvdb/tree/LeafManager.h
+include/openvdb/tree/LeafNode.h
+include/openvdb/tree/LeafNodeBool.h
+include/openvdb/tree/LeafNodeMask.h
+include/openvdb/tree/NodeManager.h
+include/openvdb/tree/NodeUnion.h
+include/openvdb/tree/RootNode.h
+include/openvdb/tree/Tree.h
+include/openvdb/tree/TreeIterator.h
+include/openvdb/tree/ValueAccessor.h
+include/openvdb/util/CpuTimer.h
+include/openvdb/util/Formats.h
+include/openvdb/util/MapsUtil.h
+include/openvdb/util/Name.h
+include/openvdb/util/NodeMasks.h
+include/openvdb/util/NullInterrupter.h
+include/openvdb/util/PagedArray.h
+include/openvdb/util/Util.h
+include/openvdb/util/logging.h
+include/openvdb/version.h
+lib/cmake/OpenVDB/FindBlosc.cmake
+lib/cmake/OpenVDB/FindCppUnit.cmake
+lib/cmake/OpenVDB/FindIlmBase.cmake
+lib/cmake/OpenVDB/FindLog4cplus.cmake
+lib/cmake/OpenVDB/FindOpenEXR.cmake
+lib/cmake/OpenVDB/FindOpenVDB.cmake
+lib/cmake/OpenVDB/FindTBB.cmake
+lib/cmake/OpenVDB/OpenVDBGLFW3Setup.cmake
+lib/cmake/OpenVDB/OpenVDBHoudiniSetup.cmake
+lib/cmake/OpenVDB/OpenVDBMayaSetup.cmake
+lib/cmake/OpenVDB/OpenVDBUtils.cmake
+lib/libopenvdb.so
+lib/libopenvdb.so.6.1
+lib/libopenvdb.so.6.1.0
+%%PYTHON%%%%PYTHON_LIBDIR%%/pyopenvdb.so
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@ -439,7 +439,6 @@
    SUBDIR += vdr-plugin-softhddevice
    SUBDIR += vdr-plugin-streamdev
    SUBDIR += vdr-plugin-ttxtsubs
-    SUBDIR += vdr-plugin-upnp
    SUBDIR += vdr-plugin-vdrmanager
    SUBDIR += vdr-plugin-vnsiserver
    SUBDIR += vdr-plugin-wirbelscan
--- a/multimedia/rav1e/Makefile
+++ b/multimedia/rav1e/Makefile
@ -2,6 +2,7 @@

 PORTNAME=	rav1e
 PORTVERSION=	s20190510
+PORTREVISION=	1
 CATEGORIES=	multimedia

 MAINTAINER=	jbeich@FreeBSD.org
--- a/multimedia/vdr-plugin-upnp/Makefile
+++ b/multimedia/vdr-plugin-upnp/Makefile
@ -1,64 +0,0 @@
-# Created by: Juergen Lock <nox@FreeBSD.org>
-# $FreeBSD$
-
-PORTNAME=	vdr-plugin-upnp
-PORTVERSION=	0.0.2a2
-PORTREVISION=	39
-CATEGORIES=	multimedia
-MASTER_SITES=	http://projects.vdr-developer.org/attachments/download/177/
-DISTNAME=	${PORTNAME:S/-plugin-/-/}-${DISTVERSIONPREFIX}${DISTVERSION:S/a/-alpha/}${DISTVERSIONSUFFIX}
-DIST_SUBDIR=	vdr
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Video Disk Recorder - UPnP/DLNA plugin (alpha!)
-
-LICENSE=	GPLv2+
-LICENSE_FILE=	${WRKSRC}/COPYING
-
-DEPRECATED=		Unmaintained upstream and does not build with upnp >= 1.8
-EXPIRATION_DATE=	2019-05-15
-
-BROKEN_FreeBSD_12=	fails to compile: inc/util.h:21:10: 'libavformat/avformat.h' file not found
-BROKEN_FreeBSD_13=	fails to compile: inc/util.h:21:10: 'libavformat/avformat.h' file not found
-
-LIB_DEPENDS=	libavcodec0.so:multimedia/ffmpeg0 \
-		libboost_system.so:devel/boost-libs \
-		libupnp.so:devel/upnp \
-		libsqlite3.so:databases/sqlite3
-
-USES=		tar:tgz
-PATCH_STRIP=	-p1
-WRKSRC=		${WRKDIR}/${PLUGIN}-${DISTVERSION:S/a2//}
-
-CXXFLAGS+=	-L${LOCALBASE}/lib/ffmpeg0 -lavcodec0 -lavformat0 -fPIC
-MAKE_ARGS=	LIBS="-I${LOCALBASE}/include/ffmpeg0" CXXFLAGS="${CXXFLAGS}"
-
-PORTDOCS=	README HISTORY
-
-OPTIONS_DEFINE=	DOCS NLS
-
-.include	"${.CURDIR}/../vdr/Makefile.plugins"
-
-post-patch: post-patch-plugin
-	@${REINPLACE_CMD} \
-		-e 's,lavcodec,lavcodec0,g' \
-		-e 's,lavformat,lavformat0,g' \
-		${WRKSRC}/Makefile
-
-pre-install:
-	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/vdr
-
-post-install: post-install-pluginlocales
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/http/icons
-	${INSTALL_DATA} ${WRKSRC}/http/icons/* \
-		${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/http/icons
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/http/xml
-	${INSTALL_DATA} ${WRKSRC}/http/xml/* \
-		${STAGEDIR}${PREFIX}/etc/vdr/plugins/${PLUGIN}/http/xml
-	@${MKDIR} ${STAGEDIR}/var/cache/vdr/${PLUGIN}
-
-post-install-DOCS-on:
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR})
-
-.include <bsd.port.mk>
--- a/multimedia/vdr-plugin-upnp/distinfo
+++ b/multimedia/vdr-plugin-upnp/distinfo
@ -1,2 +0,0 @@
-SHA256 (vdr/vdr-upnp-0.0.2-alpha2.tgz) = 5c5acff28e287b6ac59bd14c93cee1ce932bb8e2d0f9191cbb5a1314e6976ab3
-SIZE (vdr/vdr-upnp-0.0.2-alpha2.tgz) = 152762
--- a/multimedia/vdr-plugin-upnp/files/patch-Makefile
+++ b/multimedia/vdr-plugin-upnp/files/patch-Makefile
@ -1,31 +0,0 @@
--- a/Makefile
-+++ b/Makefile
-@@ -42,6 +42,9 @@ PACKAGE = vdr-$(ARCHIVE)
- 
- ### Includes and Defines (add further entries here):
- 
-+ifdef FREEBSD
-+LIBS += -L${LOCALBASE}/lib
-+endif
- LIBS += -lupnp -lixml -lsqlite3 -lavformat -lavcodec
- 
- INCLUDES += -I$(VDRDIR)/include	-I/usr/include -Iinc \
-@@ -150,7 +153,11 @@ i18n: $(I18Nmsgs) $(I18Npot)
- 
- libvdr-$(PLUGIN).so: $(OBJS)
- 	$(CXX) $(CXXFLAGS) $(LIBS) -shared $(OBJS) -o $@ -lc
-+ifdef FREEBSD
-+	@cp -f $@ $(LIBDIR)/$@.$(APIVERSION)
-+else
- 	@cp --remove-destination $@ $(LIBDIR)/$@.$(APIVERSION)
-+endif
- 
- dist: clean
- 	@-rm -rf $(TMPDIR)/$(ARCHIVE)
-@@ -162,3 +169,6 @@ dist: clean
- 
- clean:
- 	@-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ $(PODIR)/*.mo $(PODIR)/*.pot
-+
-+install:
-+	${INSTALL_PROGRAM} $(LIBDIR)/libvdr-$(PLUGIN).so.$(APIVERSION) ${DESTDIR}$(PREFIX)/lib/vdr/libvdr-$(PLUGIN).so.$(APIVERSION)
--- a/multimedia/vdr-plugin-upnp/files/patch-badvideo
+++ b/multimedia/vdr-plugin-upnp/files/patch-badvideo
@ -1,23 +0,0 @@
--- a/dlna/avdetector.cpp
-+++ b/dlna/avdetector.cpp
-@@ -262,7 +262,8 @@ int cAudioVideoDetector::detectDLNAProfi
- }
- 
- AVCodecContext* cCodecToolKit::getFirstCodecContext(AVFormatContext* FormatCtx, CodecType Type){
-    return cCodecToolKit::getFirstStream(FormatCtx, Type)->codec;
-+    AVStream* ret = cCodecToolKit::getFirstStream(FormatCtx, Type);
-+    return ret ? ret->codec : NULL;
- }
- 
- AVStream* cCodecToolKit::getFirstStream(AVFormatContext* FormatCtx, CodecType Type){
--- a/dlna/profiles/mpeg2.cpp
-+++ b/dlna/profiles/mpeg2.cpp
-@@ -159,6 +159,8 @@ VideoPortionProfile cMPEG2Profiler::prob
-     AVCodecContext* VideoCodec = cCodecToolKit::getFirstCodecContext(FormatCtx, CODEC_TYPE_VIDEO);
-     AVStream* VideoStream = cCodecToolKit::getFirstStream(FormatCtx, CODEC_TYPE_VIDEO);
- 
-+    if (VideoCodec == NULL || VideoStream == NULL)
-+        return DLNA_VPP_UNKNOWN;
-     MESSAGE(VERBOSE_METADATA, "Codec-ID:             %d", VideoCodec->codec_id);
-     MESSAGE(VERBOSE_METADATA, "Codec-Name:           %s", VideoCodec->codec_name);
-     MESSAGE(VERBOSE_METADATA, "Codec Bitrate:        %d", VideoCodec->bit_rate);
--- a/multimedia/vdr-plugin-upnp/files/patch-clang
+++ b/multimedia/vdr-plugin-upnp/files/patch-clang
@ -1,207 +0,0 @@
--- a/misc/util.cpp
-+++ b/misc/util.cpp
-@@ -331,105 +331,105 @@ const char* escapeXMLCharacters(const ch
-     for(unsigned int i = 0; i < strlen(Data); i++){
-         Char = Data[i];
-         switch(Char){
-            case L'€': NewData += "&euro;"; break;
-            case L'"': NewData += "&quot;"; break;
-            case L'&': NewData += "&amp;"; break;
-            case L'<': NewData += "&lt;"; break;
-            case L'>': NewData += "&gt;"; break;
-            case L'¡': NewData += "&iexcl;"; break;
-            case L'¢': NewData += "&cent;"; break;
-            case L'£': NewData += "&pound;"; break;
-            case L'¤': NewData += "&curren;"; break;
-            case L'¥': NewData += "&yen;"; break;
-            case L'¦': NewData += "&brvbar;"; break;
-            case L'§': NewData += "&sect;"; break;
-            case L'¨': NewData += "&uml;"; break;
-            case L'©': NewData += "&copy;"; break;
-            case L'ª': NewData += "&ordf;"; break;
-            case L'¬': NewData += "&not;"; break;
-            case L'': NewData += "&shy;"; break;
-            case L'®': NewData += "&reg;"; break;
-            case L'¯': NewData += "&macr;"; break;
-            case L'°': NewData += "&deg;"; break;
-            case L'±': NewData += "&plusmn;"; break;
-            case L'²': NewData += "&sup2;"; break;
-            case L'³': NewData += "&sup3;"; break;
-            case L'´': NewData += "&acute;"; break;
-            case L'µ': NewData += "&micro;"; break;
-            case L'¶': NewData += "&para;"; break;
-            case L'·': NewData += "&middot;"; break;
-            case L'¸': NewData += "&cedil;"; break;
-            case L'¹': NewData += "&sup1;"; break;
-            case L'º': NewData += "&ordm;"; break;
-            case L'»': NewData += "&raquo;"; break;
-            case L'«': NewData += "&laquo;"; break;
-            case L'¼': NewData += "&frac14;"; break;
-            case L'½': NewData += "&frac12;"; break;
-            case L'¾': NewData += "&frac34;"; break;
-            case L'¿': NewData += "&iquest;"; break;
-            case L'À': NewData += "&Agrave;"; break;
-            case L'Á': NewData += "&Aacute;"; break;
-            case L'Â': NewData += "&Acirc;"; break;
-            case L'Ã': NewData += "&Atilde;"; break;
-            case L'Ä': NewData += "&Auml;"; break;
-            case L'Å': NewData += "&Aring;"; break;
-            case L'Æ': NewData += "&AElig;"; break;
-            case L'Ç': NewData += "&Ccedil;"; break;
-            case L'È': NewData += "&Egrave;"; break;
-            case L'É': NewData += "&Eacute;"; break;
-            case L'Ê': NewData += "&Ecirc;"; break;
-            case L'Ë': NewData += "&Euml;"; break;
-            case L'Ì': NewData += "&Igrave;"; break;
-            case L'Í': NewData += "&Iacute;"; break;
-            case L'Î': NewData += "&Icirc;"; break;
-            case L'Ï': NewData += "&Iuml;"; break;
-            case L'Ð': NewData += "&ETH;"; break;
-            case L'Ñ': NewData += "&Ntilde;"; break;
-            case L'Ò': NewData += "&Ograve;"; break;
-            case L'Ó': NewData += "&Oacute;"; break;
-            case L'Ô': NewData += "&Ocirc;"; break;
-            case L'Õ': NewData += "&Otilde;"; break;
-            case L'Ö': NewData += "&Ouml;"; break;
-            case L'×': NewData += "&times;"; break;
-            case L'Ø': NewData += "&Oslash;"; break;
-            case L'Ù': NewData += "&Ugrave;"; break;
-            case L'Ú': NewData += "&Uacute;"; break;
-            case L'Û': NewData += "&Ucirc;"; break;
-            case L'Ü': NewData += "&Uuml;"; break;
-            case L'Ý': NewData += "&Yacute;"; break;
-            case L'Þ': NewData += "&THORN;"; break;
-            case L'ß': NewData += "&szlig;"; break;
-            case L'à': NewData += "&agrave;"; break;
-            case L'á': NewData += "&aacute;"; break;
-            case L'â': NewData += "&acirc;"; break;
-            case L'ã': NewData += "&atilde;"; break;
-            case L'ä': NewData += "&auml;"; break;
-            case L'å': NewData += "&aring;"; break;
-            case L'æ': NewData += "&aelig;"; break;
-            case L'ç': NewData += "&ccedil;"; break;
-            case L'è': NewData += "&egrave;"; break;
-            case L'é': NewData += "&eacute;"; break;
-            case L'ê': NewData += "&ecirc;"; break;
-            case L'ë': NewData += "&euml;"; break;
-            case L'ì': NewData += "&igrave;"; break;
-            case L'í': NewData += "&iacute;"; break;
-            case L'î': NewData += "&icirc;"; break;
-            case L'ï': NewData += "&iuml;"; break;
-            case L'ð': NewData += "&eth;"; break;
-            case L'ñ': NewData += "&ntilde;"; break;
-            case L'ò': NewData += "&ograve;"; break;
-            case L'ó': NewData += "&oacute;"; break;
-            case L'ô': NewData += "&ocirc;"; break;
-            case L'õ': NewData += "&otilde;"; break;
-            case L'ö': NewData += "&ouml;"; break;
-            case L'÷': NewData += "&divide;"; break;
-            case L'ø': NewData += "&oslash;"; break;
-            case L'ù': NewData += "&ugrave;"; break;
-            case L'ú': NewData += "&uacute;"; break;
-            case L'û': NewData += "&ucirc;"; break;
-            case L'ü': NewData += "&uuml;"; break;
-            case L'ý': NewData += "&yacute;"; break;
-            case L'þ': NewData += "&thorn;"; break;
-+            case /* L'€' */ 0x20ac: NewData += "&euro;"; break;
-+            case /* L'"' */ 0x22: NewData += "&quot;"; break;
-+            case /* L'&' */ 0x26: NewData += "&amp;"; break;
-+            case /* L'<' */ 0x3c: NewData += "&lt;"; break;
-+            case /* L'>' */ 0x3e: NewData += "&gt;"; break;
-+            case /* L'¡' */ 0xa1: NewData += "&iexcl;"; break;
-+            case /* L'¢' */ 0xa2: NewData += "&cent;"; break;
-+            case /* L'£' */ 0xa3: NewData += "&pound;"; break;
-+            case /* L'¤' */ 0xa4: NewData += "&curren;"; break;
-+            case /* L'¥' */ 0xa5: NewData += "&yen;"; break;
-+            case /* L'¦' */ 0xa6: NewData += "&brvbar;"; break;
-+            case /* L'§' */ 0xa7: NewData += "&sect;"; break;
-+            case /* L'¨' */ 0xa8: NewData += "&uml;"; break;
-+            case /* L'©' */ 0xa9: NewData += "&copy;"; break;
-+            case /* L'ª' */ 0xaa: NewData += "&ordf;"; break;
-+            case /* L'¬' */ 0xac: NewData += "&not;"; break;
-+            case /* L'' */ 0xad: NewData += "&shy;"; break;
-+            case /* L'®' */ 0xae: NewData += "&reg;"; break;
-+            case /* L'¯' */ 0xaf: NewData += "&macr;"; break;
-+            case /* L'°' */ 0xb0: NewData += "&deg;"; break;
-+            case /* L'±' */ 0xb1: NewData += "&plusmn;"; break;
-+            case /* L'²' */ 0xb2: NewData += "&sup2;"; break;
-+            case /* L'³' */ 0xb3: NewData += "&sup3;"; break;
-+            case /* L'´' */ 0xb4: NewData += "&acute;"; break;
-+            case /* L'µ' */ 0xb5: NewData += "&micro;"; break;
-+            case /* L'¶' */ 0xb6: NewData += "&para;"; break;
-+            case /* L'·' */ 0xb7: NewData += "&middot;"; break;
-+            case /* L'¸' */ 0xb8: NewData += "&cedil;"; break;
-+            case /* L'¹' */ 0xb9: NewData += "&sup1;"; break;
-+            case /* L'º' */ 0xba: NewData += "&ordm;"; break;
-+            case /* L'»' */ 0xbb: NewData += "&raquo;"; break;
-+            case /* L'«' */ 0xab: NewData += "&laquo;"; break;
-+            case /* L'¼' */ 0xbc: NewData += "&frac14;"; break;
-+            case /* L'½' */ 0xbd: NewData += "&frac12;"; break;
-+            case /* L'¾' */ 0xbe: NewData += "&frac34;"; break;
-+            case /* L'¿' */ 0xbf: NewData += "&iquest;"; break;
-+            case /* L'À' */ 0xc0: NewData += "&Agrave;"; break;
-+            case /* L'Á' */ 0xc1: NewData += "&Aacute;"; break;
-+            case /* L'Â' */ 0xc2: NewData += "&Acirc;"; break;
-+            case /* L'Ã' */ 0xc3: NewData += "&Atilde;"; break;
-+            case /* L'Ä' */ 0xc4: NewData += "&Auml;"; break;
-+            case /* L'Å' */ 0xc5: NewData += "&Aring;"; break;
-+            case /* L'Æ' */ 0xc6: NewData += "&AElig;"; break;
-+            case /* L'Ç' */ 0xc7: NewData += "&Ccedil;"; break;
-+            case /* L'È' */ 0xc8: NewData += "&Egrave;"; break;
-+            case /* L'É' */ 0xc9: NewData += "&Eacute;"; break;
-+            case /* L'Ê' */ 0xca: NewData += "&Ecirc;"; break;
-+            case /* L'Ë' */ 0xcb: NewData += "&Euml;"; break;
-+            case /* L'Ì' */ 0xcc: NewData += "&Igrave;"; break;
-+            case /* L'Í' */ 0xcd: NewData += "&Iacute;"; break;
-+            case /* L'Î' */ 0xce: NewData += "&Icirc;"; break;
-+            case /* L'Ï' */ 0xcf: NewData += "&Iuml;"; break;
-+            case /* L'Ð' */ 0xd0: NewData += "&ETH;"; break;
-+            case /* L'Ñ' */ 0xd1: NewData += "&Ntilde;"; break;
-+            case /* L'Ò' */ 0xd2: NewData += "&Ograve;"; break;
-+            case /* L'Ó' */ 0xd3: NewData += "&Oacute;"; break;
-+            case /* L'Ô' */ 0xd4: NewData += "&Ocirc;"; break;
-+            case /* L'Õ' */ 0xd5: NewData += "&Otilde;"; break;
-+            case /* L'Ö' */ 0xd6: NewData += "&Ouml;"; break;
-+            case /* L'×' */ 0xd7: NewData += "&times;"; break;
-+            case /* L'Ø' */ 0xd8: NewData += "&Oslash;"; break;
-+            case /* L'Ù' */ 0xd9: NewData += "&Ugrave;"; break;
-+            case /* L'Ú' */ 0xda: NewData += "&Uacute;"; break;
-+            case /* L'Û' */ 0xdb: NewData += "&Ucirc;"; break;
-+            case /* L'Ü' */ 0xdc: NewData += "&Uuml;"; break;
-+            case /* L'Ý' */ 0xdd: NewData += "&Yacute;"; break;
-+            case /* L'Þ' */ 0xde: NewData += "&THORN;"; break;
-+            case /* L'ß' */ 0xdf: NewData += "&szlig;"; break;
-+            case /* L'à' */ 0xe0: NewData += "&agrave;"; break;
-+            case /* L'á' */ 0xe1: NewData += "&aacute;"; break;
-+            case /* L'â' */ 0xe2: NewData += "&acirc;"; break;
-+            case /* L'ã' */ 0xe3: NewData += "&atilde;"; break;
-+            case /* L'ä' */ 0xe4: NewData += "&auml;"; break;
-+            case /* L'å' */ 0xe5: NewData += "&aring;"; break;
-+            case /* L'æ' */ 0xe6: NewData += "&aelig;"; break;
-+            case /* L'ç' */ 0xe7: NewData += "&ccedil;"; break;
-+            case /* L'è' */ 0xe8: NewData += "&egrave;"; break;
-+            case /* L'é' */ 0xe9: NewData += "&eacute;"; break;
-+            case /* L'ê' */ 0xea: NewData += "&ecirc;"; break;
-+            case /* L'ë' */ 0xeb: NewData += "&euml;"; break;
-+            case /* L'ì' */ 0xec: NewData += "&igrave;"; break;
-+            case /* L'í' */ 0xed: NewData += "&iacute;"; break;
-+            case /* L'î' */ 0xee: NewData += "&icirc;"; break;
-+            case /* L'ï' */ 0xef: NewData += "&iuml;"; break;
-+            case /* L'ð' */ 0xf0: NewData += "&eth;"; break;
-+            case /* L'ñ' */ 0xf1: NewData += "&ntilde;"; break;
-+            case /* L'ò' */ 0xf2: NewData += "&ograve;"; break;
-+            case /* L'ó' */ 0xf3: NewData += "&oacute;"; break;
-+            case /* L'ô' */ 0xf4: NewData += "&ocirc;"; break;
-+            case /* L'õ' */ 0xf5: NewData += "&otilde;"; break;
-+            case /* L'ö' */ 0xf6: NewData += "&ouml;"; break;
-+            case /* L'÷' */ 0xf7: NewData += "&divide;"; break;
-+            case /* L'ø' */ 0xf8: NewData += "&oslash;"; break;
-+            case /* L'ù' */ 0xf9: NewData += "&ugrave;"; break;
-+            case /* L'ú' */ 0xfa: NewData += "&uacute;"; break;
-+            case /* L'û' */ 0xfb: NewData += "&ucirc;"; break;
-+            case /* L'ü' */ 0xfc: NewData += "&uuml;"; break;
-+            case /* L'ý' */ 0xfd: NewData += "&yacute;"; break;
-+            case /* L'þ' */ 0xfe: NewData += "&thorn;"; break;
-             default: NewData += Data[i]; break;
-         }
-     }
--- a/multimedia/vdr-plugin-upnp/files/patch-freebsd
+++ b/multimedia/vdr-plugin-upnp/files/patch-freebsd
@ -1,83 +0,0 @@
--- a/misc/util.cpp
-+++ b/misc/util.cpp
-@@ -12,6 +12,14 @@
- #include <string.h>
- #include <string>
- #include <sys/ioctl.h>
-+#ifdef __FreeBSD__
-+#include <sys/socket.h>
-+#include <ifaddrs.h>
-+#include <net/if.h>
-+#include <net/if_dl.h>
-+#include <net/if_types.h>
-+#include <net/ethernet.h>
-+#endif
- #include <net/if.h>
- #include <upnp/ixml.h>
- #include <arpa/inet.h>
-@@ -74,6 +82,7 @@ char* substr(const char* str, unsigned i
- }
- 
- const char* getMACFromInterface(const char* Interface) {
-+#ifndef __FreeBSD__
-     int fd;
-     struct ifreq ifr;
- 
-@@ -95,6 +104,31 @@ const char* getMACFromInterface(const ch
-          (unsigned char)ifr.ifr_hwaddr.sa_data[3],
-          (unsigned char)ifr.ifr_hwaddr.sa_data[4],
-          (unsigned char)ifr.ifr_hwaddr.sa_data[5]);
-+#else
-+    struct ifaddrs *ifa, *ifp = NULL;
-+    char *ret = new char[18];
-+    strcpy(ret, "00:00:00:00:00:00");
-+
-+    if (!Interface || getifaddrs(&ifp) < 0)
-+        return ret;
-+
-+    for (ifa = ifp; ifa != NULL; ifa = ifa->ifa_next) {
-+        if (strcmp(ifa->ifa_name, Interface))
-+            continue;
-+
-+        if (ifa->ifa_addr->sa_family == AF_LINK) {
-+            struct sockaddr_dl *sdl =
-+                (struct sockaddr_dl *)ifa->ifa_addr;
-+
-+            if (sdl->sdl_type == IFT_ETHER &&
-+                sdl->sdl_alen == ETHER_ADDR_LEN)
-+                snprintf(ret, 18, "%s",
-+                    ether_ntoa((struct ether_addr *)LLADDR(sdl)));
-+                break;
-+        }
-+    }
-+    freeifaddrs(ifp);
-+#endif
- 
-     return ret;
- }
--- a/server/server.cpp
-+++ b/server/server.cpp
-@@ -8,6 +8,9 @@
- #include <vdr/plugin.h>
- #include <stdlib.h>
- #include <string.h>
-+#ifdef __FreeBSD__
-+#include <sys/socket.h>
-+#endif
- #include <arpa/inet.h>
- #include <upnp/upnp.h>
- #include "server.h"
--- a/database/database.cpp
-+++ b/database/database.cpp
-@@ -161,7 +161,11 @@ bool cRow::fetchColumn(char** Column, ch
- 
- int cSQLiteDatabase::initialize(){
-     int ret;
-+#ifdef __FreeBSD__
-+    const char* dbdir = (cUPnPConfig::get()->mDatabaseFolder) ? cUPnPConfig::get()->mDatabaseFolder : "/var/cache/vdr/upnp";
-+#else
-     const char* dbdir = (cUPnPConfig::get()->mDatabaseFolder) ? cUPnPConfig::get()->mDatabaseFolder : cPluginUpnp::getConfigDirectory();
-+#endif
-     cString File = cString::sprintf("%s/%s", dbdir, SQLITE_DB_FILE);
-     if((ret = sqlite3_open(File, &this->mDatabase))){
-         ERROR("Unable to open database file %s (Error code: %d)!", *File, ret);
--- a/multimedia/vdr-plugin-upnp/files/patch-fromgit
+++ b/multimedia/vdr-plugin-upnp/files/patch-fromgit
@ -1,23 +0,0 @@
--- a/database/metadata.cpp
-+++ b/database/metadata.cpp
-@@ -461,11 +471,20 @@ void cMediaDatabase::Action(){
-     time_t LastEPGUpdate = 0;
-     while(this->Running()){
- 
-+#ifndef WITHOUT_TV
-         if(cSchedules::Modified() >= LastEPGUpdate){
-             MESSAGE(VERBOSE_EPG_UPDATES, "Schedule changed. Updating...");
-             updateChannelEPG();
-             LastEPGUpdate = cSchedules::Modified();
-         }
-+#endif
-+#ifndef WITHOUT_RECORDS
-+        int NotUsed;
-+        if(Recordings.StateChanged(NotUsed)){
-+            MESSAGE(VERBOSE_EPG_UPDATES, "Recordings changed. Updating...");
-+            loadRecordings();
-+        }
-+#endif
- 
-         cCondWait::SleepMs(60 * 1000); // sleep a minute
-     }
--- a/multimedia/vdr-plugin-upnp/files/patch-iconv
+++ b/multimedia/vdr-plugin-upnp/files/patch-iconv
@ -1,44 +0,0 @@
--- a/inc/upnp/contentdirectory.h
-+++ b/inc/upnp/contentdirectory.h
-@@ -39,6 +39,7 @@ public:
-     virtual void setError(Upnp_Action_Request* Request, int Error);
- private:
-     cMediaDatabase*             mMediaDatabase;
-+    cCharSetConv*               mconv;
-     void Action();
-     int getSearchCapabilities(Upnp_Action_Request* Request);
-     int getSortCapabilities(Upnp_Action_Request* Request);
--- a/upnp/contentdirectory.cpp
-+++ b/upnp/contentdirectory.cpp
-@@ -14,9 +14,13 @@
- cContentDirectory::cContentDirectory(UpnpDevice_Handle DeviceHandle, cMediaDatabase* MediaDatabase)
- : cUpnpService(DeviceHandle) {
-     this->mMediaDatabase = MediaDatabase;
-+    this->mconv = new cCharSetConv((cCharSetConv::SystemCharacterTable() ?
-+                                          cCharSetConv::SystemCharacterTable() : "UTF-8"), "UTF-8");
- }
- 
-cContentDirectory::~cContentDirectory() {}
-+cContentDirectory::~cContentDirectory() {
-+    delete this->mconv;
-+}
- 
- int cContentDirectory::subscribe(Upnp_Subscription_Request* Request){
-     IXML_Document* PropertySet = NULL;
-@@ -149,8 +153,15 @@ int cContentDirectory::browse(Upnp_Actio
-         return Request->ErrCode;
-     }
- 
-+    const char *utf8Result = this->mconv->Convert(ResultSet->mResult);
-+    if(!utf8Result){
-+        ERROR("Converting XML data failed");
-+        this->setError(Request, UPNP_SOAP_E_ACTION_FAILED);
-+        return Request->ErrCode;
-+    }
-+
-     char* escapedResult = NULL;
-    escapeXMLCharacters(ResultSet->mResult, &escapedResult);
-+    escapeXMLCharacters(utf8Result, &escapedResult);
- 
-     if(!escapedResult){
-         ERROR("Escaping XML data failed");
--- a/multimedia/vdr-plugin-upnp/files/patch-libupnp1.6.9
+++ b/multimedia/vdr-plugin-upnp/files/patch-libupnp1.6.9
@ -1,183 +0,0 @@
--- a/database/object.cpp
-+++ b/database/object.cpp
-@@ -7,6 +7,7 @@
- 
- #include <string.h>
- #include <stdio.h>
-+#include <upnp/upnp.h>
- #include <upnp/upnptools.h>
- #include <vdr/recording.h>
- #include <vector>
--- a/inc/util.h
-+++ b/inc/util.h
-@@ -20,6 +20,12 @@ extern "C" {
- 
- #include <libavformat/avformat.h>
- #include <libavcodec/avcodec.h>
-+
-+#ifdef __FreeBSD__
-+#define off64_t off_t
-+#endif
-+#include <netinet/in.h>
-+
- /**
-  * Compares two strings
-  *
-@@ -147,5 +153,7 @@ public:
- 	virtual eOSState ProcessKey(eKeys Key);
- };
- 
-+const char *IPAddrP(struct sockaddr_storage &IPAddr, char *buf, size_t buflen);
-+
- #endif	/* _UTIL_H */
- 
--- a/inc/webserver.h
-+++ b/inc/webserver.h
-@@ -22,7 +22,9 @@ class cUPnPWebServer {
-     friend class cUPnPServer;
- private:
-     static cUPnPWebServer *mInstance;
-+#ifdef OLDUPNPAPI
-     static UpnpVirtualDirCallbacks mVirtualDirCallbacks;
-+#endif
-     const char* mRootdir;
-     cUPnPWebServer(const char* root = "/");
- protected:
--- a/misc/util.cpp
-+++ b/misc/util.cpp
-@@ -532,4 +567,16 @@ IXML_Element* ixmlAddFilteredProperty(cS
-         return ixmlAddProperty(document, node, upnpproperty, value);
-     else
-         return NULL;
-}
-\ No newline at end of file
-+}
-+
-+const char *IPAddrP(struct sockaddr_storage &IPAddr, char *buf, size_t buflen){
-+    *buf = '\0';
-+    if (IPAddr.ss_family == AF_INET) {
-+        inet_ntop(AF_INET, (void *)&((struct sockaddr_in *)&IPAddr)->sin_addr, buf, buflen);
-+        return buf;
-+    } else if (IPAddr.ss_family == AF_INET6) {
-+        inet_ntop(AF_INET6, (void *)&((struct sockaddr_in6 *)&IPAddr)->sin6_addr, buf, buflen);
-+        return buf;
-+    }
-+    return "??";
-+}
--- a/server/webserver.cpp
-+++ b/server/webserver.cpp
-@@ -100,6 +100,7 @@ cUPnPWebServer::~cUPnPWebServer(){}
- 
- cUPnPWebServer* cUPnPWebServer::mInstance = NULL;
- 
-+#ifdef OLDUPNPAPI
- UpnpVirtualDirCallbacks cUPnPWebServer::mVirtualDirCallbacks = {
-     cUPnPWebServer::getInfo,
-     cUPnPWebServer::open,
-@@ -108,6 +109,7 @@ UpnpVirtualDirCallbacks cUPnPWebServer::
-     cUPnPWebServer::seek,
-     cUPnPWebServer::close
- };
-+#endif
- 
- bool cUPnPWebServer::init(){
-     MESSAGE(VERBOSE_WEBSERVER, "Initialize callbacks for virtual directories.");
-@@ -118,7 +120,16 @@ bool cUPnPWebServer::init(){
-     }
-     MESSAGE(VERBOSE_WEBSERVER, "Setting up callbacks");
- 
-+#ifdef OLDUPNPAPI
-     if(UpnpSetVirtualDirCallbacks(&cUPnPWebServer::mVirtualDirCallbacks) == UPNP_E_INVALID_ARGUMENT){
-+#else
-+    if(UpnpVirtualDir_set_GetInfoCallback(&cUPnPWebServer::getInfo) != UPNP_E_SUCCESS ||
-+       UpnpVirtualDir_set_OpenCallback(&cUPnPWebServer::open) != UPNP_E_SUCCESS ||
-+       UpnpVirtualDir_set_ReadCallback(&cUPnPWebServer::read) != UPNP_E_SUCCESS ||
-+       UpnpVirtualDir_set_WriteCallback(&cUPnPWebServer::write) != UPNP_E_SUCCESS ||
-+       UpnpVirtualDir_set_SeekCallback(&cUPnPWebServer::seek) != UPNP_E_SUCCESS ||
-+       UpnpVirtualDir_set_CloseCallback(&cUPnPWebServer::close) != UPNP_E_SUCCESS){
-+#endif
-         ERROR("The virtual directory callbacks are invalid.");
-         return false;
-     }
--- a/upnp/connectionmanager.cpp
-+++ b/upnp/connectionmanager.cpp
-@@ -7,6 +7,8 @@
- 
- #include <string.h>
- #include <upnp/ixml.h>
-+/* XXX */
-+#define UPNP_HAVE_TOOLS 1
- #include <upnp/upnptools.h>
- #include <vdr/tools.h>
- #include "upnp/connectionmanager.h"
-@@ -70,7 +72,8 @@ int cConnectionManager::execute(Upnp_Act
- }
- 
- int cConnectionManager::getProtocolInfo(Upnp_Action_Request* Request){
-    MESSAGE(VERBOSE_CMS, "Protocol info requested by %s.", inet_ntoa(Request->CtrlPtIPAddr));
-+    char buf[64];
-+    MESSAGE(VERBOSE_CMS, "Protocol info requested by %s.", IPAddrP(Request->CtrlPtIPAddr, buf, sizeof buf));
-     cString Result = cString::sprintf(
-             "<u:%sResponse xmlns:u=\"%s\"> \
-                 <Source>%s</Source> \
-@@ -87,7 +90,8 @@ int cConnectionManager::getProtocolInfo(
- }
- 
- int cConnectionManager::getCurrentConnectionIDs(Upnp_Action_Request* Request){
-    MESSAGE(VERBOSE_CMS, "Current connection IDs requested by %s.", inet_ntoa(Request->CtrlPtIPAddr));
-+    char buf[64];
-+    MESSAGE(VERBOSE_CMS, "Current connection IDs requested by %s.", IPAddrP(Request->CtrlPtIPAddr, buf, sizeof buf));
-     cString Result;
-     const char* IDs = this->getConnectionIDsCVS();
-     if(!IDs){
-@@ -109,7 +113,8 @@ int cConnectionManager::getCurrentConnec
- }
- 
- int cConnectionManager::getCurrentConnectionInfo(Upnp_Action_Request* Request){
-    MESSAGE(VERBOSE_CMS, "Current connection info requested by %s.", inet_ntoa(Request->CtrlPtIPAddr));
-+    char buf[64];
-+    MESSAGE(VERBOSE_CMS, "Current connection info requested by %s.", IPAddrP(Request->CtrlPtIPAddr, buf, sizeof buf));
-     int ConnectionID;
- 
-     if(this->parseIntegerValue(Request->ActionRequest, "ConnectionID", &ConnectionID) != 0){
-@@ -156,7 +161,8 @@ int cConnectionManager::getCurrentConnec
- }
- 
- int cConnectionManager::prepareForConnection(Upnp_Action_Request* Request){
-    MESSAGE(VERBOSE_CMS, "Request for a new connection by %s.", inet_ntoa(Request->CtrlPtIPAddr));
-+    char buf[64];
-+    MESSAGE(VERBOSE_CMS, "Request for a new connection by %s.", IPAddrP(Request->CtrlPtIPAddr, buf, sizeof buf));
-     //char* Result = NULL;
-     char* RemoteProtocolInfo = NULL;
-     char* PeerConnectionManager = NULL;
-@@ -198,7 +204,8 @@ int cConnectionManager::prepareForConnec
- }
- 
- int cConnectionManager::connectionComplete(Upnp_Action_Request* Request){
-    MESSAGE(VERBOSE_CMS, "Request for closing an open connection by %s.", inet_ntoa(Request->CtrlPtIPAddr));
-+    char buf[64];
-+    MESSAGE(VERBOSE_CMS, "Request for closing an open connection by %s.", IPAddrP(Request->CtrlPtIPAddr, buf, sizeof buf));
-     //char* Result = NULL;
-     int ConnectionID;
- 
--- a/upnp/contentdirectory.cpp
-+++ b/upnp/contentdirectory.cpp
-@@ -6,6 +6,8 @@
-  */
- 
- #include <upnp/ixml.h>
-+/* XXX */
-+#define UPNP_HAVE_TOOLS 1
- #include <upnp/upnptools.h>
- #include "upnp/contentdirectory.h"
- #include "../common.h"
-@@ -84,7 +90,8 @@ int cContentDirectory::execute(Upnp_Acti
- 
- 
- int cContentDirectory::browse(Upnp_Action_Request* Request){
-    MESSAGE(VERBOSE_CDS, "Browse requested by %s.", inet_ntoa(Request->CtrlPtIPAddr));
-+    char buf[64];
-+    MESSAGE(VERBOSE_CDS, "Browse requested by %s.", IPAddrP(Request->CtrlPtIPAddr, buf, sizeof buf));
- 
-     char* ObjectID = NULL;
-     if(this->parseStringValue(Request->ActionRequest, "ObjectID", &ObjectID)){
--- a/multimedia/vdr-plugin-upnp/files/patch-livetv-channelname
+++ b/multimedia/vdr-plugin-upnp/files/patch-livetv-channelname
@ -1,14 +0,0 @@
--- a/database/metadata.cpp
-+++ b/database/metadata.cpp
-@@ -364,7 +364,11 @@ void cMediaDatabase::updateChannelEPG(){
-                         MESSAGE(VERBOSE_EPG_UPDATES, "Updating details");
- 
-                         if(Event){
-+#if 1 // XXX easier to find the channels at least on xbmc
-+                            ChannelItem->setTitle(Channel->Name());
-+#else
-                             ChannelItem->setTitle(Event->Title()?Event->Title():Channel->Name());
-+#endif
-                             ChannelItem->setLongDescription(Event->Description());
-                             ChannelItem->setDescription(Event->ShortText());
-                         }
--- a/multimedia/vdr-plugin-upnp/files/patch-receiver-livereceiver.cpp
+++ b/multimedia/vdr-plugin-upnp/files/patch-receiver-livereceiver.cpp
@ -1,29 +0,0 @@
--- a/receiver/livereceiver.cpp
-+++ b/receiver/livereceiver.cpp
-@@ -31,9 +31,19 @@ cLiveReceiver* cLiveReceiver::newInstanc
-     }
- }
- 
-+#if (APIVERSNUM < 10725)
- cLiveReceiver::cLiveReceiver(cChannel *Channel, cDevice *Device)
- : cReceiver( Channel->GetChannelID(), 0, Channel->Vpid(), Channel->Apids(), Channel->Dpids(), Channel->Spids()),
-   mDevice(Device), mChannel(Channel){
-+#else
-+cLiveReceiver::cLiveReceiver(cChannel *Channel, cDevice *Device)
-+: cReceiver( Channel, 0),
-+  mDevice(Device), mChannel(Channel){
-+    AddPid(Channel->Vpid());
-+    AddPids(Channel->Apids());
-+    AddPids(Channel->Dpids());
-+    AddPids(Channel->Spids());
-+#endif
-     this->mLiveBuffer = NULL;
-     this->mOutputBuffer = NULL;
-     this->mFrameDetector = NULL;
-@@ -185,4 +195,4 @@ void cLiveReceiver::close(){
-     delete this->mLiveBuffer; this->mLiveBuffer = NULL;
-     this->mFrameDetector = NULL;
-     MESSAGE(VERBOSE_LIVE_TV, "Live receiver closed.");
-}
-\ No newline at end of file
-+}
--- a/multimedia/vdr-plugin-upnp/files/patch-recplayer-seek
+++ b/multimedia/vdr-plugin-upnp/files/patch-recplayer-seek
@ -1,33 +0,0 @@
--- a/receiver/recplayer.cpp
-+++ b/receiver/recplayer.cpp
-@@ -97,13 +97,14 @@ int cRecordingPlayer::seek(off_t offset,
-     }
-     // finally, we can seek
-     // TODO: binary search
-    for(index = 1; this->mLastOffsets[index]; index++){
-+    for(index = 1; index <= this->mLastFileNumber; index++){
-         if(this->mLastOffsets[index-1] <= offset && offset <= this->mLastOffsets[index]){
-             relativeOffset = offset - this->mLastOffsets[index-1];
-             break;
-         }
-     }
-    if(!(this->mCurrentFile = this->mRecordingFile->SetOffset(index, relativeOffset))){
-+    if(index > this->mLastFileNumber ||
-+        !(this->mCurrentFile = this->mRecordingFile->SetOffset(index, relativeOffset))){
-         // seeking failed!!! should never happen.
-         this->mCurrentFile = this->mRecordingFile->SetOffset(1);
-         return -1;
-@@ -115,9 +116,12 @@ int cRecordingPlayer::seek(off_t offset,
- void cRecordingPlayer::scanLastOffsets(){
-     // rewind
-     this->mCurrentFile = this->mRecordingFile->SetOffset(1);
-    for(int i = 1; (this->mCurrentFile = this->mRecordingFile->NextFile()); i++){
-+    this->mLastOffsets[0] = 0;
-+    this->mLastFileNumber = 1;
-+    for(int i = 1; this->mCurrentFile; i++){
-         this->mLastOffsets[i] = this->mLastOffsets[i-1] + this->mCurrentFile->Seek(0, SEEK_END);
-         this->mLastFileNumber = this->mRecordingFile->Number();
-+        this->mCurrentFile = this->mRecordingFile->NextFile();
-     }
- }
- 
--- a/multimedia/vdr-plugin-upnp/files/patch-size_t
+++ b/multimedia/vdr-plugin-upnp/files/patch-size_t
@ -1,51 +0,0 @@
--- a/database/object.cpp
-+++ b/database/object.cpp
-@@ -1023,7 +1024,7 @@ void cUPnPObjectFactory::registerMediato
-     }
-     MESSAGE(VERBOSE_SDK, "Registering mediator for class '%s'", UPnPClass);
-     this->mMediators[UPnPClass] = Mediator;
-    MESSAGE(VERBOSE_SDK, "Now %d mediators registered", this->mMediators.size());
-+    MESSAGE(VERBOSE_SDK, "Now %ld mediators registered", (long)this->mMediators.size());
-     return;
- }
- 
-@@ -1040,7 +1041,7 @@ void cUPnPObjectFactory::unregisterMedia
-     MESSAGE(VERBOSE_SDK, "Unregistering mediator for class '%s'", UPnPClass);
-     this->mMediators.erase(MediatorIterator);
-     if(freeMediator) delete MediatorIterator->second;
-    MESSAGE(VERBOSE_SDK, "Now %d mediators registered", this->mMediators.size());
-+    MESSAGE(VERBOSE_SDK, "Now %ld mediators registered", (long)this->mMediators.size());
-     return;
- }
- 
-@@ -1067,7 +1068,7 @@ cMediatorInterface* cUPnPObjectFactory::
- 
- cMediatorInterface* cUPnPObjectFactory::findMediatorByClass(const char* Class){
-     if(!Class){ ERROR("No class specified"); return NULL; }
-    MESSAGE(VERBOSE_SQL, "Searching for mediator '%s' in %d mediators", Class, this->mMediators.size());
-+    MESSAGE(VERBOSE_SQL, "Searching for mediator '%s' in %ld mediators", Class, (long)this->mMediators.size());
-     tMediatorMap::iterator MediatorIterator = this->mMediators.find(Class);
-     if(MediatorIterator==this->mMediators.end()){
-         ERROR("No matching mediator for class '%s'",Class);
--- a/receiver/recplayer.cpp
-+++ b/receiver/recplayer.cpp
-@@ -58,7 +58,7 @@ int cRecordingPlayer::read(char* buf, si
-         ERROR("Current part of record is not open");
-         return -1;
-     }
-    MESSAGE(VERBOSE_RECORDS, "Reading %d from record", buflen);
-+    MESSAGE(VERBOSE_RECORDS, "Reading %ld from record", (long)buflen);
-     int bytesread = 0;
-     while((bytesread = this->mCurrentFile->Read(buf, buflen)) == 0){ // EOF, try next file
-         if(!(this->mCurrentFile = this->mRecordingFile->NextFile())){
--- a/server/server.cpp
-+++ b/server/server.cpp
-@@ -278,7 +281,7 @@ bool cUPnPServer::autoDetectSettings(voi
-     char** Ifaces = getNetworkInterfaces(&count);
-     int i=0;
-     bool ret = false;
-    MESSAGE(VERBOSE_CUSTOM_OUTPUT, "AUTODETECT: Found %d possible interfaces.", sizeof(Ifaces));
-+    MESSAGE(VERBOSE_CUSTOM_OUTPUT, "AUTODETECT: Found %ld possible interfaces.", (long)sizeof(Ifaces));
-     while(Ifaces[i]){
-         if(strcmp(Ifaces[i],"lo")!=0){
-             //    true || false == true
--- a/multimedia/vdr-plugin-upnp/files/patch-strncpy
+++ b/multimedia/vdr-plugin-upnp/files/patch-strncpy
@ -1,12 +0,0 @@
--- a/misc/util.cpp
-+++ b/misc/util.cpp
-@@ -485,7 +519,8 @@ IXML_Element* ixmlAddProperty(IXML_Docum
-     char tvalue[UPNP_MAX_METADATA_LENGTH];
-     // trim the value to max metadata size
-     if(value){
-        strncpy(tvalue, value, UPNP_MAX_METADATA_LENGTH);
-+        strncpy(tvalue, value, UPNP_MAX_METADATA_LENGTH - 1);
-+        tvalue[UPNP_MAX_METADATA_LENGTH - 1] = '\0';
-     }
-     
-     const char* attribute = att(upnpproperty);
--- a/multimedia/vdr-plugin-upnp/pkg-descr
+++ b/multimedia/vdr-plugin-upnp/pkg-descr
@ -1,11 +0,0 @@
-http://www.vdr-wiki.de/wiki/index.php/Upnp-plugin
-
-UPnP/DLNA Plugin for Video Disk Recorder
-
-This Plugins extends the VDR with the possibility to act as an UPnP/DLNA Media
-Server (DMS). It will serve VDR's contents in the network to any UPnP-AV and
-DLNA capable devices.
-
-This still is an alpha version!
-
-WWW: http://upnp.vdr-developer.org/
--- a/multimedia/vdr-plugin-upnp/pkg-plist
+++ b/multimedia/vdr-plugin-upnp/pkg-plist
@ -1,10 +0,0 @@
-lib/vdr/libvdr-upnp.so.%%APIVERSION%%
-etc/vdr/plugins/upnp/http/icons/upnpIconLrg.jpeg
-etc/vdr/plugins/upnp/http/icons/upnpIconLrg.png
-etc/vdr/plugins/upnp/http/icons/upnpIconSm.jpeg
-etc/vdr/plugins/upnp/http/icons/upnpIconSm.png
-etc/vdr/plugins/upnp/http/xml/cds_scpd.xml
-etc/vdr/plugins/upnp/http/xml/cms_scpd.xml
-%%NLS%%share/locale/de-DE/LC_MESSAGES/vdr-upnp.mo
-@dir(%%VDR_USER%%,%%VDR_GROUP%%,) /var/cache/vdr/upnp
-@dir /var/cache/vdr
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	vlc
 DISTVERSION=	3.0.6
-PORTREVISION=	13
+PORTREVISION=	14
 PORTEPOCH=	4
 CATEGORIES=	multimedia audio ipv6 net www
 MASTER_SITES=	http://download.videolan.org/pub/videolan/${PORTNAME}/${DISTVERSION:S/a$//}/ \
--- a/net-im/fractal/Makefile
+++ b/net-im/fractal/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	fractal
 DISTVERSION=	4.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im
 MASTER_SITES=	https://gitlab.gnome.org/World/fractal/uploads/${GL_HASH}/

--- a/net-p2p/amule-devel/Makefile
+++ b/net-p2p/amule-devel/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	amule
 PORTVERSION=	11004
+PORTREVISION=	1
 CATEGORIES=	net-p2p
 MASTER_SITES=	http://amule.sourceforge.net/tarballs/
 PKGNAMESUFFIX=	-devel
--- a/net-p2p/amule-devel/files/patch-src_UPnPBase.cpp
+++ b/net-p2p/amule-devel/files/patch-src_UPnPBase.cpp
@ -1,6 +1,6 @@
 --- src/UPnPBase.cpp.orig	2018-11-19 11:11:51 UTC
 +++ src/UPnPBase.cpp
-@@ -1127,7 +1127,11 @@ bool CUPnPControlPoint::PrivateDeletePor
+@@ -1127,7 +1127,11 @@ bool CUPnPControlPoint::PrivateDeletePortMapping(
 
 
 // This function is static
@ -12,7 +12,7 @@
 {
 	std::ostringstream msg;
 	std::ostringstream msg2;
-@@ -1149,24 +1153,47 @@ int CUPnPControlPoint::Callback(Upnp_Eve
+@@ -1149,24 +1153,47 @@ int CUPnPControlPoint::Callback(Upnp_EventType EventTy
 		msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: ";
 		// UPnP Discovery
 upnpDiscovery:
@ -66,16 +66,16 @@
 				// Add the root device to our list
 +#if UPNP_VERSION >= 10800
 +				int expires = UpnpDiscovery_get_Expires(d_event);
-+				upnpCP->AddRootDevice(rootDevice, urlBase,
+ 				upnpCP->AddRootDevice(rootDevice, urlBase,
 +					location, expires);
 +#else
- 				upnpCP->AddRootDevice(rootDevice, urlBase,
+				upnpCP->AddRootDevice(rootDevice, urlBase,
 					d_event->Location, d_event->Expires);
 +#endif
 			}
 			// Free the XML doc tree
 			IXML::Document::Free(doc);
-@@ -1216,28 +1249,58 @@ upnpDiscovery:
+@@ -1216,28 +1249,60 @@ upnpDiscovery:
 	case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {
 		//fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n");
 		// UPnP Device Removed
@ -105,6 +105,8 @@
 		std::transform(devType.begin(), devType.end(), devType.begin(), tolower);
 		if (stdStringIsEqualCI(devType, UPnP::Device::IGW)) {
 +#if UPNP_VERSION >= 10800
+ 			const char *deviceID =
+ 				UpnpDiscovery_get_DeviceID_cstr(dab_event);
 +			upnpCP->RemoveRootDevice(deviceID);
 +#else
 			upnpCP->RemoveRootDevice(dab_event->DeviceId);
@ -120,7 +122,7 @@
 +		int eventKey = UpnpEvent_get_EventKey(e_event);
 +		IXML_Document *changedVariables =
 +			UpnpEvent_get_ChangedVariables(e_event);
-+		onst std::string sid = UpnpEvent_get_SID_cstr(e_event);
+		const std::string sid = UpnpEvent_get_SID_cstr(e_event);
 +#else
 		struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
 		const std::string Sid = e_event->Sid;
@ -134,7 +136,7 @@
 		break;
 	}
 	case UPNP_EVENT_SUBSCRIBE_COMPLETE:
-@@ -1252,19 +1315,39 @@ upnpDiscovery:
+@@ -1252,19 +1317,39 @@ upnpDiscovery:
 		//fprintf(stderr, "Callback: UPNP_EVENT_RENEWAL_COMPLETE\n");
 		msg << "error(UPNP_EVENT_RENEWAL_COMPLETE): ";
 upnpEventRenewalComplete:
@ -162,10 +164,10 @@
 +				UpnpEventSubscribe_get_PublisherUrl(es_event);
 +			const char *sid = UpnpEvent_get_SID_cstr(es_event);
 +			int timeOut = UpnpEvent_get_TimeOut(es_event);
-+			TvCtrlPointHandleSubscribeUpdate(
+ 			TvCtrlPointHandleSubscribeUpdate(
 +				publisherUrl, sid, timeOut);
 +#else
- 			TvCtrlPointHandleSubscribeUpdate(
+			TvCtrlPointHandleSubscribeUpdate(
 				GET_UPNP_STRING(es_event->PublisherUrl),
 				es_event->Sid,
 				es_event->TimeOut );
@ -174,7 +176,7 @@
 		}
 
 		break;
-@@ -1280,29 +1363,56 @@ upnpEventRenewalComplete:
+@@ -1280,29 +1365,56 @@ upnpEventRenewalComplete:
 		msg << "error(UPNP_EVENT_SUBSCRIPTION_EXPIRED): ";
 		msg2 << "UPNP_EVENT_SUBSCRIPTION_EXPIRED: ";
 upnpEventSubscriptionExpired:
@ -231,7 +233,7 @@
 					"' with SID == '" <<
 					newSID << "'.";
 				AddDebugLogLineC(logUPnP, msg2);
-@@ -1321,17 +1431,34 @@ upnpEventSubscriptionExpired:
+@@ -1321,17 +1433,34 @@ upnpEventSubscriptionExpired:
 	case UPNP_CONTROL_ACTION_COMPLETE: {
 		//fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_COMPLETE\n");
 		// This is here if we choose to do this asynchronously
@ -266,7 +268,7 @@
 				"<UpnpSendActionAsync>");
 		}
 		/* No need for any processing here, just print out results.
-@@ -1342,22 +1469,38 @@ upnpEventSubscriptionExpired:
+@@ -1342,21 +1471,37 @@ upnpEventSubscriptionExpired:
 	case UPNP_CONTROL_GET_VAR_COMPLETE: {
 		//fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_COMPLETE\n");
 		msg << "error(UPNP_CONTROL_GET_VAR_COMPLETE): ";
@ -300,8 +302,7 @@
 				sv_event->CtrlUrl,
 				sv_event->StateVarName,
 				sv_event->CurrentVal );
- #endif
 +#endif
+ #endif
 		}
 		break;
- 	}
--- a/net-p2p/amule/Makefile
+++ b/net-p2p/amule/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	amule
 PORTVERSION=	2.3.2
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	net-p2p
 MASTER_SITES=	SF/${PORTNAME}/aMule/${PORTVERSION}
 DISTNAME=	aMule-${PORTVERSION}
--- a/net-p2p/amule/files/patch-src_UPnPBase.cpp
+++ b/net-p2p/amule/files/patch-src_UPnPBase.cpp
@ -1,6 +1,6 @@
 --- src/UPnPBase.cpp.orig	2016-09-16 07:55:07 UTC
 +++ src/UPnPBase.cpp
-@@ -1127,7 +1127,11 @@ bool CUPnPControlPoint::PrivateDeletePor
+@@ -1127,7 +1127,11 @@ bool CUPnPControlPoint::PrivateDeletePortMapping(
 
 
 // This function is static
@ -12,7 +12,7 @@
 {
 	std::ostringstream msg;
 	std::ostringstream msg2;
-@@ -1149,24 +1153,47 @@ int CUPnPControlPoint::Callback(Upnp_Eve
+@@ -1149,24 +1153,47 @@ int CUPnPControlPoint::Callback(Upnp_EventType EventTy
 		msg2<< "UPNP_DISCOVERY_SEARCH_RESULT: ";
 		// UPnP Discovery
 upnpDiscovery:
@ -66,16 +66,16 @@
 				// Add the root device to our list
 +#if UPNP_VERSION >= 10800
 +				int expires = UpnpDiscovery_get_Expires(d_event);
-+				upnpCP->AddRootDevice(rootDevice, urlBase,
+ 				upnpCP->AddRootDevice(rootDevice, urlBase,
 +					location, expires);
 +#else
- 				upnpCP->AddRootDevice(rootDevice, urlBase,
+				upnpCP->AddRootDevice(rootDevice, urlBase,
 					d_event->Location, d_event->Expires);
 +#endif
 			}
 			// Free the XML doc tree
 			IXML::Document::Free(doc);
-@@ -1216,28 +1249,58 @@ upnpDiscovery:
+@@ -1216,28 +1249,60 @@ upnpDiscovery:
 	case UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE: {
 		//fprintf(stderr, "Callback: UPNP_DISCOVERY_ADVERTISEMENT_BYEBYE\n");
 		// UPnP Device Removed
@ -105,6 +105,8 @@
 		std::transform(devType.begin(), devType.end(), devType.begin(), tolower);
 		if (stdStringIsEqualCI(devType, UPnP::Device::IGW)) {
 +#if UPNP_VERSION >= 10800
+ 			const char *deviceID =
+ 				UpnpDiscovery_get_DeviceID_cstr(dab_event);
 +			upnpCP->RemoveRootDevice(deviceID);
 +#else
 			upnpCP->RemoveRootDevice(dab_event->DeviceId);
@ -120,7 +122,7 @@
 +		int eventKey = UpnpEvent_get_EventKey(e_event);
 +		IXML_Document *changedVariables =
 +			UpnpEvent_get_ChangedVariables(e_event);
-+		onst std::string sid = UpnpEvent_get_SID_cstr(e_event);
+		const std::string sid = UpnpEvent_get_SID_cstr(e_event);
 +#else
 		struct Upnp_Event *e_event = (struct Upnp_Event *)Event;
 		const std::string Sid = e_event->Sid;
@ -134,7 +136,7 @@
 		break;
 	}
 	case UPNP_EVENT_SUBSCRIBE_COMPLETE:
-@@ -1252,19 +1315,39 @@ upnpDiscovery:
+@@ -1252,19 +1317,39 @@ upnpDiscovery:
 		//fprintf(stderr, "Callback: UPNP_EVENT_RENEWAL_COMPLETE\n");
 		msg << "error(UPNP_EVENT_RENEWAL_COMPLETE): ";
 upnpEventRenewalComplete:
@ -162,10 +164,10 @@
 +				UpnpEventSubscribe_get_PublisherUrl(es_event);
 +			const char *sid = UpnpEvent_get_SID_cstr(es_event);
 +			int timeOut = UpnpEvent_get_TimeOut(es_event);
-+			TvCtrlPointHandleSubscribeUpdate(
+ 			TvCtrlPointHandleSubscribeUpdate(
 +				publisherUrl, sid, timeOut);
 +#else
- 			TvCtrlPointHandleSubscribeUpdate(
+			TvCtrlPointHandleSubscribeUpdate(
 				GET_UPNP_STRING(es_event->PublisherUrl),
 				es_event->Sid,
 				es_event->TimeOut );
@ -174,7 +176,7 @@
 		}
 
 		break;
-@@ -1280,29 +1363,56 @@ upnpEventRenewalComplete:
+@@ -1280,29 +1365,56 @@ upnpEventRenewalComplete:
 		msg << "error(UPNP_EVENT_SUBSCRIPTION_EXPIRED): ";
 		msg2 << "UPNP_EVENT_SUBSCRIPTION_EXPIRED: ";
 upnpEventSubscriptionExpired:
@ -231,7 +233,7 @@
 					"' with SID == '" <<
 					newSID << "'.";
 				AddDebugLogLineC(logUPnP, msg2);
-@@ -1321,17 +1431,34 @@ upnpEventSubscriptionExpired:
+@@ -1321,17 +1433,34 @@ upnpEventSubscriptionExpired:
 	case UPNP_CONTROL_ACTION_COMPLETE: {
 		//fprintf(stderr, "Callback: UPNP_CONTROL_ACTION_COMPLETE\n");
 		// This is here if we choose to do this asynchronously
@ -266,7 +268,7 @@
 				"<UpnpSendActionAsync>");
 		}
 		/* No need for any processing here, just print out results.
-@@ -1342,22 +1469,38 @@ upnpEventSubscriptionExpired:
+@@ -1342,21 +1471,37 @@ upnpEventSubscriptionExpired:
 	case UPNP_CONTROL_GET_VAR_COMPLETE: {
 		//fprintf(stderr, "Callback: UPNP_CONTROL_GET_VAR_COMPLETE\n");
 		msg << "error(UPNP_CONTROL_GET_VAR_COMPLETE): ";
@ -300,8 +302,7 @@
 				sv_event->CtrlUrl,
 				sv_event->StateVarName,
 				sv_event->CurrentVal );
- #endif
 +#endif
+ #endif
 		}
 		break;
- 	}
--- a/net/boringtun/Makefile
+++ b/net/boringtun/Makefile
@ -3,6 +3,7 @@
 PORTNAME=	boringtun
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.2.0
+PORTREVISION=	1
 CATEGORIES=	net

 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
--- a/net/rabbiteer/Makefile
+++ b/net/rabbiteer/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	rabbiteer
 DISTVERSION=	1.4.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net

 MAINTAINER=	dch@FreeBSD.org
--- a/net/routinator/Makefile
+++ b/net/routinator/Makefile
@ -3,6 +3,7 @@
 PORTNAME=	routinator
 PORTVERSION=	0.3.3
 DISTVERSIONPREFIX=	v
+PORTREVISION=	1
 CATEGORIES=	net

 MAINTAINER=	jaap@NLnetLabs.nl
--- a/science/lammps/Makefile
+++ b/science/lammps/Makefile
@ -2,7 +2,6 @@

 PORTNAME=	lammps
 PORTVERSION=	${GH_TAGNAME:C/(stable|patch)_([0-9]{1,2})([A-Z][a-z][a-z])([0-9]{4})/\4.\3.\2/S/Jan/01/S/Feb/02/S/Mar/03/S/Apr/04/S/May/05/S/Jun/06/S/Jul/07/S/Aug/08/S/Sep/09/S/Oct/10/S/Nov/11/S/Dec/12/}
-PORTREVISION=	1
 CATEGORIES=	science

 MAINTAINER=	yuri@FreeBSD.org
@ -16,7 +15,7 @@ CONFLICTS_BUILD=	ga # conflicts with include/error.h, already fixed in the head

 USES=		blaslapack:openblas cmake:noninja eigen:3 fortran shebangfix
 USE_GITHUB=	yes
-GH_TAGNAME=	patch_30Apr2019
+GH_TAGNAME=	patch_15May2019
 SHEBANG_GLOB=	*.sh *.bash
 SHEBANG_FILES=	lib/kokkos/bin/nvcc_wrapper

@ -32,6 +31,7 @@ PARALLEL_DESC=		Enable parallelizations:
 MPI_CMAKE_BOOL=		BUILD_MPI
 MPI_LIB_DEPENDS=	libmpi.so:net/openmpi

+OPENMP_USES=		localbase
 OPENMP_CMAKE_BOOL=	BUILD_OMP
 OPENMP_LIB_DEPENDS=	libomp.so:devel/openmp

@ -56,12 +56,6 @@ LATTE_DESC=		Use LATTE package
 LATTE_CMAKE_BOOL=	PKG_LATTE
 LATTE_LIB_DEPENDS=	liblatte.so:science/latte

-# use clang from ports because cmake can't find OpenMP with base clang, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=223678
-BUILD_DEPENDS+=	clang${LLVM_DEFAULT}:devel/llvm${LLVM_DEFAULT}
-CPP=		clang-cpp${LLVM_DEFAULT}
-CC=		clang${LLVM_DEFAULT}
-CXX=		clang++${LLVM_DEFAULT}
-
 post-patch:
 	@${REINPLACE_CMD} 's|SHELL = /bin/bash|SHELL = ${LOCALBASE}/bin/bash|' ${WRKSRC}/src/Makefile

--- a/science/lammps/distinfo
+++ b/science/lammps/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1556682873
-SHA256 (lammps-lammps-2019.04.30-patch_30Apr2019_GH0.tar.gz) = cdea2190fd187086cc3782b913ef7cd59270d837cc1fa9b45a365d01e2133938
-SIZE (lammps-lammps-2019.04.30-patch_30Apr2019_GH0.tar.gz) = 106188090
+TIMESTAMP = 1557885315
+SHA256 (lammps-lammps-2019.05.15-patch_15May2019_GH0.tar.gz) = 88c1fb6dfe822956c5ee20c5ef238c0503ce35501e0f7822c0ac67593e38a731
+SIZE (lammps-lammps-2019.05.15-patch_15May2019_GH0.tar.gz) = 106423786
--- a/science/lammps/pkg-plist
+++ b/science/lammps/pkg-plist
@ -32,6 +32,7 @@ man/man1/msi2lmp.1.gz
 %%DATADIR%%/potentials/BNC.tersoff
 %%DATADIR%%/potentials/BNCH-old.ILP
 %%DATADIR%%/potentials/BNCH.ILP
+%%DATADIR%%/potentials/C.drip
 %%DATADIR%%/potentials/C.lcbop
 %%DATADIR%%/potentials/CC.KC
 %%DATADIR%%/potentials/CC.KC-full
@ -40,6 +41,7 @@ man/man1/msi2lmp.1.gz
 %%DATADIR%%/potentials/CH.KC
 %%DATADIR%%/potentials/CH.airebo
 %%DATADIR%%/potentials/CH.airebo-m
+%%DATADIR%%/potentials/CH.rebo
 %%DATADIR%%/potentials/CH_taper.KC
 %%DATADIR%%/potentials/CdTe.bop.table
 %%DATADIR%%/potentials/CdTe.sw
--- a/science/py-qcelemental/Makefile
+++ b/science/py-qcelemental/Makefile
@ -1,7 +1,7 @@
 # $FreeBSD$

 PORTNAME=	qcelemental
-PORTVERSION=	0.3.3
+PORTVERSION=	0.4.0
 CATEGORIES=	science python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
--- a/science/py-qcelemental/distinfo
+++ b/science/py-qcelemental/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1554011920
-SHA256 (qcelemental-0.3.3.tar.gz) = c35154ae56d37ee423d47fbe080cbe8c1316b1081971945962257f485db6e9ca
-SIZE (qcelemental-0.3.3.tar.gz) = 142218
+TIMESTAMP = 1557853850
+SHA256 (qcelemental-0.4.0.tar.gz) = 8f7e910483fa862d8fc21f59ff21d3c269cbe57ab870762d1368ad1fca51e93d
+SIZE (qcelemental-0.4.0.tar.gz) = 181284
--- a/security/cargo-audit/Makefile
+++ b/security/cargo-audit/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	cargo-audit
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.1
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	security

 MAINTAINER=	tobik@FreeBSD.org
--- a/security/kr/Makefile
+++ b/security/kr/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	kr
 PORTVERSION=	2.3.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	security

 MAINTAINER=	feld@FreeBSD.org
--- a/security/py-rekall-core/Makefile
+++ b/security/py-rekall-core/Makefile
@ -4,6 +4,7 @@
 PORTNAME=	rekall-core
 DISTVERSION=	1.7.2rc1-52
 DISTVERSIONSUFFIX=	-g0cba831
+PORTREVISION=	1
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

@ -23,7 +24,7 @@ RUN_DEPENDS=	cabextract:archivers/cabextract \
 		${PYTHON_PKGNAMEPREFIX}parsedatetime>=2.4:devel/py-parsedatetime@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}psutil>=5.0:sysutils/py-psutil@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyaff4>=0.25:security/py-pyaff4@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycryptodome>=3.4.7:security/py-pycryptodome@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycryptodomex>=3.4.7:security/py-pycryptodomex@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyelftools>=0.24:devel/py-pyelftools@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pyparsing>=2.1.5:devel/py-pyparsing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}dateutil>=2.6.1:devel/py-dateutil@${PY_FLAVOR} \
@ -48,4 +49,11 @@ WRKSRC_SUBDIR=	rekall-core

 PYDISTUTILS_INSTALLARGS+=	--install-data=${PYTHON_SITELIBDIR}

+post-patch:
+	${REINPLACE_CMD} "s|from Crypto|from Cryptodome|" \
+		${WRKSRC}/rekall/compatibility.py \
+		${WRKSRC}/rekall/plugins/windows/mimikatz.py \
+		${WRKSRC}/rekall/plugins/windows/registry/hashdump.py \
+		${WRKSRC}/rekall/plugins/windows/registry/lsasecrets.py
+
 .include <bsd.port.post.mk>
--- a/security/py-rekall-core/files/patch-setup.py
+++ b/security/py-rekall-core/files/patch-setup.py
@ -26,7 +26,7 @@
 -    'pytsk3==20170802',
 -    'pytz==2017.3',
 -    'rekall-capstone==3.0.5.post2',
-+    'pycryptodome>=3.4.7',
+    'pycryptodomex>=3.4.7',
 +    'pyelftools>=0.24',
 +    'pyparsing>=2.1.5',
 +    'python-dateutil>=2.6.1',
--- a/security/py-rekall_lib/Makefile
+++ b/security/py-rekall_lib/Makefile
@ -4,6 +4,7 @@
 PORTNAME=	rekall_lib
 DISTVERSION=	1.7.2rc1-52
 DISTVERSIONSUFFIX=	-g0cba831
+PORTREVISION=	1
 CATEGORIES=	security python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}

@ -16,7 +17,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}arrow>=0.10.0:devel/py-arrow@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}future>=0:devel/py-future@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sortedcontainers>=1.5.7:devel/py-sortedcontainers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pycryptodome>=0:security/py-pycryptodome@${PY_FLAVOR}
+		${PYTHON_PKGNAMEPREFIX}pycryptodomex>=0:security/py-pycryptodomex@${PY_FLAVOR}

 USE_GITHUB=	yes
 GH_PROJECT=	rekall
@ -28,4 +29,7 @@ USE_PYTHON=	distutils autoplist
 NO_ARCH=	yes
 WRKSRC_SUBDIR=	rekall-lib

+post-patch:
+	${REINPLACE_CMD} "s|from Crypto|from Cryptodome|" ${WRKSRC}/rekall_lib/crypto.py
+
 .include <bsd.port.mk>
--- a/shells/ion/Makefile
+++ b/shells/ion/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	ion
 DISTVERSION=	1.0.5-900
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	shells
 PKGNAMESUFFIX=	-shell

--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@ -251,7 +251,6 @@
    SUBDIR += diskscrub
    SUBDIR += disktool
    SUBDIR += disktype
-    SUBDIR += djmount
    SUBDIR += dmg2img
    SUBDIR += dmidecode
    SUBDIR += docker
--- a/sysutils/djmount/Makefile
+++ b/sysutils/djmount/Makefile
@ -1,35 +0,0 @@
-# Created by: Eric L. Camachat <eric@camachat.org>
-# $FreeBSD$
-
-PORTNAME=	djmount
-PORTVERSION=	0.71
-PORTREVISION=	10
-CATEGORIES=	sysutils
-MASTER_SITES=	SF
-
-MAINTAINER=	eric@camachat.org
-COMMENT=	Mount UPnP A/V Media
-
-LICENSE=	GPLv2
-
-DEPRECATED=	Unmaintained upstream and does not build with upnp >= 1.8
-EXPIRATION_DATE=	2019-05-15
-
-LIB_DEPENDS=	libupnp.so:devel/upnp
-
-PLIST_FILES=	bin/${PORTNAME}
-GNU_CONFIGURE=	yes
-USES=		fuse iconv:build pkgconfig readline
-CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
-		--with-fuse-prefix=${LOCALBASE} \
-		--with-external-libupnp --with-libupnp-prefix=${LOCALBASE}
-
-PORTDOCS=	AUTHORS ChangeLog NEWS README TODO
-
-OPTIONS_DEFINE=	DOCS
-
-post-install:
-	@${INSTALL} -d ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-
-.include <bsd.port.mk>
--- a/sysutils/djmount/distinfo
+++ b/sysutils/djmount/distinfo
@ -1,2 +0,0 @@
-SHA256 (djmount-0.71.tar.gz) = aa5bb482af4cbd42695a7e396043d47b53d075ac2f6aa18a8f8e11383c030e4f
-SIZE (djmount-0.71.tar.gz) = 1159653
--- a/sysutils/djmount/files/patch-djmount
+++ b/sysutils/djmount/files/patch-djmount
@ -1,98 +0,0 @@
--- configure.ac	2006-08-28 04:12:33.000000000 +0800
-+++ configure.ac	2008-10-15 10:46:23.000000000 +0800
-@@ -240,7 +240,7 @@ RT_PACKAGE_FIND([fuse], [-D_FILE_OFFSET_
- ** $FUSE_MSG_ERRORS
- 	])])
- 
-FUSE_CFLAGS="$FUSE_CFLAGS -DFUSE_USE_VERSION=22"
-+FUSE_CFLAGS="$FUSE_CFLAGS -DFUSE_USE_VERSION=25"
- 
- 
- #
--- configure	2006-08-28 04:13:13.000000000 +0800
-+++ configure	2008-10-15 10:46:23.000000000 +0800
-@@ -26489,7 +26489,7 @@ fi
- 
- 
- 
-FUSE_CFLAGS="$FUSE_CFLAGS -DFUSE_USE_VERSION=22"
-+FUSE_CFLAGS="$FUSE_CFLAGS -DFUSE_USE_VERSION=25"
- 
- 
- #
-diff -purN djmount/cache.h djmount/cache.h
--- djmount/cache.h	2006-08-28 04:12:20.000000000 +0800
-+++ djmount/cache.h	2008-10-15 11:12:35.000000000 +0800
-@@ -25,6 +25,9 @@
- 
- #include <stdlib.h>
- #include <stdbool.h>
-+#ifdef __FreeBSD__
-+#include <time.h>
-+#endif
- 
- 
- /******************************************************************************
-diff -purN djmount/fuse_main.c djmount/fuse_main.c
--- djmount/fuse_main.c	2006-08-28 04:12:20.000000000 +0800
-+++ djmount/fuse_main.c	2008-10-15 11:12:21.000000000 +0800
-@@ -32,7 +32,9 @@
- #include <fcntl.h>
- #include <dirent.h>
- #include <errno.h>
-+#ifdef __linux__
- #include <sys/statfs.h>
-+#endif
- #ifdef HAVE_SETXATTR
- #	include <sys/xattr.h>
- #endif
-diff -purN djmount/string_util.c djmount/string_util.c
--- djmount/string_util.c	2006-08-28 04:12:20.000000000 +0800
-+++ djmount/string_util.c	2008-10-15 11:12:03.000000000 +0800
-@@ -251,7 +251,11 @@ StringStream_GetSnapshot (StringStream* 
- 		if (res && slen)
- 			*slen = ss->size;
- #else
-+#ifdef __linux__
- 		off_t const size = ftello (ss->file);
-+#else
-+		size_t const size = ftello (ss->file);
-+#endif
- 		res = talloc_size (result_context, size+1);
- 		if (res) {
- 			rewind (ss->file);
-diff -purN djmount/content_dir.c djmount/content_dir.c
--- djmount/content_dir.c	2006-08-28 05:12:20.000000000 +0900
-+++ djmount/content_dir.c	2012-02-12 21:14:11.000000000 +0900
-@@ -302,7 +302,7 @@ BrowseOrSearchAll (ContentDir* cds,
- 	// Note: it is allowed to have nb_matched == 0 if it cannot be
- 	// computed by the CDS.
- 	int nb_retry = 0;
-	while (PtrArray_GetSize (objects) < nb_matched && nb_retry++ < 2) {
-+	while (PtrArray_GetSize (objects) < nb_matched && ++nb_retry) {
- 		Log_Printf (LOG_WARNING, 
- 			    "ContentDir_BrowseId ObjectId=%s : "
- 			    "got %d results, expected %d. Retry %d ...",
-diff -purN djmount/content_dir.h djmount/content_dir.h
--- djmount/content_dir.h	2006-08-28 05:12:20.000000000 +0900
-+++ djmount/content_dir.h	2012-02-12 21:14:11.000000000 +0900
-@@ -46,7 +46,7 @@ typedef uint_fast32_t ContentDir_Index;
- 
- // ContentDirectory ServiceType
- #define CONTENT_DIR_SERVICE_TYPE \
-	"urn:schemas-upnp-org:service:ContentDirectory:1"
-+	"urn:schemas-upnp-org:service:ContentDirectory:2"
- 
- 
- 
-diff -purN djmount/upnp_util.h djmount/upnp_util.h
--- djmount/upnp_util.h	2006-08-28 05:12:20.000000000 +0900
-+++ djmount/upnp_util.h	2012-02-12 21:14:11.000000000 +0900
-@@ -28,6 +28,7 @@
- 
- 
- #include <upnp/upnptools.h>
-+#include <upnp/upnp.h>
- 
- 
- #ifdef __cplusplus
--- a/sysutils/djmount/pkg-descr
+++ b/sysutils/djmount/pkg-descr
@ -1,12 +0,0 @@
-djmount is a UPnP AV client. It mounts as a Linux filesystem the media
-content of compatible UPnP AV devices.
-Djmount discovers automatically all UPnP AV Media Servers on the network,
-and make the content available in a directory tree. All shared files
-(e.g. Audio or Video files) are directly visible and can be played using
-your favorite media player.
-
-djmount is written in C for the Linux operating system.
-It is free software, licensed under the terms of the GNU General Public
-License (GNU GPL).
-
-WWW: http://djmount.sourceforge.net/
--- a/sysutils/exa/Makefile
+++ b/sysutils/exa/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	exa
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.8.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	sysutils

 MAINTAINER=	tobik@FreeBSD.org
--- a/sysutils/fd/Makefile
+++ b/sysutils/fd/Makefile
@ -4,7 +4,7 @@
 PORTNAME=	fd
 DISTVERSIONPREFIX=	v
 DISTVERSION=	7.3.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils
 PKGNAMESUFFIX=	-find

--- a/sysutils/flowgger/Makefile
+++ b/sysutils/flowgger/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	flowgger
 DISTVERSION=	0.2.6-28
 DISTVERSIONSUFFIX=	-gab572a0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	sysutils

 MAINTAINER=	ports@FreeBSD.org
--- a/sysutils/fusefs-sandboxfs/Makefile
+++ b/sysutils/fusefs-sandboxfs/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	sandboxfs
 DISTVERSIONPREFIX=	sandboxfs-
 DISTVERSION=	0.1.0
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	sysutils
 PKGNAMEPREFIX=	fusefs-

--- a/sysutils/hexyl/Makefile
+++ b/sysutils/hexyl/Makefile
@ -3,6 +3,7 @@
 PORTNAME=	hexyl
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.5.0
+PORTREVISION=	1
 CATEGORIES=	sysutils

 MAINTAINER=	tobik@FreeBSD.org
--- a/sysutils/potnet/Makefile
+++ b/sysutils/potnet/Makefile
@ -2,7 +2,7 @@

 PORTNAME=	potnet
 DISTVERSION=	0.1.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils

 MAINTAINER=	pizzamig@FreeBSD.org
--- a/sysutils/slurm-wlm/Makefile
+++ b/sysutils/slurm-wlm/Makefile
@ -1,15 +1,12 @@
 # $FreeBSD$

 PORTNAME=	slurm
-DISTVERSION=	17.02.11
-PORTREVISION=	3
-CATEGORIES=	sysutils
-MASTER_SITES=	http://www.schedmd.com/download/latest/ \
-		http://www.schedmd.com/download/archive/ \
-		http://www.schedmd.com/download/development/
+DISTVERSION=	18.08.7
+CATEGORIES=	sysutils python
+MASTER_SITES=	https://download.schedmd.com/slurm/
 PKGNAMESUFFIX=	-wlm

-MAINTAINER=	jrm@FreeBSD.org
+MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	Simple Linux Utility for Resource Management

 LICENSE=	GPLv2+
@ -20,27 +17,27 @@ LIB_DEPENDS=	libjson-c.so:devel/json-c \
 		libmunge.so:security/munge \
 		liblz4.so:archivers/liblz4

-USERS=		slurm
-GROUPS=		${USERS}
-
-USES=		gmake libtool pkgconfig python:build readline:port shebangfix \
-		ssl tar:bz2
+USES=		compiler:c11 gmake gnome libtool lua pkgconfig python:build \
+		readline:port shebangfix ssl tar:bz2
 USE_LDCONFIG=	yes
 USE_PERL5=	configure
 USE_RC_SUBR=	slurmctld slurmd

+USERS=		slurm
+GROUPS=		${USERS}
+
+LINUX_USES=	linux
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--bindir=${PREFIX}/bin
 INSTALL_TARGET=	install-strip
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 SHEBANG_FILES=	doc/html/shtml2html.py doc/man/man2html.py

-OPTIONS_DEFINE=	CURL DOCS GTK2 HDF5 HWLOC IPMI MYSQL RRD LINUX
-OPTIONS_DEFAULT=HDF5 HWLOC
-OPTIONS_SUB=	yes
+OPTIONS_DEFINE=		CURL DOCS GUI HDF5 HWLOC IPMI MYSQL RRD LINUX
+OPTIONS_DEFAULT=	HDF5 HWLOC
+OPTIONS_SUB=		yes

 CURL_DESC=	Require cURL for elasticsearch plugins
-GTK2_DESC=	Build sview GUI config tool
+GUI_DESC=	Build sview GUI config tool
 HDF5_DESC=	Job profiling using HDF5
 HWLOC_DESC=	Portable hardware locality
 IPMI_DESC=	IPMI energy consumption accounting
@ -52,10 +49,11 @@ DOCS_BUILD_DEPENDS=	man2html:textproc/man2html
 CURL_LIB_DEPENDS=	libcurl.so:ftp/curl
 CURL_CONFIGURE_WITH=	libcurl

-GTK2_USE=		GNOME=cairo,gdkpixbuf2,glib20,gtk20
-GTK2_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
+GUI_USE=		GNOME=cairo,gdkpixbuf2,glib20,gtk20
+GUI_LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 			libfreetype.so:print/freetype2
-GTK2_USES=		gettext
+GUI_USES=		gettext
+GUI_CONFIGURE_ENABLE=	glibtest gtktest x11
 # Neither of these work.  See post-patch below.
 #GTK2_CONFIGURE_ENV_OFF=	ac_gtk_test=no
 #GTK2_CONFIGURE_OFF=	--disable-gtktest
@ -77,15 +75,31 @@ MYSQL_CONFIGURE_OFF=	--with-mysql_config=/nonexistent
 RRD_LIB_DEPENDS=	librrd.so:databases/rrdtool
 RRD_CONFIGURE_WITH=	rrdtool

-LINUX_USES=		linux
+# --docdir is non-functional
+# CONFIGURE_ARGS=	--docdir=${DOCSDIR}
+# FreeBSD Infiniband support is still experimental
+CONFIGURE_ARGS=	--without-ofed
+DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}-${DISTVERSION}

 CFLAGS+=	-I${WRKSRC}/slurm -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lsysinfo -lkvm

+.include <bsd.port.pre.mk>
+
+# Force newer GCC on platforms using GCC 4.2 as base
+.if ${CHOSEN_COMPILER_TYPE} == gcc
+USE_GCC=	yes
+.endif
+
+# Hack around nonfunctional --disable-gtktest flag
+pre-configure-GUI-off:
+	@${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \
+		${WRKSRC}/configure
+
 # SLURM's configure enables interactive jobs if pty.h exists.  Replacing
 # #include <pty.h> with appropriate headers will therefore not work, so instead
 # add a pty.h for the build.
-post-patch:
+pre-configure:
 	@${CP} ${FILESDIR}/pty.h ${WRKSRC}/slurm
 	@${REINPLACE_CMD} -e 's|sched_setaffinity|cpuset_setaffinity|g' \
 		${WRKSRC}/configure
@ -105,12 +119,10 @@ post-patch:
 		-e 's|StateSaveLocation=.*|StateSaveLocation=/var/run/slurm|' \
 		${WRKSRC}/etc/slurm.conf.example

-post-patch-LINUX-on:
 	@${REINPLACE_CMD} -e 's|"/proc|"/compat/linux/proc|g' \
 		${WRKSRC}/src/slurmd/slurmstepd/req.c \
 		${WRKSRC}/src/slurmd/slurmstepd/pdebug.c \
 		${WRKSRC}/src/slurmd/slurmd/get_mach_stat.c \
-		${WRKSRC}/src/slurmd/slurmd/read_proc.c \
 		${WRKSRC}/src/slurmd/common/xcpuinfo.c \
 		${WRKSRC}/src/slurmd/common/xcgroup.c \
 		${WRKSRC}/src/slurmd/common/set_oomadj.c \
@ -122,22 +134,27 @@ post-patch-LINUX-on:
 		${WRKSRC}/src/plugins/jobacct_gather/common/common_jag.c \
 		${WRKSRC}/src/plugins/jobacct_gather/linux/jobacct_gather_linux.c \
 		${WRKSRC}/src/plugins/switch/cray/scaling.c \
+		${WRKSRC}/src/plugins/switch/cray/switch_cray.c \
 		${WRKSRC}/src/plugins/proctrack/cray/proctrack_cray.c \
 		${WRKSRC}/src/plugins/proctrack/cgroup/proctrack_cgroup.c \
 		${WRKSRC}/src/plugins/proctrack/pgid/proctrack_pgid.c \
 		${WRKSRC}/src/plugins/proctrack/linuxproc/kill_tree.c \
 		${WRKSRC}/src/plugins/proctrack/lua/proctrack_lua.c \
 		${WRKSRC}/src/plugins/acct_gather_filesystem/lustre/acct_gather_filesystem_lustre.c \
+		${WRKSRC}/src/plugins/node_features/knl_generic/node_features_knl_generic.c \
 		${WRKSRC}/contribs/cray/pam_job.c \
 		${WRKSRC}/contribs/lua/proctrack.lua

-# Hack around nonfunctional --disable-gtktest flag
-post-patch-GTK2-off:
-	@${REINPLACE_CMD} -e 's|min_gtk_version=.*|min_gtk_version=2000.0.0|' \
-		${WRKSRC}/configure
+	@if ${WHICH} sbatch > /dev/null; then \
+		${ECHO_CMD} "********************************************"; \
+		${ECHO_CMD} "Build may fail while slurm-wlm is installed."; \
+		${ECHO_CMD} "Deinstall slurm-wlm and run make again."; \
+		${ECHO_CMD} "********************************************"; \
+		false; \
+	fi

 post-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/slurm.conf.example \
 		${STAGEDIR}${PREFIX}/etc/slurm.conf.sample

-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
--- a/sysutils/slurm-wlm/distinfo
+++ b/sysutils/slurm-wlm/distinfo
@ -1,3 +1,3 @@
-TIMESTAMP = 1529149760
-SHA256 (slurm-17.02.11.tar.bz2) = 4dbda42078eece1022b713489c8ffab01c015f359acd323248c5e1e9ecc47db5
-SIZE (slurm-17.02.11.tar.bz2) = 6056931
+TIMESTAMP = 1556910143
+SHA256 (slurm-18.08.7.tar.bz2) = 854f922e4147af1ba861988455dbbb53ab5325f1ca138dce0ad553792b888743
+SIZE (slurm-18.08.7.tar.bz2) = 6186006
--- a/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example
+++ b/sysutils/slurm-wlm/files/patch-etc_slurm.conf.example
@ -0,0 +1,78 @@
+--- etc/slurm.conf.example.orig	2018-10-26 20:10:17 UTC
+++ etc/slurm.conf.example
+@@ -8,8 +8,8 @@
+ #
+ # See the slurm.conf man page for more information.
+ #
+-ClusterName=linux
+-ControlMachine=linux0
+ClusterName=beastie
+ControlMachine=beastie0
+ #ControlAddr=
+ #BackupController=
+ #BackupAddr=
+@@ -21,12 +21,12 @@ SlurmdPort=6818
+ AuthType=auth/munge
+ #JobCredentialPrivateKey=
+ #JobCredentialPublicCertificate=
+-StateSaveLocation=/var/spool/slurm/ctld
+-SlurmdSpoolDir=/var/spool/slurm/d
+StateSaveLocation=/var/run/slurm
+SlurmdSpoolDir=/var/spool/slurmd
+ SwitchType=switch/none
+ MpiDefault=none
+-SlurmctldPidFile=/var/run/slurmctld.pid
+-SlurmdPidFile=/var/run/slurmd.pid
+SlurmctldPidFile=/var/run/slurm/slurmctld.pid
+SlurmdPidFile=/var/run/slurm/slurmd.pid
+ ProctrackType=proctrack/pgid
+ #PluginDir=
+ #FirstJobId=
+@@ -42,7 +42,7 @@ ReturnToService=0
+ #SrunEpilog=
+ #TaskProlog=
+ #TaskEpilog=
+-#TaskPlugin=
+TaskPlugin=task/none
+ #TrackWCKey=no
+ #TreeWidth=50
+ #TmpFS=
+@@ -57,7 +57,8 @@ KillWait=30
+ Waittime=0
+ #
+ # SCHEDULING
+-SchedulerType=sched/backfill
+SchedulerType=sched/builtin
+SchedulerParameters=defer
+ #SchedulerAuth=
+ #SelectType=select/linear
+ FastSchedule=1
+@@ -72,22 +73,22 @@ FastSchedule=1
+ #
+ # LOGGING
+ SlurmctldDebug=3
+-SlurmctldLogFile=/var/log/slurmctld.log
+SlurmctldLogFile=/var/log/slurm/slurmctld.log
+ SlurmdDebug=3
+-SlurmdLogFile=/var/log/slurmd.log
+SlurmdLogFile=/var/log/slurm/slurm_accounting.log
+ JobCompType=jobcomp/none
+ #JobCompLoc=
+ #
+ # ACCOUNTING
+-#JobAcctGatherType=jobacct_gather/linux
+JobAcctGatherType=jobacct_gather/none
+ #JobAcctGatherFrequency=30
+ #
+-#AccountingStorageType=accounting_storage/slurmdbd
+AccountingStorageType=accounting_storage/filetxt
+ #AccountingStorageHost=
+-#AccountingStorageLoc=
+AccountingStorageLoc=/var/log/slurm/slurm_accounting.log
+ #AccountingStoragePass=
+ #AccountingStorageUser=
+ #
+ # COMPUTE NODES
+-NodeName=linux[1-32] Procs=1 State=UNKNOWN
+NodeName=beastie[1-32] Procs=1 State=UNKNOWN
+ PartitionName=debug Nodes=ALL Default=YES MaxTime=INFINITE State=UP
--- a/sysutils/slurm-wlm/files/patch-nokerberos
+++ b/sysutils/slurm-wlm/files/patch-nokerberos
@ -1,41 +0,0 @@
-Index: sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-agent.c
-===================================================================
--- sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-agent.c.orig	2018-02-20 02:40:20 UTC
-+++ sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-agent.c
-@@ -0,0 +1,10 @@
-+--- src/plugins/mpi/pmi2/agent.c.orig	2017-11-01 01:04:16 UTC
-++++ src/plugins/mpi/pmi2/agent.c
-+@@ -39,7 +39,6 @@
-+ \*****************************************************************************/
-+ 
-+ #if defined(__FreeBSD__)
-+-#include <roken.h>
-+ #include <sys/socket.h>	/* AF_INET */
-+ #endif
-+ 
--- sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi1.c.orig	2018-02-20 02:40:20 UTC
-+++ sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi1.c
-@@ -0,0 +1,10 @@
-+--- src/plugins/mpi/pmi2/pmi1.c.orig	2017-11-01 01:04:16 UTC
-++++ src/plugins/mpi/pmi2/pmi1.c
-+@@ -38,7 +38,6 @@
-+ #include "config.h"
-+ 
-+ #if defined(__FreeBSD__)
-+-#include <roken.h>
-+ #include <sys/socket.h> /* AF_INET */
-+ #endif
-+ 
--- sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi2.c.orig	2018-02-20 02:40:20 UTC
-+++ sysutils/slurm-wlm/files/patch-src-plugins-mpi-pmi2-pmi2.c
-@@ -0,0 +1,10 @@
-+--- src/plugins/mpi/pmi2/pmi2.c.orig	2017-11-01 01:04:16 UTC
-++++ src/plugins/mpi/pmi2/pmi2.c
-+@@ -36,7 +36,6 @@
-+ \*****************************************************************************/
-+ 
-+ #if defined(__FreeBSD__)
-+-#include <roken.h>
-+ #include <sys/socket.h> /* AF_INET */
-+ #endif
-+ 
--- a/sysutils/slurm-wlm/files/patch-src_common_read__config.h
+++ b/sysutils/slurm-wlm/files/patch-src_common_read__config.h
@ -0,0 +1,14 @@
+--- src/common/read_config.h.orig	2018-10-23 14:45:36 UTC
+++ src/common/read_config.h
+@@ -140,8 +140,10 @@ extern uint16_t drop_priv_flag;
+ #define DEFAULT_CHECKPOINT_TYPE     "checkpoint/none"
+ #if defined HAVE_REAL_CRAY/* ALPS requires cluster-unique job container IDs */
+ #  define DEFAULT_PROCTRACK_TYPE    "proctrack/sgi_job"
+-#else
+#elif defined __linux__
+ #  define DEFAULT_PROCTRACK_TYPE    "proctrack/cgroup"
+#else
+#  define DEFAULT_PROCTRACK_TYPE    "proctrack/pgid"
+ #endif
+ #define DEFAULT_PREEMPT_TYPE        "preempt/none"
+ #define DEFAULT_PRIORITY_DECAY      604800 /* 7 days */
--- a/sysutils/slurm-wlm/files/patch-src_common_slurm__xlator.h
+++ b/sysutils/slurm-wlm/files/patch-src_common_slurm__xlator.h
@ -0,0 +1,12 @@
+--- src/common/slurm_xlator.h.orig	2019-04-12 04:20:25 UTC
+++ src/common/slurm_xlator.h
+@@ -299,7 +299,9 @@
+  * The header file used only for #define values. */
+ 
+ /* strlcpy.[ch] functions */
+#if (!HAVE_STRLCPY)	// Match this to src/common/strlcpy.c
+ #define	strlcpy			slurm_strlcpy
+#endif
+ 
+ /* switch.[ch] functions
+  * None exported today.
--- a/sysutils/slurm-wlm/files/patch-src_plugins_switch_cray_switch__cray.c
+++ b/sysutils/slurm-wlm/files/patch-src_plugins_switch_cray_switch__cray.c
@ -0,0 +1,25 @@
+--- src/plugins/switch/cray/switch_cray.c.orig	2019-04-12 04:20:25 UTC
+++ src/plugins/switch/cray/switch_cray.c
+@@ -35,7 +35,6 @@
+  *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301  USA.
+ \*****************************************************************************/
+ 
+-#if !(defined(__FreeBSD__) || defined(__NetBSD__))
+ #include "config.h"
+ 
+ #define _GNU_SOURCE
+@@ -44,7 +43,9 @@
+ #include <fcntl.h>
+ #include <inttypes.h>
+ #include <limits.h>
+#ifdef __linux__
+ #include <linux/limits.h>
+#endif
+ #include <math.h>
+ #include <sched.h>
+ #include <signal.h>
+@@ -1056,4 +1057,3 @@ extern int switch_p_job_step_post_resume(stepd_step_re
+ #endif
+ 	return SLURM_SUCCESS;
+ }
+-#endif /* !defined(__FreeBSD__) */
--- a/sysutils/slurm-wlm/files/patch-src_srun_libsrun_srun__job.c
+++ b/sysutils/slurm-wlm/files/patch-src_srun_libsrun_srun__job.c
@ -0,0 +1,14 @@
+--- src/srun/libsrun/srun_job.c.orig	2018-10-24 20:21:46 UTC
+++ src/srun/libsrun/srun_job.c
+@@ -113,6 +113,11 @@ static int shepherd_fd = -1;
+ static pthread_t signal_thread = (pthread_t) 0;
+ static int pty_sigarray[] = { SIGWINCH, 0 };
+ 
+#ifdef __FreeBSD__
+#define __environ environ
+extern char **environ;
+#endif
+
+ /*
+  * Prototypes:
+  */
--- a/sysutils/slurm-wlm/pkg-descr
+++ b/sysutils/slurm-wlm/pkg-descr
@ -1,10 +1,9 @@
-Slurm is an open-source workload manager designed for *nix clusters
-of all sizes. It provides three key functions. First it allocates
-exclusive and/or non-exclusive access to resources (computer nodes)
-to users for some duration of time so they can perform work. Second,
-it provides a framework for starting, executing, and monitoring
-work (typically a parallel job) on a set of allocated nodes. Finally,
-it arbitrates contention for resources by managing a queue of
+Slurm is an open-source workload manager designed for *nix clusters of all
+sizes. It provides three key functions. First it allocates exclusive and/or
+non-exclusive access to resources (computer nodes) to users for some duration
+of time so they can perform work. Second, it provides a framework for starting,
+executing, and monitoring work (typically a parallel job) on a set of allocated
+nodes. Finally, it arbitrates contention for resources by managing a queue of
 pending work.

 WWW: https://slurm.schedmd.com/
--- a/sysutils/slurm-wlm/pkg-plist
+++ b/sysutils/slurm-wlm/pkg-plist
@ -7,7 +7,6 @@ bin/sbcast
 bin/scancel
 bin/scontrol
 bin/sdiag
-%%HDF5%%bin/sh5util
 bin/sinfo
 bin/smap
 bin/sprio
@ -17,30 +16,22 @@ bin/srun
 bin/sshare
 bin/sstat
 bin/strigger
-%%GTK2%%bin/sview
-@sample etc/slurm.conf.sample
 include/slurm/pmi.h
 include/slurm/slurm.h
 include/slurm/slurm_errno.h
 include/slurm/slurmdb.h
 include/slurm/smd_ns.h
 include/slurm/spank.h
-lib/libpmi.a
-lib/libpmi.so
-lib/libpmi.so.0
-lib/libpmi.so.0.0.0
 lib/libslurm.a
 lib/libslurm.so
-lib/libslurm.so.31
-lib/libslurm.so.31.0.0
+lib/libslurm.so.33
+lib/libslurm.so.33.0.0
 lib/libslurmdb.a
 lib/libslurmdb.so
-lib/libslurmdb.so.31
-lib/libslurmdb.so.31.0.0
+lib/libslurmdb.so.33
+lib/libslurmdb.so.33.0.0
 lib/slurm/accounting_storage_filetxt.a
 lib/slurm/accounting_storage_filetxt.so
-%%MYSQL%%lib/slurm/accounting_storage_mysql.a
-%%MYSQL%%lib/slurm/accounting_storage_mysql.so
 lib/slurm/accounting_storage_none.a
 lib/slurm/accounting_storage_none.so
 lib/slurm/accounting_storage_slurmdbd.a
@ -57,12 +48,8 @@ lib/slurm/acct_gather_filesystem_lustre.a
 lib/slurm/acct_gather_filesystem_lustre.so
 lib/slurm/acct_gather_filesystem_none.a
 lib/slurm/acct_gather_filesystem_none.so
-lib/slurm/acct_gather_infiniband_none.a
-lib/slurm/acct_gather_infiniband_none.so
-%%IPMI%%lib/slurm/acct_gather_energy_ipmi.a
-%%IPMI%%lib/slurm/acct_gather_energy_ipmi.so
-%%HDF5%%lib/slurm/acct_gather_profile_hdf5.a
-%%HDF5%%lib/slurm/acct_gather_profile_hdf5.so
+lib/slurm/acct_gather_interconnect_none.a
+lib/slurm/acct_gather_interconnect_none.so
 lib/slurm/acct_gather_profile_none.a
 lib/slurm/acct_gather_profile_none.so
 lib/slurm/auth_munge.a
@ -71,8 +58,6 @@ lib/slurm/auth_none.a
 lib/slurm/auth_none.so
 lib/slurm/burst_buffer_cray.a
 lib/slurm/burst_buffer_cray.so
-lib/slurm/power_cray.a
-lib/slurm/power_cray.so
 lib/slurm/burst_buffer_generic.a
 lib/slurm/burst_buffer_generic.so
 lib/slurm/checkpoint_none.a
@ -89,8 +74,6 @@ lib/slurm/crypto_openssl.a
 lib/slurm/crypto_openssl.so
 lib/slurm/ext_sensors_none.a
 lib/slurm/ext_sensors_none.so
-%%RRD%%lib/slurm/ext_sensors_rrd.a
-%%RRD%%lib/slurm/ext_sensors_rrd.so
 lib/slurm/gres_gpu.a
 lib/slurm/gres_gpu.so
 lib/slurm/gres_mic.a
@ -123,12 +106,8 @@ lib/slurm/jobacct_gather_linux.a
 lib/slurm/jobacct_gather_linux.so
 lib/slurm/jobacct_gather_none.a
 lib/slurm/jobacct_gather_none.so
-%%CURL%%lib/slurm/jobcomp_elasticsearch.a
-%%CURL%%lib/slurm/jobcomp_elasticsearch.so
 lib/slurm/jobcomp_filetxt.a
 lib/slurm/jobcomp_filetxt.so
-%%MYSQL%%lib/slurm/jobcomp_mysql.a
-%%MYSQL%%lib/slurm/jobcomp_mysql.so
 lib/slurm/jobcomp_none.a
 lib/slurm/jobcomp_none.so
 lib/slurm/jobcomp_script.a
@ -141,6 +120,8 @@ lib/slurm/layouts_power_default.a
 lib/slurm/layouts_power_default.so
 lib/slurm/layouts_unit_default.a
 lib/slurm/layouts_unit_default.so
+lib/slurm/libslurmfull.a
+lib/slurm/libslurmfull.so
 lib/slurm/mcs_account.a
 lib/slurm/mcs_account.so
 lib/slurm/mcs_group.a
@ -149,18 +130,6 @@ lib/slurm/mcs_none.a
 lib/slurm/mcs_none.so
 lib/slurm/mcs_user.a
 lib/slurm/mcs_user.so
-lib/slurm/mpi_lam.a
-lib/slurm/mpi_lam.so
-lib/slurm/mpi_mpich1_p4.a
-lib/slurm/mpi_mpich1_p4.so
-lib/slurm/mpi_mpich1_shmem.a
-lib/slurm/mpi_mpich1_shmem.so
-lib/slurm/mpi_mpichgm.a
-lib/slurm/mpi_mpichgm.so
-lib/slurm/mpi_mpichmx.a
-lib/slurm/mpi_mpichmx.so
-lib/slurm/mpi_mvapich.a
-lib/slurm/mpi_mvapich.so
 lib/slurm/mpi_none.a
 lib/slurm/mpi_none.so
 lib/slurm/mpi_openmpi.a
@ -171,10 +140,10 @@ lib/slurm/node_features_knl_cray.a
 lib/slurm/node_features_knl_cray.so
 lib/slurm/node_features_knl_generic.a
 lib/slurm/node_features_knl_generic.so
+lib/slurm/power_cray.a
+lib/slurm/power_cray.so
 lib/slurm/power_none.a
 lib/slurm/power_none.so
-lib/slurm/preempt_job_prio.a
-lib/slurm/preempt_job_prio.so
 lib/slurm/preempt_none.a
 lib/slurm/preempt_none.so
 lib/slurm/preempt_partition_prio.a
@ -241,6 +210,10 @@ lib/slurm/topology_none.a
 lib/slurm/topology_none.so
 lib/slurm/topology_tree.a
 lib/slurm/topology_tree.so
+%%LUA_LIBDIR%%/slurm/job_submit_lua.a
+%%LUA_LIBDIR%%/slurm/job_submit_lua.so
+%%LUA_LIBDIR%%/slurm/proctrack_lua.a
+%%LUA_LIBDIR%%/slurm/proctrack_lua.so
 man/man1/sacct.1.gz
 man/man1/sacctmgr.1.gz
 man/man1/salloc.1.gz
@ -250,7 +223,6 @@ man/man1/sbcast.1.gz
 man/man1/scancel.1.gz
 man/man1/scontrol.1.gz
 man/man1/sdiag.1.gz
-%%HDF5%%man/man1/sh5util.1.gz
 man/man1/sinfo.1.gz
 man/man1/slurm.1.gz
 man/man1/smap.1.gz
@ -261,11 +233,10 @@ man/man1/srun.1.gz
 man/man1/sshare.1.gz
 man/man1/sstat.1.gz
 man/man1/strigger.1.gz
-%%GTK2%%man/man1/sview.1.gz
+man/man3/slurm_allocate_pack_job_blocking.3.gz
 man/man3/slurm_allocate_resources.3.gz
 man/man3/slurm_allocate_resources_blocking.3.gz
 man/man3/slurm_allocation_lookup.3.gz
-man/man3/slurm_allocation_lookup_lite.3.gz
 man/man3/slurm_allocation_msg_thr_create.3.gz
 man/man3/slurm_allocation_msg_thr_destroy.3.gz
 man/man3/slurm_api_version.3.gz
@ -342,6 +313,8 @@ man/man3/slurm_load_partitions.3.gz
 man/man3/slurm_load_reservations.3.gz
 man/man3/slurm_load_slurmd_status.3.gz
 man/man3/slurm_notify_job.3.gz
+man/man3/slurm_pack_job_lookup.3.gz
+man/man3/slurm_pack_job_will_run.3.gz
 man/man3/slurm_perror.3.gz
 man/man3/slurm_pid2jobid.3.gz
 man/man3/slurm_ping.3.gz
@ -403,7 +376,6 @@ man/man3/slurm_update_partition.3.gz
 man/man3/slurm_update_reservation.3.gz
 man/man3/slurm_update_step.3.gz
 man/man5/acct_gather.conf.5.gz
-man/man5/bluegene.conf.5.gz
 man/man5/burst_buffer.conf.5.gz
 man/man5/cgroup.conf.5.gz
 man/man5/cray.conf.5.gz
@ -423,176 +395,199 @@ sbin/slurmctld
 sbin/slurmd
 sbin/slurmdbd
 sbin/slurmstepd
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/Slurm_Entity.pdf
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/Slurm_Individual.pdf
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/accounting.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/accounting_storageplugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/acct_gather.conf.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/acct_gather_energy_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/acct_gather_profile_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/add.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/allocation_pies.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/api.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/arch.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/authplugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bb_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/big_sys.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bluegene.conf.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/bluegene.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/burst_buffer.conf.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/burst_buffer.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cgroup.conf.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cgroups.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/checkpoint_blcr.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/checkpoint_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/coding_style.pdf
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/configurator.easy.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/configurator.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cons_res.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cons_res_share.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/contributor.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/core_spec.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/core_spec_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cpu_management.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cray.conf.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cray.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/cray_alps.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/crypto_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/disclaimer.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/dist_plane.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/documentation.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/download.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/elastic_computing.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/entities.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/example_usage.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ext_sensors.conf.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ext_sensorsplugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/fair_tree.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/faq.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/fonts.css
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/fonts.ttf
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gang_scheduling.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres.conf.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres_design.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/gres_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_job_outline.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_profile_user_guide.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/hdf5_task_attr.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/high_throughput.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm-pe.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig1.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/ibm_pe_fig2.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/intel_knl.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_array.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_container_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_exit_code.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_launch.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/job_submit_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jobacct_gatherplugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jobcompplugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/jquery.min.js
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/k_function.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/knl.conf.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/launch_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/licenses.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mail.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/man_index.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mc_support.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mcs.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mcs_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/meetings.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mpi_guide.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/mpiplugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/multi_cluster.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/news.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/node_features_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/nonstop.conf.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/overview.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex1.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex2.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex3.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex4.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex5.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex6.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plane_ex7.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/platforms.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_mgmt.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/power_save.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/preempt.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/preemption_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_multifactor3.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/priority_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/proctrack_plugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/programmer_guide.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/prolog_epilog.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/publications.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/qos.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/quickstart.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/quickstart_admin.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/reservations.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/reset.css
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/resource_limits.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/rosetta.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/route_plugin.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/rpc.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sacct.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sacctmgr.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/salloc.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sattach.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sbatch.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sbcast.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/scancel.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sched_config.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/schedmd.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/schedplugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/scontrol.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sdiag.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/select_design.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/selectplugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sh5util.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sinfo.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm.conf.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm.css
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_logo.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_ug_agenda.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurm_ug_cfp.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmctld.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmctld_plugstack.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmd.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmdbd.conf.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmdbd.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/slurmstepd.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/smap.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/spank.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sprio.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/squeue.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/squeue_color.png
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sreport.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/srun.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sshare.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/sstat.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/strigger.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/style.css
-%%PORTDOCS%%%%GTK2%%%%DOCSDIR%%-%%PORTVERSION%%/html/sview.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/switchplugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/taskplugins.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/team.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/testimonials.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topo_ex1.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topo_ex2.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology.conf.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/topology_plugin.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tres.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/troubleshoot.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorial_intro_files.tar
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/tutorials.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/usage_pies.gif
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/user_permissions.html
-%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/html/wckey.html
+%%CURL%%lib/slurm/jobcomp_elasticsearch.a
+%%CURL%%lib/slurm/jobcomp_elasticsearch.so
+%%CURL%%lib/slurm/acct_gather_profile_influxdb.a
+%%CURL%%lib/slurm/acct_gather_profile_influxdb.so
+%%GUI%%bin/sview
+%%GUI%%man/man1/sview.1.gz
+%%HDF5%%%%PORTDOCS%%%%DOCSDIR%%/html/sh5util.html
+%%HDF5%%bin/sh5util
+%%HDF5%%lib/slurm/acct_gather_profile_hdf5.a
+%%HDF5%%lib/slurm/acct_gather_profile_hdf5.so
+%%HDF5%%man/man1/sh5util.1.gz
+%%IPMI%%lib/slurm/acct_gather_energy_ipmi.a
+%%IPMI%%lib/slurm/acct_gather_energy_ipmi.so
+%%IPMI%%lib/slurm/acct_gather_energy_xcc.a
+%%IPMI%%lib/slurm/acct_gather_energy_xcc.so
+%%MYSQL%%lib/slurm/accounting_storage_mysql.a
+%%MYSQL%%lib/slurm/accounting_storage_mysql.so
+%%MYSQL%%lib/slurm/jobcomp_mysql.a
+%%MYSQL%%lib/slurm/jobcomp_mysql.so
+%%PORTDOCS%%%%DOCSDIR%%/html/Slurm_Entity.pdf
+%%PORTDOCS%%%%DOCSDIR%%/html/Slurm_Individual.pdf
+%%PORTDOCS%%%%DOCSDIR%%/html/accounting.html
+%%PORTDOCS%%%%DOCSDIR%%/html/accounting_storageplugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/acct_gather.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/acct_gather_energy_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/acct_gather_profile_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/add.html
+%%PORTDOCS%%%%DOCSDIR%%/html/allocation_pies.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/api.html
+%%PORTDOCS%%%%DOCSDIR%%/html/arch.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/authplugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/bb_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/big_sys.html
+%%PORTDOCS%%%%DOCSDIR%%/html/burst_buffer.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/burst_buffer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cgroup.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cgroups.html
+%%PORTDOCS%%%%DOCSDIR%%/html/checkpoint_blcr.html
+%%PORTDOCS%%%%DOCSDIR%%/html/checkpoint_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/coding_style.pdf
+%%PORTDOCS%%%%DOCSDIR%%/html/configurator.easy.html
+%%PORTDOCS%%%%DOCSDIR%%/html/configurator.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cons_res.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cons_res_share.html
+%%PORTDOCS%%%%DOCSDIR%%/html/containers.html
+%%PORTDOCS%%%%DOCSDIR%%/html/contributor.html
+%%PORTDOCS%%%%DOCSDIR%%/html/core_spec.html
+%%PORTDOCS%%%%DOCSDIR%%/html/core_spec_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cpu_management.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cray.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/cray.html
+%%PORTDOCS%%%%DOCSDIR%%/html/crypto_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/disclaimer.html
+%%PORTDOCS%%%%DOCSDIR%%/html/dist_plane.html
+%%PORTDOCS%%%%DOCSDIR%%/html/documentation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/download.html
+%%PORTDOCS%%%%DOCSDIR%%/html/elastic_computing.html
+%%PORTDOCS%%%%DOCSDIR%%/html/elasticsearch.html
+%%PORTDOCS%%%%DOCSDIR%%/html/entities.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/example_usage.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/ext_sensors.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ext_sensorsplugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fair_tree.html
+%%PORTDOCS%%%%DOCSDIR%%/html/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/html/federation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts.css
+%%PORTDOCS%%%%DOCSDIR%%/html/fonts.ttf
+%%PORTDOCS%%%%DOCSDIR%%/html/gang_scheduling.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gres.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gres.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gres_design.html
+%%PORTDOCS%%%%DOCSDIR%%/html/gres_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hdf5_job_outline.png
+%%PORTDOCS%%%%DOCSDIR%%/html/hdf5_profile_user_guide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/hdf5_task_attr.png
+%%PORTDOCS%%%%DOCSDIR%%/html/heterogeneous_jobs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/high_throughput.html
+%%PORTDOCS%%%%DOCSDIR%%/html/ibm_pe_fig1.png
+%%PORTDOCS%%%%DOCSDIR%%/html/ibm_pe_fig2.png
+%%PORTDOCS%%%%DOCSDIR%%/html/intel_knl.html
+%%PORTDOCS%%%%DOCSDIR%%/html/job_array.html
+%%PORTDOCS%%%%DOCSDIR%%/html/job_container_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/job_exit_code.html
+%%PORTDOCS%%%%DOCSDIR%%/html/job_launch.html
+%%PORTDOCS%%%%DOCSDIR%%/html/job_submit_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jobacct_gatherplugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jobcompplugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/jquery.min.js
+%%PORTDOCS%%%%DOCSDIR%%/html/k_function.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/knl.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/launch_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/licenses.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mail.html
+%%PORTDOCS%%%%DOCSDIR%%/html/man_index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mc_support.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/mc_support.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mcs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mcs_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/meetings.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mpi_guide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/mpiplugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/multi_cluster.html
+%%PORTDOCS%%%%DOCSDIR%%/html/news.html
+%%PORTDOCS%%%%DOCSDIR%%/html/node_features_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/nonstop.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/overview.html
+%%PORTDOCS%%%%DOCSDIR%%/html/pam_slurm_adopt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/plane_ex1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/plane_ex2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/plane_ex3.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/plane_ex4.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/plane_ex5.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/plane_ex6.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/plane_ex7.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/platforms.html
+%%PORTDOCS%%%%DOCSDIR%%/html/plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/power_mgmt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/power_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/power_save.html
+%%PORTDOCS%%%%DOCSDIR%%/html/preempt.html
+%%PORTDOCS%%%%DOCSDIR%%/html/preemption_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/priority_multifactor.html
+%%PORTDOCS%%%%DOCSDIR%%/html/priority_multifactor3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/priority_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/proctrack_plugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/programmer_guide.html
+%%PORTDOCS%%%%DOCSDIR%%/html/prolog_epilog.html
+%%PORTDOCS%%%%DOCSDIR%%/html/publications.html
+%%PORTDOCS%%%%DOCSDIR%%/html/qos.html
+%%PORTDOCS%%%%DOCSDIR%%/html/quickstart.html
+%%PORTDOCS%%%%DOCSDIR%%/html/quickstart_admin.html
+%%PORTDOCS%%%%DOCSDIR%%/html/reservations.html
+%%PORTDOCS%%%%DOCSDIR%%/html/reset.css
+%%PORTDOCS%%%%DOCSDIR%%/html/resource_binding.html
+%%PORTDOCS%%%%DOCSDIR%%/html/resource_limits.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rosetta.html
+%%PORTDOCS%%%%DOCSDIR%%/html/route_plugin.html
+%%PORTDOCS%%%%DOCSDIR%%/html/rpc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sacct.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sacctmgr.html
+%%PORTDOCS%%%%DOCSDIR%%/html/salloc.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sattach.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sbatch.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sbcast.html
+%%PORTDOCS%%%%DOCSDIR%%/html/scancel.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sched_config.html
+%%PORTDOCS%%%%DOCSDIR%%/html/schedmd.png
+%%PORTDOCS%%%%DOCSDIR%%/html/schedplugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/scontrol.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sdiag.html
+%%PORTDOCS%%%%DOCSDIR%%/html/select_design.html
+%%PORTDOCS%%%%DOCSDIR%%/html/selectplugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sinfo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/slurm.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/slurm.css
+%%PORTDOCS%%%%DOCSDIR%%/html/slurm.html
+%%PORTDOCS%%%%DOCSDIR%%/html/slurm_logo.png
+%%PORTDOCS%%%%DOCSDIR%%/html/slurm_ug_agenda.html
+%%PORTDOCS%%%%DOCSDIR%%/html/slurm_ug_cfp.html
+%%PORTDOCS%%%%DOCSDIR%%/html/slurmctld.html
+%%PORTDOCS%%%%DOCSDIR%%/html/slurmctld_plugstack.html
+%%PORTDOCS%%%%DOCSDIR%%/html/slurmd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/slurmdbd.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/slurmdbd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/slurmstepd.html
+%%PORTDOCS%%%%DOCSDIR%%/html/smap.html
+%%PORTDOCS%%%%DOCSDIR%%/html/spank.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sprio.html
+%%PORTDOCS%%%%DOCSDIR%%/html/squeue.html
+%%PORTDOCS%%%%DOCSDIR%%/html/squeue_color.png
+%%PORTDOCS%%%%DOCSDIR%%/html/sreport.html
+%%PORTDOCS%%%%DOCSDIR%%/html/srun.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sshare.html
+%%PORTDOCS%%%%DOCSDIR%%/html/sstat.html
+%%PORTDOCS%%%%DOCSDIR%%/html/strigger.html
+%%PORTDOCS%%%%DOCSDIR%%/html/style.css
+%%PORTDOCS%%%%DOCSDIR%%/html/switchplugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/taskplugins.html
+%%PORTDOCS%%%%DOCSDIR%%/html/team.html
+%%PORTDOCS%%%%DOCSDIR%%/html/testimonials.html
+%%PORTDOCS%%%%DOCSDIR%%/html/topo_ex1.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/topo_ex2.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/topology.conf.html
+%%PORTDOCS%%%%DOCSDIR%%/html/topology.html
+%%PORTDOCS%%%%DOCSDIR%%/html/topology_plugin.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tres.html
+%%PORTDOCS%%%%DOCSDIR%%/html/troubleshoot.html
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorial_intro_files.tar
+%%PORTDOCS%%%%DOCSDIR%%/html/tutorials.html
+%%PORTDOCS%%%%DOCSDIR%%/html/usage_pies.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/user_permissions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/wckey.html
+%%PORTDOCS%%%%GUI%%%%DOCSDIR%%/html/sview.html
+%%RRD%%lib/slurm/ext_sensors_rrd.a
+%%RRD%%lib/slurm/ext_sensors_rrd.so
+@sample etc/slurm.conf.sample
--- a/textproc/bat/Makefile
+++ b/textproc/bat/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	bat
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.10.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	textproc

 MAINTAINER=	pizzamig@FreeBSD.org
--- a/textproc/ripgrep/Makefile
+++ b/textproc/ripgrep/Makefile
@ -5,6 +5,7 @@

 PORTNAME=	ripgrep
 DISTVERSION=	11.0.1
+PORTREVISION=	1
 CATEGORIES=	textproc

 MAINTAINER=	petteri.valkonen@iki.fi
--- a/textproc/sd/Makefile
+++ b/textproc/sd/Makefile
@ -3,7 +3,7 @@
 PORTNAME=	sd
 DISTVERSIONPREFIX=	sd-
 DISTVERSION=	0.5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc

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