diff options
author | Ade Lovett <ade@FreeBSD.org> | 2010-09-23 00:40:50 +0000 |
---|---|---|
committer | Ade Lovett <ade@FreeBSD.org> | 2010-09-23 00:40:50 +0000 |
commit | 7e601a7ac60064742a52d96926ed3cee8ce64881 (patch) | |
tree | 3ddc25f33c95195f70f1d42605a718c541218fda /science/xmds | |
parent | - Update to 0.3.1 (diff) |
Purge 3 outdated, old-and-busted, versions of automake as part of
ongoing cleanup to find sanity in the world.
Feature safe: yes (surprisingly)
Notes
Notes:
svn path=/head/; revision=261660
Diffstat (limited to 'science/xmds')
-rw-r--r-- | science/xmds/Makefile | 4 | ||||
-rw-r--r-- | science/xmds/files/patch-Makefile.am | 16 | ||||
-rw-r--r-- | science/xmds/files/patch-Makefile.in | 82 |
3 files changed, 84 insertions, 18 deletions
diff --git a/science/xmds/Makefile b/science/xmds/Makefile index b873bc3e7c2f..b10288c72c58 100644 --- a/science/xmds/Makefile +++ b/science/xmds/Makefile @@ -17,8 +17,8 @@ COMMENT= XMDS is a code generator that integrates equations; MAN1= loadxsil.1 xmds.1 xsil2graphics.1 OPTIONS= FFTW3 "Use fftw3 instead of fftw2" Off -HAS_CONFIGURE= YES -USE_AUTOTOOLS= automake:16 + +GNU_CONFIGURE= yes .include <bsd.port.pre.mk> diff --git a/science/xmds/files/patch-Makefile.am b/science/xmds/files/patch-Makefile.am deleted file mode 100644 index df9d50658cfd..000000000000 --- a/science/xmds/files/patch-Makefile.am +++ /dev/null @@ -1,16 +0,0 @@ -Index: Makefile.am -=================================================================== ---- Makefile.am (revision 1829) -+++ Makefile.am (working copy) -@@ -55,8 +55,9 @@ - m4files = acx_mpi.m4 acx_pthread.m4 - - EXTRA_DIST = $(example_files) $(m4files) $(manfiles) MANIFEST README.Windows source/loadxsil.m --dist_doc_data = AUTHORS NEWS COPYING README README.Windows source/loadxsil.m --doc_examplesdir = ${docdir}/examples -+xmdsdocdir = ${datadir}/doc/xmds-${VERSION} -+dist_xmdsdoc_DATA = AUTHORS NEWS COPYING README README.Windows source/loadxsil.m -+doc_examplesdir = ${xmdsdocdir}/examples - dist_doc_examples_DATA = $(example_files) - - api: diff --git a/science/xmds/files/patch-Makefile.in b/science/xmds/files/patch-Makefile.in new file mode 100644 index 000000000000..04e7248ff066 --- /dev/null +++ b/science/xmds/files/patch-Makefile.in @@ -0,0 +1,82 @@ +--- Makefile.in.orig 2008-02-25 21:32:56.000000000 -0600 ++++ Makefile.in 2010-09-22 14:22:17.000000000 -0500 +@@ -150,4 +150,5 @@ + EXTRA_DIST = $(example_files) $(m4files) $(manfiles) MANIFEST README.Windows source/loadxsil.m +-dist_doc_data = AUTHORS NEWS COPYING README README.Windows source/loadxsil.m +-doc_examplesdir = ${docdir}/examples ++xmdsdocdir = ${datadir}/doc/xmds-${VERSION} ++dist_xmdsdoc_DATA = AUTHORS NEWS COPYING README README.Windows source/loadxsil.m ++doc_examplesdir = ${xmdsdocdir}/examples + dist_doc_examples_DATA = $(example_files) +@@ -162,3 +163,3 @@ + MANS = $(man1_MANS) +-DATA = $(dist_doc_examples_DATA) ++DATA = $(dist_doc_examples_DATA) $(dist_xmdsdoc_DATA) + +@@ -169,5 +170,5 @@ + uninstall-recursive check-recursive installcheck-recursive +-DIST_COMMON = README $(dist_doc_examples_DATA) AUTHORS COPYING \ +- ChangeLog INSTALL Makefile.am Makefile.in NEWS TODO \ +- acinclude.m4 aclocal.m4 config.guess config.sub configure \ ++DIST_COMMON = README $(dist_doc_examples_DATA) $(dist_xmdsdoc_DATA) \ ++ AUTHORS COPYING ChangeLog INSTALL Makefile.am Makefile.in NEWS \ ++ TODO acinclude.m4 aclocal.m4 config.guess config.sub configure \ + configure.in depcomp install-sh ltmain.sh missing mkinstalldirs +@@ -255,2 +256,20 @@ + done ++dist_xmdsdocDATA_INSTALL = $(INSTALL_DATA) ++install-dist_xmdsdocDATA: $(dist_xmdsdoc_DATA) ++ @$(NORMAL_INSTALL) ++ $(mkinstalldirs) $(DESTDIR)$(xmdsdocdir) ++ @list='$(dist_xmdsdoc_DATA)'; for p in $$list; do \ ++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " $(dist_xmdsdocDATA_INSTALL) $$d$$p $(DESTDIR)$(xmdsdocdir)/$$f"; \ ++ $(dist_xmdsdocDATA_INSTALL) $$d$$p $(DESTDIR)$(xmdsdocdir)/$$f; \ ++ done ++ ++uninstall-dist_xmdsdocDATA: ++ @$(NORMAL_UNINSTALL) ++ @list='$(dist_xmdsdoc_DATA)'; for p in $$list; do \ ++ f="`echo $$p | sed -e 's|^.*/||'`"; \ ++ echo " rm -f $(DESTDIR)$(xmdsdocdir)/$$f"; \ ++ rm -f $(DESTDIR)$(xmdsdocdir)/$$f; \ ++ done + +@@ -458,3 +477,3 @@ + installdirs-am: +- $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(doc_examplesdir) ++ $(mkinstalldirs) $(DESTDIR)$(man1dir) $(DESTDIR)$(doc_examplesdir) $(DESTDIR)$(xmdsdocdir) + +@@ -500,3 +519,4 @@ + +-install-data-am: install-dist_doc_examplesDATA install-man ++install-data-am: install-dist_doc_examplesDATA install-dist_xmdsdocDATA \ ++ install-man + +@@ -519,4 +539,4 @@ + +-uninstall-am: uninstall-dist_doc_examplesDATA uninstall-info-am \ +- uninstall-man ++uninstall-am: uninstall-dist_doc_examplesDATA uninstall-dist_xmdsdocDATA \ ++ uninstall-info-am uninstall-man + +@@ -532,10 +552,12 @@ + install-data-recursive install-dist_doc_examplesDATA \ +- install-exec install-exec-am install-exec-recursive \ +- install-info install-info-am install-info-recursive install-man \ +- install-man1 install-recursive install-strip installcheck \ +- installcheck-am installdirs installdirs-am \ +- installdirs-recursive maintainer-clean maintainer-clean-generic \ ++ install-dist_xmdsdocDATA install-exec install-exec-am \ ++ install-exec-recursive install-info install-info-am \ ++ install-info-recursive install-man install-man1 \ ++ install-recursive install-strip installcheck installcheck-am \ ++ installdirs installdirs-am installdirs-recursive \ ++ maintainer-clean maintainer-clean-generic \ + maintainer-clean-recursive mostlyclean mostlyclean-generic \ + mostlyclean-recursive tags tags-recursive uninstall \ +- uninstall-am uninstall-dist_doc_examplesDATA uninstall-info-am \ ++ uninstall-am uninstall-dist_doc_examplesDATA \ ++ uninstall-dist_xmdsdocDATA uninstall-info-am \ + uninstall-info-recursive uninstall-man uninstall-man1 \ |