summaryrefslogtreecommitdiff
path: root/math/gnuplot/files
diff options
context:
space:
mode:
Diffstat (limited to 'math/gnuplot/files')
-rw-r--r--math/gnuplot/files/patch-configure108
-rw-r--r--math/gnuplot/files/patch-docs-Makefile.in58
2 files changed, 0 insertions, 166 deletions
diff --git a/math/gnuplot/files/patch-configure b/math/gnuplot/files/patch-configure
deleted file mode 100644
index e13ef060cef1..000000000000
--- a/math/gnuplot/files/patch-configure
+++ /dev/null
@@ -1,108 +0,0 @@
---- configure.orig 2014-09-22 03:26:10.000000000 +0900
-+++ configure 2014-12-06 14:27:21.000000000 +0900
-@@ -5982,7 +5982,7 @@
- fi
-
-
--if test "${build}" != "${host}"
-+if test "$cross_compiling" != no
- then
- CC=${CC-${host_alias-gcc}}
- CFLAGS=${CFLAGS-"-g -O2"}
-@@ -10844,12 +10844,12 @@
- pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1" 2>/dev/null`
-+ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-${LUA_VER}" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -10862,12 +10862,12 @@
- pkg_cv_LUA_LIBS="$LUA_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1" 2>/dev/null`
-+ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-${LUA_VER}" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -10886,9 +10886,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1"`
-+ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-${LUA_VER}"`
- else
-- LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1"`
-+ LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-${LUA_VER}"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LUA_PKG_ERRORS" >&5
-@@ -10920,12 +10920,12 @@
- pkg_cv_LUA_CFLAGS="$LUA_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua5.1" 2>/dev/null`
-+ pkg_cv_LUA_CFLAGS=`$PKG_CONFIG --cflags "lua-${LUA_VER}" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -10938,12 +10938,12 @@
- pkg_cv_LUA_LIBS="$LUA_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
-- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua5.1\""; } >&5
-- ($PKG_CONFIG --exists --print-errors "lua5.1") 2>&5
-+ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lua-${LUA_VER}\""; } >&5
-+ ($PKG_CONFIG --exists --print-errors "lua-${LUA_VER}") 2>&5
- ac_status=$?
- $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
- test $ac_status = 0; }; then
-- pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua5.1" 2>/dev/null`
-+ pkg_cv_LUA_LIBS=`$PKG_CONFIG --libs "lua-${LUA_VER}" 2>/dev/null`
- else
- pkg_failed=yes
- fi
-@@ -10962,9 +10962,9 @@
- _pkg_short_errors_supported=no
- fi
- if test $_pkg_short_errors_supported = yes; then
-- LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua5.1"`
-+ LUA_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "lua-${LUA_VER}"`
- else
-- LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua5.1"`
-+ LUA_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "lua-${LUA_VER}"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$LUA_PKG_ERRORS" >&5
-@@ -11024,7 +11024,7 @@
- return 0;
- }
- _ACEOF
--for ac_lib in '' lua lua5.1; do
-+for ac_lib in '' lua lua-${LUA_VER}; do
- if test -z "$ac_lib"; then
- ac_res="none required"
- else
diff --git a/math/gnuplot/files/patch-docs-Makefile.in b/math/gnuplot/files/patch-docs-Makefile.in
deleted file mode 100644
index 1cc396eba7e5..000000000000
--- a/math/gnuplot/files/patch-docs-Makefile.in
+++ /dev/null
@@ -1,58 +0,0 @@
---- docs/Makefile.in.orig 2013-09-23 16:16:41.000000000 -0700
-+++ docs/Makefile.in 2014-04-12 20:11:45.000000000 -0700
-@@ -395,15 +395,15 @@
- # Thanks to Bruce Ravel for doc2texi.el!
- gnuplot.texi $(srcdir)/gnuplot-eldoc.el $(srcdir)/gnuplot-eldoc.elc: $(srcdir)/doc2texi.el $(srcdir)/gnuplot.doc
- @echo "Creating texinfo and eldoc strings file"
-- @if test "$(EMACS)" != no; then \
-- test "$(top_srcdir)" = "$(top_builddir)" || echo "COPYING GNUPLOT.DOC" ; \
-- test "$(top_srcdir)" = "$(top_builddir)" || cp $(srcdir)/gnuplot.doc . ; \
-- $(EMACS) -batch -q --no-site-file -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi ; \
-- echo "Compiling gnuplot-eldoc.el" ; \
-- $(EMACS) -batch -q --no-site-file -f batch-byte-compile gnuplot-eldoc.el ; \
-- else \
-- echo "No emacs found - cannot create texinfo file" ; \
-- fi
-+# @if test "$(EMACS)" != no; then \
-+# test "$(top_srcdir)" = "$(top_builddir)" || echo "COPYING GNUPLOT.DOC" ; \
-+# test "$(top_srcdir)" = "$(top_builddir)" || cp $(srcdir)/gnuplot.doc . ; \
-+# $(EMACS) -batch -q --no-site-file -l $(srcdir)/doc2texi.el -f d2t-doc-to-texi ; \
-+# echo "Compiling gnuplot-eldoc.el" ; \
-+# $(EMACS) -batch -q --no-site-file -f batch-byte-compile gnuplot-eldoc.el ; \
-+# else \
-+# echo "No emacs found - cannot create texinfo file" ; \
-+# fi
-
-
- # this is how to make OS/2 ipfc documentation
-@@ -463,18 +463,18 @@
- $(INSTALL_DATA) gnuplot.pdf $(DESTDIR)$(GIHDIR)/gnuplot.pdf; \
- fi
-
--install-info: gnuplot.info gnuplot-eldoc.el gnuplot-eldoc.elc
-- @if test "$(EMACS)" != no; then \
-- $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir) $(DESTDIR)$(lispdir); \
-- $(INSTALL_DATA) gnuplot.info $(DESTDIR)$(infodir)/gnuplot.info; \
-- $(INSTALL_DATA) gnuplot-eldoc.el $(DESTDIR)$(lispdir)/gnuplot-eldoc.el; \
-- $(INSTALL_DATA) gnuplot-eldoc.elc $(DESTDIR)$(lispdir)/gnuplot-eldoc.elc; \
-- else : ; fi
-- @if (test "$(EMACS)" != no && install-info --version && \
-- install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
-- echo "install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info";\
-- install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info || :;\
-- else : ; fi
-+install-info:
-+# @if test "$(EMACS)" != no; then \
-+# $(top_srcdir)/mkinstalldirs $(DESTDIR)$(infodir) $(DESTDIR)$(lispdir); \
-+# $(INSTALL_DATA) gnuplot.info $(DESTDIR)$(infodir)/gnuplot.info; \
-+# $(INSTALL_DATA) gnuplot-eldoc.el $(DESTDIR)$(lispdir)/gnuplot-eldoc.el; \
-+# $(INSTALL_DATA) gnuplot-eldoc.elc $(DESTDIR)$(lispdir)/gnuplot-eldoc.elc; \
-+# else : ; fi
-+# @if (test "$(EMACS)" != no && install-info --version && \
-+# install-info --version | fgrep -i -v debian) >/dev/null 2>&1; then \
-+# echo "install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info";\
-+# install-info --info-dir=$(DESTDIR)$(infodir) $(DESTDIR)$(infodir)/gnuplot.info || :;\
-+# else : ; fi
-
- installcheck:
-