svn commit: r556143 - in head: . net net/remmina net/remmina-plugin-exec net/remmina-plugin-nx net/remmina-plugin-rdp net/remmina-plugin-secret net/remmina-plugin-spice net/remmina-plugin-st net/re...
Ben Woods
woodsb02 at FreeBSD.org
Tue Nov 24 02:07:41 UTC 2020
Author: woodsb02
Date: Tue Nov 24 02:07:39 2020
New Revision: 556143
URL: https://svnweb.freebsd.org/changeset/ports/556143
Log:
net/remmina: Create default and lite flavors
net/remmina-plugin*: Remove individual plugin ports in favor of flavors
Added:
head/net/remmina/pkg-descr-lite
- copied, changed from r555538, head/net/remmina/pkg-descr
Deleted:
head/net/remmina-plugin-exec/
head/net/remmina-plugin-nx/
head/net/remmina-plugin-rdp/
head/net/remmina-plugin-secret/
head/net/remmina-plugin-spice/
head/net/remmina-plugin-st/
head/net/remmina-plugin-vnc/
head/net/remmina-plugin-www/
head/net/remmina-plugin-xdmcp/
head/net/remmina-plugins/
head/net/remmina/pkg-message
Modified:
head/MOVED
head/net/Makefile
head/net/remmina/Makefile
head/net/remmina/pkg-descr
head/net/remmina/pkg-plist
Modified: head/MOVED
==============================================================================
--- head/MOVED Tue Nov 24 01:38:05 2020 (r556142)
+++ head/MOVED Tue Nov 24 02:07:39 2020 (r556143)
@@ -15707,3 +15707,13 @@ www/py-requestbuilder||2020-11-15|Has expired: Uses de
x11-toolkits/py-SquareMap||2020-11-15|Has expired: Uses deprecated version of python
devel/py-utils||2020-11-16|Removed on maintainers request, uses EOLed python27
net-mgmt/cnagios4|net-mgmt/cnagio|2020-11-17|Moved to nagios4 flavored version
+net/remmina-plugin-exec|net/remmina|2020-11-24|Moved to remmina flavored version
+net/remmina-plugin-nx|net/remmina|2020-11-24|Moved to remmina flavored version
+net/remmina-plugin-rdp|net/remmina|2020-11-24|Moved to remmina flavored version
+net/remmina-plugin-secret|net/remmina|2020-11-24|Moved to remmina flavored version
+net/remmina-plugin-spice|net/remmina|2020-11-24|Moved to remmina flavored version
+net/remmina-plugin-st|net/remmina|2020-11-24|Moved to remmina flavored version
+net/remmina-plugin-vnc|net/remmina|2020-11-24|Moved to remmina flavored version
+net/remmina-plugin-www|net/remmina|2020-11-24|Moved to remmina flavored version
+net/remmina-plugin-xdmcp|net/remmina|2020-11-24|Moved to remmina flavored version
+net/remmina-plugins|net/remmina|2020-11-24|Moved to remmina flavored version
Modified: head/net/Makefile
==============================================================================
--- head/net/Makefile Tue Nov 24 01:38:05 2020 (r556142)
+++ head/net/Makefile Tue Nov 24 02:07:39 2020 (r556143)
@@ -1164,16 +1164,6 @@
SUBDIR += redir
SUBDIR += relayd
SUBDIR += remmina
- SUBDIR += remmina-plugin-exec
- SUBDIR += remmina-plugin-nx
- SUBDIR += remmina-plugin-rdp
- SUBDIR += remmina-plugin-secret
- SUBDIR += remmina-plugin-spice
- SUBDIR += remmina-plugin-st
- SUBDIR += remmina-plugin-vnc
- SUBDIR += remmina-plugin-www
- SUBDIR += remmina-plugin-xdmcp
- SUBDIR += remmina-plugins
SUBDIR += remotebox
SUBDIR += remotedesk
SUBDIR += repeater
Modified: head/net/remmina/Makefile
==============================================================================
--- head/net/remmina/Makefile Tue Nov 24 01:38:05 2020 (r556142)
+++ head/net/remmina/Makefile Tue Nov 24 02:07:39 2020 (r556143)
@@ -3,6 +3,7 @@
PORTNAME= remmina
DISTVERSION= 1.4.8
+PORTREVISION= 1
CATEGORIES= net gnome
MAINTAINER= woodsb02 at FreeBSD.org
@@ -15,6 +16,12 @@ LIB_DEPENDS= libjson-glib-1.0.so:devel/json-glib \
libsodium.so:security/libsodium \
libsoup-2.4.so:devel/libsoup
+CONFLICTS_INSTALL= remmina-plugin*
+
+FLAVORS= default lite
+lite_DESCR= ${.CURDIR}/pkg-descr-lite
+lite_PKGNAMESUFFIX= -lite
+
USES= cmake compiler:c11 desktop-file-utils gettext gnome localbase:ldflags pathfix \
pkgconfig shared-mime-info ssl shebangfix xorg
@@ -25,43 +32,129 @@ GL_COMMIT= 7ebc497062de66881b71bbe7f54dabfda0129ac2
USE_GNOME= atk cairo gdkpixbuf2 glib20 gtk30 pango
USE_XORG= ice sm x11 xext xkbfile
+USE_LDCONFIG= yes
INSTALLS_ICONS= yes
CMAKE_ARGS= --build=build \
-DWITH_APPINDICATOR:BOOL=false
SHEBANG_FILES= data/desktop/remmina-file-wrapper.in
bash_CMD= ${SH}
-OPTIONS_DEFINE= AVAHI GCRYPT NLS SSH TERM
-OPTIONS_DEFAULT= AVAHI GCRYPT SSH TERM
+OPTIONS_DEFINE= AVAHI CUPS GCRYPT NLS SSH TERM
+OPTIONS_GROUP= PLUGINS
+OPTIONS_GROUP_PLUGINS= EXEC KWALLET NX RDP SECRET SPICE ST VNC WWW XDMCP
+OPTIONS_DEFAULT= AVAHI CUPS GCRYPT NLS SSH TERM \
+ EXEC NX RDP SECRET SPICE ST VNC WWW XDMCP
OPTIONS_SUB= yes
+.if ${FLAVOR:U} == lite
+OPTIONS_EXCLUDE= AVAHI CUPS KWALLET NX SECRET SPICE SSH TERM WWW XDMCP
+COMMENT+= (lite flavor)
+.endif
+
AVAHI_DESC= Build with Avahi support
+EXEC_DESC= Plugin to execute a command
GCRYPT_DESC= Build with libgcrypt support for password encryption
+NX_DESC= NX protocol plugin
+RDP_DESC= Remote Desktop Protocol plugin
+SECRET_DESC= GNOME Keyring plugin
+SPICE_DESC= Spice protocol plugin
SSH_DESC= Build with SSH tunneling support
+ST_DESC= (Simple) Terminal Plugin
TERM_DESC= Build with terminal support
+VNC_DESC= VNC protocol plugin
+WWW_DESC= Plugin to open an authenticated web browser
+XDMCP_DESC= XDMCP protocol plugin
AVAHI_LIB_DEPENDS= libavahi-client.so:net/avahi-app \
libavahi-ui-gtk3.so:net/avahi-gtk3
AVAHI_CMAKE_BOOL= WITH_AVAHI
+CUPS_LIB_DEPENDS= libcups.so:print/cups
+CUPS_CMAKE_BOOL= WITH_CUPS
+
GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt
GCRYPT_CMAKE_BOOL= WITH_GCRYPT
+KWALLET_USES= kde:5 qt:5
+KWALLET_USE= kde=wallet qt=buildtools_build,core,gui,qmake_build
+KWALLET_CMAKE_BOOL= WITH_KF5WALLET
+
NLS_CMAKE_BOOL= WITH_TRANSLATIONS
+NX_IMPLIES= SSH
+
+RDP_LIB_DEPENDS= libfreerdp2.so:net/freerdp
+
+SECRET_LIB_DEPENDS= libsecret-1.so:security/libsecret
+SECRET_RUN_DEPENDS= gnome-keyring:security/gnome-keyring
+
+SPICE_BUILD_DEPENDS= spice-protocol>=0.12.15:devel/spice-protocol
+SPICE_LIB_DEPENDS= libspice-client-gtk-3.0.so:deskutils/spice-gtk
+SPICE_CMAKE_BOOL= WITH_SPICE
+
SSH_LIB_DEPENDS= libssh.so:security/libssh
SSH_LDFLAGS= -fstack-protector
SSH_CMAKE_BOOL= WITH_LIBSSH
+ST_IMPLIES= EXEC
+
TERM_USE= gnome=vte3
TERM_CMAKE_BOOL= WITH_VTE
+VNC_USES= jpeg
+VNC_LIB_DEPENDS= libgnutls.so:security/gnutls \
+ libvncserver.so:net/libvncserver
+VNC_CMAKE_BOOL= WITH_LIBVNCSERVER
+
+WWW_LIB_DEPENDS= libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
+ libsoup-2.4.so:devel/libsoup
+
+XDMCP_RUN_DEPENDS= Xephyr:x11-servers/xephyr
+
post-patch:
- # do not build plugins and locales , they are provided by separated ports
- ${REINPLACE_CMD} -e '/add_subdirectory(plugins/d' \
- -e 's,FreeBSD,FreeBSD|DragonFly,' \
- ${WRKSRC}/CMakeLists.txt
${REINPLACE_CMD} -e 's,FreeBSD,FreeBSD|DragonFly,' \
+ ${WRKSRC}/CMakeLists.txt \
${WRKSRC}/src/CMakeLists.txt
+
+post-patch-EXEC-off:
+ ${REINPLACE_CMD} -e '/add_subdirectory(exec)/d' ${WRKSRC}/plugins/CMakeLists.txt
+
+post-patch-GCRYPT-off:
+ ${REINPLACE_CMD} -e '/find_suggested_package(GCRYPT)/d' ${WRKSRC}/CMakeLists.txt
+
+post-patch-KWALLET-off:
+ ${REINPLACE_CMD} -e '/add_definitions(-DWITH_KF5WALLET)/d' ${WRKSRC}/plugins/CMakeLists.txt
+ ${REINPLACE_CMD} -e '/add_subdirectory(kwallet)/d' ${WRKSRC}/plugins/CMakeLists.txt
+
+post-patch-NX-off:
+ ${REINPLACE_CMD} -e '/find_required_package(XKBFILE)/d' ${WRKSRC}/plugins/CMakeLists.txt
+ ${REINPLACE_CMD} -e '/add_subdirectory(nx)/d' ${WRKSRC}/plugins/CMakeLists.txt
+
+post-patch-RDP-off:
+ ${REINPLACE_CMD} -e '/find_suggested_package(FREERDP)/d' ${WRKSRC}/plugins/CMakeLists.txt
+ ${REINPLACE_CMD} -e '/add_subdirectory(rdp)/d' ${WRKSRC}/plugins/CMakeLists.txt
+
+post-patch-SECRET-off:
+ ${REINPLACE_CMD} -e '/add_subdirectory(plugins\/secret)/d' ${WRKSRC}/CMakeLists.txt
+
+post-patch-SPICE-off:
+ ${REINPLACE_CMD} -e '/find_suggested_package(SPICE)/d' ${WRKSRC}/plugins/CMakeLists.txt
+ ${REINPLACE_CMD} -e '/add_subdirectory(spice)/d' ${WRKSRC}/plugins/CMakeLists.txt
+
+post-patch-SSH-off:
+ ${REINPLACE_CMD} -e '/find_suggested_package(LIBSSH)/d' ${WRKSRC}/plugins/CMakeLists.txt
+
+post-patch-ST-off:
+ ${REINPLACE_CMD} -e '/add_subdirectory(st)/d' ${WRKSRC}/plugins/CMakeLists.txt
+
+post-patch-VNC-off:
+ ${REINPLACE_CMD} -e' /find_suggested_package(LIBVNCSERVER)/d' ${WRKSRC}/plugins/CMakeLists.txt
+ ${REINPLACE_CMD} -e '/add_subdirectory(vnc)/d' ${WRKSRC}/plugins/CMakeLists.txt
+
+post-patch-WWW-off:
+ ${REINPLACE_CMD} -e '/add_subdirectory(www)/d' ${WRKSRC}/plugins/CMakeLists.txt
+
+post-patch-XDMCP-off:
+ ${REINPLACE_CMD} -e '/add_subdirectory(xdmcp)/d' ${WRKSRC}/plugins/CMakeLists.txt
.include <bsd.port.mk>
Modified: head/net/remmina/pkg-descr
==============================================================================
--- head/net/remmina/pkg-descr Tue Nov 24 01:38:05 2020 (r556142)
+++ head/net/remmina/pkg-descr Tue Nov 24 02:07:39 2020 (r556143)
@@ -3,20 +3,11 @@ system administrators and travellers, who need to work
computers in front of either large monitors or tiny netbooks. Remmina supports
multiple network protocols in an integrated and consistant user interface.
-The Remmina main program:
+Remmina includes support for the following network protocols:
+* RDP, VNC, SPICE, NX, XDMCP, SSH, SFTP
- * Maintain a list of connection profiles, organized by groups
- * Make quick connections by directly putting in the server address
- * Remote desktops with higher resolutions are scrollable/scalable in both
- window and fullscreen mode
- * Viewport fullscreen mode: remote desktop automatically scrolls when the
- mouse moves over the screen edge.
- * Floating toolbar in fullscreen mode, allows you to switch between modes,
- toggle keyboard grabbing, minimize, etc.
- * Tabbed interface, optionally managed by groups
- * A GTK+ 3 application
-
-Remmina plugins are available for the following network protocols:
- * RDP, VNC, NX, XDMCP, SSH, Telepathy
+This is the full-featured flavor of the Remmina package, compiled with support
+for optional desktop features and network protocols, as shown by the package
+options.
WWW: https://www.remmina.org/
Copied and modified: head/net/remmina/pkg-descr-lite (from r555538, head/net/remmina/pkg-descr)
==============================================================================
--- head/net/remmina/pkg-descr Tue Nov 17 02:56:13 2020 (r555538, copy source)
+++ head/net/remmina/pkg-descr-lite Tue Nov 24 02:07:39 2020 (r556143)
@@ -3,20 +3,10 @@ system administrators and travellers, who need to work
computers in front of either large monitors or tiny netbooks. Remmina supports
multiple network protocols in an integrated and consistant user interface.
-The Remmina main program:
+Remmina includes support for the following network protocols:
+* RDP, VNC, SPICE, NX, XDMCP, SSH, SFTP
- * Maintain a list of connection profiles, organized by groups
- * Make quick connections by directly putting in the server address
- * Remote desktops with higher resolutions are scrollable/scalable in both
- window and fullscreen mode
- * Viewport fullscreen mode: remote desktop automatically scrolls when the
- mouse moves over the screen edge.
- * Floating toolbar in fullscreen mode, allows you to switch between modes,
- toggle keyboard grabbing, minimize, etc.
- * Tabbed interface, optionally managed by groups
- * A GTK+ 3 application
-
-Remmina plugins are available for the following network protocols:
- * RDP, VNC, NX, XDMCP, SSH, Telepathy
+This is the lite flavor of the Remmina package, compiled with the minimum
+dependencies to support the RDP and VNC protocols only.
WWW: https://www.remmina.org/
Modified: head/net/remmina/pkg-plist
==============================================================================
--- head/net/remmina/pkg-plist Tue Nov 24 01:38:05 2020 (r556142)
+++ head/net/remmina/pkg-plist Tue Nov 24 02:07:39 2020 (r556143)
@@ -3,6 +3,16 @@ bin/remmina-file-wrapper
include/remmina/plugin.h
include/remmina/remmina_trace_calls.h
include/remmina/types.h
+%%EXEC%%lib/remmina/plugins/remmina-plugin-exec.so
+%%KWALLET%%lib/remmina/plugins/remmina-plugin-kwallet.so
+%%NX%%lib/remmina/plugins/remmina-plugin-nx.so
+%%RDP%%lib/remmina/plugins/remmina-plugin-rdp.so
+%%SECRET%%lib/remmina/plugins/remmina-plugin-secret.so
+%%SPICE%%lib/remmina/plugins/remmina-plugin-spice.so
+%%ST%%lib/remmina/plugins/remmina-plugin-st.so
+%%VNC%%lib/remmina/plugins/remmina-plugin-vnc.so
+%%WWW%%lib/remmina/plugins/remmina-plugin-www.so
+%%XDMCP%%lib/remmina/plugins/remmina-plugin-xdmcp.so
libdata/pkgconfig/remmina.pc
man/man1/remmina-file-wrapper.1.gz
man/man1/remmina.1.gz
@@ -65,6 +75,17 @@ share/icons/hicolor/scalable/apps/remmina-panel-invert
share/icons/hicolor/scalable/apps/remmina-panel.svg
share/icons/hicolor/scalable/emblems/remmina-sftp-symbolic.svg
share/icons/hicolor/scalable/emblems/remmina-ssh-symbolic.svg
+%%EXEC%%share/icons/hicolor/scalable/emblems/remmina-tool-symbolic.svg
+%%NX%%share/icons/hicolor/scalable/emblems/remmina-nx-symbolic.svg
+%%RDP%%share/icons/hicolor/scalable/emblems/remmina-rdp-symbolic.svg
+%%RDP%%share/icons/hicolor/scalable/emblems/remmina-rdp-ssh-symbolic.svg
+%%SPICE%%share/icons/hicolor/scalable/emblems/remmina-spice-ssh-symbolic.svg
+%%SPICE%%share/icons/hicolor/scalable/emblems/remmina-spice-symbolic.svg
+%%VNC%%share/icons/hicolor/scalable/emblems/remmina-vnc-ssh-symbolic.svg
+%%VNC%%share/icons/hicolor/scalable/emblems/remmina-vnc-symbolic.svg
+%%WWW%%share/icons/hicolor/scalable/emblems/remmina-www-symbolic.svg
+%%XDMCP%%share/icons/hicolor/scalable/emblems/remmina-xdmcp-ssh-symbolic.svg
+%%XDMCP%%share/icons/hicolor/scalable/emblems/remmina-xdmcp-symbolic.svg
share/icons/hicolor/scalable/panel/remmina-panel-inverted.svg
share/icons/hicolor/scalable/panel/remmina-panel.svg
%%NLS%%share/locale/ar/LC_MESSAGES/remmina.mo
@@ -143,6 +164,7 @@ share/mime/packages/remmina-mime.xml
%%DATADIR%%/external_tools/remmina_nslookup.sh
%%DATADIR%%/external_tools/remmina_ping.sh
%%DATADIR%%/external_tools/remmina_traceroute.sh
+%%WWW%%%%DATADIR%%/res/www-js.js
%%DATADIR%%/theme/3024 Day.colors
%%DATADIR%%/theme/3024 Night.colors
%%DATADIR%%/theme/AdventureTime.colors
More information about the svn-ports-head
mailing list