- Update net/remmina and its plugins to 1.0.0 release

- Add gnome and nx plugins

Big thanks to Koichiro IWAIO for his work!

Submitted by:	Koichiro IWAIO <meta AT vmeta DOT jp> via mail

20 files changed, 311 insertions, 143 deletions

diff --git a/net/Makefile b/net/Makefile
index d9e2a6c8619f..6e0826d96877 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -986,7 +986,9 @@
     SUBDIR += relayd
     SUBDIR += remmina
     SUBDIR += remmina-applet
+    SUBDIR += remmina-plugin-gnome
     SUBDIR += remmina-plugin-i18n
+    SUBDIR += remmina-plugin-nx
     SUBDIR += remmina-plugin-rdp
     SUBDIR += remmina-plugin-telepathy
     SUBDIR += remmina-plugin-vnc
diff --git a/net/remmina-plugin-gnome/Makefile b/net/remmina-plugin-gnome/Makefile
new file mode 100644
index 000000000000..f87365c8173a
--- /dev/null
+++ b/net/remmina-plugin-gnome/Makefile
@@ -0,0 +1,13 @@
+# Created by: Koichiro IWAO <meta+ports@vmeta.jp>
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-gnome
+
+MAINTAINER=	meta+ports@vmeta.jp
+COMMENT=	Remmina plugin for GNOME Keyring
+
+LIB_DEPENDS=	gnome-keyring:${PORTSDIR}/security/libgnome-keyring
+
+MASTERDIR=	${.CURDIR}/../remmina-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/remmina-plugin-gnome/pkg-plist b/net/remmina-plugin-gnome/pkg-plist
new file mode 100644
index 000000000000..236ce7402001
--- /dev/null
+++ b/net/remmina-plugin-gnome/pkg-plist
@@ -0,0 +1,4 @@
+lib/remmina/plugins/remmina-plugins-gnome.so
+@dirrmtry lib/remmina/plugins
+@dirrmtry lib/remmina
+@dirrmtry include/remmina
diff --git a/net/remmina-plugin-i18n/Makefile b/net/remmina-plugin-i18n/Makefile
index 868be5c15bcd..6707a5efb2e5 100644
--- a/net/remmina-plugin-i18n/Makefile
+++ b/net/remmina-plugin-i18n/Makefile
@@ -1,7 +1,4 @@
-# New ports collection makefile for:	remmina-plugin-i18n
-# Date created:				24 June 2010
-# Whom:					Alexander Logvinov <avl@FreeBSD.org>
-#
+# Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
 #
 
@@ -11,6 +8,6 @@ COMMENT=	Localized messages for Remmina plugins
 
 MASTERDIR=	${.CURDIR}/../remmina-plugins
 
-USES=		gettext
+USES+=	gettext
 
 .include "${MASTERDIR}/Makefile"
diff --git a/net/remmina-plugin-i18n/pkg-plist b/net/remmina-plugin-i18n/pkg-plist
index 0d27184388bc..c317a80363ea 100644
--- a/net/remmina-plugin-i18n/pkg-plist
+++ b/net/remmina-plugin-i18n/pkg-plist
@@ -22,3 +22,4 @@ share/locale/th/LC_MESSAGES/remmina-plugins.mo
 share/locale/tr/LC_MESSAGES/remmina-plugins.mo
 share/locale/uk/LC_MESSAGES/remmina-plugins.mo
 share/locale/zh_CN/LC_MESSAGES/remmina-plugins.mo
+@dirrmtry include/remmina
diff --git a/net/remmina-plugin-nx/Makefile b/net/remmina-plugin-nx/Makefile
new file mode 100644
index 000000000000..51f82fac11ad
--- /dev/null
+++ b/net/remmina-plugin-nx/Makefile
@@ -0,0 +1,15 @@
+# Created by: Koichiro IWAO <meta+ports@vmeta.jp>
+# $FreeBSD$
+
+PKGNAMESUFFIX=	-nx
+
+MAINTAINER=	meta+ports@vmeta.jp
+COMMENT=	Remmina plugin for NX
+
+USE_XORG+=	xkbfile
+
+MASTERDIR=	${.CURDIR}/../remmina-plugins
+
+WITH_NX=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/net/remmina-plugin-rdp/Makefile b/net/remmina-plugin-rdp/Makefile
index f315bc069c47..2a943326b46d 100644
--- a/net/remmina-plugin-rdp/Makefile
+++ b/net/remmina-plugin-rdp/Makefile
@@ -1,15 +1,12 @@
-# New ports collection makefile for:	remmina-plugin-rdp
-# Date created:				24 June 2010
-# Whom:					Alexander Logvinov <avl@FreeBSD.org>
-#
+# Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
-#
 
 PKGNAMESUFFIX=	-rdp
 
 COMMENT=	Remmina plugin for RDP protocol
 
