summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorjoerg <joerg>2010-01-04 17:59:49 +0000
committerjoerg <joerg>2010-01-04 17:59:49 +0000
commit6b2305bf5afb8b93229114460305284693181e65 (patch)
tree3d8777cc503f1013c32ad3596f59133d7b79b375 /audio
parent5dd82ffa125014f9c0dfcabea25e1954d7a03a69 (diff)
downloadpkgsrc-6b2305bf5afb8b93229114460305284693181e65.tar.gz
Deal with the usual scons design nightmare and don't nuke the complete
environment.
Diffstat (limited to 'audio')
-rw-r--r--audio/madman/distinfo4
-rw-r--r--audio/madman/patches/patch-ad16
2 files changed, 16 insertions, 4 deletions
diff --git a/audio/madman/distinfo b/audio/madman/distinfo
index 311bfb3f81b..d063d74350f 100644
--- a/audio/madman/distinfo
+++ b/audio/madman/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2006/05/31 10:25:19 joerg Exp $
+$NetBSD: distinfo,v 1.6 2010/01/04 17:59:49 joerg Exp $
SHA1 (madman-0.93.tar.gz) = 61eac807b280d301c2bce574cd6c0781611530cd
RMD160 (madman-0.93.tar.gz) = 699a5be1cf28e9e6374879713673334e2ec98fba
@@ -6,6 +6,6 @@ Size (madman-0.93.tar.gz) = 548497 bytes
SHA1 (patch-aa) = 0c10ac7f0fa21cb2b1bd458b46278acda17cf031
SHA1 (patch-ab) = 056252fba05db0f75891181e6093dd3ab6bd5e16
SHA1 (patch-ac) = 860d323c498b7d01fdf12fc766a50fbc0ceead4e
-SHA1 (patch-ad) = 0e55206095039c012b22053c95064ecbb271ceb3
+SHA1 (patch-ad) = 52672eb9e93b251f9ef083d34cf358103fbc229b
SHA1 (patch-ae) = d370197a5a7210bf7fc371365ca489dfca4a1a9e
SHA1 (patch-af) = 820647180f3444163332ca37eb8408745accb46f
diff --git a/audio/madman/patches/patch-ad b/audio/madman/patches/patch-ad
index 0186ca5ddfb..93cde729e6a 100644
--- a/audio/madman/patches/patch-ad
+++ b/audio/madman/patches/patch-ad
@@ -1,4 +1,4 @@
-$NetBSD: patch-ad,v 1.3 2006/05/31 10:25:19 joerg Exp $
+$NetBSD: patch-ad,v 1.4 2010/01/04 17:59:49 joerg Exp $
--- SConstruct.orig 2004-05-20 14:03:14.000000000 +0000
+++ SConstruct
@@ -11,7 +11,19 @@ $NetBSD: patch-ad,v 1.3 2006/05/31 10:25:19 joerg Exp $
opts = Options( "my_options.py")
opts.Add("qt_directory", "Path to Qt directory", "not specified")
-@@ -112,7 +114,7 @@ def SplitLibs(lstring):
+@@ -18,10 +20,7 @@ opts.Add("add_lib_dirs", "A comma-separa
+ opts.Add(BoolOption("maintainer_mode", "Whether you want to use some special ingredients", 0))
+
+ env = Environment(
+- ENV = {
+- 'PATH' : os.environ[ 'PATH' ],
+- 'HOME' : os.environ[ 'HOME' ] # required for distcc
+- }, options = opts)
++ ENV = os.environ, options = opts)
+ env.Replace(CPPPATH = [], LIBS = [], LIBPATH = [], CPPDEFINES = [],
+ CXXFLAGS = "", CCFLAGS = "")
+ Help(opts.GenerateHelpText(env))
+@@ -112,7 +111,7 @@ def SplitLibs(lstring):
def CheckForQtAt(context, qtdir):
context.Message('Checking for Qt at %s... ' % qtdir)
result = AttemptLinkWithVariables(context,