<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[121007] trunk/dports/science/hdf4</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/121007">121007</a></dd>
<dt>Author</dt> <dd>takeshi@macports.org</dd>
<dt>Date</dt> <dd>2014-06-14 02:11:12 -0700 (Sat, 14 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>hdf4: updated for 4.2.10. use PortGroup compilers. added patch for examples directories</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencehdf4Portfile">trunk/dports/science/hdf4/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/science/hdf4/files/</li>
<li><a href="#trunkdportssciencehdf4filespatchhdfexamplesMakefileindiff">trunk/dports/science/hdf4/files/patch-hdf-examples-Makefile.in.diff</a></li>
<li><a href="#trunkdportssciencehdf4filespatchhdffortranexamplesMakefileindiff">trunk/dports/science/hdf4/files/patch-hdf-fortran-examples-Makefile.in.diff</a></li>
<li><a href="#trunkdportssciencehdf4filespatchmfhdfexamplesMakefileindiff">trunk/dports/science/hdf4/files/patch-mfhdf-examples-Makefile.in.diff</a></li>
<li><a href="#trunkdportssciencehdf4filespatchmfhdffortranexamplesMakefileindiff">trunk/dports/science/hdf4/files/patch-mfhdf-fortran-examples-Makefile.in.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencehdf4Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/hdf4/Portfile (121006 => 121007)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -2,9 +2,13 @@
</span><span class="cx"> # $Id$
</span><span class="cx">
</span><span class="cx"> PortSystem 1.0
</span><ins>+PortGroup compilers 1.0
</ins><span class="cx">
</span><ins>+compilers.choose fc f77 f90
+compilers.setup
+
</ins><span class="cx"> name hdf4
</span><del>-version 4.2.9
</del><ins>+version 4.2.10
</ins><span class="cx"> platforms darwin
</span><span class="cx"> categories science
</span><span class="cx"> license NCSA
</span><span class="lines">@@ -17,12 +21,15 @@
</span><span class="cx"> http://www.hdfgroup.org/ftp/HDF/prev-releases/HDF${version}/src/
</span><span class="cx"> distname hdf-${version}
</span><span class="cx"> use_bzip2 yes
</span><del>-checksums md5 c268a703f334ee4987fa710a0de9b9fc \
- sha1 c2251642e29c7acada37d5e599e68d270088e56d \
- rmd160 2052a35912bfe0eaa7f21b14325ebf60786d1e02
</del><ins>+checksums md5 bf26b3caaf3c0090965c8995578375bd \
+ sha1 5163543895728dabb536a0659b3d965d55bccf74 \
+ rmd160 4345dc9621980a3fe972eaf9aaedaa1ebe127657
</ins><span class="cx">
</span><span class="cx"> depends_lib port:zlib port:jpeg
</span><span class="cx">
</span><ins>+patchfiles patch-hdf-examples-Makefile.in.diff \
+ patch-mfhdf-examples-Makefile.in.diff
+
</ins><span class="cx"> configure.args --disable-netcdf --disable-fortran \
</span><span class="cx"> --with-jpeg=${prefix} --enable-shared \
</span><span class="cx"> --without-szlib
</span><span class="lines">@@ -50,53 +57,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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}"
</del><ins>+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
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-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
- }
-}
-
</del><span class="cx"> if {[variant_isset g95]} {
</span><del>- 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
</del><span class="cx"> configure.fflags-append -fno-second-underscore
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportssciencehdf4filespatchhdfexamplesMakefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/hdf4/files/patch-hdf-examples-Makefile.in.diff (0 => 121007)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+--- 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@LD_LIBRARY_PATH = $(LL_PATH)
+
</ins></span></pre></div>
<a id="trunkdportssciencehdf4filespatchhdffortranexamplesMakefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/hdf4/files/patch-hdf-fortran-examples-Makefile.in.diff (0 => 121007)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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@LD_LIBRARY_PATH = $(LL_PATH)
+
</ins></span></pre></div>
<a id="trunkdportssciencehdf4filespatchmfhdfexamplesMakefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/hdf4/files/patch-mfhdf-examples-Makefile.in.diff (0 => 121007)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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@LD_LIBRARY_PATH = $(LL_PATH)
+
</ins></span></pre></div>
<a id="trunkdportssciencehdf4filespatchmfhdffortranexamplesMakefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/hdf4/files/patch-mfhdf-fortran-examples-Makefile.in.diff (0 => 121007)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- 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@LD_LIBRARY_PATH = $(LL_PATH)
+
</ins></span></pre>
</div>
</div>
</body>
</html>