Ticket #11533: scons-0.96.92_to_0.96.95.diff

devel/scons/Portfile

@@ -3 +3 @@
 PortSystem                      1.0
 PortGroup                       python24 1.0
 name                            scons
-version                         0.96.92
+version                         0.96.95
 categories                      devel python
-maintainers                     nomaintainer@macports.org
+maintainers                     boeyms@fastmail.fm openmaintainer@macports.org
 description                     Software construction tool
 long_description \
         SCons is an Open Source software construction tool--that is, a \
@@ -19 +19 @@
 homepage                        http://www.scons.org/
 master_sites            sourceforge
 
-checksums                       md5 0b6b388cdd640b7f297f37a678c65d5c \
-                                sha1 17a3f462f4eb37052df17b47e6528d72472092eb \
-                                rmd160 75aa04717da98eccabc42180f6eab9ee4b8bd904
+checksums                       md5 51ea0157e41da1d28a7e6ed34da08333 \
+                                sha1 0f8d524804c2175ae1bc37576fa1445ffd52fd90 \
+                                rmd160 73da7451d4a42d96a1f8ae65d75b93c6064d7a5d
 
-patchfiles                      patch-setup.py patch-scons patch-sconsign
+patchfiles                      patch-setup.py
 post-patch {
-        reinplace "s|@@PREFIX@@|${prefix}|g" ${worksrcpath}/script/scons \
-                ${worksrcpath}/script/sconsign
+        reinplace "s|/usr/bin/env |${prefix}/bin/|g" \
+                ${worksrcpath}/script/scons \
+                ${worksrcpath}/script/sconsign \
+                ${worksrcpath}/script/scons-time \
+                ${worksrcpath}/script/scons-post-install.py
+        reinplace "s|/sw|/${prefix}|g" \
+                ${worksrcpath}/engine/SCons/Platform/darwin.py
 }
 
 post-destroot {
-        xinstall -m 755 -d ${destroot}${prefix}/share/man/man1 \
-                ${destroot}${prefix}/share/doc/${name}
+        xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
         xinstall -m 644 -W ${worksrcpath} CHANGES.txt LICENSE.txt README.txt \
                 RELEASE.txt ${destroot}${prefix}/share/doc/${name}
 }
-

devel/scons/files/patch-scons

@@ -1 @@
---- script/scons.orig   2005-09-08 07:15:22.000000000 -0600
-+++ script/scons        2006-01-31 01:20:07.000000000 -0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!@@PREFIX@@/bin/python
- #
- # SCons - a Software Constructor
- #

devel/scons/files/patch-sconsign

@@ -1 @@
---- script/sconsign.orig        2005-09-08 07:15:22.000000000 -0600
-+++ script/sconsign     2006-01-31 01:20:15.000000000 -0700
-@@ -1,4 +1,4 @@
--#! /usr/bin/env python
-+#!@@PREFIX@@/bin/python
- #
- # SCons - a Software Constructor
- #

devel/scons/files/patch-setup.py

@@ -1 @@
---- setup.py.orig       2005-09-08 07:15:23.000000000 -0600
-+++ setup.py    2006-01-31 01:23:57.000000000 -0700
-@@ -330,7 +330,7 @@
+--- setup.py    2007-02-13 03:55:03.000000000 +0000
++++ setup.py.new        2007-03-06 13:38:03.000000000 +0000
+@@ -336,7 +336,7 @@
              if is_win32:
                  dir = 'Doc'
              else:
 -                dir = os.path.join('man', 'man1')
-+                dir = os.path.join('share', 'man', 'man1')
-             self.data_files = [(dir, ["scons.1", "sconsign.1"])]
++                dir = os.path.join('share','man', 'man1')
+             self.data_files = [(dir, man_pages)]
              man_dir = os.path.join(self.install_dir, dir)
              msg = "Installed SCons man pages into %s" % man_dir
-@@ -351,7 +351,7 @@
+@@ -384,7 +384,7 @@
                            "SCons.Sig",
                            "SCons.Tool"],
      'package_dir'      : {'' : 'engine'},
--    'data_files'       : [('man/man1', ["scons.1", "sconsign.1"])],
-+    'data_files'       : [('share/man/man1', ["scons.1", "sconsign.1"])],
-     'scripts'          : ['script/scons',
-                           'script/sconsign',
-                           'script/scons.bat'],
+-    'data_files'       : [('man/man1', man_pages)],
++    'data_files'       : [('share/man/man1', man_pages)],
+     'scripts'          : scripts,
+     'cmdclass'         : {'install'         : install,
+                           'install_lib'     : install_lib,