Import of pkgsrc-2014Q1

graphics/gnuplot/Makefile

@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.79 2013/06/06 12:54:30 wiz Exp $
+# $NetBSD: Makefile,v 1.86 2014/02/12 23:18:00 tron Exp $
 
-DISTNAME=	gnuplot-4.6.3
-PKGREVISION=	3
+DISTNAME=	gnuplot-4.6.4
+PKGREVISION=	1
 CATEGORIES+=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gnuplot/}
 
@@ -27,21 +27,9 @@ CONFIGURE_ARGS+=	--without-tutorial
 CONFIGURE_ARGS+=	ac_cv_prog_EMACS=
 INFO_FILES=		yes
 
-# Use BSD editline wherever possible:
-.include "../../mk/bsd.prefs.mk"
-
-.if !empty(OPSYS:M*BSD) || ${OPSYS} == "DragonFly" || ${OPSYS} == "Darwin"
-.  if ${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[01234].*)
-CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
-.include "../../devel/readline/buildlink3.mk"
-.  else
 CONFIGURE_ARGS+=	--with-readline=bsd
+.include "../../mk/readline.buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
-.  endif
-.else
-CONFIGURE_ARGS+=	--with-readline=${BUILDLINK_PREFIX.readline}
-.include "../../devel/readline/buildlink3.mk"
-.endif
 
 LDFLAGS.SunOS+=		-liconv
 

graphics/gnuplot/distinfo

@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.22 2013/05/16 14:17:04 adam Exp $
+$NetBSD: distinfo,v 1.25 2014/03/25 23:19:19 asau Exp $
 
-SHA1 (gnuplot-4.6.3.tar.gz) = f01e417dc9504a05fd5cc2595b05ccb58bcea5b2
-RMD160 (gnuplot-4.6.3.tar.gz) = 42ff3a2066e5089b19c52a88cd2c17d9db87681d
-Size (gnuplot-4.6.3.tar.gz) = 4973116 bytes
+SHA1 (gnuplot-4.6.4.tar.gz) = 54ee5ce9a0a2698b046064bd275e772673350013
+RMD160 (gnuplot-4.6.4.tar.gz) = a2dcc9d7768b9fbd12fa0993c6d40d059f57215e
+Size (gnuplot-4.6.4.tar.gz) = 4974176 bytes
 SHA1 (patch-aa) = fa5981422c83d1467b0df8a7c36ce7b2439855f2
-SHA1 (patch-ac) = 271c107d7793d8817221474eca4b5da78abad9c9
+SHA1 (patch-ac) = ba7d48926faca78399fe10f44020364a244f87e0
 SHA1 (patch-ad) = 5165374c6e8275f2f030659daa45051851e98413
 SHA1 (patch-ae) = ce2a89ebcdcae1b1945563b48e6ebb6974d3a048
 SHA1 (patch-af) = e5672a05f88d0ba3c1471b379dd47cd1b274f8b1
 SHA1 (patch-ag) = 8a27282ee0e9add193e3437e2f88dac149e40068
 SHA1 (patch-ah) = e4024ebbc039d7b5e741aa109259de6269b03765
+SHA1 (patch-docs_gnuplot.texi) = fd9e1eccf64198336e9ba80997b022612101ac77

graphics/gnuplot/patches/patch-ac

@@ -1,15 +1,19 @@
-$NetBSD: patch-ac,v 1.2 2012/08/10 15:14:54 drochner Exp $
+$NetBSD: patch-ac,v 1.3 2014/03/25 23:19:19 asau Exp $
 
 NetBSD editline keeps header files in "readline", not "editline".
 Same applies to DragonFly.
+FreeBSD requires additional header file to get access to history.
 
 --- src/gp_hist.h.orig	2011-02-21 07:56:57.000000000 +0000
 +++ src/gp_hist.h
-@@ -70,7 +70,7 @@ extern long int gnuplot_history_size;
+@@ -70,7 +70,10 @@ extern long int gnuplot_history_size;
   * (almost) compatible readline replacement
   */
  #if defined(HAVE_LIBEDITLINE)
 -# include <editline/readline.h>
++# if defined(__FreeBSD__)
++#   include <readline/history.h>
++# endif
 +# include <readline/readline.h>
  #endif
  

graphics/gnuplot/patches/patch-docs_gnuplot.texi

@@ -0,0 +1,19 @@
+$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