Import of pkgsrc-2015Q1

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

graphics/gnuplot/patches/patch-ah

@@ -1,17 +1,20 @@
-$NetBSD: patch-ah,v 1.2 2011/02/08 13:13:41 adam Exp $
+$NetBSD: patch-ah,v 1.3 2014/06/01 16:58:21 wiz 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.orig	2013-07-03 16:31:53.000000000 +0000
 +++ src/variable.c
-@@ -275,6 +275,12 @@ static const struct path_table fontpath_
+@@ -281,6 +281,15 @@ 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 pkgsrc default font path */
++    { @PKGSRC_PREFIX@ "/share/fonts/X11/Type1" },
++    { @PKGSRC_PREFIX@ "/share/fonts/X11/TTF" },
 +    /* NetBSD native X.org */
 +    { "/usr/X11R7/lib/X11/fonts/Type1" },
 +    { "/usr/X11R7/lib/X11/fonts/truetype" },

graphics/gnuplot/patches/patch-docs_gnuplot.texi

@@ -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