-LIB_DEPENDS=	freerdp.0:${PORTSDIR}/net/freerdp
+BUILD_DEPENDS=	freerdp>=1.0.0:${PORTSDIR}/net/freerdp
+RUN_DEPENDS=	${BUILD_DEPENDS}
 
 MASTERDIR=	${.CURDIR}/../remmina-plugins
 
diff --git a/net/remmina-plugin-telepathy/Makefile b/net/remmina-plugin-telepathy/Makefile
index 29a569903bd3..ed5e9f8d7af0 100644
--- a/net/remmina-plugin-telepathy/Makefile
+++ b/net/remmina-plugin-telepathy/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	remmina-plugin-telepathy
-# Date created:				24 June 2010
-# Whom:					Alexander Logvinov <avl@FreeBSD.org>
-#
+# Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
-#
 
 PKGNAMESUFFIX=	-telepathy
 
diff --git a/net/remmina-plugin-vnc/Makefile b/net/remmina-plugin-vnc/Makefile
index 9718e85e66e1..ae96263685db 100644
--- a/net/remmina-plugin-vnc/Makefile
+++ b/net/remmina-plugin-vnc/Makefile
@@ -1,15 +1,11 @@
-# New ports collection makefile for:	remmina-plugin-vnc
-# Date created:				24 June 2010
-# Whom:					Alexander Logvinov <avl@FreeBSD.org>
-#
+# Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
-#
 
-PORTREVISION=	2
 PKGNAMESUFFIX=	-vnc
 
 COMMENT=	Remmina plugin for VNC protocol
 
+BUILD_DEPENDS=	${LOCALBASE}/include/gcrypt.h:${PORTSDIR}/security/libgcrypt
 LIB_DEPENDS=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		gnutls:${PORTSDIR}/security/gnutls
 
diff --git a/net/remmina-plugin-xdmcp/Makefile b/net/remmina-plugin-xdmcp/Makefile
index 6b9c35f04846..e1eed9a89485 100644
--- a/net/remmina-plugin-xdmcp/Makefile
+++ b/net/remmina-plugin-xdmcp/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	remmina-plugin-xdmcp
-# Date created:				24 June 2010
-# Whom:					Alexander Logvinov <avl@FreeBSD.org>
-#
+# Created by: Alexander Logvinov <avl@FreeBSD.org>
 # $FreeBSD$
-#
 
 PKGNAMESUFFIX=	-xdmcp
 
diff --git a/net/remmina-plugins/Makefile b/net/remmina-plugins/Makefile
index 046c97797cb0..61a0edb86d35 100644
--- a/net/remmina-plugins/Makefile
+++ b/net/remmina-plugins/Makefile
@@ -2,31 +2,41 @@
 # $FreeBSD$
 
 PORTNAME?=	remmina-plugins
-PORTVERSION=	0.9.2
-PORTREVISION?=	1
+PORTVERSION=	1.0.0
 CATEGORIES=	net gnome
-MASTER_SITES=	# Empty
-DISTFILES?=	# Empty
+USE_GITHUB=	yes
+GH_ACCOUNT=	FreeRDP
+GH_PROJECT=	remmina
+GH_COMMIT=	356c033
+GH_TAGNAME=	${PORTVERSION}
+DISTNAME=	remmina-plugins-${PORTVERSION}
 
-MAINTAINER=	fluffy@FreeBSD.org
+
+MAINTAINER?=	fluffy@FreeBSD.org
 COMMENT?=	Remmina plugin system
 
 .if defined(PKGNAMESUFFIX)
 .include "${.CURDIR}/../remmina-plugins/bsd.plugin.mk"
 .else
 
-OPTIONS_DEFINE=	RDP VNC XDMCP TELEP
-OPTIONS_DEFAULT=	RDP VNC XDMCP TELEP
+OPTIONS_DEFINE=	KEYRING RDP VNC XDMCP TELEP NX
+OPTIONS_DEFAULT=	KEYRING RDP VNC XDMCP TELEP
+KEYRING_DESC=	GNOME Keyring plugin
 RDP_DESC=	RDP protocol plugin
 VNC_DESC=	VNC protocol plugin
 XDMCP_DESC=	XDMCP protocol plugin
 TELEP_DESC=	Telepathy protocol plugin
+NX_DESC=	NX protocol plugin
 
 NO_BUILD=	yes
 PATCHDIR=	# none
 
 .include <bsd.port.options.mk>
 
+.if ${PORT_OPTIONS:MKEYRING}
+RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugins-gnome.so:${PORTSDIR}/net/remmina-plugin-gnome
+.endif
+
 .if ${PORT_OPTIONS:MRDP}
 RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-rdp.so:${PORTSDIR}/net/remmina-plugin-rdp
 .endif
@@ -43,6 +53,10 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-xdmcp.so:${PORTSDI
 RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-telepathy.so:${PORTSDIR}/net/remmina-plugin-telepathy
 .endif
 
+.if ${PORT_OPTIONS:MNX}
+RUN_DEPENDS+=	${LOCALBASE}/lib/remmina/plugins/remmina-plugin-nx.so:${PORTSDIR}/net/remmina-plugin-nx
+.endif
+
 do-install:	# empty
 
 .include <bsd.port.mk>
diff --git a/net/remmina-plugins/bsd.plugin.mk b/net/remmina-plugins/bsd.plugin.mk
index 7fdde98b82d2..30b67b50920b 100644
--- a/net/remmina-plugins/bsd.plugin.mk
+++ b/net/remmina-plugins/bsd.plugin.mk
@@ -2,32 +2,33 @@
 
 PORTNAME=	remmina-plugin
 
-MASTER_SITES=	SF/remmina/0.9
-DISTNAME=	remmina-plugins-${PORTVERSION}
-DISTFILES=	${DISTNAME}.tar.gz
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/${PORTNAME}s/COPYING
 
-BUILD_DEPENDS+=	${LOCALBASE}/include/remmina/plugin.h:${PORTSDIR}/net/remmina
-RUN_DEPENDS+=	remmina:${PORTSDIR}/net/remmina
+BUILD_DEPENDS+=	remmina>=${PORTVERSION}:${PORTSDIR}/net/remmina
+RUN_DEPENDS+=	remmina>=${PORTVERSION}:${PORTSDIR}/net/remmina
 
-GNU_CONFIGURE=	yes
+USES=		cmake
 USE_GMAKE=	yes
-USE_GNOME=	glib20 gtk20
+USE_GNOME=	atk desktopfileutils gdkpixbuf2 glib20 gtk20 pango
 INSTALLS_ICONS=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-CONFIGURE_ARGS+=--disable-nx --disable-rdp --disable-ssh --disable-telepathy \
-		--disable-vnc --disable-xdmcp --disable-nls
+CFLAGS+=	-I${WRKSRC}/remmina/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC
+WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-Remmina-${GH_COMMIT}
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
+# disable appindicator as it is new feature of gnome 3
+CMAKE_ARGS+=    -DWITH_APPINDICATOR=OFF
+# set build directory
+CMAKE_ARGS+=    --build=build
+# prefer gtk2 rather than gtk3
+CMAKE_ARGS+=    -DGTK_VERSION=2
 
 .include <bsd.port.pre.mk>
 
-.if ${PKGNAMESUFFIX} == "-i18n"
-CONFIGURE_ARGS+=--enable-nls
+.if ${PKGNAMESUFFIX} == "-i18n" || ${PKGNAMESUFFIX} == "-gnome"
 PLIST=		${.CURDIR}/pkg-plist
 .else
-CONFIGURE_ARGS+=--enable${PKGNAMESUFFIX}
 PLIST_SUB+=	PLUGIN="${PKGNAMESUFFIX:S,-,,}"
 PLIST=		${PKGDIR}/pkg-plist.plugin
 
@@ -38,7 +39,6 @@ PLIST_SUB+=	TELEP="@comment " ICONS=""
 .endif
 .if ${PORT_OPTIONS:MTELEP}
 LIB_DEPENDS+=	ssh.4:${PORTSDIR}/security/libssh
-CONFIGURE_ARGS+=--enable-ssh
 PLIST_SUB+=	SSH="@comment "
 .if ${OSVERSION} >= 800040
 LDFLAGS+=	-fstack-protector
@@ -46,6 +46,11 @@ LDFLAGS+=	-fstack-protector
 .else
 PLIST_SUB+=	SSH=""
 .endif
+.if ${PORT_OPTIONS:MNX}
+PLIST_SUB+=	ICONS="" SSH="@comment "
+.else
+PLIST_SUB+=	ICONS="@comment "
+.endif
 
 .if ${PORT_OPTIONS:MNLS}
 RUN_DEPENDS+=	${LOCALBASE}/share/locale/bg/LC_MESSAGES/remmina-plugins.mo:${PORTSDIR}/net/remmina-plugin-i18n
@@ -53,5 +58,38 @@ RUN_DEPENDS+=	${LOCALBASE}/share/locale/bg/LC_MESSAGES/remmina-plugins.mo:${PORT
 
 .endif
 
+post-patch:
+	@# do not build remmina core program
+	${REINPLACE_CMD} -e 's|add_subdirectory(remmina)||' ${WRKSRC}/CMakeLists.txt
+	${REINPLACE_CMD} -e 's|find_suggested_package(AVAHI)||' ${WRKSRC}/CMakeLists.txt
+	@# which plugins to build
+.if ${PKGNAMESUFFIX:S,-,,} != "nx"
+	${REINPLACE_CMD} -e 's|find_suggested_package(LIBSSH)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+	${REINPLACE_CMD} -e 's|find_required_package(XKBFILE)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+	${REINPLACE_CMD} -e 's|add_subdirectory(nx)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+.endif
+.if ${PKGNAMESUFFIX:S,-,,} != "gnome"
+	${REINPLACE_CMD} -e 's|add_subdirectory(remmina-plugins-gnome)||' ${WRKSRC}/CMakeLists.txt
+.endif
+.if ${PKGNAMESUFFIX:S,-,,} != "rdp"
+	${REINPLACE_CMD} -e 's|find_suggested_package(FREERDP)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+	${REINPLACE_CMD} -e 's|add_subdirectory(rdp)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+.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|add_subdirectory(vnc)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+.endif
+.if ${PKGNAMESUFFIX:S,-,,} != "xdmcp"
+	${REINPLACE_CMD} -e 's|add_subdirectory(xdmcp)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+.endif
+.if ${PKGNAMESUFFIX:S,-,,} != "telepathy"
+	${REINPLACE_CMD} -e 's|find_suggested_package(TELEPATHY)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+	${REINPLACE_CMD} -e 's|add_subdirectory(telepathy)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+.endif
+.if ${PKGNAMESUFFIX:S,-,,} != "i18n"
+	${REINPLACE_CMD} -e 's|add_subdirectory(po)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+.endif
+
 .include <bsd.port.post.mk>
 .endif
diff --git a/net/remmina-plugins/distinfo b/net/remmina-plugins/distinfo
index f09049473331..188acaf0b924 100644
--- a/net/remmina-plugins/distinfo
+++ b/net/remmina-plugins/distinfo
@@ -1,2 +1,2 @@
-SHA256 (remmina-plugins-0.9.2.tar.gz) = f2df73a3a8f678f8c186755572072a744302b03b949a328ae1522f8bbb6da762
-SIZE (remmina-plugins-0.9.2.tar.gz) = 542221
+SHA256 (remmina-plugins-1.0.0.tar.gz) = 7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731
+SIZE (remmina-plugins-1.0.0.tar.gz) = 540568
diff --git a/net/remmina-plugins/files/patch-vnc_Makefile.in b/net/remmina-plugins/files/patch-vnc_Makefile.in
index 15bbb2fa8baa..e69de29bb2d1 100644
--- a/net/remmina-plugins/files/patch-vnc_Makefile.in
+++ b/net/remmina-plugins/files/patch-vnc_Makefile.in
@@ -1,16 +0,0 @@
---- vnc/Makefile.in.orig	2010-06-22 14:55:04.000000000 +1000
-+++ vnc/Makefile.in	2010-06-24 12:32:00.000000000 +1000
-@@ -372,11 +372,11 @@
- @am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
- 
- remmina_plugin_vnc_la-remminapluginvnc.lo: remminapluginvnc.c
--@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remmina_plugin_vnc_la_CFLAGS) $(CFLAGS) -MT remmina_plugin_vnc_la-remminapluginvnc.lo -MD -MP -MF $(DEPDIR)/remmina_plugin_vnc_la-remminapluginvnc.Tpo -c -o remmina_plugin_vnc_la-remminapluginvnc.lo `test -f 'remminapluginvnc.c' || echo '$(srcdir)/'`remminapluginvnc.c
-+@am__fastdepCC_TRUE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(remmina_plugin_vnc_la_CFLAGS) $(CPPFLAGS) $(CFLAGS) -MT remmina_plugin_vnc_la-remminapluginvnc.lo -MD -MP -MF $(DEPDIR)/remmina_plugin_vnc_la-remminapluginvnc.Tpo -c -o remmina_plugin_vnc_la-remminapluginvnc.lo `test -f 'remminapluginvnc.c' || echo '$(srcdir)/'`remminapluginvnc.c
- @am__fastdepCC_TRUE@	$(am__mv) $(DEPDIR)/remmina_plugin_vnc_la-remminapluginvnc.Tpo $(DEPDIR)/remmina_plugin_vnc_la-remminapluginvnc.Plo
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	source='remminapluginvnc.c' object='remmina_plugin_vnc_la-remminapluginvnc.lo' libtool=yes @AMDEPBACKSLASH@
- @AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
--@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(remmina_plugin_vnc_la_CFLAGS) $(CFLAGS) -c -o remmina_plugin_vnc_la-remminapluginvnc.lo `test -f 'remminapluginvnc.c' || echo '$(srcdir)/'`remminapluginvnc.c
-+@am__fastdepCC_FALSE@	$(LIBTOOL)  --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(remmina_plugin_vnc_la_CFLAGS) $(CPPFLAGS) $(CFLAGS) -c -o remmina_plugin_vnc_la-remminapluginvnc.lo `test -f 'remminapluginvnc.c' || echo '$(srcdir)/'`remminapluginvnc.c
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
diff --git a/net/remmina-plugins/pkg-plist.plugin b/net/remmina-plugins/pkg-plist.plugin
index fbe6c9d6b2e6..228030c7277b 100644
--- a/net/remmina-plugins/pkg-plist.plugin
+++ b/net/remmina-plugins/pkg-plist.plugin
@@ -1,14 +1,8 @@
-lib/remmina/plugins/remmina-plugin-%%PLUGIN%%.a
-lib/remmina/plugins/remmina-plugin-%%PLUGIN%%.la
 lib/remmina/plugins/remmina-plugin-%%PLUGIN%%.so
-%%TELEP%%share/dbus-1/services/org.freedesktop.Telepathy.Client.Remmina.service
-%%ICONS%%share/remmina/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%.png
-%%ICONS%%%%SSH%%share/remmina/icons/hicolor/16x16/emblems/remmina-%%PLUGIN%%-ssh.png
-%%ICONS%%share/remmina/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%.png
 %%ICONS%%%%SSH%%share/remmina/icons/hicolor/22x22/emblems/remmina-%%PLUGIN%%-ssh.png
-%%TELEP%%share/telepathy/clients/Remmina.client
-@dirrmtry lib/remmina/plugins
-@dirrmtry lib/remmina
+%%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
@@ -16,5 +10,6 @@ lib/remmina/plugins/remmina-plugin-%%PLUGIN%%.so
 @dirrmtry share/remmina/icons/hicolor
 @dirrmtry share/remmina/icons
 @dirrmtry share/remmina
-%%TELEP%%@dirrmtry share/telepathy/clients
-%%TELEP%%@dirrmtry share/telepathy
+@dirrmtry lib/remmina/plugins
+@dirrmtry lib/remmina
+@dirrmtry include/remmina
diff --git a/net/remmina/Makefile b/net/remmina/Makefile
index 3ad1277b9ea0..e23bf4e14c51 100644
--- a/net/remmina/Makefile
+++ b/net/remmina/Makefile
@@ -2,39 +2,48 @@
 # $FreeBSD$
 
 PORTNAME=	remmina
-PORTVERSION=	0.9.3
-PORTREVISION=	3
+PORTVERSION=	1.0.0
 CATEGORIES=	net gnome
-MASTER_SITES=	SF/${PORTNAME}/0.9
 
 MAINTAINER=	fluffy@FreeBSD.org
 COMMENT=	The GTK+ Remote Desktop Client
 
-OPTIONS_DEFINE=	SSH GCRYPT TERM AVAHI UNIQUE NLS
-OPTIONS_DEFAULT=	SSH GCRYPT TERM AVAHI UNIQUE
-SSH_DESC=	SSH tunneling support
-GCRYPT_DESC=	libgcrypt support for password encryption
-TERM_DESC=	terminal support
-UNIQUE_DESC=	Unique-App support
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/${PORTNAME}/COPYING
 
-GNU_CONFIGURE=	yes
+USES=		cmake desktop-file-utils
 USE_GMAKE=	yes
-USE_GNOME=	glib20 gtk20 desktopfileutils
+USE_GNOME=	atk gdkpixbuf2 glib20 gtk20 pango
 INSTALLS_ICONS=	yes
 LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS} -Wl,-rpath -Wl,${LOCALBASE}/lib
 CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
