(pkgsrc)

  - Two targets added, post-build: and post-install:,
    to build gnuplot.pdf (which was in 4.6.6 PLIST),
    and two dependency for above process. Thanks gdt@ for comment.

(upstream)
  - Update 4.6.6 to 5.0.0
---------------------
		GNUPLOT Version 5.0 Release Notes
		=================================

Gnuplot version 5 contains significant new capabilities and enhancements.
The most recent previous release was 4.6 patchlevel 6 (4.6.6).
Please see the NEWS file for bugfixes and minor changes to version 5.0
applied after feedback on release candidates -rc1, -rc2, and -rc3.

Release Notes date: 31 December 2014

NOTABLE NEW FEATURES
====================

* New plot styles "with parallelaxes" and labeled contours.

* New coordinate system (Degrees, Minutes, Seconds) "set xdata geographic".

* The "fit" command can now handle functions with up to 12 variables, and
  can take into account errors on x as well as errors on dependent variables.
  Final covariance terms are stored in user-accessible variables.
  Fitting options are now controlled by the command "set fit ..." rather than
  by environmental variables.

* The interpretation of columns in a "fit" command depends on new keywords
  "error", "xyerror", "zerror".  In most cases the program can also recognize
  version 4 syntax (no error keyword but last column contains zerror).

* The dot/dash pattern of a line can now be controlled independently
  from other line properties using the keyword "dashtype".

* The default color of individual line types can be changed using
  "set linetype" (introduced in 4.6). In version 5 a default overall color
  sequence can be selected using "set colors {default|classic|podo}".
  The "classic" sequence is red/green/blue/magenta/cyan/yellow as used by
  older gnuplot versions.  The default and podo colors are chosen to be
  more easily distinguished in print and in particular by people with color
  vision problems.

* Text markup now supports bold and italic font settings in addition to
  the subscript, superscript, font size and other options previously
  provided by the "enhanced text" mode.  This mode is now the default.

* Command scripts may place in-line data in a named data block for
  repeated plotting.

* Bit shift operators << and >>

* RGB colors can include an alpha-channel for transparency.
       # ARGBcolor = (Alpha << 24) + (Red << 16) + (Green << 8) + Blue

* Secondary axes (x2, y2) can be locked to the primary axis via a mapping
  function.  In the simplest case this guarantees that the primary and
  secondary axis ranges are identical.  In the general case it allows you
  to define a non-linear axis, something that previously was only possible
  for the special case of log scaling.

* The "import" command attaches a user-defined function name to a
  function provided by an extenal shared object (i.e. a plugin library).

* Previous commands in the history list of an interactive session can be
  reexecuted by number.  For example "history !5" will reexecute the
  command numbered 5 in the list reported by "history".

* Hypertext labels in the interactive terminals including web display
  using the HTML canvas or svg terminals.

Many other additions are described in the "New Features" section of the
documentation.


CHANGES
=======

Gnuplot development assigns very high priority to backward compatibility
with earlier versions.  For example any command script that worked in
version 4.0 is expected to continue to work for all version 4 releases
including the most recent one (4.6.6).  However changes introduced in
version 5 can affect the operation of some version 4 scripts.

A brief summary of potentially incompatible changes is given here.

* Earlier versions of gnuplot used the keyword "linetype" to mean both
  the color and the solid/dot/dash pattern of a line.  Version 5 has
  separate keywords "linecolor" and "dashtype".  You can use these keywords
  directly in a plot command or assign any desired color and a dash pattern
  to a linetype.  The program now provides a default set of 8 linetypes, all solid.
  You can change these or add new linetypes as you please. You do not need
  to change the current terminal or terminal mode in order to use dashed lines.

* The handling of input data containing NaN, Inf, an inconsistent number of
  data columns, or other unexpected content has changed. See documentation
  under "missing" for examples and figures.

* Time coordinates are stored internally as the number of seconds relative
  to the standard unix epoch 1-Jan-1970.  Earlier versions of gnuplot used
  a different epoch internally (1-Jan-2000). This change resolves
  inconsistencies introduced when time in seconds was generated externally.
  The epoch convention used by a particular gnuplot installation can be
  determined using the command `print strftime("%F",0)`.
  Time is now stored to at least millisecond precision.

