[91025] trunk/dports/science/healpix/Portfile

[aronnax at macports.org]

Revision: 91025
          https://trac.macports.org/changeset/91025
Author:   aronnax at macports.org
Date:     2012-03-22 05:52:13 -0700 (Thu, 22 Mar 2012)
Log Message:
-----------
healpix: address ryandesign's comments

Modified Paths:
--------------
    trunk/dports/science/healpix/Portfile

Modified: trunk/dports/science/healpix/Portfile
===================================================================
--- trunk/dports/science/healpix/Portfile	2012-03-22 10:42:33 UTC (rev 91024)
+++ trunk/dports/science/healpix/Portfile	2012-03-22 12:52:13 UTC (rev 91025)
@@ -12,8 +12,7 @@
                     analysis, and visualization of data on the sphere.
 homepage            http://healpix.jpl.nasa.gov/
 platforms           darwin
-master_sites        sourceforge
-master_sites.mirror_subdir ${name}/Healpix_${version}
+master_sites        sourceforge:project/${name}/Healpix_${version}
 worksrcdir          Healpix_${version}
 distname            Healpix_${version}_2011Feb09
 
@@ -21,6 +20,8 @@
                     sha1    f7a0fdab8e9fcfdf81e3e5e9a7d18912203d3803 \
                     rmd160  e15b14262591a679764665d4d1774c38786a7a00
 
+universal_variant   yes
+
 depends_lib         port:cfitsio
 
 patchfiles          patch-src-cxx-cxxsupport-arr.h.diff
@@ -36,8 +37,6 @@
    if {![file executable ${configure.cc}]} {
        depends_build-append port:apple-gcc42
        configure.compiler apple-gcc-4.2
-       # base (as of 2.0.3) doesn't set cxx for apple-gcc-4.2
-       configure.cxx ${prefix}/bin/g++-apple-4.2
    }
 }
 
@@ -51,24 +50,23 @@
                     CFITSIO_LIBDIR=${prefix}/lib \
                     CFITSIO_EXT_LIB=${prefix}/lib/libcfitsio.a \
                     CFITSIO_EXT_INC=${prefix}/include \
-                    CC=${configure.cc} CL=${configure.cc} \
-                    CXX=${configure.cxx} CXXL=${configure.cxx}
+                    CC="${configure.cc} [get_canonical_archflags cc]" \
+                    CL="${configure.cc} [get_canonical_archflags ld]" \
+                    CXX="${configure.cxx} [get_canonical_archflags cxx]" \
+                    CXXL="${configure.cxx} [get_canonical_archflags ld]"
 
 build {
-    system "${build.cmd} -C ${worksrcpath}/src/cxx ${build.post_args}"
-    system "${build.cmd} -C ${worksrcpath}/src/C/subs static install AR=\"ar -rsv\" ${build.post_args}"
+    system -W ${worksrcpath}/src/cxx "${build.cmd} [join ${build.post_args}]"
+    system -W ${worksrcpath}/src/C/subs "${build.cmd} static install AR=\"ar -rsv\" [join ${build.post_args}]"
 }
 
-pre-destroot {
+post-build {
     # This file is just a copy of ${worksrcpath}/lib/libhpxgif.a
     # and conflicts with port:giflib.
     file delete ${worksrcpath}/lib/libgif.a
 }
 
 destroot {
-    xinstall -d ${destroot}${prefix}/include
-    xinstall -d ${destroot}${prefix}/lib
-    xinstall -d ${destroot}${prefix}/bin
     eval xinstall [glob ${worksrcpath}/include/*] ${destroot}${prefix}/include
     eval xinstall [glob ${worksrcpath}/lib/*] ${destroot}${prefix}/lib
     eval xinstall [glob ${worksrcpath}/bin/*] ${destroot}${prefix}/bin
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120322/93f30c83/attachment.html>