From 31607f95b5de3b5b0695f9bcd1dd71f8c090fb49 Mon Sep 17 00:00:00 2001
From: Scott McCreary <scottmc2@gmail.com>
Date: Fri, 29 Jul 2011 16:39:40 +0000
Subject: [PATCH] =?UTF-8?q?Updated=20bep=20and=20patch=20files=20for=20sco?=
 =?UTF-8?q?ns=202.0.1=20from=20Roland=20Pl=C3=BCss.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dev-util/scons/patches/scons-2.0.1.patch | 52 +++++++++---------------
 dev-util/scons/scons-2.0.1.bep           | 24 +++++------
 2 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/dev-util/scons/patches/scons-2.0.1.patch b/dev-util/scons/patches/scons-2.0.1.patch
index 7e941e8c4..7271f58e4 100644
--- a/dev-util/scons/patches/scons-2.0.1.patch
+++ b/dev-util/scons/patches/scons-2.0.1.patch
@@ -12,19 +12,19 @@ diff -Naur scons-2.0.1/engine/SCons/Platform/__init__.py scons-2.0.1-haiku/engin
      elif os.name == 'os2':
 diff -Naur scons-2.0.1/engine/SCons/Platform/haiku.py scons-2.0.1-haiku/engine/SCons/Platform/haiku.py
 --- scons-2.0.1/engine/SCons/Platform/haiku.py	1970-01-01 00:00:00.000000000 +0000
-+++ scons-2.0.1-haiku/engine/SCons/Platform/haiku.py	2011-07-26 06:05:29.487325696 +0000
-@@ -0,0 +1,41 @@
++++ scons-2.0.1-haiku/engine/SCons/Platform/haiku.py	2011-07-26 22:13:19.692584448 +0000
+@@ -0,0 +1,54 @@
 +"""SCons.Platform.haiku
 +
 +Platform-specific initialization for Haiku systems.
 +
-+There normally shouldn't be any need to import this module directly.  It
++There normally shouldn't be any need to import this module directly. It
 +will usually be imported through the generic SCons.Platform.Platform()
 +selection method.
 +"""
 +
 +#
-+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 The SCons Foundation
++# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 The SCons Foundation
 +#
 +# Permission is hereby granted, free of charge, to any person obtaining
 +# a copy of this software and associated documentation files (the
@@ -49,36 +49,22 @@ diff -Naur scons-2.0.1/engine/SCons/Platform/haiku.py scons-2.0.1-haiku/engine/S
 +__revision__ = ""
 +
 +import posix
++import commands
++
++def findDir( identifier ):
++	return commands.getoutput( 'finddir %s' % identifier )
 +
 +def generate(env):
 +	posix.generate(env)
-+	env['ENV']['PATH'] = '.:/boot/home/config/bin:/boot/common/bin:/boot/system/bin:/boot/develop/tools/gnupro/bin'
++	
++	# path list
++	listPath = [ '.' ]
++	listPath.append( '%s/bin' % findDir( 'B_USER_CONFIG_DIRECTORY' ) )
++	listPath.append( findDir( 'B_COMMON_BIN_DIRECTORY' ) )
++	listPath.append( findDir( 'B_SYSTEM_BIN_DIRECTORY' ) )
++	listPath.append( findDir( 'B_BEOS_BIN_DIRECTORY' ) )
++	listPath.append( '%s/tools/gnupro/bin' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' ) )
++	env['ENV']['PATH'] = ':'.join( listPath )
++	
 +	# help the linker find the startfiles
-+	env['ENV']['BELIBRARIES'] = '/boot/develop/lib/x86'
-diff -Naur scons-2.0.1/script/scons scons-2.0.1-haiku/script/scons
---- scons-2.0.1/script/scons	2010-08-17 06:02:53.027000832 +0000
-+++ scons-2.0.1-haiku/script/scons	2011-07-26 06:06:01.259522560 +0000
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /bin/env python
- #
- # SCons - a Software Constructor
- #
-diff -Naur scons-2.0.1/script/scons-time scons-2.0.1-haiku/script/scons-time
---- scons-2.0.1/script/scons-time	2010-08-17 06:02:53.026738688 +0000
-+++ scons-2.0.1-haiku/script/scons-time	2011-07-26 06:06:03.308281344 +0000
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/bin/env python
- #
- # scons-time - run SCons timings and collect statistics
- #
-diff -Naur scons-2.0.1/script/sconsign scons-2.0.1-haiku/script/sconsign
---- scons-2.0.1/script/sconsign	2010-08-17 06:02:53.027000832 +0000
-+++ scons-2.0.1-haiku/script/sconsign	2011-07-26 06:06:14.344195072 +0000
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#! /bin/env python
- #
- # SCons - a Software Constructor
- #
++	env['ENV']['BELIBRARIES'] = ':%s/lib/x86' % findDir( 'B_COMMON_DEVELOP_DIRECTORY' )
diff --git a/dev-util/scons/scons-2.0.1.bep b/dev-util/scons/scons-2.0.1.bep
index e3e9c2b8b..6ec4b1a5e 100644
--- a/dev-util/scons/scons-2.0.1.bep
+++ b/dev-util/scons/scons-2.0.1.bep
@@ -4,25 +4,25 @@ LICENSE="MIT"
 COPYRIGHT="2001-2010 The SCons Foundation"
 SRC_URI="http://ovh.dl.sourceforge.net/sourceforge/scons/scons-2.0.1.tar.gz"
 CHECKSUM_MD5="beca648b894cdbf85383fffc79516d18"
-REVISION="1"
+REVISION="2"
 STATUS_HAIKU="stable"
 DEPEND="dev-lang/python >= 2.5.4"
 BUILD {
 	cd scons-2.0.1
+	for f in "script/scons script/scons-time script/sconsign"; do
+		sed -i -e "s@#! /usr/bin/env python@#! /bin/env python@" $f
+	done
 	python setup.py build
 }
 
 INSTALL {
-	cd scons-2.0.1
-	if [ ! -z ${DESTDIR} ];then
-		python setup.py install --root=${DESTDIR} \
-			--prefix=`finddir B_COMMON_DIRECTORY` \
-			--symlink-scons \
-			--standard-lib
-	else
-		python setup.py install --prefix=`finddir B_COMMON_DIRECTORY` \
-			--symlink-scons \ 
-			--standard-lib
+	if [ ! -z ${DESTDIR} ]; then
+		options="${options} --root=${DESTDIR}"
 	fi
+	options="${options} --prefix=`finddir B_COMMON_DIRECTORY`"
+	options="${options} --install-data=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`"
+	options="${options} --symlink-scons"
+	options="${options} --standard-lib"
+	cd scons-2.0.1
+	python setup.py install $options
 }
-