[31041] trunk/dports/devel/poco/Portfile

[source_changes at macosforge.org]

Revision: 31041
          http://trac.macosforge.org/projects/macports/changeset/31041
Author:   nox at macports.org
Date:     2007-11-14 10:48:06 -0800 (Wed, 14 Nov 2007)

Log Message:
-----------
poco:
 * Fixed universal support.
 * IPv6 support is now always enabled.
 * Removed {{{cd}}} calls.

Modified Paths:
--------------
    trunk/dports/devel/poco/Portfile

Modified: trunk/dports/devel/poco/Portfile
===================================================================
--- trunk/dports/devel/poco/Portfile	2007-11-14 18:37:40 UTC (rev 31040)
+++ trunk/dports/devel/poco/Portfile	2007-11-14 18:48:06 UTC (rev 31041)
@@ -36,6 +36,15 @@
                     sha1 912de8e62ae264408b130c760e08b6867d674f00 \
                     rmd160 2de13a5c8f93364730da685c201ef1a894b2da4c
 
+set config      Darwin
+
+post-patch {
+    reinplace -E "/^CFLAGS\[\[:>:\]\]/s|\$|[join ${configure.cppflags} " "] [join ${configure.cflags} " "]|" \
+        ${worksrcpath}/build/config/${config}
+    reinplace -E "/^LINKFLAGS\[\[:>:\]\]/s|\$|[join ${configure.ldflags} " "]|" \
+        ${worksrcpath}/build/config/${config}
+}
+
 configure.args  --no-samples
 
 build.target    poco
@@ -51,8 +60,7 @@
         return [array names x]
     }
 
-    cd ${worksrcpath}
-    set file [open components]
+    set file [open ${worksrcpath}/components]
 
     set components {}
     while {[gets ${file} component] != -1} {
@@ -62,7 +70,7 @@
     close ${file}
 
     foreach {component} [luniq ${components}] {
-        foreach {testrunner} [glob -nocomplain ${component}/testsuite/bin/*/*/testrunner{,d}] {
+        foreach {testrunner} [glob -nocomplain ${worksrcpath}/${component}/testsuite/bin/*/*/testrunner{,d}] {
             catch {system "${testrunner} -all -print"}
         }
     }
@@ -71,18 +79,16 @@
 set docdir      ${prefix}/share/doc/${name}-${version}
 
 post-destroot {
-    xinstall -m 0755 -d ${destroot}${docdir}
+    xinstall -d ${destroot}${docdir}
     xinstall -m 0644 -W ${worksrcpath} CHANGELOG CONTRIBUTORS LICENSE NEWS README VERSION \
         ${destroot}${docdir}
 
     if {! [variant_isset doc]} {
-        xinstall -m 0755 -d ${destroot}${docdir}/html
+        xinstall -d ${destroot}${docdir}/html
         xinstall -m 0644 -W ${worksrcpath}/doc Acknowledgements.html ${destroot}${docdir}/html
     }
 }
 
-variant ipv6 description {Support IPv6 protocol in Net library (Requires Darwin 8)} requires darwin_8 {}
-
 variant ssl description {Build NetSSL library} {
     distname                ${my_distname}-ssl
     depends_lib-append      port:openssl
@@ -112,12 +118,12 @@
     post-destroot {
         set workdocpath ${workpath}/${my_distname}-doc
 
-        xinstall -m 0755 -d ${destroot}${docdir}/html/CppUnit
+        xinstall -d ${destroot}${docdir}/html/CppUnit
         eval xinstall -m 0644 [glob ${workdocpath}/*.html] ${destroot}${docdir}/html
         eval xinstall -m 0644 [glob ${worksrcpath}/CppUnit/doc/*] ${destroot}${docdir}/html/CppUnit
 
         foreach {dir} {images css} {
-            xinstall -m 0755 -d ${destroot}${docdir}/html/${dir}
+            xinstall -d ${destroot}${docdir}/html/${dir}
             eval xinstall -m 0644 [glob ${workdocpath}/${dir}/*] ${destroot}${docdir}/html/${dir}
         }
     }
@@ -126,37 +132,30 @@
 platform darwin {
     post-destroot {
         set libdir ${prefix}/lib
-        cd ${destroot}${libdir}
 
-        foreach {dylib} [glob -type f *.dylib] {
-           system "install_name_tool -id ${libdir}/${dylib} ${dylib}"
+        foreach {dylib} [glob -type f -directory ${destroot}${libdir} -tail *.dylib] {
+            system "install_name_tool -id ${libdir}/${dylib} ${destroot}${libdir}/${dylib}"
 
-           set otool [lrange [split [exec otool -L ${dylib}] \n] 2 end]
+            set otool [lrange [split [exec otool -L ${dylib}] \n] 2 end]
 
-           foreach {otoolentry} ${otool} {
-               set lib [lindex ${otoolentry} 0]
+            foreach {otoolentry} ${otool} {
+                set lib [lindex ${otoolentry} 0]
 
-               if {! [string match ${worksrcpath}/* ${lib}]} {
-                   continue
-               }
+                if {! [string match ${worksrcpath}/* ${lib}]} {
+                    continue
+                }
 
-               system "install_name_tool -change ${lib} ${libdir}/[file tail ${lib}] ${dylib}"
-           }
+                system "install_name_tool -change ${lib} ${libdir}/[file tail ${lib}] \
+                    ${destroot}${libdir}/${dylib}"
+            }
         }
     }
 }
 
 platform darwin 7 {
-    configure.args-append   --config=Darwin7
+    set config              Darwin7
+    configure.args-append   --config=${config}
 }
 
-platform darwin 8 {
-    post-patch {
-        if {! [variant_isset ipv6]} {
-            reinplace "s/-DPOCO_HAVE_IPv6//" ${worksrcpath}/build/config/Darwin
-        }
-    }
-}
-
 livecheck.regex "<title>sources ${name}-(.*) released.*</title>"
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071114/3886eb2f/attachment.html