Index: head/net-p2p/retroshare/Makefile
===================================================================
--- head/net-p2p/retroshare/Makefile	(revision 499613)
+++ head/net-p2p/retroshare/Makefile	(revision 499614)
@@ -1,63 +1,63 @@
 # Created by: glocke@bsdstammtisch.at
 # $FreeBSD$
 
 PORTNAME=	retroshare
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-p2p
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES=	428b331d8efe.patch:-p1
 
 MAINTAINER=	peter@netkey.at
 COMMENT=	Private and secure decentralised communication platform
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 LIB_DEPENDS=	libsqlcipher.so:databases/sqlcipher \
 		libspeex.so:audio/speex \
 		libspeexdsp.so:audio/speexdsp \
-		libupnp.so:devel/upnp \
 		libgnome-keyring.so:security/libgnome-keyring \
 		libgpgme.so:security/gpgme \
 		libopencv_highgui.so:graphics/opencv \
 		libopencv_imgproc.so:graphics/opencv-core \
 		libavcodec.so:multimedia/ffmpeg \
 		libcurl.so:ftp/curl \
-		libmicrohttpd.so:www/libmicrohttpd
+		libmicrohttpd.so:www/libmicrohttpd \
+		libminiupnpc.so:net/miniupnpc
 
 USES=		compiler:features desktop-file-utils dos2unix \
 		gnome pkgconfig qmake qt:5 ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	RetroShare
 GH_PROJECT=	RetroShare
 RS_REVISION=	0e6d27a
 USE_GNOME=	libxml2 libxslt
 USE_GL=		gl
 USE_QT=		core gui multimedia printsupport network widgets xml \
 		buildtools_build uitools_build
 DOS2UNIX_FILES=	retroshare-nogui/src/retroshare-nogui.pro
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/retroshare.pri
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/libretroshare/src/libretroshare.pro
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/libretroshare/src/rsserver/rsaccounts.cc
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/retroshare-gui/src/retroshare-gui.pro
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/retroshare-nogui/src/retroshare-nogui.pro
 	@${REINPLACE_CMD} -e 's|/usr/bin|${PREFIX}/bin|' \
 		${WRKSRC}/data/retroshare.desktop
 	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|' \
 		${WRKSRC}/data/retroshare.desktop
 	@${REINPLACE_CMD} -e 's|RS_REVISION_NUMBER.*|RS_REVISION_NUMBER   0x${RS_REVISION}|' \
 		${WRKSRC}/libretroshare/src/retroshare/rsversion.h
 
 .include <bsd.port.post.mk>
Index: head/net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro
===================================================================
--- head/net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro	(revision 499613)
+++ head/net-p2p/retroshare/files/patch-libretroshare_src_libretroshare.pro	(revision 499614)
@@ -1,19 +1,20 @@
 --- libretroshare/src/libretroshare.pro.orig	2018-03-13 19:25:38 UTC
 +++ libretroshare/src/libretroshare.pro
-@@ -341,13 +341,15 @@ mac {
+@@ -341,13 +341,14 @@ mac {
  
  freebsd-* {
  	INCLUDEPATH *= /usr/local/include/gpgme
 -	INCLUDEPATH *= /usr/local/include/glib-2.0
 +	INCLUDEPATH += $$system(pkg-config --cflags glib-2.0 | sed -e "s/-I//g")
  
  	QMAKE_CXXFLAGS *= -Dfseeko64=fseeko -Dftello64=ftello -Dstat64=stat -Dstatvfs64=statvfs -Dfopen64=fopen
  
  	# linux/bsd can use either - libupnp is more complete and packaged.
- 	#CONFIG += upnp_miniupnpc 
-     CONFIG += upnp_libupnp
+-	#CONFIG += upnp_miniupnpc 
+-    CONFIG += upnp_libupnp
++	CONFIG += upnp_miniupnpc 
 +	DEFINES *= PLUGIN_DIR=\"\\\"$${PLUGIN_DIR}\\\"\"
 +	DEFINES *= DATA_DIR=\"\\\"$${DATA_DIR}\\\"\"
  }
  
  ################################# OpenBSD ##########################################
Index: head/net-p2p/retroshare/files/patch-retroshare-gui_src_retroshare-gui.pro
===================================================================
--- head/net-p2p/retroshare/files/patch-retroshare-gui_src_retroshare-gui.pro	(revision 499613)
+++ head/net-p2p/retroshare/files/patch-retroshare-gui_src_retroshare-gui.pro	(revision 499614)
@@ -1,21 +1,21 @@
---- retroshare-gui/src/retroshare-gui.pro.orig	2016-02-05 19:04:46 UTC
+--- retroshare-gui/src/retroshare-gui.pro.orig	2018-03-13 19:25:38 UTC
 +++ retroshare-gui/src/retroshare-gui.pro
-@@ -239,12 +239,16 @@ macx {
+@@ -270,12 +270,15 @@ macx {
  
  freebsd-* {
  	INCLUDEPATH *= /usr/local/include/gpgme
 -	LIBS *= -lssl
 +	LIBS *= -lssl -lcrypto
  	LIBS *= -lgpgme
- 	LIBS *= -lupnp
+-	LIBS *= -lupnp
++	LIBS *= -lminiupnpc
  	LIBS *= -lgnome-keyring
 +	LIBS *= -lz
-+	LIBS *= -lixml
 +	LIBS *= -lexecinfo
  
 -	LIBS += -lsqlite3
 +	LIBS += -lsqlcipher
 +	LIBS *= -rdynamic
  }
  
  ##################################### Haiku ######################################
Index: head/net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare-nogui.pro
===================================================================
--- head/net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare-nogui.pro	(revision 499613)
+++ head/net-p2p/retroshare/files/patch-retroshare-nogui_src_retroshare-nogui.pro	(revision 499614)
@@ -1,20 +1,20 @@
---- retroshare-nogui/src/retroshare-nogui.pro.orig	2016-03-05 21:29:14 UTC
+--- retroshare-nogui/src/retroshare-nogui.pro.orig	2019-04-20 14:26:36 UTC
 +++ retroshare-nogui/src/retroshare-nogui.pro
-@@ -126,10 +126,16 @@ macx {
+@@ -115,10 +115,15 @@ macx {
  
  freebsd-* {
  	INCLUDEPATH *= /usr/local/include/gpgme
 -	LIBS *= -lssl
 +	LIBS *= -lssl -lcrypto
  	LIBS *= -lgpgme
- 	LIBS *= -lupnp
+-	LIBS *= -lupnp
++	LIBS *= -lminiupnpc
  	LIBS *= -lgnome-keyring
 +	LIBS *= -lz
-+	LIBS *= -lixml
 +	LIBS *= -lthr
 +	LIBS += -lsqlcipher
 +	LIBS *= -lexecinfo
 +	LIBS *= -rdynamic
  }
  
  ##################################### OpenBSD  ######################################