23086301 Upgrade gnuplot to 5.0 or newer
authorDavid Marx <David.M.Marx@Oracle.Com>
Fri, 24 Jun 2016 16:19:17 -0700
changeset 6280 203b97a7f889
parent 6279 b8986042dd84
child 6281 801ca85e3dc9
23086301 Upgrade gnuplot to 5.0 or newer
components/gnuplot/Makefile
components/gnuplot/README
components/gnuplot/gnuplot.license
components/gnuplot/gnuplot.p5m
components/gnuplot/patches/arial.patch
components/gnuplot/patches/texinfo.patch
components/gnuplot/patches/wxWidgets3-exit.patch
components/gnuplot/patches/wxWidgets3.patch
components/gnuplot/rundemo
components/gnuplot/runtcldemo
--- a/components/gnuplot/Makefile	Fri Jun 24 11:30:54 2016 -0700
+++ b/components/gnuplot/Makefile	Fri Jun 24 16:19:17 2016 -0700
@@ -29,16 +29,13 @@
 LD_Z_IGNORE=
 
 COMPONENT_NAME=		gnuplot
-COMPONENT_VERSION=	4.6.0
-COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
+COMPONENT_VERSION=	5.0.3
 COMPONENT_PROJECT_URL=  http://gnuplot.info/
-COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tar.gz
 COMPONENT_ARCHIVE_HASH= \
-    sha256:6e60adb5039a3541f407c2ade670004178b376754c424c13f0be24c7960c17be
+    sha256:5f6ee35f3f22014058e999911934bfa9db28e02a2722a7001c192cd182b8c715
 COMPONENT_ARCHIVE_URL=  http://sourceforge.net/projects/$(COMPONENT_NAME)/files/$(COMPONENT_NAME)/$(COMPONENT_VERSION)/$(COMPONENT_ARCHIVE)/download
-COMPONENT_BUGDB=	utility/gnuplot
 
-TPNO=			8452
+TPNO=			29106
 
 CXXFLAGS += -std=c++11
 
@@ -66,6 +63,8 @@
 REQUIRED_PACKAGES += library/ncurses
 REQUIRED_PACKAGES += library/readline
 REQUIRED_PACKAGES += library/zlib
+REQUIRED_PACKAGES += print/filter/ghostscript/fonts/gnu-gs-fonts-other
+REQUIRED_PACKAGES += print/filter/ghostscript/fonts/gnu-gs-fonts-std
 REQUIRED_PACKAGES += runtime/lua
 REQUIRED_PACKAGES += shell/ksh93
 REQUIRED_PACKAGES += system/font/truetype/liberation
--- a/components/gnuplot/README	Fri Jun 24 11:30:54 2016 -0700
+++ b/components/gnuplot/README	Fri Jun 24 16:19:17 2016 -0700
@@ -20,25 +20,10 @@
 #
 
 #
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-Gnuplot 4.4.0
-
-patches/arial.patch changes the default font from "arial" which 
-we don't have in Solaris to "LiberationSans-Regular".  
-
-patches/syscfg.h.patch fixes a problem found with the Sun C++ 
-compiler and bool and older versions of the Sun header files.  
+Gnuplot 5.0.3
 
-patches/libpng12.patch fixes a problem found that libgd wants 
--lpng14, but -lcairo and gnuplot want -lpng12.  
-
-There is an additional install_demo rule in Makefile to 
-distribute the demos.  
-
-There is an additional install_man rule in Makefile to add Oracle 
-stability to the man page.  
-
-There is an additional install_app-defaults rule to copy the
-app-defaults file to the Solaris app-defaults directory.
+The gnuplot demos are installed at /usr/demo/gnuplot, and rundemo 
+and runtcldemo scripts are provided to run the demos.  
--- a/components/gnuplot/gnuplot.license	Fri Jun 24 11:30:54 2016 -0700
+++ b/components/gnuplot/gnuplot.license	Fri Jun 24 16:19:17 2016 -0700
@@ -1,503 +1,840 @@
-========== ADDENDUM 1: The gnuplot 4.6.0 general copyright ==========
-/*[ 
- * Copyright 1986 - 1993, 1998, 2004   Thomas Williams, Colin Kelley 
- * 
- * Permission to use, copy, and distribute this software and its 
- * documentation for any purpose with or without fee is hereby granted, 
- * provided that the above copyright notice appear in all copies and 
- * that both that copyright notice and this permission notice appear 
- * in supporting documentation. 
- * 
- * Permission to modify the software is granted, but not the right to 
- * distribute the complete modified source code.  Modifications are to 
- * be distributed as patches to the released version.  Permission to 
- * distribute binaries produced by compiling modified sources is granted, 
- * provided you 
- *   1. distribute the corresponding source modifications from the 
- *    released version in the form of a patch file along with the binaries, 
- *   2. add special version identification to distinguish your version 
- *    in addition to the base release version number, 
- *   3. provide your name and address as the primary contact for the 
- *    support of your modified version, and 
- *   4. retain our contact information in regard to use of the base 
- *    software. 
- * Permission to distribute the released version of the source code along 
- * with corresponding source modifications in the form of a patch file is 
- * granted with same provisions 2 through 4 for binary distributions. 
- * 
- * This software is provided "as is" without express or implied warranty 
- * to the extent permitted by applicable law. 
-]*/ 
+COPYRIGHT SECTION
+=================
+
+=========COPYRIGHT001=============
+=========COPYRIGHT002=============
+Copyright Timothee Lecomte
+
+Permission to use, copy, and distribute this software and its
+documentation for any purpose with or without fee is hereby granted,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation.
+
+Permission to modify the software is granted, but not the right to
+distribute the complete modified source code.  Modifications are to
+be distributed as patches to the released version.  Permission to
+distribute binaries produced by compiling modified sources is granted,
+provided you
+  1. distribute the corresponding source modifications from the
+   released version in the form of a patch file along with the binaries,
+  2. add special version identification to distinguish your version
+   in addition to the base release version number,
+  3. provide your name and address as the primary contact for the
+   support of your modified version, and
+  4. retain our contact information in regard to use of the base
+   software.
+Permission to distribute the released version of the source code along
+with corresponding source modifications in the form of a patch file is
+granted with same provisions 2 through 4 for binary distributions.
 
-
-======== ADDENDUM 2: The gnuplot 4.6.0  License File =====
-
-The gnuplot general copyright: 
+This software is provided "as is" without express or implied warranty
+to the extent permitted by applicable law.
 
-Copyright 1986 - 1993, 1998 - 2001, 2004, 2007   Thomas Williams, Colin Kelley 
-Copyright 1999 -  Petr Mikulik <[email protected]> 
-Copyright 1999, 2004   Hans-Bernhard Broeker 
-Copyright 1999, 2004   Lars Hecking 
-Copyright 2005,2006   Timothee Lecomte 
+Alternatively, the contents of this file, apart from one portion
+that originates from other gnuplot files and is designated as such,
+may be used under the terms of the GNU General Public License
+Version 2 or later (the "GPL"), in which case the provisions of GPL
+are applicable instead of those above. If you wish to allow
+use of your version of the appropriate portion of this file only
+under the terms of the GPL and not to allow others to use your version
+of this file under the above gnuplot license, indicate your decision
+by deleting the provisions above and replace them with the notice
+and other provisions required by the GPL. If you do not
+delete the provisions above, a recipient may use your version of this file
+under either the GPL or the gnuplot license.
+=========COPYRIGHT003=============
+=========COPYRIGHT004=============
+=========COPYRIGHT005=============
+=========COPYRIGHT006=============
+=========COPYRIGHT056=============
+=========COPYRIGHT099=============
+=========COPYRIGHT100=============
+=========COPYRIGHT102=============
+Copyright Thomas Williams, Colin Kelley, Peter Hedwig, Hans-Bernhard Broeker
+Copyright James Darrell McCauley, Lars Hecking, Timothee Lecomte,
+Copyright P. Klosowski, Petr Mikulik,
 
-Permission to use, copy, and distribute this software and its 
-documentation for any purpose with or without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and 
-that both that copyright notice and this permission notice appear 
-in supporting documentation. 
+Permission to use, copy, and distribute this software and its
+documentation for any purpose with or without fee is hereby granted,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation.
 
-Permission to modify the software is granted, but not the right to 
-distribute the complete modified source code.  Modifications are to 
-be distributed as patches to the released version.  Permission to 
-distribute binaries produced by compiling modified sources is granted, 
-provided you 
-  1. distribute the corresponding source modifications from the 
-   released version in the form of a patch file along with the binaries, 
-  2. add special version identification to distinguish your version 
-   in addition to the base release version number, 
-  3. provide your name and address as the primary contact for the 
-   support of your modified version, and 
-  4. retain our contact information in regard to use of the base 
-   software. 
-Permission to distribute the released version of the source code along 
-with corresponding source modifications in the form of a patch file is 
-granted with same provisions 2 through 4 for binary distributions. 
+Permission to modify the software is granted, but not the right to
+distribute the complete modified source code.  Modifications are to
+be distributed as patches to the released version.  Permission to
+distribute binaries produced by compiling modified sources is granted,
+provided you
+  1. distribute the corresponding source modifications from the
+   released version in the form of a patch file along with the binaries,
+  2. add special version identification to distinguish your version
+   in addition to the base release version number,
+  3. provide your name and address as the primary contact for the
+   support of your modified version, and
+  4. retain our contact information in regard to use of the base
+   software.
+Permission to distribute the released version of the source code along
+with corresponding source modifications in the form of a patch file is
+granted with same provisions 2 through 4 for binary distributions.
 
-This software is provided "as is" without express or implied warranty 
-to the extent permitted by applicable law. 
-============================================================================ 
-Copyrights in src/wxterminal directory: 
+This software is provided "as is" without express or implied warranty
+to the extent permitted by applicable law.
+=========COPYRIGHT007=============
+Copyright (C) Bruce Ravel
 
-Copyright 2005,2006   Timothee Lecomte 
+Author:     Bruce Ravel <[email protected]>
+Maintainer: Bruce Ravel <[email protected]>
+Created:
+Updated:
+Version:
+Keywords:
 
-Permission to use, copy, and distribute this software and its 
-documentation for any purpose with or without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and 
-that both that copyright notice and this permission notice appear 
-in supporting documentation. 
+This file is not part of GNU Emacs.
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+This lisp script is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-Permission to modify the software is granted, but not the right to 
-distribute the complete modified source code.  Modifications are to 
-be distributed as patches to the released version.  Permission to 
-distribute binaries produced by compiling modified sources is granted, 
-provided you 
-  1. distribute the corresponding source modifications from the 
-   released version in the form of a patch file along with the binaries, 
-  2. add special version identification to distinguish your version 
-   in addition to the base release version number, 
-  3. provide your name and address as the primary contact for the 
-   support of your modified version, and 
-  4. retain our contact information in regard to use of the base 
-   software. 
-Permission to distribute the released version of the source code along 
-with corresponding source modifications in the form of a patch file is 
-granted with same provisions 2 through 4 for binary distributions. 
+Permission is granted to distribute copies of this lisp script
+provided the copyright notice and this permission are preserved in
+all copies.
+=========COPYRIGHT008=============
+Copyright (C) 1986 - 2004   Thomas Williams, Colin Kelley et al.
+=========COPYRIGHT009=============
+=========COPYRIGHT018=============
+Copyright (C) Thomas Williams, Colin Kelley et al.
+Copyright (C) various authors
+=========COPYRIGHT010=============
+Copyright (c) 1987 Free Software Foundation, Inc.
+
+This file is part of GNU Emacs, but was adapted for the gnuplot
+reference card because it was so nicely set up.
+=========COPYRIGHT011=============
+Copyright(c) Alex Woo 1992 June 1
+Updated by Hans-Bernhard Broker, April 2004
+=========COPYRIGHT017=============
+gnuplot{} is copyrighted, but freely distributable;
+you don't have to pay for it.
+=========COPYRIGHT020=============
+Copyright 2004 Scott James Remnant <[email protected]>.
 
