Update xmms to 1.2.5. Changes include:

 Translation/Internationalization:

* New translations (gl, pt, id, sr)
* Translations work in libxmms.
* Handles broken translations better.

Plugins:

* Joystick plugin suppports more than 4 buttons.
* Vorbis plugin handles streams.
* Vorbis plugin generate data in native endianness.
* File info dialog for Vorbis plugin.
* Alot of bugfixes to the Vorbis plugin.
* Tonegen input plugin supports more frequencys at the same time.
* Solaris output plugin added.
* Additional fixes to the Solaris plugin after it moved to the XMMS source.
* IR plugin can now configure IR code length.
* OSS Output can now configure the mixer device manually.
* Handle no effect plugins without crash.
* Esd plugin makes use of ESPEAKER variable.
* ID3v1.1 support, ID3v1.0 still saves the entire comment.

Portability:

* CDAudio ported to OpenBSD.
* Fixed glitches in FreeBSD audio playback.
* Compilation fixes for Tru64 Unix, FreeBSD, OpenBSD.

Playlist:

* Physically delete file from playlist.
* Right-click menu in the playlist.
* Playlist counter wraps at ~136 years instead of ~600 hours.
* Pressing middle mouse button in the playlist will try to add the
  content of the clipboard. Double click will clear the playlist.

Misc:

* MiniIcon now shows up in KDE2 taskbar.
* Gnomexmms shows the title in the tooltip.
* DGA support has been dropped.
* Fullscreen code should be more sane now.
* Man pages. (xmms, gnomexmms, wmxmms)

Core:

* Set realtime mode and drop root privilieges before initalizing GTK.
  (XMMS would not work with GTK 1.2.10)
* Better shuffleplay support.
* Possible to show WM decorations.
* Fixed segfaults in the controlsocket.
* Generic titles instead of Input plugin specific
  (mpg123, vorbis, cdaudio).
* %F - File path, for titlestrings.

* Smaller fixes, memory leaks and stability issues.

11 files changed, 142 insertions, 183 deletions

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index 0468d449e7e..6fab2b65179 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2001/06/11 06:34:19 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2001/06/21 16:38:33 rh Exp $
 # FreeBSD: ports/audio/xmms/Makefile,v 1.9 2000/02/11 01:46:12 cpiazza Exp
 
-DISTNAME=	xmms-1.2.4
+DISTNAME=	xmms-1.2.5
 CATEGORIES=	audio
 MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.2.x/ \
 		ftp://ftp.sunet.se/pub/multimedia/xmms/1.2.x/
@@ -19,6 +19,7 @@ DEPENDS+=	libxml>=1.8.5:../../textproc/libxml
 USE_LIBTOOL=	yes
 USE_X11=	yes
 USE_MESA=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -31,7 +32,7 @@ LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig
 
 .if (${OPSYS} == NetBSD)
 CONFIGURE_ARGS+=--with-dev-dsp=/dev/sound
-CPPFLAGS+=	-I${WRKDIR}
+CPPFLAGS+=	-I${WRKDIR} -DHAVE_NANOSLEEP=1
 
 .if (${MACHINE_ARCH} == i386)
 post-patch:
diff --git a/audio/xmms/distinfo b/audio/xmms/distinfo
index 3aae52edba2..cf16fc2a554 100644
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@@ -1,20 +1,18 @@
-$NetBSD: distinfo,v 1.4 2001/05/20 20:52:24 rh Exp $
+$NetBSD: distinfo,v 1.5 2001/06/21 16:38:33 rh Exp $
 
-SHA1 (xmms-1.2.4.tar.gz) = 49d165feadc823444ee3c93826d164fbcf9a5ae2
-Size (xmms-1.2.4.tar.gz) = 1944572 bytes
-SHA1 (patch-aa) = 0bc298c70c90b79f0b87d03c9896e60815436ba8
+SHA1 (xmms-1.2.5.tar.gz) = 64d64a6db0b08ba91a135229437c384da7dba1e5
+Size (xmms-1.2.5.tar.gz) = 2414840 bytes
+SHA1 (patch-aa) = c876da295aab062a93dd6e1a16ef8105ff976417
 SHA1 (patch-ab) = 6f236de07dcd7ce8a2325effe038e42ea4222250
