[120809] trunk/dports/science/yaxt
takeshi at macports.org
takeshi at macports.org
Sat Jun 7 17:25:47 PDT 2014
Revision: 120809
https://trac.macports.org/changeset/120809
Author: takeshi at macports.org
Date: 2014-06-07 17:25:47 -0700 (Sat, 07 Jun 2014)
Log Message:
-----------
yaxt: added patches to avoid using wrong headers
Modified Paths:
--------------
trunk/dports/science/yaxt/Portfile
trunk/dports/science/yaxt/files/patch-src-Makefile.in.diff
Added Paths:
-----------
trunk/dports/science/yaxt/files/patch-examples-Makefile.in.diff
trunk/dports/science/yaxt/files/patch-perf-Makefile.in.diff
trunk/dports/science/yaxt/files/patch-tests-Makefile.in.diff
Modified: trunk/dports/science/yaxt/Portfile
===================================================================
--- 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)
@@ -8,6 +8,7 @@
name yaxt
version 0.2.2
+revision 1
platforms darwin
maintainers takeshi openmaintainer
license BSD
@@ -22,7 +23,10 @@
checksums rmd160 3cf6d1251e48c175f511a5885c23ee06edacb3f7 \
sha256 6feb7185b397f7249f48ce10b7c60c457885eb7b67b7231dc08656c353e7e93b
-patchfiles patch-src-Makefile.in.diff
+patchfiles patch-src-Makefile.in.diff \
+ patch-tests-Makefile.in.diff \
+ patch-examples-Makefile.in.diff \
+ patch-perf-Makefile.in.diff
configure.cppflags-append -I../src
configure.fcflags-append -cpp
Added: trunk/dports/science/yaxt/files/patch-examples-Makefile.in.diff
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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
Added: trunk/dports/science/yaxt/files/patch-perf-Makefile.in.diff
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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
Modified: trunk/dports/science/yaxt/files/patch-src-Makefile.in.diff
===================================================================
--- 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)
@@ -1,64 +1,54 @@
---- 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 @@
+--- 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
+
distdir: $(DISTFILES)
- $(am__remove_distdir)
- test -d "$(distdir)" || mkdir "$(distdir)"
- @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
- topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ @srcdirstrip=`echo "$(srcdir)" | $(SED) 's/[].[^$$\\*]/\\\\&/g'`; \
@@ -82,21 +72,16 @@
if test -d "$(distdir)/$$file"; then \
find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
fi; \
-@@ -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' \
+@@ -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
+
Added: trunk/dports/science/yaxt/files/patch-tests-Makefile.in.diff
===================================================================
--- 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)
@@ -0,0 +1,11 @@
+--- 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)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140607/af2cbfa0/attachment.html>
More information about the macports-changes
mailing list