* The function `timecolumn(N,"timeformat")` now has 2 parameters.
  Because the second parameter is not associated with any particular data axis,
  this allows using the `timecolumn` function to read time data for reasons
  other than specifying the x or y coordinate.  Use of time formats
  to generate axis tick labels is now controlled by "set {xy}tics time" rather
  than by "set {xy}data time".  Thus prior calls to `set xdata time` or
  `set timefmt x` are unnecessary for either input or output.
  These older commands still work, but are deprecated.

* The "reverse" keyword (e.g. "set xrange [*:*] reverse") now affects only
  autoscaling.  It has no effect on explicit ranges.
  "set xrange [0:1] reverse" is _not_ the same as "set xrange [1:0]".

* Options to the "fit" command are now given by "set fit ..." rather than
  by setting environmental variables.  Fit can handle up to MAX_NUM_VAR
  independent variables (currently 12).  Variables other than the first
  two (x, y) have been dissociated from axis names.  This means, for example,
  "set urange [U1:U2]" has no effect on fitting because "u" is not a fit
  variable.  Use the command "set dummy ..." to assign names to fit variables
  3 ... 12.

* The `call` command is implemented by providing a set of variables ARGC,
  ARG0, ..., ARG9. ARG0 holds the name of the script file being executed.
  ARG1 to ARG9 are string variables and thus may either be referenced directly
  or expanded as macros, e.g. @ARG1.  The older convention for referencing
  call parameters as tokens $0 ... $9 is deprecated.

* "unset xrange" (and other axis ranges) restores the default range.

* "unset terminal" restores the original terminal of the current session.

5 files changed, 55 insertions, 34 deletions

diff --git a/graphics/gnuplot/Makefile b/graphics/gnuplot/Makefile
index 966e6a35598..ef8b467a0dc 100644
--- a/graphics/gnuplot/Makefile
+++ b/graphics/gnuplot/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.95 2015/03/01 12:58:10 mef Exp $
+# $NetBSD: Makefile,v 1.96 2015/03/03 15:22:20 mef Exp $
 
-DISTNAME=	gnuplot-4.6.6
+DISTNAME=	gnuplot-5.0.0
 API_VERSION=	${PKGVERSION:C/([0-9])\.([0-9])\.([0-9])/\1.\2/}
 CATEGORIES+=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnuplot/}
@@ -26,11 +26,15 @@ CONFIGURE_ARGS+=	--without-tutorial
 CONFIGURE_ARGS+=	ac_cv_prog_EMACS=
 INFO_FILES=		yes
 
+# to build doc/gnuplot.pdf
+BUILD_DEPENDS+=		tex-latex-bin-[0-9]*:../../print/tex-latex-bin
+BUILD_DEPENDS+=		tex-ucs-[0-9]*:../../print/tex-ucs
+
 CONFIGURE_ARGS+=	--with-readline=bsd
 .include "../../mk/readline.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 
-PLIST_SUBST=		API_VERSION=${API_VERSION}
+PLIST_SUBST+=		API_VERSION=${API_VERSION}
 LDFLAGS.SunOS+=		-liconv
 
 # Make this available to patch-ah so the font path can include pkgsrc fonts.
@@ -40,6 +44,13 @@ SUBST_MESSAGE.fontpath=	Fixing font path.
 SUBST_FILES.fontpath=	src/variable.c
 SUBST_SED.fontpath=	-e 's,@PKGSRC_PREFIX@,"${PREFIX}",'
 
+post-build:
+	(cd ${WRKSRC}/docs; ${GMAKE} gnuplot.pdf)
+
+post-install:
+	(cd ${WRKSRC}/docs; \
+	${INSTALL_DATA} gnuplot.pdf ${DESTDIR}${PREFIX}/share/gnuplot/${API_VERSION})
+
 .include "options.mk"
 
 .include "../../converters/libiconv/buildlink3.mk"
