Make madman use the scons package instead of an included version of scons.

Also, stop scons from spreading .sconsign files around the file system.

From package maintainer Ove Soerensen in private mail.

5 files changed, 40 insertions, 4 deletions

diff --git a/audio/madman/Makefile b/audio/madman/Makefile
index c61e48ac83d..b348d2a3d22 100644
--- a/audio/madman/Makefile
+++ b/audio/madman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/10/03 00:13:07 tv Exp $
+# $NetBSD: Makefile,v 1.4 2004/11/09 12:37:36 wiz Exp $
 
 DISTNAME=	madman-0.93
 PKGREVISION=	2
@@ -9,13 +9,14 @@ MAINTAINER=	ove@elektro-eel.org
 HOMEPAGE=	http://madman.sourceforge.net/
 COMMENT=	Powerful audio manager for large collections
 
+BUILD_DEPENDS+=		scons>=0.96:../../devel/scons
+
 USE_BUILDLINK3=		# defined
 USE_X11=		# defined
 
 GCC_REQD=		3.0
 
 post-extract:
-	${TAR} -zxC ${WRKSRC} -f ${WRKSRC}/scons-local-0.95.tar.gz
 	${MV} ${WRKSRC}/httpd/make_webdata ${WRKSRC}/httpd/make_webdata.org
 	${SED} -e 's,#! /usr/bin/env python,#!${PYTHONBIN},' ${WRKSRC}/httpd/make_webdata.org > ${WRKSRC}/httpd/make_webdata
 	${CHMOD} 755 ${WRKSRC}/httpd/make_webdata
@@ -23,7 +24,8 @@ post-extract:
 	${AWK} '{print} NR == 20 {print "myenv.Append(LINKFLAGS = \"-Wl,-R${X11BASE}/lib,-R${LOCALBASE}/lib,-R${LOCALBASE}${QTDIR}/lib\")"}' ${WRKSRC}/main/SConscript.org > ${WRKSRC}/main/SConscript
 
 do-build:
-	${PYTHONBIN} ${WRKSRC}/scons.py -C ${WRKSRC} prefix=${PREFIX} qt_directory=${QTDIR} add_c_include_dirs=${LOCALBASE}/include add_c_lib_dirs=${WRKDIR}/lib
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons -C ${WRKSRC} prefix=${PREFIX} \
+	qt_directory=${QTDIR} add_c_include_dirs=${LOCALBASE}/include add_c_lib_dirs=${WRKDIR}/lib
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/main/madman ${PREFIX}/bin
diff --git a/audio/madman/distinfo b/audio/madman/distinfo
index 1c190284298..d8446b71a72 100644
--- a/audio/madman/distinfo
+++ b/audio/madman/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2004/08/27 00:05:19 wiz Exp $
+$NetBSD: distinfo,v 1.2 2004/11/09 12:37:36 wiz Exp $
 
 SHA1 (madman-0.93.tar.gz) = 61eac807b280d301c2bce574cd6c0781611530cd
 Size (madman-0.93.tar.gz) = 548497 bytes
 SHA1 (patch-aa) = 0c10ac7f0fa21cb2b1bd458b46278acda17cf031
+SHA1 (patch-ab) = 056252fba05db0f75891181e6093dd3ab6bd5e16
+SHA1 (patch-ac) = 860d323c498b7d01fdf12fc766a50fbc0ceead4e
+SHA1 (patch-ad) = 6c80415f847b5990343aed0f3b24b284059fd576
diff --git a/audio/madman/patches/patch-ab b/audio/madman/patches/patch-ab
new file mode 100644
index 00000000000..93e27a1ed84
--- /dev/null
+++ b/audio/madman/patches/patch-ab
@@ -0,0 +1,10 @@
+$NetBSD: patch-ab,v 1.1 2004/11/09 12:37:36 wiz Exp $
+
+--- ui/auto_tag.cpp.orig	2004-11-08 19:22:02.000000000 +0100
++++ ui/auto_tag.cpp	2004-11-08 19:22:23.000000000 +0100
+@@ -654,4 +654,4 @@
+ 
+ 
+ 
+-#include "moc_auto_tag.cc"
++#include "auto_tag.moc"
diff --git a/audio/madman/patches/patch-ac b/audio/madman/patches/patch-ac
new file mode 100644
index 00000000000..e13e6bfddb5
--- /dev/null
+++ b/audio/madman/patches/patch-ac
@@ -0,0 +1,10 @@
+$NetBSD: patch-ac,v 1.1 2004/11/09 12:37:36 wiz Exp $
+
+--- ui/prefs_dialog.cpp.orig	2004-11-08 19:22:13.000000000 +0100
++++ ui/prefs_dialog.cpp	2004-11-08 19:22:36.000000000 +0100
+@@ -498,4 +498,4 @@
+     return make_pair(false, false);
+ }
+ 
+-#include "moc_prefs_dialog.cc"
++#include "prefs_dialog.moc"
diff --git a/audio/madman/patches/patch-ad b/audio/madman/patches/patch-ad
new file mode 100644
index 00000000000..d0ddf9deba2
--- /dev/null
+++ b/audio/madman/patches/patch-ad
@@ -0,0 +1,11 @@
+--- SConstruct.orig	2004-11-09 13:09:48.000000000 +0100
++++ SConstruct	2004-11-09 13:10:06.000000000 +0100
+@@ -1,6 +1,8 @@
+ import os
+ import glob
+ 
++SConsignFile()
++
+ opts = Options(	"my_options.py")
+ 
+ opts.Add("qt_directory", "Path to Qt directory", "not specified")