Update xsidplay to 1.6.5.1a. Changes:

 * Compiles on NetBSD (:-), in contrast to the present/old version;
   May still need work on NetBSD-current (2.0G)
 * No list of changes available either in xsidplay sources nor
   on the homepage

5 files changed, 71 insertions, 334 deletions

diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 985660c3408..e87cde59b58 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.27 2004/04/18 04:06:31 snj Exp $
+# $NetBSD: Makefile,v 1.28 2004/09/17 23:21:27 hubertf Exp $
 #
 
-DISTNAME=	xsidplay-1_5_4
-PKGNAME=	xsidplay-1.5.4
-PKGREVISION=	1
+DISTNAME=	xsidplay-1.6.5.1a
 CATEGORIES=	audio x11
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
 EXTRACT_SUFX=	.tgz
@@ -12,21 +10,20 @@ MAINTAINER=	pooka@NetBSD.org
 HOMEPAGE=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/
 COMMENT=	Commodore 64 music player and SID chip emulator for X11
 
-WRKSRC=			${WRKDIR}/xsidplay-1.5.4
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-USE_X11BASE=		yes
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
 
 CONFIGURE_ARGS+=	--with-qt-dir=${QTDIR}
+CONFIGURE_ENV+=		DISABLE_ESD_TEST=yes
+CONFIGURE_ENV+=		DISABLE_ARTSD_TEST=yes
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin
 
 .include "../../audio/libsidplay/buildlink3.mk"
-.include "../../x11/qt2-libs/buildlink3.mk"
+.include "../../x11/qt3-libs/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xsidplay/distinfo b/audio/xsidplay/distinfo
index 845ab17dcae..48f8bf3b343 100644
--- a/audio/xsidplay/distinfo
+++ b/audio/xsidplay/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/03/15 02:15:11 dmcmahill Exp $
+$NetBSD: distinfo,v 1.5 2004/09/17 23:21:27 hubertf Exp $
 
-SHA1 (xsidplay-1_5_4.tgz) = 998c8a327884a2519a61198cf116928abfd3fe86
-Size (xsidplay-1_5_4.tgz) = 362710 bytes
-SHA1 (patch-aa) = f842f79d01bf4bdc1c5ae5d4b05922b143828088
-SHA1 (patch-ab) = d7f307b76a7221d28c2a8c45698cba1fca1d0e25
-SHA1 (patch-ac) = 94187025d2f61e5cd6915d46958f087ed9fd4179
+SHA1 (xsidplay-1.6.5.1a.tgz) = 60f2262a8dd79b276272d49eff9a07277dc6c9aa
+Size (xsidplay-1.6.5.1a.tgz) = 355698 bytes
+SHA1 (patch-aa) = ef685ad02fd72aac03c4a2379547578717a0830b
diff --git a/audio/xsidplay/patches/patch-aa b/audio/xsidplay/patches/patch-aa
index ee4cc2f99f7..ce08ba732f2 100644
--- a/audio/xsidplay/patches/patch-aa
+++ b/audio/xsidplay/patches/patch-aa
@@ -1,53 +1,63 @@
-$NetBSD: patch-aa,v 1.8 2003/03/15 02:15:12 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.9 2004/09/17 23:21:27 hubertf Exp $
 
