[pkgsrc/trunk]: pkgsrc/audio/madman Deal with the usual scons design nightmar...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/525c4a19291f
branches:  trunk
changeset: 569041:525c4a19291f
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Jan 04 17:59:49 2010 +0000

description:
Deal with the usual scons design nightmare and don't nuke the complete
environment.

diffstat:

 audio/madman/distinfo         |   4 ++--
 audio/madman/patches/patch-ad |  16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diffs (47 lines):

diff -r aa7f2e900621 -r 525c4a19291f audio/madman/distinfo
--- a/audio/madman/distinfo     Mon Jan 04 17:37:08 2010 +0000
+++ b/audio/madman/distinfo     Mon Jan 04 17:59:49 2010 +0000
@@ -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 @@
 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 -r aa7f2e900621 -r 525c4a19291f audio/madman/patches/patch-ad
--- a/audio/madman/patches/patch-ad     Mon Jan 04 17:37:08 2010 +0000
+++ b/audio/madman/patches/patch-ad     Mon Jan 04 17:59:49 2010 +0000
@@ -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 @@
  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,