[136796] trunk/dports/science/gildas

smaret at macports.org smaret at macports.org
Wed May 27 03:12:28 PDT 2015


Revision: 136796
          https://trac.macports.org/changeset/136796
Author:   smaret at macports.org
Date:     2015-05-27 03:12:27 -0700 (Wed, 27 May 2015)
Log Message:
-----------
gildas: update to 201505a.

Modified Paths:
--------------
    trunk/dports/science/gildas/Portfile
    trunk/dports/science/gildas/files/patch-admin-Makefile.def.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-lapack.diff

Modified: trunk/dports/science/gildas/Portfile
===================================================================
--- 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)
@@ -5,7 +5,7 @@
 PortGroup           compilers 1.0
 
 name                gildas
-version             201407c
+version             201505a
 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
@@ -28,8 +28,8 @@
 master_sites        http://www.iram.fr/~gildas/dist/
 distname            ${name}-src-${my_version}
 
-checksums           rmd160  92447664ad2719308a9e44c2536ffde1431ff7d9 \
-                    sha256  0f73a5c55e8ebc2dce248e683bd4ac148c06d2f7da093b209ab8b1d1153e06b7
+checksums           rmd160  c56761c34d62287b7245ab43b9ce362a1d6f8206 \
+                    sha256  6ab6635f5edd0c16e7699fce96094da87194ca467c6e73cef19dbd1d7b9d91d3
 
 patch.pre_args      -p1
 patchfiles          patch-admin-Makefile.def.diff \

Modified: trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff
===================================================================
--- 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)
@@ -1,17 +1,6 @@
-# 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)
- 
+--- 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 @@
  # 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.
@@ -30,62 +19,30 @@
  
  # 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
- 
- ###########################################################################
+@@ -219,7 +219,7 @@
  # 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
+ # Preprocessor generic flags
+ GLOBAL_CPPFLAGS += -P -traditional -C 
+@@ -335,7 +335,7 @@
+ # C++ compilation
  
- # C compiler name
--CC = gcc
+ # C++ compiler name
 -CXX = g++
-+CC = @CC@
 +CXX = @CXX@
- ifeq ($(GAG_OS_KIND),aix)
-   CC = xlc
+ ifdef GAG_COMPILER_CXXEXE
+   CXX = $(GAG_COMPILER_CXXEXE)
  endif
- ifeq ($(GAG_OS_KIND),osf)
-   CC = cc
-@@ -331,11 +331,11 @@ GLOBAL_CFLAGS += -I$(execincdir)
- ifneq ($(useincdir),)
-     GLOBAL_CFLAGS += -I$(useincdir)
+@@ -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)
  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)
+ ifeq ($(CFITSIO_PRESENT),yes)
+   SIC_LIB_DEPENDS += -lcfitsio
\ No newline at end of file

Modified: trunk/dports/science/gildas/files/patch-admin-Makefile.python.diff
===================================================================
--- 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)
@@ -1,17 +1,6 @@
-# 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
- 
+--- 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 @@
  ifneq ($(MOD_IDENTITY),)
  
  $(MOD_NAME): $(MOD_SOURCES) $(MOD_INCLUDES) $(MOD_EXTRAS) $(builddir)/setup.py
@@ -19,6 +8,4 @@
 +	$(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' \
+ $(builddir)/setup.py: $(gagsrcdir)/kernel/python/binding/setup.py.src Makefile

Modified: trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff
===================================================================
--- 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)
@@ -1,36 +1,22 @@
-# 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:
- 
+--- 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 @@
  # 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)
+ 
+ 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 @@
    # 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 += $(shell g++ $(GAG_32BITS_SWITCH) -print-file-name=libstdc++.$(LIB_CXX_EXT))
 +STDCpp_LIB += @STDCXXLIB@
  
  ###########################################################################
  # Kernel libraries
- 
- LEGACY_LIBS = -lslatec -llapack -lblas

Modified: trunk/dports/science/gildas/files/patch-admin-define-system.sh.diff
===================================================================
--- 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)
@@ -1,45 +1,38 @@
---- 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
+--- 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
          	if which ifort > /dev/null 2>&1; then
-         	    DEFAULT_COMPILER=ifort
+         	    DEFAULT_FCOMPILER=ifort
 -        	elif which gfortran > /dev/null 2>&1; then
--        	    DEFAULT_COMPILER=gfortran
+-        	    DEFAULT_FCOMPILER=gfortran
 +        	elif which @FC@ > /dev/null 2>&1; then
-+        	    DEFAULT_COMPILER=@FC@
++        	    DEFAULT_FCOMPILER=@FC@
          	fi
              fi ;;
          CYGWIN*)
-@@ -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"
-                 :
+@@ -375,10 +375,12 @@
              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:
-@@ -359,10 +359,12 @@
-             fi
          fi
          #
--        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
+-        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
              # 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
++	elif [ "$CPP_VERSION" != "${CPP_VERSION/clang/}" ]; then
 +            GAG_COMPILER_CPPFLAGS="$GAG_COMPILER_CPPFLAGS -ffreestanding"
          fi
          #
-         export GAG_COMPILER_FFLAGS GAG_COMPILER_LIBS GAG_COMPILER_CPPFLAGS
+         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

Modified: trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff
===================================================================
--- 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)
@@ -1,17 +1,6 @@
-# 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
+--- 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 @@
      fi
      #
      # Check availability of g++. This only has an impact on ATM2009
@@ -20,11 +9,7 @@
          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
+@@ -443,34 +443,34 @@
          NUMPY_PRESENT=no
          NUMERIC_PRESENT=no
          SQLITE3_PRESENT=no
@@ -32,10 +17,10 @@
 +        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`
+-        	PYTHON_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%"`
++        	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%"`
          	# 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'))"`
@@ -45,7 +30,7 @@
 +        	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.
+         	                # find it or not. See also our script python-config-ldflags.py
          	#
          	# Now search for Numpy or Numeric
 -        	if python -c "import numpy" > /dev/null 2>&1; then
@@ -68,11 +53,7 @@
          	    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
+@@ -546,11 +546,11 @@
              ATM2003_PRESENT=yes
              ATM2003_LIB_DIR=$DIR
          fi
@@ -86,7 +67,7 @@
              BLAS_PRESENT=yes
              BLAS_LIB_DIR=$DIR
          fi
-         if file_present "libslatec." "${DIR}"; then
+@@ -558,13 +558,13 @@
              SLATEC_PRESENT=yes
              SLATEC_LIB_DIR=$DIR
          fi
@@ -107,11 +88,7 @@
          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
-     #
+@@ -598,6 +598,8 @@
      XML_PRESENT="yes"
      #
      unset GAG_LIB_DEP_PATH GAG_INC_DEP_PATH
@@ -120,5 +97,3 @@
      #
      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

Modified: trunk/dports/science/gildas/files/patch-lapack.diff
===================================================================
--- 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)
@@ -42,22 +42,18 @@
  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	    \
+--- 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 @@
  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
  
- ifeq ($(GAG_COMPILER_KIND),ifc)
+ ifeq ($(GAG_COMPILER_FKIND),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
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150527/de7c5926/attachment-0001.html>


More information about the macports-changes mailing list