---- src/Makefile.in.orig	Thu Oct 26 11:51:21 2000
-+++ src/Makefile.in	Fri Mar 14 20:54:45 2003
-@@ -105,5 +105,5 @@
- bin_PROGRAMS = xsidplay
- 
--xsidplay_LDADD = audio/libaudio.a stilview/libstilview.a songlendb/libsonglendb.a tools/libtools.a widgets/libwidgets.a @SIDPLAY_LDFLAGS@ -lsidplay @QT_LDFLAGS@ -lqt
-+xsidplay_LDADD = audio/libaudio.a stilview/libstilview.a songlendb/libsonglendb.a tools/libtools.a widgets/libwidgets.a @SIDPLAY_LDFLAGS@ -lsidplay @QT_LDFLAGS@ -lX11 -lXext -lICE -lSM -lqt @LIBAUDIO@
- 
- 
-@@ -140,4 +140,6 @@
- CXXCOMPILE = $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
- LTCXXCOMPILE = $(LIBTOOL) --mode=compile $(CXX) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
-+CXXCOMPILE_NOOPT = $(CXXCOMPILE:-O%=)
-+LTCXXCOMPILE_NOOPT = $(LTCXXCOMPILE:-O%=)
- CXXLD = $(CXX)
- CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) -o $@
-@@ -159,5 +161,5 @@
- all: all-redirect
- .SUFFIXES:
--.SUFFIXES: .S .c .cpp .lo .o .s
-+.SUFFIXES:  .S .c .cxx .cpp .lo .o .s
- $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
- 	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
-@@ -239,4 +241,11 @@
- 	$(LTCXXCOMPILE) -c $<
- 
-+.cxx.o:
-+	$(CXXCOMPILE_NOOPT) -c $<
-+.cxx.lo:
-+	$(LTCXXCOMPILE_NOOPT) -c $<
-+.cpp.cxx:
-+	cp $< $@
-+
- # This directory's subdirectories are mostly independent; you can cd
- # into them and run `make' without going through this Makefile.
-@@ -515,2 +524,15 @@
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-+
-+# problem files  -- compile with no optimization
-+ifeq (${MACHINE_ARCH},alpha)
-+moc_FilterDialogData.o: moc_FilterDialogData.cxx
-+moc_MainDialog.o: moc_MainDialog.cxx
-+moc_MainDialogData.o: moc_MainDialogData.cxx
-+moc_MixerDialog.o: moc_MixerDialog.cxx
-+moc_MixerDialogData.o:  moc_MixerDialogData.cxx
-+moc_PlaylistDialog.o: moc_PlaylistDialog.cxx
-+moc_PlaylistEditDialog.o: moc_PlaylistEditDialog.cxx
-+moc_PlaylistEditDialogData.o: moc_PlaylistEditDialogData.cxx
-+endif
-+
+--- configure.orig	2003-02-01 21:18:09.000000000 +0100
++++ configure
+@@ -6577,6 +6577,7 @@ else
+ fi
+  
+ 
++if test -z "$DISABLE_ARTSD_TEST"; then
+ # aRts (KDE Sound Server).
+ # Extract the first word of "artsc-config", so it can be a program name with args.
+ set dummy artsc-config; ac_word=$2
+@@ -6622,6 +6623,7 @@ EOF
+     ARTSC_INCLUDES="`$ARTSC_CONFIG --cflags`"
+     ARTSC_LDADD="`$ARTSC_CONFIG --libs`"
+ fi
++fi # DISABLE_ARTSD_TEST
+ 
+ 
+ if test -n "$ARTSC_CONFIG"; then
+@@ -6634,7 +6636,7 @@ fi
+ 
+ 
+ 
+-
++if test -z "$DISABLE_ESD_TEST"; then
+ # Enlightenment Sound Daemon.
+ # Extract the first word of "esd-config", so it can be a program name with args.
+ set dummy esd-config; ac_word=$2
+@@ -6680,6 +6682,7 @@ EOF
+     ESD_INCLUDES="`$ESD_CONFIG --cflags`"
+     ESD_LDADD="`$ESD_CONFIG --libs`"
+ fi
++fi # DISABLE_ESD_TEST
+ 
+ 
+ if test -n "$ESD_CONFIG"; then
+@@ -7789,6 +7792,7 @@ fi
+     done
+ 
+ my_qt_includes=$qt_incdir
++my_qt_lib=-lqt
+ 
+     qt_libdir=""
+     for i in $qt_libdirs;
+@@ -7797,6 +7801,8 @@ my_qt_includes=$qt_incdir
+         do
+ 	        if test -r "$i/$j"; then
+ 		        qt_libdir=$i
++			my_qt_lib=-lqt-mt
++			echo "Using multi-threaded version of Qt lib (libqt-mt)"
+                 break 2
+             fi
+         done
+@@ -7886,7 +7892,7 @@ echo "configure:7879: checking for Qt ve
+     CXX="${SHELL-/bin/sh} ${srcdir}/libtool $CXX"
+     CXXFLAGS="$CXXFLAGS $QT_INCLUDES"
+     LDFLAGS="$LDFLAGS $QT_LDFLAGS"
+-    LIBS="$LIBS -lqt"
++    LIBS="$LIBS ${my_qt_lib}"
+ 
+     cat > conftest.$ac_ext <<EOF
+ #line 7893 "configure"
diff --git a/audio/xsidplay/patches/patch-ab b/audio/xsidplay/patches/patch-ab
deleted file mode 100644
index 625a8d4d8e2..00000000000
--- a/audio/xsidplay/patches/patch-ab
+++ /dev/null
@@ -1,255 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2000/10/29 08:54:54 pooka Exp $
-
---- configure.orig	Thu Oct 26 18:40:22 2000
-+++ configure	Sat Oct 28 15:19:05 2000
-@@ -1876,10 +1876,47 @@
- done
- 
- 
-+echo $ac_n "checking for main in -lossaudio""... $ac_c" 1>&6
-+echo "configure:1881: checking for main in -lossaudio" >&5
-+ac_lib_var=`echo ossaudio'_'main | 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="-lossaudio  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 1889 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+main()
-+; return 0; }
-+EOF
-+if { (eval echo configure:1896: \"$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"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
-+
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  LIBAUDIO=-lossaudio 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+ 
-+
- # Extract the first word of "cp", so it can be a program name with args.
- set dummy cp; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1883: checking for $ac_word" >&5
-+echo "configure:1920: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_path_CP'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -1914,7 +1951,7 @@
- 
- 
- echo $ac_n "checking which audio driver to install""... $ac_c" 1>&6
--echo "configure:1918: checking which audio driver to install" >&5
-+echo "configure:1955: checking which audio driver to install" >&5
- my_have_audio_driver=no
- case "$host" in 
-   *linux*) my_have_audio_driver=yes
-@@ -2032,7 +2069,7 @@
- fi
- 
- echo $ac_n "checking build system type""... $ac_c" 1>&6
--echo "configure:2036: checking build system type" >&5
-+echo "configure:2073: checking build system type" >&5
- 
- build_alias=$build
- case "$build_alias" in
-@@ -2052,7 +2089,7 @@
- # Extract the first word of "ranlib", so it can be a program name with args.
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2056: checking for $ac_word" >&5
-+echo "configure:2093: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2082,7 +2119,7 @@
- # Extract the first word of "gcc", so it can be a program name with args.
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2086: checking for $ac_word" >&5
-+echo "configure:2123: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2112,7 +2149,7 @@
-   # Extract the first word of "cc", so it can be a program name with args.
- set dummy cc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2116: checking for $ac_word" >&5
-+echo "configure:2153: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2163,7 +2200,7 @@
-       # Extract the first word of "cl", so it can be a program name with args.
- set dummy cl; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2167: checking for $ac_word" >&5
-+echo "configure:2204: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2195,7 +2232,7 @@
- fi
- 
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
--echo "configure:2199: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
-+echo "configure:2236: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
- 
- ac_ext=c
- # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
-@@ -2206,12 +2243,12 @@
- 
- cat > conftest.$ac_ext << EOF
- 
--#line 2210 "configure"
-+#line 2247 "configure"
- #include "confdefs.h"
- 
- main(){return(0);}
- EOF
--if { (eval echo configure:2215: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2252: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   ac_cv_prog_cc_works=yes
-   # If we can't run a trivial program, we are probably using a cross compiler.
-   if (./conftest; exit) 2>/dev/null; then
-@@ -2237,12 +2274,12 @@
-   { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
- fi
- echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
--echo "configure:2241: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
-+echo "configure:2278: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
- echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
- cross_compiling=$ac_cv_prog_cc_cross
- 
- echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
--echo "configure:2246: checking whether we are using GNU C" >&5
-+echo "configure:2283: checking whether we are using GNU C" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2251,7 +2288,7 @@
-   yes;
- #endif
- EOF
--if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2255: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-+if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:2292: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
-   ac_cv_prog_gcc=yes
- else
-   ac_cv_prog_gcc=no
-@@ -2270,7 +2307,7 @@
- ac_save_CFLAGS="$CFLAGS"
- CFLAGS=
- echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
--echo "configure:2274: checking whether ${CC-cc} accepts -g" >&5
-+echo "configure:2311: checking whether ${CC-cc} accepts -g" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2313,7 +2350,7 @@
- if test "$ac_cv_prog_gcc" = yes; then
-   # Check if gcc -print-prog-name=ld gives a path.
-   echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
--echo "configure:2317: checking for ld used by GCC" >&5
-+echo "configure:2354: checking for ld used by GCC" >&5
-   ac_prog=`($CC -print-prog-name=ld) 2>&5`
-   case "$ac_prog" in
-     # Accept absolute paths.
-@@ -2337,10 +2374,10 @@
-   esac
- elif test "$with_gnu_ld" = yes; then
-   echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
--echo "configure:2341: checking for GNU ld" >&5
-+echo "configure:2378: checking for GNU ld" >&5
- else
-   echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
--echo "configure:2344: checking for non-GNU ld" >&5
-+echo "configure:2381: checking for non-GNU ld" >&5
- fi
- if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2375,7 +2412,7 @@
- fi
- test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
- echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
--echo "configure:2379: checking if the linker ($LD) is GNU ld" >&5
-+echo "configure:2416: checking if the linker ($LD) is GNU ld" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2391,7 +2428,7 @@
- 
- 
- echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
--echo "configure:2395: checking for BSD-compatible nm" >&5
-+echo "configure:2432: checking for BSD-compatible nm" >&5
- if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2427,7 +2464,7 @@
- echo "$ac_t""$NM" 1>&6
- 
- echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
--echo "configure:2431: checking whether ln -s works" >&5
-+echo "configure:2468: checking whether ln -s works" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-@@ -2481,8 +2518,8 @@
- case "$lt_target" in
- *-*-irix6*)
-   # Find out which ABI we are using.
--  echo '#line 2485 "configure"' > conftest.$ac_ext
--  if { (eval echo configure:2486: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+  echo '#line 2522 "configure"' > conftest.$ac_ext
-+  if { (eval echo configure:2523: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-     case "`/usr/bin/file conftest.o`" in
-     *32-bit*)
-       LD="${LD-ld} -32"
-@@ -2503,19 +2540,19 @@
-   SAVE_CFLAGS="$CFLAGS"
-   CFLAGS="$CFLAGS -belf"
-   echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
--echo "configure:2507: checking whether the C compiler needs -belf" >&5
-+echo "configure:2544: checking whether the C compiler needs -belf" >&5
- if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2512 "configure"
-+#line 2549 "configure"
- #include "confdefs.h"
- 
- int main() {
- 
- ; return 0; }
- EOF
--if { (eval echo configure:2519: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+if { (eval echo configure:2556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   lt_cv_cc_needs_belf=yes
- else
-@@ -2809,6 +2846,7 @@
- s%@QT_INCLUDES@%$QT_INCLUDES%g
- s%@QT_LDFLAGS@%$QT_LDFLAGS%g
- s%@MOC@%$MOC%g
-+s%@LIBAUDIO@%$LIBAUDIO%g
- s%@CP@%$CP%g
- s%@build@%$build%g
- s%@build_alias@%$build_alias%g
diff --git a/audio/xsidplay/patches/patch-ac b/audio/xsidplay/patches/patch-ac
deleted file mode 100644
index 0d9b46bde42..00000000000
--- a/audio/xsidplay/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.5 2002/12/09 02:32:55 hubertf Exp $
-
---- src/tools/TextFile.cpp.orig	Wed Oct 11 20:01:40 2000
-+++ src/tools/TextFile.cpp
-@@ -27,6 +27,8 @@
- #include <strstream.h>
- #endif
- 
-+#define strnicmp strncasecmp		/* HF */
-+
- #include <sidplay/compconf.h>
- #include <sidplay/fformat.h>  // strnicmp stuff
-