Index: MOVED =================================================================== --- MOVED +++ MOVED @@ -12858,6 +12858,7 @@ emulators/pearpc||2019-08-01|Has expired: Abandonware sysutils/bbcp||2019-08-03|Has expired: the port is broken for more than a year multimedia/gnome-mpv|multimedia/celluloid|2019-08-08|Renamed upstream +net/remmina-plugin-telepathy||2019-08-04|Disabled upstream for build Issues devel/py-mimeparse|devel/py-python-mimeparse|2019-08-11|Rename to match upstream naming devel/rubygem-web-console|devel/rubygem-web-console-rails5|2019-08-11|Rename to match our rubygem- port naming devel/rubygem-spring-rails5|devel/rubygem-spring|2019-08-11|Remove unnecessary port after devel/rubygem-spring update Index: net/Makefile =================================================================== --- net/Makefile +++ net/Makefile @@ -1176,9 +1176,11 @@ SUBDIR += remmina-plugin-nx SUBDIR += remmina-plugin-rdp SUBDIR += remmina-plugin-secret - SUBDIR += remmina-plugin-telepathy + SUBDIR += remmina-plugin-spice + SUBDIR += remmina-plugin-st SUBDIR += remmina-plugin-vnc SUBDIR += remmina-plugin-xdmcp + SUBDIR += remmina-plugin-www SUBDIR += remmina-plugins SUBDIR += remotebox SUBDIR += remotedesk Index: net/remmina-plugin-exec/Makefile =================================================================== --- net/remmina-plugin-exec/Makefile +++ net/remmina-plugin-exec/Makefile @@ -5,7 +5,8 @@ COMMENT= Remmina plugin to execute a command -USE_GNOME+= cairo +USES= gnome +USE_GNOME= cairo MASTERDIR= ${.CURDIR}/../remmina-plugins Index: net/remmina-plugin-nx/Makefile =================================================================== --- net/remmina-plugin-nx/Makefile +++ net/remmina-plugin-nx/Makefile @@ -1,16 +1,16 @@ # Created by: Koichiro IWAO # $FreeBSD$ -PORTREVISION= 1 PKGNAMESUFFIX= -nx COMMENT= Remmina plugin for NX -USE_GNOME+= cairo -USE_XORG+= x11 xkbfile +USES= gnome +USE_GNOME= cairo +USE_XORG= x11 xkbfile MASTERDIR= ${.CURDIR}/../remmina-plugins -LIB_DEPENDS+= libssh.so:security/libssh +LIB_DEPENDS= libssh.so:security/libssh .include "${MASTERDIR}/Makefile" Index: net/remmina-plugin-rdp/Makefile =================================================================== --- net/remmina-plugin-rdp/Makefile +++ net/remmina-plugin-rdp/Makefile @@ -7,8 +7,9 @@ LIB_DEPENDS= libfreerdp2.so:net/freerdp -USE_GNOME+= cairo -USE_XORG+= ice sm x11 xext +USES= gnome +USE_GNOME= cairo +USE_XORG= ice sm x11 xext MASTERDIR= ${.CURDIR}/../remmina-plugins Index: net/remmina-plugin-spice/Makefile =================================================================== --- /dev/null +++ net/remmina-plugin-spice/Makefile @@ -0,0 +1,13 @@ +# Created by: Nick Wolff +# $FreeBSD$ + +PKGNAMESUFFIX= -spice + +COMMENT= Remmina plugin to execute a command + +BUILD_DEPENDS= spice-gtk>=0.37:deskutils/spice-gtk \ + spice-protocol>=0.12.15:devel/spice-protocol + +MASTERDIR= ${.CURDIR}/../remmina-plugins + +.include "${MASTERDIR}/Makefile" Index: net/remmina-plugin-spice/pkg-plist =================================================================== --- /dev/null +++ net/remmina-plugin-spice/pkg-plist @@ -0,0 +1,3 @@ +lib/remmina/plugins/remmina-plugin-spice.so +share/icons/hicolor/scalable/emblems/remmina-spice-ssh-symbolic.svg +share/icons/hicolor/scalable/emblems/remmina-spice-symbolic.svg Index: net/remmina-plugin-st/Makefile =================================================================== --- /dev/null +++ net/remmina-plugin-st/Makefile @@ -0,0 +1,10 @@ +# Created by: Alexander Logvinov +# $FreeBSD$ + +PKGNAMESUFFIX= -st + +COMMENT= Remmina plugin for (Simple) Terminal use cases + +MASTERDIR= ${.CURDIR}/../remmina-plugins + +.include "${MASTERDIR}/Makefile" Index: net/remmina-plugin-st/pkg-plist =================================================================== --- /dev/null +++ net/remmina-plugin-st/pkg-plist @@ -0,0 +1,2 @@ +lib/remmina/plugins/remmina-plugin-st.so +share/icons/hicolor/scalable/emblems/remmina-tool-symbolic.svg Index: net/remmina-plugin-telepathy/Makefile =================================================================== --- net/remmina-plugin-telepathy/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# Created by: Alexander Logvinov -# $FreeBSD$ - -PKGNAMESUFFIX= -telepathy - -COMMENT= Remmina plugin for Telepathy support - -USE_GNOME+= cairo gtk30 -LIB_DEPENDS= libdbus-1.so:devel/dbus \ - libdbus-glib-1.so:devel/dbus-glib \ - libtelepathy-glib.so:net-im/telepathy-glib - -MASTERDIR= ${.CURDIR}/../remmina-plugins - -.include "${MASTERDIR}/Makefile" Index: net/remmina-plugin-telepathy/pkg-plist =================================================================== --- net/remmina-plugin-telepathy/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/remmina/plugins/remmina-plugin-telepathy.so -share/dbus-1/services/org.freedesktop.Telepathy.Client.Remmina.service -share/telepathy/clients/Remmina.client Index: net/remmina-plugin-vnc/Makefile =================================================================== --- net/remmina-plugin-vnc/Makefile +++ net/remmina-plugin-vnc/Makefile @@ -5,12 +5,12 @@ COMMENT= Remmina plugin for VNC protocol -LIB_DEPENDS= libgnutls.so:security/gnutls \ - libgcrypt.so:security/libgcrypt \ +LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ + libgnutls.so:security/gnutls \ libvncserver.so:net/libvncserver -USES= jpeg -USE_GNOME+= cairo +USES= gnome jpeg +USE_GNOME= cairo MASTERDIR= ${.CURDIR}/../remmina-plugins Index: net/remmina-plugin-www/Makefile =================================================================== --- /dev/null +++ net/remmina-plugin-www/Makefile @@ -0,0 +1,15 @@ +# Created by: Nick Wolff +# $FreeBSD$ + +PKGNAMESUFFIX= -www + +COMMENT= Remmina plugin to open an authenticated web-browser + +USES= gnome +USE_GNOME= cairo +LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \ + libsoup-2.4.so:devel/libsoup + +MASTERDIR= ${.CURDIR}/../remmina-plugins + +.include "${MASTERDIR}/Makefile" Index: net/remmina-plugin-www/pkg-plist =================================================================== --- /dev/null +++ net/remmina-plugin-www/pkg-plist @@ -0,0 +1,3 @@ +lib/remmina/plugins/remmina-plugin-www.so +share/icons/hicolor/scalable/emblems/remmina-www-symbolic.svg +share/remmina/res/www-js.js Index: net/remmina-plugin-xdmcp/Makefile =================================================================== --- net/remmina-plugin-xdmcp/Makefile +++ net/remmina-plugin-xdmcp/Makefile @@ -7,7 +7,8 @@ RUN_DEPENDS= Xephyr:x11-servers/xephyr -USE_GNOME+= cairo +USES= gnome +USE_GNOME= cairo MASTERDIR= ${.CURDIR}/../remmina-plugins Index: net/remmina-plugins/Makefile =================================================================== --- net/remmina-plugins/Makefile +++ net/remmina-plugins/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME?= remmina-plugins -DISTVERSION= 1.2.31.4 -PORTREVISION= 1 +DISTVERSION= 1.3.5 CATEGORIES= net gnome MAINTAINER?= woodsb02@FreeBSD.org @@ -16,7 +15,7 @@ USE_GITLAB= yes GL_ACCOUNT= Remmina GL_PROJECT= Remmina -GL_COMMIT= 65d552c9becc957cae124ab5c26562cf22c052b9 +GL_COMMIT= e1a0ffd30a0d8e35ed86ec81ecb4719bb870d62c .include "${.CURDIR}/../remmina-plugins/bsd.plugin.mk" @@ -24,22 +23,26 @@ USES= metaport -OPTIONS_DEFINE= EXEC KEYRING NX RDP TELEP VNC XDMCP -OPTIONS_DEFAULT= EXEC KEYRING RDP TELEP VNC XDMCP +OPTIONS_DEFINE= EXEC KEYRING NX RDP SPICE VNC WWW XDMCP +OPTIONS_DEFAULT= EXEC KEYRING NX RDP SPICE VNC WWW XDMCP EXEC_DESC= Plugin to execute a command KEYRING_DESC= GNOME Keyring plugin +NX_DESC= NX protocol plugin RDP_DESC= Remote Desktop Protocol plugin +SPICE_DESC= Spice protocol plugin +ST_DESC= (Simple) Terminal Plugin VNC_DESC= VNC protocol plugin +WWW_DESC= Plugin to open an authenticated web browser XDMCP_DESC= XDMCP protocol plugin -TELEP_DESC= Telepathy protocol plugin -NX_DESC= NX protocol plugin EXEC_RUN_DEPENDS= remmina-plugin-exec>=0:net/remmina-plugin-exec KEYRING_RUN_DEPENDS= remmina-plugin-secret>=0:net/remmina-plugin-secret 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 +SPICE_RUN_DEPENDS= remmina-plugin-spice>=0:net/remmina-plugin-spice +ST_RUN_DEPENDS= remmina-plugin-st>=0:net/remmina-plugin-st VNC_RUN_DEPENDS= remmina-plugin-vnc>=0:net/remmina-plugin-vnc +WWW_RUN_DEPENDS= remmina-plugin-www>=0:net/remmina-plugin-www XDMCP_RUN_DEPENDS= remmina-plugin-xdmcp>=0:net/remmina-plugin-xdmcp .include Index: net/remmina-plugins/bsd.plugin.mk =================================================================== --- net/remmina-plugins/bsd.plugin.mk +++ net/remmina-plugins/bsd.plugin.mk @@ -33,10 +33,16 @@ ${REINPLACE_CMD} -e '/add_subdirectory(data)/d' ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e '/add_subdirectory(po)/d' ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} -e '/find_suggested_package(AVAHI)/d' ${WRKSRC}/CMakeLists.txt + ${REINPLACE_CMD} -e '/target_link_libraries(remmina/d' ${WRKSRC}/plugins/CMakeLists.txt + # Which plugins to build .if ${PKGNAMESUFFIX:S,-,,} != "exec" ${REINPLACE_CMD} -e '/add_subdirectory(exec)/d' ${WRKSRC}/plugins/CMakeLists.txt .endif +.if ${PKGNAMESUFFIX:S,-,,} != "kwallet" + ${REINPLACE_CMD} -e '/add_definitions(-DWITH_KF5WALLET)/d' ${WRKSRC}/plugins/CMakeLists.txt + ${REINPLACE_CMD} -e '/add_subdirectory(kwallet)/d' ${WRKSRC}/plugins/CMakeLists.txt +.endif .if ${PKGNAMESUFFIX:S,-,,} != "nx" ${REINPLACE_CMD} -e '/find_suggested_package(LIBSSH)/d' ${WRKSRC}/plugins/CMakeLists.txt ${REINPLACE_CMD} -e '/find_required_package(XKBFILE)/d' ${WRKSRC}/plugins/CMakeLists.txt @@ -53,6 +59,9 @@ ${REINPLACE_CMD} -e '/find_suggested_package(SPICE)/d' ${WRKSRC}/plugins/CMakeLists.txt ${REINPLACE_CMD} -e '/add_subdirectory(spice)/d' ${WRKSRC}/plugins/CMakeLists.txt .endif +.if ${PKGNAMESUFFIX:S,-,,} != "st" + ${REINPLACE_CMD} -e '/add_subdirectory(st)/d' ${WRKSRC}/plugins/CMakeLists.txt +.endif .if ${PKGNAMESUFFIX:S,-,,} != "telepathy" ${REINPLACE_CMD} -e '/find_suggested_package(TELEPATHY)/d' ${WRKSRC}/plugins/CMakeLists.txt ${REINPLACE_CMD} -e '/add_subdirectory(telepathy)/d' ${WRKSRC}/plugins/CMakeLists.txt @@ -62,6 +71,9 @@ ${REINPLACE_CMD} -e' /find_suggested_package(LIBVNCSERVER)/d' ${WRKSRC}/plugins/CMakeLists.txt ${REINPLACE_CMD} -e '/add_subdirectory(vnc)/d' ${WRKSRC}/plugins/CMakeLists.txt .endif +.if ${PKGNAMESUFFIX:S,-,,} != "www" + ${REINPLACE_CMD} -e '/add_subdirectory(www)/d' ${WRKSRC}/plugins/CMakeLists.txt +.endif .if ${PKGNAMESUFFIX:S,-,,} != "xdmcp" ${REINPLACE_CMD} -e '/add_subdirectory(xdmcp)/d' ${WRKSRC}/plugins/CMakeLists.txt .endif Index: net/remmina-plugins/distinfo =================================================================== --- net/remmina-plugins/distinfo +++ net/remmina-plugins/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535188642 -SHA256 (Remmina-Remmina-65d552c9becc957cae124ab5c26562cf22c052b9_GL0.tar.gz) = 02efdd291661c2f54d6aede6fd82898ac103b428a474e24240b90c6bef87f5f2 -SIZE (Remmina-Remmina-65d552c9becc957cae124ab5c26562cf22c052b9_GL0.tar.gz) = 1250771 +TIMESTAMP = 1564883727 +SHA256 (Remmina-Remmina-e1a0ffd30a0d8e35ed86ec81ecb4719bb870d62c_GL0.tar.gz) = 91c97b4e284dbc3612e000cd4ded1c01cf6f29b74ddde095d2ef6a7fc673b6d4 +SIZE (Remmina-Remmina-e1a0ffd30a0d8e35ed86ec81ecb4719bb870d62c_GL0.tar.gz) = 1474390 Index: net/remmina/Makefile =================================================================== --- net/remmina/Makefile +++ net/remmina/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= remmina -DISTVERSION= 1.2.31.4 -PORTREVISION= 1 +DISTVERSION= 1.3.5 CATEGORIES= net gnome MAINTAINER= woodsb02@FreeBSD.org @@ -13,20 +12,23 @@ LICENSE_FILE= ${WRKSRC}/LICENSE LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \ - libsoup-2.4.so:devel/libsoup + libsodium.so:security/libsodium + libsoup-2.4.so:devel/libsoup \ + +USES= cmake desktop-file-utils gettext gnome localbase:ldflags pathfix \ + pkgconfig shared-mime-info ssl shebangfix USE_GITLAB= yes GL_ACCOUNT= Remmina GL_PROJECT= Remmina -GL_COMMIT= 65d552c9becc957cae124ab5c26562cf22c052b9 +GL_COMMIT= e1a0ffd30a0d8e35ed86ec81ecb4719bb870d62c -USES= cmake desktop-file-utils gettext localbase:ldflags pathfix \ - pkgconfig shared-mime-info ssl USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 pango USE_XORG= ice sm x11 xext xkbfile INSTALLS_ICONS= yes CMAKE_ARGS= --build=build \ -DWITH_APPINDICATOR:BOOL=false +SHEBANG_FILES= data/desktop/remmina-file-wrapper.sh.in OPTIONS_DEFINE= AVAHI GCRYPT NLS SSH TERM OPTIONS_DEFAULT= AVAHI GCRYPT SSH TERM Index: net/remmina/distinfo =================================================================== --- net/remmina/distinfo +++ net/remmina/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1535184028 -SHA256 (Remmina-Remmina-65d552c9becc957cae124ab5c26562cf22c052b9_GL0.tar.gz) = 02efdd291661c2f54d6aede6fd82898ac103b428a474e24240b90c6bef87f5f2 -SIZE (Remmina-Remmina-65d552c9becc957cae124ab5c26562cf22c052b9_GL0.tar.gz) = 1250771 +TIMESTAMP = 1564883727 +SHA256 (Remmina-Remmina-e1a0ffd30a0d8e35ed86ec81ecb4719bb870d62c_GL0.tar.gz) = 91c97b4e284dbc3612e000cd4ded1c01cf6f29b74ddde095d2ef6a7fc673b6d4 +SIZE (Remmina-Remmina-e1a0ffd30a0d8e35ed86ec81ecb4719bb870d62c_GL0.tar.gz) = 1474390 Index: net/remmina/pkg-message =================================================================== --- net/remmina/pkg-message +++ net/remmina/pkg-message @@ -1,4 +1,9 @@ - - Remmina is pretty useless without a plugins. - Consider installing net/remmina-plugins. - +[ +{ + type: install + message: <