[116604] trunk/dports/science

30 Jan 2014

Revision: 116604
          https://trac.macports.org/changeset/116604
Author:   aronnax@macports.org
Date:     2014-01-29 19:49:17 -0800 (Wed, 29 Jan 2014)
Log Message:
-----------
healpix-c, healpix-cxx: update to 3.11.2

 - Source packages for these are now available as standalone tarballs,
   so these are no longer subports of healpix.
 - Fix compiler blacklists for +openmp (healpix-cxx hadn't actually been
   built with OpenMP acceleration before).
 - Add a missing build dependency for healpix-java.

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

Added Paths:
-----------
    trunk/dports/science/healpix-c/
    trunk/dports/science/healpix-c/Portfile
    trunk/dports/science/healpix-cxx/
    trunk/dports/science/healpix-cxx/Portfile

Removed Paths:
-------------
    trunk/dports/science/healpix/files/patch-configure.ac.diff

Modified: trunk/dports/science/healpix/Portfile
===================================================================

--- trunk/dports/science/healpix/Portfile	2014-01-30 03:29:09 UTC (rev 116603)
+++ trunk/dports/science/healpix/Portfile	2014-01-30 03:49:17 UTC (rev 116604)
@@ -10,8 +10,9 @@
 license             GPL-2
 maintainers         aronnax
 description         Hierarchical Equal Area isoLatitude Pixelization of a sphere
-long_description    Software for pixelization, hierarchical indexation, synthesis, \
-                    analysis, and visualization of data on the sphere.
+long_description \
+  Software for pixelization, hierarchical indexing, synthesis, analysis, and \
+  visualization of data on the sphere.
 homepage            http://healpix.jpl.nasa.gov/
 platforms           darwin
 master_sites        sourceforge:project/${name}/Healpix_${base_version}/
@@ -54,47 +55,6 @@
     livecheck.type  none
 }
 
