svn commit: r463551 - in head: . net net/remmina net/remmina-plugin-exec net/remmina-plugin-gnome net/remmina-plugin-nx net/remmina-plugin-rdp net/remmina-plugin-secret net/remmina-plugin-telepathy...
Ben Woods
woodsb02 at FreeBSD.org
Sun Mar 4 05:21:12 UTC 2018
Author: woodsb02
Date: Sun Mar 4 05:21:09 2018
New Revision: 463551
URL: https://svnweb.freebsd.org/changeset/ports/463551
Log:
net/remmina: Update to v1.2.0-rcgit.27 (Valentine Edition 2018)
- Upstream renamed net/remmina-plugin-gnome to net/remmina-plugin-secret
- Add new plugin net/remmina-plugin-exec to execute commands
- Remove unnecessarily complicated pkg-plist logic for plugins
Changes this release:
https://github.com/FreeRDP/Remmina/releases/tag/v1.2.0-rcgit.27
https://github.com/FreeRDP/Remmina/releases/tag/v1.2.0-rcgit.26
https://github.com/FreeRDP/Remmina/releases/tag/v1.2.0-rcgit.25
Added:
head/net/remmina-plugin-exec/
head/net/remmina-plugin-exec/Makefile (contents, props changed)
head/net/remmina-plugin-exec/pkg-plist (contents, props changed)
head/net/remmina-plugin-nx/pkg-plist (contents, props changed)
head/net/remmina-plugin-rdp/pkg-plist (contents, props changed)
head/net/remmina-plugin-secret/
- copied from r463550, head/net/remmina-plugin-gnome/
head/net/remmina-plugin-telepathy/pkg-plist (contents, props changed)
head/net/remmina-plugin-vnc/pkg-plist (contents, props changed)
head/net/remmina-plugin-xdmcp/pkg-plist (contents, props changed)
Deleted:
head/net/remmina-plugin-gnome/
head/net/remmina-plugins/pkg-plist.plugin
Modified:
head/MOVED
head/net/Makefile
head/net/remmina-plugin-nx/Makefile
head/net/remmina-plugin-rdp/Makefile
head/net/remmina-plugin-secret/Makefile
head/net/remmina-plugin-secret/pkg-plist
head/net/remmina-plugin-telepathy/Makefile
head/net/remmina-plugin-vnc/Makefile
head/net/remmina-plugin-xdmcp/Makefile
head/net/remmina-plugins/Makefile
head/net/remmina-plugins/bsd.plugin.mk
head/net/remmina-plugins/distinfo
head/net/remmina/Makefile
head/net/remmina/distinfo
Modified: head/MOVED
==============================================================================
--- head/MOVED Sun Mar 4 04:11:49 2018 (r463550)
+++ head/MOVED Sun Mar 4 05:21:09 2018 (r463551)
@@ -10156,3 +10156,4 @@ devel/adime||2018-03-02|Has expired: Abandonware, not
devel/boaconstructor||2018-03-02|Has expired: Abandonware, does not work with recent python/wxPython
audio/amp||2018-03-02|Has expired: No more upstream
devel/alf||2018-03-02|Has expired: Abandonware, unused in the ports tree
+net/remmina-plugin-gnome|net/remmina-plugin-secret|2018-03-04|Renamed upstream
Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile Sun Mar 4 04:11:49 2018 (r463550)
+++ head/net/Makefile Sun Mar 4 05:21:09 2018 (r463551)
@@ -1136,9 +1136,10 @@
SUBDIR += redir
SUBDIR += relayd
SUBDIR += remmina
- SUBDIR += remmina-plugin-gnome
+ SUBDIR += remmina-plugin-exec
SUBDIR += remmina-plugin-nx
SUBDIR += remmina-plugin-rdp
+ SUBDIR += remmina-plugin-secret
SUBDIR += remmina-plugin-telepathy
SUBDIR += remmina-plugin-vnc
SUBDIR += remmina-plugin-xdmcp
Added: head/net/remmina-plugin-exec/Makefile
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/remmina-plugin-exec/Makefile Sun Mar 4 05:21:09 2018 (r463551)
@@ -0,0 +1,12 @@
+# Created by: Ben Woods <woodsb02 at FreeBSD.org>
+# $FreeBSD$
+
+PKGNAMESUFFIX= -exec
+
+COMMENT= Remmina plugin to execute a command
+
+USE_GNOME+= cairo
+
+MASTERDIR= ${.CURDIR}/../remmina-plugins
+
+.include "${MASTERDIR}/Makefile"
Added: head/net/remmina-plugin-exec/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/remmina-plugin-exec/pkg-plist Sun Mar 4 05:21:09 2018 (r463551)
@@ -0,0 +1,3 @@
+lib/remmina/plugins/remmina-plugin-exec.so
+share/icons/hicolor/22x22/emblems/remmina-tool.png
+share/icons/hicolor/16x16/emblems/remmina-tool.png
Modified: head/net/remmina-plugin-nx/Makefile
==============================================================================
--- head/net/remmina-plugin-nx/Makefile Sun Mar 4 04:11:49 2018 (r463550)
+++ head/net/remmina-plugin-nx/Makefile Sun Mar 4 05:21:09 2018 (r463551)
@@ -12,6 +12,4 @@ MASTERDIR= ${.CURDIR}/../remmina-plugins
LIB_DEPENDS+= libssh_threads.so:security/libssh
-PLIST_SUB+= ICONS="" SSH="@comment "
-
.include "${MASTERDIR}/Makefile"
Added: head/net/remmina-plugin-nx/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/remmina-plugin-nx/pkg-plist Sun Mar 4 05:21:09 2018 (r463551)
@@ -0,0 +1,3 @@
+lib/remmina/plugins/remmina-plugin-nx.so
+share/icons/hicolor/22x22/emblems/remmina-nx.png
+share/icons/hicolor/16x16/emblems/remmina-nx.png
Modified: head/net/remmina-plugin-rdp/Makefile
==============================================================================
--- head/net/remmina-plugin-rdp/Makefile Sun Mar 4 04:11:49 2018 (r463550)
+++ head/net/remmina-plugin-rdp/Makefile Sun Mar 4 05:21:09 2018 (r463551)
@@ -13,6 +13,4 @@ USE_XORG+= ice sm x11 xext
MASTERDIR= ${.CURDIR}/../remmina-plugins
-PLIST_SUB+= ICONS="" SSH=""
-
.include "${MASTERDIR}/Makefile"
Added: head/net/remmina-plugin-rdp/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/remmina-plugin-rdp/pkg-plist Sun Mar 4 05:21:09 2018 (r463551)
@@ -0,0 +1,5 @@
+lib/remmina/plugins/remmina-plugin-rdp.so
+share/icons/hicolor/22x22/emblems/remmina-rdp-ssh.png
+share/icons/hicolor/22x22/emblems/remmina-rdp.png
+share/icons/hicolor/16x16/emblems/remmina-rdp-ssh.png
+share/icons/hicolor/16x16/emblems/remmina-rdp.png
Modified: head/net/remmina-plugin-secret/Makefile
==============================================================================
--- head/net/remmina-plugin-gnome/Makefile Sun Mar 4 04:11:49 2018 (r463550)
+++ head/net/remmina-plugin-secret/Makefile Sun Mar 4 05:21:09 2018 (r463551)
@@ -1,7 +1,7 @@
# Created by: Koichiro IWAO <meta+ports at vmeta.jp>
# $FreeBSD$
-PKGNAMESUFFIX= -gnome
+PKGNAMESUFFIX= -secret
COMMENT= Remmina plugin for GNOME Keyring
Modified: head/net/remmina-plugin-secret/pkg-plist
==============================================================================
--- head/net/remmina-plugin-gnome/pkg-plist Sun Mar 4 04:11:49 2018 (r463550)
+++ head/net/remmina-plugin-secret/pkg-plist Sun Mar 4 05:21:09 2018 (r463551)
@@ -1 +1 @@
-lib/remmina/plugins/remmina-plugins-gnome.so
+lib/remmina/plugins/remmina-plugin-secret.so
Modified: head/net/remmina-plugin-telepathy/Makefile
==============================================================================
--- head/net/remmina-plugin-telepathy/Makefile Sun Mar 4 04:11:49 2018 (r463550)
+++ head/net/remmina-plugin-telepathy/Makefile Sun Mar 4 05:21:09 2018 (r463551)
@@ -10,6 +10,4 @@ LIB_DEPENDS= libtelepathy-glib.so:net-im/telepathy-gli
MASTERDIR= ${.CURDIR}/../remmina-plugins
-PLIST_SUB+= ICONS="@comment "
-
.include "${MASTERDIR}/Makefile"
Added: head/net/remmina-plugin-telepathy/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/remmina-plugin-telepathy/pkg-plist Sun Mar 4 05:21:09 2018 (r463551)
@@ -0,0 +1,3 @@
+lib/remmina/plugins/remmina-plugin-telepathy.so
+share/dbus-1/services/org.freedesktop.Telepathy.Client.Remmina.service
+share/telepathy/clients/Remmina.client
Modified: head/net/remmina-plugin-vnc/Makefile
==============================================================================
--- head/net/remmina-plugin-vnc/Makefile Sun Mar 4 04:11:49 2018 (r463550)
+++ head/net/remmina-plugin-vnc/Makefile Sun Mar 4 05:21:09 2018 (r463551)
@@ -14,6 +14,4 @@ USE_GNOME+= cairo
MASTERDIR= ${.CURDIR}/../remmina-plugins
-PLIST_SUB+= ICONS="" SSH=""
-
.include "${MASTERDIR}/Makefile"
Added: head/net/remmina-plugin-vnc/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/remmina-plugin-vnc/pkg-plist Sun Mar 4 05:21:09 2018 (r463551)
@@ -0,0 +1,5 @@
+lib/remmina/plugins/remmina-plugin-vnc.so
+share/icons/hicolor/22x22/emblems/remmina-vnc-ssh.png
+share/icons/hicolor/22x22/emblems/remmina-vnc.png
+share/icons/hicolor/16x16/emblems/remmina-vnc-ssh.png
+share/icons/hicolor/16x16/emblems/remmina-vnc.png
Modified: head/net/remmina-plugin-xdmcp/Makefile
==============================================================================
--- head/net/remmina-plugin-xdmcp/Makefile Sun Mar 4 04:11:49 2018 (r463550)
+++ head/net/remmina-plugin-xdmcp/Makefile Sun Mar 4 05:21:09 2018 (r463551)
@@ -11,6 +11,4 @@ USE_GNOME+= cairo
MASTERDIR= ${.CURDIR}/../remmina-plugins
-PLIST_SUB+= ICONS="" SSH=""
-
.include "${MASTERDIR}/Makefile"
Added: head/net/remmina-plugin-xdmcp/pkg-plist
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/net/remmina-plugin-xdmcp/pkg-plist Sun Mar 4 05:21:09 2018 (r463551)
@@ -0,0 +1,5 @@
+lib/remmina/plugins/remmina-plugin-xdmcp.so
+share/icons/hicolor/22x22/emblems/remmina-xdmcp-ssh.png
+share/icons/hicolor/22x22/emblems/remmina-xdmcp.png
+share/icons/hicolor/16x16/emblems/remmina-xdmcp-ssh.png
+share/icons/hicolor/16x16/emblems/remmina-xdmcp.png
Modified: head/net/remmina-plugins/Makefile
==============================================================================
--- head/net/remmina-plugins/Makefile Sun Mar 4 04:11:49 2018 (r463550)
+++ head/net/remmina-plugins/Makefile Sun Mar 4 05:21:09 2018 (r463551)
@@ -3,7 +3,7 @@
PORTNAME?= remmina-plugins
DISTVERSIONPREFIX=v
-DISTVERSION= 1.2.0-rcgit.24
+DISTVERSION= 1.2.0-rcgit.27
CATEGORIES= net gnome
MAINTAINER?= woodsb02 at FreeBSD.org
@@ -21,8 +21,9 @@ GH_PROJECT= Remmina
USES= metaport
-OPTIONS_DEFINE= KEYRING NX RDP TELEP VNC XDMCP
-OPTIONS_DEFAULT= KEYRING RDP TELEP VNC XDMCP
+OPTIONS_DEFINE= EXEC KEYRING NX RDP TELEP VNC XDMCP
+OPTIONS_DEFAULT= EXEC KEYRING RDP TELEP VNC XDMCP
+EXEC_DESC= Plugin to execute a command
KEYRING_DESC= GNOME Keyring plugin
RDP_DESC= Remote Desktop Protocol plugin
VNC_DESC= VNC protocol plugin
@@ -30,7 +31,8 @@ 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
+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
Modified: head/net/remmina-plugins/bsd.plugin.mk
==============================================================================
--- head/net/remmina-plugins/bsd.plugin.mk Sun Mar 4 04:11:49 2018 (r463550)
+++ head/net/remmina-plugins/bsd.plugin.mk Sun Mar 4 05:21:09 2018 (r463551)
@@ -22,38 +22,38 @@ CMAKE_ARGS+= -DWITH_APPINDICATOR=OFF
# set build directory
CMAKE_ARGS+= --build=build
-SSH_DESC= Build with SSH tunneling support
-
.include <bsd.port.pre.mk>
-.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,-,,} != "exec"
+ ${REINPLACE_CMD} -e 's|add_subdirectory(exec)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
+.endif
.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,-,,} != "secret"
+ ${REINPLACE_CMD} -e 's|add_subdirectory(remmina-plugins-secret)||' ${WRKSRC}/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,-,,} != "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,-,,} != "vnc"
${REINPLACE_CMD} -e 's|find_suggested_package(GCRYPT)||' ${WRKSRC}/CMakeLists.txt
${REINPLACE_CMD} -e' s|find_suggested_package(LIBVNCSERVER)||' ${WRKSRC}/remmina-plugins/CMakeLists.txt
@@ -61,10 +61,6 @@ post-patch:
.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 <bsd.port.post.mk>
Modified: head/net/remmina-plugins/distinfo
==============================================================================
--- head/net/remmina-plugins/distinfo Sun Mar 4 04:11:49 2018 (r463550)
+++ head/net/remmina-plugins/distinfo Sun Mar 4 05:21:09 2018 (r463551)
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1520133073
+SHA256 (FreeRDP-Remmina-v1.2.0-rcgit.27_GH0.tar.gz) = 5f96fc2b1013a12acada30991ec7f46b53b731e71f735e662d830d9083db9826
+SIZE (FreeRDP-Remmina-v1.2.0-rcgit.27_GH0.tar.gz) = 1165848
Modified: head/net/remmina/Makefile
==============================================================================
--- head/net/remmina/Makefile Sun Mar 4 04:11:49 2018 (r463550)
+++ head/net/remmina/Makefile Sun Mar 4 05:21:09 2018 (r463551)
@@ -3,7 +3,7 @@
PORTNAME= remmina
DISTVERSIONPREFIX=v
-DISTVERSION= 1.2.0-rcgit.24
+DISTVERSION= 1.2.0-rcgit.27
CATEGORIES= net gnome
MAINTAINER= woodsb02 at FreeBSD.org
@@ -12,14 +12,18 @@ COMMENT= GTK+ Remote Desktop Client
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/LICENSE
+LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \
+ libsoup-2.4.so:devel/libsoup
+
USE_GITHUB= yes
GH_ACCOUNT= FreeRDP
GH_PROJECT= Remmina
-USES= cmake:outsource desktop-file-utils gettext localbase:ldflags pathfix pkgconfig shared-mime-info
+USES= cmake:outsource 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
-PATHFIX_WRKSRC= ${WRKSRC}/remmina
+PATHFIX_WRKSRC= ${WRKSRC}/remmina
INSTALLS_ICONS= yes
CMAKE_ARGS= --build=build \
-DWITH_APPINDICATOR:BOOL=false
Modified: head/net/remmina/distinfo
==============================================================================
--- head/net/remmina/distinfo Sun Mar 4 04:11:49 2018 (r463550)
+++ head/net/remmina/distinfo Sun Mar 4 05:21:09 2018 (r463551)
@@ -1,3 +1,3 @@
-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
+TIMESTAMP = 1520133048
+SHA256 (FreeRDP-Remmina-v1.2.0-rcgit.27_GH0.tar.gz) = 5f96fc2b1013a12acada30991ec7f46b53b731e71f735e662d830d9083db9826
+SIZE (FreeRDP-Remmina-v1.2.0-rcgit.27_GH0.tar.gz) = 1165848
More information about the svn-ports-all
mailing list