4 files changed, 21 insertions, 28 deletions

diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 19e5f8123993..b50e0a9b8faf 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	xsidplay
-PORTVERSION=	1.5.4
+PORTVERSION=	1.6b11
 CATEGORIES=	audio emulators
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/ \
 		http://www.freenix.no/~anders/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./_/g}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	anders@fix.no
@@ -25,11 +24,13 @@ USE_LIBTOOL=	yes
 CONFIGURE_ENV=	MOC="${X11BASE}/bin/moc2"
 CONFIGURE_ARGS=	--with-qt-includes=${X11BASE}/include/qt2 \
 		--with-qt-libraries=${X11BASE}/lib \
-		--with-sidplay-includes=${LOCALBASE}/include \
-		--with-sidplay-library=${LOCALBASE}/lib \
+		--with-sidplay-inc=${LOCALBASE}/include \
+		--with-sidplay-lib=${LOCALBASE}/lib \
 		--with-x-includes=${X11BASE}/include \
 		--with-x-libraries=${X11BASE}/lib
 
+CFLAGS+=	-D_THREAD_SAFE
+
 .include <bsd.port.pre.mk>
 
 .if ${MACHINE_ARCH} == "alpha"
diff --git a/audio/xsidplay/distinfo b/audio/xsidplay/distinfo
index 2d0ecfc49cd1..eb2da73e708f 100644
--- a/audio/xsidplay/distinfo
+++ b/audio/xsidplay/distinfo
@@ -1 +1 @@
-MD5 (xsidplay-1_5_4.tgz) = ce3551a55e24c64adfb16bd8c4e4b29f
+MD5 (xsidplay-1.6b11.tgz) = 4d0150bfbf238eb304d8a9c5efbf9e5d
diff --git a/audio/xsidplay/files/patch-aa b/audio/xsidplay/files/patch-aa
index b73845642a23..ccaef2e4f4ce 100644
--- a/audio/xsidplay/files/patch-aa
+++ b/audio/xsidplay/files/patch-aa
@@ -1,19 +1,11 @@
---- configure.orig	Fri Oct 27 00:40:22 2000
-+++ configure	Tue Dec 12 02:14:04 2000
-@@ -1629,14 +1629,14 @@
+--- src/songlendb/Makefile.in.old	Sun Oct 22 22:36:00 2000
++++ src/songlendb/Makefile.in	Sun Oct 22 22:36:21 2000
+@@ -95,7 +95,7 @@
+ LIBRARIES =  $(noinst_LIBRARIES)
  
  
- 
--if test "$qt_includes" = "$x_includes" || test -z "$qt_includes"; then
-+if test -z "$qt_includes"; then
-  QT_INCLUDES="";
- else
-  QT_INCLUDES="-I$qt_includes"
-  all_includes="$QT_INCLUDES $all_includes"
- fi
- 
--if test "$qt_libraries" = "$x_libraries" || test -z "$qt_libraries"; then
-+if test -z "$qt_libraries"; then
-  QT_LDFLAGS=""
- else
-  QT_LDFLAGS="-L$qt_libraries"
+-DEFS = @DEFS@ -I. -I$(srcdir) 
++DEFS = @DEFS@ -I. -I$(srcdir) -I$(LOCALBASE)/include
+ CPPFLAGS = @CPPFLAGS@
+ LDFLAGS = @LDFLAGS@
+ LIBS = @LIBS@
diff --git a/audio/xsidplay/files/patch-ac b/audio/xsidplay/files/patch-ac
index 61b25cc79cbc..0aef37604cc6 100644
--- a/audio/xsidplay/files/patch-ac
+++ b/audio/xsidplay/files/patch-ac
@@ -1,11 +1,11 @@
---- src/Makefile.in.orig	Fri Oct 27 00:51:21 2000
-+++ src/Makefile.in	Tue Dec 12 01:43:35 2000
-@@ -104,7 +104,7 @@
+--- src/Makefile.in.old	Sun Mar  4 17:17:22 2001
++++ src/Makefile.in	Sun Mar  4 17:17:38 2001
+@@ -105,7 +105,7 @@
  
  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@ -lqt2
