[94769] trunk/dports

[takeshi at macports.org]

Revision: 94769
          https://trac.macports.org/changeset/94769
Author:   takeshi at macports.org
Date:     2012-06-29 06:27:47 -0700 (Fri, 29 Jun 2012)
Log Message:
-----------
New port proj47. projects.h needed by grass (#34981) and cdo (#34991)
was made private in proj-4.8.0.
While we wait the developers of grass and cdo to make their source
not rely on the private header, grass and cdo are made to depend on
the new port proj47.
Everything is installed under ${prefix}/lib/proj47
so proj and proj47 can co-exist.

Two more changes to grass:
1. I was unable to build grass with clang, so llvm-gcc-4.2 is used instead
if ${configure.compiler}=="clang".
2. Allow both openmotif and lesstif (#24960).

Modified Paths:
--------------
    trunk/dports/gis/grass/Portfile
    trunk/dports/science/cdo/Portfile

Added Paths:
-----------
    trunk/dports/gis/proj47/
    trunk/dports/gis/proj47/Portfile

Modified: trunk/dports/gis/grass/Portfile
===================================================================
--- trunk/dports/gis/grass/Portfile	2012-06-29 09:18:08 UTC (rev 94768)
+++ trunk/dports/gis/grass/Portfile	2012-06-29 13:27:47 UTC (rev 94769)
@@ -5,7 +5,7 @@
 name              grass
 epoch             1
 version           6.4.0
-revision          1
+revision          2
 maintainers       nomaintainer
 categories        gis
 platforms         darwin
@@ -28,14 +28,18 @@
                   port:jpeg \
                   port:libpng \
                   port:mesa \
-                  port:openmotif \
-                  port:proj \
+                  lib:libXm:openmotif \
+                  port:proj47 \
                   port:tk \
                   path:lib/pkgconfig/cairo.pc:cairo \
                   port:readline
 
 use_parallel_build yes
 
+if {${configure.compiler}=="clang"} {
+    configure.compiler	llvm-gcc-4.2
+}
+
 patchfiles \
     patch-Makefile.diff \
     patch-configure.diff \
@@ -61,9 +65,9 @@
     --with-motif-libs=${prefix}/lib \
     --with-png-includes=${prefix}/include \
     --with-png-libs=${prefix}/lib \
-    --with-proj-includes=${prefix}/include \
-    --with-proj-libs=${prefix}/lib \
-    --with-proj-share=${prefix}/share/proj \
+    --with-proj-includes=${prefix}/lib/proj47/include \
+    --with-proj-libs=${prefix}/lib/proj47/lib \
+    --with-proj-share=${prefix}/lib/proj47/share/proj \
     --with-tcltk-includes=${prefix}/include \
     --with-tcltk-libs=${prefix}/lib \
     --with-cxx \

Added: trunk/dports/gis/proj47/Portfile
===================================================================
--- trunk/dports/gis/proj47/Portfile	                        (rev 0)
+++ trunk/dports/gis/proj47/Portfile	2012-06-29 13:27:47 UTC (rev 94769)
@@ -0,0 +1,49 @@
+# -*- 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: Portfile 94430 2012-06-19 04:44:41Z stromnov at macports.org $
+
+PortSystem          1.0
+
+set realname        proj
+name                ${realname}47
+version             4.7.0
+revision            0
+set datumgrid_version   1.5
+categories          gis
+license             MIT
+platforms           darwin
+distname            ${realname}-${version}
+
+maintainers         gmail.com:seanasy openmaintainer
+
+description         PROJ.4 - Cartographic Projections Library
+
+long_description    PROJ.4 is a library for converting data between \
+                    cartographic projections.
+
+homepage            http://trac.osgeo.org/proj/
+master_sites        http://download.osgeo.org/proj/
+
+distfiles-append    ${realname}-datumgrid-${datumgrid_version}.zip
+
+checksums           ${realname}-${version}.tar.gz \
+                    md5     927d34623b52e0209ba2bfcca18fe8cd \
+                    sha1    bfe59b8dc1ea0c57e1426c37ff2b238fea66acd7 \
+                    rmd160  cd96c09906b99d2ad205cc087e2863910d1124e1 \
+                    \
+                    ${realname}-datumgrid-${datumgrid_version}.zip \
+                    md5     f5bf28a2a9c6afe9a3f670f0c0adb783 \
+                    sha1    4429ba1a8c764d5c0e6724d868f6874f452f7440 \
+                    rmd160  f5deacd0242557c92c35d43941cd52a7e4096467
+
+extract.only        ${realname}-${version}.tar.gz
+
+post-extract {
+    system "unzip ${distpath}/${realname}-datumgrid-${datumgrid_version}.zip -d ${worksrcpath}/nad"
+}
+
+configure.pre_args  --prefix=${prefix}/lib/proj47
+configure.args      --mandir=${prefix}/lib/proj47/share/man
+
+livecheck.type      regex
+livecheck.url       ${master_sites}
+livecheck.regex     "${realname}-(\\d+(?:\\.\\d+)*)${extract.suffix}"

Modified: trunk/dports/science/cdo/Portfile
===================================================================
--- trunk/dports/science/cdo/Portfile	2012-06-29 09:18:08 UTC (rev 94768)
+++ trunk/dports/science/cdo/Portfile	2012-06-29 13:27:47 UTC (rev 94769)
@@ -5,6 +5,7 @@
 
 name                        cdo
 version                     1.5.4
+revision                    1
 platforms                   darwin
 maintainers                 takeshi
 license                     GPL-2
@@ -24,11 +25,11 @@
 fetch.ignore_sslcert        yes
 
 depends_lib                 port:netcdf \
-                            port:proj
+                            port:proj47
 
 configure.args              --with-netcdf=${prefix} \
                             --disable-dependency-tracking \
-                            --with-proj=${prefix} \
+                            --with-proj=${prefix}/lib/proj47 \
                             --with-hdf5=${prefix} \
                             --with-zlib=${prefix} \
                             --with-szlib=${prefix}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120629/856e3569/attachment.html>