From anders@totem.fix.no  Sun Mar  4 12:22:46 2001
Return-Path: <anders@totem.fix.no>
Received: from totem.fix.no (totem.fix.no [213.142.66.130])
	by hub.freebsd.org (Postfix) with ESMTP id 26A4237B718
	for <FreeBSD-gnats-submit@freebsd.org>; Sun,  4 Mar 2001 12:22:45 -0800 (PST)
	(envelope-from anders@totem.fix.no)
Received: by totem.fix.no (Postfix, from userid 1000)
	id 1E11C3CC8; Sun,  4 Mar 2001 21:22:44 +0100 (CET)
Message-Id: <20010304202244.1E11C3CC8@totem.fix.no>
Date: Sun,  4 Mar 2001 21:22:44 +0100 (CET)
From: Anders Nordby <anders@fix.no>
Reply-To: Anders Nordby <anders@fix.no>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Update port: audio/xsidplay
X-Send-Pr-Version: 3.2

>Number:         25529
>Category:       ports
>Synopsis:       Update port: audio/xsidplay
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    dinoex
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Mar 04 12:30:00 PST 2001
>Closed-Date:    Sat Mar 17 06:03:12 PST 2001
>Last-Modified:  Mon Jul 15 13:13:19 PDT 2002
>Originator:     Anders Nordby
>Release:        FreeBSD 4.2-STABLE i386
>Organization:
Fluxpod Information eXchange
>Environment:

FreeBSD eggsilo.localnet 4.2-STABLE FreeBSD 4.2-STABLE #0: Sat Feb  3 23:01:01 CET 2001     root@eggsilo.localnet:/space/tmp/obj/usr/src/sys/EGGSILO  i386

>Description:

Updates the port to the latest version.

>How-To-Repeat:

	

>Fix:
	
diff -Nur xsidplay.old/Makefile xsidplay/Makefile
--- xsidplay.old/Makefile	Tue Jan  2 16:40:05 2001
+++ xsidplay/Makefile	Sun Mar  4 21:20:14 2001
@@ -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,10 +24,12 @@
 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
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin
diff -Nur xsidplay.old/distinfo xsidplay/distinfo
--- xsidplay.old/distinfo	Tue Jan  2 16:40:05 2001
+++ xsidplay/distinfo	Sun Mar  4 21:20:36 2001
@@ -1 +1 @@
-MD5 (xsidplay-1_5_4.tgz) = ce3551a55e24c64adfb16bd8c4e4b29f
+MD5 (xsidplay-1.6b11.tgz) = 4d0150bfbf238eb304d8a9c5efbf9e5d
diff -Nur xsidplay.old/files/patch-aa xsidplay/files/patch-aa
--- xsidplay.old/files/patch-aa	Tue Jan  2 16:40:07 2001
+++ xsidplay/files/patch-aa	Sun Mar  4 21:20:27 2001
@@ -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 -Nur xsidplay.old/files/patch-ac xsidplay/files/patch-ac
--- xsidplay.old/files/patch-ac	Tue Jan  2 16:40:07 2001
+++ xsidplay/files/patch-ac	Sun Mar  4 21:20:27 2001
@@ -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
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: dinoex 
State-Changed-When: Sat Mar 17 06:03:12 PST 2001 
State-Changed-Why:  
Committed, Thanks. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=25529 
>Unformatted:
