deskutils/cairo-dock-plugins: Update version 3.4.1=>3.5.0

- Pet port{clippy|fmt}
- Return to pool

Changelog: https://github.com/Cairo-Dock/cairo-dock-plug-ins/releases/tag/3.5.0

3 files changed, 65 insertions, 90 deletions

diff --git a/deskutils/cairo-dock-plugins/Makefile b/deskutils/cairo-dock-plugins/Makefile
index 2c63293b05b6..0678296a74c5 100644
--- a/deskutils/cairo-dock-plugins/Makefile
+++ b/deskutils/cairo-dock-plugins/Makefile
@@ -1,123 +1,104 @@
 PORTNAME=	cairo-dock-plugins
-PORTVERSION=	3.4.1
-PORTREVISION=	14
+DISTVERSION=	3.5.0
 CATEGORIES=	deskutils
 
-PATCH_SITES=	https://github.com/Cairo-Dock/cairo-dock-plug-ins/commit/
-PATCHFILES=	d08541a0afb4377ce2f35feb280fbe443870b587.patch:-p1
-
-MAINTAINER=	bofh@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Cairo-Dock-Plugins for Cairo-Dock
 WWW=		https://www.glx-dock.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libgldi.so:deskutils/cairo-dock
+LIB_DEPENDS=	libcurl.so:ftp/curl \
+		libdbus-1.so:devel/dbus \
+		libdbus-glib-1.so:devel/dbus-glib \
+		libgldi.so:deskutils/cairo-dock \
+		libharfbuzz.so:print/harfbuzz \
+		libwayland-client.so:graphics/wayland
 RUN_DEPENDS=	wget:ftp/wget
 
-USES=		cmake gettext gnome localbase:ldflags pkgconfig python xorg
+USES=		cmake gettext gl gnome localbase:ldflags pkgconfig python ssl \
+		xorg
 USE_GITHUB=	yes
 GH_ACCOUNT=	Cairo-Dock
 GH_PROJECT=	cairo-dock-plug-ins
-USE_GNOME=	glib20 gtk30 librsvg2 libxml2
+USE_GL=		gl glu opengl
+USE_GNOME=	cairo glib20 gtk30 librsvg2 libxml2
 USE_LDCONFIG=	yes
-USE_XORG=	xrender
-
-CMAKE_ARGS=	-DROOT_PREFIX:PATH=${STAGEDIR} \
-		-Denable-weblets:BOOL=FALSE
+USE_XORG=	x11 xcomposite xrandr xrender xtst
 
-GNU_CONFIGURE=	yes
+CMAKE_ARGS=	-Denable-mono-interface:BOOL=FALSE \
+		-Denable-python-interface:BOOL=FALSE \
+		-Denable-ruby-interface:BOOL=FALSE \
+		-Denable-vala-interface:BOOL=FALSE \
+		-Denable-weblets:BOOL=FALSE \
+		-DROOT_PREFIX:PATH=${STAGEDIR}
 
 DATADIR=	${PREFIX}/share/cairo-dock
 
 PLIST_SUB=	PYVER="${PYTHON_VERSION:S/thon//}"
 
 OPTIONS_DEFAULT=	GMENU
-OPTIONS_GROUP=		INTEGR PLUGINS ADDON TPI
+OPTIONS_GROUP=		ADDON INTEGR PLUGINS
 OPTIONS_GROUP_ADDON=	EXIF ICAL UPOWER
 OPTIONS_GROUP_INTEGR=	GNOME_INTEGRATION XFCE_INTEGRATION
-OPTIONS_GROUP_PLUGINS=	ALSA_MIXER GMENU IMPULSE KEYBOARD_INDICATOR \
-			MAIL SOUND_EFFECTS XGAMMA ZEITGEIST
-#OPTIONS_GROUP_TPI=	PYTHON RUBY MONO VALA
+OPTIONS_GROUP_PLUGINS=	ALSA_MIXER GMENU IMPULSE KEYBOARD_INDICATOR MAIL \
+			SOUND_EFFECTS XGAMMA ZEITGEIST
 OPTIONS_SUB=		yes
 
-ADDON_DESC=		Add On
-ALSA_MIXER_DESC=	Alsa-Mixer applet
-EXIF_DESC=		Read file meta-data
-GMENU_DESC=		GMenu applet
-GNOME_INTEGRATION_DESC=	GNOME integration support
-ICAL_DESC=		IETF Calendaring and Scheduling protocols
-IMPULSE_DESC=		Impulse applet
-INTEGR_DESC=		Integration plug-ins
-KEYBOARD_INDICATOR_DESC=	 Keyboard-indicator applet
-MAIL_DESC=		Mail applet
-#MONO_DESC=		Mono interface
-PLUGINS_DESC=		Plug-ins
-#PYTHON_DESC=		Python interface
-#RUBY_DESC=		Ruby interface
-SOUND_EFFECTS_DESC=	Sound Effects applet
-#TERMINAL_DESC=		Terminal applet
-#TPI_DESC=		Third Party Interfaces
-UPOWER_DESC=		D-Bus daemon for power management tasks
-#VALA_DESC=		Vala interface
-XFCE_INTEGRATION_DESC=	XFCE integration support
-XGAMMA_DESC=		Xgamma applet
-ZEITGEIST_DESC=		User logs activities
-
-ALSA_MIXER_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-ALSA_MIXER_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
-ALSA_MIXER_CMAKE_BOOL=	enable-alsa-mixer
-EXIF_LIB_DEPENDS=	libexif.so:graphics/libexif
-EXIF_CMAKE_BOOL=	enable-exif-support
-GMENU_LIB_DEPENDS=	libgnome-menu-3.so:x11/gnome-menus
-GMENU_CMAKE_BOOL=	enable-gmenu
-#GNOME_INTEGRATION_LIB_DEPENDS=
+ADDON_DESC=			Add On
+ALSA_MIXER_DESC=		Alsa-Mixer applet
+EXIF_DESC=			Read file meta-data
+GMENU_DESC=			GMenu applet
+GNOME_INTEGRATION_DESC=		GNOME integration support
+ICAL_DESC=			IETF Calendaring and Scheduling protocols
+IMPULSE_DESC=			Impulse applet
+INTEGR_DESC=			Integration plug-ins
+KEYBOARD_INDICATOR_DESC=	Keyboard-indicator applet
+MAIL_DESC=			Mail applet
+PLUGINS_DESC=			Plug-ins
+SOUND_EFFECTS_DESC=		Sound Effects applet
+UPOWER_DESC=			D-Bus daemon for power management tasks
+XFCE_INTEGRATION_DESC=		XFCE integration support
+XGAMMA_DESC=			Xgamma applet
+ZEITGEIST_DESC=			User logs activities
+
+ALSA_MIXER_LIB_DEPENDS=		libasound.so:audio/alsa-lib
+ALSA_MIXER_RUN_DEPENDS=		${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
+ALSA_MIXER_CMAKE_BOOL=		enable-alsa-mixer
+EXIF_LIB_DEPENDS=		libexif.so:graphics/libexif
+EXIF_CMAKE_BOOL=		enable-exif-support
+GMENU_LIB_DEPENDS=		libgnome-menu-3.so:x11/gnome-menus
+GMENU_CMAKE_BOOL=		enable-gmenu
 GNOME_INTEGRATION_CMAKE_BOOL=	enable-gnome-integration
-ICAL_LIB_DEPENDS=	libical.so:devel/libical
-ICAL_CMAKE_BOOL=	enable-ical-support
-IMPULSE_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
-IMPULSE_CMAKE_BOOL=	enable-impulse
+ICAL_LIB_DEPENDS=		libical.so:devel/libical
+ICAL_CMAKE_BOOL=		enable-ical-support
+IMPULSE_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
+IMPULSE_CMAKE_BOOL=		enable-impulse
 KEYBOARD_INDICATOR_LIB_DEPENDS=	libexif.so:graphics/libexif \
 				libxklavier.so:x11/libxklavier
 KEYBOARD_INDICATOR_CMAKE_BOOL=	enable-keyboard-indicator
-# libetpan 1.9.4 replaces libetpan-config with libetpan.pc
-MAIL_BUILD_DEPENDS=	libetpan>=1.9.4:mail/libetpan
-MAIL_LIB_DEPENDS=	libetpan.so:mail/libetpan
-MAIL_CMAKE_BOOL=	enable-mail
-#MONO_BUILD_DEPENDS=	mono:lang/mono${MONO_DEFAULT}
-#MONO_RUN_DEPENDS=	mono:lang/mono${MONO_DEFAULT}
-#MONO_CMAKE_BOOL=	enable-mono-interface
-CMAKE_ARGS+=		-Denable-mono-interface:BOOL=FALSE
-#PYTHON_LIB_DEPENDS=
-#PYTHON_CMAKE_BOOL=	enable-python-interface
-CMAKE_ARGS+=		-Denable-python-interface:BOOL=FALSE
-#RUBY_LIB_DEPENDS=
-#RUBY_CMAKE_BOOL=	enable-ruby-interface
-CMAKE_ARGS+=		-Denable-ruby-interface:BOOL=FALSE
+MAIL_BUILD_DEPENDS=		libetpan>=1.9.4:mail/libetpan
+MAIL_LIB_DEPENDS=		libetpan.so:mail/libetpan
+MAIL_CMAKE_BOOL=		enable-mail
 SOUND_EFFECTS_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 SOUND_EFFECTS_RUN_DEPENDS=	${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:audio/alsa-plugins
 SOUND_EFFECTS_CMAKE_BOOL=	enable-sound-effects
-# Needs newer vte
-#TERMINAL_LIB_DEPENDS=	vte:x11-toolkits/vte
-#TERMINAL_CMAKE_BOOL=	enable-terminal
-UPOWER_LIB_DEPENDS=	libupower-glib.so:sysutils/upower
-UPOWER_CMAKE_BOOL=	enable-upower-support
-#VALA_LIB_DEPENDS=
-#VALA_CMAKE_BOOL=	enable-vala-interface
-CMAKE_ARGS+=		-Denable-vala-interface:BOOL=FALSE
+UPOWER_LIB_DEPENDS=		libupower-glib.so:sysutils/upower
+UPOWER_CMAKE_BOOL=		enable-upower-support
 XFCE_INTEGRATION_LIB_DEPENDS=	libexif.so:graphics/libexif
 XFCE_INTEGRATION_CMAKE_BOOL=	enable-xfce-integration
-XGAMMA_RUN_DEPENDS=	xgamma:x11/xgamma
-XGAMMA_CMAKE_BOOL=	enable-xgamma
-ZEITGEIST_LIB_DEPENDS=	libzeitgeist-2.0.so:sysutils/zeitgeist
-ZEITGEIST_CMAKE_BOOL=	enable-recent-events
+XGAMMA_RUN_DEPENDS=		xgamma:x11/xgamma
+XGAMMA_CMAKE_BOOL=		enable-xgamma
+ZEITGEIST_LIB_DEPENDS=		libzeitgeist-2.0.so:sysutils/zeitgeist
+ZEITGEIST_CMAKE_BOOL=		enable-recent-events
 
 ICONS_PACKAGE=	cairo-dock-plugins-png-icons
 
 .include <bsd.port.options.mk>
 
-.if ${OPSYS} == FreeBSD && ( ${OSVERSION} >= 1400079 || ( ${OSVERSION} >= 1302505 && ${OSVERSION} < 1400000 ))
+.if ${OPSYS} == FreeBSD && (${OSVERSION} >= 1400079 || (${OSVERSION} >= 1302505 && \
+	${OSVERSION} < 1400000))
 CFLAGS+=	-Wno-error=int-conversion
 .endif
 
@@ -131,9 +112,4 @@ post-patch:
 	     s|/usr/share/applications|${LOCALBASE}/share/applications|g; \
 	     s|/usr/share/cairo-dock|${LOCALBASE}/share/cairo-dock|g'
 
-#post-install:
-#.if defined(VALA)
-#	${MV} ${STAGEDIR}${PREFIX}/lib/pkgconfig/CDApplet.pc ${STAGEDIR}${PREFIX}/libdata/pkgconfig/
-#.endif
-
 .include <bsd.port.mk>
diff --git a/deskutils/cairo-dock-plugins/distinfo b/deskutils/cairo-dock-plugins/distinfo
index e24080937218..facc9b22ef9d 100644
--- a/deskutils/cairo-dock-plugins/distinfo
+++ b/deskutils/cairo-dock-plugins/distinfo
@@ -1,5 +1,3 @@
-TIMESTAMP = 1598613717
-SHA256 (Cairo-Dock-cairo-dock-plug-ins-3.4.1_GH0.tar.gz) = 321113fb8fa214d965c9827b82890651dc4cd0beb23aef0e2d3f5caf806ebdc2
-SIZE (Cairo-Dock-cairo-dock-plug-ins-3.4.1_GH0.tar.gz) = 7398005
-SHA256 (d08541a0afb4377ce2f35feb280fbe443870b587.patch) = 298f8dd8df6dd632b4b07e17be1cd204c5bb832153bfa43df077e029daddf989
-SIZE (d08541a0afb4377ce2f35feb280fbe443870b587.patch) = 5784
+TIMESTAMP = 1707240303
+SHA256 (Cairo-Dock-cairo-dock-plug-ins-3.5.0_GH0.tar.gz) = cf1ff262ee75ef69caa846a447de1738c8c5f3afa9fdbbdf9c51d623692f5636
+SIZE (Cairo-Dock-cairo-dock-plug-ins-3.5.0_GH0.tar.gz) = 7465207
diff --git a/deskutils/cairo-dock-plugins/pkg-plist b/deskutils/cairo-dock-plugins/pkg-plist
index 5015ad3eda3e..344eda2b5adf 100644
--- a/deskutils/cairo-dock-plugins/pkg-plist
+++ b/deskutils/cairo-dock-plugins/pkg-plist
@@ -453,6 +453,7 @@ lib/cairo-dock/libcd-wifi.so
 share/locale/ar/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/ca/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/cs/LC_MESSAGES/cairo-dock-plugins.mo
+share/locale/da/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/de/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/el/LC_MESSAGES/cairo-dock-plugins.mo
 share/locale/en/LC_MESSAGES/cairo-dock-plugins.mo