[71055] trunk/dports/science/magicspp
takeshi at macports.org
takeshi at macports.org
Mon Aug 30 15:53:31 PDT 2010
Revision: 71055
http://trac.macports.org/changeset/71055
Author: takeshi at macports.org
Date: 2010-08-30 15:53:31 -0700 (Mon, 30 Aug 2010)
Log Message:
-----------
magicspp: updated for 2.10.0. Fixed gcc43 and gcc44 variants
Modified Paths:
--------------
trunk/dports/science/magicspp/Portfile
trunk/dports/science/magicspp/files/patch-configure.diff
trunk/dports/science/magicspp/files/patch-magics-config.in.diff
trunk/dports/science/magicspp/files/patch-src-Makefile.in.diff
Modified: trunk/dports/science/magicspp/Portfile
===================================================================
--- trunk/dports/science/magicspp/Portfile 2010-08-30 22:51:46 UTC (rev 71054)
+++ trunk/dports/science/magicspp/Portfile 2010-08-30 22:53:31 UTC (rev 71055)
@@ -4,7 +4,7 @@
PortSystem 1.0
name magicspp
-version 2.8.0
+version 2.10.0
platforms darwin
maintainers takeshi
license Apache v2.0
@@ -13,9 +13,9 @@
homepage http://www.ecmwf.int/products/data/software/magics++.html
master_sites http://www.ecmwf.int/products/data/software/download/software_files/
distname Magics++-${version}
-checksums md5 cf696eaa5d8075e32cc48b8107c43ffb \
- sha1 5b09244f6428895c38804402877a9447edf150f5 \
- rmd160 63ad953c40b469729483817f2525a1999a1753c8
+checksums md5 6abfa2bd917073dc12e52f32ce215770 \
+ sha1 75ad6aa2ee5533789e13ed79d2b4b6e952b72379 \
+ rmd160 c4e72c984c8a7b119bd56a2aa9dd173360a83574
long_description \
Magics++ is the latest generation of the ECMWF's Meteorological plotting \
software MAGICS (Meteorological Applications Graphics Integrated Colour System) \
@@ -59,6 +59,8 @@
configure.env-append LIBS=\"-lgrib_api -lopenjpeg -lpng\"
configure.cppflags-append -I${prefix}/include/freetype2/
configure.args-append --disable-dependency-tracking \
+ --disable-qt \
+ --disable-json \
--enable-cairo \
--enable-bufr \
--with-grib_api=${prefix} \
@@ -67,12 +69,12 @@
--with-gs-font-dir=${prefix}/share/ghostscript/fonts
variant gcc43 conflicts gcc44 description {for emos +gcc43} {
- configure.ldflags-append -lgrib_api -lopenjpeg -lpng -lemosR64 -L${prefix}/lib/gcc43 -lgfortran -lnetcdf_c++ -lnetcdf
+ configure.ldflags-append -lgrib_api -lopenjpeg -lpng -lemosR64 -lgfortran -lgfortranbegin -lnetcdf_c++ -lnetcdf
configure.compiler macports-gcc-4.3
}
variant gcc44 conflicts gcc43 description {for emos +gcc44} {
- configure.ldflags-append -lgrib_api -lopenjpeg -lpng -lemosR64 -L${prefix}/lib/gcc44 -lgfortran -lnetcdf_c++ -lnetcdf
+ configure.ldflags-append -lgrib_api -lopenjpeg -lpng -lemosR64 -lgfortran -lgfortranbegin -lnetcdf_c++ -lnetcdf
configure.compiler macports-gcc-4.4
}
Modified: trunk/dports/science/magicspp/files/patch-configure.diff
===================================================================
--- trunk/dports/science/magicspp/files/patch-configure.diff 2010-08-30 22:51:46 UTC (rev 71054)
+++ trunk/dports/science/magicspp/files/patch-configure.diff 2010-08-30 22:53:31 UTC (rev 71055)
@@ -1,17 +1,11 @@
---- configure.orig 2009-12-10 11:52:06.000000000 -1000
-+++ configure 2009-12-10 11:53:40.000000000 -1000
-@@ -20146,8 +20146,12 @@
+--- configure.orig 2010-08-29 21:58:00.000000000 +0900
++++ configure 2010-08-29 21:59:07.000000000 +0900
+@@ -19906,7 +19906,7 @@
# FLIBS is determined which Fortran compiler was used for Emoslib!!!
#
case "${F77}" in
- gfortran )
-- FLIBS="-lgfortran"
+ *gfortran* )
-+ FLIBS="-L${exec_prefix}/lib/gcc43 -lgfortran"
-+ FFLAGS="${FFLAGS} ${AXX}"
-+ ;;
-+ *g95 )
-+ FLIBS="-lf95"
+ FLIBS="-lgfortran"
FFLAGS="${FFLAGS} ${AXX}"
;;
- # Intel compiler 9.x
Modified: trunk/dports/science/magicspp/files/patch-magics-config.in.diff
===================================================================
--- trunk/dports/science/magicspp/files/patch-magics-config.in.diff 2010-08-30 22:51:46 UTC (rev 71054)
+++ trunk/dports/science/magicspp/files/patch-magics-config.in.diff 2010-08-30 22:53:31 UTC (rev 71055)
@@ -1,5 +1,5 @@
---- magics-config.in.orig 2009-12-10 15:45:26.000000000 -1000
-+++ magics-config.in 2009-12-10 16:08:07.000000000 -1000
+--- magics-config.in.orig 2010-08-29 21:59:57.000000000 +0900
++++ magics-config.in 2010-08-29 22:05:06.000000000 +0900
@@ -6,6 +6,8 @@
includedir=@includedir@
F77="@F77@"
@@ -9,29 +9,7 @@
AXX="@AXX@"
FFLAGS="@FFLAGS@"
CPPLIBS="@CPPLIBS@"
-@@ -154,7 +156,7 @@
- # Intel compiler
- # Portland pgf90
- # IBM fortran compiler
-- ifc | ifort | pgf90 | pgf77 | xlf | xlf90 | xlf_r | xlf90_r )
-+ ifc | ifort | pgf90 | pgf77 | xlf | xlf90 | xlf_r | xlf90_r | g95 )
- FXX="-r8 ${FXX}"
- ;;
- esac
-@@ -179,10 +181,10 @@
-
- case "${CC}" in
- icc | icpc | gcc | g++ )
-- CXX="-m64 ${CXX}"
-+ CXXFLAGS="-m64 ${CXXFLAGS}"
- ;;
- pgc | pgcpp )
-- CXX="-tp amd64 ${CXX}"
-+ CXXFLAGS="-tp amd64 ${CXXFLAGS}"
- ;;
- esac
- ;;
-@@ -205,7 +207,7 @@
+@@ -200,7 +202,7 @@
fi
if test "$echo_libs" = "yes"; then
@@ -40,7 +18,7 @@
my_libs="-L${libdir} -lMagPlus"
else
my_libs="${libdir}/libMagPlus.a"
-@@ -237,7 +239,7 @@
+@@ -232,7 +234,7 @@
fi
if test "$echo_shared" = "yes"; then
@@ -49,7 +27,7 @@
shared="${precision} -L${libdir} -lMagPlus @MAGICS_3RDPARTY_LIBS@ $CPPLIBS"
echo ${shared}
else
-@@ -252,16 +254,17 @@
+@@ -247,16 +249,17 @@
if test "$compile" = "yes"; then
out=""
if test "${suffix}x" = "x"; then
@@ -58,16 +36,16 @@
fi
- name="`basename $f77_file .${suffix}`"
-+ name=${f77_file%.*}
++ name=${f77_file%.*}
if test ${name} != ${f77_file} ; then
out="-o $name " ### avoid overriding source file
fi
- $F77 ${out}$f77_file ${FFLAGS} ${precision} -L${libdir} -Wl,-rpath,${libdir} -lMagPlus @LDFLAGS@ @MAGICS_3RDPARTY_LIBS@ $CPPLIBS
- echo "$F77 ${out}$f77_file ${FFLAGS} ${precision} -L${libdir} -lMagPlus @LDFLAGS@ @MAGICS_3RDPARTY_LIBS@ $CPPLIBS"
-+ $F77 ${f77_file} -c && \
-+ ${CXX} ${CXXFLAGS} ${out}${name}.o ${FFLAGS} ${precision} -L${libdir} -Wl,-rpath,${libdir} -lMagPlus @LDFLAGS@ @MAGICS_3RDPARTY_LIBS@ $CPPLIBS
-+ echo "$F77 ${f77_file} -c && ${CXX} ${CXXFLAGS} ${out}${name}.o ${FFLAGS} ${precision} -L${libdir} -lMagPlus @LDFLAGS@ @MAGICS_3RDPARTY_LIBS@ $CPPLIBS"
++ $F77 ${f77_file} -c && \
++ ${CXX} ${CXXFLAGS} ${out}${name}.o ${FFLAGS} ${precision} -L${libdir} -Wl,-rpath,${libdir} -lMagPlus @LDFLAGS@ @MAGICS_3RDPARTY_LIBS@ $CPPLIBS
++ echo "$F77 ${f77_file} -c && ${CXX} ${CXXFLAGS} ${out}${name}.o ${FFLAGS} ${precision} -L${libdir} -lMagPlus @LDFLAGS@ @MAGICS_3RDPARTY_LIBS@ $CPPLIBS"
fi
if test "$compileC" = "yes"; then
Modified: trunk/dports/science/magicspp/files/patch-src-Makefile.in.diff
===================================================================
--- trunk/dports/science/magicspp/files/patch-src-Makefile.in.diff 2010-08-30 22:51:46 UTC (rev 71054)
+++ trunk/dports/science/magicspp/files/patch-src-Makefile.in.diff 2010-08-30 22:53:31 UTC (rev 71055)
@@ -1,13 +1,11 @@
---- src/Makefile.in.orig 2009-12-10 09:57:21.000000000 -1000
-+++ src/Makefile.in 2009-12-10 09:58:08.000000000 -1000
-@@ -80,8 +80,8 @@
- am__objects_1 =
- am_libMagPlus_la_OBJECTS = $(am__objects_1)
- libMagPlus_la_OBJECTS = $(am_libMagPlus_la_OBJECTS)
--libMagPlus_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
-- $(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-+libMagPlus_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
-+ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) \
- $(libMagPlus_la_LDFLAGS) $(LDFLAGS) -o $@
- DEFAULT_INCLUDES = -I. at am__isrc@
- depcomp = $(SHELL) $(top_srcdir)/config/depcomp
+--- src/Makefile.in.orig 2010-08-29 22:06:01.000000000 +0900
++++ src/Makefile.in 2010-08-29 22:07:45.000000000 +0900
+@@ -104,7 +104,7 @@
+ $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+ $(AM_CFLAGS) $(CFLAGS)
+ CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
++LINK = $(LIBTOOL) --tag=CXX --mode=link $(CXXLD) $(AM_CFLAGS) $(CFLAGS) \
+ $(AM_LDFLAGS) $(LDFLAGS) -o $@
+ SOURCES = $(libMagPlusDouble_a_SOURCES) $(libMagPlusSingle_a_SOURCES) \
+ $(libMagPlus_la_SOURCES)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100830/d0071252/attachment-0001.html>
More information about the macports-changes
mailing list