update to 1.2.10

changes:
-bugfixes
-IPv6 support integrated
-new translations
-minor feature additions

25 files changed, 31 insertions, 760 deletions

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index aa310b3f006..4d225e77ef8 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.53 2003/12/08 14:41:39 wiz Exp $
+# $NetBSD: Makefile,v 1.54 2004/05/06 14:48:57 drochner Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		10
-
 CONFIGURE_ARGS+=	--disable-esd
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common
index 60764a0b930..b7bbe2913e4 100644
--- a/audio/xmms/Makefile.common
+++ b/audio/xmms/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.7 2004/04/12 10:23:24 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/05/06 14:48:57 drochner Exp $
 #
 
-DISTNAME=	xmms-1.2.7
+DISTNAME=	xmms-1.2.10
 CATEGORIES=	audio
-MASTER_SITES=	ftp://ftp.xmms.org/pub/xmms/1.2.x/ \
+MASTER_SITES=	http://www.xmms.org/files/1.2.x/ \
 		ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/
 
 MAINTAINER=	rh@NetBSD.org
diff --git a/audio/xmms/PLIST.common b/audio/xmms/PLIST.common
index cf12b27f68c..f845b0693fd 100644
--- a/audio/xmms/PLIST.common
+++ b/audio/xmms/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.1 2003/09/25 05:36:33 grant Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2004/05/06 14:48:57 drochner Exp $
 bin/wmxmms
 bin/xmms
 bin/xmms-config
@@ -13,8 +13,8 @@ include/xmms/xmmsctrl.h
 lib/libxmms.a
 lib/libxmms.la
 lib/libxmms.so
-lib/libxmms.so.3
-lib/libxmms.so.3.1
+lib/libxmms.so.4
+lib/libxmms.so.4.1
 lib/xmms/Effect/libecho.la
 lib/xmms/Effect/libecho.so
 lib/xmms/Effect/libstereo.la
@@ -27,8 +27,6 @@ lib/xmms/General/libsong_change.la
 lib/xmms/General/libsong_change.so
 lib/xmms/Input/libcdaudio.la
 lib/xmms/Input/libcdaudio.so
-lib/xmms/Input/libidcin.la
-lib/xmms/Input/libidcin.so
 lib/xmms/Input/libmikmod.la
 lib/xmms/Input/libmikmod.so
 lib/xmms/Input/libmpg123.la
@@ -43,27 +41,34 @@ lib/xmms/Output/${LIBAUDIO}.la
 lib/xmms/Output/${LIBAUDIO}.so
 lib/xmms/Output/libdisk_writer.la
 lib/xmms/Output/libdisk_writer.so
+lib/xmms/Output/libsun.la
+lib/xmms/Output/libsun.so
 lib/xmms/Visualization/libbscope.la
 lib/xmms/Visualization/libbscope.so
 lib/xmms/Visualization/libogl_spectrum.la
 lib/xmms/Visualization/libogl_spectrum.so
 lib/xmms/Visualization/libsanalyzer.la
 lib/xmms/Visualization/libsanalyzer.so
-man/man1/gnomexmms.1
 man/man1/wmxmms.1
 man/man1/xmms.1
 share/aclocal/xmms.m4
 ${PKGLOCALEDIR}/locale/af/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/be/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/en/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/xmms.mo
