Upgrade to 1.5.4

PR: 24008
Submitted by: MAINTAINER

5 files changed, 23 insertions, 26 deletions

diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index b789be40bdc..781e26f78bd 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xsidplay
-PORTVERSION=	1.5.2
+PORTVERSION=	1.5.4
 CATEGORIES=	audio emulators
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/ \
 		http://www.freenix.no/~anders/
diff --git a/audio/xsidplay/distinfo b/audio/xsidplay/distinfo
index b33ac8b12ad..2d0ecfc49cd 100644
--- a/audio/xsidplay/distinfo
+++ b/audio/xsidplay/distinfo
@@ -1 +1 @@
-MD5 (xsidplay-1_5_2.tgz) = 4cd00c3b17a133379ecace9b36d3d81d
+MD5 (xsidplay-1_5_4.tgz) = ce3551a55e24c64adfb16bd8c4e4b29f
diff --git a/audio/xsidplay/files/patch-aa b/audio/xsidplay/files/patch-aa
index 6e6fcc29a2b..b73845642a2 100644
--- a/audio/xsidplay/files/patch-aa
+++ b/audio/xsidplay/files/patch-aa
@@ -1,11 +1,19 @@
---- configure.orig	Mon Sep 18 19:55:14 2000
-+++ configure	Tue Sep 19 00:48:06 2000
-@@ -1480,7 +1480,7 @@
- # Check whether --with-qt-dir or --without-qt-dir was given.
- if test "${with_qt_dir+set}" = set; then
-   withval="$with_qt_dir"
--    ac_qt_includes="$withval"/include
-+    ac_qt_includes="$withval"/include/qt2
-        ac_qt_libraries="$withval"/lib
-     
+--- configure.orig	Fri Oct 27 00:40:22 2000
++++ configure	Tue Dec 12 02:14:04 2000
+@@ -1629,14 +1629,14 @@
+ 
+ 
+ 
+-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"
diff --git a/audio/xsidplay/files/patch-ab b/audio/xsidplay/files/patch-ab
deleted file mode 100644
index ccaef2e4f4c..00000000000
--- a/audio/xsidplay/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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)
- 
- 
--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 4b9b428f388..61b25cc79cb 100644
--- a/audio/xsidplay/files/patch-ac
+++ b/audio/xsidplay/files/patch-ac
@@ -1,11 +1,11 @@
---- src/Makefile.in.old	Sun Oct 22 22:35:17 2000
-+++ src/Makefile.in	Sun Oct 22 22:35:31 2000
+--- 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 @@
  
  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@ -L$(X11BASE)/lib -lqt2
++xsidplay_LDADD = audio/libaudio.a stilview/libstilview.a songlendb/libsonglendb.a tools/libtools.a widgets/libwidgets.a @SIDPLAY_LDFLAGS@ -lsidplay @QT_LDFLAGS@ -lqt2
  
  
  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