diff options
| author |   Christian Faulhammer <opfer@gentoo.org> | 2008-05-09 20:25:37 +0000 |
|---|---|---|
| committer | Christian Faulhammer <opfer@gentoo.org> | 2008-05-09 20:25:37 +0000 |
| commit | e155bbfd928d53d7c3bbd42c7d3463e203072864 (patch) | |
| tree | 39cf0fa7322bad2096a02e8f3db0e9bbe7362781 /sci-visualization/gnuplot | |
| parent | extended DESCRIPTION, fixed a typo in a message and add patch for GCC 4.3, pr... (diff) | |
| download | gentoo-2-e155bbfd928d53d7c3bbd42c7d3463e203072864.tar.gz gentoo-2-e155bbfd928d53d7c3bbd42c7d3463e203072864.tar.bz2 gentoo-2-e155bbfd928d53d7c3bbd42c7d3463e203072864.zip | |
reworked patch for X application file by ulm
(Portage version: 2.1.4.4)
Diffstat (limited to 'sci-visualization/gnuplot')
| -rw-r--r-- | sci-visualization/gnuplot/ChangeLog | 9 | ||||
| -rw-r--r-- | sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch | 49 | ||||
| -rw-r--r-- | sci-visualization/gnuplot/gnuplot-4.2.3-r2.ebuild (renamed from sci-visualization/gnuplot/gnuplot-4.2.3-r1.ebuild) | 2 |
3 files changed, 42 insertions, 18 deletions
diff --git a/sci-visualization/gnuplot/ChangeLog b/sci-visualization/gnuplot/ChangeLog index c5a59a5b2d41..d2cbd9981b07 100644 --- a/sci-visualization/gnuplot/ChangeLog +++ b/sci-visualization/gnuplot/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for sci-visualization/gnuplot # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.70 2008/04/28 23:42:54 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/ChangeLog,v 1.71 2008/05/09 20:25:37 opfer Exp $ + +*gnuplot-4.2.3-r2 (09 May 2008) + + 09 May 2008; Christian Faulhammer <opfer@gentoo.org> + files/gnuplot-4.2.3-app-defaults.patch, -gnuplot-4.2.3-r1.ebuild, + +gnuplot-4.2.3-r2.ebuild: + reworked patch for X application file by ulm *gnuplot-4.2.3-r1 (28 Apr 2008) diff --git a/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch b/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch index 4000c4418d85..ac9a26135b0a 100644 --- a/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch +++ b/sci-visualization/gnuplot/files/gnuplot-4.2.3-app-defaults.patch @@ -1,33 +1,50 @@ +--- gnuplot-4.2.3-orig/configure.in 2008-03-04 19:36:53.000000000 +0100 ++++ gnuplot-4.2.3/configure.in 2008-04-26 11:44:59.000000000 +0200 +@@ -1024,6 +1024,10 @@ + fi + AC_SUBST(LISPDIR) + ++dnl Location of application defaults ++AC_ARG_VAR(appdefaultdir,[Directory for application defaults]) ++test -z "$appdefaultdir" && appdefaultdir='${sysconfdir}/X11/app-defaults' ++ + dnl Substitute variables + AC_SUBST(PACKAGE) + AC_SUBST(VERSION_MAJOR) --- gnuplot-4.2.3-orig/share/Makefile.am 2008-03-05 04:38:59.000000000 +0100 +++ gnuplot-4.2.3/share/Makefile.am 2008-04-26 11:44:59.000000000 +0200 -@@ -5,7 +5,7 @@ +@@ -5,8 +5,6 @@ SUBDIRS = LaTeX -appdefaultdir = $(libdir)/X11/app-defaults -+appdefaultdir = /etc/X11/app-defaults - +- APPDEFAULTFILES = Gnuplot ---- gnuplot-4.2.3-orig/share/Makefile.in 2008-03-08 21:06:28.000000000 +0100 -+++ gnuplot-4.2.3/share/Makefile.in 2008-04-26 11:45:11.000000000 +0200 -@@ -190,7 +190,7 @@ - AUTOMAKE_OPTIONS = foreign 1.2h - EXTRA_DIST = Gnuplot.app-defaults - SUBDIRS = LaTeX --appdefaultdir = $(libdir)/X11/app-defaults -+appdefaultdir = /etc/X11/app-defaults - APPDEFAULTFILES = Gnuplot appdefault_DATA = $(APPDEFAULTFILES) - CLEANFILES = $(APPDEFAULTFILES) +--- gnuplot-4.2.3-orig/src/Makefile.am 2007-08-26 19:50:20.000000000 +0200 ++++ gnuplot-4.2.3/src/Makefile.am 2008-04-26 11:44:59.000000000 +0200 +@@ -25,7 +25,10 @@ + noinst_PROGRAMS = bf_test + + XLIBS = @LIBRARIES_FOR_X@ +-AM_CPPFLAGS = -I../term -I$(top_srcdir)/term -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\" ++AM_CPPFLAGS = -I../term -I$(top_srcdir)/term \ ++ -DBINDIR=\"$(bindir)\" -DX11_DRIVER_DIR=\"$(X11_DRIVER_DIR)\" \ ++ -DGNUPLOT_PS_DIR=\"$(GNUPLOT_PS_DIR)\" -DAppDefDir=\"$(appdefaultdir)\" \ ++ -DCONTACT=\"$(EMAIL)\" -DHELPFILE=\"$(HELPFILE)\" + + gnuplot_SOURCES = alloc.c alloc.h ansichek.h axis.c axis.h \ + breaders.c breaders.h bitmap.c bitmap.h color.c color.h command.c \ --- gnuplot-4.2.3-orig/src/gplt_x11.c 2007-12-10 00:55:27.000000000 +0100 +++ gnuplot-4.2.3/src/gplt_x11.c 2008-04-26 11:45:18.000000000 +0200 -@@ -4787,7 +4787,7 @@ +@@ -4787,7 +4787,9 @@ */ #define On(v) ( !strncasecmp(v, "on", 2) || !strncasecmp(v, "true", 4) ) --#define AppDefDir "/usr/lib/X11/app-defaults" -+#define AppDefDir "/etc/X11/app-defaults" ++#ifndef AppDefDir + #define AppDefDir "/usr/lib/X11/app-defaults" ++#endif #ifndef MAXHOSTNAMELEN #define MAXHOSTNAMELEN 64 #endif diff --git a/sci-visualization/gnuplot/gnuplot-4.2.3-r1.ebuild b/sci-visualization/gnuplot/gnuplot-4.2.3-r2.ebuild index 7d01ca5816db..9374ebcef0ce 100644 --- a/sci-visualization/gnuplot/gnuplot-4.2.3-r1.ebuild +++ b/sci-visualization/gnuplot/gnuplot-4.2.3-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.3-r1.ebuild,v 1.1 2008/04/28 23:42:54 opfer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sci-visualization/gnuplot/gnuplot-4.2.3-r2.ebuild,v 1.1 2008/05/09 20:25:37 opfer Exp $ inherit eutils elisp-common multilib wxwidgets |