<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[136796] trunk/dports/science/gildas</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/136796">136796</a></dd>
<dt>Author</dt> <dd>smaret@macports.org</dd>
<dt>Date</dt> <dd>2015-05-27 03:12:27 -0700 (Wed, 27 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>gildas: update to 201505a.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegildasPortfile">trunk/dports/science/gildas/Portfile</a></li>
<li><a href="#trunkdportssciencegildasfilespatchadminMakefiledefdiff">trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff</a></li>
<li><a href="#trunkdportssciencegildasfilespatchadminMakefilepythondiff">trunk/dports/science/gildas/files/patch-admin-Makefile.python.diff</a></li>
<li><a href="#trunkdportssciencegildasfilespatchadminMakefilestdcxxlibdiff">trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff</a></li>
<li><a href="#trunkdportssciencegildasfilespatchadmindefinesystemshdiff">trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff</a></li>
<li><a href="#trunkdportssciencegildasfilespatchadmingildasenvshdiff">trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff</a></li>
<li><a href="#trunkdportssciencegildasfilespatchlapackdiff">trunk/dports/science/gildas/files/patch-lapack.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegildasPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gildas/Portfile (136795 => 136796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gildas/Portfile 2015-05-27 07:15:41 UTC (rev 136795)
+++ trunk/dports/science/gildas/Portfile 2015-05-27 10:12:27 UTC (rev 136796)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> PortGroup compilers 1.0
</span><span class="cx">
</span><span class="cx"> name gildas
</span><del>-version 201407c
</del><ins>+version 201505a
</ins><span class="cx"> 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]
</span><span class="cx"> categories science
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -28,8 +28,8 @@
</span><span class="cx"> master_sites http://www.iram.fr/~gildas/dist/
</span><span class="cx"> distname ${name}-src-${my_version}
</span><span class="cx">
</span><del>-checksums rmd160 92447664ad2719308a9e44c2536ffde1431ff7d9 \
- sha256 0f73a5c55e8ebc2dce248e683bd4ac148c06d2f7da093b209ab8b1d1153e06b7
</del><ins>+checksums rmd160 c56761c34d62287b7245ab43b9ce362a1d6f8206 \
+ sha256 6ab6635f5edd0c16e7699fce96094da87194ca467c6e73cef19dbd1d7b9d91d3
</ins><span class="cx">
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx"> patchfiles patch-admin-Makefile.def.diff \
</span></span></pre></div>
<a id="trunkdportssciencegildasfilespatchadminMakefiledefdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff (136795 => 136796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff 2015-05-27 07:15:41 UTC (rev 136795)
+++ trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff 2015-05-27 10:12:27 UTC (rev 136796)
</span><span class="lines">@@ -1,17 +1,6 @@
</span><del>-# HG changeset patch
-# User Sean Farley <sean.michael.farley@gmail.com>
-# Date 1397847162 18000
-# Fri Apr 18 13:52:42 2014 -0500
-# Node ID a47e3a6b57a431073b3e3244893e887f3aa9b1f5
-# Parent f610b440a202997768c53e526a1d1fd9e10f1c0a
-make: change compilers to be variables
-
-diff --git a/admin/Makefile.def b/admin/Makefile.def
---- a/admin/Makefile.def
-+++ b/admin/Makefile.def
-@@ -71,16 +71,16 @@ CLDLIBS = $(GAG_LIB_FLAGS)
- FLDLIBS = $(GAG_LIB_FLAGS)
-
</del><ins>+--- gildas-src-may15a/admin/Makefile.def.orig 2015-03-17 10:55:49.000000000 +0100
++++ gildas-src-may15a/admin/Makefile.def 2015-05-21 23:36:25.000000000 +0200
+@@ -72,12 +72,12 @@
</ins><span class="cx"> # The following variables are provided to the user so that he can override
</span><span class="cx"> # the preprocessing, compilation and linking options defined by default
</span><span class="cx"> # later in this file. User can modify them here.
</span><span class="lines">@@ -30,62 +19,30 @@
</span><span class="cx">
</span><span class="cx"> # The following variables are for mandatory GLOBAL definitions.
</span><span class="cx"> # They should be modified only in this file.
</span><del>- GLOBAL_CPPFLAGS =
- GLOBAL_SLDFLAGS =
-@@ -229,11 +229,11 @@ GLOBAL_DIRTY = $(builddir) *~ TAGS Chang
-
- ###########################################################################
</del><ins>+@@ -219,7 +219,7 @@
</ins><span class="cx"> # Fortran preprocessing
</span><span class="cx">
</span><span class="cx"> # Preprocessor command
</span><span class="cx"> -CPP = cpp
</span><span class="cx"> +CPP = @CPP@
</span><del>- ifeq ($(GAG_OS_KIND),solaris)
- CPP = /usr/ccs/lib/cpp
- endif
- ifeq ($(GAG_OS_KIND),aix)
- CPP = /usr/ccs/lib/cpp
-@@ -307,12 +307,12 @@ endif
</del><span class="cx">
</span><del>- ###########################################################################
- # C compilation
</del><ins>+ # Preprocessor generic flags
+ GLOBAL_CPPFLAGS += -P -traditional -C
+@@ -335,7 +335,7 @@
+ # C++ compilation
</ins><span class="cx">
</span><del>- # C compiler name
--CC = gcc
</del><ins>+ # C++ compiler name
</ins><span class="cx"> -CXX = g++
</span><del>-+CC = @CC@
</del><span class="cx"> +CXX = @CXX@
</span><del>- ifeq ($(GAG_OS_KIND),aix)
- CC = xlc
</del><ins>+ ifdef GAG_COMPILER_CXXEXE
+ CXX = $(GAG_COMPILER_CXXEXE)
</ins><span class="cx"> endif
</span><del>- ifeq ($(GAG_OS_KIND),osf)
- CC = cc
-@@ -331,11 +331,11 @@ GLOBAL_CFLAGS += -I$(execincdir)
- ifneq ($(useincdir),)
- GLOBAL_CFLAGS += -I$(useincdir)
</del><ins>+@@ -538,7 +538,7 @@
+ SIC_SYS_LIBS =
+ SIC_LIB_DEPENDS += $(_GAG_LIBS) $(LEGACY_LIBS)
+ ifeq ($(PYTHON_PRESENT),yes)
+- SIC_SYS_LIBS += $(shell python $(gagadmdir)/python-config-ldflags.py)
++ SIC_SYS_LIBS += $(shell @PYTHON@ $(gagadmdir)/python-config-ldflags.py)
</ins><span class="cx"> endif
</span><del>-
- # GCC flags
--ifeq ($(CC),gcc)
-+ifeq ($(CC),@CC@)
- # Generic to GCC
- GLOBAL_CFLAGS += -pipe -fPIC
- OPTION_CFLAGS += -Wall
- ifeq ($(GAG_USE_32BITS),yes)
- GLOBAL_CFLAGS += -m32
-diff --git a/admin/Makefile.main b/admin/Makefile.main
---- a/admin/Makefile.main
-+++ b/admin/Makefile.main
-@@ -16,11 +16,11 @@ ifeq ($(GAG_OS_KIND),mingw)
- RC_FILES = $(patsubst %,win-%.rc,$(EXECUTABLES))
- RC_EXISTING_FILES = $(wildcard $(RC_FILES))
- RC_DLLS = $(patsubst %.rc,$(libdir)/%.dll,$(RC_EXISTING_FILES))
- TARGETS += $(RC_DLLS)
- $(libdir)/%.dll: $(builddir)/%.o
-- gcc -o $@ -shared $?
-+ $(CC) -o $@ -shared $?
- endif
- ifneq ($(GAG_OS_KIND),cygwin)
- DIRTY = $(PCL) $(EXECS) $(OBJECTS)
- else
- DIRTY = $(PCL) $(patsubst %,%.exe,$(EXECS)) $(OBJECTS)
</del><ins>+ ifeq ($(CFITSIO_PRESENT),yes)
+ SIC_LIB_DEPENDS += -lcfitsio
</ins><span class="cx">\ No newline at end of file
</span></span></pre></div>
<a id="trunkdportssciencegildasfilespatchadminMakefilepythondiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gildas/files/patch-admin-Makefile.python.diff (136795 => 136796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gildas/files/patch-admin-Makefile.python.diff 2015-05-27 07:15:41 UTC (rev 136795)
+++ trunk/dports/science/gildas/files/patch-admin-Makefile.python.diff 2015-05-27 10:12:27 UTC (rev 136796)
</span><span class="lines">@@ -1,17 +1,6 @@
</span><del>-# HG changeset patch
-# User Sean Farley <sean.michael.farley@gmail.com>
-# Date 1397847327 18000
-# Fri Apr 18 13:55:27 2014 -0500
-# Node ID 7a1883c3f9ed3e8c9b9f97de7ecb5ed7e37c058a
-# Parent a47e3a6b57a431073b3e3244893e887f3aa9b1f5
-make: use variable for python
-
-diff --git a/admin/Makefile.python b/admin/Makefile.python
---- a/admin/Makefile.python
-+++ b/admin/Makefile.python
-@@ -39,11 +39,11 @@ include $(gagadmdir)/Makefile.build
- # Specific targets and rules
-
</del><ins>+--- gildas-src-may15a/admin/Makefile.python.orig 2014-10-13 14:48:33.000000000 +0200
++++ gildas-src-may15a/admin/Makefile.python 2015-05-26 10:06:21.000000000 +0200
+@@ -41,7 +41,7 @@
</ins><span class="cx"> ifneq ($(MOD_IDENTITY),)
</span><span class="cx">
</span><span class="cx"> $(MOD_NAME): $(MOD_SOURCES) $(MOD_INCLUDES) $(MOD_EXTRAS) $(builddir)/setup.py
</span><span class="lines">@@ -19,6 +8,4 @@
</span><span class="cx"> + $(GAG_PYTHON_DISTFLAGS) @PYTHON@ $(builddir)/setup.py build --build-base $(builddir) --build-lib $(builddir)
</span><span class="cx"> $(MV) $(builddir)/*.$(SO_EXT) $(pythondir)
</span><span class="cx">
</span><del>- $(builddir)/setup.py: setup.py.src Makefile
- sed \
- -e 's?\$$MOD_IDENTITY?$(MOD_IDENTITY)?g' \
</del><ins>+ $(builddir)/setup.py: $(gagsrcdir)/kernel/python/binding/setup.py.src Makefile
</ins></span></pre></div>
<a id="trunkdportssciencegildasfilespatchadminMakefilestdcxxlibdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff (136795 => 136796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff 2015-05-27 07:15:41 UTC (rev 136795)
+++ trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff 2015-05-27 10:12:27 UTC (rev 136796)
</span><span class="lines">@@ -1,36 +1,22 @@
</span><del>-# HG changeset patch
-# User Sean Farley <sean.michael.farley@gmail.com>
-# Date 1397847476 18000
-# Fri Apr 18 13:57:56 2014 -0500
-# Node ID ba9baa3e45905e06f670f7c19198c0b7190c9706
-# Parent 7a1883c3f9ed3e8c9b9f97de7ecb5ed7e37c058a
-make: use variable for stdcxxlib
-
-diff --git a/admin/Makefile.build b/admin/Makefile.build
---- a/admin/Makefile.build
-+++ b/admin/Makefile.build
-@@ -372,6 +372,8 @@ endif
- -lm:
-
</del><ins>+--- gildas-src-may15a/admin/Makefile.build.orig 2015-03-03 17:31:08.000000000 +0100
++++ gildas-src-may15a/admin/Makefile.build 2015-05-26 09:58:20.000000000 +0200
+@@ -396,6 +396,8 @@
</ins><span class="cx"> # Required by ASDM libs:
</span><span class="cx"> -lstdc++:
</span><span class="cx">
</span><span class="cx"> +-lc++:
</span><span class="cx"> +
</span><span class="cx"> ###########################################################################
</span><del>-diff --git a/admin/Makefile.def b/admin/Makefile.def
---- a/admin/Makefile.def
-+++ b/admin/Makefile.def
-@@ -531,11 +531,11 @@ endif
- # various systems
- ifeq ($(GAG_USE_32BITS),yes)
</del><ins>+
+ endif # _MAKEFILE_BUILD_
+--- gildas-src-may15a/admin/Makefile.def.orig 2015-05-26 09:53:50.000000000 +0200
++++ gildas-src-may15a/admin/Makefile.def 2015-05-26 09:59:26.000000000 +0200
+@@ -491,7 +491,7 @@
</ins><span class="cx"> # Compilation in 32 bits mode
</span><span class="cx"> GAG_32BITS_SWITCH = "-m32"
</span><span class="cx"> endif
</span><del>--STDCpp_LIB += $(shell g++ $(GAG_32BITS_SWITCH) -print-file-name=libstdc++.$(LIB_CPP_EXT))
</del><ins>+-STDCpp_LIB += $(shell g++ $(GAG_32BITS_SWITCH) -print-file-name=libstdc++.$(LIB_CXX_EXT))
</ins><span class="cx"> +STDCpp_LIB += @STDCXXLIB@
</span><span class="cx">
</span><span class="cx"> ###########################################################################
</span><span class="cx"> # Kernel libraries
</span><del>-
- LEGACY_LIBS = -lslatec -llapack -lblas
</del></span></pre></div>
<a id="trunkdportssciencegildasfilespatchadmindefinesystemshdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff (136795 => 136796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff 2015-05-27 07:15:41 UTC (rev 136795)
+++ trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff 2015-05-27 10:12:27 UTC (rev 136796)
</span><span class="lines">@@ -1,45 +1,38 @@
</span><del>---- gildas-src-jun14a/admin/define-system.sh.orig 2014-06-06 10:30:59.000000000 +0200
-+++ gildas-src-jun14a/admin/define-system.sh 2014-06-06 10:31:24.000000000 +0200
-@@ -227,8 +227,8 @@
- fi
</del><ins>+--- gildas-src-may15a/admin/define-system.sh.orig 2014-12-09 11:31:56.000000000 +0100
++++ gildas-src-may15a/admin/define-system.sh 2015-05-26 10:30:40.000000000 +0200
+@@ -213,8 +213,8 @@
+ fi
</ins><span class="cx"> if which ifort > /dev/null 2>&1; then
</span><del>- DEFAULT_COMPILER=ifort
</del><ins>+ DEFAULT_FCOMPILER=ifort
</ins><span class="cx"> - elif which gfortran > /dev/null 2>&1; then
</span><del>-- DEFAULT_COMPILER=gfortran
</del><ins>+- DEFAULT_FCOMPILER=gfortran
</ins><span class="cx"> + elif which @FC@ > /dev/null 2>&1; then
</span><del>-+ DEFAULT_COMPILER=@FC@
</del><ins>++ DEFAULT_FCOMPILER=@FC@
</ins><span class="cx"> fi
</span><span class="cx"> fi ;;
</span><span class="cx"> CYGWIN*)
</span><del>-@@ -297,7 +297,7 @@
- if [ "$GAG_COMPILER_KIND" = "ifort" ]; then
- # Compress Major+Minor (no dot = easier preprocessing tests)
- GAG_COMPILER_VERSION=`$GAG_COMPILER_EXE -v 2>&1 | head -1 | cut -d" " -f2 | sed "s%\.%%"`
-- elif [ "$GAG_COMPILER_KIND" = "gfortran" ]; then
-+ elif [ "$GAG_COMPILER_KIND" != "${GAG_COMPILER_KIND/gfortran/}" ]; then
- # Compress Major+Minor+Micro (no dot = easier preprocessing tests)
- GAG_COMPILER_VERSION=`$GAG_COMPILER_EXE --version | head -1 | sed "s%.*[^0-9]\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*%\1\2\3%"`
- # Reject gfortran unstable versions
-@@ -346,7 +346,7 @@
- # GAG_COMPILER_CPPFLAGS="-DFORTRAN2003_PP"
- :
</del><ins>+@@ -375,10 +375,12 @@
</ins><span class="cx"> fi
</span><del>-- elif [ "$GAG_COMPILER_KIND" = "gfortran" ]; then
-+ elif [ "$GAG_COMPILER_KIND" != "${GAG_COMPILER_KIND/gfortran/}" ]; then
- GAG_COMPILER_LIBS="-lgfortran"
- if [ "$GFORTRAN_VERSION3" ">" "4.5.1" ]; then
- # Fortran 2003 pointer procedures:
-@@ -359,10 +359,12 @@
- fi
</del><span class="cx"> fi
</span><span class="cx"> #
</span><del>-- GCC_VERSION=`gcc --version | head -1 | sed "s%.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*%\1%"`
-+ GCC_VERSION=`@CC@ --version | head -1 | sed "s%.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*%\1%"`
- if [ "$GCC_VERSION" ">" "4.7.9" ]; then
</del><ins>+- CPP_VERSION=`cpp --version | head -1 | sed "s%.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*%\1%"`
++ CPP_VERSION=`@CPP@ --version | head -1 | sed "s%.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*%\1%"`
+ if [ "$CPP_VERSION" ">" "4.7.9" ]; then
</ins><span class="cx"> # See http://gcc.gnu.org/gcc-4.8/porting_to.html
</span><span class="cx"> GAG_COMPILER_CPPFLAGS="$GAG_COMPILER_CPPFLAGS -ffreestanding"
</span><del>-+ elif [ "$GCC_VERSION" != "${GCC_VERSION/clang/}" ]; then
</del><ins>++ elif [ "$CPP_VERSION" != "${CPP_VERSION/clang/}" ]; then
</ins><span class="cx"> + GAG_COMPILER_CPPFLAGS="$GAG_COMPILER_CPPFLAGS -ffreestanding"
</span><span class="cx"> fi
</span><span class="cx"> #
</span><del>- export GAG_COMPILER_FFLAGS GAG_COMPILER_LIBS GAG_COMPILER_CPPFLAGS
</del><ins>+ export GAG_COMPILER_FFLAGS GAG_COMPILER_FLIBS GAG_COMPILER_CPPFLAGS
+--- gildas-src-may15a/admin/define-system.sh.orig 2015-05-27 10:53:14.000000000 +0200
++++ gildas-src-may15a/admin/define-system.sh 2015-05-27 10:53:29.000000000 +0200
+@@ -403,7 +403,7 @@
+ # 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
+ 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
</ins></span></pre></div>
<a id="trunkdportssciencegildasfilespatchadmingildasenvshdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff (136795 => 136796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff 2015-05-27 07:15:41 UTC (rev 136795)
+++ trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff 2015-05-27 10:12:27 UTC (rev 136796)
</span><span class="lines">@@ -1,17 +1,6 @@
</span><del>-# HG changeset patch
-# User Sean Farley <sean.michael.farley@gmail.com>
-# Date 1397849684 18000
-# Fri Apr 18 14:34:44 2014 -0500
-# Node ID 0c556df11dafc4475317fdc3598c7db1ad0b4265
-# Parent 6bac5a7664f423bf62146ffd002bff8c397df3ec
-gildas-sh: use variables in script
-
-diff --git a/admin/gildas-env.sh b/admin/gildas-env.sh
---- a/admin/gildas-env.sh
-+++ b/admin/gildas-env.sh
-@@ -416,11 +416,11 @@ EOF
- unset PYTHON_INC_DIR PYTHON_LIB_DIR
- unset NUMPY_PRESENT NUMPY_INC_PRESENT NUMPY_INC_DIR
</del><ins>+--- gildas-src-may15a/admin/gildas-env.sh.orig 2014-12-09 11:45:14.000000000 +0100
++++ gildas-src-may15a/admin/gildas-env.sh 2015-05-26 10:12:21.000000000 +0200
+@@ -426,7 +426,7 @@
</ins><span class="cx"> fi
</span><span class="cx"> #
</span><span class="cx"> # Check availability of g++. This only has an impact on ATM2009
</span><span class="lines">@@ -20,11 +9,7 @@
</span><span class="cx"> ATM2009_PRESENT=yes
</span><span class="cx"> else
</span><span class="cx"> gagenv_message "g++ not found in your \$PATH"
</span><del>- gagenv_message "This means that ATM 2009 will not be available"
- ATM2009_PRESENT=no
-@@ -433,38 +433,38 @@ EOF
- PYTHON_INC=no
- PYTHON_LIB=no
</del><ins>+@@ -443,34 +443,34 @@
</ins><span class="cx"> NUMPY_PRESENT=no
</span><span class="cx"> NUMERIC_PRESENT=no
</span><span class="cx"> SQLITE3_PRESENT=no
</span><span class="lines">@@ -32,10 +17,10 @@
</span><span class="cx"> + if \which @PYTHON@ > /dev/null 2>&1; then
</span><span class="cx"> # Check the version of python the user is currently using
</span><span class="cx"> - if python -V 2>&1 > /dev/null 2>&1; then
</span><del>-- PY_VERS_FULL=`python -V 2>&1 | cut -d' ' -f2`
</del><ins>+- PYTHON_VERS_FULL=`python -V 2>&1 | cut -d' ' -f2`
</ins><span class="cx"> + if @PYTHON@ -V 2>&1 > /dev/null 2>&1; then
</span><del>-+ PY_VERS_FULL=`@PYTHON@ -V 2>&1 | cut -d' ' -f2`
- PY_VERS=`echo $PY_VERS_FULL | sed "s%\([0-9]\.[0-9][0-9]*\).*%\1%"`
</del><ins>++ PYTHON_VERS_FULL=`@PYTHON@ -V 2>&1 | cut -d' ' -f2`
+ PYTHON_VERS=`echo $PYTHON_VERS_FULL | sed "s%\([0-9]\.[0-9][0-9]*\).*%\1%"`
</ins><span class="cx"> # Search for Python header and library. kernel/python/binding/setup.py
</span><span class="cx"> # does exactly the same, so this should be consistent
</span><span class="cx"> - PYTHON_INC_DIR=`python -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'))"`
</span><span class="lines">@@ -45,7 +30,7 @@
</span><span class="cx"> + PYTHON_LIB_DIR=`@PYTHON@ -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR'))"`
</span><span class="cx"> PYTHON_LIB=yes # libpython name on the various supported systems is just
</span><span class="cx"> # unpredictible. Can not check in advance if the linker will
</span><del>- # find it or not.
</del><ins>+ # find it or not. See also our script python-config-ldflags.py
</ins><span class="cx"> #
</span><span class="cx"> # Now search for Numpy or Numeric
</span><span class="cx"> - if python -c "import numpy" > /dev/null 2>&1; then
</span><span class="lines">@@ -68,11 +53,7 @@
</span><span class="cx"> SQLITE3_PRESENT=yes
</span><span class="cx"> fi
</span><span class="cx"> fi
</span><del>- else
- gagenv_message "Python not found in your \$PATH"
-@@ -536,29 +536,29 @@ EOF
- fi
- if file_present "libatm2003." "${DIR}"; then
</del><ins>+@@ -546,11 +546,11 @@
</ins><span class="cx"> ATM2003_PRESENT=yes
</span><span class="cx"> ATM2003_LIB_DIR=$DIR
</span><span class="cx"> fi
</span><span class="lines">@@ -86,7 +67,7 @@
</span><span class="cx"> BLAS_PRESENT=yes
</span><span class="cx"> BLAS_LIB_DIR=$DIR
</span><span class="cx"> fi
</span><del>- if file_present "libslatec." "${DIR}"; then
</del><ins>+@@ -558,13 +558,13 @@
</ins><span class="cx"> SLATEC_PRESENT=yes
</span><span class="cx"> SLATEC_LIB_DIR=$DIR
</span><span class="cx"> fi
</span><span class="lines">@@ -107,11 +88,7 @@
</span><span class="cx"> if file_present "libasdmStandalone." "${DIR}"; then
</span><span class="cx"> SDM_PRESENT=yes
</span><span class="cx"> if [ "$SDM_PRESENT" = "yes" ]; then
</span><del>- SDM_LIB_DIR=$DIR
- fi
-@@ -588,10 +588,12 @@ EOF
- IFS=$OLDIFS
- #
</del><ins>+@@ -598,6 +598,8 @@
</ins><span class="cx"> XML_PRESENT="yes"
</span><span class="cx"> #
</span><span class="cx"> unset GAG_LIB_DEP_PATH GAG_INC_DEP_PATH
</span><span class="lines">@@ -120,5 +97,3 @@
</span><span class="cx"> #
</span><span class="cx"> if [ "$X11_INC" = "yes" ]; then
</span><span class="cx"> gagenv_message "Found X11 header in $X11_INC_DIR"
</span><del>- GAG_INC_DEP_PATH=$GAG_INC_DEP_PATH:$X11_INC_DIR
- else
</del></span></pre></div>
<a id="trunkdportssciencegildasfilespatchlapackdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gildas/files/patch-lapack.diff (136795 => 136796)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gildas/files/patch-lapack.diff 2015-05-27 07:15:41 UTC (rev 136795)
+++ trunk/dports/science/gildas/files/patch-lapack.diff 2015-05-27 10:12:27 UTC (rev 136796)
</span><span class="lines">@@ -42,22 +42,18 @@
</span><span class="cx"> else
</span><span class="cx"> GAG_LIBS = -lgkernel
</span><span class="cx"> diff --git a/legacy/slatec/Makefile b/legacy/slatec/Makefile
</span><del>---- a/legacy/slatec/Makefile
-+++ b/legacy/slatec/Makefile
-@@ -22,11 +22,11 @@ M-all.o N-all.o O-all.o Q-all.o R-all.o
- Sd-slatec.o Se-slatec.o Sg-slatec.o Si-slatec.o Sln-slatec.o So-slatec.o \
- Sp-slatec.o Sqr-slatec.o Ss-slatec.o St-slatec.o Suz-slatec.o T-all.o \
</del><ins>+--- gildas-src-may15a/legacy/slatec/Makefile.orig 2014-12-09 11:31:56.000000000 +0100
++++ gildas-src-may15a/legacy/slatec/Makefile 2015-05-26 10:42:52.000000000 +0200
+@@ -24,7 +24,7 @@
</ins><span class="cx"> U-all.o V-all.o W-all.o X-all.o Y-all.o Z-all.o d1mach.o i1mach.o pimach.o \
</span><span class="cx"> r1mach.o dummy.o P-all.o P-value.o Dp-1vlu.o
</span><span class="cx">
</span><span class="cx"> -LIB_DEPENDS = -llapack -lblas
</span><span class="cx"> +LIB_DEPENDS = -framework Accelerate
</span><span class="cx">
</span><del>- ifeq ($(GAG_COMPILER_KIND),ifc)
</del><ins>+ ifeq ($(GAG_COMPILER_FKIND),ifc)
</ins><span class="cx"> OPTION_FFLAGS =
</span><del>- endif
- ifeq ($(GAG_COMPILER_KIND),ifort)
-diff --git a/packages/clic/lib/Makefile b/packages/clic/lib/Makefile
</del><ins>+
</ins><span class="cx"> --- a/packages/clic/lib/Makefile
</span><span class="cx"> +++ b/packages/clic/lib/Makefile
</span><span class="cx"> @@ -62,11 +62,11 @@ CLIC_LIB_OBJECTS = blockdata.o check.o c
</span></span></pre>
</div>
</div>
</body>
</html>