-SHA1 (patch-ac) = 97b57d828734e04edb5d57ff7862589545d30e39
-SHA1 (patch-ad) = fbe5031b1b023966e326434595313086da7f42fe
 SHA1 (patch-ae) = 1e486f43bfe8dbafbbea3db3781ec08196184ee2
 SHA1 (patch-af) = 472e2504fae530b34785e18d38d6f45891494a6d
 SHA1 (patch-ag) = 24a56ba54752994806518872d03709559f5ac620
 SHA1 (patch-ah) = b9d9453e99a25601c79cc0beeb37685f7fbefa6f
-SHA1 (patch-ai) = 453bdeffd7443afecc7feefd9c934a058c98d638
+SHA1 (patch-ai) = d05ba576dc40dd29d59c571fbab369d83fbe0b06
 SHA1 (patch-aj) = 95e965c5033dea5d2b0be2a22058f19504da0031
-SHA1 (patch-ak) = 53605fe5a6aea44f8b4e2f46d203be9371216608
-SHA1 (patch-al) = 0e80f3fa228c0eccf84ad9e3b4e8693c81e44c59
+SHA1 (patch-ak) = 9c89fc3014c1109b14f56c4bdaae7782f2531529
+SHA1 (patch-al) = 3150ee9972911c5152f14a0771d9e9a2cbcb107f
 SHA1 (patch-am) = 3f44eb6ea71c47133482142f4d18ff60c230763c
-SHA1 (patch-an) = ed27a2e280621828e5ea8fc85c24131bfd23a25b
-SHA1 (patch-ao) = 87cb5aa60b1c459126acc9c473076777f4acd104
+SHA1 (patch-an) = 9055b76be68766955311b8f388afd60c604c0c34
+SHA1 (patch-ao) = 428e1083a104358d752ddc483310a97764cb6979
 SHA1 (patch-ap) = 493a4d81960b4d11548b8f277c00b8315339ac02
diff --git a/audio/xmms/patches/patch-aa b/audio/xmms/patches/patch-aa
index 941670e84ff..21ec8131f77 100644
--- a/audio/xmms/patches/patch-aa
+++ b/audio/xmms/patches/patch-aa
@@ -1,177 +1,150 @@
-$NetBSD: patch-aa,v 1.4 2001/05/20 20:52:24 rh Exp $
+$NetBSD: patch-aa,v 1.5 2001/06/21 16:38:33 rh Exp $
 
---- Input/cdaudio/cdaudio.c.orig	Sun May 20 17:45:46 2001
+--- Input/cdaudio/cdaudio.c.orig	Tue Mar 13 15:16:07 2001
 +++ Input/cdaudio/cdaudio.c
-@@ -95,7 +95,7 @@
+@@ -96,7 +96,7 @@
  #define STOP_UNLOCK() pthread_mutex_unlock(&stop_mutex)
  
  
--#if !defined(CDROMVOLREAD) && !(defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__))
-+#if !defined(CDROMVOLREAD) && !(defined(HAVE_SYS_CDIO_H) && (defined(__NetBSD__) || defined(__FreeBSD__)))
+-#if !defined(CDROMVOLREAD) && !(defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__)))
++#if !defined(CDROMVOLREAD) && !(defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)))
  static gint volume_left = 100, volume_right = 100;
  #endif
  
-@@ -139,10 +139,21 @@
+@@ -140,9 +140,13 @@
+ 		cdda_cfg.device = g_strdup("/dev/acd0c");
  	if (!cdda_cfg.directory)
  		cdda_cfg.directory = g_strdup("/cdrom");
