<!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>[120809] trunk/dports/science/yaxt</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/120809">120809</a></dd>
<dt>Author</dt> <dd>takeshi@macports.org</dd>
<dt>Date</dt> <dd>2014-06-07 17:25:47 -0700 (Sat, 07 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>yaxt: added patches to avoid using wrong headers</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceyaxtPortfile">trunk/dports/science/yaxt/Portfile</a></li>
<li><a href="#trunkdportsscienceyaxtfilespatchsrcMakefileindiff">trunk/dports/science/yaxt/files/patch-src-Makefile.in.diff</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsscienceyaxtfilespatchexamplesMakefileindiff">trunk/dports/science/yaxt/files/patch-examples-Makefile.in.diff</a></li>
<li><a href="#trunkdportsscienceyaxtfilespatchperfMakefileindiff">trunk/dports/science/yaxt/files/patch-perf-Makefile.in.diff</a></li>
<li><a href="#trunkdportsscienceyaxtfilespatchtestsMakefileindiff">trunk/dports/science/yaxt/files/patch-tests-Makefile.in.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceyaxtPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/yaxt/Portfile (120808 => 120809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/yaxt/Portfile 2014-06-07 23:02:01 UTC (rev 120808)
+++ trunk/dports/science/yaxt/Portfile 2014-06-08 00:25:47 UTC (rev 120809)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx">
</span><span class="cx"> name yaxt
</span><span class="cx"> version 0.2.2
</span><ins>+revision 1
</ins><span class="cx"> platforms darwin
</span><span class="cx"> maintainers takeshi openmaintainer
</span><span class="cx"> license BSD
</span><span class="lines">@@ -22,7 +23,10 @@
</span><span class="cx"> checksums rmd160 3cf6d1251e48c175f511a5885c23ee06edacb3f7 \
</span><span class="cx"> sha256 6feb7185b397f7249f48ce10b7c60c457885eb7b67b7231dc08656c353e7e93b
</span><span class="cx">
</span><del>-patchfiles patch-src-Makefile.in.diff
</del><ins>+patchfiles patch-src-Makefile.in.diff \
+ patch-tests-Makefile.in.diff \
+ patch-examples-Makefile.in.diff \
+ patch-perf-Makefile.in.diff
</ins><span class="cx"> configure.cppflags-append -I../src
</span><span class="cx"> configure.fcflags-append -cpp
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsscienceyaxtfilespatchexamplesMakefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/yaxt/files/patch-examples-Makefile.in.diff (0 => 120809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/yaxt/files/patch-examples-Makefile.in.diff (rev 0)
+++ trunk/dports/science/yaxt/files/patch-examples-Makefile.in.diff 2014-06-08 00:25:47 UTC (rev 120809)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- examples/Makefile.in.orig 2014-03-06 23:32:58.000000000 +0900
++++ examples/Makefile.in 2014-06-08 09:06:01.000000000 +0900
+@@ -355,7 +355,7 @@
+ row2col_f_LDADD = ../src/libyaxt.la $(MPI_FC_LIB)
+ tr_gp2fs_SOURCES = tr_gp2fs.c
+ tr_gp2fs_LDADD = $(LDADD) -lm
+-AM_CFLAGS = -I../inst_headers $(MPI_C_INCLUDE)
++AM_CPPFLAGS = -I../inst_headers $(MPI_C_INCLUDE)
+ AM_FCFLAGS = $(FC_MOD_FLAG)../inst_headers/f90 $(MPI_FC_INCLUDE) $(MPI_FC_MOD)
+ LDADD = ../src/libyaxt.la $(MPI_C_LIB)
+ all: all-am
</ins></span></pre></div>
<a id="trunkdportsscienceyaxtfilespatchperfMakefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/yaxt/files/patch-perf-Makefile.in.diff (0 => 120809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/yaxt/files/patch-perf-Makefile.in.diff (rev 0)
+++ trunk/dports/science/yaxt/files/patch-perf-Makefile.in.diff 2014-06-08 00:25:47 UTC (rev 120809)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- perf/Makefile.in.orig 2014-03-06 23:32:58.000000000 +0900
++++ perf/Makefile.in 2014-06-08 09:11:13.000000000 +0900
+@@ -336,7 +336,7 @@
+ perf_idxsection_get_positions_of_indices_SOURCES = perf_idxsection_get_positions_of_indices.c
+ perf_sparse_array_gather_SOURCES = perf_sparse_array_gather.f90
+ perf_sparse_array_gather_LDADD = ../src/libyaxt.la $(MPI_FC_LIB)
+-AM_CFLAGS = -I../inst_headers $(MPI_C_INCLUDE)
++AM_CPPFLAGS = -I../inst_headers $(MPI_C_INCLUDE)
+ AM_FCFLAGS = $(FC_MOD_FLAG)../inst_headers/f90 $(MPI_FC_INCLUDE) $(MPI_FC_MOD)
+ LDADD = ../src/libyaxt.la $(MPI_C_LIB)
+ EXTRA_DIST = core
</ins></span></pre></div>
<a id="trunkdportsscienceyaxtfilespatchsrcMakefileindiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/yaxt/files/patch-src-Makefile.in.diff (120808 => 120809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/yaxt/files/patch-src-Makefile.in.diff 2014-06-07 23:02:01 UTC (rev 120808)
+++ trunk/dports/science/yaxt/files/patch-src-Makefile.in.diff 2014-06-08 00:25:47 UTC (rev 120809)
</span><span class="lines">@@ -1,64 +1,54 @@
</span><del>---- Makefile.in.orig 2014-03-06 23:32:58.000000000 +0900
-+++ Makefile.in 2014-05-31 22:21:18.000000000 +0900
-@@ -142,29 +142,29 @@
- sed_last='s,^.*/\([^/]*\)$$,\1,'; \
- sed_butlast='s,/*[^/]*$$,,'; \
- while test -n "$$dir1"; do \
-- first=`echo "$$dir1" | sed -e "$$sed_first"`; \
-+ first=`echo "$$dir1" | $(SED) -e "$$sed_first"`; \
- if test "$$first" != "."; then \
- if test "$$first" = ".."; then \
-- dir2=`echo "$$dir0" | sed -e "$$sed_last"`/"$$dir2"; \
-- dir0=`echo "$$dir0" | sed -e "$$sed_butlast"`; \
-+ dir2=`echo "$$dir0" | $(SED) -e "$$sed_last"`/"$$dir2"; \
-+ dir0=`echo "$$dir0" | $(SED) -e "$$sed_butlast"`; \
- else \
-- first2=`echo "$$dir2" | sed -e "$$sed_first"`; \
-+ first2=`echo "$$dir2" | $(SED) -e "$$sed_first"`; \
- if test "$$first2" = "$$first"; then \
-- dir2=`echo "$$dir2" | sed -e "$$sed_rest"`; \
-+ dir2=`echo "$$dir2" | $(SED) -e "$$sed_rest"`; \
- else \
- dir2="../$$dir2"; \
- fi; \
- dir0="$$dir0"/"$$first"; \
- fi; \
- fi; \
-- dir1=`echo "$$dir1" | sed -e "$$sed_rest"`; \
-+ dir1=`echo "$$dir1" | $(SED) -e "$$sed_rest"`; \
- done; \
- reldir="$$dir2"
- DIST_ARCHIVES = $(distdir).tar.gz
- GZIP_ENV = --best
- distuninstallcheck_listfiles = find . -type f -print
- am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
-- | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
-+ | $(SED) 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
- distcleancheck_listfiles = find . -type f -print
- ACLOCAL = @ACLOCAL@
- AMTAR = @AMTAR@
-@@ -443,7 +443,7 @@
- esac; \
- done; \
- dot_seen=no; \
-- target=`echo $@ | sed s/-recursive//`; \
-+ target=`echo $@ | $(SED) s/-recursive//`; \
- list='$(SUBDIRS)'; for subdir in $$list; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
-@@ -478,7 +478,7 @@
- fi; \
- done; \
- rev="$$rev ."; \
-- target=`echo $@ | sed s/-recursive//`; \
-+ target=`echo $@ | $(SED) s/-recursive//`; \
- for subdir in $$rev; do \
- echo "Making $$target in $$subdir"; \
- if test "$$subdir" = "."; then \
-@@ -566,21 +566,21 @@
</del><ins>+--- src/Makefile.in.orig 2014-03-06 23:32:58.000000000 +0900
++++ src/Makefile.in 2014-06-07 19:19:25.000000000 +0900
+@@ -132,27 +132,27 @@
+ CONFIG_HEADER = $(top_builddir)/include/config.h
+ CONFIG_CLEAN_FILES =
+ CONFIG_CLEAN_VPATH_FILES =
+-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
++am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | $(SED) 's|.|.|g'`;
+ am__vpath_adj = case $$p in \
+- $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
++ $(srcdir)/*) f=`echo "$$p" | $(SED) "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+-am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
++am__strip_dir = f=`echo $$p | $(SED) -e 's|^.*/||'`;
+ am__install_max = 40
+ am__nobase_strip_setup = \
+- srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
++ srcdirstrip=`echo "$(srcdir)" | $(SED) 's/[].[^$$\\*|]/\\\\&/g'`
+ am__nobase_strip = \
+- for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
++ for p in $$list; do echo "$$p"; done | $(SED) -e "s|$$srcdirstrip/||"
+ am__nobase_list = $(am__nobase_strip_setup); \
+ for p in $$list; do echo "$$p $$p"; done | \
+- sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
++ $(SED) "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+ $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+ if (++n[$$2] == $(am__install_max)) \
+ { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+ END { for (dir in files) print dir, files[dir] }'
+ am__base_list = \
+- sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+- sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
++ $(SED) '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
++ $(SED) '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+ am__uninstall_files_from_dir = { \
+ test -z "$$files" \
+ || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+@@ -506,7 +506,7 @@
+ clean-libLTLIBRARIES:
+ -test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
+ @list='$(lib_LTLIBRARIES)'; for p in $$list; do \
+- dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
++ dir="`echo $$p | $(SED) -e 's|/[^/]*$$||'`"; \
+ test "$$dir" != "$$p" || dir=.; \
+ echo "rm -f \"$${dir}/so_locations\""; \
+ rm -f "$${dir}/so_locations"; \
+@@ -662,21 +662,21 @@
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
</ins><span class="cx"> distdir: $(DISTFILES)
</span><del>- $(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
</del><span class="cx"> - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
</span><span class="cx"> - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
</span><span class="cx"> + @srcdirstrip=`echo "$(srcdir)" | $(SED) 's/[].[^$$\\*]/\\\\&/g'`; \
</span><span class="lines">@@ -82,21 +72,16 @@
</span><span class="cx"> if test -d "$(distdir)/$$file"; then \
</span><span class="cx"> find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
</span><span class="cx"> fi; \
</span><del>-@@ -691,7 +691,7 @@
- mkdir $(distdir)/_inst
- chmod a-w $(distdir)
- test -d $(distdir)/_build || exit 0; \
-- dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-+ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | $(SED) -e 's,^[^:\\/]:[\\/],/,'` \
- && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
- && am__cwd=`pwd` \
- && $(am__cd) $(distdir)/_build \
-@@ -723,7 +723,7 @@
- $(am__remove_distdir)
- @(echo "$(distdir) archives ready for distribution: "; \
- list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-- sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
-+ $(SED) -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
- distuninstallcheck:
- @test -n '$(distuninstallcheck_dir)' || { \
- echo 'ERROR: trying to run $@ with an empty' \
</del><ins>+@@ -819,10 +819,10 @@
+
+
+ xtinclude_Makefile.inc: Makefile
+- headers=`echo $(libyaxt_la_SOURCES) | sed 's/[ ][ ]*/\n/g' | grep 'xt/.*\.h$$'` ; \
++ headers=`echo $(libyaxt_la_SOURCES) | $(SED) 's/[ ][ ]*/\n/g' | grep 'xt/.*\.h$$'` ; \
+ echo "xtinclude_HEADERS = \\" >$@ ; \
+ for header in $$headers ; do echo " $$header \\" ; done \
+- | sed '$$s/\\$$//' >>$@
++ | $(SED) '$$s/\\$$//' >>$@
+
+ all-local: xtinclude_Makefile.inc
+
</ins></span></pre></div>
<a id="trunkdportsscienceyaxtfilespatchtestsMakefileindiff"></a>
<div class="addfile"><h4>Added: trunk/dports/science/yaxt/files/patch-tests-Makefile.in.diff (0 => 120809)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/yaxt/files/patch-tests-Makefile.in.diff (rev 0)
+++ trunk/dports/science/yaxt/files/patch-tests-Makefile.in.diff 2014-06-08 00:25:47 UTC (rev 120809)
</span><span class="lines">@@ -0,0 +1,11 @@
</span><ins>+--- tests/Makefile.in.orig 2014-03-06 23:32:58.000000000 +0900
++++ tests/Makefile.in 2014-06-08 09:05:44.000000000 +0900
+@@ -802,7 +802,7 @@
+ test_yaxt_SOURCES = test_yaxt.f90 ftest_common.f90
+ test_yaxt_LDADD = $(XT_FC_LDADD)
+ test_mpi_generate_datatype_SOURCES = test_mpi_generate_datatype.c tests.h
+-AM_CFLAGS = -I../inst_headers $(MPI_C_INCLUDE)
++AM_CPPFLAGS = -I../inst_headers $(MPI_C_INCLUDE)
+ AM_FCFLAGS = $(FC_MOD_FLAG)../inst_headers/f90 $(MPI_FC_INCLUDE) $(MPI_FC_MOD)
+ LDADD = libtestutil.a ../src/libyaxt.la $(MPI_C_LIB)
+ XT_FC_LDADD = libtestutil.a ../src/libyaxt.la $(MPI_FC_LIB)
</ins></span></pre>
</div>
</div>
</body>
</html>