[119194] trunk/dports/science
sean at macports.org
sean at macports.org
Sat Apr 19 17:21:38 PDT 2014
Revision: 119194
https://trac.macports.org/changeset/119194
Author: sean at macports.org
Date: 2014-04-19 17:21:38 -0700 (Sat, 19 Apr 2014)
Log Message:
-----------
gildas: add new port for radioastronomy; closes #42886
Added Paths:
-----------
trunk/dports/science/gildas/
trunk/dports/science/gildas/Portfile
trunk/dports/science/gildas/files/
trunk/dports/science/gildas/files/astro.in
trunk/dports/science/gildas/files/class.in
trunk/dports/science/gildas/files/clic.in
trunk/dports/science/gildas/files/greg.in
trunk/dports/science/gildas/files/mapping.in
trunk/dports/science/gildas/files/mira.in
trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff
trunk/dports/science/gildas/files/patch-admin-Makefile.diff
trunk/dports/science/gildas/files/patch-admin-Makefile.python.diff
trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff
trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff
trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff
trunk/dports/science/gildas/files/patch-fortran.diff
trunk/dports/science/gildas/files/patch-lapack.diff
trunk/dports/science/gildas/files/sic.in
Added: trunk/dports/science/gildas/Portfile
===================================================================
--- trunk/dports/science/gildas/Portfile (rev 0)
+++ trunk/dports/science/gildas/Portfile 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,117 @@
+# -*- 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
+PortGroup compilers 1.0
+
+name gildas
+version 201404b
+categories science
+platforms darwin
+maintainers gmail.com:sebastien.maret
+license permissive
+
+description Radioastronomy data analysis software
+
+long_description GILDAS is a collection of state-of-the-art softwares \
+ oriented toward (sub-)millimeter radioastronomical \
+ applications (either single-dish or interferometer). \
+ It is daily used to reduce all data acquired with the \
+ IRAM 30M telescope and Plateau de Bure Interferometer \
+ PDBI (except VLBI observations). GILDAS is easily \
+ extensible. GILDAS is written in Fortran-90, with a \
+ few parts in C/C++ (mainly keyboard interaction, \
+ plotting, widgets).
+
+homepage http://www.iram.fr/IRAMFR/GILDAS/gildas.html
+master_sites http://www.iram.fr/~gildas/dist/
+distname ${name}-src-apr14b
+
+checksums rmd160 02f59882bc19c656bd5bec6f79a220915003fb76 \
+ sha256 4a6c7ef9bb7c96549c61847eb58fc4adca361b4fb260faf94f7d84e760193981
+
+patch.pre_args -p1
+patchfiles patch-admin-Makefile.diff \
+ patch-admin-Makefile.def.diff \
+ patch-admin-Makefile.stdcxxlib.diff \
+ patch-admin-Makefile.python.diff \
+ patch-admin-gildas-env.sh.diff \
+ patch-admin-define-system.sh.diff \
+ patch-lapack.diff \
+ patch-fortran.diff
+
+depends_lib port:gtk2 \
+ port:libpng \
+ port:python27 \
+ port:py27-numpy
+
+depends_build port:cfitsio \
+ port:pkgconfig \
+ port:slatec
+
+# need x11 and cannot be used with quartz; see ticket #42886
+require_active_variants gtk2 x11 quartz
+
+compilers.choose fc
+compilers.setup -g95 -gcc44 -gcc45 -gcc46 require_fortran
+configure.python ${prefix}/bin/python2.7
+
+if {![fortran_variant_isset]} {
+ default_variants-append +gcc48
+}
+
+set cxxstdlib {}
+platform darwin {
+ if {[info exists configure.cxx_stdlib] &&
+ ${configure.cxx_stdlib} ne {} &&
+ [string match *clang* ${configure.cxx}]} {
+ set cxxstdlib ${configure.cxx_stdlib}
+ } elseif {[string match *clang* ${configure.cxx}] &&
+ ${os.major} >= 13} {
+ set cxxstdlib libc++
+ } else {
+ set cxxstdlib libstdc++
+ }
+
+ if {[string length ${cxxstdlib}]} {
+ set cxxstdlib [string map {lib -l} ${cxxstdlib}]
+ }
+}
+
+post-extract {
+ if {![gcc_variant_isset]} {
+ reinplace -W ${worksrcpath}/admin "s|-Wrealloc-lhs-all||" define-system.sh
+ }
+}
+
+configure {
+ reinplace -W ${worksrcpath}/admin "s|@CC@|${configure.cc}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
+ reinplace -W ${worksrcpath}/admin "s|@CCFLAGS@|${configure.cflags}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
+ reinplace -W ${worksrcpath}/admin "s|@FC@|${configure.fc}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
+ reinplace -W ${worksrcpath}/admin "s|@FCFLAGS@|${configure.fcflags}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
+ reinplace -W ${worksrcpath}/admin "s|@CXX@|${configure.cxx}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
+ reinplace -W ${worksrcpath}/admin "s|@CPP@|${configure.cpp}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
+ reinplace -W ${worksrcpath}/admin "s|@CPPFLAGS@|${configure.cppflags}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
+ reinplace -W ${worksrcpath}/admin "s|@LDFLAGS@|${configure.ldflags}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
+ reinplace -W ${worksrcpath}/admin "s|@PYTHON@|${configure.python}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
+ reinplace -W ${worksrcpath}/admin "s|@STDCXXLIB@|${cxxstdlib}|g" Makefile.def Makefile.python gildas-env.sh define-system.sh
+}
+
+build {
+ system -W ${worksrcpath} "source admin/gildas-env.sh -c ${configure.fc} -s ${prefix}/include:${prefix}/lib:/System/Library/Frameworks/Accelerate.framework/Frameworks/vecLib.framework/Versions/Current/ && export GAG_SLDFLAGS='-shared -o ${prefix}/lib/gildas/x86_64-darwin-gfortran/lib/\$(notdir \$@) -install_name ${prefix}/lib/gildas/x86_64-darwin-gfortran/lib/\$(notdir \$@)' && export DYLD_LIBRARY_PATH=${worksrcpath}/integ/x86_64-darwin-gfortran/lib && make install"
+}
+
+destroot {
+ xinstall -d ${destroot}${prefix}/lib
+ copy ${workpath}/gildas-exe-apr14b ${destroot}${prefix}/lib/gildas
+
+ xinstall ${filespath}/astro.in ${destroot}${prefix}/bin/astro
+ xinstall ${filespath}/class.in ${destroot}${prefix}/bin/class
+ xinstall ${filespath}/clic.in ${destroot}${prefix}/bin/clic
+ 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}/sic.in ${destroot}${prefix}/bin/sic
+
+ reinplace -W ${destroot}${prefix}/bin s|@PREFIX@|${prefix}|g astro class clic greg mapping mira sic
+}
Added: trunk/dports/science/gildas/files/astro.in
===================================================================
--- trunk/dports/science/gildas/files/astro.in (rev 0)
+++ trunk/dports/science/gildas/files/astro.in 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,12 @@
+#!/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
+exec ${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/bin/astro ${*}
Added: trunk/dports/science/gildas/files/class.in
===================================================================
--- trunk/dports/science/gildas/files/class.in (rev 0)
+++ trunk/dports/science/gildas/files/class.in 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,12 @@
+#!/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
+exec ${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/bin/class ${*}
Added: trunk/dports/science/gildas/files/clic.in
===================================================================
--- trunk/dports/science/gildas/files/clic.in (rev 0)
+++ trunk/dports/science/gildas/files/clic.in 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,12 @@
+#!/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
+exec ${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/bin/clic ${*}
Added: trunk/dports/science/gildas/files/greg.in
===================================================================
--- trunk/dports/science/gildas/files/greg.in (rev 0)
+++ trunk/dports/science/gildas/files/greg.in 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,12 @@
+#!/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
+exec ${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/bin/greg ${*}
Added: trunk/dports/science/gildas/files/mapping.in
===================================================================
--- trunk/dports/science/gildas/files/mapping.in (rev 0)
+++ trunk/dports/science/gildas/files/mapping.in 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,12 @@
+#!/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
+exec ${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/bin/mapping ${*}
Added: trunk/dports/science/gildas/files/mira.in
===================================================================
--- trunk/dports/science/gildas/files/mira.in (rev 0)
+++ trunk/dports/science/gildas/files/mira.in 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,12 @@
+#!/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
+exec ${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/bin/mira ${*}
Added: trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff
===================================================================
--- trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff (rev 0)
+++ trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,91 @@
+# HG changeset patch
+# User Sean Farley <sean.michael.farley at 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)
+
+ # The following variables are provided to the user so that he can override
+ # the preprocessing, compilation and linking options defined by default
+ # later in this file. User can modify them here.
+-CPPFLAGS = $(GAG_CPPFLAGS)
+-SLDFLAGS = $(GAG_SLDFLAGS)
+-FLDFLAGS = $(GAG_FLDFLAGS)
+-CLDFLAGS = $(GAG_CLDFLAGS)
+-FFLAGS = $(GAG_FFLAGS)
+-CFLAGS = $(GAG_CFLAGS)
++CPPFLAGS = @CPPFLAGS@ $(GAG_CPPFLAGS)
++SLDFLAGS = @LDFLAGS@ $(GAG_SLDFLAGS)
++FLDFLAGS = @LDFLAGS@ $(GAG_FLDFLAGS)
++CLDFLAGS = @LDFLAGS@ $(GAG_CLDFLAGS)
++FFLAGS = @FCFLAGS@ $(GAG_FFLAGS)
++CFLAGS = @CCFLAGS@ $(GAG_CFLAGS)
+
+ # The following variables are for mandatory GLOBAL definitions.
+ # They should be modified only in this file.
+ GLOBAL_CPPFLAGS =
+ GLOBAL_SLDFLAGS =
+@@ -229,11 +229,11 @@ GLOBAL_DIRTY = $(builddir) *~ TAGS Chang
+
+ ###########################################################################
+ # Fortran preprocessing
+
+ # Preprocessor command
+-CPP = cpp
++CPP = @CPP@
+ 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
+
+ ###########################################################################
+ # C compilation
+
+ # C compiler name
+-CC = gcc
+-CXX = g++
++CC = @CC@
++CXX = @CXX@
+ ifeq ($(GAG_OS_KIND),aix)
+ CC = xlc
+ endif
+ ifeq ($(GAG_OS_KIND),osf)
+ CC = cc
+@@ -331,11 +331,11 @@ GLOBAL_CFLAGS += -I$(execincdir)
+ ifneq ($(useincdir),)
+ GLOBAL_CFLAGS += -I$(useincdir)
+ endif
+
+ # GCC flags
+-ifeq ($(CC),gcc)
++ifeq ($(CC), at 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)
Added: trunk/dports/science/gildas/files/patch-admin-Makefile.diff
===================================================================
--- trunk/dports/science/gildas/files/patch-admin-Makefile.diff (rev 0)
+++ trunk/dports/science/gildas/files/patch-admin-Makefile.diff 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,42 @@
+# HG changeset patch
+# User Sean Farley <sean.michael.farley at gmail.com>
+# Date 1397946736 18000
+# Sat Apr 19 17:32:16 2014 -0500
+# Node ID b911914b645214ff60140304ecd87b088b0e225d
+# Parent 436da9915ef75995539303661dc8a84ce6885cea
+make: remove install-message
+
+diff --git a/admin/Makefile b/admin/Makefile
+--- a/admin/Makefile
++++ b/admin/Makefile
+@@ -29,29 +29,8 @@ integ: integ-message
+ integ-message:
+ @(echo)
+ @(echo "Compilation succeeded! Bye.")
+ @(echo)
+
+-default-install: install-message
+-
+-install-message:
+- @(echo)
+- @(echo "***************************************************************************")
+- @(echo "Installation succeeded!")
+- @(echo)
+- @(echo "bash users: You should add in your ~/.bash_profile the following lines")
+- @(echo " export GAG_ROOT_DIR=$(gagexedir)")
+- @(echo " export GAG_EXEC_SYSTEM=$(GAG_EXEC_SYSTEM)")
+- @(echo ' source $$GAG_ROOT_DIR/etc/bash_profile')
+- @(echo)
+- @(echo "csh users: You should add in your ~/.login the following lines")
+- @(echo " setenv GAG_ROOT_DIR $(gagexedir)")
+- @(echo " setenv GAG_EXEC_SYSTEM $(GAG_EXEC_SYSTEM)")
+- @(echo ' source $$GAG_ROOT_DIR/etc/login')
+- @(echo)
+- @(echo "You should then exit this xterm and open a new one to reset your path.")
+- @(echo "GILDAS should be ready for use (e.g. type greg @ gag_demo:demo).")
+- @(echo "Bye.")
+- @(echo "***************************************************************************")
+- @(echo)
++default-install:
+
+ ###########################################################################
Added: trunk/dports/science/gildas/files/patch-admin-Makefile.python.diff
===================================================================
--- trunk/dports/science/gildas/files/patch-admin-Makefile.python.diff (rev 0)
+++ trunk/dports/science/gildas/files/patch-admin-Makefile.python.diff 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,24 @@
+# HG changeset patch
+# User Sean Farley <sean.michael.farley at 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
+
+ ifneq ($(MOD_IDENTITY),)
+
+ $(MOD_NAME): $(MOD_SOURCES) $(MOD_INCLUDES) $(MOD_EXTRAS) $(builddir)/setup.py
+- $(GAG_PYTHON_DISTFLAGS) python $(builddir)/setup.py build --build-base $(builddir) --build-lib $(builddir)
++ $(GAG_PYTHON_DISTFLAGS) @PYTHON@ $(builddir)/setup.py build --build-base $(builddir) --build-lib $(builddir)
+ $(MV) $(builddir)/*.$(SO_EXT) $(pythondir)
+
+ $(builddir)/setup.py: setup.py.src Makefile
+ sed \
+ -e 's?\$$MOD_IDENTITY?$(MOD_IDENTITY)?g' \
Added: trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff
===================================================================
--- trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff (rev 0)
+++ trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,36 @@
+# HG changeset patch
+# User Sean Farley <sean.michael.farley at 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:
+
+ # Required by ASDM libs:
+ -lstdc++:
+
++-lc++:
++
+ ###########################################################################
+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)
+ # Compilation in 32 bits mode
+ GAG_32BITS_SWITCH = "-m32"
+ endif
+-STDCpp_LIB += $(shell g++ $(GAG_32BITS_SWITCH) -print-file-name=libstdc++.$(LIB_CPP_EXT))
++STDCpp_LIB += @STDCXXLIB@
+
+ ###########################################################################
+ # Kernel libraries
+
+ LEGACY_LIBS = -lslatec -llapack -lblas
Added: trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff
===================================================================
--- trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff (rev 0)
+++ trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,73 @@
+# HG changeset patch
+# User Sean Farley <sean.michael.farley at gmail.com>
+# Date 1397849840 18000
+# Fri Apr 18 14:37:20 2014 -0500
+# Node ID 0e344bcb0edfc864c73ef9072be1698768a94c55
+# Parent 0c556df11dafc4475317fdc3598c7db1ad0b4265
+define-system: use variables
+
+diff --git a/admin/define-system.sh b/admin/define-system.sh
+--- a/admin/define-system.sh
++++ b/admin/define-system.sh
+@@ -225,12 +225,12 @@ EOF
+ else
+ GAG_MACHINE=pc
+ fi
+ if which ifort > /dev/null 2>&1; then
+ DEFAULT_COMPILER=ifort
+- elif which gfortran > /dev/null 2>&1; then
+- DEFAULT_COMPILER=gfortran
++ elif which @FC@ > /dev/null 2>&1; then
++ DEFAULT_COMPILER=@FC@
+ fi
+ fi ;;
+ CYGWIN*)
+ GAG_MACHINE=pc
+ GAG_OS_KIND=cygwin
+@@ -295,13 +295,13 @@ EOF
+ # Detect the compiler version.
+ GAG_COMPILER_VERSION=
+ if [ "$GAG_COMPILER_KIND" = "ifort" ]; then
+ # Compress Major+Minor (no dot = easier preprocessing tests)
+ GAG_COMPILER_VERSION=`ifort -v 2>&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=`gfortran --version | head -1 | sed "s%.*\s\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*%\1\2\3%"`
++ GAG_COMPILER_VERSION=`@FC@ --version | head -1 | sed "s%.*\s\([0-9][0-9]*\)\.\([0-9][0-9]*\)\.\([0-9][0-9]*\).*%\1\2\3%"`
+ # Reject gfortran unstable versions
+ GFORTRAN_VERSION2=`$GAG_COMPILER_EXE --version | head -1 | sed "s%.*\s\([0-9][0-9]*\.[0-9][0-9]*\)\.[0-9][0-9]*.*%\1%"`
+ GFORTRAN_VERSION3=`$GAG_COMPILER_EXE --version | head -1 | sed "s%.*\s\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*%\1%"`
+ # Minimum Gfortran version:
+ GFORTRAN_MINI="4.4.0"
+@@ -344,11 +344,11 @@ EOF
+ # Currently disabled: ifort 11.1 has an internal error
+ # if the debug mode is enabled
+ # GAG_COMPILER_CPPFLAGS="-DFORTRAN2003_PP"
+ :
+ fi
+- 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:
+ GAG_COMPILER_CPPFLAGS="-DFORTRAN2003_PP"
+ fi
+@@ -357,14 +357,16 @@ EOF
+ # arrays in Left Hand Side of assignments
+ GAG_COMPILER_FFLAGS="-Wrealloc-lhs-all"
+ fi
+ fi
+ #
+- GCC_VERSION=`gcc --version | head -1 | sed "s%.*\s\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*%\1%"`
++ GCC_VERSION=`@CC@ --version | head -1 | sed "s%.*\s\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*%\1%"`
+ if [ "$GCC_VERSION" ">" "4.7.9" ]; then
+ # See http://gcc.gnu.org/gcc-4.8/porting_to.html
+ GAG_COMPILER_CPPFLAGS="$GAG_COMPILER_CPPFLAGS -ffreestanding"
++ elif [ "$GCC_VERSION" != "${GCC_VERSION/clang/}" ]; then
++ GAG_COMPILER_CPPFLAGS="$GAG_COMPILER_CPPFLAGS -ffreestanding"
+ fi
+ #
+ export GAG_COMPILER_FFLAGS GAG_COMPILER_LIBS GAG_COMPILER_CPPFLAGS
+ #
+ else
Added: trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff
===================================================================
--- trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff (rev 0)
+++ trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,124 @@
+# HG changeset patch
+# User Sean Farley <sean.michael.farley at 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
+ fi
+ #
+ # Check availability of g++. This only has an impact on ATM2009
+- if \which g++ > /dev/null 2>&1; then
++ if \which @CXX@ > /dev/null 2>&1; then
+ ATM2009_PRESENT=yes
+ else
+ gagenv_message "g++ not found in your \$PATH"
+ 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
+ NUMPY_PRESENT=no
+ NUMERIC_PRESENT=no
+ SQLITE3_PRESENT=no
+- if \which python > /dev/null 2>&1; then
++ if \which @PYTHON@ > /dev/null 2>&1; then
+ # Check the version of python the user is currently using
+- if python -V 2>&1 > /dev/null 2>&1; then
+- PY_VERS_FULL=`python -V 2>&1 | cut -d' ' -f2`
++ if @PYTHON@ -V 2>&1 > /dev/null 2>&1; then
++ 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%"`
+ # Search for Python header and library. kernel/python/binding/setup.py
+ # does exactly the same, so this should be consistent
+- PYTHON_INC_DIR=`python -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'))"`
++ PYTHON_INC_DIR=`@PYTHON@ -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('INCLUDEPY'))"`
+ if [ -e "$PYTHON_INC_DIR/Python.h" ]; then PYTHON_INC=yes; else PYTHON_INC=no; fi
+- PYTHON_LIB_DIR=`python -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR'))"`
++ PYTHON_LIB_DIR=`@PYTHON@ -c "import distutils.sysconfig; print(distutils.sysconfig.get_config_var('LIBDIR'))"`
+ PYTHON_LIB=yes # libpython name on the various supported systems is just
+ # unpredictible. Can not check in advance if the linker will
+ # find it or not.
+ #
+ # Now search for Numpy or Numeric
+- if python -c "import numpy" > /dev/null 2>&1; then
++ if @PYTHON@ -c "import numpy" > /dev/null 2>&1; then
+ NUMPY_PRESENT=yes
+- NUMPY_INC_DIR=`python -c "import numpy; print(numpy.__path__[0] + '/core/include')"`
++ NUMPY_INC_DIR=`@PYTHON@ -c "import numpy; print(numpy.__path__[0] + '/core/include')"`
+ if [ -e "$NUMPY_INC_DIR/numpy/arrayobject.h" ]; then
+ NUMPY_INC_PRESENT=yes
+ else
+ NUMPY_INC_PRESENT=no
+ fi
+- elif python -c "import Numeric"> /dev/null 2>&1; then
++ elif @PYTHON@ -c "import Numeric"> /dev/null 2>&1; then
+ NUMERIC_PRESENT=yes
+ fi
+ # Search for sqlite3
+- if python -c "import sqlite3" > /dev/null 2>&1; then
++ if @PYTHON@ -c "import sqlite3" > /dev/null 2>&1; then
+ SQLITE3_PRESENT=yes
+ fi
+ fi
+ else
+ gagenv_message "Python not found in your \$PATH"
+@@ -536,29 +536,29 @@ EOF
+ fi
+ if file_present "libatm2003." "${DIR}"; then
+ ATM2003_PRESENT=yes
+ ATM2003_LIB_DIR=$DIR
+ fi
+- if file_present "liblapack." "${DIR}"; then
++ if file_present "libLAPACK." "${DIR}"; then
+ LAPACK_PRESENT=yes
+ LAPACK_LIB_DIR=$DIR
+ fi
+- if file_present "libblas." "${DIR}"; then
++ if file_present "libBLAS." "${DIR}"; then
+ BLAS_PRESENT=yes
+ BLAS_LIB_DIR=$DIR
+ fi
+ if file_present "libslatec." "${DIR}"; then
+ SLATEC_PRESENT=yes
+ SLATEC_LIB_DIR=$DIR
+ fi
+- if file_present "libfftw3." "${DIR}"; then
+- FFTW3_PRESENT=yes
+- FFTW3_LIB_DIR=$DIR
+- if file_present "libfftw3f." "${DIR}"; then
+- FFTW3F_PRESENT=yes
+- fi
+- fi
++# if file_present "libfftw3." "${DIR}"; then
++# FFTW3_PRESENT=yes
++# FFTW3_LIB_DIR=$DIR
++# if file_present "libfftw3f." "${DIR}"; then
++# FFTW3F_PRESENT=yes
++# fi
++# fi
+ if file_present "libasdmStandalone." "${DIR}"; then
+ SDM_PRESENT=yes
+ if [ "$SDM_PRESENT" = "yes" ]; then
+ SDM_LIB_DIR=$DIR
+ fi
+@@ -588,10 +588,12 @@ EOF
+ IFS=$OLDIFS
+ #
+ XML_PRESENT="yes"
+ #
+ unset GAG_LIB_DEP_PATH GAG_INC_DEP_PATH
++ GAG_INC_DEP_PATH=$GAG_INC_DEP_PATH:@PREFIX@/include
++ GAG_LIB_DEP_PATH=$GAG_INC_DEP_PATH:@PREFIX@/lib
+ #
+ if [ "$X11_INC" = "yes" ]; then
+ gagenv_message "Found X11 header in $X11_INC_DIR"
+ GAG_INC_DEP_PATH=$GAG_INC_DEP_PATH:$X11_INC_DIR
+ else
Added: trunk/dports/science/gildas/files/patch-fortran.diff
===================================================================
--- trunk/dports/science/gildas/files/patch-fortran.diff (rev 0)
+++ trunk/dports/science/gildas/files/patch-fortran.diff 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,425 @@
+# HG changeset patch
+# User Sean Farley <sean.michael.farley at gmail.com>
+# Date 1397874113 18000
+# Fri Apr 18 21:21:53 2014 -0500
+# Node ID 5eceb5b8043a7a763ac0c1e18fbac272477670f5
+# Parent d903f416ef63711865f0b8325cd5bb06132af03e
+contrib: for the love of god and everything holy don't use '#' for continuation
+
+diff --git a/contrib/gaussclumps/lib/backtrans.f b/contrib/gaussclumps/lib/backtrans.f
+--- a/contrib/gaussclumps/lib/backtrans.f
++++ b/contrib/gaussclumps/lib/backtrans.f
+@@ -1,7 +1,7 @@
+ subroutine backtrans(image,nimage,points,temp,npts,blanking,
+- # rms,npix1,npix2,npix3,refpix,val,inc)
++ & rms,npix1,npix2,npix3,refpix,val,inc)
+ real*4 refpix(3),val(3),inc(3)
+ integer(kind=4), intent(in) :: nimage
+ real*4 image (nimage), points(3,nimage)
+ real*4 temp(npix1,npix2,npix3)
+
+diff --git a/contrib/gaussclumps/lib/cubcurfit.f b/contrib/gaussclumps/lib/cubcurfit.f
+--- a/contrib/gaussclumps/lib/cubcurfit.f
++++ b/contrib/gaussclumps/lib/cubcurfit.f
+@@ -39,11 +39,11 @@ c
+ c
+ c test for convergence
+ c
+ 31 continue
+ ddel=abs(a(1)-a(2))*(a(1)+a(2))/
+- # (wid(1)+wid(2)+0.5*(a(1)+a(2))**2)
++ & (wid(1)+wid(2)+0.5*(a(1)+a(2))**2)
+ do 32 i=1,nterms
+ li=lista(i)
+ del = abs(a(li)-b(li))
+ if (li.le.3) then
+ del = del/abs(a(li)) / (1.+wid(li)/a(li)**2)
+@@ -78,11 +78,11 @@ c
+ beta(j) = 0.
+ endif
+ do 35 k=1,j
+ lk=lista(k)
+ if ( (lk.eq.11 .or. lk.eq.7) .and.
+- # (lj.eq.11 .or. lj.eq.7) ) then
++ & (lj.eq.11 .or. lj.eq.7) ) then
+ alpha(j,k)=8.*sm*a(lk)*a(lj)
+ else if (lk.ge.8 .and. lj.eq.lk) then
+ alpha(j,k)=2.*4.*sc/wid(lj-7)
+ else
+ alpha(j,k) = 0.
+@@ -100,26 +100,26 @@ c
+ lj=lista(j)
+ beta(j)=beta(j)+deriv(lj)*(res*weight(ix)*rr)
+ do 46 k=1,j
+ lk=lista(k)
+ 46 alpha(j,k)=
+- # alpha(j,k)+deriv(lj)*deriv(lk)*(weight(ix)*rr)
++ & alpha(j,k)+deriv(lj)*deriv(lk)*(weight(ix)*rr)
+ 50 continue
+ do 53 j=1,nterms
+ do 53 k=1,j
+ 53 alpha(k,j)=alpha(j,k)
+ c
+ c evaluate chi square at starting point.
+ c
+ if (chisqr.eq.0.) then
+ chisq1=
+- # fchisq(y,npts,free,yfit,weight,ipt,1.e30,bigger,s0,a)
++ & fchisq(y,npts,free,yfit,weight,ipt,1.e30,bigger,s0,a)
+ else
+ chisq1=chisqr
+ endif
+ write (termou,'(1x,a,1p,8g9.2)')
+- # 'chisqr ',chisq1,a(1),a(2),a(4),a(3),a(5),a(6)
++ & 'chisqr ',chisq1,a(1),a(2),a(4),a(3),a(5),a(6)
+ c
+ c invert modified curvature matrix to find new parameters.
+ c
+ int = 0
+ 71 int = int + 1
+@@ -178,11 +178,11 @@ c if chi square increased, increase
+ call quadini(b)
+ do 92 i=1,npts
+ ix = ipt(i)
+ 92 yfit(ix)=functn(ix,b,x,nterms)
+ chisqr=
+- # fchisq(y,npts,free,yfit,weight,ipt,chisq1,bigger,s0,b)
++ & fchisq(y,npts,free,yfit,weight,ipt,chisq1,bigger,s0,b)
+ if (.not.bigger) goto 31
+ 96 flambda=flambda*fnu
+ go to 71
+ c
+ 101 if(iter-itmax)103,102,102
+@@ -287,11 +287,11 @@ c
+ 130 continue
+ 140 return
+ end
+
+ function
+- # fchisq (y,npts,free,yfit,weight,ipt,chiold,bigger,s0,a)
++ & fchisq (y,npts,free,yfit,weight,ipt,chiold,bigger,s0,a)
+ common /termpointer/ lista,peak,cent,wid
+ dimension lista(11),cent(3),wid(3)
+ real*4 peak
+ dimension a(11)
+ dimension y(1), yfit(1), weight(1), ipt(1)
+diff --git a/contrib/gaussclumps/lib/cubfit.f b/contrib/gaussclumps/lib/cubfit.f
+--- a/contrib/gaussclumps/lib/cubfit.f
++++ b/contrib/gaussclumps/lib/cubfit.f
+@@ -1,8 +1,8 @@
+ subroutine cubfit (image,nimage,npts,nterms,a,sigmaa,
+- # flambdin,imagfit,chisqr,eps,itmax,points,s0,
+- # conv,p0,imax,ap,ap1)
++ & flambdin,imagfit,chisqr,eps,itmax,points,s0,
++ & conv,p0,imax,ap,ap1)
+ use gildas_def
+ use gkernel_interfaces
+ integer(kind=4), intent(in) :: nimage
+ real*4 image(nimage),imagfit(nimage),points(3,nimage)
+ dimension a(11),sigmaa(11),s0(3)
+@@ -42,18 +42,18 @@ 11 x(k)=points(k,i)-a(7+k)
+ wsum=wsum+weight(i)
+ endif
+ endif
+ 1 continue
+ write (2,*)
+- # 'I-CUBFIT, ',npsel,' points selected with > ',p0,' * peak, ',
+- # ' within ',sqrt(ap1),' * initial fwhm. sum of weights ',wsum
++ & 'I-CUBFIT, ',npsel,' points selected with > ',p0,' * peak, ',
++ & ' within ',sqrt(ap1),' * initial fwhm. sum of weights ',wsum
+
+ flambda=flambdin
+
+ call curfit (image,npsel,nterms,a,sigmaa,flambda,
+- # imagfit,chisqr,eps,itmax,points,
+- # conv,weight,ipt,s0,wsum)
++ & imagfit,chisqr,eps,itmax,points,
++ & conv,weight,ipt,s0,wsum)
+ do 2 i=1,npts
+ 2 imagfit(i)=functn(i,a,points,nterms)-a(11)**2
+
+ deallocate(ipt,weight)
+
+diff --git a/contrib/gaussclumps/lib/cubfunc.f b/contrib/gaussclumps/lib/cubfunc.f
+--- a/contrib/gaussclumps/lib/cubfunc.f
++++ b/contrib/gaussclumps/lib/cubfunc.f
+@@ -27,12 +27,12 @@ c offset is a(11)**2
+ do 1 i=1,2
+ x(i)=points(i,ip)-a(7+i)
+ 1 x(3)=x(3)-a(4+i)*x(i)
+
+ functn=aq(1)*x(1)*x(1)+aq(2)*x(2)*x(2)
+- # +2.*aq(3)*x(1)*x(2)
+- # +x(3)**2*vv
++ & +2.*aq(3)*x(1)*x(2)
++ & +x(3)**2*vv
+
+ functn=a(7)**2*expz(-functn)+a(11)**2
+
+ return
+ end
+@@ -66,11 +66,11 @@ 1 x(3)=x(3)-a(4+i)*x(i)
+
+ deriv(1)=f*(aa*(s*x(2)-c*x(1)))**2/2.772589*2.*a(1)
+ deriv(2)=f*(bb*(s*x(1)+c*x(2)))**2/2.772589*2.*a(2)
+ deriv(3)=f*(x(3)*vv)**2/2.772589*2.*a(3)
+ deriv(4)=-f*(2.*aq(3)*(x(1)*x(1)-x(2)*x(2)) +
+- # 2.*(aq(2)-aq(1))*x(1)*x(2))
++ & 2.*(aq(2)-aq(1))*x(1)*x(2))
+ deriv(7)=2.*f/a(7)
+ deriv(10)=f*2.*vv*x(3)
+
+ do 2 i=1,2
+ deriv(7+i)=-f*2.*vv*x(3)*a(4+i)
+diff --git a/contrib/gaussclumps/lib/findmax.f b/contrib/gaussclumps/lib/findmax.f
+--- a/contrib/gaussclumps/lib/findmax.f
++++ b/contrib/gaussclumps/lib/findmax.f
+@@ -1,7 +1,7 @@
+ subroutine findmax (image,nimage,imax,npts,points,badpts,
+- # rms,sum)
++ & rms,sum)
+ integer(kind=4), intent(in) :: nimage
+ real*4 image(nimage),points(3,nimage)
+ integer*2 badpts (nimage)
+ real*4 max,min
+
+@@ -20,13 +20,13 @@
+ endif
+ sum=sum+image(i)
+ 1 continue
+
+ write (2,*) 'I-FINDMAX, maximum found at ',
+- # points(1,imax),points(2,imax),points(3,imax),' ',max*rms
++ & points(1,imax),points(2,imax),points(3,imax),' ',max*rms
+ write (2,*) 'I-FINDMAX, minimum found at ',
+- # points(1,imin),points(2,imin),points(3,imin),' ',min*rms
++ & points(1,imin),points(2,imin),points(3,imin),' ',min*rms
+ write (2,*) 'I-FINDMAX, integral ',sum*rms
+ write (6,*) 'I-FINDMAX, integral ',sum*rms
+
+ return
+ end
+diff --git a/contrib/gaussclumps/lib/getpar.f b/contrib/gaussclumps/lib/getpar.f
+--- a/contrib/gaussclumps/lib/getpar.f
++++ b/contrib/gaussclumps/lib/getpar.f
+@@ -1,8 +1,8 @@
+ subroutine getpar (imafile,rms,beamfwhm,velres,fbeam,fvel,
+- # fitflag,s0,thresh,p0,ap,ap1,itmaxcl,itmaxfit,
+- # eps,flambda,blanking,tol,savres,savfit,minsum)
++ & fitflag,s0,thresh,p0,ap,ap1,itmaxcl,itmaxfit,
++ & eps,flambda,blanking,tol,savres,savfit,minsum)
+ character*30 imafile
+ character*1 yn1,yn2,yn3,yn4,yn5
+ logical savres
+ logical savfit
+ real*4 minsum
+@@ -54,20 +54,20 @@ 1001 format (1x,a)
+ if (yn5.eq.'N'.or.yn5.eq.'n') savfit=.false.
+
+ open (unit=2,file='clumps_output',status='new')
+ open (unit=3,file='clumps_list',status='new')
+ write (3,1020) rms,beamfwhm,fbeam,velres,fvel,
+- # thresh,p0,sqrt(ap),sqrt(ap1),s0
++ & thresh,p0,sqrt(ap),sqrt(ap1),s0
+ write (2,1020) rms,beamfwhm,fbeam,velres,fvel,
+- # thresh,p0,sqrt(ap),sqrt(ap1),s0
++ & thresh,p0,sqrt(ap),sqrt(ap1),s0
+ write (6,1020) rms,beamfwhm,fbeam,velres,fvel,
+- # thresh,p0,sqrt(ap),sqrt(ap1),s0
++ & thresh,p0,sqrt(ap),sqrt(ap1),s0
+ 1020 format (1x,' rms: ',1p,g10.3,', beamfwhm: ',2(g10.3,1x),
+- # ', velres: ',2(g10.3,1x),/,
+- # 1x,' threshhold: ',g10.3,', contrast: ',g10.3,
+- # ', weigth-aperture: ',g10.3,
+- # 1x,g10.3,/,1x,' stiffness: ',3g10.3)
++ & ', velres: ',2(g10.3,1x),/,
++ & 1x,' threshhold: ',g10.3,', contrast: ',g10.3,
++ & ', weigth-aperture: ',g10.3,
++ & 1x,g10.3,/,1x,' stiffness: ',3g10.3)
+ close (unit=1)
+ return
+
+ 999 write (6,*) 'I-GETPAR: error reading clumps_inp '
+ close (unit=1)
+diff --git a/contrib/gaussclumps/lib/iterate.f b/contrib/gaussclumps/lib/iterate.f
+--- a/contrib/gaussclumps/lib/iterate.f
++++ b/contrib/gaussclumps/lib/iterate.f
+@@ -1,7 +1,7 @@
+ subroutine iterate(image,nimage,imax,iclump,thresh,itmaxcl,
+- # iter,rms,sum,minsum)
++ & iter,rms,sum,minsum)
+
+ real*4 minsum
+ integer(kind=4), intent(in) :: nimage
+ real*4 image(nimage)
+ logical iter
+@@ -10,20 +10,20 @@
+ iter=.true.
+
+ if (iclump.eq.1) sum_thresh = minsum*sum
+ if (image(imax).lt.thresh/rms) then
+ write (2,*)
+- # 'I-ITERATE, threshhold reached after ',iclump,' iterations '
++ & 'I-ITERATE, threshhold reached after ',iclump,' iterations '
+ iter=.false.
+ else if (iclump.gt.itmaxcl) then
+ write (2,*)
+- # 'I-ITERATE, maximum number of clumps; stop iterating '
++ & 'I-ITERATE, maximum number of clumps; stop iterating '
+ iter=.false.
+ else if (sum.le.sum_thresh) then
+ write (2,*)
+- # 'I-ITERATE, integrated intensity lower than ',minsum,
+- # '% of start value after ',iclump,' iterations.'
++ & 'I-ITERATE, integrated intensity lower than ',minsum,
++ & '% of start value after ',iclump,' iterations.'
+ iter=.false.
+ endif
+
+ return
+ end
+diff --git a/contrib/gaussclumps/lib/listclump.f b/contrib/gaussclumps/lib/listclump.f
+--- a/contrib/gaussclumps/lib/listclump.f
++++ b/contrib/gaussclumps/lib/listclump.f
+@@ -1,7 +1,7 @@
+ subroutine listclump (iclump,a,sigmaa,imafile,
+- # chisqr,imgname,rms)
++ & chisqr,imgname,rms)
+
+ common /termpointer/ lista,peak,cent,wid
+ dimension lista(11),cent(3),wid(3)
+ real*4 peak
+
+@@ -37,27 +37,27 @@ 1 sig(i)=' '
+ 2 continue
+
+ call convert (a,b,rms)
+
+ write (2,1010) iclump,(b(wp(i)),i=1,10),(a(wp(i)),i=1,11),
+- # chisqr,(sig(wp(i)),i=1,11)
++ & chisqr,(sig(wp(i)),i=1,11)
+
+ write (3,2010) iclump,(b(bwp(i)),i=1,11)
+
+ 1000 format (1x,' clump ',' x ',' y ',
+- # ' v ',' amplitude ',' delta x ',' delta y ',
+- # ' phi ',' dv/dr ',' fwhm ',' delta v ',//,
+- # ' ',' x ',' y ',
+- # ' v ',' amplitude ',' a11 ',' a22 ',
+- # ' a12 ',' dv/dx ',' dv/dy ',' a33 ',/,
+- # 1x,' chisqr ',/)
++ & ' v ',' amplitude ',' delta x ',' delta y ',
++ & ' phi ',' dv/dr ',' fwhm ',' delta v ',//,
++ & ' ',' x ',' y ',
++ & ' v ',' amplitude ',' a11 ',' a22 ',
++ & ' a12 ',' dv/dx ',' dv/dy ',' a33 ',/,
++ & 1x,' chisqr ',/)
+ 1010 format
+- # (/,1x,i5,6x,1p,10(g12.5),//,11x,11(g11.4),/,1x,g10.4,11a11)
++ & (/,1x,i5,6x,1p,10(g12.5),//,11x,11(g11.4),/,1x,g10.4,11a11)
+ 2000 format (1x,' no.',' x ',' y ',
+- # ' v ',' amp. ',' dx ',' dy ',
+- # ' phi ',' fwhm ',' dv/dr ',' phiv ',' dv ')
++ & ' v ',' amp. ',' dx ',' dy ',
++ & ' phi ',' fwhm ',' dv/dr ',' phiv ',' dv ')
+ 2010 format
+ c x,y v amp
+- # (1x,i4,2(1x,f9.2),(1x,f7.2),(1x,f9.4),2(1x,f7.2),(1x,f6.1),
+- # (1x,f6.2),(1x,f9.4),(1x,f6.1),(1x,f5.2))
++ & (1x,i4,2(1x,f9.2),(1x,f7.2),(1x,f9.4),2(1x,f7.2),(1x,f6.1),
++ & (1x,f6.2),(1x,f9.4),(1x,f6.1),(1x,f5.2))
+ return
+ end
+diff --git a/contrib/gaussclumps/lib/replace.f b/contrib/gaussclumps/lib/replace.f
+--- a/contrib/gaussclumps/lib/replace.f
++++ b/contrib/gaussclumps/lib/replace.f
+@@ -1,8 +1,8 @@
+ subroutine replace (image,nimage,imagfit,points,npts,blanking,
+- # rms,npix,refpix,val,inc,imgname,iclump,
+- # savres,savfit)
++ & rms,npix,refpix,val,inc,imgname,iclump,
++ & savres,savfit)
+ use gildas_def
+ use gkernel_interfaces
+ integer(kind=4), intent(in) :: nimage
+ real*4 image(nimage),imagfit(nimage),points(3,nimage)
+ integer npix(3)
+@@ -36,26 +36,26 @@
+ 1 fit(i)=fit(i)+imagfit(i)
+ write (6,*) 'I-REPLACE: fit subtracted '
+
+ if (savres) then
+ call backtrans (image,nimage,points,temp,npts,blanking,
+- # rms,npix1,npix2,npix3,refpix,val,inc)
++ & rms,npix1,npix2,npix3,refpix,val,inc)
+
+ write (header,1000) imgname(1:40),iclump,' clumps subtracted '
+ 1000 format (a40,': ',i6,a)
+ call writeimg (temp,nimage,npix,refpix,val,inc,'clumps_tmp',
+- # header)
++ & header)
+ write (6,*) 'I-REPLACE: residual image saved on clumps_tmp'
+ endif
+
+ if (savfit) then
+ call backtrans (fit,nimage,points,temp,npts,blanking,
+- # rms,npix1,npix2,npix3,refpix,val,inc)
++ & rms,npix1,npix2,npix3,refpix,val,inc)
+
+ write (header,1000) imgname(1:40),iclump,' fitted clumps '
+ call writeimg (temp,nimage,npix,refpix,val,inc,'clumps_img',
+- # header)
++ & header)
+ write (6,*) 'I-REPLACE: fitted image saved on clumps_img'
+ endif
+
+ deallocate(temp,fit)
+
+diff --git a/contrib/gaussclumps/lib/setinit.f b/contrib/gaussclumps/lib/setinit.f
+--- a/contrib/gaussclumps/lib/setinit.f
++++ b/contrib/gaussclumps/lib/setinit.f
+@@ -1,8 +1,8 @@
+ subroutine setinit (a,nimage,fitflag,beamfwhm,velres,
+- # fbeam,fvel,nterms,
+- # image,imax,points)
++ & fbeam,fvel,nterms,
++ & image,imax,points)
+ *
+ * initialize fit
+ *
+
+ common /termpointer/ lista,peak,cent,wid
+diff --git a/contrib/gaussclumps/lib/transfer.f b/contrib/gaussclumps/lib/transfer.f
+--- a/contrib/gaussclumps/lib/transfer.f
++++ b/contrib/gaussclumps/lib/transfer.f
+@@ -1,7 +1,7 @@
+ subroutine transfer (image,nimage,points,temp,npts,blanking,
+- # tol,rms,npix1,npix2,npix3,refpix,val,inc)
++ & tol,rms,npix1,npix2,npix3,refpix,val,inc)
+ integer(kind=4), intent(in) :: nimage
+ real*4 refpix(3),val(3),inc(3)
+ real*4 image (nimage), points(3,nimage)
+ real*4 temp(npix1,npix2,npix3)
+
+diff --git a/contrib/gaussclumps/lib/writeimg.f b/contrib/gaussclumps/lib/writeimg.f
+--- a/contrib/gaussclumps/lib/writeimg.f
++++ b/contrib/gaussclumps/lib/writeimg.f
+@@ -1,16 +1,16 @@
+ subroutine writeimg(temp,nimage,npix,refpix,val,inc,filnam,
+- # header)
++ & header)
+ integer(kind=4), intent(in) :: nimage
+ real*4 temp(nimage)
+ integer npix(3)
+ real*4 refpix(3),val(3),inc(3)
+ character*(*) filnam
+ character*80 header
+
+ open (unit=1,file=filnam,
+- # form='unformatted',status='unknown')
++ & form='unformatted',status='unknown')
+
+ write (1) header
+ do 1 i=1,3
+ 1 write (1) npix(i),refpix(i),val(i),inc(i)
+
Added: trunk/dports/science/gildas/files/patch-lapack.diff
===================================================================
--- trunk/dports/science/gildas/files/patch-lapack.diff (rev 0)
+++ trunk/dports/science/gildas/files/patch-lapack.diff 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,77 @@
+# HG changeset patch
+# User Sean Farley <sean.michael.farley at gmail.com>
+# Date 1397871654 18000
+# Fri Apr 18 20:40:54 2014 -0500
+# Node ID d903f416ef63711865f0b8325cd5bb06132af03e
+# Parent 0e344bcb0edfc864c73ef9072be1698768a94c55
+make: use frameworks for lapack
+
+diff --git a/admin/Makefile.build b/admin/Makefile.build
+--- a/admin/Makefile.build
++++ b/admin/Makefile.build
+@@ -353,13 +353,15 @@ endif
+ ###########################################################################
+ # The following targets are there to avoid make error (target search) when
+ # only the shared libraries are installed (i.e. the corresponding archive
+ # libraries are missing).
+
+--lblas:
++-framework:
+
+--llapack:
++Accelerate:
++
++vecLib:
+
+ -lslatec:
+
+ -lX11:
+
+diff --git a/admin/Makefile.def b/admin/Makefile.def
+--- a/admin/Makefile.def
++++ b/admin/Makefile.def
+@@ -536,11 +536,11 @@ endif
+ STDCpp_LIB += @STDCXXLIB@
+
+ ###########################################################################
+ # Kernel libraries
+
+-LEGACY_LIBS = -lslatec -llapack -lblas
++LEGACY_LIBS = -lslatec -framework Accelerate -framework vecLib
+ _GAG_LIBS = -lggui -lgcore -lgio -lgwcs -lgmath -lgsys -lginc
+ ifndef GAG_WIN32
+ GAG_LIBS = $(_GAG_LIBS)
+ else
+ GAG_LIBS = -lgkernel
+diff --git a/legacy/slatec/Makefile b/legacy/slatec/Makefile
+--- 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 \
+ U-all.o V-all.o W-all.o X-all.o Y-all.o Z-all.o d1mach.o i1mach.o pimach.o \
+ r1mach.o dummy.o P-all.o P-value.o Dp-1vlu.o
+
+-LIB_DEPENDS = -llapack -lblas
++LIB_DEPENDS = -framework Accelerate -framework vecLib
+
+ ifeq ($(GAG_COMPILER_KIND),ifc)
+ OPTION_FFLAGS =
+ endif
+ ifeq ($(GAG_COMPILER_KIND),ifort)
+diff --git a/packages/clic/lib/Makefile b/packages/clic/lib/Makefile
+--- a/packages/clic/lib/Makefile
++++ b/packages/clic/lib/Makefile
+@@ -62,11 +62,11 @@ CLIC_LIB_OBJECTS = blockdata.o check.o c
+ sg_line_table.o table_passband.o clic_index.o
+
+ # Mathematical library dependency
+ ifeq ($(LINEAR),lapack)
+ LINEAR_LIB_OBJECTS = singular.o mth_lapack.o
+- LINEAR_LIB_DEPENDS = -llapack -lblas
++ LINEAR_LIB_DEPENDS = -framework Accelerate -framework vecLib
+ else
+ ifeq ($(LINEAR),nag)
+ LINEAR_LIB_OBJECTS = mth_nag.o
+ LINEAR_LIB_DEPENDS = -lnag
+ else
Added: trunk/dports/science/gildas/files/sic.in
===================================================================
--- trunk/dports/science/gildas/files/sic.in (rev 0)
+++ trunk/dports/science/gildas/files/sic.in 2014-04-20 00:21:38 UTC (rev 119194)
@@ -0,0 +1,12 @@
+#!/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
+exec ${GAG_ROOT_DIR}/${GAG_EXEC_SYSTEM}/bin/sic ${*}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140419/51302ae1/attachment-0001.html>
More information about the macports-changes
mailing list