Update to version 1.6.2.1

PR:31299
Submitted by: Ports Fury

4 files changed, 12 insertions, 32 deletions

diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index fffcecb07855..ae975cc0d24c 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -6,26 +6,22 @@
 #
 
 PORTNAME=	xsidplay
-PORTVERSION=	1.6.0
+PORTVERSION=	1.6.2.1
 PORTEPOCH=	1
 CATEGORIES=	audio emulators
-MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/ \
-		http://www.freenix.no/~anders/
+MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	sidplay.1:${PORTSDIR}/audio/libsidplay
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
-
 USE_QT_VER=	2
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
-CONFIGURE_ARGS+=--with-sidplay-inc=${LOCALBASE}/include \
-		--with-sidplay-lib=${LOCALBASE}/lib
-
-CFLAGS+=	${PTHREAD_CFLAGS}
+CONFIGURE_ARGS=	--with-qt-binaries=${X11BASE}/bin
+QTCPPFLAGS+=	${PTHREAD_CFLAGS}
+QTCFGLIBS+=	${PTHREAD_LIBS}
 
 .include <bsd.port.pre.mk>
 
@@ -33,6 +29,12 @@ CFLAGS+=	${PTHREAD_CFLAGS}
 CFLAGS+=	-O0
 .endif
 
+pre-patch:
+.for file in configure src/Makefile.in	
+	@${PERL} -pi -e 's|moc|${MOC:T}|g ; \
+		 s|qt-mt|${QTNAME}-mt|g' ${WRKSRC}/${file}
+.endfor
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/src/xsidplay ${PREFIX}/bin
 
diff --git a/audio/xsidplay/distinfo b/audio/xsidplay/distinfo
index 3e2c170fd601..e10123ef87b9 100644
--- a/audio/xsidplay/distinfo
+++ b/audio/xsidplay/distinfo
@@ -1 +1 @@
-MD5 (xsidplay-1.6.0.tgz) = 96f612f5d70b236e23ecf262bfbecd2c
+MD5 (xsidplay-1.6.2.1.tgz) = ddf115409d9ca0554c74e6e51c2f0a6e
diff --git a/audio/xsidplay/files/patch-aa b/audio/xsidplay/files/patch-aa
deleted file mode 100644
index ccaef2e4f4ce..000000000000
--- a/audio/xsidplay/files/patch-aa
+++ /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
deleted file mode 100644
index 7309edc98cb3..000000000000
--- a/audio/xsidplay/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.in.old	Sat Apr 14 04:20:06 2001
-+++ src/Makefile.in	Sat Apr 14 04:20:27 2001
-@@ -105,7 +105,7 @@
- 
- bin_PROGRAMS = xsidplay
- 
--xsidplay_LDADD = audio/libaudio.a $(LIBAUDIO) stilview/libstilview.a songlendb/libsonglendb.a tools/libtools.a widgets/libwidgets.a wrapper/libwrapper.a $(SIDPLAY_LDADD) $(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_LDADD) $(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 WidgetOffset.cpp WidgetOffset.h filenames.h xsidplay.cpp