+CFLAGS+=	-I${WRKSRC}/remmina/include -I${LOCALBASE}/include ${PTHREAD_CFLAGS} -fPIC
 SUB_FILES=	pkg-message
+USE_GITHUB=	yes
+GH_ACCOUNT=	FreeRDP
+GH_PROJECT=	${PORTNAME}
+GH_COMMIT=	356c033
+GH_TAGNAME=	${PORTVERSION}
+WRKSRC=		${WRKDIR}/${GH_ACCOUNT}-Remmina-${GH_COMMIT}
 
-LICENSE=	GPLv2
-LICENSE_FILE=	${WRKSRC}/COPYING
+OPTIONS_DEFINE=	SSH GCRYPT TERM AVAHI UNIQUE NLS
+OPTIONS_DEFAULT=	SSH GCRYPT TERM AVAHI UNIQUE NLS
+SSH_DESC=	Build with SSH tunneling support
+GCRYPT_DESC=	Build with libgcrypt support for password encryption
+TERM_DESC=	Build with terminal support
+AVAHI_DESC=	Build with Avahi support
+UNIQUE_DESC=	Build with Unique-App support
 
 .include <bsd.port.options.mk>
 
+CMAKE_ARGS+=	--build=build
+# now cannot build with gtk30 because requisite ports are old
+CMAKE_ARGS+=	-DGTK_VERSION=2
+
 .if ${PORT_OPTIONS:MNLS}
 USES+=		gettext
 PLIST_SUB+=	NLS=""
 .else
-CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
 .endif
 
@@ -45,35 +54,49 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/libssh.so.4:${PORTSDIR}/security/libssh
 LDFLAGS+=	-fstack-protector
 .endif
 .else
-CONFIGURE_ARGS+=--disable-ssh
+CMAKE_ARGS+=	-DWITH_SSH=OFF
 .endif
 
 .if ${PORT_OPTIONS:MGCRYPT}
 LIB_DEPENDS+=	gcrypt:${PORTSDIR}/security/libgcrypt
 .else
-CONFIGURE_ARGS+=--disable-gcrypt
+CMAKE_ARGS+=	-DWITH_GCRYPT=OFF
 .endif
 
 .if ${PORT_OPTIONS:MTERM}
 USE_GNOME+=	vte
 .else
-CONFIGURE_ARGS+=--disable-vte
+CMAKE_ARGS+=	-DWITH_VTE=OFF
 .endif
 
 .if ${PORT_OPTIONS:MAVAHI}
-LIB_DEPENDS+=	avahi-ui.0:${PORTSDIR}/net/avahi-gtk
+LIB_DEPENDS+=	avahi-ui:${PORTSDIR}/net/avahi-gtk
 .else
-CONFIGURE_ARGS+=--disable-avahi
+CMAKE_ARGS+=	-DWITH_AVAHI=OFF
 .endif
 
 .if ${PORT_OPTIONS:MUNIQUE}