-subport ${name}-c {
-    description         C language implementation of HEALPix
-    long_description    ${long_description} This is the ${description}.
-
-    worksrcdir          Healpix_${base_version}/src/C/autotools
-
-    depends_build       port:pkgconfig
-    depends_lib         port:cfitsio
-
-    use_autoreconf      yes
-}
-
-subport ${name}-cxx {
-    revision            1
-    description         C++ language implementation of HEALPix
-    long_description    ${long_description} This is the ${description}.
-
-    worksrcdir          Healpix_${base_version}/src/cxx/autotools
-
-    # FIXME: Patch fixed upstream, but not in a release yet
-    patchfiles          patch-configure.ac.diff
-
-    depends_build       port:pkgconfig
-    depends_lib         port:cfitsio
-
-    use_autoreconf      yes
-
-    configure.args-append \
-                        --disable-openmp
-
-    default_variants    +openmp
-
-    variant openmp description "enable OpenMP parallel acceleration" {
-        configure.args-delete \
-                        --disable-openmp
-
-        # http://www.llvm.org/devmtg/2013-04/#talk2
-        compiler.blacklist *clang*
-    }
-}
-
 subport ${name}-java {
     description         Java language implementation of HEALPix
     long_description    ${long_description} This is the ${description}.
@@ -103,7 +63,7 @@
 
     patchfiles      patch-build.xml.diff
 
-    depends_build   bin:javac:jikes bin:jar:jikes
+    depends_build   bin:javac:jikes bin:jar:jikes bin:ant:apache-ant
     depends_lib     bin:java:kaffe
 
     use_configure   no

Deleted: trunk/dports/science/healpix/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/science/healpix/files/patch-configure.ac.diff	2014-01-30 03:29:09 UTC (rev 116603)
+++ trunk/dports/science/healpix/files/patch-configure.ac.diff	2014-01-30 03:49:17 UTC (rev 116604)
@@ -1,9 +0,0 @@
---- configure.ac.orig	2013-09-01 08:54:22.000000000 -0700
-+++ configure.ac	2013-09-01 08:54:37.000000000 -0700
-@@ -1,5 +1,5 @@
- AC_INIT([healpix_cxx], [3.10])
--AM_INIT_AUTOMAKE([foreign -Wall -Werror])
-+AM_INIT_AUTOMAKE([foreign subdir-objects -Wall -Werror])
- 
- dnl
- dnl Needed for linking on Windows.

Added: trunk/dports/science/healpix-c/Portfile
===================================================================
--- trunk/dports/science/healpix-c/Portfile	                        (rev 0)
+++ trunk/dports/science/healpix-c/Portfile	2014-01-30 03:49:17 UTC (rev 116604)
@@ -0,0 +1,32 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem          1.0
+
+name                healpix-c
+version             3.11.2
+categories          science
+license             GPL-2
+maintainers         aronnax
+description         C language implementation of HEALPix
+long_description \
+  Software for pixelization, hierarchical indexing, synthesis, analysis, and \
+  visualization of data on the sphere. This is the ${description}.
+homepage            http://healpix.sourceforge.net
+platforms           darwin
+master_sites        sourceforge:project/healpix/Healpix_3.11/autotools_packages/
+distname            chealpix-${version}
+
+checksums           md5     4d6e2c77429a1fc316c6d99399fdbcf6 \
+                    sha1    ae37635f21fda103f87f8ade245ca5dc1a114ad5
+
+depends_build       port:pkgconfig
+depends_lib         port:cfitsio
+
+pre-activate {
+    if {[file exists ${prefix}/lib/libchealpix.a]
+        && ![catch {set vers [lindex [registry_active healpix] 0]}]
+        && [vercmp [lindex $vers 1] 3.00] < 0} {
+        registry_deactivate_composite healpix "" [list ports_nodepcheck 1]
+    }
+}


Property changes on: trunk/dports/science/healpix-c/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

Added: trunk/dports/science/healpix-cxx/Portfile
===================================================================
--- trunk/dports/science/healpix-cxx/Portfile	                        (rev 0)
+++ trunk/dports/science/healpix-cxx/Portfile	2014-01-30 03:49:17 UTC (rev 116604)
@@ -0,0 +1,47 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem          1.0
+
+name                healpix-cxx
+version             3.11.2
+categories          science
+license             GPL-2
+maintainers         aronnax
+description         C++ language implementation of HEALPix
+long_description \
+  Software for pixelization, hierarchical indexing, synthesis, analysis, and \
+  visualization of data on the sphere. This is the ${description}.
+homepage            http://healpix.sourceforge.net
+platforms           darwin
+master_sites        sourceforge:project/healpix/Healpix_3.11/autotools_packages/
+distname            healpix_cxx-${version}
+
+checksums           md5     38f968d70df801a2d07ce498745925ec \
+                    sha1    982620220ef578b5eb9a79357200ee0c1fd7b090
+
+depends_build       port:pkgconfig
+depends_lib         port:cfitsio
+
+configure.args-append \
+                    --disable-openmp
+
+default_variants    +openmp
+
+variant openmp description "enable OpenMP parallel acceleration" {
+    configure.args-delete \
+                    --disable-openmp
+
+        # FIXME: llvm-gcc42 is broken, https://trac.macports.org/ticket/40713
+        # Only clang really needs to be blacklisted
+        compiler.blacklist *gcc-4.2 *clang*
+        compiler.fallback macports-gcc-4.8 macports-gcc-4.7 macports-gcc-4.6 macports-gcc-4.5 macports-gcc-4.4 macports-gcc-4.3
+}
+
+pre-activate {
+    if {[file exists ${prefix}/lib/libchealpix.a]
+        && ![catch {set vers [lindex [registry_active healpix] 0]}]
+        && [vercmp [lindex $vers 1] 3.00] < 0} {
+        registry_deactivate_composite healpix "" [list ports_nodepcheck 1]
+    }
+}


Property changes on: trunk/dports/science/healpix-cxx/Portfile
___________________________________________________________________
Added: svn:keywords
   + Id
Added: svn:eol-style
   + native

    

aronnax＠macports.org

tags

participants (1)