Bring this package closer to a working state. Configuring the "libxmms"

library doesn't work properly yet.

13 files changed, 160 insertions, 372 deletions

diff --git a/audio/xmms/Makefile b/audio/xmms/Makefile
index da1dae0ab6e..6c6b0fcbec4 100644
--- a/audio/xmms/Makefile
+++ b/audio/xmms/Makefile
@@ -1,10 +1,5 @@
-# New ports collection makefile for:	xmms
-# Version required:		1.0.1
-# Date created:			3 July 1999
-# Whom:				Espen Skoglund <esk@ira.uka.de>
-#
+# $NetBSD: Makefile,v 1.2 2000/03/07 23:03:12 tron Exp $
 # FreeBSD: ports/audio/xmms/Makefile,v 1.9 2000/02/11 01:46:12 cpiazza Exp
-#
 
 DISTNAME=	xmms-1.0.1
 CATEGORIES=	audio
@@ -16,20 +11,21 @@ MASTER_SITES=	ftp://ftp.xmms.org/xmms/1.0/ \
 		ftp://ftp.nl.xmms.org/xmms/1.0/ \
 		ftp://ftp.de.xmms.org/xmms/1.0/
 
-MAINTAINER=	esk@ira.uka.de
+MAINTAINER=	tron@netbsd.org
+HOMEPAGE=	http://www.xmms.org/
 
-LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
-		glib12.3:${PORTSDIR}/devel/glib12 \
-		xml.5:${PORTSDIR}/textproc/libxml
+DEPENDS+=	Mesa-*:../../graphics/Mesa
+DEPENDS+=	gtk+-1.2.*:../../x11/gtk
+DEPENDS+=	libmikmod>=3.1.7:../libmikmod
+DEPENDS+=	libxml>=1.8.5:../../textproc/libxml
+DEPENDS+=	mit-pthreads-*:../../devel/mit-pthreads
 
 USE_LIBTOOL=	yes