-LIB_DEPENDS+=	unique-1.0.2:${PORTSDIR}/x11-toolkits/unique
+LIB_DEPENDS+=	unique:${PORTSDIR}/x11-toolkits/unique
 .else
-CONFIGURE_ARGS+=--disable-unique
+CMAKE_ARGS+=	-DWITH_UNIQUE=OFF
+.endif
+
+post-patch:
+	@# fit avahi to current PORTVERSION
+	${REINPLACE_CMD} -e's|avahi-ui>=0.6.30|avahi-ui>=0.6.29|' ${WRKSRC}/cmake/FindAVAHI.cmake
+	${REINPLACE_CMD} -e's|avahi-client>=0.6.30|avahi-client>=0.6.29|' ${WRKSRC}/cmake/FindAVAHI.cmake
+	@# do not build plugins and locales , they are provided by separated ports
+	${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins)||' ${WRKSRC}/CMakeLists.txt
+	${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins-gnome)||' ${WRKSRC}/CMakeLists.txt
+.if !${PORT_OPTIONS:MNLS}
+	${REINPLACE_CMD} -e's|add_subdirectory(po)||' ${WRKSRC}/remmina/CMakeLists.txt
 .endif
 
 post-install:
-	@-update-desktop-database
+	@# localized desktop entry file is not included remmina 1.0.0, install manually
+	${MKDIR} ${PREFIX}/share/applications/
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.desktop ${PREFIX}/share/applications/
+	${CP} -a ${DATADIR}/icons/ ${PREFIX}/share/icons
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/net/remmina/distinfo b/net/remmina/distinfo
index 3dc98a196220..b22633b3fd3d 100644
--- a/net/remmina/distinfo
+++ b/net/remmina/distinfo
@@ -1,2 +1,2 @@
-SHA256 (remmina-0.9.3.tar.gz) = ea10eba6f60676f7ebfebd285884e41fbb081f3809064588564f53624a3cee82
-SIZE (remmina-0.9.3.tar.gz) = 389744
+SHA256 (remmina-1.0.0.tar.gz) = 7cd0d2d6adbd96c7139da8c4bfc4cf4821e1fa97242bb9cc9db32a53df289731
+SIZE (remmina-1.0.0.tar.gz) = 540568
diff --git a/net/remmina/files/patch-remmina_CMakeFiles.txt b/net/remmina/files/patch-remmina_CMakeFiles.txt
new file mode 100644
index 000000000000..644c6e194759
--- /dev/null
+++ b/net/remmina/files/patch-remmina_CMakeFiles.txt
@@ -0,0 +1,9 @@
+--- remmina/CMakeLists.txt.orig	2013-05-21 03:32:51.737574552 +0000
++++ remmina/CMakeLists.txt	2013-05-21 03:33:13.052583969 +0000
+@@ -139,5 +139,5 @@
+ install(TARGETS remmina DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/remmina.pc.in ${CMAKE_CURRENT_BINARY_DIR}/remmina.pc @ONLY)
+-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
++install(FILES ${CMAKE_CURRENT_BINARY_DIR}/remmina.pc DESTINATION libdata/pkgconfig)
+ 
diff --git a/net/remmina/files/remmina.desktop b/net/remmina/files/remmina.desktop
new file mode 100644
index 000000000000..01d00d1b8a18
--- /dev/null
+++ b/net/remmina/files/remmina.desktop
@@ -0,0 +1,61 @@
+[Desktop Entry]
+Version=1.0
+Name=Remmina Remote Desktop Client
+Name[bg]=Клиент за отдалечен достъп Remmina
+Name[ca]=Client d'escriptori remot Remmina
+Name[cs]=Klient vzdálené plochy Remmina
+Name[da]=Remmina Fjernskrivebords Klient
+Name[de]=Remmina Betrachter für entfernte Arbeitsflächen
+Name[el]=Remmina Απομακρυσμένη Σύνδεση
+Name[es]=Cliente de escritorio remoto Remmina
+Name[eu]=Remmina, urruneko mahaigainen bezeroa
+Name[fr]=Visionneur de bureaux distants Remmina
+Name[hu]=Remmina távoli asztal kliens
+Name[id]=Remmina Remote Desktop Client
+Name[it]=Client di connessione a desktop remoti Remmina
+Name[kk]=Remmina қашықтаған жұмыс үстел клиенті
+Name[lt]=Remmina nutolusio darbalaukio klientas
+Name[nl]=Remmina Extern Bureaublad Client
+Name[pl]=Klient zdalnego pulpitu Remmina
+Name[pt_BR]=Cliente de área de trabalho remota Remmina
+Name[pt_PT]=Visualizador de Área de Trabalho Remota
+Name[ru]=Клиент удалённого рабочего стола Remmina
+Name[sk]=Klient pripojenia k vzdialenej ploche Remmina
+Name[sv]=Remmina - Klient för fjärrskrivbord
+Name[th]=Remmina ลูกข่ายพื้นโต๊ะระยะไกล
+Name[tr]=Remmina Uzak Masaüstü Bağlantı Aracı
+Name[uk]=Клієнт з'єднань з відаленим комп'ютером Remmina
+Name[zh_CN]=Remmina 远程桌面客户端
+Comment=Connect to remote desktops
+Comment[bg]=Свързване към отдалечени компютри
+Comment[ca]=Connecteu-vos a escriptoris remots
+Comment[cs]=Připojení ke vzdáleným plochám
+Comment[da]=Tilslut fjernskriveborde
+Comment[de]=Zu entfernten Arbeitsflächen verbinden
+Comment[es]=Conectar a escritorio remoto
+Comment[eu]=Konektatu urruneko mahaigainekin
+Comment[fr]=Connectez-vous à des bureaux distants
+Comment[hu]=Kapcsolódás távoli asztalokhoz
+Comment[id]=Mengakses remote desktop
+Comment[it]=Connessione a desktop remoti
+Comment[kk]=Қашықтаған жұмыс үстелдерге қосылу
+Comment[lt]=Jungtis prie nutolusių darbalaukių
+Comment[nl]=Verbinding maken met bureaubladen op afstand
+Comment[pl]=Łączy ze zdalnymi pulpitami
+Comment[pt_BR]=Conecte-se a áreas de trabalho remotas
+Comment[pt_PT]=Ligar a áreas de trabalho remotas
+Comment[ru]=Подключение к удалённым рабочим столам
+Comment[sk]=Pripojenie k vzdialeným plochám
+Comment[sv]=Anslut till fjärrskrivbord
+Comment[th]=เชื่อมต่อไปยังพื้นโต๊ะระยะไกล
+Comment[tr]=Uzak masaüstlerine bağlan
+Comment[uk]=З'єднання з відаленим комп'ютером
+Comment[zh_CN]=连接到远程桌面
+TryExec=remmina
+Exec=remmina
+Icon=remmina
+Terminal=false
+Type=Application
+Actions=
+Categories=GTK;GNOME;X-GNOME-NetworkSettings;Network;
+
diff --git a/net/remmina/pkg-plist b/net/remmina/pkg-plist
index 35b64a249c5a..f61b1eec6a67 100644
--- a/net/remmina/pkg-plist
+++ b/net/remmina/pkg-plist
@@ -1,60 +1,87 @@
 bin/remmina
