[42160] trunk/dports/science/hdf5
jochen at macports.org
jochen at macports.org
Sat Nov 15 23:32:17 PST 2008
Revision: 42160
http://trac.macports.org/changeset/42160
Author: jochen at macports.org
Date: 2008-11-15 23:32:16 -0800 (Sat, 15 Nov 2008)
Log Message:
-----------
upgrade to 1.6.8 and remove unnecessary patch files
Modified Paths:
--------------
trunk/dports/science/hdf5/Portfile
Removed Paths:
-------------
trunk/dports/science/hdf5/files/patch-H5PropList.cpp.diff
trunk/dports/science/hdf5/files/patch-gnu-flags.diff
trunk/dports/science/hdf5/files/patch-powerpc-apple.diff
Modified: trunk/dports/science/hdf5/Portfile
===================================================================
--- trunk/dports/science/hdf5/Portfile 2008-11-16 07:27:02 UTC (rev 42159)
+++ trunk/dports/science/hdf5/Portfile 2008-11-16 07:32:16 UTC (rev 42160)
@@ -6,8 +6,8 @@
# This Portfile still follows 1.6.x, in the spirit of 1.8 not being ready for production.
# We should provide a hdf5-devel port for 1.8 at this time, I guess.
name hdf5
-version 1.6.7
-revision 6
+version 1.6.8
+revision 0
categories science
maintainers openmaintainer jochen
@@ -19,15 +19,13 @@
http://www.sfr-fresh.com/unix/misc/ \
http://distfiles.macports.org/hdf5
-checksums md5 79027c67188e2e4131c5573771f477ce \
- sha1 9c26fe09cdad269c9a6757933f70ca164a47b8e8 \
- rmd160 2dbbcccd32986dcd66ce804c5e90ac6c949b71f6
+checksums md5 a822babf2810b509cc6779de739debd3 \
+ sha1 0918e1eb607bbe4b3f4c29ff9c60e97402dbd1dd \
+ rmd160 6f1a94e05f1fb681c5e32012f9231b50ef0eb0eb
depends_lib port:zlib
-patchfiles patch-gnu-flags.diff \
- patch-commence.diff patch-c-commence.diff \
- patch-fortran-commence.diff patch-H5f90i.diff \
- patch-H5PropList.cpp.diff
+patchfiles patch-commence.diff patch-c-commence.diff \
+ patch-fortran-commence.diff patch-H5f90i.diff
use_parallel_build yes
Deleted: trunk/dports/science/hdf5/files/patch-H5PropList.cpp.diff
===================================================================
--- trunk/dports/science/hdf5/files/patch-H5PropList.cpp.diff 2008-11-16 07:27:02 UTC (rev 42159)
+++ trunk/dports/science/hdf5/files/patch-H5PropList.cpp.diff 2008-11-16 07:32:16 UTC (rev 42160)
@@ -1,10 +0,0 @@
---- c++/src/H5PropList.cpp.orig 2008-04-09 18:34:35.000000000 +0200
-+++ c++/src/H5PropList.cpp 2008-04-09 18:35:11.000000000 +0200
-@@ -18,6 +18,7 @@
- #else
- #include <iostream>
- #endif
-+#include <cstdlib>
- #include <string>
-
- #include "H5Include.h"
Deleted: trunk/dports/science/hdf5/files/patch-gnu-flags.diff
===================================================================
--- trunk/dports/science/hdf5/files/patch-gnu-flags.diff 2008-11-16 07:27:02 UTC (rev 42159)
+++ trunk/dports/science/hdf5/files/patch-gnu-flags.diff 2008-11-16 07:32:16 UTC (rev 42160)
@@ -1,282 +0,0 @@
---- config/gnu-flags.orig 2008-04-17 20:13:12.000000000 +0200
-+++ config/gnu-flags 2008-04-17 20:13:28.000000000 +0200
-@@ -26,7 +26,7 @@
- # cc_version: Version number: 2.91.60, 2.7.2.1
- #
- if test X = "X$cc_flags_set"; then
-- cc_version="`$CC $CFLAGS -v 2>&1 |grep 'gcc version' |\
-+ cc_version="`$CC $CFLAGS $H5_CFLAGS -v 2>&1 |grep 'gcc version' |\
- sed 's/.*gcc version \([-a-z0-9\.]*\).*/\1/'`"
- cc_vendor=`echo $cc_version |sed 's/\([a-z]*\).*/\1/'`
- cc_version=`echo $cc_version |sed 's/[-a-z]//g'`
-@@ -130,7 +130,7 @@
- # architecture-specific optimizations cause problems
- # for some users who build binaries to be used on
- # multiple architectures.
-- #arch="-march=i686"
-+ # arch="-march=i686"
- ;;
- esac
-
-@@ -142,14 +142,14 @@
- esac
-
- # General
-- CFLAGS="$CFLAGS $arch -ansi"
-+ H5_CFLAGS="$H5_CFLAGS $arch -ansi -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline"
-
- # Production
- case "$cc_vendor-$cc_version" in
- gcc-2.95.[34])
- PROD_CFLAGS="-O3"
- ;;
-- gcc-3.[0-4]*|gcc-4.[012]*)
-+ gcc-3.[0-4]*|gcc-4.[0123]*)
- # The optimization level is reduced for gcc 3.* and 4.* due to problems
- # with code generation for src/H5Tconv.c with the -O2 & -O3
- # optimization levels (which shows up as failures for various integer
-@@ -170,7 +170,7 @@
- PROD_CPPFLAGS=
-
- # Debug
-- DEBUG_CFLAGS="-g -fverbose-asm -pedantic -Wall -W -Wundef -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-qual -Wcast-align -Wwrite-strings -Wconversion -Wsign-compare -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wredundant-decls -Wnested-externs -Winline"
-+ DEBUG_CFLAGS="-g -fverbose-asm"
- DEBUG_CPPFLAGS=
-
- # Profile
-@@ -188,135 +188,196 @@
- # the information from the previous version and adding modifications to that.
- case "$cc_vendor-$cc_version" in
-
--# Closer to the gcc 4.1 release, we should check for additional flags to
-+# Closer to the gcc 4.2 release, we should check for additional flags to
- # include and break it out into it's own section, like the other versions
- # below. -QAK
-- gcc-4.[01]*)
-+ gcc-4.[123]*)
-+ # Replace -ansi flag with -std=c99 flag
-+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-+
-+ # Disable warnings about using 'long long' type
-+ H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-+
-+ # Append warning flags from gcc-3* case
-+ # (don't use -Wpadded flag for normal builds, many of the warnings its
-+ # issuing can't be fixed and they are making it hard to detect other,
-+ # more important warnings)
-+ #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+ H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-+
-+ # Append warning flags from gcc-3.2* case
-+ H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
-+
-+ # Enable mort format checking flags, beyond the basic -Wformat included
-+ # in -Wall
-+ H5_CFLAGS="$H5_CFLAGS -Wformat-nonliteral -Wformat-security -Wformat-y2k"
-+
-+ # The "unreachable code" warning does not appear to be reliable yet...
-+ H5_CFLAGS="$H5_CFLAGS -Wunreachable-code"
-+
-+ # Append warning flags from gcc-3.3* case
-+ H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
-+
-+ # Append warning flags from gcc-3.4* case
-+ H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
-+
-+ # Replace old -W flag with new -Wextra flag
-+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
-+
-+ # Append more extra warning flags that only gcc4.0+ know about
-+ H5_CFLAGS="$H5_CFLAGS -Wmissing-field-initializers -Wvariadic-macros"
-+
-+ # Append more extra warning flags that only gcc4.1+ know about
-+ H5_CFLAGS="$H5_CFLAGS -Wunsafe-loop-optimizations -Wc++-compat -Wvolatile-register-var"
-+
-+ # Try out the new "stack protector" feature in gcc 4.1
-+ # (Strictly speaking this isn't really a "warning" flag, so it's added to
-+ # the debugging flags)
-+ #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wstack-protector -fstack-protector-all"
-+ ;;
-+
-+ gcc-4.0*)
- # Replace -ansi flag with -std=c99 flag
-- CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
- # Disable warnings about using 'long long' type
-- CFLAGS="$CFLAGS -Wno-long-long"
-+ H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
- # Append warning flags from gcc-3* case
- # (don't use -Wpadded flag for normal builds, many of the warnings its
- # issuing can't be fixed and they are making it hard to detect other,
- # more important warnings)
-- #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-+ #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+ H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-
- # Append warning flags from gcc-3.2* case
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
-+ H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
-
- # The "format=2" warning generates too many warnings about valid
- # usage in the library.
-- #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wformat=2"
-+ #CFLAGS="$CFLAGS -Wformat=2"
-
- # The "unreachable code" warning does not appear to be reliable yet...
-- #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wunreachable-code"
-+ #CFLAGS="$CFLAGS -Wunreachable-code"
-
- # Append warning flags from gcc-3.3* case
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wendif-labels"
-+ H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
-
- # Append warning flags from gcc-3.4* case
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
-+ H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
-
- # Replace old -W flag with new -Wextra flag
-- DEBUG_CFLAGS="`echo $DEBUG_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
-+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
-
- # Append more extra warning flags that only gcc4.0+ know about
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wvariadic-macros"
-+ H5_CFLAGS="$H5_CFLAGS -Wmissing-field-initializers -Wvariadic-macros"
- ;;
-
- gcc-3.4*)
- # Replace -ansi flag with -std=c99 flag
-- CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
- # Disable warnings about using 'long long' type
-- CFLAGS="$CFLAGS -Wno-long-long"
-+ H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
- # Append warning flags from gcc-3* case
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+ # (don't use -Wpadded flag for normal builds, many of the warnings its
-+ # issuing can't be fixed and they are making it hard to detect other,
-+ # more important warnings)
-+ #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+ H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-
- # Append warning flags from gcc-3.2* case
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
-+ H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
-
- # The "format=2" warning generates too many warnings about valid
- # usage in the library.
-- #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wformat=2"
-+ #CFLAGS="$CFLAGS -Wformat=2"
-
- # The "unreachable code" warning does not appear to be reliable yet...
-- #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wunreachable-code"
-+ #CFLAGS="$CFLAGS -Wunreachable-code"
-
- # Append warning flags from gcc-3.3* case
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wendif-labels"
-+ H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
-
- # Append more extra warning flags that only gcc3.4+ know about
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
-+ H5_CFLAGS="$H5_CFLAGS -Wdeclaration-after-statement -Wold-style-definition -Winvalid-pch"
-
- # Replace old -W flag with new -Wextra flag
-- DEBUG_CFLAGS="`echo $DEBUG_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
-+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-W\ /-Wextra\ /g'`"
- ;;
-
- gcc-3.3*)
- # Replace -ansi flag with -std=c99 flag
-- CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
- # Disable warnings about using 'long long' type
-- CFLAGS="$CFLAGS -Wno-long-long"
-+ H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
- # Append warning flags from gcc-3* case
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+ # (don't use -Wpadded flag for normal builds, many of the warnings its
-+ # issuing can't be fixed and they are making it hard to detect other,
-+ # more important warnings)
-+ #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+ H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-
- # Append warning flags from gcc-3.2* case
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
-+ H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
-
- # The "format=2" warning generates too many warnings about valid
- # usage in the library.
-- #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wformat=2"
-+ #CFLAGS="$CFLAGS -Wformat=2"
-
- # The "unreachable code" warning does not appear to be reliable yet...
-- #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wunreachable-code"
-+ #CFLAGS="$CFLAGS -Wunreachable-code"
-
- # Append more extra warning flags that only gcc3.3+ know about
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wendif-labels"
-+ H5_CFLAGS="$H5_CFLAGS -Wendif-labels"
- ;;
-
- gcc-3.2*)
- # Replace -ansi flag with -std=c99 flag
-- CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
- # Disable warnings about using 'long long' type
-- CFLAGS="$CFLAGS -Wno-long-long"
-+ H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
- # Append warning flags from gcc-3* case
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+ # (don't use -Wpadded flag for normal builds, many of the warnings its
-+ # issuing can't be fixed and they are making it hard to detect other,
-+ # more important warnings)
-+ #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+ H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
-
- # Append more extra warning flags that only gcc3.2+ know about
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
-+ H5_CFLAGS="$H5_CFLAGS -Wmissing-noreturn -Wpacked -Wdisabled-optimization -Wmultichar"
-
- # The "format=2" warning generates too many warnings about valid
- # usage in the library.
-- #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wformat=2"
-+ #CFLAGS="$CFLAGS -Wformat=2"
-
- # The "unreachable code" warning does not appear to be reliable yet...
-- #DEBUG_CFLAGS="$DEBUG_CFLAGS -Wunreachable-code"
-+ #CFLAGS="$CFLAGS -Wunreachable-code"
- ;;
-
- gcc-3*)
- # Replace -ansi flag with -std=c99 flag
-- CFLAGS="`echo $CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-+ H5_CFLAGS="`echo $H5_CFLAGS | sed -e 's/-ansi/-std=c99/g'`"
-
- # Disable warnings about using 'long long' type
-- CFLAGS="$CFLAGS -Wno-long-long"
-+ H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
-
- # Append some extra warning flags that only gcc3+ know about
-- DEBUG_CFLAGS="$DEBUG_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+ # (don't use -Wpadded flag for normal builds, many of the warnings its
-+ # issuing can't be fixed and they are making it hard to detect other,
-+ # more important warnings)
-+ #H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute -Wpadded"
-+ H5_CFLAGS="$H5_CFLAGS -Wfloat-equal -Wmissing-format-attribute"
- ;;
-
- gcc-2.9[56]*)
- # Disable warnings about using 'long long' type
-- CFLAGS="$CFLAGS -Wno-long-long"
-+ H5_CFLAGS="$H5_CFLAGS -Wno-long-long"
- ;;
- esac
-
Deleted: trunk/dports/science/hdf5/files/patch-powerpc-apple.diff
===================================================================
--- trunk/dports/science/hdf5/files/patch-powerpc-apple.diff 2008-11-16 07:27:02 UTC (rev 42159)
+++ trunk/dports/science/hdf5/files/patch-powerpc-apple.diff 2008-11-16 07:32:16 UTC (rev 42160)
@@ -1,72 +0,0 @@
---- fortran/config/powerpc-apple.orig 2008-05-04 16:59:28.000000000 +0900
-+++ fortran/config/powerpc-apple 2008-05-04 17:04:46.000000000 +0900
-@@ -30,12 +30,7 @@
-
-
- # The default Fortran 90 compiler
--if test "X-" = "X-$F9X"; then
-- F9X=xlf
-- F9X_BASENAME=xlf
-- else
-- F9X_BASENAME=f95
--fi
-+F9X_BASENAME=g95
-
- #
- # HDF5 integers
-@@ -54,43 +49,15 @@
- SIZE_T='SELECTED_INT_KIND(R_INTEGER)'
- OBJECT_NAMELEN_DEFAULT_F=-1
-
--case $F9X_BASENAME in
-- xlf)
-- F9XSUFFIXFLAG="-qsuffix=f=f90 -qfree=f90"
-- FFLAGS="$FFLAGS -static -O ${F9XSUFFIXFLAG} -qmoddir=./ "
-- FSEARCH_DIRS="-I./ -I../src"
-- DEBUG_FFLAGS="-g"
-- PROD_FFLAGS="-O"
-- PROFILE_FFLAGS="-g -pg"
-- f9x_flags_set=yes
-- ;;
--
-- #
-- # Assume Absoft compiler
-- #
-- f95)
-- # Set required flag for compiling C stubs
-- CFLAGS="$CFLAGS -DH5_ABSOFT"
--
-- F9XSUFFIXFLAG=""
--#We enforce that external name will appear in upper case (this is a default for Absoft)
-- FFLAGS="$FFLAGS -YEXT_NAMES=UCS"
-- FSEARCH_DIRS=""
-- DEBUG_FFLAGS="-g"
-- PROD_FFLAGS="-O"
-- PROFILE_FFLAGS="-g"
-- f9x_flags_set=yes
-- ;;
--
--esac
--
--# ----------------------------------------------------------------------
--# Absoft compiler must be used with --disable-shared.
--#
--if test "X$F9X_BASENAME" = "Xf95"; then
-- if test "X$enable_shared" != "Xno"; then
-- echo "error: --disable-shared must be used when building with Absoft Fortran compiler"
-- exit 1
-- fi
--fi
--
-+#
-+# Assume g95
-+#
-+
-+F9XSUFFIXFLAG=""
-+FFLAGS="$FFLAGS "
-+FSEARCH_DIRS="-I./ -I../src"
-+DEBUG_FFLAGS="-g"
-+PROD_FFLAGS="-O"
-+PROFILE_FFLAGS="-g -pg"
-+f9x_flags_set=yes
-+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081115/8604be55/attachment.html>
More information about the macports-changes
mailing list