+USE_X11=	yes
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --without-gnome
-
-GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
-GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
-
-CONFIGURE_ENV=	GTK_CONFIG="${GTK_CONFIG}" \
- 		GLIB_CONFIG="${GLIB_CONFIG}"
+CC=		${LOCALBASE}/pthreads/bin/pgcc
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 post-extract:
 	@(cd ${WRKSRC}/Input/mpg123 && ${MV} decode_i586.s decode_i586.S && \
@@ -39,7 +35,4 @@ post-extract:
 	@${PERL} -pi.bak -e 's:blur_8.s:blur_8.S:g' \
 	    ${WRKSRC}/Visualization/blur_scope/Makefile.in
 
-post-install:
-	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
-
-.include <bsd.port.mk>
+.include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms/files/md5 b/audio/xmms/files/md5
index 21f7fe998d9..fb12e197882 100644
--- a/audio/xmms/files/md5
+++ b/audio/xmms/files/md5
@@ -1 +1,3 @@
+$NetBSD: md5,v 1.2 2000/03/07 23:03:13 tron Exp $
+
 MD5 (xmms-1.0.1.tar.gz) = 2d34665f32006ed83892de1d057176fd
diff --git a/audio/xmms/files/patch-sum b/audio/xmms/files/patch-sum
new file mode 100644
index 00000000000..e8d67827ec6
--- /dev/null
+++ b/audio/xmms/files/patch-sum
@@ -0,0 +1,10 @@
+$NetBSD: patch-sum,v 1.1 2000/03/07 23:03:13 tron Exp $
+
+MD5 (patch-aa) = ccac73d0e743c748cc116985cf7161cf
+MD5 (patch-ab) = 4030687175bf4bab9bb098150e15323a
+MD5 (patch-ac) = ff78dda0c8c7de0e796a04dd6ba6991c
+MD5 (patch-ad) = 0980675c9c1896eca7188bffd02d7cbd
+MD5 (patch-ae) = d27a91e144f260c7f369f793c2da3ca1
+MD5 (patch-af) = 0cb7493fcd03dc2e213a0c4cc0d1e63e
+MD5 (patch-ag) = ff4bbfada5d95d0a083cf60fdf2568bb
+MD5 (patch-ah) = 27624c39b2779ef2b2aaa024510c3bc0
diff --git a/audio/xmms/patches/patch-aa b/audio/xmms/patches/patch-aa
index 0d4fb8e9b94..d1d7c3cd886 100644
--- a/audio/xmms/patches/patch-aa
+++ b/audio/xmms/patches/patch-aa
@@ -1,19 +1,13 @@
-*** libxmms/configure.org	Wed Feb  2 13:33:43 2000
---- libxmms/configure	Wed Feb  2 13:33:56 2000
-***************
-*** 589,595 ****
-  # ./install, which can be erroneously created by make from ./install.sh.
-  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-  echo "configure:592: checking for a BSD compatible install" >&5
-! if test -z "$INSTALL"; then
-  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
---- 589,595 ----
-  # ./install, which can be erroneously created by make from ./install.sh.
-  echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-  echo "configure:592: checking for a BSD compatible install" >&5
-! if test -z "$NO__INSTALL"; then
-  if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
-    echo $ac_n "(cached) $ac_c" 1>&6
-  else
+$NetBSD: patch-aa,v 1.2 2000/03/07 23:03:13 tron Exp $
+
+--- Input/Makefile.in.orig	Mon Jan 31 19:44:35 2000
++++ Input/Makefile.in	Tue Mar  7 23:25:17 2000
+@@ -125,7 +125,7 @@
+ sidplay_library = @sidplay_library@
+ xmmsdir = @xmmsdir@
+ 
+-SUBDIRS = wav mpg123 mikmod cdaudio idcin
++SUBDIRS = wav mpg123 cdaudio idcin
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/audio/xmms/patches/patch-ab b/audio/xmms/patches/patch-ab
index 6737dede096..5a57e0b7f2d 100644
--- a/audio/xmms/patches/patch-ab
+++ b/audio/xmms/patches/patch-ab
@@ -1,76 +1,13 @@
-*** Makefile.in.org	Wed Feb  2 13:36:47 2000
---- Makefile.in	Wed Feb  2 13:37:01 2000
-***************
-*** 125,131 ****
-  sidplay_library = @sidplay_library@
-  xmmsdir = @xmmsdir@
-  
-! SUBDIRS = libxmms xmms Output Input Effect General Visualization wmxmms gnomexmms
-  
-  bin_SCRIPTS = xmms-config
-  
---- 125,131 ----
-  sidplay_library = @sidplay_library@
-  xmmsdir = @xmmsdir@
-  
-! SUBDIRS = libxmms xmms Output Input Effect General Visualization wmxmms
-  
-  bin_SCRIPTS = xmms-config
-  
-*** Visualization/Makefile.in.org	Wed Feb  2 13:37:14 2000
---- Visualization/Makefile.in	Wed Feb  2 13:37:26 2000
-***************
-*** 125,131 ****
-  sidplay_library = @sidplay_library@
-  xmmsdir = @xmmsdir@
-  
-! SUBDIRS = blur_scope sanalyzer opengl_spectrum
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-  CONFIG_HEADER = ../config.h
-  CONFIG_CLEAN_FILES = 
---- 125,131 ----
-  sidplay_library = @sidplay_library@
-  xmmsdir = @xmmsdir@
-  
-! SUBDIRS = blur_scope sanalyzer
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-  CONFIG_HEADER = ../config.h
-  CONFIG_CLEAN_FILES = 
-*** Input/Makefile.in.org	Wed Feb  2 13:38:23 2000
---- Input/Makefile.in	Wed Feb  2 13:38:40 2000
-***************
-*** 125,131 ****
-  sidplay_library = @sidplay_library@
-  xmmsdir = @xmmsdir@
-  
-! SUBDIRS = wav mpg123 mikmod cdaudio idcin
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-  CONFIG_HEADER = ../config.h
-  CONFIG_CLEAN_FILES = 
---- 125,131 ----
-  sidplay_library = @sidplay_library@
-  xmmsdir = @xmmsdir@
-  
-! SUBDIRS = wav mpg123 cdaudio idcin
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-  CONFIG_HEADER = ../config.h
-  CONFIG_CLEAN_FILES = 
-*** Output/Makefile.in.org	Wed Feb  2 13:39:06 2000
---- Output/Makefile.in	Wed Feb  2 13:39:17 2000
-***************
-*** 125,131 ****
-  sidplay_library = @sidplay_library@
-  xmmsdir = @xmmsdir@
-  
-! SUBDIRS = OSS esd disk_writer
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-  CONFIG_HEADER = ../config.h
-  CONFIG_CLEAN_FILES = 
---- 125,131 ----
-  sidplay_library = @sidplay_library@
-  xmmsdir = @xmmsdir@
-  
-! SUBDIRS = OSS disk_writer
-  mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-  CONFIG_HEADER = ../config.h
-  CONFIG_CLEAN_FILES = 
+$NetBSD: patch-ab,v 1.2 2000/03/07 23:03:13 tron Exp $
+
+--- Makefile.in.orig	Mon Jan 31 19:44:29 2000
++++ Makefile.in	Tue Mar  7 23:25:17 2000
+@@ -125,7 +125,7 @@
+ sidplay_library = @sidplay_library@
+ xmmsdir = @xmmsdir@
+ 
+-SUBDIRS = libxmms xmms Output Input Effect General Visualization wmxmms gnomexmms
++SUBDIRS = libxmms xmms Output Input Effect General Visualization wmxmms
+ 
+ bin_SCRIPTS = xmms-config
+ 
diff --git a/audio/xmms/patches/patch-ac b/audio/xmms/patches/patch-ac
index 7c592ad4fe9..52961d8e36f 100644
--- a/audio/xmms/patches/patch-ac
+++ b/audio/xmms/patches/patch-ac
@@ -1,36 +1,13 @@
-*** xmms/eq_graph.c.org	Wed Feb  2 21:12:51 2000
---- xmms/eq_graph.c	Wed Feb  2 21:13:07 2000
-***************
-*** 74,79 ****
---- 74,87 ----
-  	gfloat x[] =
-  	{0, 11, 23, 35, 47, 59, 71, 83, 97, 109}, yf[10];
-  
-+ 	/*
-+ 	 * This avoids the init_spline() function to be inlined.
-+ 	 * Inlining the function caused troubles when compiling with
-+ 	 * `-O' (at least on FreeBSD).
-+ 	 */
-+ 	void (*__init_spline)(gfloat *, gfloat *, gint, gfloat *) =
-+ 	    init_spline;
-+ 
-  	src = get_skin_pixmap(SKIN_EQMAIN);
-  	obj = eg->eg_widget.parent;
-  	gdk_draw_pixmap(obj, eg->eg_widget.gc, src, 0, 294, eg->eg_widget.x, eg->eg_widget.y, eg->eg_widget.width, eg->eg_widget.height);
-***************
-*** 83,89 ****
-  		cols[i] = gdk_image_get_pixel(img, 0, i);
-  	gdk_image_destroy(img);
-  
-! 	init_spline(x, cfg.equalizer_bands, 10, yf);
-  	for (i = 0; i < 109; i++)
-  	{
-  		y = 9 - (gint) ((eval_spline(x, cfg.equalizer_bands, yf, 10, i) * 9.0) / 20.0);
---- 91,97 ----
-  		cols[i] = gdk_image_get_pixel(img, 0, i);
-  	gdk_image_destroy(img);
-  
-! 	__init_spline(x, cfg.equalizer_bands, 10, yf);
-  	for (i = 0; i < 109; i++)
-  	{
-  		y = 9 - (gint) ((eval_spline(x, cfg.equalizer_bands, yf, 10, i) * 9.0) / 20.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
new file mode 100644
index 00000000000..2411cf2027d
--- /dev/null
+++ b/audio/xmms/patches/patch-ad
@@ -0,0 +1,13 @@
+$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-ae b/audio/xmms/patches/patch-ae
new file mode 100644
index 00000000000..fcf15e24004
--- /dev/null
+++ b/audio/xmms/patches/patch-ae
@@ -0,0 +1,20 @@
+$NetBSD: patch-ae,v 1.1 2000/03/07 23:03:13 tron Exp $
+
+--- configure.orig	Mon Jan 31 19:43:50 2000
++++ configure	Tue Mar  7 23:25:18 2000
+@@ -1340,6 +1340,7 @@
+ 
+ 
+ # Check for any special flags to pass to ltconfig.
++if false; then
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+ test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+@@ -1492,6 +1493,7 @@
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++fi
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
diff --git a/audio/xmms/patches/patch-af b/audio/xmms/patches/patch-af
new file mode 100644
index 00000000000..1ce29893526
--- /dev/null
+++ b/audio/xmms/patches/patch-af
@@ -0,0 +1,20 @@
+$NetBSD: patch-af,v 1.1 2000/03/07 23:03:13 tron Exp $
+
+--- libxmms/configure.orig	Tue Mar  7 23:25:18 2000
++++ libxmms/configure	Tue Mar  7 23:28:07 2000
+@@ -1473,6 +1473,7 @@
+ 
+ 
+ 
++if false; then
+ # Check for any special flags to pass to ltconfig.
+ libtool_flags="--cache-file=$cache_file"
+ test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+@@ -1626,6 +1627,7 @@
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
++fi
+ 
+ # Redirect the config.log output again, so that the ltconfig log is not
+ # clobbered by the next message.
diff --git a/audio/xmms/patches/patch-ag b/audio/xmms/patches/patch-ag
new file mode 100644
index 00000000000..0d4736b28da
--- /dev/null
+++ b/audio/xmms/patches/patch-ag
@@ -0,0 +1,28 @@
+$NetBSD: patch-ag,v 1.1 2000/03/07 23:03:13 tron Exp $
+
+--- xmms/eq_graph.c.orig	Wed Dec 22 01:43:20 1999
++++ xmms/eq_graph.c	Tue Mar  7 23:25:18 2000
+@@ -74,6 +74,14 @@
+ 	gfloat x[] =
+ 	{0, 11, 23, 35, 47, 59, 71, 83, 97, 109}, yf[10];
+ 
++	/*
++	 * This avoids the init_spline() function to be inlined.
++	 * Inlining the function caused troubles when compiling with
++	 * `-O' (at least on FreeBSD).
++	 */
++	void (*__init_spline)(gfloat *, gfloat *, gint, gfloat *) =
++	    init_spline;
++
+ 	src = get_skin_pixmap(SKIN_EQMAIN);
+ 	obj = eg->eg_widget.parent;
+ 	gdk_draw_pixmap(obj, eg->eg_widget.gc, src, 0, 294, eg->eg_widget.x, eg->eg_widget.y, eg->eg_widget.width, eg->eg_widget.height);
+@@ -83,7 +91,7 @@
+ 		cols[i] = gdk_image_get_pixel(img, 0, i);
+ 	gdk_image_destroy(img);
+ 
+-	init_spline(x, cfg.equalizer_bands, 10, yf);
++	__init_spline(x, cfg.equalizer_bands, 10, yf);
+ 	for (i = 0; i < 109; i++)
+ 	{
+ 		y = 9 - (gint) ((eval_spline(x, cfg.equalizer_bands, yf, 10, i) * 9.0) / 20.0);
diff --git a/audio/xmms/patches/patch-ah b/audio/xmms/patches/patch-ah
new file mode 100644
index 00000000000..f89ecab5b8c
--- /dev/null
+++ b/audio/xmms/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2000/03/07 23:03:13 tron Exp $
+
+--- libxmms/util.c.orig	Mon Nov 15 17:50:37 1999
++++ libxmms/util.c	Tue Mar  7 23:53:13 2000
+@@ -56,7 +56,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-ba b/audio/xmms/patches/patch-ba
deleted file mode 100644
index 3a33f541c0a..00000000000
--- a/audio/xmms/patches/patch-ba
+++ /dev/null
@@ -1,215 +0,0 @@
---- configure.orig	Mon Jan 31 10:43:50 2000
-+++ configure	Wed Feb  9 17:24:39 2000
-@@ -38,6 +38,8 @@
- ac_help="$ac_help
-   --disable-gtktest       Do not try to compile and run a test GTK program"
- ac_help="$ac_help
-+  --with-libxml-prefix=PFX   Prefix where libxml is installed (optional)"
-+ac_help="$ac_help
-   --with-esd-prefix=PFX   Prefix where ESD is installed (optional)"
- ac_help="$ac_help
-   --with-esd-exec-prefix=PFX Exec prefix where ESD is installed (optional)"
-@@ -1473,8 +1475,8 @@
- LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
- LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
- DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
--${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
--$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
-+${CONFIG_SHELL-/bin/sh} /usr/local/share/libtool/ltconfig --no-reexec \
-+$libtool_flags --no-verify --disable-ltlibs /usr/local/share/libtool/ltmain.sh $host \
- || { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
- 
- # Reload cache, that may have been modified by ltconfig
-@@ -1488,7 +1490,7 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+LIBTOOL_DEPS="/usr/local/share/libtool/ltconfig --disable-ltlibs /usr/local/share/libtool/ltmain.sh"
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-@@ -3010,48 +3012,69 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
--echo $ac_n "checking for xmlParseMemory in -lxml""... $ac_c" 1>&6
--echo "configure:3015: checking for xmlParseMemory in -lxml" >&5
--ac_lib_var=`echo xml'_'xmlParseMemory | sed 'y%./+-%__p_%'`
--if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  ac_save_LIBS="$LIBS"
--LIBS="-lxml -lz $LIBS"
--cat > conftest.$ac_ext <<EOF
--#line 3023 "configure"
--#include "confdefs.h"
--/* Override any gcc2 internal prototype to avoid an error.  */
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
--char xmlParseMemory();
-+LIBS=$LIBS_save
- 
--int main() {
--xmlParseMemory()
--; return 0; }
--EOF
--if { (eval echo configure:3034: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=yes"
--else
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_lib_$ac_lib_var=no"
-+# Check whether --with-libxml-prefix or --without-libxml-prefix was given.
-+if test "${with_libxml_prefix+set}" = set; then
-+  withval="$with_libxml_prefix"
-+  libxml_prefix="$withval"
-+else
-+  libxml_prefix=""
- fi
--rm -f conftest*
--LIBS="$ac_save_LIBS"
- 
-+if test x$libxml_prefix != x ; then
-+   libxml_args="$libxml_args --prefix=$libxml_prefix"
-+   if test x${XML_CONFIG+set} != xset ; then
-+      XML_CONFIG=$libxml_prefix/bin/xml-config
-+   fi
- fi
--if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--  XML_LIBS="-lxml -lz"
-+# Extract the first word of "xml-config", so it can be a program name with args.
-+set dummy xml-config; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:3035: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_path_XML_CONFIG'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  case "$XML_CONFIG" in
-+  /*)
-+  ac_cv_path_XML_CONFIG="$XML_CONFIG" # Let the user override the test with a path.
-+  ;;
-+  ?:/*)			 
-+  ac_cv_path_XML_CONFIG="$XML_CONFIG" # Let the user override the test with a dos path.
-+  ;;
-+  *)
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do 
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_path_XML_CONFIG="$ac_dir/$ac_word"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+  test -z "$ac_cv_path_XML_CONFIG" && ac_cv_path_XML_CONFIG="no"
-+  ;;
-+esac
-+fi
-+XML_CONFIG="$ac_cv_path_XML_CONFIG"
-+if test -n "$XML_CONFIG"; then
-+  echo "$ac_t""$XML_CONFIG" 1>&6
- else
-   echo "$ac_t""no" 1>&6
- fi
- 
-+if test "$XML_CONFIG" = "no" ; then
-+   echo "configure: warning: *** libxml not installed, disabling CDindex support ***" 1>&2
-+else
-+   XML_CFLAGS=`$XML_CONFIG $xmlconf_args --cflags`
-+   XML_LIBS=`$XML_CONFIG $xmlconf_args --libs`
-+   cat >> confdefs.h <<\EOF
-+#define WITH_CDINDEX 1
-+EOF
-+
-+fi
- 
--LIBS=$LIBS_save
- 
- # Check whether --with-esd-prefix or --without-esd-prefix was given.
- if test "${with_esd_prefix+set}" = set; then
-@@ -4506,46 +4529,6 @@
- fi
- done
- 
--for ac_hdr in gnome-xml/parser.h
--do
--ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
--echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
--echo "configure:4514: checking for $ac_hdr" >&5
--if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
--  echo $ac_n "(cached) $ac_c" 1>&6
--else
--  cat > conftest.$ac_ext <<EOF
--#line 4519 "configure"
--#include "confdefs.h"
--#include <$ac_hdr>
--EOF
--ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:4524: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
--if test -z "$ac_err"; then
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=yes"
--else
--  echo "$ac_err" >&5
--  echo "configure: failed program was:" >&5
--  cat conftest.$ac_ext >&5
--  rm -rf conftest*
--  eval "ac_cv_header_$ac_safe=no"
--fi
--rm -f conftest*
--fi
--if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
--  echo "$ac_t""yes" 1>&6
--    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
--  cat >> confdefs.h <<EOF
--#define $ac_tr_hdr 1
--EOF
-- 
--else
--  echo "$ac_t""no" 1>&6
--fi
--done
--
- 
- echo $ac_n "checking for sched_setscheduler""... $ac_c" 1>&6
- echo "configure:4552: checking for sched_setscheduler" >&5
-@@ -4818,16 +4801,6 @@
-   HAVE_LINUX_JOYSTICK_FALSE=
- fi
- 
--if test "x$ac_cv_header_gnome_xml_parser_h" = "xyes" && test "x$ac_cv_lib_xml_xmlParseMemory" = "xyes"
--then
--      cat >> confdefs.h <<\EOF
--#define WITH_CDINDEX 1
--EOF
--
--else
--      echo "configure: warning: *** libxml not installed, disabling CDindex support ***" 1>&2
--fi
--
- 
- echo $ac_n "checking machine architecture""... $ac_c" 1>&6
- echo "configure:4834: checking machine architecture" >&5
-@@ -4898,7 +4871,7 @@
- if test "$ARCH_TYPE" = "i386" || test "$ARCH_TYPE" = "i486" || test "$ARCH_TYPE" = "i586" ||
-    test "$ARCH_TYPE" = "i686" || test "$ARCH_TYPE" = "i86pc"
- then
--	CFLAGS="$CFLAGS -m486"
-+	CFLAGS="$CFLAGS"
- 	ARCH_DEFINES="-DI386_ASSEM"
- else
- 	ARCH_DEFINES=""
-@@ -5145,6 +5118,7 @@
- s%@OPENGL_LIBS@%$OPENGL_LIBS%g
- s%@HAVE_OPENGL_TRUE@%$HAVE_OPENGL_TRUE%g
- s%@HAVE_OPENGL_FALSE@%$HAVE_OPENGL_FALSE%g
-+s%@XML_CONFIG@%$XML_CONFIG%g
- s%@XML_LIBS@%$XML_LIBS%g
- s%@ESD_CONFIG@%$ESD_CONFIG%g
- s%@ESD_CFLAGS@%$ESD_CFLAGS%g
diff --git a/audio/xmms/pkg/PLIST b/audio/xmms/pkg/PLIST
index dd1ed4bc9c9..b6c8d8ee951 100644
--- a/audio/xmms/pkg/PLIST
+++ b/audio/xmms/pkg/PLIST
@@ -1,3 +1,4 @@
+@comment $NetBSD: PLIST,v 1.2 2000/03/07 23:03:14 tron Exp $
 bin/xmms
 bin/wmxmms
 bin/xmms-config
@@ -8,11 +9,6 @@ include/xmms/util.h
 include/xmms/fullscreen.h
 include/xmms/dga.h
 include/xmms/plugin.h
-lib/libxmms.so.1
-@exec ln -fs %D/%F %B/libxmms.so
-@exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %D/lib
-@unexec rm -f %B/libxmms.so
-@unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
 lib/xmms/Output/libOSS.so
 lib/xmms/Output/libdisk_writer.so
 lib/xmms/Input/libwav.so
@@ -27,7 +23,7 @@ lib/xmms/General/libir.so
 lib/xmms/General/libsong_change.so
 lib/xmms/Visualization/libbscope.so
 lib/xmms/Visualization/libsanalyzer.so
-lib/libxmms.la
+lib/libxmms.so.1.0
 lib/libxmms.a
 share/aclocal/xmms.m4
 share/xmms/wmxmms.xpm