Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7161375 Update gnuplot to version 4.6.0
authorRich Burridge <rich.burridge@oracle.com>
Wed, 18 Apr 2012 11:08:05 -0700
changeset 778 9d5e4d6466cd
parent 777 e2e604cdbd6a
child 779 0efb89d4efa5
7161375 Update gnuplot to version 4.6.0
components/gnuplot/Makefile file | annotate | diff | comparison | revisions
components/gnuplot/gnuplot.license file | annotate | diff | comparison | revisions
components/gnuplot/gnuplot.p5m file | annotate | diff | comparison | revisions
components/gnuplot/patches/libpng12.patch file | annotate | diff | comparison | revisions 
--- a/components/gnuplot/Makefile	Wed Apr 18 10:38:45 2012 -0700
+++ b/components/gnuplot/Makefile	Wed Apr 18 11:08:05 2012 -0700
@@ -28,11 +28,11 @@
 LD_Z_IGNORE=
 
 COMPONENT_NAME=		gnuplot
-COMPONENT_VERSION=	4.4.4
+COMPONENT_VERSION=	4.6.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_PROJECT_URL=  http://gnuplot.info/
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
-COMPONENT_ARCHIVE_HASH= sha1:d4f143eade1f8d8b27be44cbda431d37a71c6a31
+COMPONENT_ARCHIVE_HASH= sha1:9a43ae13546d97d4b174533ddac31a14e0edc9b2
 COMPONENT_ARCHIVE_URL=  http://sourceforge.net/projects/$(COMPONENT_NAME)/files/$(COMPONENT_NAME)/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)/download
 
 COMPONENT_BUILD_TARGETS = all info
--- a/components/gnuplot/gnuplot.license	Wed Apr 18 10:38:45 2012 -0700
+++ b/components/gnuplot/gnuplot.license	Wed Apr 18 11:08:05 2012 -0700
@@ -1,3 +1,7 @@
+-----------------
+- gnuplot 4.6.0 -
+-----------------
+
 Oracle elects to use only the GNU Lesser General Public License version
 2.1 (LGPL)/GNU General Public License version 2 (GPL) for any software
 where a choice of LGPL/GPL license versions are made available with the
--- a/components/gnuplot/gnuplot.p5m	Wed Apr 18 10:38:45 2012 -0700
+++ b/components/gnuplot/gnuplot.p5m	Wed Apr 18 11:08:05 2012 -0700
@@ -38,18 +38,18 @@
 dir path=usr/demo/gnuplot
 dir path=usr/lib
 dir path=usr/lib/gnuplot
-dir path=usr/lib/gnuplot/4.4
+dir path=usr/lib/gnuplot/4.6
 dir path=usr/share
 dir path=usr/share/X11
 dir path=usr/share/X11/app-defaults
 dir path=usr/share/emacs
 dir path=usr/share/emacs/site-lisp
 dir path=usr/share/gnuplot
-dir path=usr/share/gnuplot/4.4
-dir path=usr/share/gnuplot/4.4/PostScript
-dir path=usr/share/gnuplot/4.4/app-defaults
-dir path=usr/share/gnuplot/4.4/js
-dir path=usr/share/gnuplot/4.4/lua
+dir path=usr/share/gnuplot/4.6
+dir path=usr/share/gnuplot/4.6/PostScript
+dir path=usr/share/gnuplot/4.6/app-defaults
+dir path=usr/share/gnuplot/4.6/js
+dir path=usr/share/gnuplot/4.6/lua
 dir path=usr/share/info
 dir path=usr/share/man
 dir path=usr/share/man/man1
@@ -214,43 +214,50 @@
 file path=usr/demo/gnuplot/world.dat
 file path=usr/demo/gnuplot/world.dem
 file path=usr/demo/gnuplot/world2.dem
-file path=usr/lib/gnuplot/4.4/gnuplot_x11 mode=555
+file path=usr/lib/gnuplot/4.6/gnuplot_x11 mode=555
 file path=usr/share/emacs/site-lisp/gnuplot-gui.el
 file path=usr/share/emacs/site-lisp/gnuplot-gui.elc
 file path=usr/share/emacs/site-lisp/gnuplot.el
 file path=usr/share/emacs/site-lisp/gnuplot.elc
 file path=usr/share/emacs/site-lisp/info-look.20.2.el
 file path=usr/share/emacs/site-lisp/info-look.20.3.el
