From 9c2567d7a75667c33975787f6fcbee7f2856aa07 Mon Sep 17 00:00:00 2001 From: Ben Woods Date: Tue, 24 Nov 2020 02:07:39 +0000 Subject: [PATCH] net/remmina: Create default and lite flavors net/remmina-plugin*: Remove individual plugin ports in favor of flavors --- MOVED | 10 ++ net/Makefile | 10 -- net/remmina-plugin-exec/Makefile | 13 --- net/remmina-plugin-exec/pkg-plist | 2 - net/remmina-plugin-nx/Makefile | 16 --- net/remmina-plugin-nx/pkg-plist | 2 - net/remmina-plugin-rdp/Makefile | 16 --- net/remmina-plugin-rdp/pkg-plist | 3 - net/remmina-plugin-secret/Makefile | 15 --- net/remmina-plugin-secret/pkg-plist | 1 - net/remmina-plugin-spice/Makefile | 13 --- net/remmina-plugin-spice/pkg-plist | 3 - net/remmina-plugin-st/Makefile | 18 --- net/remmina-plugin-st/pkg-plist | 1 - net/remmina-plugin-vnc/Makefile | 17 --- net/remmina-plugin-vnc/pkg-plist | 3 - net/remmina-plugin-www/Makefile | 15 --- net/remmina-plugin-www/pkg-plist | 3 - net/remmina-plugin-xdmcp/Makefile | 15 --- net/remmina-plugin-xdmcp/pkg-plist | 3 - net/remmina-plugins/Makefile | 50 --------- net/remmina-plugins/bsd.plugin.mk | 82 -------------- net/remmina-plugins/distinfo | 3 - net/remmina/Makefile | 105 +++++++++++++++++- net/remmina/pkg-descr | 19 +--- .../pkg-descr => remmina/pkg-descr-lite} | 6 + net/remmina/pkg-message | 13 --- net/remmina/pkg-plist | 22 ++++ 28 files changed, 142 insertions(+), 337 deletions(-) delete mode 100644 net/remmina-plugin-exec/Makefile delete mode 100644 net/remmina-plugin-exec/pkg-plist delete mode 100644 net/remmina-plugin-nx/Makefile delete mode 100644 net/remmina-plugin-nx/pkg-plist delete mode 100644 net/remmina-plugin-rdp/Makefile delete mode 100644 net/remmina-plugin-rdp/pkg-plist delete mode 100644 net/remmina-plugin-secret/Makefile delete mode 100644 net/remmina-plugin-secret/pkg-plist delete mode 100644 net/remmina-plugin-spice/Makefile delete mode 100644 net/remmina-plugin-spice/pkg-plist delete mode 100644 net/remmina-plugin-st/Makefile delete mode 100644 net/remmina-plugin-st/pkg-plist delete mode 100644 net/remmina-plugin-vnc/Makefile delete mode 100644 net/remmina-plugin-vnc/pkg-plist delete mode 100644 net/remmina-plugin-www/Makefile delete mode 100644 net/remmina-plugin-www/pkg-plist delete mode 100644 net/remmina-plugin-xdmcp/Makefile delete mode 100644 net/remmina-plugin-xdmcp/pkg-plist delete mode 100644 net/remmina-plugins/Makefile delete mode 100644 net/remmina-plugins/bsd.plugin.mk delete mode 100644 net/remmina-plugins/distinfo rename net/{remmina-plugins/pkg-descr => remmina/pkg-descr-lite} (58%) delete mode 100644 net/remmina/pkg-message diff --git a/MOVED b/MOVED index b953dc72b2e7..f6794333630b 100644 --- a/MOVED +++ b/MOVED @@ -15707,3 +15707,13 @@ www/py-requestbuilder||2020-11-15|Has expired: Uses deprecated version of python 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 diff --git a/net/Makefile b/net/Makefile index 1268a31c421b..3cf02d60a7f0 100644 --- a/net/Makefile +++ b/net/Makefile @@ -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 diff --git a/net/remmina-plugin-exec/Makefile b/net/remmina-plugin-exec/Makefile deleted file mode 100644 index c197654f2e4d..000000000000 --- a/net/remmina-plugin-exec/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# Created by: Ben Woods -# $FreeBSD$ - -PKGNAMESUFFIX= -exec - -COMMENT= Remmina plugin to execute a command - -USES= gnome -USE_GNOME= cairo - -MASTERDIR= ${.CURDIR}/../remmina-plugins - -.include "${MASTERDIR}/Makefile" diff --git a/net/remmina-plugin-exec/pkg-plist b/net/remmina-plugin-exec/pkg-plist deleted file mode 100644 index 624e892b83ed..000000000000 --- a/net/remmina-plugin-exec/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/remmina/plugins/remmina-plugin-exec.so -share/icons/hicolor/scalable/emblems/remmina-tool-symbolic.svg diff --git a/net/remmina-plugin-nx/Makefile b/net/remmina-plugin-nx/Makefile deleted file mode 100644 index a20a1319e3b7..000000000000 --- a/net/remmina-plugin-nx/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Koichiro IWAO -# $FreeBSD$ - -PKGNAMESUFFIX= -nx - -COMMENT= Remmina plugin for NX - -USES= gnome xorg -USE_GNOME= cairo -USE_XORG= x11 xkbfile - -MASTERDIR= ${.CURDIR}/../remmina-plugins - -LIB_DEPENDS= libssh.so:security/libssh - -.include "${MASTERDIR}/Makefile" diff --git a/net/remmina-plugin-nx/pkg-plist b/net/remmina-plugin-nx/pkg-plist deleted file mode 100644 index e25eb921b6f7..000000000000 --- a/net/remmina-plugin-nx/pkg-plist +++ /dev/null @@ -1,2 +0,0 @@ -lib/remmina/plugins/remmina-plugin-nx.so -share/icons/hicolor/scalable/emblems/remmina-nx-symbolic.svg diff --git a/net/remmina-plugin-rdp/Makefile b/net/remmina-plugin-rdp/Makefile deleted file mode 100644 index 7c924a91f80a..000000000000 --- a/net/remmina-plugin-rdp/Makefile +++ /dev/null @@ -1,16 +0,0 @@ -# Created by: Alexander Logvinov -# $FreeBSD$ - -PKGNAMESUFFIX= -rdp - -COMMENT= Remmina plugin for RDP protocol - -LIB_DEPENDS= libfreerdp2.so:net/freerdp - -USES= gnome xorg -USE_GNOME= cairo -USE_XORG= ice sm x11 xext - -MASTERDIR= ${.CURDIR}/../remmina-plugins - -.include "${MASTERDIR}/Makefile" diff --git a/net/remmina-plugin-rdp/pkg-plist b/net/remmina-plugin-rdp/pkg-plist deleted file mode 100644 index dd2d74761b0f..000000000000 --- a/net/remmina-plugin-rdp/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/remmina/plugins/remmina-plugin-rdp.so -share/icons/hicolor/scalable/emblems/remmina-rdp-symbolic.svg -share/icons/hicolor/scalable/emblems/remmina-rdp-ssh-symbolic.svg diff --git a/net/remmina-plugin-secret/Makefile b/net/remmina-plugin-secret/Makefile deleted file mode 100644 index 538b2881dc21..000000000000 --- a/net/remmina-plugin-secret/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# Created by: Koichiro IWAO -# $FreeBSD$ - -PKGNAMESUFFIX= -secret - -COMMENT= Remmina plugin for GNOME Keyring - -LIB_DEPENDS= libsecret-1.so:security/libsecret -RUN_DEPENDS= gnome-keyring:security/gnome-keyring - -USES+= gettext-runtime - -MASTERDIR= ${.CURDIR}/../remmina-plugins - -.include "${MASTERDIR}/Makefile" diff --git a/net/remmina-plugin-secret/pkg-plist b/net/remmina-plugin-secret/pkg-plist deleted file mode 100644 index d8e1aa4bf6c7..000000000000 --- a/net/remmina-plugin-secret/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -lib/remmina/plugins/remmina-plugin-secret.so diff --git a/net/remmina-plugin-spice/Makefile b/net/remmina-plugin-spice/Makefile deleted file mode 100644 index 297aa58278c5..000000000000 --- a/net/remmina-plugin-spice/Makefile +++ /dev/null @@ -1,13 +0,0 @@ -# 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" diff --git a/net/remmina-plugin-spice/pkg-plist b/net/remmina-plugin-spice/pkg-plist deleted file mode 100644 index 369ecd5dfd52..000000000000 --- a/net/remmina-plugin-spice/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -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 diff --git a/net/remmina-plugin-st/Makefile b/net/remmina-plugin-st/Makefile deleted file mode 100644 index 36d129feacf3..000000000000 --- a/net/remmina-plugin-st/Makefile +++ /dev/null @@ -1,18 +0,0 @@ -# Created by: Alexander Logvinov -# $FreeBSD$ - -PKGNAMESUFFIX= -st - -COMMENT= Remmina plugin for (Simple) Terminal use cases - -RUN_DEPENDS= ${LOCALBASE}/share/icons/hicolor/scalable/emblems/remmina-tool-symbolic.svg:net/remmina-plugin-exec # Shared icon file deleted below - -USES= gnome -USE_GNOME= cairo - -post-install: - ${RM} -rv ${STAGEDIR}${PREFIX}/share/icons - -MASTERDIR= ${.CURDIR}/../remmina-plugins - -.include "${MASTERDIR}/Makefile" diff --git a/net/remmina-plugin-st/pkg-plist b/net/remmina-plugin-st/pkg-plist deleted file mode 100644 index a00b02743728..000000000000 --- a/net/remmina-plugin-st/pkg-plist +++ /dev/null @@ -1 +0,0 @@ -lib/remmina/plugins/remmina-plugin-st.so diff --git a/net/remmina-plugin-vnc/Makefile b/net/remmina-plugin-vnc/Makefile deleted file mode 100644 index 6596f9a671ab..000000000000 --- a/net/remmina-plugin-vnc/Makefile +++ /dev/null @@ -1,17 +0,0 @@ -# Created by: Alexander Logvinov -# $FreeBSD$ - -PKGNAMESUFFIX= -vnc - -COMMENT= Remmina plugin for VNC protocol - -LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ - libgnutls.so:security/gnutls \ - libvncserver.so:net/libvncserver - -USES= gnome jpeg -USE_GNOME= cairo - -MASTERDIR= ${.CURDIR}/../remmina-plugins - -.include "${MASTERDIR}/Makefile" diff --git a/net/remmina-plugin-vnc/pkg-plist b/net/remmina-plugin-vnc/pkg-plist deleted file mode 100644 index a9fe27fd4aff..000000000000 --- a/net/remmina-plugin-vnc/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/remmina/plugins/remmina-plugin-vnc.so -share/icons/hicolor/scalable/emblems/remmina-vnc-ssh-symbolic.svg -share/icons/hicolor/scalable/emblems/remmina-vnc-symbolic.svg diff --git a/net/remmina-plugin-www/Makefile b/net/remmina-plugin-www/Makefile deleted file mode 100644 index 35b3b55cfc38..000000000000 --- a/net/remmina-plugin-www/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# Created by: Nick Wolff -# $FreeBSD$ - -PKGNAMESUFFIX= -www - -COMMENT= Remmina plugin to open an authenticated web-browser - -USES= compiler:c11 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" diff --git a/net/remmina-plugin-www/pkg-plist b/net/remmina-plugin-www/pkg-plist deleted file mode 100644 index f7cb28ba7ef0..000000000000 --- a/net/remmina-plugin-www/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/remmina/plugins/remmina-plugin-www.so -share/icons/hicolor/scalable/emblems/remmina-www-symbolic.svg -share/remmina/res/www-js.js diff --git a/net/remmina-plugin-xdmcp/Makefile b/net/remmina-plugin-xdmcp/Makefile deleted file mode 100644 index 3f2e6a23c906..000000000000 --- a/net/remmina-plugin-xdmcp/Makefile +++ /dev/null @@ -1,15 +0,0 @@ -# Created by: Alexander Logvinov -# $FreeBSD$ - -PKGNAMESUFFIX= -xdmcp - -COMMENT= Remmina plugin for XDMCP protocol - -RUN_DEPENDS= Xephyr:x11-servers/xephyr - -USES= gnome -USE_GNOME= cairo - -MASTERDIR= ${.CURDIR}/../remmina-plugins - -.include "${MASTERDIR}/Makefile" diff --git a/net/remmina-plugin-xdmcp/pkg-plist b/net/remmina-plugin-xdmcp/pkg-plist deleted file mode 100644 index f771fe310470..000000000000 --- a/net/remmina-plugin-xdmcp/pkg-plist +++ /dev/null @@ -1,3 +0,0 @@ -lib/remmina/plugins/remmina-plugin-xdmcp.so -share/icons/hicolor/scalable/emblems/remmina-xdmcp-ssh-symbolic.svg -share/icons/hicolor/scalable/emblems/remmina-xdmcp-symbolic.svg diff --git a/net/remmina-plugins/Makefile b/net/remmina-plugins/Makefile deleted file mode 100644 index 606368f5ec74..000000000000 --- a/net/remmina-plugins/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# Created by: Alexander Logvinov -# $FreeBSD$ - -PORTNAME?= remmina-plugins -DISTVERSION= 1.4.8 -CATEGORIES= net gnome - -MAINTAINER?= woodsb02@FreeBSD.org -COMMENT?= Remmina plugin system - -LICENSE?= GPLv2+ - -.if defined(PKGNAMESUFFIX) - -USE_GITLAB= yes -GL_ACCOUNT= Remmina -GL_PROJECT= Remmina -GL_COMMIT= 7ebc497062de66881b71bbe7f54dabfda0129ac2 - -.include "${.CURDIR}/../remmina-plugins/bsd.plugin.mk" - -.else - -USES= metaport - -OPTIONS_DEFINE= EXEC KEYRING NX RDP SPICE ST VNC WWW XDMCP -OPTIONS_DEFAULT= EXEC KEYRING NX RDP SPICE ST 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 - -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 -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 - -.endif diff --git a/net/remmina-plugins/bsd.plugin.mk b/net/remmina-plugins/bsd.plugin.mk deleted file mode 100644 index 98c8e1164133..000000000000 --- a/net/remmina-plugins/bsd.plugin.mk +++ /dev/null @@ -1,82 +0,0 @@ -# $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 gnome localbase:ldflags pkgconfig -USE_GNOME+= atk gdkpixbuf2 glib20 gtk30 pango -USE_LDCONFIG= yes -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 - -.include - -PLIST= ${.CURDIR}/pkg-plist - -post-patch: -# Do not build remmina core program - ${REINPLACE_CMD} -e '/add_subdirectory(src)/d' ${WRKSRC}/CMakeLists.txt - ${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 - ${REINPLACE_CMD} -e '/add_subdirectory(nx)/d' ${WRKSRC}/plugins/CMakeLists.txt -.endif -.if ${PKGNAMESUFFIX:S,-,,} != "rdp" - ${REINPLACE_CMD} -e '/find_suggested_package(FREERDP)/d' ${WRKSRC}/plugins/CMakeLists.txt - ${REINPLACE_CMD} -e '/add_subdirectory(rdp)/d' ${WRKSRC}/plugins/CMakeLists.txt -.endif -.if ${PKGNAMESUFFIX:S,-,,} != "secret" - ${REINPLACE_CMD} -e '/add_subdirectory(plugins\/secret)/d' ${WRKSRC}/CMakeLists.txt -.endif -.if ${PKGNAMESUFFIX:S,-,,} != "spice" - ${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 -.endif -.if ${PKGNAMESUFFIX:S,-,,} != "vnc" - ${REINPLACE_CMD} -e '/find_suggested_package(GCRYPT)/d' ${WRKSRC}/CMakeLists.txt - ${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 - -.include -.endif diff --git a/net/remmina-plugins/distinfo b/net/remmina-plugins/distinfo deleted file mode 100644 index 5119a3736cd7..000000000000 --- a/net/remmina-plugins/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1604554184 -SHA256 (Remmina-Remmina-7ebc497062de66881b71bbe7f54dabfda0129ac2_GL0.tar.gz) = c567f54c71c5d706bcda93f04f28c795699fc35f06ca625533b88150b7edde4e -SIZE (Remmina-Remmina-7ebc497062de66881b71bbe7f54dabfda0129ac2_GL0.tar.gz) = 2001351 diff --git a/net/remmina/Makefile b/net/remmina/Makefile index bbce00eae56e..86f6fbe11ce2 100644 --- a/net/remmina/Makefile +++ b/net/remmina/Makefile @@ -3,6 +3,7 @@ PORTNAME= remmina DISTVERSION= 1.4.8 +PORTREVISION= 1 CATEGORIES= net gnome MAINTAINER= woodsb02@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 diff --git a/net/remmina/pkg-descr b/net/remmina/pkg-descr index 1be69949db27..5aaf37111995 100644 --- a/net/remmina/pkg-descr +++ b/net/remmina/pkg-descr @@ -3,20 +3,11 @@ system administrators and travellers, who need to work with lots of remote 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/ diff --git a/net/remmina-plugins/pkg-descr b/net/remmina/pkg-descr-lite similarity index 58% rename from net/remmina-plugins/pkg-descr rename to net/remmina/pkg-descr-lite index a9ff3ff59ef2..632b47a0ae5b 100644 --- a/net/remmina-plugins/pkg-descr +++ b/net/remmina/pkg-descr-lite @@ -3,4 +3,10 @@ system administrators and travellers, who need to work with lots of remote computers in front of either large monitors or tiny netbooks. Remmina supports multiple network protocols in an integrated and consistant user interface. +Remmina includes support for the following network protocols: +* RDP, VNC, SPICE, NX, XDMCP, SSH, SFTP + +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/ diff --git a/net/remmina/pkg-message b/net/remmina/pkg-message deleted file mode 100644 index 5809eac5bf97..000000000000 --- a/net/remmina/pkg-message +++ /dev/null @@ -1,13 +0,0 @@ -[ -{ type: install -[ -{ - type: install - message: <