Index: head/net/remmina/Makefile =================================================================== --- head/net/remmina/Makefile (revision 455114) +++ head/net/remmina/Makefile (revision 455115) @@ -1,63 +1,62 @@ # Created by: Alexander Logvinov # $FreeBSD$ PORTNAME= remmina DISTVERSIONPREFIX=v -DISTVERSION= 1.2.0-rcgit.19 -PORTREVISION= 1 +DISTVERSION= 1.2.0-rcgit.24 CATEGORIES= net gnome MAINTAINER= woodsb02@FreeBSD.org COMMENT= GTK+ Remote Desktop Client LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE USE_GITHUB= yes GH_ACCOUNT= FreeRDP GH_PROJECT= Remmina -USES= cmake:outsource gettext localbase:ldflags pathfix pkgconfig +USES= cmake:outsource desktop-file-utils gettext localbase:ldflags pathfix pkgconfig shared-mime-info USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 pango USE_XORG= ice sm x11 xext PATHFIX_WRKSRC= ${WRKSRC}/remmina INSTALLS_ICONS= yes CMAKE_ARGS= --build=build \ -DWITH_APPINDICATOR:BOOL=false OPTIONS_DEFINE= AVAHI GCRYPT NLS SSH TERM OPTIONS_DEFAULT= AVAHI GCRYPT SSH TERM OPTIONS_SUB= yes AVAHI_DESC= Build with Avahi support GCRYPT_DESC= Build with libgcrypt support for password encryption SSH_DESC= Build with SSH tunneling support TERM_DESC= Build with terminal support AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app \ libavahi-ui-gtk3.so:net/avahi-gtk3 AVAHI_CMAKE_BOOL= WITH_AVAHI GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt GCRYPT_CMAKE_BOOL= WITH_GCRYPT NLS_CMAKE_BOOL= WITH_TRANSLATIONS SSH_LIB_DEPENDS= libssh_threads.so:security/libssh SSH_LDFLAGS= -fstack-protector SSH_CMAKE_BOOL= WITH_LIBSSH TERM_USE= gnome=vte3 TERM_CMAKE_BOOL= WITH_VTE post-patch: # do not build plugins and locales , they are provided by separated ports ${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins)||' \ -e 's,FreeBSD,FreeBSD|DragonFly,' ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e's|add_subdirectory(remmina-plugins-gnome)||' \ ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e's|add_subdirectory(external_tools)||' \ -e 's,FreeBSD,FreeBSD|DragonFly,' \ ${WRKSRC}/remmina/CMakeLists.txt .include Index: head/net/remmina/distinfo =================================================================== --- head/net/remmina/distinfo (revision 455114) +++ head/net/remmina/distinfo (revision 455115) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501922538 -SHA256 (FreeRDP-Remmina-v1.2.0-rcgit.19_GH0.tar.gz) = e5a5bc76caf78f873030e0fe9709a2981c9900cfd153775309e358fb783840a3 -SIZE (FreeRDP-Remmina-v1.2.0-rcgit.19_GH0.tar.gz) = 864828 +TIMESTAMP = 1511962749 +SHA256 (FreeRDP-Remmina-v1.2.0-rcgit.24_GH0.tar.gz) = 7d959485469b8e99d4d950e6e916b22e28a6855d58955a1be7f49b3a5650e82c +SIZE (FreeRDP-Remmina-v1.2.0-rcgit.24_GH0.tar.gz) = 1052140 Index: head/net/remmina/pkg-plist =================================================================== --- head/net/remmina/pkg-plist (revision 455114) +++ head/net/remmina/pkg-plist (revision 455115) @@ -1,100 +1,104 @@ bin/remmina include/remmina/plugin.h include/remmina/remmina_trace_calls.h include/remmina/types.h libdata/pkgconfig/remmina.pc man/man1/remmina.1.gz -share/appdata/remmina.appdata.xml -share/applications/remmina.desktop +share/applications/org.remmina.Remmina.desktop +share/applications/remmina-file.desktop share/icons/hicolor/128x128/apps/remmina.png +share/icons/hicolor/16x16/actions/remmina-dynres.png share/icons/hicolor/16x16/actions/remmina-fit-window.png share/icons/hicolor/16x16/actions/remmina-fullscreen.png share/icons/hicolor/16x16/actions/remmina-pin-down.png share/icons/hicolor/16x16/actions/remmina-pin-up.png share/icons/hicolor/16x16/actions/remmina-scale.png share/icons/hicolor/16x16/actions/remmina-switch-page.png share/icons/hicolor/16x16/apps/remmina-panel-inverted.png share/icons/hicolor/16x16/apps/remmina-panel.png share/icons/hicolor/16x16/apps/remmina.png share/icons/hicolor/16x16/emblems/remmina-sftp.png +share/icons/hicolor/22x22/actions/remmina-dynres.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/actions/remmina-switch-page.png share/icons/hicolor/22x22/apps/remmina-panel-inverted.png share/icons/hicolor/22x22/apps/remmina-panel.png share/icons/hicolor/22x22/apps/remmina.png share/icons/hicolor/22x22/emblems/remmina-sftp.png share/icons/hicolor/24x24/apps/remmina-panel-inverted.png share/icons/hicolor/24x24/apps/remmina-panel.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/64x64/apps/remmina.png share/icons/hicolor/72x72/apps/remmina.png share/icons/hicolor/96x96/apps/remmina.png share/icons/hicolor/scalable/apps/remmina.svg %%NLS%%share/locale/ar/LC_MESSAGES/remmina.mo %%NLS%%share/locale/ast/LC_MESSAGES/remmina.mo %%NLS%%share/locale/bg/LC_MESSAGES/remmina.mo %%NLS%%share/locale/bn/LC_MESSAGES/remmina.mo %%NLS%%share/locale/bs/LC_MESSAGES/remmina.mo %%NLS%%share/locale/ca/LC_MESSAGES/remmina.mo %%NLS%%share/locale/ca@valencia/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/en_AU/LC_MESSAGES/remmina.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/remmina.mo %%NLS%%share/locale/es/LC_MESSAGES/remmina.mo %%NLS%%share/locale/et/LC_MESSAGES/remmina.mo %%NLS%%share/locale/eu/LC_MESSAGES/remmina.mo %%NLS%%share/locale/fi/LC_MESSAGES/remmina.mo %%NLS%%share/locale/fr/LC_MESSAGES/remmina.mo %%NLS%%share/locale/gl/LC_MESSAGES/remmina.mo %%NLS%%share/locale/he/LC_MESSAGES/remmina.mo %%NLS%%share/locale/hr/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/ja/LC_MESSAGES/remmina.mo %%NLS%%share/locale/kk/LC_MESSAGES/remmina.mo %%NLS%%share/locale/km/LC_MESSAGES/remmina.mo %%NLS%%share/locale/kn/LC_MESSAGES/remmina.mo %%NLS%%share/locale/ko/LC_MESSAGES/remmina.mo %%NLS%%share/locale/lt/LC_MESSAGES/remmina.mo %%NLS%%share/locale/lv/LC_MESSAGES/remmina.mo %%NLS%%share/locale/ms/LC_MESSAGES/remmina.mo %%NLS%%share/locale/my/LC_MESSAGES/remmina.mo %%NLS%%share/locale/nb/LC_MESSAGES/remmina.mo %%NLS%%share/locale/nl/LC_MESSAGES/remmina.mo %%NLS%%share/locale/oc/LC_MESSAGES/remmina.mo %%NLS%%share/locale/pl/LC_MESSAGES/remmina.mo %%NLS%%share/locale/pt/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/ro/LC_MESSAGES/remmina.mo %%NLS%%share/locale/ru/LC_MESSAGES/remmina.mo %%NLS%%share/locale/shn/LC_MESSAGES/remmina.mo %%NLS%%share/locale/si/LC_MESSAGES/remmina.mo %%NLS%%share/locale/sk/LC_MESSAGES/remmina.mo %%NLS%%share/locale/sl/LC_MESSAGES/remmina.mo %%NLS%%share/locale/sq/LC_MESSAGES/remmina.mo %%NLS%%share/locale/sr/LC_MESSAGES/remmina.mo %%NLS%%share/locale/sv/LC_MESSAGES/remmina.mo %%NLS%%share/locale/te/LC_MESSAGES/remmina.mo %%NLS%%share/locale/th/LC_MESSAGES/remmina.mo %%NLS%%share/locale/tr/LC_MESSAGES/remmina.mo %%NLS%%share/locale/ug/LC_MESSAGES/remmina.mo %%NLS%%share/locale/uk/LC_MESSAGES/remmina.mo %%NLS%%share/locale/uz@cyrillic/LC_MESSAGES/remmina.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/remmina.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/remmina.mo +share/metainfo/org.remmina.Remmina.appdata.xml +share/mime/packages/remmina-mime.xml %%DATADIR%%/ui/remmina_about.glade %%DATADIR%%/ui/remmina_key_chooser.glade %%DATADIR%%/ui/remmina_main.glade %%DATADIR%%/ui/remmina_mpc.glade %%DATADIR%%/ui/remmina_preferences.glade %%DATADIR%%/ui/remmina_spinner.glade %%DATADIR%%/ui/remmina_string_list.glade Index: head/net/remmina-plugin-rdp/Makefile =================================================================== --- head/net/remmina-plugin-rdp/Makefile (revision 455114) +++ head/net/remmina-plugin-rdp/Makefile (revision 455115) @@ -1,18 +1,17 @@ # Created by: Alexander Logvinov # $FreeBSD$ PKGNAMESUFFIX= -rdp -PORTREVISION= 1 COMMENT= Remmina plugin for RDP protocol LIB_DEPENDS= libfreerdp2.so:net/freerdp USE_GNOME+= cairo USE_XORG+= ice sm x11 xext MASTERDIR= ${.CURDIR}/../remmina-plugins PLIST_SUB+= ICONS="" SSH="" .include "${MASTERDIR}/Makefile" Index: head/net/remmina-plugins/Makefile =================================================================== --- head/net/remmina-plugins/Makefile (revision 455114) +++ head/net/remmina-plugins/Makefile (revision 455115) @@ -1,42 +1,42 @@ # Created by: Alexander Logvinov # $FreeBSD$ PORTNAME?= remmina-plugins DISTVERSIONPREFIX=v -DISTVERSION= 1.2.0-rcgit.19 +DISTVERSION= 1.2.0-rcgit.24 CATEGORIES= net gnome MAINTAINER?= woodsb02@FreeBSD.org COMMENT?= Remmina plugin system LICENSE?= GPLv2+ USE_GITHUB= yes GH_ACCOUNT= FreeRDP GH_PROJECT= Remmina .if defined(PKGNAMESUFFIX) .include "${.CURDIR}/../remmina-plugins/bsd.plugin.mk" .else USES= metaport OPTIONS_DEFINE= KEYRING NX RDP TELEP VNC XDMCP OPTIONS_DEFAULT= KEYRING RDP TELEP VNC XDMCP KEYRING_DESC= GNOME Keyring plugin RDP_DESC= Remote Desktop Protocol plugin VNC_DESC= VNC protocol plugin XDMCP_DESC= XDMCP protocol plugin TELEP_DESC= Telepathy protocol plugin NX_DESC= NX protocol plugin KEYRING_RUN_DEPENDS= remmina-plugin-gnome>=0:net/remmina-plugin-gnome NX_RUN_DEPENDS= remmina-plugin-nx>=0:net/remmina-plugin-nx RDP_RUN_DEPENDS= remmina-plugin-rdp>=0:net/remmina-plugin-rdp TELEP_RUN_DEPENDS= remmina-plugin-telepathy>=0:net/remmina-plugin-telepathy VNC_RUN_DEPENDS= remmina-plugin-vnc>=0:net/remmina-plugin-vnc XDMCP_RUN_DEPENDS= remmina-plugin-xdmcp>=0:net/remmina-plugin-xdmcp .include .endif Index: head/net/remmina-plugins/bsd.plugin.mk =================================================================== --- head/net/remmina-plugins/bsd.plugin.mk (revision 455114) +++ head/net/remmina-plugins/bsd.plugin.mk (revision 455115) @@ -1,67 +1,71 @@ # $FreeBSD$ # # Common code for Remmina plugin ports net/remmina-plugin-* .if defined(PKGNAMESUFFIX) PORTNAME= remmina-plugin PATCHDIR= ${.CURDIR}/../remmina/files LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS+= remmina>=${PORTVERSION}:net/remmina RUN_DEPENDS+= remmina>=${PORTVERSION}:net/remmina USES+= cmake localbase:ldflags pkgconfig USE_GNOME+= atk gdkpixbuf2 glib20 gtk30 pango INSTALLS_ICONS= yes # disable appindicator as it is a feature of gnome 3 which isn't supported on FreeBSD CMAKE_ARGS+= -DWITH_APPINDICATOR=OFF # set build directory CMAKE_ARGS+= --build=build SSH_DESC= Build with SSH tunneling support .include .if ${PKGNAMESUFFIX} == "-gnome" PLIST= ${.CURDIR}/pkg-plist .else PLIST_SUB+= PLUGIN="${PKGNAMESUFFIX:S,-,,}" PLIST= ${PKGDIR}/pkg-plist.plugin .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,-,,} != "spice" + ${REINPLACE_CMD} -e 's|find_suggested_package(SPICE)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt + ${REINPLACE_CMD} -e 's|add_subdirectory(spice)||' ${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|find_required_package(LIBVNCSERVER)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt + ${REINPLACE_CMD} -e' s|find_suggested_package(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 .include .endif Index: head/net/remmina-plugins/distinfo =================================================================== --- head/net/remmina-plugins/distinfo (revision 455114) +++ head/net/remmina-plugins/distinfo (revision 455115) @@ -1,3 +1,3 @@ -TIMESTAMP = 1501922545 -SHA256 (FreeRDP-Remmina-v1.2.0-rcgit.19_GH0.tar.gz) = e5a5bc76caf78f873030e0fe9709a2981c9900cfd153775309e358fb783840a3 -SIZE (FreeRDP-Remmina-v1.2.0-rcgit.19_GH0.tar.gz) = 864828 +TIMESTAMP = 1511962758 +SHA256 (FreeRDP-Remmina-v1.2.0-rcgit.24_GH0.tar.gz) = 7d959485469b8e99d4d950e6e916b22e28a6855d58955a1be7f49b3a5650e82c +SIZE (FreeRDP-Remmina-v1.2.0-rcgit.24_GH0.tar.gz) = 1052140