+-xsidplay_LDADD = audio/libaudio.a $(LIBAUDIO) stilview/libstilview.a songlendb/libsonglendb.a tools/libtools.a widgets/libwidgets.a wrapper/libwrapper.a $(SIDPLAY_LIBADD) $(LIBTSID) $(X_LDFLAGS) $(X_EXTRA_LIBS) $(X_PRE_LIBS) -lX11 $(QT_LDFLAGS) -lqt-mt
++xsidplay_LDADD = audio/libaudio.a $(LIBAUDIO) stilview/libstilview.a songlendb/libsonglendb.a tools/libtools.a widgets/libwidgets.a wrapper/libwrapper.a $(SIDPLAY_LIBADD) $(LIBTSID) $(X_LDFLAGS) $(X_EXTRA_LIBS) $(X_PRE_LIBS) -lX11 $(QT_LDFLAGS) -lqt2-mt -pthread
  
  
- xsidplay_SOURCES = $(BUILT_SOURCES) AudioDialog.cpp AudioDialog.h AudioDialogData.cpp AudioDialogData.h ConfigC.cpp ConfigC.h ConfigFile.cpp ConfigFile.h ConfigFileOld.cpp ConfigFileOld.h EmuDialog.cpp EmuDialog.h EmuDialogData.cpp EmuDialogData.h FilterDialog.cpp FilterDialog.h FilterDialogData.cpp FilterDialogData.h GlobalIcon.h HVSC_Dialog.cpp HVSC_Dialog.h HVSC_DialogData.cpp HVSC_DialogData.h HVSC_Config.h HistoryDialog.cpp HistoryDialog.h HistoryDialogData.cpp HistoryDialogData.h HistoryFile.cpp HistoryFile.h HistoryItem.h MainDialog.cpp MainDialog.h MainDialogData.cpp MainDialogData.h MixerConfig.h MixerDialog.cpp MixerDialog.h MixerDialogData.cpp MixerDialogData.h Player.h Player.cpp Playlist.cpp Playlist.h PlaylistDialog.cpp PlaylistDialog.h PlaylistDialogData.cpp PlaylistDialogData.h PlaylistEditDialog.cpp PlaylistEditDialog.h PlaylistEditDialogData.cpp PlaylistEditDialogData.h PlaylistCheck.cpp PlaylistCheck.h PlaylistItem.h PlaylistOptDialog.cpp PlaylistOptDialog.h StilDialog.cpp StilDialog.h WaveViewDialog.cpp WaveViewDialog.h WaveViewDialogData.cpp WaveViewDialogData.h WidgetOffset.cpp WidgetOffset.h myTimer.h filenames.h xsidplay.cpp
+ xsidplay_SOURCES = $(BUILT_SOURCES) AudioDialog.cpp AudioDialog.h AudioDialogData.cpp AudioDialogData.h ConfigC.cpp ConfigC.h ConfigFile.cpp ConfigFile.h ConfigFileOld.cpp ConfigFileOld.h EmuDialog.cpp EmuDialog.h EmuDialogData.cpp EmuDialogData.h FilterDialog.cpp FilterDialog.h FilterDialogData.cpp FilterDialogData.h GlobalIcon.h HVSC_Dialog.cpp HVSC_Dialog.h HVSC_DialogData.cpp HVSC_DialogData.h HVSC_Config.h HistoryDialog.cpp HistoryDialog.h HistoryDialogData.cpp HistoryDialogData.h HistoryFile.cpp HistoryFile.h HistoryItem.h MainDialog.cpp MainDialog.h MainDialogData.cpp MainDialogData.h MixerConfig.h MixerDialog.cpp MixerDialog.h MixerDialogData.cpp MixerDialogData.h Player.h Player.cpp Playlist.cpp Playlist.h PlaylistDialog.cpp PlaylistDialog.h PlaylistDialogData.cpp PlaylistDialogData.h PlaylistEditDialog.cpp PlaylistEditDialog.h PlaylistEditDialogData.cpp PlaylistEditDialogData.h PlaylistCheck.cpp PlaylistCheck.h PlaylistItem.h PlaylistOptDialog.cpp PlaylistOptDialog.h StilDialog.cpp StilDialog.h WidgetOffset.cpp WidgetOffset.h filenames.h xsidplay.cpp