[130951] trunk/dports/science/giza

[sean at macports.org]

Revision: 130951
          https://trac.macports.org/changeset/130951
Author:   sean at macports.org
Date:     2015-01-03 22:00:55 -0800 (Sat, 03 Jan 2015)
Log Message:
-----------
giza: fix incorrect usuage with compilers

Modified Paths:
--------------
    trunk/dports/science/giza/Portfile

Added Paths:
-----------
    trunk/dports/science/giza/files/
    trunk/dports/science/giza/files/patch-Makefile.diff

Modified: trunk/dports/science/giza/Portfile
===================================================================
--- trunk/dports/science/giza/Portfile	2015-01-04 06:00:51 UTC (rev 130950)
+++ trunk/dports/science/giza/Portfile	2015-01-04 06:00:55 UTC (rev 130951)
@@ -27,8 +27,7 @@
 conflicts           pgplot
 use_configure       no
 
-compilers.choose    fc f90
-compilers.setup     require_fortran -dragonegg
+compilers.setup     require_fortran -dragonegg -g95
 
 build.cmd           make
 build.args          CC=${configure.cc} FC=${configure.fc}
@@ -41,32 +40,12 @@
 destroot.args       PREFIX=${prefix}
 use_parallel_build  no
 
-set gcc_versions {4.4 4.5 4.6 4.7 4.8 4.9}
+patchfiles-append   patch-Makefile.diff
 
-foreach ver ${gcc_versions} {
-    set ver_no_dot [join [split ${ver} "."] ""]
-
-    if {[variant_isset gcc${ver_no_dot}]} {
-        configure.fc  ${prefix}/bin/gfortran-mp-${ver}
-        configure.cc  ${prefix}/bin/gcc-mp-${ver}
-        build.args-append   CC=${configure.cc} FC=${configure.fc} FLIBS="-L${prefix}/lib/gcc${ver_no_dot} -lgfortran"
-    }
+pre-build {
+    build.args-append CC=${configure.cc} FC=${configure.fc}
 }
 
-if {[variant_isset g95]} {
-   configure.fc  ${prefix}/bin/g95
-   build.args-append FC=${configure.fc} FLIBS="-L${prefix}/lib/ -lf95"
-}
-
-if {![fortran_variant_isset]} {
-   default_variants-append +gcc48
-   set ver 4.8
-   set ver_no_dot [join [split ${ver} "."] ""]
-   configure.fc  ${prefix}/bin/gfortran-mp-${ver}
-   configure.cc  ${prefix}/bin/gcc-mp-${ver}
-   build.args-append  CC=${configure.cc} FC=${configure.fc} FLIBS="-L${prefix}/lib/gcc${ver_no_dot} -lgfortran"
-}
-
 post-destroot {
     system "install_name_tool -id ${prefix}/lib/libcpgplot.dylib ${destroot}${prefix}/lib/libcpgplot.dylib"
     system "install_name_tool -id ${prefix}/lib/libpgplot.dylib ${destroot}${prefix}/lib/libpgplot.dylib"

Added: trunk/dports/science/giza/files/patch-Makefile.diff
===================================================================
--- trunk/dports/science/giza/files/patch-Makefile.diff	                        (rev 0)
+++ trunk/dports/science/giza/files/patch-Makefile.diff	2015-01-04 06:00:55 UTC (rev 130951)
@@ -0,0 +1,11 @@
+--- build/Makefile.orig	2014-12-30 21:28:11.000000000 -0600
++++ build/Makefile	2014-12-30 21:28:35.000000000 -0600
+@@ -230,7 +230,7 @@
+ 	ln -sf $(SHARED_LIB_GIZA_VERSION) $(SHARED_LIB_GIZA)
+ 
+ $(SHARED_LIB_PGPLOT): $(INCDIR)/giza-version.h $(OBJECTS) giza-fortran.o giza-pgplot.o
+-	$(LIBTOOL) $(SHAREDLIBFLAGS) -o $(SHARED_LIB_PGPLOT) $(OBJECTS) giza-fortran.o giza-pgplot.o $(LDFLAGS) $(FLIBS)
++	$(FC) $(SHAREDLIBFLAGS) -o $(SHARED_LIB_PGPLOT) $(OBJECTS) giza-fortran.o giza-pgplot.o $(LDFLAGS)
+ 
+ $(SHARED_LIB_CPGPLOT):  $(INCDIR)/giza-version.h $(OBJECTS) giza-cpgplot.o
+ 	$(LIBTOOL) $(SHAREDLIBFLAGS) -o $@ $(OBJECTS) giza-cpgplot.o $(LDFLAGS)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20150103/b0c7a67a/attachment.html>