Ticket #27071: nonpareil-Portfile.diff

/opt/local/var/macports/sources/rsync.macports.org/release/ports/emulators/nonpareil/Portfile

@@ -58 +58 @@
                                         port:python25                                                   \
                                         port:scons
 
-patchfiles                      patch-src-util.diff
+patchfiles                      osx.patch                                                               \
+                                        patch-src-util.diff
 
 worksrcdir                      ${name}-${version}
 use_parallel_build      yes
 use_configure           no
-build.cmd                       "scons-local/scons.py"
+build.cmd                       "scons"
 build.args                      prefix=${prefix}
 build.target
 
-destroot.cmd            "scons-local/scons.py"
+destroot.cmd            "scons"
 destroot.args           prefix=${prefix} destdir=${destroot}
 
 
-post-extract {
-        system "
-                pushd ${workpath}/${name}-${version}/scons-local;
-                        tar -xzf scons-local-0.96.90.tar.gz
-                popd
-        "
+post-patch {
+        reinplace s|@PREFIX@|${prefix}|g ${worksrcpath}/src/SConscript
 }
 
 platform macosx {
@@ -151 +148 @@
                     rmd160  ec3bea3f6eda7d29a480a880a7875d4e9fc6c8cf
         
         patchfiles-delete               patch-src-util.diff
-        build.cmd                               "scons"
-        destroot.cmd                    "scons"
 
         post-extract {
                 system "
                         bzip2 --verbose --decompress --stdout ${distpath}/nonpareil-wholepatch-20090714.diff.bz2 >${workpath}/nonpareil-wholepatch-20090714.diff;
                 "
         }
-        pre-patch {
-                file copy ${filespath}/osx.patch ${filespath}/osx.patch.diff 
-                reinplace s|@PREFIX@|${prefix}|g ${filespath}/osx.patch.diff
-        }
         post-patch {
                 system "
                         pushd ${workpath};
@@ -172 +163 @@
                                 popd;
                         popd;
                 "
-                file delete ${filespath}/osx.patch.diff
         }
 }