[83562] trunk/dports

[ryandesign at macports.org]

Revision: 83562
          http://trac.macports.org/changeset/83562
Author:   ryandesign at macports.org
Date:     2011-09-05 17:12:52 -0700 (Mon, 05 Sep 2011)
Log Message:
-----------
qjson: fix install failure with new distfile; see #31078

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/kde4-1.1.tcl
    trunk/dports/devel/qjson/Portfile

Modified: trunk/dports/_resources/port1.0/group/kde4-1.1.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/kde4-1.1.tcl	2011-09-05 23:54:10 UTC (rev 83561)
+++ trunk/dports/_resources/port1.0/group/kde4-1.1.tcl	2011-09-06 00:12:52 UTC (rev 83562)
@@ -47,7 +47,7 @@
 post-extract            { file mkdir ${workpath}/build }
 
 # standard post-arg, where to find the primary CMakeLists.txt file.
-default configure.post_args {../${distname}}
+default configure.post_args {../${worksrcdir}}
 default configure.dir       {${workpath}/build}
 default build.dir           {${workpath}/build}
 
@@ -77,7 +77,7 @@
 post-extract {
     # Following the official word: Change #include ["<]Phonon...[">] to
     # ...phonon... in all files that contain that header.
-    fs-traverse item ${workpath}/${distname} {
+    fs-traverse item ${worksrcpath} {
         if {[file isfile ${item}]} {
             reinplace "/#include/s at Phonon@phonon@" ${item}
         }

Modified: trunk/dports/devel/qjson/Portfile
===================================================================
--- trunk/dports/devel/qjson/Portfile	2011-09-05 23:54:10 UTC (rev 83561)
+++ trunk/dports/devel/qjson/Portfile	2011-09-06 00:12:52 UTC (rev 83562)
@@ -21,5 +21,4 @@
 checksums           rmd160  9b333dda51c70a8994d3203b238fe33ec3281af5 \
                     sha256  3b8e94345fe846171c4b4d7d3518891d5fc864fda1e0c10d935bdb77bd3db994
 
-configure.dir       ${workpath}/build
-build.dir           ${workpath}/build
+worksrcdir          ${name}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110905/9330af74/attachment-0001.html>