-include/remmina/plugin.h
-include/remmina/types.h
+libdata/pkgconfig/remmina.pc
 share/applications/remmina.desktop
+share/icons/hicolor/48x48/apps/remmina.png
+share/icons/hicolor/24x24/apps/remmina.png
+share/icons/hicolor/scalable/apps/remmina.svg
+share/icons/hicolor/32x32/apps/remmina.png
+share/icons/hicolor/22x22/apps/remmina.png
+share/icons/hicolor/22x22/actions/remmina-switch-page.png
+share/icons/hicolor/22x22/actions/remmina-fit-window.png
+share/icons/hicolor/22x22/actions/remmina-fullscreen.png
+share/icons/hicolor/22x22/actions/remmina-scale.png
+share/icons/hicolor/22x22/emblems/remmina-sftp.png
+share/icons/hicolor/16x16/apps/remmina.png
+share/icons/hicolor/16x16/emblems/remmina-sftp.png
+share/icons/hicolor/16x16/actions/remmina-switch-page.png
+share/icons/hicolor/16x16/actions/remmina-fullscreen.png
+share/icons/hicolor/16x16/actions/remmina-scale.png
+share/icons/hicolor/16x16/actions/remmina-fit-window.png
+share/icons/hicolor/16x16/actions/remmina-pin-up.png
+share/icons/hicolor/16x16/actions/remmina-pin-down.png
+%%NLS%%share/locale/th/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/el/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/de/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/zh_CN/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/id/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/eu/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/sv/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/kk/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/it/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/ca/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/da/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/sk/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/tr/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/bg/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/hu/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/es/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/pt_BR/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/pl/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/pt_PT/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/lt/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/cs/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/remmina.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/remmina.mo
+%%DATADIR%%/icons/hicolor/24x24/apps/remmina.png
+%%DATADIR%%/icons/hicolor/48x48/apps/remmina.png
+%%DATADIR%%/icons/hicolor/scalable/apps/remmina.svg
+%%DATADIR%%/icons/hicolor/16x16/apps/remmina.png
+%%DATADIR%%/icons/hicolor/16x16/emblems/remmina-sftp.png
+%%DATADIR%%/icons/hicolor/16x16/actions/remmina-pin-down.png
 %%DATADIR%%/icons/hicolor/16x16/actions/remmina-fit-window.png
 %%DATADIR%%/icons/hicolor/16x16/actions/remmina-fullscreen.png