-This software is provided "as is" without express or implied warranty 
-to the extent permitted by applicable law. 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful, but
+WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-Alternatively, the contents of this file may be used under the terms of the 
-GNU General Public License Version 2 or later (the "GPL"), in which case the 
-provisions of GPL are applicable instead of those above. If you wish to allow 
-use of your version of this file only under the terms of the GPL and not 
-to allow others to use your version of this file under the above gnuplot 
-license, indicate your decision by deleting the provisions above and replace 
-them with the notice and other provisions required by the GPL. If you do not 
-delete the provisions above, a recipient may use your version of this file 
-under either the GPL or the gnuplot license. 
-============================================================================ 
-Copyrights in the lisp directory: 
+As a special exception to the GNU General Public License, if you
+distribute this file as part of a program that contains a
+configuration script generated by Autoconf, you may include it under
+the same distribution terms that you use for the rest of that program.
+=========COPYRIGHT024=============
+Copyright 2004  Petr Mikulik
+
+As part of the program Gnuplot, which is
+=========COPYRIGHT025=============
+Petr Mikulik, since December 1998
+Copyright: open source as much as possible
+=========COPYRIGHT026=============
+Layout adapted from the TeX source for Stephen Gildea's GNU Emacs
+Reference Card (version 1.8).
 
-Copyright (C) 1998 Phil Type and Bruce Ravel, 1999-2002 Bruce Ravel 
-Copyright (C) 1995, 1996, 1997 Ralph Schleicher. 
+PostScript is a registered trademark of Adobe Systems Incorporated.
+GNU, Versatec, Imagen, Printronix, Canon, GraphOn, Visual, MicroVAX,
+UIS, Tektronix, Unix, VAX, VMS, NeWS, SunView, and em4010 are all
+trademarks of various companies.  We endorse none of them.
+=========COPYRIGHT027=============
+This code uses the cairo library, a 2D graphics library with
+support for multiple output devices.
+Cairo is distributed under the LGPL licence.
 
-This program is free software; you can redistribute it and/or modify 
-it under the terms of the GNU General Public License as published by 
-the Free Software Foundation; either version 2, or (at your option) 
-any later version. 
+See http://www.cairographics.org for details.
 
-This lisp script is distributed in the hope that it will be useful, 
-but WITHOUT ANY WARRANTY; without even the implied warranty of 
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. 
+It also uses the pango library, a text-layout rendering library.
+Pango is distributed under the LGPL licence.
 
-Permission is granted to distribute copies of this lisp script 
-provided the copyright notice and this permission are preserved in 
-all copies. 
-============================================================================ 
-Copyrights in the lisp directory: 
+See http://www.pango.org for details.
+=========COPYRIGHT029=============
+Petr Mikulik, December 1998 -- June 1999
+Copyright: open source as much as possible
+=========COPYRIGHT030=============
+NOTICE: Change of Copyright Status
 
-Copyright (C) 1995, 1996, 1997, 1998 Free Software Foundation, Inc. 
+The author of this module, Carsten Grammes, has expressed in
+personal email that he has no more interest in this code, and
+doesn't claim any copyright. He has agreed to put this module
+into the public domain.
 
-GNU Emacs is free software; you can redistribute it and/or modify 
-it under the terms of the GNU General Public License as published by 
-the Free Software Foundation; either version 2, or (at your option) 
-any later version. 
+Lars Hecking  15-02-1999
+=========COPYRIGHT031=============
+====license information====
+The following code originates from other gnuplot files,
+and is not subject to the alternative license statement.
+=========COPYRIGHT032=============
+Previous copyright of this module:   Carsten Grammes, 1993
+Experimental Physics, University of Saarbruecken, Germany
 
-GNU Emacs is distributed in the hope that it will be useful, 
-but WITHOUT ANY WARRANTY; without even the implied warranty of 
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the 
-GNU General Public License for more details. 
+Internet address: [email protected]
 
-You should have received a copy of the GNU General Public License 
-along with GNU Emacs; see the file COPYING.  If not, write to the 
-Free Software Foundation, Inc., 59 Temple Place - Suite 330, 
-Boston, MA 02111-1307, USA. 
-============================================================================ 
-Copyrights in m4/pkg.m4: 
+Permission to use, copy, and distribute this software and its
+documentation for any purpose with or without fee is hereby granted,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation.
 
-Copyright (C) 2004 Scott James Remnant <[email protected]>. 
+This software is provided "as is" without express or implied warranty.
+=========COPYRIGHT033=============
+The following code uses the wxWidgets library, which is
+distributed under its own licence (derivated from the LGPL).
 
-This program is free software; you can redistribute it and/or modify 
-it under the terms of the GNU General Public License as published by 
-the Free Software Foundation; either version 2 of the License, or 
-(at your option) any later version. 
+You can read it at the following address :
+http://www.wxwidgets.org/licence.htm
+=========COPYRIGHT034=============
+Previous copyright of this module:   Carsten Grammes, 1993
+=========COPYRIGHT035=============
+=========COPYRIGHT036=============
+Cephes Math Library Release 2.0, 2.1, 2.8
+Copyright by Stephen L. Moshier
+Direct inquiries to 30 Frost Street, Cambridge, MA 02140
+=========COPYRIGHT037=============
+This program is based on pgnuplot.c Copyright (C) 1999 Hans-Bernhard Broeker
+with substantial modifications Copyright (C) 1999 Craig R. Schardt.
 
-This program is distributed in the hope that it will be useful, but 
-WITHOUT ANY WARRANTY; without even the implied warranty of 
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
-General Public License for more details. 
-
-You should have received a copy of the GNU General Public License 
-along with this program; if not, write to the Free Software 
-Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. 
+The code is released to the public domain.
+=========COPYRIGHT038=============
+Copyright (C) 1999 by Hans-Bernhard Broeker
+([email protected])
+This file is in the public domain. It might become part of a future
+distribution of gnuplot.
+=========COPYRIGHT039=============
+Modifications by Craig R. Schardt (17 Jun 1999)
 
-As a special exception to the GNU General Public License, if you 
-distribute this file as part of a program that contains a 
-configuration script generated by Autoconf, you may include it under 
-the same distribution terms that you use for the rest of that program. 
-============================================================================ 
-Copyrights in the lisp directory: 
-
-Copyright (C) 1989, 1991 Free Software Foundation, Inc. 
-59 Temple Place, Suite 330, Boston, MA  02111-1307  USA 
-Everyone is permitted to copy and distribute verbatim copies 
-of this license document, but changing it is not allowed. 
-
-			    Preamble 
+Copyright (C) 1999 by Craig R. Schardt ([email protected])
+=========COPYRIGHT040=============
+Copyright 1993, NeXT Computer, Inc.
+=========COPYRIGHT041=============
+Gnuplot is a command-line driven interactive function plotting utility
+for linux, OSX, MSWin, VMS, and many other platforms.  The software is
+copyrighted but freely distributed (i.e., you don't have to pay for it).
+It was originally intended as graphical program to allow scientists
+and students to visualize mathematical functions and data.  Gnuplot
+supports many different types of terminals, plotters, and printers
+(including many color devices, and pseudo-devices like LaTeX) and is
+easily extensible to include new devices.
 
-  The licenses for most software are designed to take away your 
-freedom to share and change it.  By contrast, the GNU General Public 
-License is intended to guarantee your freedom to share and change free 
-software--to make sure the software is free for all its users.  This 
-General Public License applies to most of the Free Software 
-Foundation's software and to any other program whose authors commit to 
-using it.  (Some other Free Software Foundation software is covered by 
-the GNU Library General Public License instead.)  You can apply it to 
-your programs, too. 
+The "GNU" in gnuplot is NOT related to the Free Software Foundation,
+the naming is just a coincidence (and a long story; see the gnuplot FAQ
+for details). Thus gnuplot is not covered by the GPL (GNU Public License)
+copyleft, but rather by its own copyright statement, included in all source
+code files. However, some of the associated drivers and support utilities
+are dual-licensed.
+=========COPYRIGHT043=============
+Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
 
-  When we speak of free software, we are referring to freedom, not 
-price.  Our General Public Licenses are designed to make sure that you 
-have the freedom to distribute copies of free software (and charge for 
-this service if you wish), that you receive source code or can get it 
-if you want it, that you can change the software or use pieces of it 
-in new free programs; and that you know you can do these things. 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.
 
-  To protect your rights, we need to make restrictions that forbid 
-anyone to deny you these rights or to ask you to surrender the rights. 
-These restrictions translate to certain responsibilities for you if you 
-distribute copies of the software, or if you modify it. 
+As a special exception to the GNU General Public License, if you
+distribute this file as part of a program that contains a
+configuration script generated by Autoconf, you may include it under
+the same distribution terms that you use for the rest of that program.
 
-  For example, if you distribute copies of such a program, whether 
-gratis or for a fee, you must give the recipients all the rights that 
-you have.  You must make sure that they, too, receive or can get the 
-source code.  And you must show them these terms so they know their 
-rights. 
+Originally written by Alexandre Oliva <[email protected]>.
+=========COPYRIGHT045=============
+Copyright Free Software Foundation, Inc.
 
-  We protect your rights with two steps: (1) copyright the software, and 
-(2) offer you this license which gives you legal permission to copy, 
-distribute and/or modify the software. 
+This file is free software; the Free Software Foundation
+gives unlimited permission to copy and/or distribute it,
+with or without modifications, as long as this notice is preserved.
+=========COPYRIGHT047=============
+Copyright (c) 1992 Jos van der Woude, [email protected]
 
-  Also, for each author's protection and ours, we want to make certain 
-that everyone understands that there is no warranty for this free 
-software.  If the software is modified by someone else and passed on, we 
-want its recipients to know that what they have is not the original, so 
-that any problems introduced by others will not reflect on the original 
-authors' reputations. 
+Note: this function was translated from the Public Domain Fortran
+      version available from http://lib.stat.cmu.edu/apstat
+=========COPYRIGHT048=============
+The gnuplot source code and executables may be copied and/or modified
+freely as long as the copyright messages are left intact.
+=========COPYRIGHT049=============
+Copyright (C) 1994 X Consortium
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-  Finally, any free program is threatened constantly by software 
-patents.  We wish to avoid the danger that redistributors of a free 
-program will individually obtain patent licenses, in effect making the 
-program proprietary.  To prevent this, we have made it clear that any 
-patent must be licensed for everyone's free use or not licensed at all. 
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-  The precise terms and conditions for copying, distribution and 
-modification follow. 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the X Consor-
+tium.
 
 
-		    GNU GENERAL PUBLIC LICENSE 
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 
+FSF changes to this file are in the public domain.
+=========COPYRIGHT050=============
+Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
+  Free Software Foundation, Inc.
+Originally by Fran,cois Pinard <[email protected]>, 1996.
 
-  0. This License applies to any program or other work which contains 
-a notice placed by the copyright holder saying it may be distributed 
-under the terms of this General Public License.  The "Program", below, 
-refers to any such program or work, and a "work based on the Program" 
-means either the Program or any derivative work under copyright law: 
-that is to say, a work containing the Program or a portion of it, 
-either verbatim or with modifications and/or translated into another 
-language.  (Hereinafter, translation is included without limitation in 
-the term "modification".)  Each licensee is addressed as "you". 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
+02110-1301, USA.
 
-Activities other than copying, distribution and modification are not 
-covered by this License; they are outside its scope.  The act of 
-running the Program is not restricted, and the output from the Program 
-is covered only if its contents constitute a work based on the 
-Program (independent of having been made by running the Program). 
-Whether that is true depends on what the Program does. 
+As a special exception to the GNU General Public License, if you
+distribute this file as part of a program that contains a
+configuration script generated by Autoconf, you may include it under
+the same distribution terms that you use for the rest of that program.
+=========COPYRIGHT053=============
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
 
-  1. You may copy and distribute verbatim copies of the Program's 
-source code as you receive it, in any medium, provided that you 
-conspicuously and appropriately publish on each copy an appropriate 
-copyright notice and disclaimer of warranty; keep intact all the 
-notices that refer to this License and to the absence of any warranty; 
-and give any other recipients of the Program a copy of this License 
-along with the Program. 
-
-You may charge a fee for the physical act of transferring a copy, and 
-you may at your option offer warranty protection in exchange for a fee. 
+This file is free documentation; the Free Software Foundation gives
+unlimited permission to copy, distribute and modify it.
+=========COPYRIGHT055=============
+License: public domain.
+=========COPYRIGHT057=============
+Copyright (c) 1985 Regents of the University of California.
+All rights reserved.  The Berkeley software License Agreement
+specifies the terms and conditions for redistribution.
+=========COPYRIGHT058=============
+Copyright (c) 1985 by Supoj Sutanthavibul
+Parts Copyright (c) 1994 by Brian V. Smith
+Parts Copyright (c) 1991 by Paul King
 
-  2. You may modify your copy or copies of the Program or any portion 
-of it, thus forming a work based on the Program, and copy and 
-distribute such modifications or work under the terms of Section 1 
-above, provided that you also meet all of these conditions: 
+The X Consortium, and any party obtaining a copy of these files from
+the X Consortium, directly or indirectly, is granted, free of charge, a
+full and unrestricted irrevocable, world-wide, paid up, royalty-free,
+nonexclusive right and license to deal in this software and
+documentation files (the "Software"), including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons who receive
+copies from any such party to do so, with the only requirement being
+that this copyright notice remain intact.  This license includes without
+limitation a license to do the foregoing actions under any patents of
+the party supplying this software to the X Consortium.
+=========COPYRIGHT059=============
+/* gstring.c (emx+gcc) -- Copyright (c) 1994 by David J. Liu */
+=========COPYRIGHT060=============
+Some of this code including BGI drivers are copyright Borland Intl.
+=========COPYRIGHT065=============
+13 Jan 1999 - Copyright statement changed to new gnuplot copyright
+Permission given by orig author in private email (lh)
+=========COPYRIGHT068=============
+(C) Copyright 1992 Alex Woo
+=========COPYRIGHT069=============
+Copyright (c) Jos van der Woude, [email protected]
+=========COPYRIGHT071=============
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+=========COPYRIGHT072=============
+Copyright (c) 2003,2005,2006,2007 Adobe Systems Incorporated
 
-    a) You must cause the modified files to carry prominent notices 
-    stating that you changed the files and the date of any change. 
-
-    b) You must cause any work that you distribute or publish, that in 
-    whole or in part contains or is derived from the Program or any 
-    part thereof, to be licensed as a whole at no charge to all third 
-    parties under the terms of this License. 
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this documentation file to use, copy, publish, distribute,
+sublicense, and/or sell copies of the documentation, and to permit
+others to do the same, provided that:
+- No modification, editing or other alteration of this document is
+allowed; and
+- The above copyright notice and this permission notice shall be
+included in all copies of the documentation.
 
