[149398] trunk/dports/science/gildas

[smaret at macports.org]

Revision: 149398
          https://trac.macports.org/changeset/149398
Author:   smaret at macports.org
Date:     2016-06-17 03:12:31 -0700 (Fri, 17 Jun 2016)
Log Message:
-----------
gildas: Update to version 201606a.

Modified Paths:
--------------
    trunk/dports/science/gildas/Portfile
    trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff

Added Paths:
-----------
    trunk/dports/science/gildas/files/mrtcal.in

Modified: trunk/dports/science/gildas/Portfile
===================================================================
--- trunk/dports/science/gildas/Portfile	2016-06-17 05:39:00 UTC (rev 149397)
+++ trunk/dports/science/gildas/Portfile	2016-06-17 10:12:31 UTC (rev 149398)
@@ -6,7 +6,7 @@
 PortGroup           active_variants 1.1 
 
 name                gildas
-version             201605a
+version             201606a
 set my_version      [string tolower [clock format [clock scan 2000-[string range ${version} 4 5]-10] -format %b]][string range ${version} 2 3][string range ${version} 6 end]
 categories          science
 platforms           darwin
@@ -27,11 +27,11 @@
                     plotting, widgets).
 
 homepage            http://www.iram.fr/IRAMFR/GILDAS/gildas.html
-master_sites        http://www.iram.fr/~gildas/dist/archive/gildas
+master_sites        http://www.iram.fr/~gildas/dist/
 distname            ${name}-src-${my_version}
 
-checksums           rmd160  eafb3cb6e29cb3b75aef2b97363b5ebd4e4fb86f \
-                    sha256  fc5852e7d1a8dec9574873c1f71d4c781a8e1433b8a28c56ae150679f94c80a7
+checksums           rmd160  748d9faf6318db1dcea9cb84ea48790b925a8289 \
+                    sha256  7043db2fbca6144d714aaaf23aa4c5a7932ca2fd9d79d274286f78a470acd141
 
 patch.pre_args      -p1
 patchfiles          patch-admin-Makefile.def.diff \
@@ -96,9 +96,10 @@
     xinstall ${filespath}/greg.in ${destroot}${prefix}/bin/greg
     xinstall ${filespath}/mapping.in ${destroot}${prefix}/bin/mapping
     xinstall ${filespath}/mira.in ${destroot}${prefix}/bin/mira
+    xinstall ${filespath}/mrtcal.in ${destroot}${prefix}/bin/mrtcal
     xinstall ${filespath}/sic.in ${destroot}${prefix}/bin/sic
 
-    reinplace -W ${destroot}${prefix}/bin s|@PREFIX@|${prefix}|g astro class clic greg mapping mira sic
+    reinplace -W ${destroot}${prefix}/bin s|@PREFIX@|${prefix}|g astro class clic greg mapping mira mrtcal sic
 
     # delete broken module
     delete ${destroot}${prefix}/lib/gildas/x86_64-darwin-gfortran/python/pyclassfiller

Added: trunk/dports/science/gildas/files/mrtcal.in
===================================================================
--- trunk/dports/science/gildas/files/mrtcal.in	                        (rev 0)
+++ trunk/dports/science/gildas/files/mrtcal.in	2016-06-17 10:12:31 UTC (rev 149398)
@@ -0,0 +1,13 @@
+#!/bin/sh -e
+
+export GAG_ROOT_DIR="@PREFIX@/lib/gildas"
+export GAG_PATH="${GAG_ROOT_DIR}/etc"
+export GAG_EXEC_SYSTEM="x86_64-darwin-gfortran"
+if [ -z "\$PYTHONPATH" ]; then
+  PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python"
+else
+  PYTHONPATH="${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/python:${PYTHONPATH}"
+fi
+export PYTHONPATH
+export DYLD_LIBRARY_PATH=${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/lib/
+exec ${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/bin/mrtcal ${*}

Modified: trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff
===================================================================
--- trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff	2016-06-17 05:39:00 UTC (rev 149397)
+++ trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff	2016-06-17 10:12:31 UTC (rev 149398)
@@ -31,8 +31,8 @@
      #  source admin/gildas-env.sh -c ifort  (use default ifort e.g. ifort 11) and
      #  source admin/gildas-env.sh -c ifort14  (i.e. use namely non default ifort 14)
      # does not build their binaries in the same integration branch.
--    GAG_EXEC_SYSTEM=$GAG_MACHINE-$GAG_OS_VERS-$GAG_COMPILER_FEXE$GAG_CONFIG
-+    GAG_EXEC_SYSTEM=$GAG_MACHINE-$GAG_OS_VERS-$GAG_COMPILER_FKIND$GAG_CONFIG
+-    GAG_EXEC_SYSTEM=$GAG_MACHINE-$GAG_TARGET_VERS-$GAG_COMPILER_FEXE$GAG_CONFIG
++    GAG_EXEC_SYSTEM=$GAG_MACHINE-$GAG_TARGET_VERS-$GAG_COMPILER_FKIND$GAG_CONFIG
      export GAG_COMP_SYSTEM GAG_EXEC_SYSTEM
      export GAG_MACHINE GAG_OS_KIND GAG_OS_VERS GAG_CONFIG
      export GAG_COMPILER_CKIND GAG_COMPILER_CEXE
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160617/c0731b76/attachment.html>