Update to 1.2.10; from new maintainer Robert Nagy <thuglife@bsd.hu>.

2004-04-15 19:23:46 +00:00 · 2004-04-15 19:23:46 +00:00 · 85111636e9
commit 85111636e9
parent e14bce7e53
24 changed files with 286 additions and 648 deletions
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.30 2003/12/12 18:30:02 naddy Exp $
+# $OpenBSD: Makefile,v 1.31 2004/04/15 19:23:46 naddy Exp $

 COMMENT=		"Multimedia player for the X Window System"
 COMMENT-esd=		"Esound output plugin for XMMS"
@ -6,17 +6,16 @@ COMMENT-vorbis=		"Ogg Vorbis input plugin for XMMS"
 COMMENT-mikmod=		"Mikmod input plugin for XMMS"
 COMMENT-mp3=		"MP3 input plugin for XMMS"

-VERSION=		1.2.7
+VERSION=		1.2.10
 DISTNAME=		xmms-${VERSION}
 PKGNAME-esd=		xmms-esd-${VERSION}
 PKGNAME-vorbis=		xmms-vorbis-${VERSION}
 PKGNAME-mikmod=		xmms-mikmod-${VERSION}
 PKGNAME-mp3=		xmms-mp3-${VERSION}
-SUNDRIVER=		xmms_sun-${VERSION}
 CATEGORIES=		audio
 HOMEPAGE=		http://www.xmms.org

-MAINTAINER=		Wilbern Cobb <wcobb@openbsd.org>
+MAINTAINER=		Robert Nagy <thuglife@bsd.hu>

 # GPL
 PERMIT_PACKAGE_CDROM=	Yes
@ -25,14 +24,11 @@ PERMIT_DISTFILES_CDROM= Yes
 PERMIT_DISTFILES_FTP=	Yes

 V=			1.2.x
-MASTER_SITES=		http://www.xmms.org/files/$V/ \
+MASTER_SITES=		${HOMEPAGE}/files/$V/ \
 			ftp://ftp.xmms.org/xmms/$V/ \
 			ftp://ftp.sunet.se/pub/multimedia/xmms/$V/ \
 			ftp://ftp.stealth.net/xmms/$V/

-MASTER_SITES0=		http://vedge.com.ar/hack/ \
-			http://mirror.csoft.org/xmms/
-
 PSEUDO_FLAVORS=		no_esd no_vorbis no_mikmod no_mp3
 FLAVOR?=
 MULTI_PACKAGES=
@ -51,24 +47,23 @@ MULTI_PACKAGES+=	-mp3

 SUBPACKAGE?=

+MODULES=		iconv
 RUN_DEPENDS=		:unzip-*:archivers/unzip
 LIB_DEPENDS=		gtk.1.2,gdk.1.2::x11/gtk+ \
 			gthread.1.2::devel/glib \
 			xml.9::textproc/libxml1

-USE_LIBTOOL=		Yes
 USE_X11=		Yes
 CONFIGURE_STYLE=	autoconf
+AUTOCONF_VERSION=	2.57
 CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
-			--without-gnome
+			--without-gnome \
+			--enable-ipv6

-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
-		XML_CONFIG="${LOCALBASE}/bin/xml-config"
-
-DISTFILES=		${DISTNAME}.tar.gz \
-			${SUNDRIVER}.tar.gz:0
+CONFIGURE_ENV=		CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+			CFLAGS="${CFLAGS} -I${LOCALBASE}/include -I${X11BASE}/include" \
+			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
+			XML_CONFIG="${LOCALBASE}/bin/xml-config" \

 DOCS=			README NEWS

@ -113,11 +108,8 @@ CONFIGURE_ARGS+=	--disable-mikmod
 . endif
 .endif

-post-extract:
-	@mv -f ${WRKDIR}/${SUNDRIVER} ${WRKSRC}/Output/sun
-
 pre-configure:
-	@cd ${WRKSRC}/libxmms && ${LOCALBASE}/bin/autoconf
+	@cd ${WRKSRC}/libxmms && ${LOCALBASE}/bin/autoconf-${AUTOCONF_VERSION}

 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmms
--- a/audio/xmms/distinfo
+++ b/audio/xmms/distinfo
@ -1,6 +1,3 @@
-MD5 (xmms-1.2.7.tar.gz) = 8aa14a305d1eeb1bb53dba2197ba695a
-MD5 (xmms_sun-1.2.7.tar.gz) = 57de928d27bf9a30f3859400e2d722f6
-RMD160 (xmms-1.2.7.tar.gz) = 21618f8b827b7d08b867c7a5fdf0c57b8530a523
-RMD160 (xmms_sun-1.2.7.tar.gz) = 90943949d9c728a77d31235c96c893d250f87afc
-SHA1 (xmms-1.2.7.tar.gz) = 2f910d88af9bb5e8d54e796653beef969b555c68
-SHA1 (xmms_sun-1.2.7.tar.gz) = a9e9f476a9a33fc9239baaa2604d8ee2d96098fd
+MD5 (xmms-1.2.10.tar.gz) = 85ad2db10fbfdfceccd12a8f617111ad
+RMD160 (xmms-1.2.10.tar.gz) = 4bdc0f5c64fb9b0a17cea3bc1473890c5470c9b7
+SHA1 (xmms-1.2.10.tar.gz) = 8bfedb208c12788546dd59e91d103aac46e82bb0
--- a/audio/xmms/patches/patch-Input_cdaudio_cdaudio_c
+++ b/audio/xmms/patches/patch-Input_cdaudio_cdaudio_c
@ -1,39 +1,23 @@
-$OpenBSD: patch-Input_cdaudio_cdaudio_c,v 1.2 2004/01/22 20:15:22 naddy Exp $
--- Input/cdaudio/cdaudio.c.orig	2002-02-05 15:39:11.000000000 +0100
-+++ Input/cdaudio/cdaudio.c	2004-01-22 20:41:36.000000000 +0100
-@@ -552,6 +552,10 @@ static int get_current_frame(void)
+$OpenBSD: patch-Input_cdaudio_cdaudio_c,v 1.3 2004/04/15 19:23:46 naddy Exp $
+--- Input/cdaudio/cdaudio.c.orig	2004-01-28 00:09:39.000000000 +0100
+++ Input/cdaudio/cdaudio.c	2004-04-15 14:47:46.000000000 +0200
+@@ -333,7 +333,7 @@ static gboolean is_mounted(char * device
+ #elif defined(HAVE_GETMNTINFO)
+  	entries = getmntinfo(&fsp, MNT_NOWAIT);
+  	if (entries < 0)
+- 		return NULL;
+ 		return FALSE;
+ 	
+ 	while (entries-- > 0)
+ 	{
+@@ -817,6 +817,10 @@ static int get_current_frame(void)
 {
 	struct ioc_read_subchannel subchnl;
 	struct cd_sub_channel_info subinfo;
-+	
+
 +	bzero (&subchnl, sizeof (subchnl));
 +	bzero (&subinfo, sizeof (subinfo));
 +
 	subchnl.address_format = CD_MSF_FORMAT;
 	subchnl.data_format = CD_CURRENT_POSITION;
- 	subchnl.data_len = sizeof(subinfo);
-@@ -591,17 +595,23 @@ gboolean cdda_get_toc_lowlevel(int fd, c
- {
- 	struct ioc_toc_header tochdr;
- 	struct ioc_read_toc_entry tocentry;
-+	struct cd_toc_entry entry;
- 	int i;
- 
- 	if (ioctl(fd, CDIOREADTOCHEADER, &tochdr))
- 		return FALSE;
- 
-+	bzero (&tocentry, sizeof (tocentry));
-+	bzero (&entry, sizeof (entry));
-+	tocentry.data_len = sizeof (entry);
-+	tocentry.data = &entry;
-+
- 	for (i = tochdr.starting_track; i <= tochdr.ending_track; i++)
- 	{		
- 		tocentry.address_format = CD_MSF_FORMAT;
- 
- 		tocentry.starting_track = i;
-		if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry))
-+		if (ioctl(fd, CDIOREADTOCENTRYS, &tocentry) < 0)
- 			return FALSE;
- 		info->track[i].minute =
- 		    tocentry.data->addr.msf.minute;
+ 	subchnl.track = 0;
--- a/audio/xmms/patches/patch-Input_cdaudio_cddb_c
+++ b/audio/xmms/patches/patch-Input_cdaudio_cddb_c
@ -1,14 +0,0 @@
-$OpenBSD: patch-Input_cdaudio_cddb_c,v 1.1 2002/08/31 07:15:11 wcobb Exp $
--- Input/cdaudio/cddb.c.orig	Sat Aug 31 02:25:12 2002
-+++ Input/cdaudio/cddb.c	Sat Aug 31 02:25:59 2002
-@@ -693,7 +693,9 @@ static void cddb_server_dialog_ok_cb(Gtk
- 
- 	if (!GTK_CLIST(server_clist)->selection)
- 		return;
-	gtk_clist_get_text(GTK_CLIST(server_clist), (gint) GTK_CLIST(server_clist)->selection->data, 0, &text);
-+	gtk_clist_get_text(GTK_CLIST(server_clist),
-+	    GPOINTER_TO_INT(GTK_CLIST(server_clist)->selection->data),
-+	    0, &text);
- 	cdda_cddb_set_server(text);
- 	gtk_entry_set_text(entry, text);
- 	gtk_widget_destroy(server_dialog);
--- a/audio/xmms/patches/patch-Input_mikmod_drv_xmms_c
+++ b/audio/xmms/patches/patch-Input_mikmod_drv_xmms_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-Input_mikmod_drv_xmms_c,v 1.1 2002/04/09 23:13:30 naddy Exp $
--- Input/mikmod/drv_xmms.c.orig	Wed Apr 10 00:39:37 2002
-+++ Input/mikmod/drv_xmms.c	Wed Apr 10 00:39:51 2002
-@@ -65,7 +65,7 @@ static BOOL xmms_Init(void)
- 	if (!(audiobuffer = (SBYTE *) g_malloc0(buffer_size)))
- 		return 1;
- 	
-	fmt = (md_mode & DMODE_16BITS) ? FMT_S16_LE : FMT_U8;
-+	fmt = (md_mode & DMODE_16BITS) ? FMT_S16_NE : FMT_U8;
- 	nch = (md_mode & DMODE_STEREO) ? 2 : 1;
- 
- 	if (audio_open)
--- a/audio/xmms/patches/patch-Output_Makefile_am
+++ b/audio/xmms/patches/patch-Output_Makefile_am
@ -1,7 +0,0 @@
-$OpenBSD: patch-Output_Makefile_am,v 1.2 2002/02/05 04:07:57 pvalchev Exp $
--- Output/Makefile.am.orig	Thu Jul  5 21:03:08 2001
-+++ Output/Makefile.am	Thu Jul  5 21:03:16 2001
-@@ -1,2 +1,2 @@
-ALL_PLUGINS = OSS esd disk_writer solaris
-+ALL_PLUGINS = OSS esd disk_writer solaris sun
- SUBDIRS = @OUTPUT_PLUGINS@
--- a/audio/xmms/patches/patch-Output_Makefile_in
+++ b/audio/xmms/patches/patch-Output_Makefile_in
@ -1,18 +0,0 @@
-$OpenBSD: patch-Output_Makefile_in,v 1.3 2004/01/22 20:15:22 naddy Exp $
--- Output/Makefile.in.orig	2002-03-04 22:58:28.000000000 +0100
-+++ Output/Makefile.in	2004-01-22 20:41:36.000000000 +0100
-@@ -1,4 +1,4 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
-+# Makefile.in generated automatically by automake 1.4-p1 from Makefile.am
- 
- # Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
-@@ -162,7 +162,7 @@ sidplay_cflags = @sidplay_cflags@
- sidplay_library = @sidplay_library@
- xmmsdir = @xmmsdir@
- 
-ALL_PLUGINS = OSS esd disk_writer solaris
-+ALL_PLUGINS = OSS esd disk_writer solaris sun
- SUBDIRS = @OUTPUT_PLUGINS@
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../config.h ../xmms/i18n.h
--- a/audio/xmms/patches/patch-Output_sun_Makefile_in
+++ b/audio/xmms/patches/patch-Output_sun_Makefile_in
@ -1,149 +0,0 @@
-$OpenBSD: patch-Output_sun_Makefile_in,v 1.1 2002/08/30 12:23:57 wcobb Exp $
--- Output/sun/Makefile.in.orig	Fri Aug 30 07:07:32 2002
-+++ Output/sun/Makefile.in	Fri Aug 30 07:09:43 2002
-@@ -204,8 +204,6 @@ DISTFILES = $(DIST_COMMON) $(SOURCES) $(
- 
- TAR = tar
- GZIP_ENV = --best
-DEP_FILES =  .deps/about.P .deps/audio.P .deps/configure.P \
-.deps/convert.P .deps/mixer.P .deps/sun.P
- SOURCES = $(libsun_la_SOURCES)
- OBJECTS = $(libsun_la_OBJECTS)
- 
-@@ -213,9 +211,9 @@ all: all-redirect
- .SUFFIXES:
- .SUFFIXES: .S .c .lo .o .obj .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu Output/sun/Makefile
-+	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Output/sun/Makefile
- 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status $(BUILT_SOURCES)
-+Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
- 	cd $(top_builddir) \
- 	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
- 
-@@ -245,6 +243,9 @@ uninstall-libLTLIBRARIES:
- 	  $(LIBTOOL)  --mode=uninstall rm -f $(DESTDIR)$(libdir)/$$p; \
- 	done
- 
-+.c.o:
-+	$(COMPILE) -c $<
-+
- # FIXME: We should only use cygpath when building on Windows,
- # and only if it is available.
- .c.obj:
-@@ -267,6 +268,9 @@ distclean-compile:
- 
- maintainer-clean-compile:
- 
-+.c.lo:
-+	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
-+
- .s.lo:
- 	$(LIBTOOL) --mode=compile $(COMPILE) -c $<
- 
-@@ -320,11 +324,6 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V
- subdir = Output/sun
- 
- distdir: $(DISTFILES)
-	here=`cd $(top_builddir) && pwd`; \
-	top_distdir=`cd $(top_distdir) && pwd`; \
-	distdir=`cd $(distdir) && pwd`; \
-	cd $(top_srcdir) \
-	  && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu Output/sun/Makefile
- 	@for file in $(DISTFILES); do \
- 	  d=$(srcdir); \
- 	  if test -d $$d/$$file; then \
-@@ -335,38 +334,6 @@ distdir: $(DISTFILES)
- 	    || cp -p $$d/$$file $(distdir)/$$file || :; \
- 	  fi; \
- 	done
-
-DEPS_MAGIC := $(shell mkdir .deps > /dev/null 2>&1 || :)
-
--include $(DEP_FILES)
-
-mostlyclean-depend:
-
-clean-depend:
-
-distclean-depend:
-	-rm -rf .deps
-
-maintainer-clean-depend:
-
-%.o: %.c
-	@echo '$(COMPILE) -c $<'; \
-	$(COMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-cp .deps/$(*F).pp .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm .deps/$(*F).pp
-
-%.lo: %.c
-	@echo '$(LTCOMPILE) -c $<'; \
-	$(LTCOMPILE) -Wp,-MD,.deps/$(*F).pp -c $<
-	@-sed -e 's/^\([^:]*\)\.o[ 	]*:/\1.lo \1.o :/' \
-	  < .deps/$(*F).pp > .deps/$(*F).P; \
-	tr ' ' '\012' < .deps/$(*F).pp \
-	  | sed -e 's/^\\$$//' -e '/^$$/ d' -e '/:$$/ d' -e 's/$$/ :/' \
-	    >> .deps/$(*F).P; \
-	rm -f .deps/$(*F).pp
- info-am:
- info: info-am
- dvi-am:
-@@ -404,27 +371,27 @@ distclean-generic:
- 
- maintainer-clean-generic:
- mostlyclean-am:  mostlyclean-libLTLIBRARIES mostlyclean-compile \
-		mostlyclean-libtool mostlyclean-tags mostlyclean-depend \
-+		mostlyclean-libtool mostlyclean-tags \
- 		mostlyclean-generic
- 
- mostlyclean: mostlyclean-am
- 
- clean-am:  clean-libLTLIBRARIES clean-compile clean-libtool clean-tags \
-		clean-depend clean-generic mostlyclean-am
-+		clean-generic mostlyclean-am
- 
- clean: clean-am
- 
- distclean-am:  distclean-libLTLIBRARIES distclean-compile \
-		distclean-libtool distclean-tags distclean-depend \
-		distclean-generic clean-am
-+		distclean-libtool distclean-tags distclean-generic \
-+		clean-am
- 	-rm -f libtool
- 
- distclean: distclean-am
- 
- maintainer-clean-am:  maintainer-clean-libLTLIBRARIES \
- 		maintainer-clean-compile maintainer-clean-libtool \
-		maintainer-clean-tags maintainer-clean-depend \
-		maintainer-clean-generic distclean-am
-+		maintainer-clean-tags maintainer-clean-generic \
-+		distclean-am
- 	@echo "This command is intended for maintainers to use;"
- 	@echo "it deletes files that may require special tools to rebuild."
- 
-@@ -436,13 +403,12 @@ uninstall-libLTLIBRARIES install-libLTLI
- distclean-compile clean-compile maintainer-clean-compile \
- mostlyclean-libtool distclean-libtool clean-libtool \
- maintainer-clean-libtool tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir mostlyclean-depend \
-distclean-depend clean-depend maintainer-clean-depend info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
-+clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-+check-am installcheck-am installcheck install-exec-am install-exec \
-+install-data-am install-data install-am install uninstall-am uninstall \
-+all-redirect all-am all installdirs mostlyclean-generic \
-+distclean-generic clean-generic maintainer-clean-generic clean \
-+mostlyclean distclean maintainer-clean
- 
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
--- a/audio/xmms/patches/patch-Output_sun_audio_c
+++ b/audio/xmms/patches/patch-Output_sun_audio_c
@ -1,7 +1,7 @@
-$OpenBSD: patch-Output_sun_audio_c,v 1.1 2004/01/23 01:41:06 naddy Exp $
--- Output/sun/audio.c.orig	2004-01-22 20:42:58.000000000 +0100
-+++ Output/sun/audio.c	2004-01-22 20:44:08.000000000 +0100
-@@ -124,14 +124,12 @@ sun_setformat(AFormat fmt, gint rate, gi
+$OpenBSD: patch-Output_sun_audio_c,v 1.2 2004/04/15 19:23:46 naddy Exp $
+--- Output/sun/audio.c.orig	2002-06-02 15:42:03.000000000 +0200
+++ Output/sun/audio.c	2004-04-14 23:33:54.000000000 +0200
+@@ -123,14 +123,12 @@ static void sun_setformat(AFormat fmt, i
 	
 	sun = sun_format(fmt);
 
@ -16,3 +16,30 @@ $OpenBSD: patch-Output_sun_audio_c,v 1.1 2004/01/23 01:41:06 naddy Exp $
 	output.frequency = rate;
 	output.channels = nch;
 	sun_setparams();
+@@ -328,7 +326,7 @@ static inline void sun_write_audio(gpoin
+ 		output_time_offset += (output_bytes * 1000) / output.bps;
+ 		output_bytes = 0;
+ 		close(audio.fd);
+-		audio.fd = open(audio.devaudio, O_RDWR);
+		audio.fd = open(audio.devaudio, O_WRONLY);
+ 		sun_setformat(new_format, new_frequency, new_channels);
+ 	}
+ 	if (effects_enabled() && ep && ep->mod_samples)
+@@ -518,7 +516,7 @@ static void* sun_loop(void *arg)
+ 		{
+ 			audio.unpause = FALSE;
+ 			close(audio.fd);
+-			audio.fd = open(audio.devaudio, O_RDWR);
+			audio.fd = open(audio.devaudio, O_WRONLY);
+ 			sun_setparams();
+ 			audio.paused = FALSE;
+ 		}
+@@ -535,7 +533,7 @@ int sun_open(AFormat fmt, int rate, int 
+ 
+ 	AUDIO_INITINFO(&info);
+ 
+-	if ((audio.fd = open(audio.devaudio, O_RDWR)) < 0)
+	if ((audio.fd = open(audio.devaudio, O_WRONLY)) < 0)
+ 	{
+ 		g_error("%s: %s", audio.devaudio, strerror(errno));
+ 		return 0;
--- a/audio/xmms/patches/patch-Output_sun_configure_c
+++ b/audio/xmms/patches/patch-Output_sun_configure_c
@ -1,30 +0,0 @@
-$OpenBSD: patch-Output_sun_configure_c,v 1.1 2002/08/31 07:15:11 wcobb Exp $
--- Output/sun/configure.c.orig	Sat Aug 31 02:24:28 2002
-+++ Output/sun/configure.c	Sat Aug 31 02:24:53 2002
-@@ -152,7 +152,7 @@ configure_mixer_volumedev_scan(gchar *ty
- 			item = gtk_menu_item_new_with_label(_(info.label.name));
- 			gtk_signal_connect(GTK_OBJECT(item), "activate",
- 			    configure_win_mixer_volume_dev_cb,
-			    (gpointer) info.index);
-+			    GINT_TO_POINTER(info.index));
- 
- 			gtk_widget_show(item);
- 			gtk_menu_append(GTK_MENU(menu), item);
-@@ -336,7 +336,7 @@ configure_mixer_toggle_button(GtkWidget 
- 			gtk_signal_connect(GTK_OBJECT(toggle_cbutton),
- 			    "toggled",
- 			    GTK_SIGNAL_FUNC(mixer_cbutton_toggled_cb),
-			    (gpointer) mixer.dev);
-+			    GINT_TO_POINTER(mixer.dev));
- 		}
- 	}
- }
-@@ -405,8 +405,6 @@ configure_stats_loop(void)
- 	}
- 	while (stats_frame.active && stats_frame.fd) {
- 		audio_info_t info;
-		int wseek;
-		int rerror;
- 		gchar sl[32];
- 
- 		pthread_mutex_lock(&stats_frame.audioctl_mutex);
--- a/audio/xmms/patches/patch-README
+++ b/audio/xmms/patches/patch-README
@ -1,46 +0,0 @@
--- README.orig	2002-01-07 15:07:59.000000000 +0100
-+++ README	2004-01-22 20:41:37.000000000 +0100
-@@ -39,6 +39,7 @@ TABLE OF CONTENTS
-             3.6.2.1 OSS Driver
-             3.6.2.2 Disk Writer
-             3.6.2.3 eSound Output
-+            3.6.2.4 BSD Sun Output
-       3.6.3 Effect plugins
-             3.6.3.1 Echo
-             3.6.3.2 Extra Stereo
-@@ -876,6 +877,35 @@ the audio data is sent uncompressed to t
- The 'Buffering' tab works just like the 'OSS Driver' one.
- 
- 
-+3.6.2.4 BSD Sun Output
-+----------------------
-+The 'Sun' output plugin will use the native audio(4) interface provided
-+by OpenBSD and NetBSD for playback and mixing.
-+
-+The $AUDIODEVICE and $MIXERDEVICE environment variables will override the
-+current configuration settings. Defaults are /dev/audio and /dev/mixer.
-+
-+In the 'Devices' tab you can change the audio, audioctl and mixer devices
-+XMMS is going to use. The audioctl device is used for ioctl(2) calls
-+independent of audio data I/O.
-+
-+In the 'Buffering' tab you can change how much data the Sun plugin will
-+buffer. The 'Buffer size' ranges from 200 - 10000ms. If you want the plugin
-+to wait for the buffer to be filled before it starts playing the music,
-+change the 'Pre-buffer' value, this ranges from 0% - 90% of the 'Buffer size'
-+value.
-+
-+In the 'Mixer' tab you can select the volume device to be affected when you
-+alter the volume from XMMS. `XMMS uses mixer exclusively' causes XMMS to
-+keep the mixer device open instead of re-opening it for each operation.
-+
-+There may also be some more options depending on what your audio mixer
-+device supports (eg. loudness, spatial, surround, preamp).
-+
-+In the 'Status' tab you can see audio device information and real-time
-+playback status.
-+
-+
- 3.6.3 Effect plugins
- --------------------
- Effect plugins can alter the sound of the music you are listening to.
--- a/audio/xmms/patches/patch-Visualization_blur_scope_config_c
+++ b/audio/xmms/patches/patch-Visualization_blur_scope_config_c
@ -1,21 +0,0 @@
-$OpenBSD: patch-Visualization_blur_scope_config_c,v 1.1 2002/08/31 07:15:11 wcobb Exp $
--- Visualization/blur_scope/config.c.orig	Sat Aug 31 02:26:20 2002
-+++ Visualization/blur_scope/config.c	Sat Aug 31 02:28:05 2002
-@@ -37,7 +37,7 @@ static void configure_ok(GtkWidget *w, g
- 
- static void configure_cancel(GtkWidget *w, gpointer data)
- {
-	bscope_cfg.color = (guint32)data;
-+	bscope_cfg.color = (guint32)GPOINTER_TO_UINT(data);
- 	generate_cmap();
- 	gtk_widget_destroy(configure_win);
- }
-@@ -109,7 +109,7 @@ void bscope_configure (void)
- 	cancel = gtk_button_new_with_label(_("Cancel"));
- 	gtk_signal_connect(GTK_OBJECT(cancel), "clicked",
- 			   GTK_SIGNAL_FUNC(configure_cancel),
-			   (gpointer)bscope_cfg.color);
-+			   GUINT_TO_POINTER((guint)bscope_cfg.color));
- 	GTK_WIDGET_SET_FLAGS(cancel, GTK_CAN_DEFAULT);
- 	gtk_box_pack_start(GTK_BOX(bbox), cancel, TRUE, TRUE, 0);
- 	gtk_widget_show(cancel);
--- a/audio/xmms/patches/patch-aclocal_m4
+++ b/audio/xmms/patches/patch-aclocal_m4
@ -1,48 +1,35 @@
--- aclocal.m4.orig	2002-03-04 22:56:49.000000000 +0100
-+++ aclocal.m4	2004-01-22 20:41:37.000000000 +0100
-@@ -1082,7 +1082,7 @@ AC_DEFUN([AC_PROG_LIBTOOL],
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+$OpenBSD: patch-aclocal_m4,v 1.7 2004/04/15 19:23:46 naddy Exp $
+--- aclocal.m4.orig	2004-02-23 22:44:21.000000000 +0100
+++ aclocal.m4	2004-04-14 23:34:14.000000000 +0200
+@@ -3087,11 +3087,11 @@ newsos6)
 
- # Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+
- AC_SUBST(LIBTOOL)dnl
- 
- # Prevent multiple expansion
-@@ -3211,9 +3211,14 @@ openbsd*)
+ openbsd*)
   version_type=sunos
-   need_lib_prefix=no
-   need_version=no
-+  sys_lib_search_path_spec="/usr/lib"
-+  sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
-+  file_magic_cmd=/usr/bin/file
-+  file_magic_test_file=`echo /usr/lib/libc.so.*`
+-  need_lib_prefix=no
+-  need_version=no
+  need_lib_prefix=yes
+  need_version=yes
   if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-+    deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
     case "$host_os" in
 -    openbsd2.[[89]] | openbsd2.[[89]].*)
 +    openbsd2.[89] | openbsd2.[89].*)
       shlibpath_overrides_runpath=no
       ;;
     *)
-@@ -3221,6 +3226,7 @@ openbsd*)
-       ;;
-     esac
+@@ -3101,7 +3101,7 @@ openbsd*)
   else
-+    deplibs_check_method='file_magic OpenBSD.* shared library'
     shlibpath_overrides_runpath=yes
   fi
-   library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
-@@ -5131,10 +5137,9 @@ AC_DEFUN(AM_WITH_NLS,
+-  library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
+  library_names_spec='${libname}${release}.so ${libname}.so'
+   finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+@@ -4282,6 +4282,7 @@ openbsd*)
+   else
+     lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
+   fi
+  lt_cv_deplibs_check_method=pass_all
+   ;;
 
- 	   if test "$gt_cv_func_gettext_libc" != "yes"; then
- 	     AC_CHECK_LIB(intl, bindtextdomain,
-	       [AC_CACHE_CHECK([for gettext in libintl],
-		 gt_cv_func_gettext_libintl,
-+	       [AC_CACHE_VAL(gt_cv_func_gettext_libintl,
- 		 [AC_CHECK_LIB(intl, gettext,
-		  gt_cv_func_gettext_libintl=yes,
-+		  [gt_cv_func_gettext_libintl=yes; LIBS="$LIBS -lintl"],
- 		  gt_cv_func_gettext_libintl=no)],
- 		 gt_cv_func_gettext_libintl=no)])
- 	   fi
+ osf3* | osf4* | osf5*)
--- a/audio/xmms/patches/patch-configure_in
+++ b/audio/xmms/patches/patch-configure_in
@ -1,76 +1,7 @@
-$OpenBSD: patch-configure_in,v 1.6 2002/04/06 19:32:40 pvalchev Exp $
--- configure.in.orig	Mon Mar  4 14:50:26 2002
-+++ configure.in	Sat Apr  6 12:25:48 2002
-@@ -15,6 +15,10 @@ AC_ARG_ENABLE( user-plugin-dir,
- [  --disable-user-plugin-dir disable per-user plugin dir],,
- 		enable_user_plugin_dir="yes")
- 
-+AC_ARG_WITH( gl-prefix,
-+[  --with-gl-prefix Prefix where OpenGL is installed],,
-+		gl_prefix="$withval", gl_prefix="$X11BASE")
-+
- AC_ARG_WITH(dev-dsp, 
-   [  --with-dev-dsp=path     Path to OSS DSP data pipe, default is /dev/dsp.],
- 	dev_dsp="$withval", dev_dsp="/dev/dsp")
-@@ -54,7 +58,7 @@ AM_PROG_LIBTOOL
- AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([*** POSIX thread support not installed - please install first ***]))
- 
- AM_PATH_GLIB(1.2.2,,AC_MSG_ERROR([*** GLIB >= 1.2.2 not installed - please install first ***]))
-AM_PATH_GTK(1.2.2,,AC_MSG_ERROR([*** GTK+ >= 1.2.2 not installed - please install first ***]),gthread)
-+AM_PATH_GTK(1.2.2,,AC_MSG_ERROR([*** GTK+ >= 1.2.2 not installed - please install first ***]))
- AC_PATH_PROG(XMMS_PATH,xmms,no)
- 
- LIBS_save=$LIBS
-@@ -84,7 +88,7 @@ AC_SUBST(VM_LIBS)
- PTHREAD_LIBS=error
- AC_MSG_CHECKING(for old style FreeBSD -pthread flag)
- AC_EGREP_CPP(yes,
-	[#if defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001
-+	[#if defined(__OpenBSD__) || (defined(__FreeBSD_cc_version) && __FreeBSD_cc_version <= 500001)
- 	  yes
- 	#endif
- 	], AC_MSG_RESULT(yes)
-@@ -117,7 +121,7 @@ AC_ARG_ENABLE( opengl,
- 
- if test "x$enable_opengl" = xyes; then
- 	LIBS_save=$LIBS
-	LIBS="$LIBS $GTK_LIBS"
-+	LIBS="$LIBS $GTK_LIBS -L$gl_prefix/lib"
- 	OPENGL_LIBS=error
- 	AC_CHECK_LIB(GL, glBegin, OPENGL_LIBS="-lGL")
- 
-@@ -126,7 +130,7 @@ if test "x$enable_opengl" = xyes; then
- 	fi
- 
- 	CPPFLAGS_save=$CPPFLAGS
-	CPPFLAGS="$GTK_CFLAGS $CPPFLAGS"
-+	CPPFLAGS="$GTK_CFLAGS $CPPFLAGS -I$gl_prefix/include"
- 	have_opengl_headers=yes
- 	AC_CHECK_HEADERS(GL/gl.h GL/glx.h,,have_opengl_headers=no)
- 
-@@ -473,10 +477,11 @@ fi
- 
- arch_type=other
- have_solaris=no
-+have_sun=no
- ARCH_DEFINES=""
- case "$host" in 
-	*-*-openbsd* | *-*-netbsd* | *-*darwin*)
-		AC_DEFINE(SYMBOL_PREFIX, "_", [Define to symbol prefix, if any])
-+	*-*-openbsd*)
-+		have_sun=yes
- 	;;
- 	i386-*-* | i486-*-* | i586-*-* | i686-*-* | i86pc-*-*)
- 		ARCH_DEFINES="-DI386_ASSEM"
-@@ -497,6 +502,7 @@ AC_SUBST(ARCH_DEFINES)
- AM_CONDITIONAL(ARCH_X86, test "x$arch_type" = "xix86")
- AM_CONDITIONAL(ARCH_PPC, test "x$arch_type" = "xppc")
- AM_CONDITIONAL(HAVE_SOLARIS, test "x$have_solaris" = xyes)
-+AM_CONDITIONAL(HAVE_SUN, test "x$have_sun" = xyes)
- 
- plugindir=$libdir/xmms
- AC_SUBST(plugindir)
-@@ -524,7 +530,7 @@ AC_SUBST(GENERAL_PLUGIN_DIR)
+$OpenBSD: patch-configure_in,v 1.7 2004/04/15 19:23:46 naddy Exp $
+--- configure.in.orig	2004-02-23 22:40:44.000000000 +0100
+++ configure.in	2004-04-14 23:34:14.000000000 +0200
+@@ -549,7 +549,7 @@ AC_SUBST(GENERAL_PLUGIN_DIR)
 AC_SUBST(VISUALIZATION_PLUGIN_DIR)
 AC_SUBST(pluginsubs)
 
@ -78,20 +9,4 @@ $OpenBSD: patch-configure_in,v 1.6 2002/04/06 19:32:40 pvalchev Exp $
 +XMMS_DEFINES="$CFLAGS -DDATA_DIR=\\\"$datadir/xmms\\\" -DPLUGIN_DIR=\\\"$plugindir\\\" -DPLUGINSUBS=$pluginsubs -DLOCALEDIR=\\\"$localedir\\\" -I$LOCALBASE/include"
 
 if test "x$enable_user_plugin_dir" = "xno"; then
- 	AC_DEFINE(DISABLE_USER_PLUGIN_DIR,, [Define to disable per user plugin directory])
-@@ -554,6 +560,7 @@ Output/OSS/Makefile
- Output/esd/Makefile
- Output/disk_writer/Makefile
- Output/solaris/Makefile
-+Output/sun/Makefile
- Input/Makefile
- Input/wav/Makefile
- Input/mpg123/Makefile
-@@ -591,6 +598,7 @@ echo "  Build esd plugin:           $hav
- echo "  Build mikmod plugin:        $have_mikmod"
- echo "  Build Ogg Vorbis plugin:    $have_oggvorbis"
- echo "  Build Solaris plugin:       $have_solaris"
-+echo "  Build BSD Sun plugin:       $have_sun"
- echo "  Build gnomexmms:            $have_gnome"
- echo "  Build OpenGL plugins:       $have_opengl"
- echo "  Pthread flag:               $PTHREAD_LIBS"
+ 	AC_DEFINE(DISABLE_USER_PLUGIN_DIR,, [Define to disable per user plugin directory])
--- a/audio/xmms/patches/patch-libxmms_aclocal_m4
+++ b/audio/xmms/patches/patch-libxmms_aclocal_m4
@ -0,0 +1,24 @@
+$OpenBSD: patch-libxmms_aclocal_m4,v 1.1 2004/04/15 19:23:46 naddy Exp $
+--- libxmms/aclocal.m4.orig	2004-02-23 22:45:13.000000000 +0100
+++ libxmms/aclocal.m4	2004-04-14 23:36:48.000000000 +0200
+@@ -1669,17 +1669,17 @@ else
+     hardcode_direct=yes
+     hardcode_shlibpath_var=no
+     if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+-      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+       hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+       export_dynamic_flag_spec='${wl}-E'
+     else
+       case "$host_os" in
+       openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $compiler_flags'
+ 	hardcode_libdir_flag_spec='-R$libdir'
+         ;;
+       *)
+-        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
+        archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+         hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
+         ;;
+       esac
--- a/audio/xmms/patches/patch-libxmms_configure_in
+++ b/audio/xmms/patches/patch-libxmms_configure_in
@ -1,6 +1,6 @@
-$OpenBSD: patch-libxmms_configure_in,v 1.5 2004/01/22 20:15:22 naddy Exp $
--- libxmms/configure.in.orig	2002-03-04 22:50:27.000000000 +0100
-+++ libxmms/configure.in	2004-01-22 20:41:37.000000000 +0100
+$OpenBSD: patch-libxmms_configure_in,v 1.6 2004/04/15 19:23:46 naddy Exp $
+--- libxmms/configure.in.orig	2004-02-23 22:42:52.000000000 +0100
+++ libxmms/configure.in	2004-04-14 23:33:55.000000000 +0200
@@ -30,7 +30,7 @@ AM_ENABLE_SHARED
 XMMS_FUNC_POSIX(sched_setscheduler nanosleep)
 
--- a/audio/xmms/patches/patch-ltmain_sh
+++ b/audio/xmms/patches/patch-ltmain_sh
@ -0,0 +1,57 @@
+$OpenBSD: patch-ltmain_sh,v 1.5 2004/04/15 19:23:46 naddy Exp $
+--- ltmain.sh.orig	2003-09-04 22:59:05.000000000 +0200
+++ ltmain.sh	2004-04-14 23:33:55.000000000 +0200
+@@ -1773,11 +1773,6 @@ compiler."
+ 	    continue
+ 	  fi
+ 
+-	  if test "$installed" = no; then
+-	    notinst_deplibs="$notinst_deplibs $lib"
+-	    need_relink=yes
+-	  fi
+-
+ 	  if test -n "$old_archive_from_expsyms_cmds"; then
+ 	    # figure out the soname
+ 	    set dummy $library_names
+@@ -4582,41 +4577,6 @@ relink_command=\"$relink_command\""
+ 
+     # Exit here if they wanted silent mode.
+     test "$show" = ":" && exit 0
+-
+-    echo "----------------------------------------------------------------------"
+-    echo "Libraries have been installed in:"
+-    for libdir in $libdirs; do
+-      echo "   $libdir"
+-    done
+-    echo
+-    echo "If you ever happen to want to link against installed libraries"
+-    echo "in a given directory, LIBDIR, you must either use libtool, and"
+-    echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+-    echo "flag during linking and do at least one of the following:"
+-    if test -n "$shlibpath_var"; then
+-      echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+-      echo "     during execution"
+-    fi
+-    if test -n "$runpath_var"; then
+-      echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+-      echo "     during linking"
+-    fi
+-    if test -n "$hardcode_libdir_flag_spec"; then
+-      libdir=LIBDIR
+-      eval flag=\"$hardcode_libdir_flag_spec\"
+-
+-      echo "   - use the \`$flag' linker flag"
+-    fi
+-    if test -n "$admincmds"; then
+-      echo "   - have your system administrator run these commands:$admincmds"
+-    fi
+-    if test -f /etc/ld.so.conf; then
+-      echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+-    fi
+-    echo
+-    echo "See any operating system documentation about shared libraries for"
+-    echo "more information, such as the ld(1) and ld.so(8) manual pages."
+-    echo "----------------------------------------------------------------------"
+     exit 0
+     ;;
+ 
--- a/audio/xmms/patches/patch-xmms_getopt_c
+++ b/audio/xmms/patches/patch-xmms_getopt_c
@ -1,19 +1,21 @@
-$OpenBSD: patch-xmms_getopt_c,v 1.1 2002/08/31 07:15:11 wcobb Exp $
--- xmms/getopt.c.orig	Sat Aug 31 02:16:38 2002
-+++ xmms/getopt.c	Sat Aug 31 02:21:19 2002
-@@ -73,9 +73,10 @@
+$OpenBSD: patch-xmms_getopt_c,v 1.2 2004/04/15 19:23:46 naddy Exp $
+--- xmms/getopt.c.orig	1999-07-29 23:03:12.000000000 +0200
+++ xmms/getopt.c	2004-04-14 23:33:55.000000000 +0200
+@@ -73,11 +73,12 @@
 
 #ifdef VMS
 #include <unixlib.h>
 -#if HAVE_STRING_H - 0
 -#include <string.h>
 #endif
-+
-+#ifdef HAVE_STRING_H
-+#include <string.h>
 #endif
 
+#ifdef HAVE_STRING_H
+#include <string.h>
+
 #if defined (WIN32) && !defined (__CYGWIN32__)
+ /* It's not Unix, really.  See?  Capital letters.  */
+ #include <windows.h>
@@ -226,19 +227,6 @@ static char *
 	return 0;
 }
@ -40,7 +42,7 @@ $OpenBSD: patch-xmms_getopt_c,v 1.1 2002/08/31 07:15:11 wcobb Exp $
 			{
 -				if ((unsigned int) (nameend - nextchar)
 -				    == (unsigned int) strlen(p->name))
-+				if ((size_t) (nameend - nextchar)
+				if ((size_t) (nameend - nextchar)      
 +				    == strlen(p->name))
 				{
 					/* Exact match found.  */
--- a/audio/xmms/patches/patch-xmms_main_c
+++ b/audio/xmms/patches/patch-xmms_main_c
@ -1,20 +1,38 @@
-$OpenBSD: patch-xmms_main_c,v 1.5 2004/01/22 20:15:22 naddy Exp $
--- xmms/main.c.orig	2002-02-27 15:30:28.000000000 +0100
-+++ xmms/main.c	2004-01-22 20:41:37.000000000 +0100
-@@ -3387,7 +3387,8 @@ int main(int argc, char **argv)
+$OpenBSD: patch-xmms_main_c,v 1.6 2004/04/15 19:23:46 naddy Exp $
+--- xmms/main.c.orig	2004-02-23 21:31:43.000000000 +0100
+++ xmms/main.c	2004-04-14 23:33:55.000000000 +0200
+@@ -3390,6 +3390,18 @@ void segfault_handler(int sig)
+ 	exit(1);
+ }
+ 
+void sigterm_handler(int sig)
+{
+	/* Original author of patch said that you should not use mainwin_quit_cb(),
+	 * but his way deadlock xmms, and it anyhow just calls ctrlsocket stuff with
+	 * with CMD_QUIT, which anyhow calls mainwin_quit_cb() in turn.  This is not
+	 * entirely clean, but works.
+	 * <azarah@gentoo.org> (19 Jan 2003)
+	 */
+	xmms_remote_quit(ctrlsocket_get_session_id());
+	mainwin_quit_cb();
+}
+	
+ static gboolean pposition_configure(GtkWidget *w, GdkEventConfigure *event, gpointer data)
+ {
+ 	gint x,y;
+@@ -3521,12 +3533,15 @@ int main(int argc, char **argv)
 #endif
 
 	signal(SIGPIPE, SIG_IGN); /* for controlsocket.c */
-	signal(SIGSEGV, segfault_handler);
-+
+	signal(SIGTERM, sigterm_handler);
+	signal(SIGINT, sigterm_handler);
+ 	signal(SIGSEGV, segfault_handler);
 +#if !defined(OpenBSD)
 	g_thread_init(NULL);
+ 	gtk_set_locale();
 	if (!g_thread_supported())
- 	{
-@@ -3396,6 +3397,7 @@ int main(int argc, char **argv)
- 			 "installed LinuxThreads you need to recompile GLIB & GTK+\n"));
- 		exit(1);
- 	}
+ 		g_error(_("GLib does not support threads."));
+-
 +#endif
 	parse_cmd_line(argc, argv, &options);
 
--- a/audio/xmms/patches/patch-xmms_plugin_h
+++ b/audio/xmms/patches/patch-xmms_plugin_h
@ -1,11 +0,0 @@
-$OpenBSD: patch-xmms_plugin_h,v 1.2 2001/07/25 15:48:26 naddy Exp $
--- xmms/plugin.h.orig	Wed Mar  1 21:28:06 2000
-+++ xmms/plugin.h	Wed Jul 25 16:47:43 2001
-@@ -58,6 +58,7 @@ typedef struct
- 	int (*output_time) (void);	/* Return the current playing time */
- 	int (*written_time) (void);	/* Return the length of all the data that has been written to
- 					   the buffer */
-+	void (*cleanup) (void);		/* Called when the plugin is unloaded */
- }
- OutputPlugin;
- 
--- a/audio/xmms/patches/patch-xmms_pluginenum_c
+++ b/audio/xmms/patches/patch-xmms_pluginenum_c
@ -1,27 +0,0 @@
-$OpenBSD: patch-xmms_pluginenum_c,v 1.5 2002/04/06 19:32:39 pvalchev Exp $
--- xmms/pluginenum.c.orig	Wed Jan  2 07:21:32 2002
-+++ xmms/pluginenum.c	Sat Apr  6 12:15:28 2002
-@@ -35,6 +35,10 @@
- # define RTLD_NOW 0
- #endif
- 
-+#if defined(__OpenBSD__) && !defined(__ELF__)
-+# define SYMBOL_PREFIX "_"
-+#endif
-+
- 
- gchar *plugin_dir_list[] =
- {
-@@ -431,6 +435,12 @@ void cleanup_plugins(void)
- 	while (node)
- 	{
- 		op = (OutputPlugin *) node->data;
-+		if (op != NULL && op->cleanup != NULL) {
-+			op->cleanup();
-+			GDK_THREADS_LEAVE();
-+			while (g_main_iteration(FALSE));
-+			GDK_THREADS_ENTER();
-+		}
- 		close_dynamic_lib(op->handle);
- 		node = node->next;
- 	}
--- a/audio/xmms/patches/patch-xmms_visualization_c
+++ b/audio/xmms/patches/patch-xmms_visualization_c
@ -1,12 +0,0 @@
-$OpenBSD: patch-xmms_visualization_c,v 1.1 2002/09/03 01:19:07 wcobb Exp $
--- xmms/visualization.c.orig	Mon Sep  2 22:13:40 2002
-+++ xmms/visualization.c	Mon Sep  2 22:14:22 2002
-@@ -260,7 +260,7 @@ void vis_send_data(gint16 pcm_data[2][51
- 	gboolean mono_freq_calced = FALSE, stereo_freq_calced = FALSE;
- 	gint16 mono_pcm[2][512], stereo_pcm[2][512];
- 	gboolean mono_pcm_calced = FALSE, stereo_pcm_calced = FALSE;
-	gchar intern_vis_data[512];
-+	signed char intern_vis_data[512];
- 	gint i;
- 
- 	if (!pcm_data || nch < 1)
--- a/audio/xmms/pkg/PFRAG.shared
+++ b/audio/xmms/pkg/PFRAG.shared
@ -1,21 +1,19 @@
-@comment $OpenBSD: PFRAG.shared,v 1.8 2002/09/03 01:22:22 wcobb Exp $
-lib/libxmms.la
-lib/libxmms.so.3.1
-DYNLIBDIR(%B)
-lib/xmms/Output/libdisk_writer.so
-lib/xmms/Output/libsun.so
-lib/xmms/Input/libwav.so
-lib/xmms/Input/libtonegen.so
-lib/xmms/Input/libcdaudio.so
-lib/xmms/Input/libidcin.so
-lib/xmms/Effect/libvoice.so
+@comment $OpenBSD: PFRAG.shared,v 1.9 2004/04/15 19:23:46 naddy Exp $
 lib/xmms/Effect/libecho.so
 lib/xmms/Effect/libstereo.so
+lib/xmms/Effect/libvoice.so
 lib/xmms/General/libir.so
 lib/xmms/General/libsong_change.so
+lib/xmms/Input/libcdaudio.so
+lib/xmms/Input/libtonegen.so
+lib/xmms/Input/libwav.so
+lib/xmms/Output/libdisk_writer.so
+lib/xmms/Output/libsun.so
 lib/xmms/Visualization/libbscope.so
-lib/xmms/Visualization/libsanalyzer.so
 lib/xmms/Visualization/libogl_spectrum.so
+lib/xmms/Visualization/libsanalyzer.so
+lib/libxmms.so.4.1
+DYNLIBDIR(%D/lib)
@dirrm lib/xmms/Visualization
@dirrm lib/xmms/Output
@dirrm lib/xmms/Input
--- a/audio/xmms/pkg/PLIST
+++ b/audio/xmms/pkg/PLIST
@ -1,10 +1,7 @@
-@comment $OpenBSD: PLIST,v 1.4 2003/12/16 15:31:22 naddy Exp $
-bin/xmms-config
-bin/xmms
+@comment $OpenBSD: PLIST,v 1.5 2004/04/15 19:23:46 naddy Exp $
 bin/wmxmms
-%%SHARED%%
-man/man1/xmms.1
-man/man1/wmxmms.1
+bin/xmms
+bin/xmms-config
 include/xmms/configfile.h
 include/xmms/dirbrowser.h
 include/xmms/formatter.h
@ -13,21 +10,47 @@ include/xmms/plugin.h
 include/xmms/titlestring.h
 include/xmms/util.h
 include/xmms/xmmsctrl.h
+lib/libxmms.a
+lib/libxmms.la
+@comment lib/xmms/Effect/libecho.la
+@comment lib/xmms/Effect/libstereo.la
+@comment lib/xmms/Effect/libvoice.la
+@comment lib/xmms/General/libir.la
+@comment lib/xmms/General/libsong_change.la
+@comment lib/xmms/Input/libcdaudio.la
+@comment lib/xmms/Input/libmikmod.la
+@comment lib/xmms/Input/libmpg123.la
+@comment lib/xmms/Input/libtonegen.la
+@comment lib/xmms/Input/libvorbis.la
+@comment lib/xmms/Input/libwav.la
+@comment lib/xmms/Output/libdisk_writer.la
+@comment lib/xmms/Output/libesdout.la
+@comment lib/xmms/Output/libsun.la
+@comment lib/xmms/Visualization/libbscope.la
+@comment lib/xmms/Visualization/libogl_spectrum.la
+@comment lib/xmms/Visualization/libsanalyzer.la
+man/man1/wmxmms.1
+man/man1/xmms.1
+share/aclocal/xmms.m4
 share/doc/xmms/NEWS
 share/doc/xmms/README
-share/xmms/wmxmms.xpm
-share/aclocal/xmms.m4
 share/locale/af/LC_MESSAGES/xmms.mo
 share/locale/az/LC_MESSAGES/xmms.mo
+share/locale/be/LC_MESSAGES/xmms.mo
 share/locale/bg/LC_MESSAGES/xmms.mo
+share/locale/bs/LC_MESSAGES/xmms.mo
 share/locale/ca/LC_MESSAGES/xmms.mo
 share/locale/cs/LC_MESSAGES/xmms.mo
+share/locale/cy/LC_MESSAGES/xmms.mo
 share/locale/da/LC_MESSAGES/xmms.mo
 share/locale/de/LC_MESSAGES/xmms.mo
 share/locale/el/LC_MESSAGES/xmms.mo
+share/locale/en/LC_MESSAGES/xmms.mo
 share/locale/eo/LC_MESSAGES/xmms.mo
 share/locale/es/LC_MESSAGES/xmms.mo
+share/locale/et/LC_MESSAGES/xmms.mo
 share/locale/eu/LC_MESSAGES/xmms.mo
+share/locale/fi/LC_MESSAGES/xmms.mo
 share/locale/fr/LC_MESSAGES/xmms.mo
 share/locale/ga/LC_MESSAGES/xmms.mo
 share/locale/gl/LC_MESSAGES/xmms.mo
@ -36,11 +59,14 @@ share/locale/hu/LC_MESSAGES/xmms.mo
 share/locale/id/LC_MESSAGES/xmms.mo
 share/locale/it/LC_MESSAGES/xmms.mo
 share/locale/ja/LC_MESSAGES/xmms.mo
+share/locale/ka/LC_MESSAGES/xmms.mo
 share/locale/ko/LC_MESSAGES/xmms.mo
 share/locale/lt/LC_MESSAGES/xmms.mo
 share/locale/lv/LC_MESSAGES/xmms.mo
-share/locale/nn/LC_MESSAGES/xmms.mo
+share/locale/mk/LC_MESSAGES/xmms.mo
+share/locale/ms/LC_MESSAGES/xmms.mo
 share/locale/nl/LC_MESSAGES/xmms.mo
+share/locale/nn/LC_MESSAGES/xmms.mo
 share/locale/no/LC_MESSAGES/xmms.mo
 share/locale/pl/LC_MESSAGES/xmms.mo
 share/locale/pt/LC_MESSAGES/xmms.mo
@ -48,100 +74,58 @@ share/locale/pt_BR/LC_MESSAGES/xmms.mo
 share/locale/ro/LC_MESSAGES/xmms.mo
 share/locale/ru/LC_MESSAGES/xmms.mo
 share/locale/sk/LC_MESSAGES/xmms.mo
+share/locale/sl/LC_MESSAGES/xmms.mo
+share/locale/sq/LC_MESSAGES/xmms.mo
 share/locale/sr/LC_MESSAGES/xmms.mo
+share/locale/sr@Latn/LC_MESSAGES/xmms.mo
 share/locale/sv/LC_MESSAGES/xmms.mo
 share/locale/tg/LC_MESSAGES/xmms.mo
 share/locale/th/LC_MESSAGES/xmms.mo
 share/locale/tr/LC_MESSAGES/xmms.mo
 share/locale/uk/LC_MESSAGES/xmms.mo
+share/locale/uz/LC_MESSAGES/xmms.mo
 share/locale/vi/LC_MESSAGES/xmms.mo
 share/locale/wa/LC_MESSAGES/xmms.mo
+share/locale/zh_CN/LC_MESSAGES/xmms.mo
 share/locale/zh_TW/LC_MESSAGES/xmms.mo
-share/locale/zh_CN.GB2312/LC_MESSAGES/xmms.mo
+share/xmms/wmxmms.xpm
+%%SHARED%%
@dirrm share/xmms
@dirrm share/locale/zh_TW/LC_MESSAGES
@dirrm share/locale/zh_TW
-@dirrm share/locale/zh_CN.GB2312/LC_MESSAGES
-@dirrm share/locale/zh_CN.GB2312
-@dirrm share/locale/wa/LC_MESSAGES
-@dirrm share/locale/wa
-@dirrm share/locale/vi/LC_MESSAGES
-@dirrm share/locale/vi
-@dirrm share/locale/uk/LC_MESSAGES
-@dirrm share/locale/uk
-@dirrm share/locale/tr/LC_MESSAGES
-@dirrm share/locale/tr
+@dirrm share/locale/zh_CN/LC_MESSAGES
+@dirrm share/locale/zh_CN
+@dirrm share/locale/uz/LC_MESSAGES
+@dirrm share/locale/uz
@dirrm share/locale/th/LC_MESSAGES
@dirrm share/locale/th
@dirrm share/locale/tg/LC_MESSAGES
@dirrm share/locale/tg
-@dirrm share/locale/sv/LC_MESSAGES
-@dirrm share/locale/sv
-@dirrm share/locale/sr/LC_MESSAGES
-@dirrm share/locale/sr
-@dirrm share/locale/sk/LC_MESSAGES
-@dirrm share/locale/sk
-@dirrm share/locale/ru/LC_MESSAGES
-@dirrm share/locale/ru
-@dirrm share/locale/ro/LC_MESSAGES
-@dirrm share/locale/ro
-@dirrm share/locale/pt_BR/LC_MESSAGES
-@dirrm share/locale/pt_BR
-@dirrm share/locale/pt/LC_MESSAGES
-@dirrm share/locale/pt
-@dirrm share/locale/pl/LC_MESSAGES
-@dirrm share/locale/pl
-@dirrm share/locale/no/LC_MESSAGES
-@dirrm share/locale/no
-@dirrm share/locale/nn/LC_MESSAGES
-@dirrm share/locale/nn
-@dirrm share/locale/nl/LC_MESSAGES
-@dirrm share/locale/nl
+@dirrm share/locale/sr@Latn/LC_MESSAGES
+@dirrm share/locale/sr@Latn
+@dirrm share/locale/sq/LC_MESSAGES
+@dirrm share/locale/sq
+@dirrm share/locale/ms/LC_MESSAGES
+@dirrm share/locale/ms
+@dirrm share/locale/mk/LC_MESSAGES
+@dirrm share/locale/mk
@dirrm share/locale/lv/LC_MESSAGES
@dirrm share/locale/lv
-@dirrm share/locale/lt/LC_MESSAGES
-@dirrm share/locale/lt
-@dirrm share/locale/ko/LC_MESSAGES
-@dirrm share/locale/ko
-@dirrm share/locale/ja/LC_MESSAGES
-@dirrm share/locale/ja
-@dirrm share/locale/it/LC_MESSAGES
-@dirrm share/locale/it
-@dirrm share/locale/id/LC_MESSAGES
-@dirrm share/locale/id
-@dirrm share/locale/hu/LC_MESSAGES
-@dirrm share/locale/hu
-@dirrm share/locale/hr/LC_MESSAGES
-@dirrm share/locale/hr
-@dirrm share/locale/gl/LC_MESSAGES
-@dirrm share/locale/gl
-@dirrm share/locale/ga/LC_MESSAGES
-@dirrm share/locale/ga
-@dirrm share/locale/fr/LC_MESSAGES
-@dirrm share/locale/fr
-@dirrm share/locale/eu/LC_MESSAGES
-@dirrm share/locale/eu
-@dirrm share/locale/es/LC_MESSAGES
-@dirrm share/locale/es
+@dirrm share/locale/ka/LC_MESSAGES
+@dirrm share/locale/ka
@dirrm share/locale/eo/LC_MESSAGES
@dirrm share/locale/eo
-@dirrm share/locale/el/LC_MESSAGES
-@dirrm share/locale/el
-@dirrm share/locale/de/LC_MESSAGES
-@dirrm share/locale/de
-@dirrm share/locale/da/LC_MESSAGES
-@dirrm share/locale/da
-@dirrm share/locale/cs/LC_MESSAGES
-@dirrm share/locale/cs
-@dirrm share/locale/ca/LC_MESSAGES
-@dirrm share/locale/ca
+@dirrm share/locale/en/LC_MESSAGES
+@dirrm share/locale/en
+@dirrm share/locale/cy/LC_MESSAGES
+@dirrm share/locale/cy
+@dirrm share/locale/bs/LC_MESSAGES
+@dirrm share/locale/bs
@dirrm share/locale/bg/LC_MESSAGES
@dirrm share/locale/bg
-@dirrm share/locale/az/LC_MESSAGES
-@dirrm share/locale/az
+@dirrm share/locale/be/LC_MESSAGES
+@dirrm share/locale/be
@dirrm share/locale/af/LC_MESSAGES
@dirrm share/locale/af
-@dirrm share/locale
@dirrm share/doc/xmms
-@dirrm share/aclocal
@dirrm include/xmms