-    c) If the modified program normally reads commands interactively 
-    when run, you must cause it, when started running for such 
-    interactive use in the most ordinary way, to print or display an 
-    announcement including an appropriate copyright notice and a 
-    notice that there is no warranty (or else, saying that you provide 
-    a warranty) and that users may redistribute the program under 
-    these conditions, and telling the user how to view a copy of this 
-    License.  (Exception: if the Program itself is interactive but 
-    does not normally print such an announcement, your work based on 
-    the Program is not required to print an announcement.) 
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this documentation file, to create their own derivative works
+from the content of this document to use, copy, publish, distribute,
+sublicense, and/or sell the derivative works, and to permit others to do
+the same, provided that the derived work is not represented as being a
+copy or version of this document.
+
+Adobe shall not be liable to any party for any loss of revenue or profit
+or for indirect, incidental, special, consequential, or other similar
+damages, whether based on tort (including without limitation negligence
+or strict liability), contract or other legal or equitable grounds even
+if Adobe has been advised or had reason to know of the possibility of
 
-These requirements apply to the modified work as a whole.  If 
-identifiable sections of that work are not derived from the Program, 
-and can be reasonably considered independent and separate works in 
-themselves, then this License, and its terms, do not apply to those 
-sections when you distribute them as separate works.  But when you 
-distribute the same sections as part of a whole which is a work based 
-on the Program, the distribution of the whole must be on the terms of 
-this License, whose permissions for other licensees extend to the 
-entire whole, and thus to each and every part regardless of who wrote it. 
+Adobe specifically disclaims all express, statutory, or implied
+warranties relating to the Adobe materials, including but not limited to
+those concerning merchantability or fitness for a particular purpose or
+non-infringement of any third party rights regarding the Adobe
+materials.
+=========COPYRIGHT073=============
+=========COPYRIGHT101=============
+Copyright (C) Free Software Foundation, Inc.
+This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it.
+=========COPYRIGHT074=============
+Licence: see the gnuplot copyright (to be merged into here...)
+=========COPYRIGHT076=============
+====license information====
+End of the non-relicensable portion.
+=========COPYRIGHT077=============
+Copyright (C) 1993 - 2001   Masahito Yamaga
+=========COPYRIGHT080=============
+Lodewyck
+
+Permission to use, copy, and distribute this software and its
+documentation for any purpose with or without fee is hereby granted,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation.
 
-Thus, it is not the intent of this section to claim rights or contest 
-your rights to work written entirely by you; rather, the intent is to 
-exercise the right to control the distribution of derivative or 
-collective works based on the Program. 
+Permission to modify the software is granted, but not the right to
+distribute the complete modified source code.  Modifications are to
+be distributed as patches to the released version.  Permission to
+distribute binaries produced by compiling modified sources is granted,
+provided you
+  1. distribute the corresponding source modifications from the
+   released version in the form of a patch file along with the binaries,
+  2. add special version identification to distinguish your version
+   in addition to the base release version number,
+  3. provide your name and address as the primary contact for the
+   support of your modified version, and
+  4. retain our contact information in regard to use of the base
+   software.
+Permission to distribute the released version of the source code along
+with corresponding source modifications in the form of a patch file is
+granted with same provisions 2 through 4 for binary distributions.
 
-In addition, mere aggregation of another work not based on the Program 
-with the Program (or with a work based on the Program) on a volume of 
-a storage or distribution medium does not bring the other work under 
-the scope of this License. 
+This software is provided "as is" without express or implied warranty
+to the extent permitted by applicable law.
+
 
-  3. You may copy and distribute the Program (or a work based on it, 
-under Section 2) in object code or executable form under the terms of 
-Sections 1 and 2 above provided that you also do one of the following: 
+Alternatively, the contents of this file may be used under the terms of the
+GNU General Public License Version 2 or later (the "GPL"), in which case the
+provisions of GPL are applicable instead of those above. If you wish to allow
+use of your version of this file only under the terms of the GPL and not
+to allow others to use your version of this file under the above gnuplot
+license, indicate your decision by deleting the provisions above and replace
+them with the notice and other provisions required by the GPL. If you do not
+delete the provisions above, a recipient may use your version of this file
+under either the GPL or the gnuplot license.
+=========COPYRIGHT083=============
+Copyright (C) 1994-2013 Free Software Foundation, Inc.
 
-    a) Accompany it with the complete corresponding machine-readable 
-    source code, which must be distributed under the terms of Sections 
-    1 and 2 above on a medium customarily used for software interchange; or, 
+This Makefile.in is free software; the Free Software Foundation
+gives unlimited permission to copy and/or distribute it,
+with or without modifications, as long as this notice is preserved.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+PARTICULAR PURPOSE.
+=========COPYRIGHT084=============
+Copyright (c) 1992 Robert K. Cunningham, MIT Lincoln Laboratory
+=========COPYRIGHT085============
+Copyright (C) 1999-2013 Free Software Foundation, Inc.
+Written by Tom Tromey <[email protected]>.
 
-    b) Accompany it with a written offer, valid for at least three 
-    years, to give any third party, for a charge no more than your 
-    cost of physically performing source distribution, a complete 
-    machine-readable copy of the corresponding source code, to be 
-    distributed under the terms of Sections 1 and 2 above on a medium 
-    customarily used for software interchange; or, 
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
 
-    c) Accompany it with the information you received as to the offer 
-    to distribute corresponding source code.  (This alternative is 
-    allowed only for noncommercial distribution and only if you 
-    received the program in object code or executable form with such 
-    an offer, in accord with Subsection b above.) 
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+As a special exception to the GNU General Public License, if you
+distribute this file as part of a program that contains a
+configuration script generated by Autoconf, you may include it under
+the same distribution terms that you use for the rest of that program.
+=========COPYRIGHT087=============
+Copyright (c) 2006-2011, Mojca Miklavec
+All rights reserved.
 
-The source code for a work means the preferred form of the work for 
-making modifications to it.  For an executable work, complete source 
-code means all the source code for all modules it contains, plus any 
-associated interface definition files, plus the scripts used to 
-control compilation and installation of the executable.  However, as a 
-special exception, the source code distributed need not include 
-anything that is normally distributed (in either source or binary 
-form) with the major components (compiler, kernel, and so on) of the 
-operating system on which the executable runs, unless that component 
-itself accompanies the executable. 
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice,
+  this list of conditions and the following disclaimer.
+- Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
 
-If distribution of executable or object code is made by offering 
-access to copy from a designated place, then offering equivalent 
-access to copy the source code from the same place counts as 
-distribution of the source code, even though third parties are not 
-compelled to copy the source along with the object code. 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGE.
+=========COPYRIGHT088=============
+=========COPYRIGHT092=============
+Copyright (c) Bastian Maerkisch. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
 
-  4. You may not copy, modify, sublicense, or distribute the Program 
-except as expressly provided under this License.  Any attempt 
-otherwise to copy, modify, sublicense or distribute the Program is 
-void, and will automatically terminate your rights under this License. 
-However, parties who have received copies, or rights, from you under 
-this License will not have their licenses terminated so long as such 
-parties remain in full compliance. 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+=========COPYRIGHT089=============
+Copyright Kevlin Henney, 1997, 2003. All rights reserved.
 
-  5. You are not required to accept this License, since you have not 
-signed it.  However, nothing else grants you permission to modify or 
-distribute the Program or its derivative works.  These actions are 
-prohibited by law if you do not accept this License.  Therefore, by 
-modifying or distributing the Program (or any work based on the 
-Program), you indicate your acceptance of this License to do so, and 
-all its terms and conditions for copying, distributing or modifying 
-the Program or works based on it. 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose is hereby granted without fee, provided
+that this copyright and permissions notice appear in all copies and
+derivatives.
+
+This software is supplied "as is" without express or implied warranty.
 
-  6. Each time you redistribute the Program (or any work based on the 
-Program), the recipient automatically receives a license from the 
-original licensor to copy, distribute or modify the Program subject to 
-these terms and conditions.  You may not impose any further 
-restrictions on the recipients' exercise of the rights granted herein. 
-You are not responsible for enforcing compliance by third parties to 
-this License. 
+But that said, if there are any problems please get in touch.
+=========COPYRIGHT090=============
+Copyright (c) 2010 James R. Van Zandt, [email protected]
+=========COPYRIGHT093=============
+=========COPYRIGHT095=============
+Copyright Stephan Boettcher, Ethan A Merritt
+
+Gnuplot license:
+
+Permission to use, copy, and distribute this software and its
+documentation for any purpose with or without fee is hereby granted,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation.
 
-  7. If, as a consequence of a court judgment or allegation of patent 
-infringement or for any other reason (not limited to patent issues), 
-conditions are imposed on you (whether by court order, agreement or 
-otherwise) that contradict the conditions of this License, they do not 
-excuse you from the conditions of this License.  If you cannot 
-distribute so as to satisfy simultaneously your obligations under this 
-License and any other pertinent obligations, then as a consequence you 
-may not distribute the Program at all.  For example, if a patent 
-license would not permit royalty-free redistribution of the Program by 
-all those who receive copies directly or indirectly through you, then 
-the only way you could satisfy both it and this License would be to 
-refrain entirely from distribution of the Program. 
+Permission to modify the software is granted, but not the right to
+distribute the complete modified source code.  Modifications are to
+be distributed as patches to the released version.  Permission to
+distribute binaries produced by compiling modified sources is granted,
+provided you
+  1. distribute the corresponding source modifications from the
+   released version in the form of a patch file along with the binaries,
+  2. add special version identification to distinguish your version
+   in addition to the base release version number,
+  3. provide your name and address as the primary contact for the
+   support of your modified version, and
+  4. retain our contact information in regard to use of the base
+   software.
+Permission to distribute the released version of the source code along
+with corresponding source modifications in the form of a patch file is
+granted with same provisions 2 through 4 for binary distributions.
+
+This software is provided "as is" without express or implied warranty
+to the extent permitted by applicable law.
+
+Alternative license:
+
+As an alternative to distributing code in this file under the gnuplot license,
+you may instead comply with the terms below. In this case, redistribution and
+use in source and binary forms, with or without modification, are permitted
+provided that the following conditions are met:
 