- # else
-+#  ifdef __NetBSD__
-+	if (!cdda_cfg.device)
-+#   if RAW_PART == 3
-+		cdda_cfg.device = g_strdup("/dev/rcd0d");
-+#   else
-+		cdda_cfg.device = g_strdup("/dev/rcd0c");
-+#   endif
-+	if (!cdda_cfg.directory)
-+		cdda_cfg.directory = g_strdup("/cdrom");
-+#  else
+-# elif defined __OpenBSD__
++# elif defined(__NetBSD__) || defined(__OpenBSD__)
  	if (!cdda_cfg.device)
- 		cdda_cfg.device = g_strdup("/vol/dev/aliases/cdrom0");
- 	if (!cdda_cfg.directory)
- 		cdda_cfg.directory = g_strdup("/cdrom/cdrom0");
++#  if RAW_PART == 3
++		cdda_cfg.device = g_strdup("/dev/cd0d");
++#  else
+ 		cdda_cfg.device = g_strdup("/dev/cd0c");
 +#  endif
- # endif
- #else
- 	if (!cdda_cfg.device)
-@@ -374,12 +385,12 @@
+ 	if (!cdda_cfg.directory)
+ 		cdda_cfg.directory = g_strdup("/cdrom");
+ # else
+@@ -412,7 +416,7 @@
  		pthread_attr_setdetachstate(attr, PTHREAD_CREATE_DETACHED);
  	}
  	
--#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__)
-+#if defined(HAVE_SYS_CDIO_H) && (defined(__NetBSD__) || defined(__FreeBSD__))
+-#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__))
++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
  /*  	ioctl(cdda_fd, CDIOCSTOP, 0); */
  	ioctl(cdda_fd, CDIOCPAUSE, 0);
  #else
- /*  	ioctl(cdda_fd, CDROMSTOP, 0); */
--	ioctl(cdda_fd, CDROMPAUSE);
-+	ioctl(cdda_fd, CDROMPAUSE, 0);
- #endif
- 	close(cdda_fd);
- 	cdda_fd = -1;
-@@ -392,8 +403,8 @@
+@@ -430,8 +434,8 @@
  
  static void cdda_pause(short p)
  {
--#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__)
+-#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__))
 -	ioctl(cdda_fd, p ? CDIOCPAUSE : CDIOCRESUME);
-+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__))
++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
 +	ioctl(cdda_fd, p ? CDIOCPAUSE : CDIOCRESUME, 0);
  #else
  	ioctl(cdda_fd, p ? CDROMPAUSE : CDROMRESUME);
  #endif
-@@ -404,7 +415,7 @@
+@@ -442,7 +446,7 @@
  {
  	struct cdda_msf *end, start;
  
--#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__)
-+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__))
+-#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__))
++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
  	struct ioc_play_msf msf;
  #else
  	struct cdrom_msf msf;
-@@ -419,7 +430,7 @@
+@@ -457,7 +461,7 @@
  	else
  		end = &cd_toc.track[track + 1];
  
--#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__)
-+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__))
+-#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__))
++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
  	msf.start_m = start.minute;
  	msf.start_s = start.second;
  	msf.start_f = start.frame;
-@@ -443,7 +454,7 @@
+@@ -481,7 +485,7 @@
  static int get_time(void)
  {
  	gint frame, start_frame, length;
--#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__)
-+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__))
+-#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__))
++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
  	struct ioc_read_subchannel subchnl;
  	struct cd_sub_channel_info subinfo;
  
-@@ -534,7 +545,7 @@
+@@ -572,7 +576,7 @@
  	if (!cdda_cfg.use_oss_mixer)
  	{
  
--#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__)
-+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__))
+-#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__))
++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
  		struct ioc_vol vol;
  
  		if (cdda_fd != -1)
-@@ -562,7 +573,7 @@
+@@ -600,7 +604,7 @@
  
  static void set_volume(int l, int r)
  {
--#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__)
-+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__))
+-#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__))
++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
  	struct ioc_vol vol;
  #else
  	struct cdrom_volctrl vol;