-file path=usr/share/gnuplot/4.4/PostScript/8859-1.ps
-file path=usr/share/gnuplot/4.4/PostScript/8859-15.ps
-file path=usr/share/gnuplot/4.4/PostScript/8859-2.ps
-file path=usr/share/gnuplot/4.4/PostScript/8859-9.ps
-file path=usr/share/gnuplot/4.4/PostScript/aglfn.txt
-file path=usr/share/gnuplot/4.4/PostScript/cp1250.ps
-file path=usr/share/gnuplot/4.4/PostScript/cp437.ps
-file path=usr/share/gnuplot/4.4/PostScript/cp850.ps
-file path=usr/share/gnuplot/4.4/PostScript/cp852.ps
-file path=usr/share/gnuplot/4.4/PostScript/koi8r.ps
-file path=usr/share/gnuplot/4.4/PostScript/koi8u.ps
-file path=usr/share/gnuplot/4.4/PostScript/prologue.ps
-file path=usr/share/gnuplot/4.4/PostScript/utf-8.ps
-file path=usr/share/gnuplot/4.4/app-defaults/Gnuplot
-file path=usr/share/gnuplot/4.4/gnuplot.gih
-file path=usr/share/gnuplot/4.4/js/README
-file path=usr/share/gnuplot/4.4/js/canvasmath.js
-file path=usr/share/gnuplot/4.4/js/canvastext.js
-file path=usr/share/gnuplot/4.4/js/gnuplot_common.js
-file path=usr/share/gnuplot/4.4/js/gnuplot_mouse.css
-file path=usr/share/gnuplot/4.4/js/gnuplot_mouse.js
-file path=usr/share/gnuplot/4.4/js/grid.png
-file path=usr/share/gnuplot/4.4/js/help.png
-file path=usr/share/gnuplot/4.4/js/nextzoom.png
-file path=usr/share/gnuplot/4.4/js/previouszoom.png
-file path=usr/share/gnuplot/4.4/js/textzoom.png
-file path=usr/share/gnuplot/4.4/lua/gnuplot-tikz.lua
+file path=usr/share/gnuplot/4.6/PostScript/8859-1.ps
+file path=usr/share/gnuplot/4.6/PostScript/8859-15.ps
+file path=usr/share/gnuplot/4.6/PostScript/8859-2.ps
+file path=usr/share/gnuplot/4.6/PostScript/8859-9.ps
+file path=usr/share/gnuplot/4.6/PostScript/aglfn.txt
+file path=usr/share/gnuplot/4.6/PostScript/cp1250.ps
+file path=usr/share/gnuplot/4.6/PostScript/cp1251.ps
+file path=usr/share/gnuplot/4.6/PostScript/cp437.ps
+file path=usr/share/gnuplot/4.6/PostScript/cp850.ps
+file path=usr/share/gnuplot/4.6/PostScript/cp852.ps
+file path=usr/share/gnuplot/4.6/PostScript/koi8r.ps
+file path=usr/share/gnuplot/4.6/PostScript/koi8u.ps
+file path=usr/share/gnuplot/4.6/PostScript/prologue.ps
+file path=usr/share/gnuplot/4.6/PostScript/utf-8.ps
+file path=usr/share/gnuplot/4.6/app-defaults/Gnuplot
+file path=usr/share/gnuplot/4.6/colors_default.gp
+file path=usr/share/gnuplot/4.6/colors_mono.gp
+file path=usr/share/gnuplot/4.6/colors_podo.gp
+file path=usr/share/gnuplot/4.6/gnuplot.gih
+file path=usr/share/gnuplot/4.6/gnuplotrc
+file path=usr/share/gnuplot/4.6/js/README
+file path=usr/share/gnuplot/4.6/js/canvasmath.js
+file path=usr/share/gnuplot/4.6/js/canvastext.js
+file path=usr/share/gnuplot/4.6/js/gnuplot_common.js
+file path=usr/share/gnuplot/4.6/js/gnuplot_dashedlines.js
+file path=usr/share/gnuplot/4.6/js/gnuplot_mouse.css
+file path=usr/share/gnuplot/4.6/js/gnuplot_mouse.js
+file path=usr/share/gnuplot/4.6/js/gnuplot_svg.js
+file path=usr/share/gnuplot/4.6/js/grid.png
+file path=usr/share/gnuplot/4.6/js/help.png
+file path=usr/share/gnuplot/4.6/js/nextzoom.png
+file path=usr/share/gnuplot/4.6/js/previouszoom.png
+file path=usr/share/gnuplot/4.6/js/textzoom.png
+file path=usr/share/gnuplot/4.6/lua/gnuplot-tikz.lua
 file path=usr/share/info/gnuplot.info
 file path=usr/share/man/man1/gnuplot.1 mangler.man.stability=uncommitted