-If any portion of this section is held invalid or unenforceable under 
-any particular circumstance, the balance of the section is intended to 
-apply and the section as a whole is intended to apply in other 
-circumstances. 
+Redistributions of source code must retain the above copyright notice, this
+list of conditions and the following disclaimer.  Redistributions in binary
+form must reproduce the above copyright notice, this list of conditions and
+the following disclaimer in the documentation and/or other materials provided
+with the distribution.
 
-It is not the purpose of this section to induce you to infringe any 
-patents or other property right claims or to contest validity of any 
-such claims; this section has the sole purpose of protecting the 
-integrity of the free software distribution system, which is 
-implemented by public license practices.  Many people have made 
-generous contributions to the wide range of software distributed 
-through that system in reliance on consistent application of that 
-system; it is up to the author/donor to decide if he or she is willing 
-to distribute software through any other system and a licensee cannot 
-impose that choice. 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.
+=========COPYRIGHT094=============
+Copyright Jyrki Yli-Nokari 1987
+
+Gnuplot license:
+
+Permission to use, copy, and distribute this software and its
+documentation for any purpose with or without fee is hereby granted,
+provided that the above copyright notice appear in all copies and
+that both that copyright notice and this permission notice appear
+in supporting documentation.
 
-This section is intended to make thoroughly clear what is believed to 
-be a consequence of the rest of this License. 
+Permission to modify the software is granted, but not the right to
+distribute the complete modified source code.  Modifications are to
+be distributed as patches to the released version.  Permission to
+distribute binaries produced by compiling modified sources is granted,
+provided you
+  1. distribute the corresponding source modifications from the
+   released version in the form of a patch file along with the binaries,
+  2. add special version identification to distinguish your version
+   in addition to the base release version number,
+  3. provide your name and address as the primary contact for the
+   support of your modified version, and
+  4. retain our contact information in regard to use of the base
+   software.
+Permission to distribute the released version of the source code along
+with corresponding source modifications in the form of a patch file is
+granted with same provisions 2 through 4 for binary distributions.
 
-  8. If the distribution and/or use of the Program is restricted in 
-certain countries either by patents or by copyrighted interfaces, the 
-original copyright holder who places the Program under this License 
-may add an explicit geographical distribution limitation excluding 
-those countries, so that distribution is permitted only in or among 
-countries not thus excluded.  In such case, this License incorporates 
-the limitation as if written in the body of this License. 
+This software is provided "as is" without express or implied warranty
+to the extent permitted by applicable law.
+
+Alternative license:
 
-  9. The Free Software Foundation may publish revised and/or new versions 
-of the General Public License from time to time.  Such new versions will 
-be similar in spirit to the present version, but may differ in detail to 
-address new problems or concerns. 
+As an alternative to distributing code in this file under the gnuplot license,
+you may instead comply with the terms below. In this case, redistribution and
+use in source and binary forms, with or without modification, are permitted
+provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+this list of conditions and the following disclaimer in the documentation
+and/or other materials provided with the distribution.
 
-Each version is given a distinguishing version number.  If the Program 
-specifies a version number of this License which applies to it and "any 
-later version", you have the option of following the terms and conditions 
-either of that version or of any later version published by the Free 
-Software Foundation.  If the Program does not specify a version number of 
-this License, you may choose any version ever published by the Free Software 
-Foundation. 
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE 
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) 
+ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE 
+POSSIBILITY OF SUCH DAMAGE.
+=========COPYRIGHT096=============
+Copyright (c) 2011 Bastian Maerkisch. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are
+permitted provided that the following conditions are met:
+
+   1. Redistributions of source code must retain the above copyright notice, this list of
+      conditions and the following disclaimer.
+
+   2. Redistributions in binary form must reproduce the above copyright notice, this list
+      of conditions and the following disclaimer in the documentation and/or other materials
+      provided with the distribution.
 
-  10. If you wish to incorporate parts of the Program into other free 
-programs whose distribution conditions are different, write to the author 
-to ask for permission.  For software which is copyrighted by the Free 
-Software Foundation, write to the Free Software Foundation; we sometimes 
-make exceptions for this.  Our decision will be guided by the two goals 
-of preserving the free status of all derivatives of our free software and 
-of promoting the sharing and reuse of software generally. 
+THIS SOFTWARE IS PROVIDED BY Bastian Maerkisch ``AS IS'' AND ANY EXPRESS OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+=========COPYRIGHT097=============
+Copyright (c) 2002-2012 Sam Hocevar <[email protected]>
+               All Rights Reserved
 
-			    NO WARRANTY 
+This library is free software. It comes without any warranty, to
+the extent permitted by applicable law. You can redistribute it
+and/or modify it under the terms of the Do What The Fuck You Want
+To Public License, Version 2, as published by Sam Hocevar. See
+http://sam.zoy.org/wtfpl/COPYING for more details.
+=========COPYRIGHT103=============
+License: GNU Lesser General Public License (LGPL), version 3
+http://www.gnu.org/licenses/lgpl.html
+=========COPYRIGHT104=============
+License
+-------
+
+See the Copyright file for copyright conditions.
 
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN 
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED 
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS 
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE 
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, 
-REPAIR OR CORRECTION. 
+The "GNU" in gnuplot is NOT related to the Free Software Foundation,
+the naming is just a coincidence (and a long story; see the gnuplot FAQ
+for details). Thus gnuplot is not covered by the GPL (GNU Public License)
+copyleft, but rather by its own copyright statement, included in all source
+code files. However, some of the associated drivers and support utilities
+are dual-licensed.
+
+=================================================================================
+GNU GENERAL PUBLIC LICENSE
+Version 2, June 1991
+
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+
+Everyone is permitted to copy and distribute verbatim copies
+of this license document, but changing it is not allowed.
+
+Preamble
+
+The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) You can apply it to your programs, too.
+
+When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for this service if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs; and that you know you can do these things.
+
+To protect your rights, we need to make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it.
+
+For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. You must make sure that they, too, receive or can get the source code. And you must show them these terms so they know their rights.
+
+We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software.
+
+Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations.
+
+Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all.
 
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, 
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING 
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED 
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY 
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER 
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE 
-POSSIBILITY OF SUCH DAMAGES. 
+The precise terms and conditions for copying, distribution and modification follow.
+TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does.
+
+1. You may copy and distribute verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee.
+
+2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. 
+    b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. 
+    c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) 
 
-		     END OF TERMS AND CONDITIONS 
+These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License.
+
+3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following:
 
-============================================================================ 
-Copyrights in term/fig.trm and term/object.h: 
+    a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+    b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, 
+    c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) 
+
+The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable.
 
-Copyright (c) 1985 by Supoj Sutanthavibul 
-Parts Copyright (c) 1994 by Brian V. Smith 
-Parts Copyright (c) 1991 by Paul King 
+If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code.
+
+4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance.
+
+5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it.
 
-The X Consortium, and any party obtaining a copy of these files from 
-the X Consortium, directly or indirectly, is granted, free of charge, a 
-full and unrestricted irrevocable, world-wide, paid up, royalty-free, 
-nonexclusive right and license to deal in this software and 
-documentation files (the "Software"), including without limitation the 
-rights to use, copy, modify, merge, publish, distribute, sublicense, 
-and/or sell copies of the Software, and to permit persons who receive 
-copies from any such party to do so, with the only requirement being 
-that this copyright notice remain intact.  This license includes without 
-limitation a license to do the foregoing actions under any patents of 
-the party supplying this software to the X Consortium. 
-============================================================================ 
-Copyrights in term/impcodes.h: 
+6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License.
+
+7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice.
+
+This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License.
+
+8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License.
+
+9. The Free Software Foundation may publish revised and/or new versions of the General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program specifies a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation.
 
-Copyright (c) 1985 Regents of the University of California. 
-All rights reserved.  The Berkeley software License Agreement 
-specifies the terms and conditions for redistribution. 
-============================================================================ 
-Copyrights in src/bitmap.c: 
+10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally.
+
+NO WARRANTY
+
+11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
+END OF TERMS AND CONDITIONS
+How to Apply These Terms to Your New Programs
+
+If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms.
+
+To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found.
+
+one line to give the program's name and an idea of what it does.
+Copyright (C) yyyy  name of author
 
-Raster routines written and copyrighted 1987 by 
-Jyrki Yli-Nokari ([email protected]) 
-Intrinsic, Ltd. 
-============================================================================ 
-Copyrights in src/specfun.c: 
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
 
-Cephes Math Library Release 2.8:  June, 2000 
-Copyright 1984, 1987, 1988, 1989, 1992, 2000 by Stephen L. Moshier 
-Direct inquiries to 30 Frost Street, Cambridge, MA 02140 
-============================================================================ 
-Copyrights in src/bf_test.c, src/binary.c src/datafile.c: 
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this when it starts in an interactive mode:
 
-Copyright (c) 1991,1992 Robert K. Cunningham, MIT Lincoln Laboratory 
-============================================================================ 
-Copyrights in the src directory: 
+Gnomovision version 69, Copyright (C) year name of author
+Gnomovision comes with ABSOLUTELY NO WARRANTY; for details
+type `show w'.  This is free software, and you are welcome
+to redistribute it under certain conditions; type `show c' 
+for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate parts of the General Public License. Of course, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names:
 