-@@ -595,7 +606,7 @@
+@@ -633,7 +637,7 @@
  	{
  		if (cdda_fd != -1)
  		{
--#if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__)
-+#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__))
+-#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__))
++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
  			vol.vol[0] = vol.vol[2] = (l * 255) / 100;
  			vol.vol[1] = vol.vol[3] = (r * 255) / 100;
  			ioctl(cdda_fd, CDIOCSETVOL, &vol);
-@@ -605,7 +616,7 @@
+@@ -643,7 +647,7 @@
  			ioctl(cdda_fd, CDROMVOLCTRL, &vol);
  #endif
  		}
--#if !defined(CDROMVOLREAD) && !(defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__))
-+#if !defined(CDROMVOLREAD) && !(defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__)))
+-#if !defined(CDROMVOLREAD) && !(defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__)))
++#if !defined(CDROMVOLREAD) && !(defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)))
  		volume_left = l;
  		volume_right = r;
  #endif
-@@ -619,6 +630,10 @@
- #if defined(HAVE_SYS_CDIO_H) && defined(__FreeBSD__)
+@@ -654,9 +658,9 @@
+ {
+ 	gboolean retv = FALSE;
+ 
+-#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__))
++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
  	struct ioc_toc_header tochdr;
+-#if defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__)
+ 	struct ioc_read_toc_entry tocentry;
+ #else
  	struct ioc_read_toc_single_entry tocentry;
-+#elif defined(__NetBSD__)
-+	struct ioc_toc_header tochdr;
-+	struct ioc_read_toc_entry tocentry;
-+	struct cd_toc_entry entry;
- #else	
- 	struct cdrom_tochdr tochdr;
- 	struct cdrom_tocentry tocentry;
-@@ -662,6 +677,41 @@
- 	info->leadout.minute = tocentry.entry.addr.msf.minute;
- 	info->leadout.second = tocentry.entry.addr.msf.second;
- 	info->leadout.frame = tocentry.entry.addr.msf.frame;
-+	
-+	info->first_track = tochdr.starting_track;
-+	info->last_track = tochdr.ending_track;
-+	retv = TRUE;
-+
-+#elif defined(HAVE_SYS_CDIO_H) && defined(__NetBSD__)
-+	if ( ioctl(fd, CDIOREADTOCHEADER, &tochdr) )
-+	    goto done;
-+
-+	for (i = tochdr.starting_track; i <= tochdr.ending_track; i++)
-+	{		
-+		tocentry.address_format = CD_MSF_FORMAT;
-+		tocentry.starting_track = i;
-+		tocentry.data_len = sizeof(entry);
-+		tocentry.data = &entry;
-+		if (ioctl(fd, CDIOREADTOCENTRIES, &tocentry))
-+			goto done;
-+		info->track[i].minute =
-+		    entry.addr.msf.minute;
-+		info->track[i].second =
-+		    entry.addr.msf.second;
-+		info->track[i].frame =
-+		    entry.addr.msf.frame;
-+		info->track[i].flags.data_track =
-+		    entry.control & 4 == 4;
-+	}
-+
-+	/* Get the leadout track */
-+	tocentry.starting_track = tochdr.ending_track + 1;
-+	tocentry.address_format = CD_MSF_FORMAT;
-+	if (ioctl(fd, CDIOREADTOCENTRIES, &tocentry))
-+		goto done;
-+	info->leadout.minute = entry.addr.msf.minute;
-+	info->leadout.second = entry.addr.msf.second;
-+	info->leadout.frame = entry.addr.msf.frame;
- 	
- 	info->first_track = tochdr.starting_track;
- 	info->last_track = tochdr.ending_track;
+@@ -676,7 +680,7 @@
+ 
+ 	memset(info, 0, sizeof(cdda_disc_toc_t));
+ 
+-#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__OpenBSD__))
++#if defined(HAVE_SYS_CDIO_H) && (defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__))
+ 	if ( ioctl(fd, CDIOREADTOCHEADER, &tochdr) )
+ 	    goto done;
+ 
+@@ -684,7 +688,7 @@
+ 	{		
+ 		tocentry.address_format = CD_MSF_FORMAT;
+ 
+-#if defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__)
+ 		tocentry.starting_track = i;
+ 		if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry))
+ 			goto done;
+@@ -714,7 +718,7 @@
+ 	/* Get the leadout track */
+ 	tocentry.address_format = CD_MSF_FORMAT;
+ 
+-#if defined(__OpenBSD__)
++#if defined(__NetBSD__) || defined(__OpenBSD__)
+ 	tocentry.starting_track = 0xAA;
+ 	if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry))
+ 		goto done;
diff --git a/audio/xmms/patches/patch-ac b/audio/xmms/patches/patch-ac
deleted file mode 100644
index 52961d8e36f..00000000000
--- a/audio/xmms/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2000/03/07 23:03:13 tron Exp $
-
---- Output/Makefile.in.orig	Mon Jan 31 19:44:32 2000
-+++ Output/Makefile.in	Tue Mar  7 23:25:17 2000
-@@ -125,7 +125,7 @@
- sidplay_library = @sidplay_library@
- xmmsdir = @xmmsdir@
- 
--SUBDIRS = OSS esd disk_writer
-+SUBDIRS = OSS disk_writer
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/audio/xmms/patches/patch-ad b/audio/xmms/patches/patch-ad
deleted file mode 100644
index 2411cf2027d..00000000000
--- a/audio/xmms/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2000/03/07 23:03:13 tron Exp $
-
---- Visualization/Makefile.in.orig	Mon Jan 31 19:44:44 2000
-+++ Visualization/Makefile.in	Tue Mar  7 23:25:17 2000
-@@ -125,7 +125,7 @@
- sidplay_library = @sidplay_library@
- xmmsdir = @xmmsdir@
- 
--SUBDIRS = blur_scope sanalyzer opengl_spectrum
-+SUBDIRS = blur_scope sanalyzer
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/audio/xmms/patches/patch-ai b/audio/xmms/patches/patch-ai
index 1329f3c2ca6..0181351c125 100644
--- a/audio/xmms/patches/patch-ai
+++ b/audio/xmms/patches/patch-ai
@@ -1,8 +1,8 @@
-$NetBSD: patch-ai,v 1.3 2001/05/20 20:52:24 rh Exp $
+$NetBSD: patch-ai,v 1.4 2001/06/21 16:38:34 rh Exp $
 
