[96823] trunk/dports/devel/zeroc-ice33/Portfile

[blair at macports.org]

Revision: 96823
          https://trac.macports.org/changeset/96823
Author:   blair at macports.org
Date:     2012-08-19 10:16:06 -0700 (Sun, 19 Aug 2012)
Log Message:
-----------
zeroc-ice33: use ${build.dir} in more places.

This helps minimize the differences between zeroc-ice33 and zeroc-ice34.

Modified Paths:
--------------
    trunk/dports/devel/zeroc-ice33/Portfile

Modified: trunk/dports/devel/zeroc-ice33/Portfile
===================================================================
--- trunk/dports/devel/zeroc-ice33/Portfile	2012-08-19 17:10:12 UTC (rev 96822)
+++ trunk/dports/devel/zeroc-ice33/Portfile	2012-08-19 17:16:06 UTC (rev 96823)
@@ -73,9 +73,13 @@
     ui_debug ${cmd}
     system ${cmd}
 
-    reinplace "s/-O2/-g -O2/" \
-        ${workpath}/Ice-${version}/cpp/config/Make.rules.Darwin
+}
 
+build.dir       ${worksrcpath}/cpp
+
+post-patch {
+    reinplace "s/-O2/-g -O2/" ${build.dir}/config/Make.rules.Darwin
+
     # It appears that the 10.4 and 10.5 installed versions of
     # ${prefix}/include/iconv.h have different definitions of
     # the inbuf parameter to iconv(), one is 'const char* * inbuf'
@@ -94,11 +98,9 @@
 
     # Prevent name conflicts between libICE.* from xorg-libice and
     # libIce.* from this port by renaming libIce.* to libZeroCIce.*.
-    reinplace "s/,Ice/,ZeroCIce/" \
-        ${workpath}/Ice-${version}/cpp/src/Ice/Makefile
-    reinplace "s/-lIce /-lZeroCIce /" \
-        ${workpath}/Ice-${version}/cpp/config/Make.rules.Darwin
-    foreach f [exec find ${workpath}/Ice-${version}/cpp -name Makefile] {
+    reinplace "s/,Ice/,ZeroCIce/" ${build.dir}/src/Ice/Makefile
+    reinplace "s/-lIce /-lZeroCIce /" ${build.dir}/config/Make.rules.Darwin
+    foreach f [exec find ${build.dir} -name Makefile] {
         reinplace "s/-lIce /-lZeroCIce /" ${f}
     }
 }
@@ -117,7 +119,7 @@
     if {${build.jobs} > 1} {
         set jobsargs " -j${build.jobs}"
     }
-    set cmd "cd ${workpath}/Ice-${version}/cpp && make${jobsargs} prefix='${prefix}' embedded_runpath_prefix='${prefix}' CC='${configure.cc}' CXX='${configure.cxx}' OPTIMIZE='yes' BZIP2_HOME='${prefix}' DB_HOME='${prefix}' EXPAT_HOME='${prefix}' OPENSSL_HOME='${prefix}' READLINE_HOME='${prefix}' USE_READLINE=yes MCPP_HOME='${prefix}' LDPLATFORMFLAGS= all && cd doc && make${jobsargs}"
+    set cmd "cd ${build.dir} && make${jobsargs} prefix='${prefix}' embedded_runpath_prefix='${prefix}' CC='${configure.cc}' CXX='${configure.cxx}' OPTIMIZE='yes' BZIP2_HOME='${prefix}' DB_HOME='${prefix}' EXPAT_HOME='${prefix}' OPENSSL_HOME='${prefix}' READLINE_HOME='${prefix}' USE_READLINE=yes MCPP_HOME='${prefix}' LDPLATFORMFLAGS= all && cd doc && make${jobsargs}"
     ui_debug ${cmd}
     system ${cmd}
 }
@@ -141,7 +143,6 @@
                 install
 
 post-destroot {
-    set cppdir ${workpath}/Ice-${version}/cpp
     set sharedir ${destroot}${prefix}/share
     set docdir ${sharedir}/doc/${name}
 
@@ -152,15 +153,15 @@
     xinstall -m 755 -d ${docdir}
     file rename ${destroot}${prefix}/ICE_LICENSE ${docdir}
     file rename ${destroot}${prefix}/LICENSE ${docdir}
-    file copy ${cppdir}/doc/reference ${docdir}
+    file copy ${build.dir}/doc/reference ${docdir}
 
     foreach f {CHANGES RELEASE_NOTES} {
         file copy ${workpath}/Ice-${version}/${f} ${docdir}
     }
 
     if {[variant_isset demo_source_code]} {
-        system "cd ${cppdir}/demo && make clean"
-        file copy ${cppdir}/demo $docdir
+        system "cd ${build.dir}/demo && make clean"
+        file copy ${build.dir}/demo $docdir
     }
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120819/538fb407/attachment.html>