-Petr Mikulik, since December 1998 
-Copyright: open source as much as possible 
-============================================================================ 
-Copyrights in demo/whale.dat: 
+Yoyodyne, Inc., hereby disclaims all copyright
+interest in the program `Gnomovision'
+(which makes passes at compilers) written 
+by James Hacker.
 
-(C) Copyright 1992 Alex Woo 
-============================================================================ 
-Copyrights in src/specfun.c and the demo directory: 
+signature of Ty Coon, 1 April 1989
+Ty Coon, President of Vice
 
-Copyright (c) 1991, 1992 Jos van der Woude, [email protected] 
-============================================================================
+This General Public License does not permit incorporating your program into proprietary programs. If your program is a subroutine library, you may consider it more useful to permit linking proprietary applications with the library. If this is what you want to do, use the GNU Lesser General Public License instead of this License. 
--- a/components/gnuplot/gnuplot.p5m	Fri Jun 24 11:30:54 2016 -0700
+++ b/components/gnuplot/gnuplot.p5m	Fri Jun 24 16:19:17 2016 -0700
@@ -22,7 +22,6 @@
 #
 # Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
 #
-<transform file path=usr/demo/gnuplot/(.+[.-].+)$ -> set action.hash demo/%<1> >
 set name=pkg.fmri \
     value=pkg:/image/gnuplot@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary value="gnuplot - plotting utility"
@@ -39,220 +38,233 @@
 
 
 file path=usr/bin/gnuplot mode=555
-file path=usr/demo/gnuplot/1.dat
-file path=usr/demo/gnuplot/2.dat
-file path=usr/demo/gnuplot/3.dat
-file path=usr/demo/gnuplot/GM1_bonds.r3d
-file path=usr/demo/gnuplot/GM1_sugar.pdb
-file path=usr/demo/gnuplot/airfoil.dem
-file path=usr/demo/gnuplot/all.dem
-file path=usr/demo/gnuplot/animate.dem
-file path=usr/demo/gnuplot/animate2.dem
-file path=usr/demo/gnuplot/approximate.dem
-file path=usr/demo/gnuplot/arrowstyle.dat
-file path=usr/demo/gnuplot/arrowstyle.dem
-file path=usr/demo/gnuplot/asciimat.dat
-file path=usr/demo/gnuplot/autoscale.dem
-file path=usr/demo/gnuplot/barchart_art.dem
-file path=usr/demo/gnuplot/battery.dat
-file path=usr/demo/gnuplot/big_peak.dat
-file path=usr/demo/gnuplot/binary.dem
+file demo/1.dat path=usr/demo/gnuplot/1.dat
+file demo/2.dat path=usr/demo/gnuplot/2.dat
+file demo/3.dat path=usr/demo/gnuplot/3.dat
+file demo/GM1_bonds.r3d path=usr/demo/gnuplot/GM1_bonds.r3d
+file demo/GM1_sugar.pdb path=usr/demo/gnuplot/GM1_sugar.pdb
+file demo/airfoil.dem path=usr/demo/gnuplot/airfoil.dem
+file demo/all.dem path=usr/demo/gnuplot/all.dem
+file demo/animate.dem path=usr/demo/gnuplot/animate.dem
+file demo/animate2.dem path=usr/demo/gnuplot/animate2.dem
+file demo/approximate.dem path=usr/demo/gnuplot/approximate.dem
+file demo/arrowstyle.dat path=usr/demo/gnuplot/arrowstyle.dat
+file demo/arrowstyle.dem path=usr/demo/gnuplot/arrowstyle.dem
+file demo/asciimat.dat path=usr/demo/gnuplot/asciimat.dat
+file demo/autoscale.dem path=usr/demo/gnuplot/autoscale.dem
+file demo/barchart_art.dem path=usr/demo/gnuplot/barchart_art.dem
+file demo/battery.dat path=usr/demo/gnuplot/battery.dat
+file demo/big_peak.dat path=usr/demo/gnuplot/big_peak.dat
+file demo/binary.dem path=usr/demo/gnuplot/binary.dem
 file $(MACH64)/demo/binary1 path=usr/demo/gnuplot/binary1
 file $(MACH64)/demo/binary2 path=usr/demo/gnuplot/binary2
 file $(MACH64)/demo/binary3 path=usr/demo/gnuplot/binary3
-file path=usr/demo/gnuplot/bivariat.dem
-file path=usr/demo/gnuplot/bldg.png
-file path=usr/demo/gnuplot/blutux.rgb
-file path=usr/demo/gnuplot/borders.dem
-file path=usr/demo/gnuplot/boxplot.dem
-file path=usr/demo/gnuplot/candlesticks.dat
-file path=usr/demo/gnuplot/candlesticks.dem
-file path=usr/demo/gnuplot/charset.dem
-file path=usr/demo/gnuplot/circles.dem
-file path=usr/demo/gnuplot/cities.dat
-file path=usr/demo/gnuplot/cities.dem
-file path=usr/demo/gnuplot/clip14in.dat
-file path=usr/demo/gnuplot/colorscheme.dem
-file path=usr/demo/gnuplot/colorwheel.dem
-file path=usr/demo/gnuplot/contours.dem
-file path=usr/demo/gnuplot/controls.dem
-file path=usr/demo/gnuplot/ctg-y2.dat
-file path=usr/demo/gnuplot/dashcolor.dem
-file path=usr/demo/gnuplot/datastrings.dem
-file path=usr/demo/gnuplot/delaunay-edges.dat
-file path=usr/demo/gnuplot/demo.edf
-file path=usr/demo/gnuplot/density.fnc
-file path=usr/demo/gnuplot/dgrid3d.dem
-file path=usr/demo/gnuplot/discrete.dem
-file path=usr/demo/gnuplot/electron.dem
-file path=usr/demo/gnuplot/ellipse.dem
-file path=usr/demo/gnuplot/ellipses.dat
-file path=usr/demo/gnuplot/ellipses_style.dem
-file path=usr/demo/gnuplot/empty-circles.dat
-file path=usr/demo/gnuplot/energy_circles.dat
-file path=usr/demo/gnuplot/enhanced_utf8.dem
-file path=usr/demo/gnuplot/enhancedtext.dem
-file path=usr/demo/gnuplot/epslatex.dem
-file path=usr/demo/gnuplot/fillbetween.dem
-file path=usr/demo/gnuplot/fillcrvs.dem
-file path=usr/demo/gnuplot/fillstyle.dem
-file path=usr/demo/gnuplot/finance.dat
-file path=usr/demo/gnuplot/finance.dem
-file path=usr/demo/gnuplot/fit.dem
-file path=usr/demo/gnuplot/fit3.dat
-file path=usr/demo/gnuplot/fontfile.dem
-file path=usr/demo/gnuplot/fontfile_latex.dem
-file path=usr/demo/gnuplot/glass.dat
-file path=usr/demo/gnuplot/gnu-valley
-file path=usr/demo/gnuplot/gnuplot.cfg
-file path=usr/demo/gnuplot/gnuplot.rot
-file path=usr/demo/gnuplot/gpdemos.tcl mode=555
-file path=usr/demo/gnuplot/heatmaps.dem
-file path=usr/demo/gnuplot/hemisphr.dat
-file path=usr/demo/gnuplot/hexa.fnc
-file path=usr/demo/gnuplot/hidden.dem
-file path=usr/demo/gnuplot/hidden2.dem
-file path=usr/demo/gnuplot/histerror.dat
-file path=usr/demo/gnuplot/histograms.dem
-file path=usr/demo/gnuplot/histograms2.dem
-file path=usr/demo/gnuplot/histopt.dat
-file path=usr/demo/gnuplot/image.dem
-file path=usr/demo/gnuplot/image2.dem
-file path=usr/demo/gnuplot/imageNaN.dem
-file path=usr/demo/gnuplot/immigration.dat
-file path=usr/demo/gnuplot/iterate.dem
-file path=usr/demo/gnuplot/kdensity2d.dem
-file path=usr/demo/gnuplot/key.dem
-file path=usr/demo/gnuplot/klein.dat
-file path=usr/demo/gnuplot/labelplot.pdb
-file path=usr/demo/gnuplot/layout.dem
-file path=usr/demo/gnuplot/lcdemo.dat
-file path=usr/demo/gnuplot/lena-keypoints.bin
-file path=usr/demo/gnuplot/lena.rgb
-file path=usr/demo/gnuplot/line.fnc
-file path=usr/demo/gnuplot/macros.dem
-file path=usr/demo/gnuplot/margins.dem
-file path=usr/demo/gnuplot/mgr.dem
-file path=usr/demo/gnuplot/molecule.dem
-file path=usr/demo/gnuplot/moli3.dat
-file path=usr/demo/gnuplot/mouselab_1.dem
-file path=usr/demo/gnuplot/mouselab_2.dem
-file path=usr/demo/gnuplot/mouselabels.dem
-file path=usr/demo/gnuplot/mousevariables.dem
-file path=usr/demo/gnuplot/multiaxis.dem
-file path=usr/demo/gnuplot/multimsh.dem
-file path=usr/demo/gnuplot/multipalette.dem
-file path=usr/demo/gnuplot/multiplt.dem
-file path=usr/demo/gnuplot/nearmap.csv
-file path=usr/demo/gnuplot/optimize.dat
-file path=usr/demo/gnuplot/orbital_elements.dat
-file path=usr/demo/gnuplot/orbits.dem
-file path=usr/demo/gnuplot/param.dem
-file path=usr/demo/gnuplot/pm3d.dem
-file path=usr/demo/gnuplot/pm3dcolors.dem
-file path=usr/demo/gnuplot/pm3dgamma.dem
-file path=usr/demo/gnuplot/pointsize.dem
-file path=usr/demo/gnuplot/polar.dem
-file path=usr/demo/gnuplot/poldat.dem
-file path=usr/demo/gnuplot/prob.dem
-file path=usr/demo/gnuplot/prob2.dem
-file path=usr/demo/gnuplot/rainbow.dem
-file path=usr/demo/gnuplot/random-points
-file path=usr/demo/gnuplot/random.dem
-file path=usr/demo/gnuplot/rectangle.dem
-file path=usr/demo/gnuplot/reflect.fnc
-file path=usr/demo/gnuplot/rgb_variable.dat
-file path=usr/demo/gnuplot/rgb_variable.dem
-file path=usr/demo/gnuplot/rgbalpha.dem
+file demo/bivariat.dem path=usr/demo/gnuplot/bivariat.dem
+file demo/bldg.png path=usr/demo/gnuplot/bldg.png
+file demo/blutux.rgb path=usr/demo/gnuplot/blutux.rgb
+file demo/bolditalic.dem path=usr/demo/gnuplot/bolditalic.dem
+file demo/borders.dem path=usr/demo/gnuplot/borders.dem
+file demo/boxplot.dem path=usr/demo/gnuplot/boxplot.dem
+file demo/callargs.dem path=usr/demo/gnuplot/callargs.dem
+file demo/candlesticks.dat path=usr/demo/gnuplot/candlesticks.dat
+file demo/candlesticks.dem path=usr/demo/gnuplot/candlesticks.dem
+file demo/cerf.dem path=usr/demo/gnuplot/cerf.dem
+file demo/charset.dem path=usr/demo/gnuplot/charset.dem
+file demo/circles.dem path=usr/demo/gnuplot/circles.dem
+file demo/cities.dat path=usr/demo/gnuplot/cities.dat
+file demo/cities.dem path=usr/demo/gnuplot/cities.dem
+file demo/clip14in.dat path=usr/demo/gnuplot/clip14in.dat
+file demo/clipobject.dem path=usr/demo/gnuplot/clipobject.dem
+file demo/colorscheme.dem path=usr/demo/gnuplot/colorscheme.dem
+file demo/colorwheel.dem path=usr/demo/gnuplot/colorwheel.dem
+file demo/complex_trig.dem path=usr/demo/gnuplot/complex_trig.dem
+file demo/contours.dem path=usr/demo/gnuplot/contours.dem
+file demo/controls.dem path=usr/demo/gnuplot/controls.dem
+file demo/ctg-y2.dat path=usr/demo/gnuplot/ctg-y2.dat
+file demo/dashcolor.dem path=usr/demo/gnuplot/dashcolor.dem
+file demo/dashtypes.dem path=usr/demo/gnuplot/dashtypes.dem
+file demo/datastrings.dem path=usr/demo/gnuplot/datastrings.dem
+file demo/delaunay-edges.dat path=usr/demo/gnuplot/delaunay-edges.dat
+file demo/demo.edf path=usr/demo/gnuplot/demo.edf
+file $(MACH64)/demo/plugin/demo_plugin.so path=usr/demo/gnuplot/demo_plugin.so \
+    pkg.linted.userland.action001.2=true
+file demo/density.fnc path=usr/demo/gnuplot/density.fnc
+file demo/dgrid3d.dem path=usr/demo/gnuplot/dgrid3d.dem
+file demo/discrete.dem path=usr/demo/gnuplot/discrete.dem
+file demo/electron.dem path=usr/demo/gnuplot/electron.dem
+file demo/ellipse.dem path=usr/demo/gnuplot/ellipse.dem
+file demo/ellipses.dat path=usr/demo/gnuplot/ellipses.dat
+file demo/ellipses_style.dem path=usr/demo/gnuplot/ellipses_style.dem
+file demo/empty-circles.dat path=usr/demo/gnuplot/empty-circles.dat
+file demo/energy_circles.dat path=usr/demo/gnuplot/energy_circles.dat
+file demo/enhanced_utf8.dem path=usr/demo/gnuplot/enhanced_utf8.dem
+file demo/enhancedtext.dem path=usr/demo/gnuplot/enhancedtext.dem
+file demo/epslatex.dem path=usr/demo/gnuplot/epslatex.dem
+file demo/fillbetween.dem path=usr/demo/gnuplot/fillbetween.dem
+file demo/fillcrvs.dem path=usr/demo/gnuplot/fillcrvs.dem
+file demo/fillstyle.dem path=usr/demo/gnuplot/fillstyle.dem
+file demo/finance.dat path=usr/demo/gnuplot/finance.dat
+file demo/finance.dem path=usr/demo/gnuplot/finance.dem
+file demo/fit.dem path=usr/demo/gnuplot/fit.dem
+file demo/fit3.dat path=usr/demo/gnuplot/fit3.dat
+file demo/fitmulti.dem path=usr/demo/gnuplot/fitmulti.dem
+file demo/fontfile.dem path=usr/demo/gnuplot/fontfile.dem
+file demo/fontfile_latex.dem path=usr/demo/gnuplot/fontfile_latex.dem
+file demo/gantt.dem path=usr/demo/gnuplot/gantt.dem
+file demo/gen-random.inc path=usr/demo/gnuplot/gen-random.inc
+file demo/glass.dat path=usr/demo/gnuplot/glass.dat
+file demo/gnu-valley path=usr/demo/gnuplot/gnu-valley
+file demo/gnuplot.cfg path=usr/demo/gnuplot/gnuplot.cfg
+file demo/gnuplot.rot path=usr/demo/gnuplot/gnuplot.rot
+file demo/gpdemos.tcl path=usr/demo/gnuplot/gpdemos.tcl mode=555
+file demo/heatmaps.dem path=usr/demo/gnuplot/heatmaps.dem
+file demo/hemisphr.dat path=usr/demo/gnuplot/hemisphr.dat
+file demo/hexa.fnc path=usr/demo/gnuplot/hexa.fnc
+file demo/hidden.dem path=usr/demo/gnuplot/hidden.dem
+file demo/hidden2.dem path=usr/demo/gnuplot/hidden2.dem
+file demo/histerror.dat path=usr/demo/gnuplot/histerror.dat
+file demo/histograms.dem path=usr/demo/gnuplot/histograms.dem
+file demo/histograms2.dem path=usr/demo/gnuplot/histograms2.dem
+file demo/histopt.dat path=usr/demo/gnuplot/histopt.dat
+file demo/hypertext.dem path=usr/demo/gnuplot/hypertext.dem
+file demo/image.dem path=usr/demo/gnuplot/image.dem
+file demo/image2.dem path=usr/demo/gnuplot/image2.dem
+file demo/imageNaN.dem path=usr/demo/gnuplot/imageNaN.dem
+file demo/immigration.dat path=usr/demo/gnuplot/immigration.dat
+file demo/iterate.dem path=usr/demo/gnuplot/iterate.dem
+file demo/kdensity2d.dem path=usr/demo/gnuplot/kdensity2d.dem
+file demo/key.dem path=usr/demo/gnuplot/key.dem
+file demo/klein.dat path=usr/demo/gnuplot/klein.dat
+file demo/layout.dem path=usr/demo/gnuplot/layout.dem
+file demo/lcdemo.dat path=usr/demo/gnuplot/lcdemo.dat
+file demo/lena-keypoints.bin path=usr/demo/gnuplot/lena-keypoints.bin
+file demo/lena.rgb path=usr/demo/gnuplot/lena.rgb
+file demo/line.fnc path=usr/demo/gnuplot/line.fnc
+file demo/lines_arrows.dem path=usr/demo/gnuplot/lines_arrows.dem
+file demo/linkedaxes.dem path=usr/demo/gnuplot/linkedaxes.dem
+file demo/macros.dem path=usr/demo/gnuplot/macros.dem
+file demo/margins.dem path=usr/demo/gnuplot/margins.dem
+file demo/matrix_index.dem path=usr/demo/gnuplot/matrix_index.dem
+file demo/mgr.dem path=usr/demo/gnuplot/mgr.dem
+file demo/molecule.dem path=usr/demo/gnuplot/molecule.dem
+file demo/moli3.dat path=usr/demo/gnuplot/moli3.dat
+file demo/mouselab_1.dem path=usr/demo/gnuplot/mouselab_1.dem
+file demo/mouselab_2.dem path=usr/demo/gnuplot/mouselab_2.dem
+file demo/mouselabels.dem path=usr/demo/gnuplot/mouselabels.dem
+file demo/mousevariables.dem path=usr/demo/gnuplot/mousevariables.dem
+file demo/multiaxis.dem path=usr/demo/gnuplot/multiaxis.dem
+file demo/multimsh.dem path=usr/demo/gnuplot/multimsh.dem
+file demo/multipalette.dem path=usr/demo/gnuplot/multipalette.dem
+file demo/multiplt.dem path=usr/demo/gnuplot/multiplt.dem
+file demo/named_var.dem path=usr/demo/gnuplot/named_var.dem
+file demo/nokey.dem path=usr/demo/gnuplot/nokey.dem
+file demo/optimize.dat path=usr/demo/gnuplot/optimize.dat
+file demo/orbital_elements.dat path=usr/demo/gnuplot/orbital_elements.dat
+file demo/orbits.dem path=usr/demo/gnuplot/orbits.dem
+file demo/parallel.dem path=usr/demo/gnuplot/parallel.dem
+file demo/param.dem path=usr/demo/gnuplot/param.dem
+file demo/piecewise.dem path=usr/demo/gnuplot/piecewise.dem
+file demo/plugin/plugin.dem path=usr/demo/gnuplot/plugin.dem
+file demo/pm3d.dem path=usr/demo/gnuplot/pm3d.dem
+file demo/pm3dcolors.dem path=usr/demo/gnuplot/pm3dcolors.dem
+file demo/pm3dgamma.dem path=usr/demo/gnuplot/pm3dgamma.dem
+file demo/pointsize.dem path=usr/demo/gnuplot/pointsize.dem
+file demo/polar.dem path=usr/demo/gnuplot/polar.dem
+file demo/poldat.dem path=usr/demo/gnuplot/poldat.dem
+file demo/prob.dem path=usr/demo/gnuplot/prob.dem
+file demo/prob2.dem path=usr/demo/gnuplot/prob2.dem
+file demo/rainbow.dem path=usr/demo/gnuplot/rainbow.dem
+file demo/random-points path=usr/demo/gnuplot/random-points
+file demo/random.dem path=usr/demo/gnuplot/random.dem
+file demo/rectangle.dem path=usr/demo/gnuplot/rectangle.dem
+file demo/reflect.fnc path=usr/demo/gnuplot/reflect.fnc
+file demo/rgb_variable.dat path=usr/demo/gnuplot/rgb_variable.dat
+file demo/rgb_variable.dem path=usr/demo/gnuplot/rgb_variable.dem
+file demo/rgba_lines.dem path=usr/demo/gnuplot/rgba_lines.dem
+file demo/rgbalpha.dem path=usr/demo/gnuplot/rgbalpha.dem
+file demo/rugplot.dem path=usr/demo/gnuplot/rugplot.dem
 file rundemo path=usr/demo/gnuplot/rundemo mode=555
-file path=usr/demo/gnuplot/running_avg.dem
+file demo/running_avg.dem path=usr/demo/gnuplot/running_avg.dem
 file runtcldemo path=usr/demo/gnuplot/runtcldemo mode=555
-file path=usr/demo/gnuplot/scatter.dem
-file path=usr/demo/gnuplot/scatter2.bin
-file path=usr/demo/gnuplot/scatter2.dat
-file path=usr/demo/gnuplot/silver.dat
-file path=usr/demo/gnuplot/simple.dem
-file path=usr/demo/gnuplot/sine.bin
-file path=usr/demo/gnuplot/singulr.dem
-file path=usr/demo/gnuplot/smooth.dem
-file path=usr/demo/gnuplot/sound.par
-file path=usr/demo/gnuplot/sound2.par
-file path=usr/demo/gnuplot/soundvel.dat
-file path=usr/demo/gnuplot/spline.dem
-file path=usr/demo/gnuplot/srl.dat
-file path=usr/demo/gnuplot/starmap.dem
-file path=usr/demo/gnuplot/start.par
-file path=usr/demo/gnuplot/stat.inc
-file path=usr/demo/gnuplot/stats.dem
-file path=usr/demo/gnuplot/steps.dat
-file path=usr/demo/gnuplot/steps.dem
-file path=usr/demo/gnuplot/stringvar.dem
-file path=usr/demo/gnuplot/surface1.dem
-file path=usr/demo/gnuplot/surface2.dem
-file path=usr/demo/gnuplot/table.dat
-file path=usr/demo/gnuplot/textcolor.dem
-file path=usr/demo/gnuplot/textrotate.dem
-file path=usr/demo/gnuplot/tics.dem
-file path=usr/demo/gnuplot/timedat.dat
-file path=usr/demo/gnuplot/timedat.dem
-file path=usr/demo/gnuplot/transparent.dem
-file path=usr/demo/gnuplot/transparent_solids.dem
-file path=usr/demo/gnuplot/triangle.dat
-file path=usr/demo/gnuplot/using.bin
-file path=usr/demo/gnuplot/using.dat
-file path=usr/demo/gnuplot/using.dem
-file path=usr/demo/gnuplot/utf8.dem
-file path=usr/demo/gnuplot/varcolor.dem
-file path=usr/demo/gnuplot/vector.dem
-file path=usr/demo/gnuplot/whale.dat
-file path=usr/demo/gnuplot/world.cor
-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/$(MACH64)/gnuplot/4.6/gnuplot_x11 mode=555
+file demo/scatter.dem path=usr/demo/gnuplot/scatter.dem
+file demo/scatter2.bin path=usr/demo/gnuplot/scatter2.bin
+file demo/scatter2.dat path=usr/demo/gnuplot/scatter2.dat
+file demo/silver.dat path=usr/demo/gnuplot/silver.dat
+file demo/simple.dem path=usr/demo/gnuplot/simple.dem
+file demo/sine.bin path=usr/demo/gnuplot/sine.bin
+file demo/singulr.dem path=usr/demo/gnuplot/singulr.dem
+file demo/smooth.dem path=usr/demo/gnuplot/smooth.dem
+file demo/sound.par path=usr/demo/gnuplot/sound.par
+file demo/sound2.par path=usr/demo/gnuplot/sound2.par
+file demo/soundvel.dat path=usr/demo/gnuplot/soundvel.dat
+file demo/spline.dem path=usr/demo/gnuplot/spline.dem
+file demo/srl.dat path=usr/demo/gnuplot/srl.dat
+file demo/start.par path=usr/demo/gnuplot/start.par
+file demo/stat.inc path=usr/demo/gnuplot/stat.inc
+file demo/stats.dem path=usr/demo/gnuplot/stats.dem
+file demo/steps.dat path=usr/demo/gnuplot/steps.dat
+file demo/steps.dem path=usr/demo/gnuplot/steps.dem
+file demo/stringvar.dem path=usr/demo/gnuplot/stringvar.dem
+file demo/surface1.dem path=usr/demo/gnuplot/surface1.dem
+file demo/surface2.dem path=usr/demo/gnuplot/surface2.dem
+file demo/table.dat path=usr/demo/gnuplot/table.dat
+file demo/textcolor.dem path=usr/demo/gnuplot/textcolor.dem
+file demo/textrotate.dem path=usr/demo/gnuplot/textrotate.dem
+file demo/tics.dem path=usr/demo/gnuplot/tics.dem
+file demo/timedat.dat path=usr/demo/gnuplot/timedat.dat
+file demo/timedat.dem path=usr/demo/gnuplot/timedat.dem
+file demo/transparent.dem path=usr/demo/gnuplot/transparent.dem
+file demo/transparent_solids.dem path=usr/demo/gnuplot/transparent_solids.dem
+file demo/triangle.dat path=usr/demo/gnuplot/triangle.dat
+file demo/using.bin path=usr/demo/gnuplot/using.bin
+file demo/using.dat path=usr/demo/gnuplot/using.dat
+file demo/using.dem path=usr/demo/gnuplot/using.dem
+file demo/utf8.dem path=usr/demo/gnuplot/utf8.dem
+file demo/varcolor.dem path=usr/demo/gnuplot/varcolor.dem
+file demo/vector.dem path=usr/demo/gnuplot/vector.dem
+file demo/whale.dat path=usr/demo/gnuplot/whale.dat
+file demo/world.cor path=usr/demo/gnuplot/world.cor
+file demo/world.dat path=usr/demo/gnuplot/world.dat
+file demo/world.dem path=usr/demo/gnuplot/world.dem
+file demo/world2.dem path=usr/demo/gnuplot/world2.dem
+file path=usr/lib/$(MACH64)/gnuplot/5.0/gnuplot_x11 mode=555
 link path=usr/share/X11/app-defaults/Gnuplot \
-    target=../../gnuplot/4.6/app-defaults/Gnuplot
-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.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
+    target=../../gnuplot/5.0/app-defaults/Gnuplot
+file path=usr/share/gnuplot/5.0/PostScript/8859-1.ps
+file path=usr/share/gnuplot/5.0/PostScript/8859-15.ps
+file path=usr/share/gnuplot/5.0/PostScript/8859-2.ps
+file path=usr/share/gnuplot/5.0/PostScript/8859-9.ps
+file path=usr/share/gnuplot/5.0/PostScript/aglfn.txt
+file path=usr/share/gnuplot/5.0/PostScript/cp1250.ps
+file path=usr/share/gnuplot/5.0/PostScript/cp1251.ps
+file path=usr/share/gnuplot/5.0/PostScript/cp437.ps
+file path=usr/share/gnuplot/5.0/PostScript/cp850.ps
+file path=usr/share/gnuplot/5.0/PostScript/cp852.ps
+file path=usr/share/gnuplot/5.0/PostScript/koi8r.ps
+file path=usr/share/gnuplot/5.0/PostScript/koi8u.ps
+file path=usr/share/gnuplot/5.0/PostScript/prologue.ps
+file path=usr/share/gnuplot/5.0/PostScript/utf-8.ps
+file path=usr/share/gnuplot/5.0/app-defaults/Gnuplot
+file path=usr/share/gnuplot/5.0/colors_default.gp
+file path=usr/share/gnuplot/5.0/colors_mono.gp
+file path=usr/share/gnuplot/5.0/colors_podo.gp
+file path=usr/share/gnuplot/5.0/gnuplot.gih
+file path=usr/share/gnuplot/5.0/gnuplotrc
+file path=usr/share/gnuplot/5.0/js/README
+file path=usr/share/gnuplot/5.0/js/canvasmath.js
+file path=usr/share/gnuplot/5.0/js/canvastext.js
+file path=usr/share/gnuplot/5.0/js/gnuplot_common.js
+file path=usr/share/gnuplot/5.0/js/gnuplot_dashedlines.js
+file path=usr/share/gnuplot/5.0/js/gnuplot_mouse.css
+file path=usr/share/gnuplot/5.0/js/gnuplot_mouse.js
+file path=usr/share/gnuplot/5.0/js/gnuplot_svg.js
+file path=usr/share/gnuplot/5.0/js/grid.png
+file path=usr/share/gnuplot/5.0/js/help.png
+file path=usr/share/gnuplot/5.0/js/nextzoom.png
+file path=usr/share/gnuplot/5.0/js/previouszoom.png
+file path=usr/share/gnuplot/5.0/js/textzoom.png
+file path=usr/share/gnuplot/5.0/lua/gnuplot-tikz.lua
+file $(MACH64)/docs/gnuplot.info path=usr/share/info/gnuplot.info
 file path=usr/share/man/man1/gnuplot.1 mangler.man.stability=uncommitted
 license gnuplot.license license=other
 depend type=require fmri=__TBD pkg.debug.depend.file=usr/lib/libXevie.so
@@ -265,3 +277,8 @@
     pkg.debug.depend.file=usr/share/fonts/TrueType/liberation/LiberationSans-Regular.ttf
 depend type=require fmri=__TBD \
     pkg.debug.depend.file=usr/share/fonts/X11/Type1/cour.pfa
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/share/ghostscript/fonts/bchb.pfa
+depend type=require fmri=__TBD \
+    pkg.debug.depend.file=usr/share/ghostscript/fonts/p052003l.pfb
+
--- a/components/gnuplot/patches/arial.patch	Fri Jun 24 11:30:54 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,14 +0,0 @@
---- gnuplot-4.4.0/term/gd.trm.orig	Wed Feb 24 18:29:20 2010
-+++ gnuplot-4.4.0/term/gd.trm	Mon Mar 28 16:41:55 2011
-@@ -978,7 +978,11 @@
- 	if (external_default)
- 		png_state.ttffont = gp_strdup(external_default);
- 	else	/* Might as well try some plausible font; it's no worse than failing immediately */
-+#ifndef sun
- 		png_state.ttffont = gp_strdup("arial");
-+#else /* sun */
-+		png_state.ttffont = gp_strdup("LiberationSans-Regular");
-+#endif /* sun */
- 
- 	free(png_state.default_ttffont);
- 	png_state.default_ttffont = gp_strdup(png_state.ttffont);
--- a/components/gnuplot/patches/texinfo.patch	Fri Jun 24 11:30:54 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,11 +0,0 @@
---- gnuplot-4.6.0/docs/gnuplot.texi.orig	Sat Jan 30 16:30:08 2016
-+++ gnuplot-4.6.0/docs/gnuplot.texi	Sat Jan 30 16:34:16 2016
-@@ -17620,7 +17620,7 @@
- @end menu
- 
- @node aed767, aifm, complete_list_of_terminals, complete_list_of_terminals
--@subsubsection aed767
-+@subsection aed767
- 
- @c ?commands set terminal aed767
- @c ?set terminal aed767
--- a/components/gnuplot/patches/wxWidgets3-exit.patch	Fri Jun 24 11:30:54 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,342 +0,0 @@
-Following commit was applied on Gnuplot 4.6.0. It avoids core dump on exit with wxWidgets 3.0.
-It can be removed with Gnuplot update to version 5.0 or later.
-
-https://github.com/gnuplot/gnuplot/commit/40d8c736f742f4c19cc4b5b3b3dc6552c220ae12
-
-From 40d8c736f742f4c19cc4b5b3b3dc6552c220ae12 Mon Sep 17 00:00:00 2001
-From: sfeam <sfeam>
-Date: Fri, 25 Oct 2013 04:45:22 +0000
-Subject: [PATCH] Add private handlers gp_exit() and gp_atexit()
-
-diff --git a/src/command.c b/src/command.c
-index 2c697ae..8662db1 100644
---- a/src/command.c
-+++ b/src/command.c
-@@ -890,7 +890,7 @@ exit_command()
- {
-     /* If the command is "exit gnuplot" then do so */
-     if (equals(c_token+1,"gnuplot"))
--	exit(0);
-+	gp_exit(EXIT_SUCCESS);
- 
-     /* else graphics will be tidied up in main */
-     command_exit_status = 1;
-@@ -2269,7 +2269,7 @@ void
- done(int status)
- {
-     term_reset();
--    exit(status);
-+    gp_exit(status);
- }
- 
- /* please note that the vms version of read_line doesn't support variable line
-diff --git a/src/plot.c b/src/plot.c
-index 96266b5..de3e24a 100644
---- a/src/plot.c
-+++ b/src/plot.c
-@@ -432,7 +432,7 @@ main(int argc, char **argv)
-     /* reset the terminal when exiting */
-     /* this is done through gp_atexit so that other terminal functions
-      * can be registered to be executed before the terminal is reset. */
--    GP_ATEXIT(term_reset);
-+    gp_atexit(term_reset);
- 
- # if defined(_Windows) && ! defined(WGP_CONSOLE)
-     interactive = TRUE;
-@@ -569,7 +569,7 @@ main(int argc, char **argv)
- 	     * In case you don't have one of these functions, or you don't
- 	     * want to use them, 'write_history()' is called directly.
- 	     */
--	    GP_ATEXIT(wrapper_for_write_history);
-+	    gp_atexit(wrapper_for_write_history);
- #endif /* GNUPLOT_HISTORY */
- 
- 	    fprintf(stderr, "\nTerminal type set to '%s'\n", term->name);
-@@ -611,7 +611,7 @@ main(int argc, char **argv)
- #endif /* VMS */
- 	if (!interactive && !noinputfiles) {
- 	    term_reset();
--	    exit(EXIT_FAILURE);	/* exit on non-interactive error */
-+	    gp_exit(EXIT_FAILURE);	/* exit on non-interactive error */
- 	}
-     }
- 
-@@ -642,12 +642,13 @@
- 		--argc; ++argv;
- 		if (argc <= 0) {
- 		    fprintf(stderr, "syntax:  gnuplot -e \"commands\"\n");
--		    return 0;
-+		    gp_exit(EXIT_FAILURE);
- 		}
- 		do_string(*argv);
- 
- 	    } else {
- 		load_file(loadpath_fopen(*argv, "r"), gp_strdup(*argv), FALSE);
-+		gp_exit(EXIT_SUCCESS);
- 	    }
- 	}
- #ifdef _Windows
-@@ -674,6 +674,10 @@ main(int argc, char **argv)
- 
-     /* HBB 20040223: Not all compilers like exit() to end main() */
-     /* exit(exit_status); */
-+#if ! defined(_Windows)
-+    /* Windows does the cleanup later */
-+    gp_exit_cleanup();
-+#endif
-     return exit_status;
- }
- 
-diff --git a/src/stdfn.c b/src/stdfn.c
-index 14526ca..914c7c1 100644
---- a/src/stdfn.c
-+++ b/src/stdfn.c
-@@ -384,6 +384,80 @@ char * gp_basename(char *path)
-     return path;
- }
- 
-+#ifdef HAVE_ATEXIT
-+# define GP_ATEXIT(x) atexit((x))
-+#elif defined(HAVE_ON_EXIT)
-+# define GP_ATEXIT(x) on_exit((x),0)
-+#else
-+# define GP_ATEXIT(x) /* you lose */
-+#endif
-+
-+struct EXIT_HANDLER {
-+    void (*function)(void);
-+    struct EXIT_HANDLER* next;
-+};
-+
-+static struct EXIT_HANDLER* exit_handlers = NULL;
-+
-+/* Calls the cleanup functions registered using gp_atexit().
-+ * Normally gnuplot should be exited using gp_exit(). In some cases, this is not
-+ * possible (notably when returning from main(), where some compilers get
-+ * confused because they expect a return statement at the very end. In that
-+ * case, gp_exit_cleanup() should be called before the return statement.
-+ */
-+void gp_exit_cleanup(void)
-+{
-+    /* Call exit handlers registered using gp_atexit(). This is used instead of
-+     * normal atexit-handlers, because some libraries (notably Qt) seem to have
-+     * problems with the destruction order when some objects are only destructed
-+     * on atexit(3). Circumvent this problem by calling the gnuplot
-+     * atexit-handlers, before any global destructors are run.
-+     */
-+    while (exit_handlers) {
-+        struct EXIT_HANDLER* handler = exit_handlers;
-+        (*handler->function)();
-+        /* note: assumes that function above has not called gp_atexit() */
-+        exit_handlers = handler->next;
-+        free(handler);
-+    }
-+}
-+
-+/* Called from exit(3). Verifies that all exit handlers have already been
-+ * called.
-+ */
-+static void debug_exit_handler(void)
-+{
-+    if (exit_handlers) {
-+        fprintf(stderr, "Gnuplot not exited using gp_exit(). Exit handlers may"
-+                "not work correctly!\n");
-+        gp_exit_cleanup();
-+    }
-+}
-+
-+/* Gnuplot replacement for atexit(3) */
-+void gp_atexit(void (*function)(void))
-+{
-+    /* Register new handler */
-+    static bool debug_exit_handler_registered = false;
-+    struct EXIT_HANDLER* new_handler = (struct EXIT_HANDLER*) malloc(sizeof(struct EXIT_HANDLER));
-+    new_handler->function = function;
-+    new_handler->next = exit_handlers;
-+    exit_handlers = new_handler;
-+
-+    if (!debug_exit_handler_registered) {
-+        GP_ATEXIT(debug_exit_handler);
-+        debug_exit_handler_registered = true;
-+    }
-+}
-+
-+/* Gnuplot replacement for exit(3). Calls the functions registered using
-+ * gp_atexit(). Always use this function instead of exit(3)!
-+ */
-+void gp_exit(int status)
-+{
-+    gp_exit_cleanup();
-+    exit(status);
-+}
- 
- #if !defined(HAVE_DIRENT_H) && defined(WIN32)  && (!defined(__WATCOMC__))
- /* BM: OpenWatcom has dirent functions in direct.h!*/
-diff --git a/src/stdfn.h b/src/stdfn.h
-index 9b2be3d..1224f57 100644
---- a/src/stdfn.h
-+++ b/src/stdfn.h
-@@ -370,13 +370,21 @@ size_t strnlen __PROTO((const char *str, size_t n));
- #  define GP_SLEEP(delay) sleep ((unsigned int) (delay+0.5))
- #endif
- 
--#ifdef HAVE_ATEXIT
--# define GP_ATEXIT(x) atexit((x))
--#elif defined(HAVE_ON_EXIT)
--# define GP_ATEXIT(x) on_exit((x),0)
--#else
--# define GP_ATEXIT(x) /* you lose */
--#endif
-+/* Gnuplot replacement for atexit(3) */
-+void gp_atexit __PROTO((void (*function)(void)));
-+
-+/* Gnuplot replacement for exit(3). Calls the functions registered using
-+ * gp_atexit(). Always use this function instead of exit(3)!
-+ */
-+void gp_exit __PROTO((int status));
-+
-+/* Calls the cleanup functions registered using gp_atexit().
-+ * Normally gnuplot should be exited using gp_exit(). In some cases, this is not
-+ * possible (notably when returning from main(), where some compilers get
-+ * confused because they expect a return statement at the very end. In that
-+ * case, gp_exit_cleanup() should be called before the return statement.
-+ */
-+void gp_exit_cleanup __PROTO((void));
- 
- char * gp_basename __PROTO((char *path));
- 
-diff --git a/src/wxterminal/gp_cairo.c b/src/wxterminal/gp_cairo.c
-index cc5a54a..35227fd 100644
---- a/src/wxterminal/gp_cairo.c
-+++ b/src/wxterminal/gp_cairo.c
-@@ -1724,7 +1724,7 @@
- 	if (cairo_status (plot->cr)) {
- 		printf("Cairo is unhappy: %s\n",
- 			cairo_status_to_string (cairo_status (plot->cr)));
--		exit(0);
-+		gp_exit(EXIT_FAILURE);
- 	}
- 	cairo_set_source_rgb(plot->cr, plot->background.r, plot->background.g, plot->background.b);
- 	cairo_paint(plot->cr);
-@@ -1735,7 +1735,7 @@
- 	if (cairo_status (plot->cr)) {
- 		printf("Cairo is unhappy: %s\n",
- 			cairo_status_to_string (cairo_status (plot->cr)));
--		exit(0);
-+		gp_exit(EXIT_FAILURE);
- 	}
- 	cairo_set_source_rgba(plot->cr, 0.0, 0.0, 0.0, 0.0);
- 	cairo_paint(plot->cr);
-diff --git a/src/wxterminal/gp_cairo_helpers.c b/src/wxterminal/gp_cairo_helpers.c
-index 76f773c..eb38f65 100644
---- a/src/wxterminal/gp_cairo_helpers.c
-+++ b/src/wxterminal/gp_cairo_helpers.c
-@@ -61,7 +61,7 @@ unsigned int * gp_cairo_helper_coordval_to_chars(coordval* image, int M, int N,
- 	/* cairo image buffer, upper bits are alpha, then r, g and b
- 	 * Depends on endianess */
- 	image255 = (unsigned int*) malloc(M*N*sizeof(unsigned int));
--	if (!image255) { fprintf(stderr,"cairo terminal: out of memory!\n"); exit(-1);}
-+	if (!image255) { fprintf(stderr,"cairo terminal: out of memory!\n"); gp_exit(EXIT_FAILURE);}
- 	image255copy = image255;
- 
- 	/* TrueColor 24-bit plot->color mode */
-diff --git a/src/wxterminal/wxt_gui.cpp b/src/wxterminal/wxt_gui.cpp
-index 3f6cb53..105340b 100644
---- a/src/wxterminal/wxt_gui.cpp
-+++ b/src/wxterminal/wxt_gui.cpp
-@@ -1566,7 +1566,7 @@
- 		if (!wxInitialize()) {
- 			fprintf(stderr,"Failed to initialize wxWidgets.\n");
- 			wxt_abort_init = true;
--			return;
-+			gp_exit(EXIT_FAILURE);
- 		}
- 
- 		/* app initialization */
-@@ -1600,7 +1600,7 @@ void wxt_init()
- 		term_interlock = (void *)wxt_init;
- 
- 		/* register call for "persist" effect and cleanup */
--		GP_ATEXIT(wxt_atexit);
-+		gp_atexit(wxt_atexit);
- 	}
- 
- 	wxt_sigint_check();
---- a/term/be.trm
-+++ b/term/be.trm
-@@ -165,7 +165,7 @@ BE_args(int argc, char *argv[])
- 
-     if (!xargv) {
- 	fputs ("not enough memory to copy argv - quitting\n", stderr);
--	exit (EXIT_FAILURE);
-+	gp_exit (EXIT_FAILURE);
-     }
- 
-     /* We make a copy of the argument vector because
-@@ -231,7 +231,7 @@ BE_init()
- 	    execvp(BE_command, optvec);
- 	    /* if we get here, something went wrong */
- 	    perror("exec failed");
--	    exit(1);
-+	    gp_exit(EXIT_FAILURE);
- 	}
- 	/* parent */
- 	close(fdes[0]);		/* read end of pipe */
-@@ -239,7 +239,7 @@ BE_init()
-     } {
- 	static int been_here = 0;
- 	if (!been_here) {
--	    atexit(BE_atexit);
-+	    gp_atexit(BE_atexit);
- 	    been_here = 1;
- 	}
-     }
-diff --git a/term/x11.trm b/term/x11.trm
-index b0c5d1c..1e68684 100644
---- a/term/x11.trm
-+++ b/term/x11.trm
-@@ -1004,7 +1004,7 @@ X11_init()
- 	    fprintf(stderr,"Expected X11 driver: %s\n",X11_full_command_path);
- 	    perror("Exec failed");
- 	    fprintf(stderr,"See 'help x11' for more details\n");
--	    exit(EXIT_FAILURE);
-+	    gp_exit(EXIT_FAILURE);
- 	}
- 	/* parent */
- # ifdef PIPE_IPC
-@@ -1037,7 +1037,7 @@ X11_init()
-     }
- 
-     if (!been_here) {
--	GP_ATEXIT(X11_atexit);
-+	gp_atexit(X11_atexit);
- 	been_here++;
-     }
-     X11_send_endianess();
-@@ -1101,7 +1101,7 @@ X11_reset()
- 
- #define BEFORE_GRAPHICS \
-  if (!(X11_ipc = fopen(X11_tmp0, "w"))) { \
--   perror(X11_tmp0); system(X11_shutdown); exit(1); \
-+   perror(X11_tmp0); system(X11_shutdown); gp_exit(EXIT_FAILURE); \
-  }
- 
- #define AFTER_TEXT \
-@@ -1229,7 +1229,7 @@ X11_init()
-     {
- 	static int been_here = 0;
- 	if (!been_here) {
--	    GP_ATEXIT(X11_atexit);
-+	    gp_atexit(X11_atexit);
- 	    been_here = 1;
- 	}
-     }
-@@ -1252,7 +1252,7 @@ do { \
-    } \
-    status = sys$qiow(0, X11_channel, IO$_WRITEVBLK, &iosb, 0, 0, buffer, strlen(buffer), 0, 0, 0, 0); \
-    if ((status & SS$_NORMAL) == SS$_NORMAL) status = iosb.stat; \
--   if((status & SS$_NORMAL) != SS$_NORMAL) exit(status); \
-+   if((status & SS$_NORMAL) != SS$_NORMAL) gp_exit(status); \
-  } while (0)
- 
- #define PRINT0(fmt)          GO((buffer, fmt))
--- a/components/gnuplot/patches/wxWidgets3.patch	Fri Jun 24 11:30:54 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,51 +0,0 @@
-Oficial fixes to make Gnuplot work with wxWidgets 3.0.
-Can be removed with Gnuplot update to version 5.0 or later.
-
-https://github.com/gnuplot/gnuplot/commit/a275a85b335fb358cea09d7e64204caca3193e1a
-https://github.com/gnuplot/gnuplot/commit/632f86b64659b9ad14bfae1c850ce268f0d39352
-
---- gnuplot-4.6.0/src/wxterminal/wxt_gui.h
-+++ gnuplot-4.6.0/src/wxterminal/wxt_gui.h
-@@ -203,6 +203,8 @@
-  * ====================================================================*/
- 
- #ifdef WXT_MULTITHREADED
-+#include <X11/Xlib.h>	/* Magic fix for linking against wxgtk3.0 */
-+
- /* thread class, where the gui loop runs.
-  * Not needed with Windows, where the main loop
-  * already processes the gui messages */
-@@ -234,6 +236,10 @@
- class wxtApp : public wxApp
- {
- public:
-+#ifdef WXT_MULTITHREADED 
-+	/* Magic fix needed by wxgtk3.0 */
-+	wxtApp() : wxApp() { XInitThreads(); } 
-+#endif 
- 	/* This one is called just after wxWidgets initialization */
- 	bool OnInit();
- 	/* cleanup on exit */
---- gnuplot-4.6.0/src/wxterminal/wxt_gui.cpp
-+++ gnuplot-4.6.0/src/wxterminal/wxt_gui.cpp
-@@ -2493,6 +2498,20 @@
- /* refresh the plot by (re)processing the plot commands list */
- void wxtPanel::wxt_cairo_refresh()
- {
-+	/* This check may prevent the assert+die behavior seen with wxgtk3.0 */
-+	/* Symptom:
-+	  ./src/gtk/dcclient.cpp(2043): assert "m_window" failed in DoGetSize(): GetSize() doesn't work without window [in thread 7fb21f386700]
-+	  Call stack:
-+	  [00] wxOnAssert(char const*, int, char const*, char const*, wchar_t const*)
-+	  [01] wxClientDCImpl::DoGetSize(int*, int*) const
-+	  [02] wxBufferedDC::UnMask()                  
-+	  wxwidgets documentation to the contrary, panel->IsShownOnScreen() is unreliable
-+	 */
-+	if (!wxt_current_window) {
-+		FPRINTF((stderr,"wxt_cairo_refresh called before window exists\n"));
-+		return;
-+	}
-+
- 	/* Clear background. */
- 	gp_cairo_solid_background(&plot);
- 
--- a/components/gnuplot/rundemo	Fri Jun 24 11:30:54 2016 -0700
+++ b/components/gnuplot/rundemo	Fri Jun 24 16:19:17 2016 -0700
@@ -20,7 +20,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 # Unfortunately, the gnuplot demo wants run in the
@@ -53,7 +53,6 @@
 GNUPLOT_DEMO_LIST="$GNUPLOT_DEMO_DIR/*.bin \
     $GNUPLOT_DEMO_DIR/*.cfg \
     $GNUPLOT_DEMO_DIR/*.cor \
-    $GNUPLOT_DEMO_DIR/*.csv \
     $GNUPLOT_DEMO_DIR/*.dat \
     $GNUPLOT_DEMO_DIR/*.dem \
     $GNUPLOT_DEMO_DIR/*.edf \
@@ -67,6 +66,7 @@
     $GNUPLOT_DEMO_DIR/binary[123] \
     $GNUPLOT_DEMO_DIR/bldg.png \
     $GNUPLOT_DEMO_DIR/gnu-valley \
+    $GNUPLOT_DEMO_DIR/demo_plugin.so \
     $GNUPLOT_DEMO_DIR/random-points \
     $GNUPLOT_DEMO_P052003L_PFB \
     $GNUPLOT_DEMO_P052023L_PFB \
--- a/components/gnuplot/runtcldemo	Fri Jun 24 11:30:54 2016 -0700
+++ b/components/gnuplot/runtcldemo	Fri Jun 24 16:19:17 2016 -0700
@@ -20,7 +20,7 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 # Unfortunately, the gnuplot demo wants run in the
@@ -50,7 +50,6 @@
 GNUPLOT_DEMO_LIST="$GNUPLOT_DEMO_DIR/*.bin \
     $GNUPLOT_DEMO_DIR/*.cfg \
     $GNUPLOT_DEMO_DIR/*.cor \
-    $GNUPLOT_DEMO_DIR/*.csv \
     $GNUPLOT_DEMO_DIR/*.dat \
     $GNUPLOT_DEMO_DIR/*.dem \
     $GNUPLOT_DEMO_DIR/*.edf \
@@ -64,6 +63,7 @@
     $GNUPLOT_DEMO_DIR/binary[123] \
     $GNUPLOT_DEMO_DIR/bldg.png \
     $GNUPLOT_DEMO_DIR/gnu-valley \
+    $GNUPLOT_DEMO_DIR/demo_plugin.so \
     $GNUPLOT_DEMO_DIR/random-points \
     $GNUPLOT_DEMO_DIR/gpdemos.tcl \
     $GNUPLOT_DEMO_P052003L_PFB \