Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv5733

Modified Files:
        scons.info 
Added Files:
        scons.patch 
Log Message:
Updated scons from -submissions
(why does that make me want to go to the coffee shop?)
https://sourceforge.net/tracker/index.php?func=detail&aid=2804151&group_id=17203&atid=414256


Index: scons.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/devel/scons.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- scons.info  1 Dec 2008 07:51:52 -0000       1.6
+++ scons.info  25 Jun 2009 19:35:54 -0000      1.7
@@ -1,33 +1,36 @@
 Package: scons
-Version: 1.0.1
+Version: 1.2.0
 Revision: 2
+
 BuildDependsOnly: true
+BuildDepends: fink (>= 0.24.12)
+
 Maintainer: Vincent Beffara <vbeff...@gmail.com>
+
 Source: mirror:sourceforge:%n/%n-%v.tar.gz
-Source-MD5: 139ef2e108789afe25ee0bdbb138b8c0
-PatchScript: <<
-  perl -pi -e 's,/usr/bin/env python,/usr/bin/python,' script/*
-<<
+Source-MD5: 53b6aa7281811717a57598e319441cf7
+
+PatchFile: scons.patch
+PatchFile-MD5: 37ad3787db9a4e52935cf397fd62d511
+
 CompileScript: <<
   /usr/bin/python setup.py build
 <<
+
 InstallScript: <<
   /usr/bin/python setup.py install --prefix=%p --root=%d
   mkdir -p %i/share
   mv %i/man %i/share
 <<
+
 DocFiles: CHANGES.txt LICENSE.txt MANIFEST README.txt RELEASE.txt
+
 Description: Python-based build tool
 DescDetail: <<
 SCons is an Open Source software construction tool -- that is, a
 build tool; an improved substitute for the classic Make utility;
 a better way to build software. 
 <<
-DescPackaging: <<
-%p/bin/scons is a python script that is not compatible with python2.6.
-Therefore we force /usr/bin/python, which is 2.3 or 2.5, so we don't
-accidentally see /sw/bin/python, which could be anything at all. See:
-http://permalink.gmane.org/gmane.os.apple.fink.general/27618
-<<
+
 Homepage: http://www.scons.org/
 License: BSD

--- NEW FILE: scons.patch ---
diff -ru scons-1.2.0/engine/SCons/Environment.py 
scons-1.2.0-2/engine/SCons/Environment.py
--- scons-1.2.0/engine/SCons/Environment.py     2008-12-21 07:59:59.000000000 
+0100
+++ scons-1.2.0-2/engine/SCons/Environment.py   2009-06-10 13:19:28.000000000 
+0200
@@ -761,6 +761,9 @@
                         dict['FRAMEWORKPATH'].append(arg[2:])
                     else:
                         append_next_arg_to = 'FRAMEWORKPATH'
+                elif arg == '-dylib_file':
+                    dict['LINKFLAGS'].append(arg)
+                    append_next_arg_to = 'LINKFLAGS'
                 elif arg == '-mno-cygwin':
                     dict['CCFLAGS'].append(arg)
                     dict['LINKFLAGS'].append(arg)
diff -ru scons-1.2.0/script/scons scons-1.2.0-2/script/scons
--- scons-1.2.0/script/scons    2008-12-21 07:59:59.000000000 +0100
+++ scons-1.2.0-2/script/scons  2009-06-10 13:25:18.000000000 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python
 #
 # SCons - a Software Constructor
 #
diff -ru scons-1.2.0/script/scons-time scons-1.2.0-2/script/scons-time
--- scons-1.2.0/script/scons-time       2008-12-21 07:59:59.000000000 +0100
+++ scons-1.2.0-2/script/scons-time     2009-06-10 13:25:32.000000000 +0200
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#! /usr/bin/python
 #
 # scons-time - run SCons timings and collect statistics
 #
diff -ru scons-1.2.0/script/sconsign scons-1.2.0-2/script/sconsign
--- scons-1.2.0/script/sconsign 2008-12-21 07:59:59.000000000 +0100
+++ scons-1.2.0-2/script/sconsign       2009-06-10 13:25:37.000000000 +0200
@@ -1,4 +1,4 @@
-#! /usr/bin/env python
+#! /usr/bin/python
 #
 # SCons - a Software Constructor
 #


------------------------------------------------------------------------------
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs

Reply via email to