[121007] trunk/dports/science/hdf4
takeshi at macports.org
takeshi at macports.org
Sat Jun 14 02:11:12 PDT 2014
Revision: 121007
https://trac.macports.org/changeset/121007
Author: takeshi at macports.org
Date: 2014-06-14 02:11:12 -0700 (Sat, 14 Jun 2014)
Log Message:
-----------
hdf4: updated for 4.2.10. use PortGroup compilers. added patch for examples directories
Modified Paths:
--------------
trunk/dports/science/hdf4/Portfile
Added Paths:
-----------
trunk/dports/science/hdf4/files/
trunk/dports/science/hdf4/files/patch-hdf-examples-Makefile.in.diff
trunk/dports/science/hdf4/files/patch-hdf-fortran-examples-Makefile.in.diff
trunk/dports/science/hdf4/files/patch-mfhdf-examples-Makefile.in.diff
trunk/dports/science/hdf4/files/patch-mfhdf-fortran-examples-Makefile.in.diff
Modified: trunk/dports/science/hdf4/Portfile
===================================================================
--- trunk/dports/science/hdf4/Portfile 2014-06-14 08:26:29 UTC (rev 121006)
+++ trunk/dports/science/hdf4/Portfile 2014-06-14 09:11:12 UTC (rev 121007)
@@ -2,9 +2,13 @@
# $Id$
PortSystem 1.0
+PortGroup compilers 1.0
+compilers.choose fc f77 f90
+compilers.setup
+
name hdf4
-version 4.2.9
+version 4.2.10
platforms darwin
categories science
license NCSA
@@ -17,12 +21,15 @@
http://www.hdfgroup.org/ftp/HDF/prev-releases/HDF${version}/src/
distname hdf-${version}
use_bzip2 yes
-checksums md5 c268a703f334ee4987fa710a0de9b9fc \
- sha1 c2251642e29c7acada37d5e599e68d270088e56d \
- rmd160 2052a35912bfe0eaa7f21b14325ebf60786d1e02
+checksums md5 bf26b3caaf3c0090965c8995578375bd \
+ sha1 5163543895728dabb536a0659b3d965d55bccf74 \
+ rmd160 4345dc9621980a3fe972eaf9aaedaa1ebe127657
depends_lib port:zlib port:jpeg
+patchfiles patch-hdf-examples-Makefile.in.diff \
+ patch-mfhdf-examples-Makefile.in.diff
+
configure.args --disable-netcdf --disable-fortran \
--with-jpeg=${prefix} --enable-shared \
--without-szlib
@@ -50,53 +57,13 @@
}
}
-set gcc_versions {4.3 4.4 4.5 4.6 4.7 4.8 4.9}
-set g95_conflicts {}
-
-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- set variant_line {variant gcc${ver_no_dot} description "build with gfortran from gcc${ver_no_dot}" conflicts g95}
-
- foreach over ${gcc_versions} {
- if {${ver} == ${over}} {
- continue
- }
-
- set over_no_dot [join [split ${over} "."] ""]
- append variant_line " conflicts gcc${over_no_dot}"
- }
- append variant_line { {}}
-
- eval $variant_line
-
- append g95_conflicts " conflicts gcc${ver_no_dot}"
+if {[fortran_variant_isset]} {
+ patchfiles-append patch-hdf-fortran-examples-Makefile.in.diff \
+ patch-mfhdf-fortran-examples-Makefile.in.diff
+ configure.args-delete --disable-fortran --enable-shared
}
-eval [concat {variant g95 description {build with g95}} $g95_conflicts {{}}]
-
-foreach ver ${gcc_versions} {
- set ver_no_dot [join [split ${ver} "."] ""]
-
- if {[variant_isset gcc${ver_no_dot}]} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:gcc${ver_no_dot}
-
- configure.fc ${prefix}/bin/gfortran-mp-${ver}
- configure.f77 ${prefix}/bin/gfortran-mp-${ver}
- configure.f90 ${prefix}/bin/gfortran-mp-${ver}
- configure.args-delete --disable-fortran --enable-shared
- }
-}
-
if {[variant_isset g95]} {
- depends_lib-append path:lib/libgcc/libgcc_s.1.dylib:libgcc
- depends_build-append port:g95
-
- configure.fc ${prefix}/bin/g95
- configure.f77 ${prefix}/bin/g95
- configure.f90 ${prefix}/bin/g95
- configure.args-delete --disable-fortran --enable-shared
configure.fflags-append -fno-second-underscore
}
Added: trunk/dports/science/hdf4/files/patch-hdf-examples-Makefile.in.diff
===================================================================
--- trunk/dports/science/hdf4/files/patch-hdf-examples-Makefile.in.diff (rev 0)
+++ trunk/dports/science/hdf4/files/patch-hdf-examples-Makefile.in.diff 2014-06-14 09:11:12 UTC (rev 121007)
@@ -0,0 +1,13 @@
+--- hdf/examples/Makefile.in.orig 2014-02-10 11:31:25.000000000 +0900
++++ hdf/examples/Makefile.in 2014-06-14 17:41:04.000000000 +0900
+@@ -289,8 +289,8 @@
+ INSTALL_TOP_FILES = README
+
+ # Where to install example files
+-EXAMPLEDIR = $(prefix)/examples/c
+-EXAMPLETOPDIR = $(prefix)/examples
++EXAMPLEDIR = $(DESTDIR)$(prefix)/share/hdf4/examples/c
++EXAMPLETOPDIR = $(DESTDIR)$(prefix)/share/hdf4/examples
+ DISTCLEANFILES = *.chkexe *.chklog
+ @BUILD_SHARED_SZIP_CONDITIONAL_TRUE at LD_LIBRARY_PATH = $(LL_PATH)
+
Added: trunk/dports/science/hdf4/files/patch-hdf-fortran-examples-Makefile.in.diff
===================================================================
--- trunk/dports/science/hdf4/files/patch-hdf-fortran-examples-Makefile.in.diff (rev 0)
+++ trunk/dports/science/hdf4/files/patch-hdf-fortran-examples-Makefile.in.diff 2014-06-14 09:11:12 UTC (rev 121007)
@@ -0,0 +1,11 @@
+--- hdf/fortran/examples/Makefile.in.orig 2014-02-10 11:31:25.000000000 +0900
++++ hdf/fortran/examples/Makefile.in 2014-06-14 18:02:43.000000000 +0900
+@@ -284,7 +284,7 @@
+ INSTALL_SCRIPT_FILES = run-fortran-ex.sh
+
+ # Where to install Fortran example files
+-EXAMPLEDIR = $(prefix)/examples/fortran
++EXAMPLEDIR = $(DESTDIR)$(prefix)/share/hdf4/examples/fortran
+ DISTCLEANFILES = *.chkexe *.chklog
+ @BUILD_SHARED_SZIP_CONDITIONAL_TRUE at LD_LIBRARY_PATH = $(LL_PATH)
+
Added: trunk/dports/science/hdf4/files/patch-mfhdf-examples-Makefile.in.diff
===================================================================
--- trunk/dports/science/hdf4/files/patch-mfhdf-examples-Makefile.in.diff (rev 0)
+++ trunk/dports/science/hdf4/files/patch-mfhdf-examples-Makefile.in.diff 2014-06-14 09:11:12 UTC (rev 121007)
@@ -0,0 +1,11 @@
+--- mfhdf/examples/Makefile.in.orig 2014-02-10 11:31:26.000000000 +0900
++++ mfhdf/examples/Makefile.in 2014-06-14 17:49:17.000000000 +0900
+@@ -266,7 +266,7 @@
+ SD_get_info.c SD_find_sds_by_name.c SD_set_get_dim_info.c \
+ SD_dimscale_vs_sds.c SD_set_attr.c SD_get_attr.c SD_chunking_example.c
+
+-EXAMPLEDIR = $(prefix)/examples/c
++EXAMPLEDIR = $(DESTDIR)$(prefix)/share/hdf4/examples/c
+ DISTCLEANFILES = *.chklog *.chkexe .deps
+ @BUILD_SHARED_SZIP_CONDITIONAL_TRUE at LD_LIBRARY_PATH = $(LL_PATH)
+
Added: trunk/dports/science/hdf4/files/patch-mfhdf-fortran-examples-Makefile.in.diff
===================================================================
--- trunk/dports/science/hdf4/files/patch-mfhdf-fortran-examples-Makefile.in.diff (rev 0)
+++ trunk/dports/science/hdf4/files/patch-mfhdf-fortran-examples-Makefile.in.diff 2014-06-14 09:11:12 UTC (rev 121007)
@@ -0,0 +1,11 @@
+--- mfhdf/fortran/examples/Makefile.in.orig 2014-02-10 11:31:26.000000000 +0900
++++ mfhdf/fortran/examples/Makefile.in 2014-06-14 18:03:15.000000000 +0900
+@@ -270,7 +270,7 @@
+
+
+ # Where to install example files
+-EXAMPLEDIR = $(prefix)/examples/fortran
++EXAMPLEDIR = $(DESTDIR)$(prefix)/share/hdf4/examples/fortran
+ DISTCLEANFILES = *.chkexe *.chklog
+ @BUILD_SHARED_SZIP_CONDITIONAL_TRUE at LD_LIBRARY_PATH = $(LL_PATH)
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140614/fa3494b6/attachment.html>
More information about the macports-changes
mailing list