aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristoph Junghans <kleiner_otti@gmx.de>2009-11-02 22:21:05 +0100
committerChristoph Junghans <kleiner_otti@gmx.de>2009-11-02 22:21:05 +0100
commit849fb6f1c1f420621d72e3d41d54327e03742a80 (patch)
tree61780384b3a7a78516fa90cda54fc52ada476f3d /sci-visualization/gnuplot/files
parentupdate package.mask for gnuplot-4.5.9999 (diff)
downloadsci-849fb6f1c1f420621d72e3d41d54327e03742a80.tar.gz
sci-849fb6f1c1f420621d72e3d41d54327e03742a80.tar.bz2
sci-849fb6f1c1f420621d72e3d41d54327e03742a80.zip
sci-visualization/gnuplot: version bump to 4.5.9999
(Portage version: 2.1.6.13/git/Linux i686) (Signed Manifest commit)
Diffstat (limited to 'sci-visualization/gnuplot/files')
-rw-r--r--sci-visualization/gnuplot/files/gnuplot-4.5.9999-app-defaults.patch (renamed from sci-visualization/gnuplot/files/gnuplot-4.3.9999-app-defaults.patch)0
-rw-r--r--sci-visualization/gnuplot/files/gnuplot-4.5.9999-gentoo-version.patch (renamed from sci-visualization/gnuplot/files/gnuplot-4.3.9999-gentoo-version.patch)47
2 files changed, 24 insertions, 23 deletions
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.3.9999-app-defaults.patch b/sci-visualization/gnuplot/files/gnuplot-4.5.9999-app-defaults.patch
index 650858e30..650858e30 100644
--- a/sci-visualization/gnuplot/files/gnuplot-4.3.9999-app-defaults.patch
+++ b/sci-visualization/gnuplot/files/gnuplot-4.5.9999-app-defaults.patch
diff --git a/sci-visualization/gnuplot/files/gnuplot-4.3.9999-gentoo-version.patch b/sci-visualization/gnuplot/files/gnuplot-4.5.9999-gentoo-version.patch
index da95153f0..f3ecf426d 100644
--- a/sci-visualization/gnuplot/files/gnuplot-4.3.9999-gentoo-version.patch
+++ b/sci-visualization/gnuplot/files/gnuplot-4.5.9999-gentoo-version.patch
@@ -1,11 +1,11 @@
Add special version identification and Gentoo contact information,
in order to fulfil provisions 2 through 4 of the gnuplot licence.
---- gnuplot-orig/src/plot.c
-+++ gnuplot/src/plot.c
-@@ -376,9 +376,11 @@
- " -V, --version\n"
+--- src/plot.c 31 Oct 2009 03:22:37 -0000 1.105
++++ src/plot.c 2 Nov 2009 20:08:59 -0000
+@@ -374,9 +374,11 @@
" -h, --help\n"
+ " -p --persist\n"
" -e \"command1; command2; ...\"\n"
- "gnuplot %s patchlevel %s\n"
- "Report bugs to %s\n",
@@ -16,10 +16,10 @@ in order to fulfil provisions 2 through 4 of the gnuplot licence.
+ gnuplot_version, gnuplot_patchlevel, gentoo_revision,
+ gentoo_bugtracker, bug_email);
return 0;
- }
- }
---- gnuplot-orig/src/show.c
-+++ gnuplot/src/show.c
+
+ } else if (!strncmp(argv[i], "-persist", 2) || !strcmp(argv[i], "--persist")) {
+--- src/show.c 31 Oct 2009 21:58:47 -0000 1.228
++++ src/show.c 2 Nov 2009 20:09:00 -0000
@@ -1015,7 +1015,7 @@
fprintf(fp, "%s\n\
@@ -29,11 +29,12 @@ in order to fulfil provisions 2 through 4 of the gnuplot licence.
%s\tlast modified %s\n\
%s\tSystem: %s %s\n\
%s\n\
-@@ -1026,10 +1026,11 @@
- %s\tThe gnuplot FAQ is available from %s\n\
- %s\n\
- %s\tSend bug reports and suggestions to <%s>\n\
-+%s\tor to <%s>\n\
+@@ -1027,11 +1027,12 @@
+ %s\tgnuplot home: http://www.gnuplot.info\n\
+ %s\tgnuplot FAQ: FAQ.pdf and %s\n\
+ %s\treport bugs: http://sf.net/projects/gnuplot/support\n\
++%s\tgentoo bugs: %s\n\
+ %s\tmailing list: %s\n\
%s\n",
p, /* empty line */
p, PROGRAM,
@@ -42,16 +43,16 @@ in order to fulfil provisions 2 through 4 of the gnuplot licence.
p, gnuplot_date,
p, os_name, os_rel,
p, /* empty line */
-@@ -1042,6 +1043,7 @@
- p, /* FAQ is at */
- p, faq_location,
+@@ -1043,6 +1044,7 @@
+ p, /* empty line */
+ p, faq_location, /* FAQ */
p, /* empty line */
+ p, gentoo_bugtracker,
- p, help_email,
- p, bug_email,
+ p, help_email, /* mailing list */
p); /* empty line */
---- gnuplot-orig/src/version.c
-+++ gnuplot/src/version.c
+
+--- src/version.c 18 Oct 2009 21:10:06 -0000 1.93
++++ src/version.c 2 Nov 2009 20:09:00 -0000
@@ -46,6 +46,9 @@
const char faq_location[] = FAQ_LOCATION;
@@ -61,9 +62,9 @@ in order to fulfil provisions 2 through 4 of the gnuplot licence.
+
char *compile_options = (void *)0; /* Will be loaded at runtime */
- #define RELEASE_VERSION 1
---- gnuplot-orig/src/version.h
-+++ gnuplot/src/version.h
+ /* #define RELEASE_VERSION 1 */
+--- src/version.h 5 Aug 2006 21:33:15 -0000 1.5
++++ src/version.h 2 Nov 2009 20:09:00 -0000
@@ -47,6 +47,9 @@
extern const char bug_email[];
extern const char help_email[];