diff --git a/graphics/gnuplot/PLIST b/graphics/gnuplot/PLIST
index 9ac4ba7bffc..a2abaa95784 100644
--- a/graphics/gnuplot/PLIST
+++ b/graphics/gnuplot/PLIST
@@ -1,8 +1,9 @@
-@comment $NetBSD: PLIST,v 1.18 2015/03/01 12:58:10 mef Exp $
+@comment $NetBSD: PLIST,v 1.19 2015/03/03 15:22:20 mef Exp $
 bin/gnuplot
 ${PLIST.qt4}libexec/gnuplot/${API_VERSION}/gnuplot_qt
 ${PLIST.x11}libexec/gnuplot/${API_VERSION}/gnuplot_x11
 man/man1/gnuplot.1
+man/man1/gnuplot-ja.1
 share/gnuplot/${API_VERSION}/PostScript/8859-1.ps
 share/gnuplot/${API_VERSION}/PostScript/8859-15.ps
 share/gnuplot/${API_VERSION}/PostScript/8859-2.ps
@@ -10,6 +11,7 @@ share/gnuplot/${API_VERSION}/PostScript/8859-9.ps
 share/gnuplot/${API_VERSION}/PostScript/aglfn.txt
 share/gnuplot/${API_VERSION}/PostScript/cp1250.ps
 share/gnuplot/${API_VERSION}/PostScript/cp1251.ps
+share/gnuplot/${API_VERSION}/PostScript/cp1252.ps
 share/gnuplot/${API_VERSION}/PostScript/cp437.ps
 share/gnuplot/${API_VERSION}/PostScript/cp850.ps
 share/gnuplot/${API_VERSION}/PostScript/cp852.ps
@@ -36,6 +38,7 @@ share/gnuplot/${API_VERSION}/js/grid.png
 share/gnuplot/${API_VERSION}/js/help.png
 share/gnuplot/${API_VERSION}/js/nextzoom.png
 share/gnuplot/${API_VERSION}/js/previouszoom.png
+share/gnuplot/${API_VERSION}/js/return.png
 share/gnuplot/${API_VERSION}/js/textzoom.png
 share/gnuplot/${API_VERSION}/lua/gnuplot-tikz.lua
 ${PLIST.qt4}share/gnuplot/${API_VERSION}/qt/qtgnuplot_fr.qm
diff --git a/graphics/gnuplot/distinfo b/graphics/gnuplot/distinfo
index 236b5be8b23..9729a274460 100644
--- a/graphics/gnuplot/distinfo
+++ b/graphics/gnuplot/distinfo
@@ -1,13 +1,12 @@
-$NetBSD: distinfo,v 1.28 2014/11/18 22:19:47 adam Exp $
+$NetBSD: distinfo,v 1.29 2015/03/03 15:22:20 mef Exp $
 
-SHA1 (gnuplot-4.6.6.tar.gz) = 012bd22b7be32da186b6bb015c0c6d876926c90b
-RMD160 (gnuplot-4.6.6.tar.gz) = eb1185c94d93d19b272311c71d93ba3402eea030
-Size (gnuplot-4.6.6.tar.gz) = 5059214 bytes
+SHA1 (gnuplot-5.0.0.tar.gz) = ca5163e3cb466b4aeb878f1173b0fe624367f08a
+RMD160 (gnuplot-5.0.0.tar.gz) = e91ae15d1b50110d323450be451db5d180917f4d
+Size (gnuplot-5.0.0.tar.gz) = 4955900 bytes
 SHA1 (patch-aa) = fa5981422c83d1467b0df8a7c36ce7b2439855f2
 SHA1 (patch-ac) = ba7d48926faca78399fe10f44020364a244f87e0
 SHA1 (patch-ad) = 5165374c6e8275f2f030659daa45051851e98413
 SHA1 (patch-ae) = ce2a89ebcdcae1b1945563b48e6ebb6974d3a048
 SHA1 (patch-af) = e5672a05f88d0ba3c1471b379dd47cd1b274f8b1
-SHA1 (patch-ag) = 8a27282ee0e9add193e3437e2f88dac149e40068
+SHA1 (patch-ag) = 92a5d18f47f44e799e5f7e24bb232024f2f8d928
 SHA1 (patch-ah) = f768abaddc7b326648e36f82b3edd2c9bead8b11