@@ -72,9 +77,12 @@ ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/ka/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xmms.mo
@@ -84,15 +92,19 @@ ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/tg/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/th/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/uz/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/xmms.mo
-${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xmms.mo
 share/xmms/wmxmms.xpm
 @dirrm share/xmms
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index e5447359352..355094ad818 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1,25 +1,5 @@
-$NetBSD: distinfo,v 1.16 2004/04/23 15:28:13 xtraeme Exp $
+$NetBSD: distinfo,v 1.17 2004/05/06 14:48:57 drochner Exp $
 
-SHA1 (xmms-1.2.7.tar.gz) = 2f910d88af9bb5e8d54e796653beef969b555c68
-Size (xmms-1.2.7.tar.gz) = 2860908 bytes
-SHA1 (patch-aa) = 06743383b9167082ca7596c12e751aaa1a3f36b6
-SHA1 (patch-ab) = 6f236de07dcd7ce8a2325effe038e42ea4222250
-SHA1 (patch-ac) = 4c3dc43fd83bacfacd376235d3723aeee96570f2
-SHA1 (patch-ad) = 7645b1a2bbb338c9bea8b2015d5763486f77d16a
-SHA1 (patch-af) = 472e2504fae530b34785e18d38d6f45891494a6d
-SHA1 (patch-ag) = 24a56ba54752994806518872d03709559f5ac620
-SHA1 (patch-ah) = 4633394e7d8c8db458e003090cbfe1727c7a3d05
-SHA1 (patch-ai) = 534fe71062cb38d35089b94af7a186255864e82f
-SHA1 (patch-aj) = 95e965c5033dea5d2b0be2a22058f19504da0031
-SHA1 (patch-ak) = 83f26d8d0a80def2ee28aa09f3261ff97d019dbf
-SHA1 (patch-al) = db49a60f6fa27879c2eb9d4738c4e03f5da948a8
-SHA1 (patch-am) = eb86d881c229b73e37efc1e6fec7d806699fc2c2
-SHA1 (patch-an) = e4169817fbdd978dd8c97cafa3447df277e53ecf
-SHA1 (patch-ao) = 666eeb2d55c3ee6881a4d482f33bc1284d7f3455
-SHA1 (patch-ap) = 493a4d81960b4d11548b8f277c00b8315339ac02
-SHA1 (patch-aq) = 3eb19fbebfc0ea68cd6703b6b3d1a706406b1aee
-SHA1 (patch-ar) = ef35ce733dceac323119b5bbb3065164fac87c74
-SHA1 (patch-as) = 1f62167c7901e8d2211f39a25e6f902935a413b1
-SHA1 (patch-at) = e95b1cc83944a388d74d6968852fa6e3e6f9d5a4
-SHA1 (patch-au) = 7e68b5de230003d40399c7a2aa2b2264e033803f
-SHA1 (patch-av) = 773baf830f687510854190b901b9752fb927f1b5
+SHA1 (xmms-1.2.10.tar.gz) = 8bfedb208c12788546dd59e91d103aac46e82bb0
+Size (xmms-1.2.10.tar.gz) = 4034832 bytes
+SHA1 (patch-aa) = 23eb5917abc23b56275b6ad96f90762531e52cab
diff --git a/audio/xmms/patches/patch-aa b/audio/xmms/patches/patch-aa
index da61e84483d..ff94f047711 100644
--- a/audio/xmms/patches/patch-aa
+++ b/audio/xmms/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2004/04/23 15:28:13 xtraeme Exp $
+$NetBSD: patch-aa,v 1.8 2004/05/06 14:48:57 drochner Exp $
 
---- Input/cdaudio/cdaudio.c.orig	2004-04-23 17:20:46.000000000 +0200
-+++ Input/cdaudio/cdaudio.c	2004-04-23 17:23:52.000000000 +0200
-@@ -214,7 +214,11 @@
+--- Input/cdaudio/cdaudio.c.orig	2004-05-06 17:52:36.000000000 +0200
++++ Input/cdaudio/cdaudio.c	2004-05-06 17:54:45.000000000 +0200
+@@ -305,7 +305,11 @@
   	FILE *mounts;
   	struct mntent *mnt;
  #elif defined(HAVE_GETMNTINFO)
@@ -14,65 +14,3 @@ $NetBSD: patch-aa,v 1.7 2004/04/23 15:28:13 xtraeme Exp $
   	int entries;
  #endif
  
-@@ -398,7 +402,7 @@
- 	if (cdda_fd < 0)
- 		return;
- 
--	ioctl(cdda_fd, XMMS_PAUSE);
-+	ioctl(cdda_fd, XMMS_PAUSE, 0);
- 	close(cdda_fd);
- 	cdda_fd = -1;
- 	stop_timeout_id = gtk_timeout_add(STOP_DELAY * 100, stop_timeout, NULL);
-@@ -409,11 +413,11 @@
- 	if (p)
- 	{
- 		pause_time = get_time();
--		ioctl(cdda_fd, XMMS_PAUSE);
-+		ioctl(cdda_fd, XMMS_PAUSE, 0);
- 	}
- 	else
- 	{
--		ioctl(cdda_fd, XMMS_RESUME);
-+		ioctl(cdda_fd, XMMS_RESUME, 0);
- 		pause_time = -1;
- 	}
- 	is_paused = p;
-@@ -554,9 +558,11 @@
- 	struct cd_sub_channel_info subinfo;
- 	subchnl.address_format = CD_MSF_FORMAT;
- 	subchnl.data_format = CD_CURRENT_POSITION;
-+	subchnl.track = 0;
- 	subchnl.data_len = sizeof(subinfo);
- 	subchnl.data = &subinfo;
--	ioctl(cdda_fd, CDIOCREADSUBCHANNEL, &subchnl);
-+	if (ioctl(cdda_fd, CDIOCREADSUBCHANNEL, &subchnl))
-+		return (-1);
- 
- 	return(LBA(subchnl.data->what.position.absaddr.msf));
- }
-@@ -591,6 +597,7 @@
- {
- 	struct ioc_toc_header tochdr;
- 	struct ioc_read_toc_entry tocentry;
-+	struct cd_toc_entry tocentrydata;
- 	int i;
- 
- 	if (ioctl(fd, CDIOREADTOCHEADER, &tochdr))
-@@ -601,6 +608,8 @@
- 		tocentry.address_format = CD_MSF_FORMAT;
- 
- 		tocentry.starting_track = i;
-+		tocentry.data = &tocentrydata;
-+		tocentry.data_len = sizeof(tocentrydata);
- 		if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry))
- 			return FALSE;
- 		info->track[i].minute =
-@@ -617,6 +626,8 @@
- 	tocentry.address_format = CD_MSF_FORMAT;
- 
- 	tocentry.starting_track = 0xAA;
-+	tocentry.data = &tocentrydata;
-+	tocentry.data_len = sizeof(tocentrydata);
- 	if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry))
- 		return FALSE;
- 	info->leadout.minute = tocentry.data->addr.msf.minute;
diff --git a/audio/xmms/patches/patch-ab b/audio/xmms/patches/patch-ab
deleted file mode 100644
index 8ac84feb235..00000000000
--- a/audio/xmms/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2001/05/20 20:52:24 rh Exp $
-
---- Makefile.in.orig	Tue Nov 28 01:55:55 2000
-+++ Makefile.in
-@@ -152,7 +152,7 @@
- sidplay_library = @sidplay_library@
- xmmsdir = @xmmsdir@
- 
--SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms gnomexmms po
-+SUBDIRS = intl libxmms xmms Output Input Effect General Visualization wmxmms po
- 
- bin_SCRIPTS = xmms-config
- 
diff --git a/audio/xmms/patches/patch-ac b/audio/xmms/patches/patch-ac
deleted file mode 100644
index 48038e8b062..00000000000
--- a/audio/xmms/patches/patch-ac
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2002/10/14 09:46:59 rh Exp $
-
---- configure.orig	Tue Mar  5 07:57:01 2002
-+++ configure
-@@ -256,6 +256,8 @@ ac_help="$ac_help
-   --with-catgets          use catgets functions if available"
- ac_help="$ac_help
-   --enable-3dnow	  build with 3DNow! instructions support"
-+ac_help="$ac_help
-+  --enable-ipv6		  enable IPv6 support [default=no]"
- 
- # Initialize some variables set by options.
- # The variables have the same names as the options, with
-@@ -10622,8 +10624,33 @@ else
- fi
- 
- 
-+# Check whether --enable-ipv6 or --disable-ipv6 was given.
-+if test "${enable_ipv6+set}" = set; then
-+  enableval="$enable_ipv6"
-+  enable_ipv6=$enableval
-+else
-+  enable_ipv6=no
-+fi
-+
-+if test "x$enable_ipv6" = xyes; then
-+  cat >> confdefs.h <<\EOF
-+#define USE_IPV6 1
-+EOF
-+
-+fi
-+
-+
-+if test "x$enable_ipv6" = xyes; then
-+  USE_IPV6_TRUE=
-+  USE_IPV6_FALSE='#'
-+else
-+  USE_IPV6_TRUE='#'
-+  USE_IPV6_FALSE=
-+fi
-+
-+
- echo $ac_n "checking for socklen_t""... $ac_c" 1>&6
--echo "configure:10627: checking for socklen_t" >&5
-+echo "configure:10654: checking for socklen_t" >&5
- if eval "test \"`echo '$''{'xmms_cv_type_socklen_t'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -12254,6 +12281,9 @@ s%@OUTPUT_PLUGINS@%$OUTPUT_PLUGINS%g
- s%@VISUALIZATION_PLUGINS@%$VISUALIZATION_PLUGINS%g
- s%@USE_3DNOW_TRUE@%$USE_3DNOW_TRUE%g
- s%@USE_3DNOW_FALSE@%$USE_3DNOW_FALSE%g
-+s%@USE_IPV6_TRUE@%$USE_IPV6_TRUE%g
-+s%@USE_IPV6_FALSE@%$USE_IPV6_FALSE%g
-+s%@USE_IPV6@%$USE_IPV6%g
- s%@OSS_CFLAGS@%$OSS_CFLAGS%g
- s%@POSIX_LIBS@%$POSIX_LIBS%g
- s%@HAVE_OSS_TRUE@%$HAVE_OSS_TRUE%g
diff --git a/audio/xmms/patches/patch-ad b/audio/xmms/patches/patch-ad
deleted file mode 100644
index 3019b80626b..00000000000
--- a/audio/xmms/patches/patch-ad
+++ /dev/null
@@ -1,58 +0,0 @@
-$NetBSD: patch-ad,v 1.3 2002/10/14 09:47:00 rh Exp $
-
---- Input/cdaudio/http.c.orig	Fri Jul 21 18:54:17 2000
-+++ Input/cdaudio/http.c
-@@ -25,9 +25,45 @@
- gint http_open_connection(gchar * server, gint port)
- {
- 	gint sock;
-+#ifdef USE_IPV6
-+	struct addrinfo hints, *res, *res0;
-+	char service[6];
-+#else
- 	struct hostent *host;
- 	struct sockaddr_in address;
-+#endif
- 
-+#ifdef USE_IPV6
-+	snprintf(service, 6, "%d", port);
-+	memset(&hints, 0, sizeof(hints));
-+	hints.ai_socktype = SOCK_STREAM;
-+
-+	if (getaddrinfo(server, service, &hints, &res0))
-+		return 0;
-+
-+	for (res = res0; res; res = res->ai_next) {
-+		sock = socket (res->ai_family, res->ai_socktype, res->ai_protocol);
-+		if (sock < 0) {
-+			if (res->ai_next)
-+				continue;
-+			else {
-+				freeaddrinfo(res0);
-+				return 0;
-+			}
-+		}
-+		if (connect(sock, res->ai_addr, res->ai_addrlen) < 0) {
-+			if (res->ai_next) {
-+				close(sock);
-+				continue;
-+			} else {
-+				freeaddrinfo(res0);
-+				return 0;
-+			}
-+		}
-+		freeaddrinfo(res0);
-+		return sock;
-+	}
-+#else
- 	sock = socket(AF_INET, SOCK_STREAM, 0);
- 	address.sin_family = AF_INET;
- 
-@@ -40,6 +76,7 @@ gint http_open_connection(gchar * server
- 	if (connect(sock, (struct sockaddr *) &address, sizeof (struct sockaddr_in)) == -1)
- 		return 0;
- 
-+#endif
- 	return sock;
- }
- 
diff --git a/audio/xmms/patches/patch-af b/audio/xmms/patches/patch-af
deleted file mode 100644
index b72c00f7ae5..00000000000
--- a/audio/xmms/patches/patch-af
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-af,v 1.4 2001/05/20 20:52:24 rh Exp $
-
---- Output/OSS/audio.c.orig	Sat Jul 29 02:19:41 2000
-+++ Output/OSS/audio.c
-@@ -39,9 +39,22 @@
- 
- static void oss_calc_device_buffer_used(void)
- {
-+#if defined(__NetBSD__) && SOUND_VERSION <= 0x030000
-+	struct audio_info info;
-+#endif
- 	audio_buf_info buf_info;
- 	if(paused)
- 		device_buffer_used = 0;
-+#if defined(__NetBSD__) && SOUND_VERSION <= 0x030000
-+	/*
-+	  This is to work around a bug in NetBSD-1.5.1 and earlier, in which
-+	  the SNDCTL_DSP_GETOSPACE(&buf_info) ioctl was not handled properly.
-+	  The correct information is always available via the native audio
-+	  driver, so use that instead.
-+	*/
-+	else if (!ioctl(fd, AUDIO_GETINFO, &info))
-+		device_buffer_used = info.play.seek;
-+#endif
- 	else if (!ioctl(fd, SNDCTL_DSP_GETOSPACE, &buf_info))
- 		device_buffer_used = (buf_info.fragstotal * buf_info.fragsize) - buf_info.bytes;
- }
diff --git a/audio/xmms/patches/patch-ag b/audio/xmms/patches/patch-ag
deleted file mode 100644
index 3ef9ab05b72..00000000000
--- a/audio/xmms/patches/patch-ag
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2001/05/20 20:52:24 rh Exp $
-
---- Output/OSS/OSS.h.orig	Mon May  8 23:09:16 2000
-+++ Output/OSS/OSS.h
-@@ -31,6 +31,9 @@
- #elif defined(HAVE_MACHINE_SOUNDCARD_H)
- #include <machine/soundcard.h>
- #endif
-+#if defined(__NetBSD__) && SOUND_VERSION <= 0x030000
-+#include <sys/audioio.h>
-+#endif
- 
- #include <fcntl.h>
- #include <unistd.h>
diff --git a/audio/xmms/patches/patch-ah b/audio/xmms/patches/patch-ah
deleted file mode 100644
index fc70dccf01c..00000000000
--- a/audio/xmms/patches/patch-ah
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ah,v 1.6 2003/10/05 10:56:37 xtraeme Exp $
-
---- libxmms/util.c.orig	Sun Oct  5 12:46:32 2003
-+++ libxmms/util.c	Sun Oct  5 12:47:21 2003
-@@ -11,6 +11,7 @@
- #endif
- 
- #ifdef __FreeBSD__
-+#include <sys/types.h>
- #include <sys/sysctl.h>
- #endif
- 
-@@ -72,7 +73,7 @@
- 
- gboolean xmms_check_realtime_priority(void)
- {
--#ifdef HAVE_SCHED_SETSCHEDULER
-+#if !defined(__NetBSD__) && defined(HAVE_SCHED_SETSCHEDULER)
- #ifdef __FreeBSD__
- 	/*
- 	 * Check if priority scheduling is enabled in the kernel
diff --git a/audio/xmms/patches/patch-ai b/audio/xmms/patches/patch-ai
deleted file mode 100644
index 1061e9c7e0d..00000000000
--- a/audio/xmms/patches/patch-ai
+++ /dev/null
@@ -1,42 +0,0 @@
-$NetBSD: patch-ai,v 1.7 2003/04/17 23:14:13 nathanw Exp $
-
---- xmms/main.c.orig	2002-02-27 09:30:28.000000000 -0500
-+++ xmms/main.c	2003-04-16 15:41:12.000000000 -0400
-@@ -3377,7 +3377,7 @@
- {
- 	gchar *filename;
- 	struct cmdlineopt options;
--#if defined(HAVE_SCHED_SETSCHEDULER) && defined(HAVE_SCHED_GET_PRIORITY_MAX)
-+#if defined(HAVE_SCHED_SETSCHEDULER) && defined(HAVE_SCHED_GET_PRIORITY_MAX) && !defined(__NetBSD__)
- 	struct sched_param sparam;
- #endif
- 
-@@ -3387,7 +3387,9 @@
- #endif
- 
- 	signal(SIGPIPE, SIG_IGN); /* for controlsocket.c */
-+#if 0 /* XXXNJW This makes debugging nearly impossible. */
- 	signal(SIGSEGV, segfault_handler);
-+#endif
- 	g_thread_init(NULL);
- 	if (!g_thread_supported())
- 	{
-@@ -3408,7 +3410,7 @@
- 
- 	if (geteuid() == 0)
- 	{
--#if defined(HAVE_SCHED_SETSCHEDULER) && defined(HAVE_SCHED_GET_PRIORITY_MAX)
-+#if defined(HAVE_SCHED_SETSCHEDULER) && defined(HAVE_SCHED_GET_PRIORITY_MAX) && !defined(__NetBSD__)
- 		if (cfg.use_realtime)
- 		{
- 			sparam.sched_priority = sched_get_priority_max(SCHED_RR);
-@@ -3500,8 +3502,8 @@
- 
- 	/* enable_x11r5_session_management(argc, argv); */
- 	sm_init(argc, argv);
--	GDK_THREADS_LEAVE();
- 	gtk_main();
-+	GDK_THREADS_LEAVE();
- 
- 	return 0;
- }
diff --git a/audio/xmms/patches/patch-aj b/audio/xmms/patches/patch-aj
deleted file mode 100644
index bc129701825..00000000000
--- a/audio/xmms/patches/patch-aj
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2000/03/12 20:36:27 tron Exp $
---- Input/cdaudio/cdaudio.h.orig	Tue Jan 18 20:48:52 2000
-+++ Input/cdaudio/cdaudio.h	Sun Mar 12 16:46:40 2000
-@@ -56,7 +56,7 @@
- #define CD_FRAMES 75
- #endif
- 
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) || defined(__NetBSD__)
- /*
-  * FreeBSD won't be able to detect media changes if using O_NONBLOCK
-  */
-@@ -65,6 +65,9 @@
- #define CDOPENFLAGS (O_RDONLY | O_NONBLOCK)
- #endif
- 
-+#ifdef __NetBSD__
-+#include <machine/disklabel.h>
-+#endif
- 
- #define CDDB_DEFAULT_SERVER "freedb.freedb.org"
- 
diff --git a/audio/xmms/patches/patch-ak b/audio/xmms/patches/patch-ak
deleted file mode 100644
index bbf535dde65..00000000000
--- a/audio/xmms/patches/patch-ak
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ak,v 1.5 2002/03/21 18:52:32 drochner Exp $
-
---- wmxmms/Makefile.in.orig	Mon Mar  4 22:59:06 2002
-+++ wmxmms/Makefile.in	Thu Mar 21 12:59:57 2002
-@@ -190,7 +190,7 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I../xmms
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ @PTHREAD_LIBS@ @XML_LIBS@
- wmxmms_OBJECTS =  getopt.$(OBJEXT) getopt1.$(OBJEXT) wmxmms.$(OBJEXT)
- wmxmms_DEPENDENCIES =  $(top_builddir)/libxmms/libxmms.la
- wmxmms_LDFLAGS = 
diff --git a/audio/xmms/patches/patch-al b/audio/xmms/patches/patch-al
deleted file mode 100644
index 586dc72de11..00000000000
--- a/audio/xmms/patches/patch-al
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-al,v 1.7 2003/06/06 19:31:56 drochner Exp $
-
---- xmms/Makefile.in.orig	2002-03-04 22:58:25.000000000 +0100
-+++ xmms/Makefile.in	2003-06-06 20:49:31.000000000 +0200
-@@ -168,7 +168,7 @@
- 
- bin_PROGRAMS = xmms
- 
--xmms_LDFLAGS = -export-dynamic
-+xmms_LDFLAGS = -export-dynamic ${LINK_ALL_LIBGCC_HACK}
- xmms_LDADD =  @GTK_LIBS@ @PTHREAD_LIBS@ @SM_LIBS@ @VM_LIBS@ \
- @POSIX_LIBS@ $(top_builddir)/libxmms/libxmms.la @INTLLIBS@
- 
-@@ -235,7 +235,7 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I.
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
--LIBS = @LIBS@
-+LIBS = @LIBS@ @XML_LIBS@
- xmms_OBJECTS =  bmp.$(OBJEXT) skin.$(OBJEXT) util.$(OBJEXT) \
- output.$(OBJEXT) fft.$(OBJEXT) input.$(OBJEXT) effect.$(OBJEXT) \
- general.$(OBJEXT) visualization.$(OBJEXT) fullscreen.$(OBJEXT) \
diff --git a/audio/xmms/patches/patch-am b/audio/xmms/patches/patch-am
deleted file mode 100644
index 659d3e9d60e..00000000000
--- a/audio/xmms/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.4 2002/03/21 18:52:32 drochner Exp $
-
---- Output/OSS/Makefile.in.orig	Mon Mar  4 22:58:30 2002
-+++ Output/OSS/Makefile.in	Thu Mar 21 13:04:20 2002
-@@ -177,7 +177,7 @@
- libdir = $(plugindir)/$(OUTPUT_PLUGIN_DIR)
- 
- libOSS_la_LDFLAGS = @PLUGIN_LDFLAGS@
--libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@
-+libOSS_la_LIBADD = @GTK_LIBS@ @PTHREAD_LIBS@ ${LIBOSSAUDIO}
- libOSS_la_SOURCES = $(osssources)
- INCLUDES = @GTK_CFLAGS@ @OSS_CFLAGS@ -I$(top_builddir)/intl
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/audio/xmms/patches/patch-an b/audio/xmms/patches/patch-an
deleted file mode 100644
index 1fb46a3dfe1..00000000000
--- a/audio/xmms/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.5 2002/03/21 18:52:32 drochner Exp $
-
---- Input/cdaudio/Makefile.in.orig	Mon Mar  4 22:58:42 2002
-+++ Input/cdaudio/Makefile.in	Thu Mar 21 13:05:43 2002
-@@ -185,7 +185,7 @@
- 
- INCLUDES = @GTK_CFLAGS@ @XML_CFLAGS@ @OSS_CFLAGS@ -I$(top_builddir)/intl
- libcdaudio_la_LDFLAGS = @PLUGIN_LDFLAGS@
--libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@
-+libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@ ${LIBOSSAUDIO}
- libcdaudio_la_SOURCES = $(cdaudiosources)
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h ../../xmms/i18n.h
diff --git a/audio/xmms/patches/patch-ao b/audio/xmms/patches/patch-ao
deleted file mode 100644
index 832cafe9434..00000000000
--- a/audio/xmms/patches/patch-ao
+++ /dev/null
@@ -1,164 +0,0 @@
-$NetBSD: patch-ao,v 1.4 2002/10/14 09:47:00 rh Exp $
-
---- Input/mpg123/http.c.orig	Tue Jan  8 00:08:04 2002
-+++ Input/mpg123/http.c
-@@ -332,8 +332,13 @@ static void *http_buffer_loop(void *arg)
- 	gboolean redirect;
- 	int udp_sock = 0;
- 	fd_set set;
-+#ifdef USE_IPV6
-+	struct addrinfo hints, *res, *res0;
-+	char service[6];
-+#else
- 	struct hostent *hp;
- 	struct sockaddr_in address;
-+#endif
- 	struct timeval tv;
- 
- 	url = (gchar *) arg;
-@@ -355,6 +360,45 @@ static void *http_buffer_loop(void *arg)
- 		chost = mpg123_cfg.use_proxy ? mpg123_cfg.proxy_host : host;
- 		cport = mpg123_cfg.use_proxy ? mpg123_cfg.proxy_port : port;
- 
-+#ifdef USE_IPV6
-+		snprintf(service, 6, "%d", cport);
-+		memset(&hints, 0, sizeof(hints));
-+		hints.ai_socktype = SOCK_STREAM;
-+		if (! getaddrinfo(chost, service, &hints, &res0)) {
-+			eof = TRUE;
-+			for (res = res0; res; res = res->ai_next) {
-+				if ((sock = socket (res->ai_family, res->ai_socktype, res->ai_protocol)) < 0)
-+					continue;
-+				fcntl(sock, F_SETFL, O_NONBLOCK);
-+				status = g_strdup_printf(_("CONNECTING TO %s:%d"), chost, cport);
-+				mpg123_ip.set_info_text(status);
-+				g_free(status);
-+				((struct sockaddr_in6 *)res->ai_addr)->sin6_port = htons(cport);
-+				if (connect(sock, res->ai_addr, res->ai_addrlen) < 0) {
-+					if (errno != EINPROGRESS) {
-+						close(sock);
-+						continue;
-+					}
-+				}
-+				eof = FALSE;
-+				break;
-+			}
-+			freeaddrinfo(res0);
-+			if (eof) {
-+				status = g_strdup_printf(_("Couldn't connect to host %s:%d"), chost, cport);
-+				show_error_message(status);
-+				g_free(status);
-+				mpg123_ip.set_info_text(NULL);
-+			}
-+		} else {
-+			status = g_strdup_printf(_("Couldn't look up host %s"), chost);
-+			show_error_message(status);
-+			g_free(status);
-+
-+			mpg123_ip.set_info_text(NULL);
-+			eof = TRUE;
-+		}
-+#else
- 		sock = socket(AF_INET, SOCK_STREAM, 0);
- 		fcntl(sock, F_SETFL, O_NONBLOCK);
- 		address.sin_family = AF_INET;
-@@ -372,9 +416,11 @@ static void *http_buffer_loop(void *arg)
- 			mpg123_ip.set_info_text(NULL);
- 			eof = TRUE;
- 		}
-+#endif
- 
- 		if (!eof)
- 		{
-+#ifndef USE_IPV6
- 			memcpy(&address.sin_addr.s_addr, *(hp->h_addr_list), sizeof (address.sin_addr.s_addr));
- 			address.sin_port = g_htons(cport);
- 
-@@ -393,6 +439,7 @@ static void *http_buffer_loop(void *arg)
- 					eof = TRUE;
- 				}
- 			}
-+#endif
- 			while (going)
- 			{
- 				tv.tv_sec = 0;
-@@ -697,14 +744,23 @@ char *mpg123_http_get_title(char *url)
- /* Find a good local udp port and bind udp_sock to it, return the port */
- static int udp_establish_listener(int *sock)
- {
-+#ifdef USE_IPV6
-+	struct sockaddr_in6 sin;
-+	socklen_t sinlen = sizeof (struct sockaddr_in6);
-+#else
- 	struct sockaddr_in sin;
- 	socklen_t sinlen = sizeof (struct sockaddr_in);
-+#endif
- 	
- #ifdef DEBUG_UDP
- 	fprintf (stderr,"Establishing udp listener\n");
- #endif
- 	
-+#ifdef USE_IPV6
-+	if ((*sock = socket(AF_INET6, SOCK_DGRAM, 0)) < 0)
-+#else
- 	if ((*sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
-+#endif
- 	{
- 		g_log(NULL, G_LOG_LEVEL_CRITICAL,
- 		      "udp_establish_listener(): unable to create socket");
-@@ -712,8 +768,12 @@ static int udp_establish_listener(int *s
- 	}
- 
- 	memset(&sin, 0, sinlen);
-+#ifdef USE_IPV6
-+	sin.sin6_family = AF_INET6;
-+#else
- 	sin.sin_family = AF_INET;
- 	sin.sin_addr.s_addr = g_htonl(INADDR_ANY);
-+#endif
- 			
- 	if (bind(*sock, (struct sockaddr *)&sin, sinlen) < 0)
- 	{
-@@ -743,7 +803,11 @@ static int udp_establish_listener(int *s
- 	fprintf (stderr,"Listening on local %s:%d\n", inet_ntoa(sin.sin_addr), g_ntohs(sin.sin_port));
- #endif
- 	
-+#ifdef USE_IPV6
-+	return g_ntohs(sin.sin6_port);
-+#else
- 	return g_ntohs(sin.sin_port);
-+#endif
- }
- 
- static int udp_check_for_data(int sock)
-@@ -752,10 +816,14 @@ static int udp_check_for_data(int sock)
- 	char *valptr;
- 	gchar *title;
- 	gint len, i;
-+#ifdef USE_IPV6
-+	struct sockaddr_in6 from;
-+#else
- 	struct sockaddr_in from;
-+#endif
- 	socklen_t fromlen;
- 
--	fromlen = sizeof(struct sockaddr_in);
-+	fromlen = sizeof(from);
- 	
- 	if ((len = recvfrom(sock, buf, 1024, 0, (struct sockaddr *)&from, &fromlen)) < 0)
- 	{
-@@ -840,7 +908,14 @@ static int udp_check_for_data(int sock)
- #ifdef DEBUG_UDP
- 			else
- 				fprintf(stderr,"Sent ack: %s", obuf);
-+#ifdef USE_IPV6
-+{
-+			char adr[INET6_ADDRSTRLEN];
-+			inet_ntop(AF_INET6, &from.sin6_addr, adr, INET6_ADDRSTRLEN);
-+			fprintf (stderr,"Remote: [%s]:%d\n", adr, g_ntohs(from.sin6_port));
-+#else
- 			fprintf (stderr,"Remote: %s:%d\n", inet_ntoa(from.sin_addr), g_ntohs(from.sin_port));
-+#endif
- #endif
- 		}
- 	}
diff --git a/audio/xmms/patches/patch-ap b/audio/xmms/patches/patch-ap
deleted file mode 100644
index d84238bfc09..00000000000
--- a/audio/xmms/patches/patch-ap
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2001/05/20 20:52:25 rh Exp $
-
---- po/Makefile.in.in.orig	Sun May 20 18:00:16 2001
-+++ po/Makefile.in.in
-@@ -18,7 +18,7 @@
- 
- prefix = @prefix@
- exec_prefix = @exec_prefix@
--datadir = $(prefix)/@DATADIRNAME@
-+datadir = @datadir@
- localedir = $(datadir)/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
diff --git a/audio/xmms/patches/patch-aq b/audio/xmms/patches/patch-aq
deleted file mode 100644
index 242d0f01203..00000000000
--- a/audio/xmms/patches/patch-aq
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aq,v 1.1 2001/08/11 20:51:25 fredb Exp $
-
---- wmxmms/getopt.c.orig	Thu Jul 29 16:03:12 1999
-+++ wmxmms/getopt.c
-@@ -64,7 +64,7 @@
- 
- /* This needs to come after some library #include
-    to get __GNU_LIBRARY__ defined.  */
--#ifdef	__GNU_LIBRARY__
-+#if defined(__GNU_LIBRARY__) || defined(__NetBSD__)
- /* Don't include stdlib.h for non-GNU C libraries because some of them
-    contain conflicting prototypes for getopt.  */
- #include <stdlib.h>
-@@ -198,7 +198,7 @@
- /* Value of POSIXLY_CORRECT environment variable.  */
- static char *posixly_correct;
- 
--#ifdef	__GNU_LIBRARY__
-+#if defined(__GNU_LIBRARY__) || defined(__NetBSD__)
- /* We want to avoid inclusion of string.h with non-GNU libraries
-    because there are many ways it can cause trouble.
-    On some systems, it contains special magic macros that don't work
diff --git a/audio/xmms/patches/patch-ar b/audio/xmms/patches/patch-ar
deleted file mode 100644
index eb6a38e78ba..00000000000
--- a/audio/xmms/patches/patch-ar
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ar,v 1.1 2001/08/11 20:51:25 fredb Exp $
-
---- xmms/getopt.c.orig	Thu Jul 29 16:03:12 1999
-+++ xmms/getopt.c
-@@ -64,7 +64,7 @@
- 
- /* This needs to come after some library #include
-    to get __GNU_LIBRARY__ defined.  */
--#ifdef	__GNU_LIBRARY__
-+#if defined(__GNU_LIBRARY__) || defined(__NetBSD__)
- /* Don't include stdlib.h for non-GNU C libraries because some of them
-    contain conflicting prototypes for getopt.  */
- #include <stdlib.h>
-@@ -198,7 +198,7 @@
- /* Value of POSIXLY_CORRECT environment variable.  */
- static char *posixly_correct;
- 
--#ifdef	__GNU_LIBRARY__
-+#if defined(__GNU_LIBRARY__) || defined(__NetBSD__)
- /* We want to avoid inclusion of string.h with non-GNU libraries
-    because there are many ways it can cause trouble.
-    On some systems, it contains special magic macros that don't work
diff --git a/audio/xmms/patches/patch-as b/audio/xmms/patches/patch-as
deleted file mode 100644
index d148227d8cb..00000000000
--- a/audio/xmms/patches/patch-as
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-as,v 1.1 2002/03/21 18:52:33 drochner Exp $
-
---- xmms/pluginenum.c.orig	Thu Mar 21 17:00:30 2002
-+++ xmms/pluginenum.c	Thu Mar 21 17:01:14 2002
-@@ -252,7 +252,7 @@
- 		gpi = NULL;
- 	return gpi;
- #else
--#ifdef SYMBOL_PREFIX
-+#if defined(SYMBOL_PREFIX) && !defined(__ELF__)
- 	char *sym = g_strconcat(SYMBOL_PREFIX, symbol, NULL);
- 	void *symh = dlsym(handle, sym);
- 	g_free(sym);
diff --git a/audio/xmms/patches/patch-at b/audio/xmms/patches/patch-at
deleted file mode 100644
index d3a61fe6136..00000000000
--- a/audio/xmms/patches/patch-at
+++ /dev/null
@@ -1,83 +0,0 @@
-$NetBSD: patch-at,v 1.1 2002/10/14 09:47:00 rh Exp $
-
---- Input/vorbis/http.c.orig	Thu Jan  3 00:21:21 2002
-+++ Input/vorbis/http.c
-@@ -287,8 +287,13 @@ static void *http_buffer_loop(void *arg)
- 	gint cnt, written, error, err_len, port, cport;
- 	gboolean redirect;
- 	fd_set set;
-+#ifdef USE_IPV6
-+	struct addrinfo hints, *res, *res0;
-+	char service[6];
-+#else
- 	struct hostent *hp;
- 	struct sockaddr_in address;
-+#endif
- 	struct timeval tv;
- 
- 	url = (gchar *) arg;
-@@ -310,6 +315,44 @@ static void *http_buffer_loop(void *arg)
- 		chost = vorbis_cfg.use_proxy ? vorbis_cfg.proxy_host : host;
- 		cport = vorbis_cfg.use_proxy ? vorbis_cfg.proxy_port : port;
- 
-+#ifdef USE_IPV6
-+		snprintf(service, 6, "%d", cport);
-+		memset(&hints, 0, sizeof(hints));
-+		hints.ai_socktype = SOCK_STREAM;
-+		if (! getaddrinfo(chost, service, &hints, &res0)) {
-+			eof = TRUE;
-+			for (res = res0; res; res = res->ai_next) {
-+				if ((sock = socket (res->ai_family, res->ai_socktype, res->ai_protocol)) < 0)
-+					continue;
-+				fcntl(sock, F_SETFL, O_NONBLOCK);
-+				status = g_strdup_printf(_("CONNECTING TO %s:%d"), chost, cport);
-+				vorbis_ip.set_info_text(status);
-+				g_free(status);
-+				((struct sockaddr_in6 *)res->ai_addr)->sin6_port = htons(cport);
-+				if (connect(sock, res->ai_addr, res->ai_addrlen) < 0) {
-+					if (errno != EINPROGRESS) {
-+						close(sock);
-+						continue;
-+					}
-+				}
-+				eof = FALSE;
-+				break;
-+			}
-+			freeaddrinfo(res0);
-+			if (eof) {
-+				status = g_strdup_printf(_("Couldn't connect to host %s:%d"), chost, cport);
-+				vorbis_ip.set_info_text(status);
-+				g_free(status);
-+				eof = TRUE;
-+				break;
-+			}
-+		} else {
-+			status = g_strdup_printf(_("Couldn't look up host %s"), chost);
-+			vorbis_ip.set_info_text(status);
-+			g_free(status);
-+			eof = TRUE;
-+		}
-+#else
- 		sock = socket(AF_INET, SOCK_STREAM, 0);
- 		fcntl(sock, F_SETFL, O_NONBLOCK);
- 		address.sin_family = AF_INET;
-@@ -327,9 +370,11 @@ static void *http_buffer_loop(void *arg)
- 			vorbis_ip.set_info_text(NULL);
- 			eof = TRUE;
- 		}
-+#endif
- 
- 		if (!eof)
- 		{
-+#ifndef USE_IPV6
- 			memcpy(&address.sin_addr.s_addr, *(hp->h_addr_list), sizeof (address.sin_addr.s_addr));
- 			address.sin_port = g_htons(cport);
- 
-@@ -348,6 +393,7 @@ static void *http_buffer_loop(void *arg)
- 					eof = TRUE;
- 				}
- 			}
-+#endif
- 			while (going)
- 			{
- 				tv.tv_sec = 0;
diff --git a/audio/xmms/patches/patch-au b/audio/xmms/patches/patch-au
deleted file mode 100644
index 9a14d18d2c5..00000000000
--- a/audio/xmms/patches/patch-au
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-au,v 1.1 2002/10/14 09:47:01 rh Exp $
-
---- config.h.in.orig	Tue Mar  5 07:56:50 2002
-+++ config.h.in
-@@ -104,6 +104,7 @@ void g_free_orig (gpointer mem);
- #undef PACKAGE
- #undef VERSION
- #undef USE_3DNOW
-+#undef USE_IPV6
- #undef WITH_SYMBOL_UNDERSCORE
- #undef WITH_SM
- #undef ENABLE_NLS
diff --git a/audio/xmms/patches/patch-av b/audio/xmms/patches/patch-av
deleted file mode 100644
index 477da3d5ce2..00000000000
--- a/audio/xmms/patches/patch-av
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-av,v 1.1 2003/04/17 23:14:13 nathanw Exp $
-
---- xmms/playlistwin.c.orig	2003-04-16 16:30:29.000000000 -0400
-+++ xmms/playlistwin.c	2003-04-16 16:32:20.000000000 -0400
-@@ -188,7 +188,6 @@
- 
- 	if (!title)
- 	{
--		PL_UNLOCK();
- 		textbox_set_text(playlistwin_sinfo, "");
- 		return;
- 	}