diff options
| author | Maho Nakata <maho@FreeBSD.org> | 2008-08-22 20:59:15 +0000 |
|---|---|---|
| committer | Maho Nakata <maho@FreeBSD.org> | 2008-08-22 20:59:15 +0000 |
| commit | ad0a58d3283e844f8e16954fd10cb10a6a8e0bfa (patch) | |
| tree | 5aa31e89c6c11417838da2c0eba40d5aa815dd8c /math/octave-devel/files | |
| parent | - Update to 4.18.6 (diff) | |
Update to 3.1.51.
Diffstat (limited to 'math/octave-devel/files')
| -rw-r--r-- | math/octave-devel/files/patch-examples+Makefile.in | 12 | ||||
| -rw-r--r-- | math/octave-devel/files/patch-scripts+pkg+pkg.m | 11 | ||||
| -rw-r--r-- | math/octave-devel/files/patch-src+Makefile.in | 13 |
3 files changed, 17 insertions, 19 deletions
diff --git a/math/octave-devel/files/patch-examples+Makefile.in b/math/octave-devel/files/patch-examples+Makefile.in index 8e1f7cf4dbdc..177e7d8cc6c6 100644 --- a/math/octave-devel/files/patch-examples+Makefile.in +++ b/math/octave-devel/files/patch-examples+Makefile.in @@ -1,17 +1,17 @@ ---- examples/Makefile.in~ Wed Dec 14 12:13:54 2005 -+++ examples/Makefile.in Wed Jul 5 12:59:06 2006 -@@ -51,10 +51,10 @@ +--- examples/Makefile.in~ 2008-07-22 00:59:03.000000000 +0900 ++++ examples/Makefile.in 2008-08-23 05:46:34.000000000 +0900 +@@ -95,10 +95,10 @@ rm -f $(DESTDIR)$(imagedir)/$$f; \ $(INSTALL_DATA) $(srcdir)/$$f $(DESTDIR)$(imagedir)/$$f; \ done -- if test -n "$(DESKTOP_FILE_INSTALL)"; then \ +- -if test -n "$(DESKTOP_FILE_INSTALL)"; then \ - $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \ - --vendor www.octave.org octave.desktop; \ - fi -+# if test -n "$(DESKTOP_FILE_INSTALL)"; then \ ++# -if test -n "$(DESKTOP_FILE_INSTALL)"; then \ +# $(DESKTOP_FILE_INSTALL) --dir=$(DESTDIR)$(datadir)/applications \ +# --vendor www.octave.org octave.desktop; \ +# fi .PHONY: install install-strip - tags: + uninstall: diff --git a/math/octave-devel/files/patch-scripts+pkg+pkg.m b/math/octave-devel/files/patch-scripts+pkg+pkg.m new file mode 100644 index 000000000000..ce7a5d1655cb --- /dev/null +++ b/math/octave-devel/files/patch-scripts+pkg+pkg.m @@ -0,0 +1,11 @@ +--- scripts/pkg/pkg.m~ 2008-07-22 00:59:05.000000000 +0900 ++++ scripts/pkg/pkg.m 2008-08-23 05:47:31.000000000 +0900 +@@ -1242,7 +1242,7 @@ + ## make + if (exist (fullfile (src, "Makefile"), "file")) + [status, output] = shell (cstrcat ("export INSTALLDIR=\"", desc.dir, +- "\"; make -C ", src)); ++ "\"; gmake -C ", src)); + if (status != 0) + rm_rf (desc.dir); + error ("'make' returned the following error: %s", output); diff --git a/math/octave-devel/files/patch-src+Makefile.in b/math/octave-devel/files/patch-src+Makefile.in deleted file mode 100644 index 5da6b5d58a88..000000000000 --- a/math/octave-devel/files/patch-src+Makefile.in +++ /dev/null @@ -1,13 +0,0 @@ -for gendoc part, http://gcc.gnu.org/bugzilla/show_bug.cgi?id=30423 - ---- src/Makefile.in.orig Sat Sep 30 03:20:15 2006 -+++ src/Makefile.in Wed Jan 10 19:26:54 2007 -@@ -313,7 +313,7 @@ - $(OCTAVE_LIBS) \ - $(LEXLIB) $(UMFPACK_LIBS) $(AMD_LIBS) $(COLAMD_LIBS) \ - $(CHOLMOD_LIBS) $(CCOLAMD_LIBS) $(CXSPARSE_LIBS) $(BLAS_LIBS) \ -- $(FFTW_LIBS) $(LIBS) $(FLIBS) -+ $(FFTW_LIBS) $(LIBS) $(FLIBS) -lcamd - - stmp-pic: pic - @if [ -f stmp-pic ]; then \ |