-%%DATADIR%%/icons/hicolor/16x16/actions/remmina-pin-down.png
-%%DATADIR%%/icons/hicolor/16x16/actions/remmina-pin-up.png
 %%DATADIR%%/icons/hicolor/16x16/actions/remmina-scale.png
+%%DATADIR%%/icons/hicolor/16x16/actions/remmina-pin-up.png
 %%DATADIR%%/icons/hicolor/16x16/actions/remmina-switch-page.png
-%%DATADIR%%/icons/hicolor/16x16/emblems/remmina-sftp.png
-%%DATADIR%%/icons/hicolor/22x22/actions/remmina-fit-window.png
-%%DATADIR%%/icons/hicolor/22x22/actions/remmina-fullscreen.png
+%%DATADIR%%/icons/hicolor/32x32/apps/remmina.png
+%%DATADIR%%/icons/hicolor/22x22/apps/remmina.png
 %%DATADIR%%/icons/hicolor/22x22/actions/remmina-scale.png
 %%DATADIR%%/icons/hicolor/22x22/actions/remmina-switch-page.png
+%%DATADIR%%/icons/hicolor/22x22/actions/remmina-fullscreen.png
+%%DATADIR%%/icons/hicolor/22x22/actions/remmina-fit-window.png
 %%DATADIR%%/icons/hicolor/22x22/emblems/remmina-sftp.png
-%%NLS%%share/locale/bg/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/da/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/de/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/el/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/es/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/hu/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/id/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/it/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/kk/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/lt/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/pt_PT/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/th/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/tr/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/uk/LC_MESSAGES/remmina.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/remmina.mo
-share/icons/hicolor/16x16/apps/remmina.png
-share/icons/hicolor/22x22/apps/remmina.png
-share/icons/hicolor/24x24/apps/remmina.png
-share/icons/hicolor/32x32/apps/remmina.png
-share/icons/hicolor/48x48/apps/remmina.png
-share/icons/hicolor/scalable/apps/remmina.svg
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@dirrm include/remmina
-@dirrm %%DATADIR%%/icons/hicolor/22x22/actions
+@dirrmtry %%DATADIR%%/icons/hicolor/scalable/apps
+@dirrmtry %%DATADIR%%/icons/hicolor/scalable
+@dirrmtry %%DATADIR%%/icons/hicolor/48x48/apps
+@dirrmtry %%DATADIR%%/icons/hicolor/48x48
+@dirrmtry %%DATADIR%%/icons/hicolor/32x32/apps
+@dirrmtry %%DATADIR%%/icons/hicolor/32x32
+@dirrmtry %%DATADIR%%/icons/hicolor/24x24/apps
+@dirrmtry %%DATADIR%%/icons/hicolor/24x24
+@dirrmtry %%DATADIR%%/icons/hicolor/22x22/actions
+@dirrmtry %%DATADIR%%/icons/hicolor/22x22/apps
 @dirrmtry %%DATADIR%%/icons/hicolor/22x22/emblems
 @dirrmtry %%DATADIR%%/icons/hicolor/22x22
-@dirrm %%DATADIR%%/icons/hicolor/16x16/actions
+@dirrmtry %%DATADIR%%/icons/hicolor/16x16/actions
+@dirrmtry %%DATADIR%%/icons/hicolor/16x16/apps
 @dirrmtry %%DATADIR%%/icons/hicolor/16x16/emblems
 @dirrmtry %%DATADIR%%/icons/hicolor/16x16
 @dirrmtry %%DATADIR%%/icons/hicolor
 @dirrmtry %%DATADIR%%/icons
 @dirrmtry %%DATADIR%%
 @dirrmtry share/applications
+@dirrmtry include/remmina