[143120] trunk/dports/science/gildas

Sat Dec 12 08:38:33 PST 2015

Revision: 143120
          https://trac.macports.org/changeset/143120
Author:   smaret at macports.org
Date:     2015-12-04 08:50:37 -0800 (Fri, 04 Dec 2015)
Log Message:
-----------
gildas: Update to version 201512a.

Modified Paths:
--------------
    trunk/dports/science/gildas/Portfile
    trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff
    trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff

Removed Paths:
-------------
    trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff

Modified: trunk/dports/science/gildas/Portfile
===================================================================

--- trunk/dports/science/gildas/Portfile	2015-12-04 16:33:01 UTC (rev 143119)
+++ trunk/dports/science/gildas/Portfile	2015-12-04 16:50:37 UTC (rev 143120)
@@ -5,7 +5,7 @@
 PortGroup           compilers 1.0
 
 name                gildas
-version             201511b
+version             201512a
 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,12 +28,11 @@
 master_sites        http://www.iram.fr/~gildas/dist/
 distname            ${name}-src-${my_version}
 
-checksums           rmd160  8df03af39d526ac3a82210bf9de768e20131ce6f \
-                    sha256  8719723d36871919528d8406d2597f1120cec5685d79dc468ac908cc8ed9e112
+checksums           rmd160  33f158d3419170e4e6cd065b32649054bcd7eec7 \
+                    sha256  c67acfe4f5ef0f14976f7e05eb7b2bcfd6011dd07f3958306e24eed3a13361f4
 
 patch.pre_args      -p1
 patchfiles          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 \

Modified: trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff
===================================================================
--- trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff	2015-12-04 16:33:01 UTC (rev 143119)
+++ trunk/dports/science/gildas/files/patch-admin-Makefile.def.diff	2015-12-04 16:50:37 UTC (rev 143120)
@@ -1,5 +1,5 @@
---- 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
+--- gildas-src-dec15a/admin/Makefile.def.orig	2015-11-30 13:25:52.000000000 +0100
++++ gildas-src-dec15a/admin/Makefile.def	2015-12-04 16:19:05.000000000 +0100
 @@ -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
@@ -28,16 +28,7 @@
  
  # Preprocessor generic flags
  GLOBAL_CPPFLAGS += -P -traditional -C 
-@@ -335,7 +335,7 @@
- # C++ compilation
- 
- # C++ compiler name
--CXX = g++
-+CXX = @CXX@
- ifdef GAG_COMPILER_CXXEXE
-   CXX = $(GAG_COMPILER_CXXEXE)
- endif
-@@ -538,7 +538,7 @@
+@@ -551,7 +551,7 @@
  SIC_SYS_LIBS =
  SIC_LIB_DEPENDS += $(_GAG_LIBS) $(LEGACY_LIBS)
  ifeq ($(PYTHON_PRESENT),yes)
@@ -45,4 +36,4 @@
 +  SIC_SYS_LIBS += $(shell @PYTHON@ $(gagadmdir)/python-config-ldflags.py)
  endif
  ifeq ($(CFITSIO_PRESENT),yes)
-   SIC_LIB_DEPENDS += -lcfitsio
\ No newline at end of file
+   SIC_LIB_DEPENDS += -lcfitsio

Deleted: trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff
===================================================================
--- trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff	2015-12-04 16:33:01 UTC (rev 143119)
+++ trunk/dports/science/gildas/files/patch-admin-Makefile.stdcxxlib.diff	2015-12-04 16:50:37 UTC (rev 143120)
@@ -1,22 +0,0 @@
---- 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++:
-+
- ###########################################################################
- 
- 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_CXX_EXT))
-+STDCpp_LIB += @STDCXXLIB@
- 
- ###########################################################################
- # Kernel libraries

Modified: trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff
===================================================================
--- trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff	2015-12-04 16:33:01 UTC (rev 143119)
+++ trunk/dports/science/gildas/files/patch-admin-gildas-env.sh.diff	2015-12-04 16:50:37 UTC (rev 143120)
@@ -1,15 +1,6 @@
---- 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
--    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"
-@@ -443,34 +443,34 @@
+--- gildas-src-dec15a/admin/gildas-env.sh.orig	2015-11-30 13:25:52.000000000 +0100
++++ gildas-src-dec15a/admin/gildas-env.sh	2015-12-04 17:04:00.000000000 +0100
+@@ -442,34 +442,34 @@
          NUMPY_PRESENT=no
          NUMERIC_PRESENT=no
          SQLITE3_PRESENT=no
@@ -53,7 +44,7 @@
          	    SQLITE3_PRESENT=yes
          	fi
              fi
-@@ -546,11 +546,11 @@
+@@ -545,11 +545,11 @@
              ATM2003_PRESENT=yes
              ATM2003_LIB_DIR=$DIR
          fi
@@ -67,7 +58,7 @@
              BLAS_PRESENT=yes
              BLAS_LIB_DIR=$DIR
          fi
-@@ -558,13 +558,13 @@
+@@ -557,13 +557,13 @@
              SLATEC_PRESENT=yes
              SLATEC_LIB_DIR=$DIR
          fi
@@ -88,7 +79,7 @@
          if file_present "libasdmStandalone." "${DIR}"; then
              SDM_PRESENT=yes
              if [ "$SDM_PRESENT" = "yes" ]; then
-@@ -598,6 +598,8 @@
+@@ -597,6 +597,8 @@
      XML_PRESENT="yes"
      #
      unset GAG_LIB_DEP_PATH GAG_INC_DEP_PATH
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20151212/5b7eb12e/attachment.html>
