5 files changed, 185 insertions, 65 deletions

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