-link path=usr/share/X11/app-defaults/Gnuplot target=../../gnuplot/4.4/app-defaults/Gnuplot
+link path=usr/share/X11/app-defaults/Gnuplot target=../../gnuplot/4.6/app-defaults/Gnuplot
 
 # Add some dependencies that pkg is not finding
 
--- a/components/gnuplot/patches/libpng12.patch	Wed Apr 18 10:38:45 2012 -0700
+++ b/components/gnuplot/patches/libpng12.patch	Wed Apr 18 11:08:05 2012 -0700
@@ -1,22 +1,22 @@
---- gnuplot-4.4.0/src/Makefile.am.orig	Fri Mar  5 18:09:39 2010
-+++ gnuplot-4.4.0/src/Makefile.am	Tue Apr 19 15:59:18 2011
-@@ -51,7 +51,7 @@
+--- gnuplot-4.6.0/src/Makefile.am.orig	2012-04-14 17:52:42.203033478 -0700
++++ gnuplot-4.6.0/src/Makefile.am	2012-04-14 17:53:57.604828972 -0700
+@@ -57,7 +57,7 @@
  template.h term_api.h term.c term.h time.c unset.c util.c util.h \
  util3d.c util3d.h variable.c variable.h version.c version.h
  
--gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS)
-+gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g)
+-gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS)
++gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g)
  
  pkglibexec_PROGRAMS = 
  
---- gnuplot-4.4.0/src/Makefile.in.orig	Sat Mar 13 13:20:04 2010
-+++ gnuplot-4.4.0/src/Makefile.in	Tue Apr 19 16:46:03 PDT 2011
-@@ -347,7 +347,7 @@
- 	template.h term_api.h term.c term.h time.c unset.c util.c \
- 	util.h util3d.c util3d.h variable.c variable.h version.c \
- 	version.h $(am__append_2) $(am__append_3)
--gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS)
-+gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g)
- @BUILD_GNUPLOT_X11_TRUE@gnuplot_x11_SOURCES = gplt_x11.c gplt_x11.h gpexecute.c gpexecute.h mousecmn.h
+--- gnuplot-4.6.0/src/Makefile.in.orig	2012-04-14 17:55:00.314759690 -0700
++++ gnuplot-4.6.0/src/Makefile.in	2012-04-14 17:55:41.703140495 -0700
+@@ -431,7 +431,7 @@
+ 	util.c util.h util3d.c util3d.h variable.c variable.h \
+ 	version.c version.h $(am__append_2) $(am__append_3) \
+ 	$(am__append_4) $(am__append_6)
+-gnuplot_LDADD = $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS)
++gnuplot_LDADD = $(shell echo -lpng $(TERMLIBS) $(TERMXLIBS) $(WX_LIBS) $(QT_LIBS) | sed -e s,-lpng[0123456789]*,-lpng12,g)
+ @BUILD_GNUPLOT_X11_TRUE@gnuplot_x11_SOURCES = gplt_x11.c gplt_x11.h gpexecute.c gpexecute.h mousecmn.h version.c version.h
  @BUILD_GNUPLOT_X11_TRUE@XLIBS = @LIBRARIES_FOR_X@
  @BUILD_GNUPLOT_X11_TRUE@gnuplot_x11_LDADD = getcolor_x11.o $(XLIBS)
upstream/oracle/userland-gate