3 files changed, 21 insertions, 34 deletions

diff --git a/net/remmina-plugins/Makefile b/net/remmina-plugins/Makefile
index 1eb873eca050..72b899d311cf 100644
--- a/net/remmina-plugins/Makefile
+++ b/net/remmina-plugins/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME?=	remmina-plugins
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	net gnome
 USE_GITHUB=	yes
 GH_ACCOUNT=	FreeRDP
@@ -15,7 +16,6 @@ DISTNAME=	remmina-${PORTVERSION}
 MAINTAINER?=	fluffy@FreeBSD.org
 COMMENT?=	Remmina plugin system
 
-NO_STAGE=	yes
 .if defined(PKGNAMESUFFIX)
 .include "${.CURDIR}/../remmina-plugins/bsd.plugin.mk"
 .else
diff --git a/net/remmina-plugins/bsd.plugin.mk b/net/remmina-plugins/bsd.plugin.mk
index 77fa8f1faca8..4ca3d14212bf 100644
--- a/net/remmina-plugins/bsd.plugin.mk
+++ b/net/remmina-plugins/bsd.plugin.mk
@@ -1,9 +1,9 @@
 .if defined(PKGNAMESUFFIX)
 
 PORTNAME=	remmina-plugin
+PATCHDIR=	${.CURDIR}/../remmina/files
 
 LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/${PORTNAME}s/COPYING
 
 BUILD_DEPENDS+=	remmina>=${PORTVERSION}:${PORTSDIR}/net/remmina
 RUN_DEPENDS+=	remmina>=${PORTVERSION}:${PORTSDIR}/net/remmina
@@ -23,38 +23,32 @@ CMAKE_ARGS+=    --build=build
 # prefer gtk2 rather than gtk3
 CMAKE_ARGS+=    -DGTK_VERSION=2
 
-.include <bsd.port.pre.mk>
+SSH_DESC=	Build with SSH tunneling support
 
-.if ${PKGNAMESUFFIX} == "-i18n" || ${PKGNAMESUFFIX} == "-gnome"
-PLIST=		${.CURDIR}/pkg-plist
-.else
-PLIST_SUB+=	PLUGIN="${PKGNAMESUFFIX:S,-,,}"
-PLIST=		${PKGDIR}/pkg-plist.plugin
+.include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MTELEP}
-PLIST_SUB+=	TELEP="" ICONS="@comment "
-.else
-PLIST_SUB+=	TELEP="@comment " ICONS=""
-.endif
-.if ${PORT_OPTIONS:MTELEP}
-LIB_DEPENDS+=	ssh.4:${PORTSDIR}/security/libssh
-PLIST_SUB+=	SSH="@comment "
+.if ${PORT_OPTIONS:MSSH}
+LIB_DEPENDS+=	libssh.so:${PORTSDIR}/security/libssh
+PLIST_SUB+=	SSH=""
 .if ${OSVERSION} >= 800040
 LDFLAGS+=	-fstack-protector
 .endif
 .else
-PLIST_SUB+=	SSH=""
-.endif
-.if ${PORT_OPTIONS:MNX}
-PLIST_SUB+=	ICONS="" SSH="@comment "
-.else
-PLIST_SUB+=	ICONS="@comment "
+CMAKE_ARGS+=	-DWITH_LIBSSH=OFF
+PLIST_SUB+=	SSH="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MNLS}
 RUN_DEPENDS+=	${LOCALBASE}/share/locale/bg/LC_MESSAGES/remmina-plugins.mo:${PORTSDIR}/net/remmina-plugin-i18n
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${PKGNAMESUFFIX} == "-i18n" || ${PKGNAMESUFFIX} == "-gnome"
+PLIST=		${.CURDIR}/pkg-plist
+.else
+PLIST_SUB+=	PLUGIN="${PKGNAMESUFFIX:S,-,,}"
+PLIST=		${PKGDIR}/pkg-plist.plugin
 .endif
 
 post-patch:
@@ -76,7 +70,7 @@ post-patch:
 .endif
 .if ${PKGNAMESUFFIX:S,-,,} != "vnc"
 	${REINPLACE_CMD} -e 's|find_suggested_package(GCRYPT)||' ${WRKSRC}/CMakeLists.txt
-	${REINPLACE_CMD} -e 's|add_subdirectory(vnc/libvncserver)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+	${REINPLACE_CMD} -e' s|find_required_package(LIBVNCSERVER)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
 	${REINPLACE_CMD} -e 's|add_subdirectory(vnc)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
 .endif
 .if ${PKGNAMESUFFIX:S,-,,} != "xdmcp"
diff --git a/net/remmina-plugins/pkg-plist.plugin b/net/remmina-plugins/pkg-plist.plugin
index 228030c7277b..cd8b566b037a 100644
--- a/net/remmina-plugins/pkg-plist.plugin
+++ b/net/remmina-plugins/pkg-plist.plugin
@@ -1,15 +1,8 @@
 lib/remmina/plugins/remmina-plugin-%%PLUGIN%%.so
-%%ICONS%%%%SSH%%share/remmina/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%-ssh.png
-%%ICONS%%share/remmina/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%.png
-%%ICONS%%%%SSH%%share/remmina/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%-ssh.png
-%%ICONS%%share/remmina/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%.png
-@dirrmtry share/remmina/icons/hicolor/22x22/emblems
-@dirrmtry share/remmina/icons/hicolor/22x22
-@dirrmtry share/remmina/icons/hicolor/16x16/emblems
-@dirrmtry share/remmina/icons/hicolor/16x16
-@dirrmtry share/remmina/icons/hicolor
-@dirrmtry share/remmina/icons
-@dirrmtry share/remmina
+%%ICONS%%%%SSH%%share/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%-ssh.png
+%%ICONS%%share/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%.png
+%%ICONS%%%%SSH%%share/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%-ssh.png
+%%ICONS%%share/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%.png
 @dirrmtry lib/remmina/plugins
 @dirrmtry lib/remmina
 @dirrmtry include/remmina