-SHA1 (patch-docs_gnuplot.texi) = fd9e1eccf64198336e9ba80997b022612101ac77
diff --git a/graphics/gnuplot/patches/patch-ag b/graphics/gnuplot/patches/patch-ag
index b86b0259299..04d34609f2f 100644
--- a/graphics/gnuplot/patches/patch-ag
+++ b/graphics/gnuplot/patches/patch-ag
@@ -1,13 +1,22 @@
-$NetBSD: patch-ag,v 1.6 2012/11/07 19:22:05 he Exp $
+$NetBSD: patch-ag,v 1.7 2015/03/03 15:22:20 mef Exp $
 
 NetBSD editline keeps header files in "readline", not "editline".
 Same applies to DragonFly.
 
 Also get rid of a non-portable "test ... ==" instance.
 
---- configure.orig	2012-09-26 23:06:30.000000000 +0000
-+++ configure
-@@ -9197,9 +9197,9 @@ fi
+--- configure.orig	2015-01-02 04:27:52.000000000 +0900
++++ configure	2015-03-01 21:42:48.000000000 +0900
+@@ -8861,7 +8861,7 @@ $as_echo "yes" >&6; }
+ 
+ # Check whether --with-aquaterm was given.
+ if test "${with_aquaterm+set}" = set; then :
+-  withval=$with_aquaterm; if test "$withval" == yes; then
++  withval=$with_aquaterm; if test "$withval" = yes; then
+ 
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Aquaterm framework presence" >&5
+ $as_echo_n "checking for Aquaterm framework presence... " >&6; }
+@@ -10164,9 +10164,9 @@ fi
  
  $as_echo "#define HAVE_LIBEDITLINE 1" >>confdefs.h
  
@@ -19,7 +28,7 @@ Also get rid of a non-portable "test ... ==" instance.
  if test "x$ac_cv_header_editline_readline_h" = xyes; then :
    cat >>confdefs.h <<_ACEOF
  #define HAVE_EDITLINE_READLINE_H 1
-@@ -15340,7 +15340,7 @@ $as_echo "    tek40xx, tek410x, texdraw,
+@@ -16239,7 +16241,7 @@ $as_echo "    tek40xx, tek410x, texdraw,
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
  $as_echo "" >&6; }
  
@@ -28,3 +37,21 @@ Also get rid of a non-portable "test ... ==" instance.
    { $as_echo "$as_me:${as_lineno-$LINENO}: result:   dot-matrix terminals: yes ( --without-bitmap-terminals to disable)" >&5
  $as_echo "  dot-matrix terminals: yes ( --without-bitmap-terminals to disable)" >&6; }
  else
+@@ -16327,7 +16329,7 @@ else
+ $as_echo "  ggi terminal: no (use --with-ggi to enable, requires libggi)" >&6; }
+ fi
+ 
+-if test "$with_gpic" == yes; then
++if test "$with_gpic" = yes; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result:   gpic terminal: yes" >&5
+ $as_echo "  gpic terminal: yes" >&6; }
+ else
+@@ -16335,7 +16337,7 @@ else
+ $as_echo "  gpic terminal: no   (use --with-gpic to enable)" >&6; }
+ fi
+ 
+-if test "$with_mif" == yes; then
++if test "$with_mif" = yes; then
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result:   mif terminal: yes" >&5
+ $as_echo "  mif terminal: yes" >&6; }
+ else
diff --git a/graphics/gnuplot/patches/patch-docs_gnuplot.texi b/graphics/gnuplot/patches/patch-docs_gnuplot.texi
deleted file mode 100644
index 7fa0b2d37f2..00000000000
--- a/graphics/gnuplot/patches/patch-docs_gnuplot.texi
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-docs_gnuplot.texi,v 1.1 2013/07/09 08:50:34 wiz Exp $
-
-Fix
-> ./gnuplot.texi:17653: raising the section level of @subsubsection which is too low                                                                                                                                
-seen with texinfo-5.1.
-
-More complete fix in
-http://sourceforge.net/p/gnuplot/bugs/1226/
-
---- docs/gnuplot.texi.orig	2013-04-12 17:26:15.000000000 +0000
-+++ docs/gnuplot.texi
-@@ -17564,6 +17564,7 @@ if/else statements.  See `if`.
- 
- @node complete_list_of_terminals,  , Terminal_types, Terminal_types
- @section complete list of terminals
-+@subsection output formats
- 
- @c ?complete list of terminals
- @cindex terminal