From 885cd21ce8f1f9049c1b00ec1e74730308366baa Mon Sep 17 00:00:00 2001
From: snj <snj@pkgsrc.org>
Date: Fri, 12 Mar 2004 04:28:12 +0000
Subject: Use bl3, nuke LTCONFIG_OVERRIDE, fix build on i386/-current.

---
 audio/xmms-sid/Makefile         |  9 ++++-----
 audio/xmms-sid/distinfo         |  3 ++-
 audio/xmms-sid/patches/patch-aa | 15 +++++++++++++++
 3 files changed, 21 insertions(+), 6 deletions(-)
 create mode 100644 audio/xmms-sid/patches/patch-aa

(limited to 'audio/xmms-sid')

diff --git a/audio/xmms-sid/Makefile b/audio/xmms-sid/Makefile
index 760c995f3bc..b39c81e6e79 100644
--- a/audio/xmms-sid/Makefile
+++ b/audio/xmms-sid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 21:24:17 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/03/12 04:28:12 snj Exp $
 #
 
 DISTNAME=	xmms-sid-0.7.4
@@ -10,11 +10,10 @@ MAINTAINER=	mycroft@NetBSD.org
 HOMEPAGE=	http://www.tnsp.org/
 COMMENT=	XMMS plugin for SID (Commodore 64) music
 
-USE_BUILDLINK2=		YES
+USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
-.include "../../audio/libsidplay/buildlink2.mk"
-.include "../../audio/xmms/buildlink2.mk"
+.include "../../audio/libsidplay/buildlink3.mk"
+.include "../../audio/xmms/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-sid/distinfo b/audio/xmms-sid/distinfo
index f2f3503177d..a7c208d2ec6 100644
--- a/audio/xmms-sid/distinfo
+++ b/audio/xmms-sid/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.4 2002/09/03 15:36:40 mycroft Exp $
+$NetBSD: distinfo,v 1.5 2004/03/12 04:28:12 snj Exp $
 
 SHA1 (xmms-sid-0.7.4.tar.gz) = 9ccf412e7c9759ae69ca78dee0895bdb724df9e8
 Size (xmms-sid-0.7.4.tar.gz) = 226916 bytes
+SHA1 (patch-aa) = fb0558110b61f54eab42cd805f9ffb2cdfa2617a
diff --git a/audio/xmms-sid/patches/patch-aa b/audio/xmms-sid/patches/patch-aa
new file mode 100644
index 00000000000..2ad522d895a
--- /dev/null
+++ b/audio/xmms-sid/patches/patch-aa
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.3 2004/03/12 04:28:12 snj Exp $
+
+--- src/Makefile.in.orig	2004-03-11 20:20:34.000000000 -0800
++++ src/Makefile.in	2004-03-11 20:21:03.000000000 -0800
+@@ -104,8 +104,8 @@ lib_LTLIBRARIES = libsid.la
+ 
+ # Generals
+ 
+-CFLAGS = -O2 -W -Wall -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ @SIDPLAY_CFLAGS@ -lstdc++
+-CXXFLAGS = $(CFLAGS)
++CFLAGS += -I$(top_builddir) -I$(top_srcdir) -I$(includedir) -D_REENTRANT @GTK_CFLAGS@ @SIDPLAY_CFLAGS@
++CXXFLAGS += $(CFLAGS)
+ LIBS = -lsidplay
+ 
+ libsid_la_LDFLAGS = -module -avoid-version
-- 
cgit v1.2.3