audio/xfce4-mixer: Update to 4.18.2

- Remove upstreamed patch
- Cleanup Makefile

4 files changed, 10 insertions, 24 deletions

diff --git a/audio/xfce4-mixer/Makefile b/audio/xfce4-mixer/Makefile
index d6d7589cb2b3..72ef84ec610b 100644
--- a/audio/xfce4-mixer/Makefile
+++ b/audio/xfce4-mixer/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	xfce4-mixer
-PORTVERSION=	4.18.1
-PORTREVISION=	5
+PORTVERSION=	4.18.2
 CATEGORIES=	audio xfce
 MASTER_SITES=	XFCE/apps
 DIST_SUBDIR=	xfce4
@@ -16,20 +15,19 @@ LIB_DEPENDS=	libharfbuzz.so:print/harfbuzz
 FLAVORS=	lite full
 FLAVOR?=	${FLAVORS:[1]}
 
-lite_CONFLICTS_INSTALL=		xfce4-mixer-full
-
 full_PKGNAMESUFFIX=		-full
 full_CONFLICTS_INSTALL=		xfce4-mixer
 
+lite_CONFLICTS_INSTALL=		xfce4-mixer-full
+
 USES=		compiler:c11 gettext-tools gmake gnome gstreamer libtool \
 		pkgconfig tar:bzip2 xfce xorg
-USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30 intltool
+USE_GNOME=	cairo gdkpixbuf2 glib20 gtk30
 USE_GSTREAMER=	good
 USE_XFCE=	libmenu panel xfconf
 USE_XORG=	x11
 
 GNU_CONFIGURE=	yes
-GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=		KEYBINDER NLS
@@ -42,10 +40,11 @@ OPTIONS_SUB=		yes
 OPTIONS_DEFAULT+=	ALSA KEYBINDER PULSEAUDIO SNDIO
 .endif
 
+KEYBINDER_DESC=			Multimedia keyboard shortcuts
+
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CONFIGURE_ENABLE=	alsa
 
-KEYBINDER_DESC=			Multimedia keyboard shortcuts
 KEYBINDER_LIB_DEPENDS=		libkeybinder-3.0.so:x11/keybinder-gtk3
 KEYBINDER_CONFIGURE_ENABLE=	keybinder
 
diff --git a/audio/xfce4-mixer/distinfo b/audio/xfce4-mixer/distinfo
index 7163c3ec4837..d6a8029d78d1 100644
--- a/audio/xfce4-mixer/distinfo
+++ b/audio/xfce4-mixer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1682981050
-SHA256 (xfce4/xfce4-mixer-4.18.1.tar.bz2) = b27f67dccc9dd67d989b405dab02be1299436dd71b58edb88a1d5f82571ead95
-SIZE (xfce4/xfce4-mixer-4.18.1.tar.bz2) = 525708
+TIMESTAMP = 1735173172
+SHA256 (xfce4/xfce4-mixer-4.18.2.tar.bz2) = 101580c15bfe7fe430a149da3603357558b7d0a66258dfdb78d04c1bf3c791a1
+SIZE (xfce4/xfce4-mixer-4.18.2.tar.bz2) = 613529
diff --git a/audio/xfce4-mixer/files/patch-libxfce4mixer_oss_oss-mixer.c b/audio/xfce4-mixer/files/patch-libxfce4mixer_oss_oss-mixer.c
deleted file mode 100644
index 9ee7e88edf01..000000000000
--- a/audio/xfce4-mixer/files/patch-libxfce4mixer_oss_oss-mixer.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libxfce4mixer/oss/oss-mixer.c.orig	2022-11-29 19:59:39 UTC
-+++ libxfce4mixer/oss/oss-mixer.c
-@@ -80,7 +80,8 @@ gst_mixer_oss_get_mixer_flags (GstMixer *mixer)
- }
- 
- 
--static void gst_mixer_oss_set_volume (GstMixer *mixer, GstMixerTrack *track, gint *volumes)
-+static void
-+gst_mixer_oss_set_volume (GstMixer *mixer, GstMixerTrack *track, gint num_channels, gint *volumes)
- {
-   int vol;
-   int l = volumes[0], r = volumes[1];
diff --git a/audio/xfce4-mixer/pkg-plist b/audio/xfce4-mixer/pkg-plist
index a552ac8f35ee..0f025b283a53 100644
--- a/audio/xfce4-mixer/pkg-plist
+++ b/audio/xfce4-mixer/pkg-plist
@@ -14,6 +14,7 @@ share/applications/xfce4-mixer.desktop
 %%NLS%%share/locale/en_CA/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/en_GB/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/es/LC_MESSAGES/xfce4-mixer.mo
+%%NLS%%share/locale/et/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/eu/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/fa_IR/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/fi/LC_MESSAGES/xfce4-mixer.mo
@@ -59,8 +60,6 @@ share/applications/xfce4-mixer.desktop
 %%NLS%%share/locale/zh_HK/LC_MESSAGES/xfce4-mixer.mo
 %%NLS%%share/locale/zh_TW/LC_MESSAGES/xfce4-mixer.mo
 share/man/man1/xfce4-mixer.1.gz
-share/pixmaps/xfce4-mixer/chain-broken.png
-share/pixmaps/xfce4-mixer/chain.png
 share/xfce4/mixer/icons/hicolor/16x16/status/audio-input-microphone-muted.png
 share/xfce4/mixer/icons/hicolor/scalable/status/audio-input-microphone-muted.svg
 share/xfce4/panel/plugins/mixer.desktop