Import of pkgsrc-2013Q2

graphics/gnuplot/patches/patch-aa

@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.10 2012/08/10 15:14:54 drochner Exp $
+
+--- src/stdfn.h.orig	2011-09-21 11:43:50.000000000 +0000
++++ src/stdfn.h
+@@ -349,7 +349,7 @@ size_t strnlen __PROTO((const char *str,
+ #endif
+ 
+ /* sleep delay time, where delay is a double value */
+-#if defined(HAVE_USLEEP)
++#if 0 /*defined(HAVE_USLEEP)*/
+ #  define GP_SLEEP(delay) usleep((unsigned int) ((delay)*1e6))
+ #  ifndef HAVE_SLEEP
+ #    define HAVE_SLEEP

graphics/gnuplot/patches/patch-ac

@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.2 2012/08/10 15:14:54 drochner Exp $
+
+NetBSD editline keeps header files in "readline", not "editline".
+Same applies to DragonFly.
+
+--- 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;
+  * (almost) compatible readline replacement
+  */
+ #if defined(HAVE_LIBEDITLINE)
+-# include <editline/readline.h>
++# include <readline/readline.h>
+ #endif
+ 
+ #if defined(READLINE) && !defined(HAVE_LIBREADLINE) && !defined(HAVE_LIBEDITLINE)

graphics/gnuplot/patches/patch-ad

@@ -0,0 +1,16 @@
+$NetBSD: patch-ad,v 1.1 2009/09/14 18:52:03 asau Exp $
+
+NetBSD editline keeps header files in "readline", not "editline".
+Same applies to DragonFly.
+
+--- src/readline.h.orig	2008-12-15 07:18:36.000000000 +0300
++++ src/readline.h	2009-09-14 17:16:14.000000000 +0400
+@@ -51,7 +51,7 @@
+ # include <readline/readline.h>
+ #endif
+ #if defined(HAVE_LIBEDITLINE)
+-# include <editline/readline.h>
++# include <readline/readline.h>
+ #endif
+ 
+ #if defined(HAVE_LIBEDITLINE)

graphics/gnuplot/patches/patch-ae

@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.2 2011/02/08 13:13:41 adam Exp $
+
+NetBSD editline keeps header files in "readline", not "editline".
+Same applies to DragonFly.
+
+--- src/plot.c.orig	2008-12-15 07:18:36.000000000 +0300
++++ src/plot.c	2009-09-14 17:22:09.000000000 +0400
+@@ -118,7 +118,7 @@
+ /* BSD editline
+ */
+ #ifdef HAVE_LIBEDITLINE
+-# include <editline/readline.h>
++# include <readline/readline.h>
+ #endif
+ 
+ /* enable gnuplot history with readline */

graphics/gnuplot/patches/patch-af

@@ -0,0 +1,16 @@
+$NetBSD: patch-af,v 1.3 2011/03/14 08:06:53 adam Exp $
+
+NetBSD editline keeps header files in "readline", not "editline".
+Same applies to DragonFly.
+
+--- configure.in.orig	2009-03-15 06:39:15.000000000 +0300
++++ configure.in	2009-09-14 17:35:06.000000000 +0400
+@@ -352,7 +352,7 @@
+       if test "$ac_cv_lib_edit_readline" = yes; then
+         AC_DEFINE(HAVE_LIBEDITLINE,1,
+                 [ Define if you are using the BSD editline library. ])
+-        AC_CHECK_HEADERS(editline/readline.h,,
++        AC_CHECK_HEADERS(readline/readline.h,,
+           AC_MSG_WARN([found BSD editline library but not readline.h please add path to readline.h to CPPFLAGS in Makefile]))
+ 
+         if test "$enable_history_file" = yes; then

graphics/gnuplot/patches/patch-ag

@@ -0,0 +1,30 @@
+$NetBSD: patch-ag,v 1.6 2012/11/07 19:22:05 he 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
+ 
+ $as_echo "#define HAVE_LIBEDITLINE 1" >>confdefs.h
+ 
+-        for ac_header in editline/readline.h
++        for ac_header in readline/readline.h
+ do :
+-  ac_fn_c_check_header_mongrel "$LINENO" "editline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
++  ac_fn_c_check_header_mongrel "$LINENO" "readline/readline.h" "ac_cv_header_editline_readline_h" "$ac_includes_default"
+ 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,
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5
+ $as_echo "" >&6; }
+ 
+-if test "$with_bitmap_terminals" == yes; then
++if test "$with_bitmap_terminals" = yes; then
+   { $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

graphics/gnuplot/patches/patch-ah

@@ -0,0 +1,20 @@
+$NetBSD: patch-ah,v 1.2 2011/02/08 13:13:41 adam Exp $
+
+Add NetBSD native X and pkgsrc modular X directories to the candidate
+font path list.
+
+--- src/variable.c.orig	2008-12-15 04:18:36.000000000 +0000
++++ src/variable.c
+@@ -275,6 +275,12 @@ static const struct path_table fontpath_
+     { "$`kpsexpand '$TEXMFMAIN'`/fonts/type1!" },
+     { "$`kpsexpand '$TEXMFDIST'`/fonts/type1!" },
+ #endif
++    /* NetBSD pkgsrc X.org */
++    { @PKGSRC_PREFIX@ "/lib/X11/fonts/Type1" },
++    { @PKGSRC_PREFIX@ "/lib/X11/fonts/truetype" },
++    /* NetBSD native X.org */
++    { "/usr/X11R7/lib/X11/fonts/Type1" },
++    { "/usr/X11R7/lib/X11/fonts/truetype" },
+     /* Linux paths */
+     { "/usr/X11R6/lib/X11/fonts/Type1" },
+     { "/usr/X11R6/lib/X11/fonts/truetype" },