---- xmms/main.c.orig	Mon Nov 20 16:45:10 2000
+--- xmms/main.c.orig	Sun Jun 17 01:05:47 2001
 +++ xmms/main.c
-@@ -35,6 +35,23 @@
+@@ -36,6 +36,23 @@
  #include "libxmms/dirbrowser.h"
  #include "xmms_mini.xpm"
  
@@ -26,25 +26,25 @@ $NetBSD: patch-ai,v 1.3 2001/05/20 20:52:24 rh Exp $
  GtkWidget *mainwin, *mainwin_url_window = NULL, *mainwin_dir_browser = NULL;
  GtkWidget *mainwin_jtt = NULL, *mainwin_jtf = NULL;
  GtkItemFactory *mainwin_options_menu, *mainwin_songname_menu, *mainwin_vis_menu;
-@@ -3232,7 +3249,7 @@
+@@ -3330,7 +3347,7 @@
+ {
  	gchar *filename;
- 	gint i;
- 	gboolean have_display = FALSE;
--#ifdef HAVE_SCHED_SETSCHEDULER
-+#if defined(HAVE_SCHED_SETSCHEDULER) && !defined(__NetBSD__)
+ 	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
-@@ -3283,7 +3300,7 @@
+@@ -3361,7 +3378,7 @@
  
  	if (geteuid() == 0)
  	{
--#ifdef HAVE_SCHED_SETSCHEDULER
-+#if defined(HAVE_SCHED_SETSCHEDULER) && !defined(__NetBSD__)
+-#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);
-@@ -3401,6 +3418,11 @@
+@@ -3450,6 +3467,11 @@
  
  	/* enable_x11r5_session_management(argc, argv); */
  	sm_init(argc, argv);
diff --git a/audio/xmms/patches/patch-ak b/audio/xmms/patches/patch-ak
index 46df99aaa67..f967fcff817 100644
--- a/audio/xmms/patches/patch-ak
+++ b/audio/xmms/patches/patch-ak
@@ -1,9 +1,9 @@
-$NetBSD: patch-ak,v 1.2 2000/03/16 23:00:57 tron Exp $
+$NetBSD: patch-ak,v 1.3 2001/06/21 16:38:34 rh Exp $
 
---- wmxmms/Makefile.in.orig	Mon Jan 31 19:44:47 2000
-+++ wmxmms/Makefile.in	Thu Mar 16 23:45:58 2000
-@@ -148,7 +148,7 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
+--- wmxmms/Makefile.in.orig	Mon Jun 18 21:56:09 2001
++++ wmxmms/Makefile.in
+@@ -180,7 +180,7 @@
+ DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I../xmms
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
diff --git a/audio/xmms/patches/patch-al b/audio/xmms/patches/patch-al
index ffc128419cd..71972617309 100644
--- a/audio/xmms/patches/patch-al
+++ b/audio/xmms/patches/patch-al
@@ -1,13 +1,13 @@
-$NetBSD: patch-al,v 1.2 2001/05/20 20:52:24 rh Exp $
+$NetBSD: patch-al,v 1.3 2001/06/21 16:38:34 rh Exp $
 
---- xmms/Makefile.in.orig	Tue Nov 28 01:55:58 2000
+--- xmms/Makefile.in.orig	Mon Jun 18 21:55:30 2001
 +++ xmms/Makefile.in
-@@ -179,7 +179,7 @@
- DEFS = @DEFS@ -I. -I$(srcdir) -I..
+@@ -184,7 +184,7 @@
+ DEFS = @DEFS@ -I. -I$(srcdir) -I.. -I.
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
 -LIBS = @LIBS@
 +LIBS = @LIBS@ @LIBMIKMOD_LIBS@ @XML_LIBS@
  xmms_OBJECTS =  bmp.o skin.o util.o output.o fft.o input.o effect.o \
- general.o visualization.o dga.o fullscreen.o pluginenum.o playlist.o \
+ general.o visualization.o fullscreen.o pluginenum.o playlist.o \
  controlsocket.o dock.o widget.o sbutton.o pbutton.o tbutton.o textbox.o \
diff --git a/audio/xmms/patches/patch-an b/audio/xmms/patches/patch-an
index 8a9bde7fb5b..e5e0dd06eb9 100644
--- a/audio/xmms/patches/patch-an
+++ b/audio/xmms/patches/patch-an
@@ -1,8 +1,8 @@
-$NetBSD: patch-an,v 1.2 2001/05/20 20:52:25 rh Exp $
+$NetBSD: patch-an,v 1.3 2001/06/21 16:38:34 rh Exp $
 
---- Input/cdaudio/Makefile.in.orig	Tue Nov 28 01:56:12 2000
+--- Input/cdaudio/Makefile.in.orig	Mon Jun 18 21:55:46 2001
 +++ Input/cdaudio/Makefile.in
-@@ -166,7 +166,7 @@
+@@ -171,7 +171,7 @@
  
  INCLUDES = @GTK_CFLAGS@ @XML_CFLAGS@ -I$(top_buiddir)/intl
  libcdaudio_la_LDFLAGS = $(cdaudioldflags)
@@ -10,4 +10,4 @@ $NetBSD: patch-an,v 1.2 2001/05/20 20:52:25 rh Exp $
 +libcdaudio_la_LIBADD = @GTK_LIBS@ @XML_LIBS@ -lossaudio
  libcdaudio_la_SOURCES = $(cdaudiosources)
  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../config.h
+ CONFIG_HEADER = ../../config.h ../../xmms/i18n.h
diff --git a/audio/xmms/patches/patch-ao b/audio/xmms/patches/patch-ao
index bd40839dc04..033912f89ce 100644
--- a/audio/xmms/patches/patch-ao
+++ b/audio/xmms/patches/patch-ao
@@ -1,10 +1,10 @@
-$NetBSD: patch-ao,v 1.1 2001/05/20 20:52:25 rh Exp $
+$NetBSD: patch-ao,v 1.2 2001/06/21 16:38:34 rh Exp $
 
---- configure.orig	Sun May 20 17:28:50 2001
+--- configure.orig	Mon Jun 18 21:53:50 2001
 +++ configure
-@@ -7339,7 +7339,11 @@
+@@ -7473,7 +7473,11 @@
    cat > conftest.$ac_ext <<EOF
- #line 7341 "configure"
+ #line 7475 "configure"
  #include "confdefs.h"
 +#ifdef __NetBSD__
 +#error Sorry, no native wide character support functions, yet!
@@ -13,4 +13,4 @@ $NetBSD: patch-ao,v 1.1 2001/05/20 20:52:25 rh Exp $
 +#endif
  EOF
  ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
- { (eval echo configure:7346: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ { (eval echo configure:7480: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
diff --git a/audio/xmms/pkg/PLIST b/audio/xmms/pkg/PLIST
index 9e3f68ebd64..ed85e829b93 100644
--- a/audio/xmms/pkg/PLIST
+++ b/audio/xmms/pkg/PLIST
@@ -1,20 +1,20 @@
-@comment $NetBSD: PLIST,v 1.7 2001/05/20 20:52:25 rh Exp $
+@comment $NetBSD: PLIST,v 1.8 2001/06/21 16:38:34 rh Exp $
 bin/wmxmms
 bin/xmms
 bin/xmms-config
 include/xmms/configfile.h
-include/xmms/dga.h
 include/xmms/dirbrowser.h
 include/xmms/formatter.h
 include/xmms/fullscreen.h
 include/xmms/plugin.h
+include/xmms/titlestring.h
 include/xmms/util.h
 include/xmms/xmmsctrl.h
 lib/libxmms.a
 lib/libxmms.la
 lib/libxmms.so
-lib/libxmms.so.1
-lib/libxmms.so.1.0
+lib/libxmms.so.2
+lib/libxmms.so.2.0
 lib/xmms/Effect/libecho.la
 lib/xmms/Effect/libecho.a
 lib/xmms/Effect/libecho.so
@@ -57,27 +57,38 @@ lib/xmms/Output/libOSS.so
 lib/xmms/Output/libdisk_writer.la
 lib/xmms/Output/libdisk_writer.a
 lib/xmms/Output/libdisk_writer.so
+lib/xmms/Output/libesdout.a
+lib/xmms/Output/libesdout.la
+lib/xmms/Output/libesdout.so
 lib/xmms/Visualization/libbscope.la
 lib/xmms/Visualization/libbscope.a
 lib/xmms/Visualization/libbscope.so
+lib/xmms/Visualization/libogl_spectrum.a
+lib/xmms/Visualization/libogl_spectrum.la
+lib/xmms/Visualization/libogl_spectrum.so
 lib/xmms/Visualization/libsanalyzer.la
 lib/xmms/Visualization/libsanalyzer.a
 lib/xmms/Visualization/libsanalyzer.so
+man/man1/gnomexmms.1
+man/man1/wmxmms.1
+man/man1/xmms.1
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/gl/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/ko/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/xmms.mo
-${PKGLOCALEDIR}/locale/zh_TW.Big5/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/af/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/xmms.mo
@@ -92,9 +103,11 @@ ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/xmms.mo
 ${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/xmms.mo
 share/aclocal/xmms.m4
 share/xmms/wmxmms.xpm
 @dirrm share/xmms