Update to version 2.12.5.

This only lists new features, there are many bugfixes.

* Apply a patch provided Kawamura Masao, relating to (a) errors in
  the documentation of file locations and (b) a programming error
  hidden behind an unset precompiler flag.
* Add `sed' RPN operator, to work on strings
* Add `skewness' and `kurtosis' RPN operators, to work on columns
* In the documentation, change the names of some variables to be
  clearer: `ll_x' is now written `xleft', etc.
* Add RPN binary operators `and', `or' for logical operations,
  along with negation operator `not'
* Add `draw arc' command
* Add `set x axis labels' and `set y axis labels' commands.
* Permit specification of `pt' units for `draw label', `draw box',
  `draw symbol at', and `draw line from'.
* Add `set clip to curve' command.  _Caution:_
  this needs extension, and may have a bug if called twice in
  succession [but is this with an intervening `set clip off']
* Add `group' and `end group' commands, in preparation for SVG
  output.  So far these commands do nothing, and are basically just a
  signal that users should not create commands with these names
  since Gri will need them soon.
* Add `..xinc..' and `..yinc..' builtin variables.
* Make the `open' command accept URLs as filenames.

6 files changed, 131 insertions, 110 deletions

diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile
index 29056723e42..7a06b01baac 100644
--- a/graphics/gri/Makefile
+++ b/graphics/gri/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2003/07/03 16:24:28 seb Exp $
+# $NetBSD: Makefile,v 1.9 2003/07/10 08:27:38 jtb Exp $
 
-DISTNAME=		gri-2.8.7
+DISTNAME=		gri-2.12.5
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gri/}
 EXTRACT_SUFX=		.tgz
@@ -11,17 +11,17 @@ COMMENT=		language for scientific graphics applications
 
 BUILD_DEPENDS+=		ImageMagick-[0-9]*:../../graphics/ImageMagick
 
-GNU_CONFIGURE=		# defined
-USE_X11=		# defined
-USE_GMAKE=		# defined
-USE_BUILDLINK2=	 	# defined
-INFO_FILES=		gri.info
+GNU_CONFIGURE=		yes
+USE_X11=		yes
+USE_GMAKE=		yes
+USE_BUILDLINK2=	 	yes
+INFO_FILES=		yes
 USE_PERL5=		build
 REPLACE_PERL=		gri_merge gri_unpage
 
-USE_NEW_TEXINFO=	YES
-USE_MAKEINFO=	YES
-INFO_FILES=	gri.info
+USE_NEW_TEXINFO=	yes
+USE_MAKEINFO=		yes
+INFO_FILES=		gri.info
 
 .include "../../devel/netcdf/buildlink2.mk"
 .include "../../mk/ghostscript.mk"
diff --git a/graphics/gri/PLIST b/graphics/gri/PLIST
index 8b03cd21a57..288b7b2bddb 100644
--- a/graphics/gri/PLIST
+++ b/graphics/gri/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/07/03 16:24:28 seb Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/07/10 08:27:38 jtb Exp $
 bin/gri
 bin/${PKGNAME}
 bin/gri_merge
@@ -51,6 +51,7 @@ share/doc/html/gri/Debug.html
 share/doc/html/gri/Debugging.html
 share/doc/html/gri/Defaults.html
 share/doc/html/gri/Delete.html
+share/doc/html/gri/DeprecatedCommands.html
 share/doc/html/gri/Development_Version.html
 share/doc/html/gri/Differentiate.html
 share/doc/html/gri/DiscussionGroup.html
@@ -60,6 +61,7 @@ share/doc/html/gri/Emacs4.html
 share/doc/html/gri/Emacs5.html
 share/doc/html/gri/EmacsFeatures.html
 share/doc/html/gri/EmbeddedSynonyms.html
+share/doc/html/gri/EndGroup.html
 share/doc/html/gri/Environment.html
 share/doc/html/gri/ErrorMessages.html
 share/doc/html/gri/Examples.html
@@ -75,6 +77,7 @@ share/doc/html/gri/Flip.html
 share/doc/html/gri/Fonts.html
 share/doc/html/gri/GetEnv.html
 share/doc/html/gri/GettingMoreControl.html
+share/doc/html/gri/GriInThePress.html
 share/doc/html/gri/GriModeCodeFragments.html
 share/doc/html/gri/GriModeCommandNames.html
 share/doc/html/gri/GriModeCompletionVarSyn.html
@@ -84,6 +87,7 @@ share/doc/html/gri/GriModeEditing.html
 share/doc/html/gri/GriModeScreenshots.html
 share/doc/html/gri/GriModeUserCommands.html
 share/doc/html/gri/GriModeUserInterface.html
+share/doc/html/gri/Group.html
 share/doc/html/gri/HandlingData.html
 share/doc/html/gri/HandlingHeaders.html
 share/doc/html/gri/Heal.html
@@ -184,6 +188,8 @@ share/doc/html/gri/Unix-install.html
 share/doc/html/gri/Unlink.html
 share/doc/html/gri/UnstableStream.html
 share/doc/html/gri/Variables.html
+share/doc/html/gri/Version_2_10.html
+share/doc/html/gri/Version_2_12.html
 share/doc/html/gri/Version_2_2.html
 share/doc/html/gri/Version_2_4.html
 share/doc/html/gri/Version_2_6.html
@@ -330,7 +336,7 @@ share/gri/${PKGVERSION}/gri.cmd
 share/gri/${PKGVERSION}/license.txt
 share/gri/${PKGVERSION}/logo.dat
 share/gri/${PKGVERSION}/startup.msg
-@dirrm share/gri/2.8.7
+@dirrm share/gri/2.12.5
 @dirrm share/gri
 @dirrm share/examples/gri
 @dirrm share/doc/html/gri/tst_suite
diff --git a/graphics/gri/distinfo b/graphics/gri/distinfo
index 13a374a3962..021e8e88fe6 100644
--- a/graphics/gri/distinfo
+++ b/graphics/gri/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2002/10/02 21:38:02 dillo Exp $
+$NetBSD: distinfo,v 1.4 2003/07/10 08:27:38 jtb Exp $
 
-SHA1 (gri-2.8.7.tgz) = 2d28f1c398e96d4ff7e34746027ce42bb5f2881a
-Size (gri-2.8.7.tgz) = 1173929 bytes
-SHA1 (patch-aa) = feb09a4ecd2b0d8db2fef8f9613b4e8dc27dbe61
-SHA1 (patch-ab) = f66fb1084bcd65544b63db43b4e2ecc34ddbd7c7
+SHA1 (gri-2.12.5.tgz) = edd4f4a98eb391a30f084699c4e47ff173e5766b
+Size (gri-2.12.5.tgz) = 1250379 bytes
+SHA1 (patch-aa) = b86bce9c8fd91aac20cabaebec4960f7d9cbfc4c
+SHA1 (patch-ab) = 5302c06072690224b05c3a80162cb7b81e4a43bf
 SHA1 (patch-ac) = b5be8b3b2d9c2ff2ea04fe84cbb2b0d8eea1e164
 SHA1 (patch-ad) = ebcc1fdbc4fe52cdcb0f5788acaa637174be4550
 SHA1 (patch-ae) = b796adf6b5532e64aa105f8cef6afabfc5a15fa5
 SHA1 (patch-af) = aee92b408a7fb6c1ff88fcf29570781ce78d65e6
-SHA1 (patch-ag) = f9f19b9d2bfee659ffd17916be685a525ce7fc99
+SHA1 (patch-ag) = 5e1af320155dc567e00595702157bfd48b9361a0
diff --git a/graphics/gri/patches/patch-aa b/graphics/gri/patches/patch-aa
index defed2fc84d..767e78d581e 100644
--- a/graphics/gri/patches/patch-aa
+++ b/graphics/gri/patches/patch-aa
@@ -1,15 +1,11 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/05/03 23:45:15 jtb Exp $
+$NetBSD: patch-aa,v 1.2 2003/07/10 08:27:39 jtb Exp $
 
---- configure.in.orig	Wed Apr  3 20:09:30 2002
-+++ configure.in	Wed May  1 21:20:19 2002
-@@ -229,60 +229,13 @@
- AC_CHECK_HEADERS(unistd.h)
- 
- 
--dnl     Check for netcdf library.  It might be
--dnl	in one of several places, so check
--dnl	several locations, reporting location
--dnl	if found.
+--- configure.in.orig
++++ configure.in
+@@ -274,56 +274,14 @@
+ dnl	in one of several places, so check
+ dnl	several locations, reporting location
+ dnl	if found.
 -AC_MSG_CHECKING(for netcdf library)
 -define(CHECK_FOR_NETCDF, [
 -    if test -d /opt/netcdf/include ; then
@@ -60,7 +56,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/03 23:45:15 jtb Exp $
 -])dnl
 -dnl
 -CHECK_FOR_NETCDF
-+AC_CHECK_LIB(netcdf, ncvarid, HAVE_LIBNETCDF="YES", HAVE_LIBNETCDF="")
++
++AC_CHECK_LIB(netcdf, nc_open, HAVE_LIBNETCDF="YES", HAVE_LIBNETCDF="")
 +[
 +if test -n "$HAVE_LIBNETCDF" ; then
 +   ] AC_DEFINE(HAVE_LIBNETCDF) [
@@ -68,5 +65,5 @@ $NetBSD: patch-aa,v 1.1.1.1 2002/05/03 23:45:15 jtb Exp $
 +fi
 +]
  
- AC_CHECK_LIB(m,sin)
- AC_SUBST(EXTRA_CXXFLAGS)
+ dnl gri3 AC_CHECK_LIB(m,sin)
+ dnl gri3 AC_CHECK_LIB(popt,poptGetNextOpt,[
diff --git a/graphics/gri/patches/patch-ab b/graphics/gri/patches/patch-ab
index 6967c8b86be..855f38034dd 100644
--- a/graphics/gri/patches/patch-ab
+++ b/graphics/gri/patches/patch-ab
@@ -1,16 +1,16 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/05/03 23:45:17 jtb Exp $
+$NetBSD: patch-ab,v 1.2 2003/07/10 08:27:39 jtb Exp $
 
---- Makefile.in.orig	Wed Apr  3 20:09:30 2002
-+++ Makefile.in	Wed May  1 22:59:25 2002
-@@ -5,6 +5,7 @@
- DESTDIR=
+--- Makefile.in.orig
++++ Makefile.in
+@@ -6,6 +6,7 @@
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
  INSTALL_DATA = @INSTALL_DATA@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
  LIBS = @LIBS@
- # ************************************************************
-@@ -17,12 +18,15 @@
+ EXTRA_OBJS = @EXTRA_OBJS@
+ EXTRA_LIBS = @EXTRA_LIBS@
+@@ -19,12 +20,15 @@
  DEFS = -DVERSION=\"$(VERSION)\" -DDEFAULT_GRI_DIR=\"$(libdir)\" $(HAVE_LINUX) @DEFS@
  CFLAGS = @CFLAGS@
  CPPFLAGS = @CPPFLAGS@
@@ -27,12 +27,16 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/03 23:45:17 jtb Exp $
  #### End of system configuration section. ####
  
  OBJS = G_string.o GriColor.o GriPath.o GriState.o assert.o chopword.o \
-@@ -100,21 +104,22 @@
- # links and creating new links as necessary.
- install: all install-bin
- 	@echo "Installing into '$(prefix)' directory"
--	cd doc; prefix=$(prefix) make install INSTALL='$(INSTALL)' 
-+	cd doc; prefix=$(prefix) $(MAKE) install INSTALL='$(INSTALL)' 
+@@ -39,7 +43,7 @@
+ while.o write.o
+ 
+ gri: $(OBJS) $(EXTRA_OBJS)
+-	$(CXX) -o gri $(OBJS) $(EXTRA_OBJS) $(LIBS) $(EXTRA_LIBS)
++	$(CXX) -o gri $(OBJS) $(EXTRA_OBJS) $(LDFLAGS) $(LIBS) $(EXTRA_LIBS)
+ 
+ # Next is a kludge.  Trying to get a local popt working, 
+ # e.g. for solaris.  Based on popt-1.2
+@@ -118,17 +122,18 @@
  
  install-bin:
  	cat startup.msg | sed -e s,VSN,${VERSION}, -e s,PREFIX,$(prefix), > tmp
@@ -46,21 +50,21 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/03 23:45:17 jtb Exp $
 -	$(INSTALL_DATA)         license.txt     $(libdir)/license.txt
 -	$(INSTALL_PROGRAM) -d                   $(prefix)/bin
 -	$(INSTALL_PROGRAM)      gri             $(prefix)/bin/gri-$(VERSION)
-+	$(BSD_INSTALL_DATA) gri.cmd $(libdir)/gri.cmd
-+	$(BSD_INSTALL_DATA) logo.dat $(libdir)/logo.dat
-+	$(BSD_INSTALL_DATA) license.txt $(libdir)/license.txt
-+	$(BSD_INSTALL_PROGRAM) gri $(prefix)/bin/gri-$(VERSION)
++	$(BSD_INSTALL_DATA)         gri.cmd         $(libdir)/gri.cmd
++	$(BSD_INSTALL_DATA)         logo.dat        $(libdir)/logo.dat
++	$(BSD_INSTALL_DATA)         license.txt     $(libdir)/license.txt
++	$(BSD_INSTALL_PROGRAM)      gri             $(prefix)/bin/gri-$(VERSION)
  	(cd $(prefix)/bin/ ; rm -f gri ; ln -sf gri-$(VERSION) gri)
 -	$(INSTALL_PROGRAM)      gri_merge       $(prefix)/bin/gri_merge
 -	$(INSTALL_PROGRAM)      gri_unpage      $(prefix)/bin/gri_unpage
-+	$(BSD_INSTALL_SCRIPT) gri_merge $(prefix)/bin/gri_merge
-+	$(BSD_INSTALL_SCRIPT) gri_unpage $(prefix)/bin/gri_unpage
++	$(BSD_INSTALL_SCRIPT)      gri_merge       $(prefix)/bin/gri_merge
++	$(BSD_INSTALL_SCRIPT)      gri_unpage      $(prefix)/bin/gri_unpage
 +	$(BSD_INSTALL_DATA_DIR) $(elispdir)
 +	$(BSD_INSTALL_DATA) gri-mode.el $(elispdir)
  
  debian-lib = $(debian)/usr/share/gri/$(VERSION)
  install_linux_debian: gri
-@@ -173,13 +178,13 @@
+@@ -188,13 +193,13 @@
  
  
  all: force
@@ -77,7 +81,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/03 23:45:17 jtb Exp $
  
  TAGS:
  	etags *.cc *.hh
-@@ -197,8 +202,8 @@
+@@ -212,8 +217,8 @@
  
  
  distclean:
@@ -88,7 +92,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2002/05/03 23:45:17 jtb Exp $
  	rm -f Makefile
  
  # Source distribution
-@@ -275,7 +280,7 @@
+@@ -295,7 +300,7 @@
  	chmod a+r $(DEST_DIR)/$(SOURCE_NAME).tgz
  
  source-arch-indep: source-copy
diff --git a/graphics/gri/patches/patch-ag b/graphics/gri/patches/patch-ag
index 89097ec4fb6..d6b2114adf4 100644
--- a/graphics/gri/patches/patch-ag
+++ b/graphics/gri/patches/patch-ag
@@ -1,31 +1,13 @@
-$NetBSD: patch-ag,v 1.1 2002/10/02 21:38:02 dillo Exp $
+$NetBSD: patch-ag,v 1.2 2003/07/10 08:27:39 jtb Exp $
 
---- configure.orig	Wed Oct  2 23:34:47 2002
+--- configure.orig
 +++ configure
-@@ -1455,66 +1453,58 @@ done
+@@ -3696,66 +3696,75 @@
  
  
  
--echo $ac_n "checking for netcdf library""... $ac_c" 1>&6
--echo "configure:1460: checking for netcdf library" >&5
-+echo $ac_n "checking for ncvarid in -lnetcdf""... $ac_c" 1>&6
-+echo "configure:1458: checking for ncvarid in -lnetcdf" >&5
-+ac_lib_var=`echo netcdf'_'ncvarid | sed 'y%./+-%__p_%'`
-+if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  ac_save_LIBS="$LIBS"
-+LIBS="-lnetcdf  $LIBS"
-+cat > conftest.$ac_ext <<EOF
-+#line 1466 "configure"
-+#include "confdefs.h"
-+/* Override any gcc2 internal prototype to avoid an error.  */
-+#ifdef __cplusplus
-+extern "C"
-+#endif
-+/* We use char because int might match the return type of a gcc2
-+    builtin and then its argument prototype would still apply.  */
-+char ncvarid();
+-echo "$as_me:$LINENO: checking for netcdf library" >&5
+-echo $ECHO_N "checking for netcdf library... $ECHO_C" >&6
  
 -    if test -d /opt/netcdf/include ; then
 -	#
@@ -35,23 +17,22 @@ $NetBSD: patch-ag,v 1.1 2002/10/02 21:38:02 dillo Exp $
 -	if test $gri_cv_is_sun = yes ; then
 -	    LIBS="$LIBS -lnsl"
 -	fi
--	cat >> confdefs.h <<\EOF
+-	cat >>confdefs.h <<\_ACEOF
 -#define HAVE_LIBNETCDF 1
-+int main() {
-+ncvarid()
-+; return 0; }
- EOF
-+if { (eval echo configure:1480: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=yes"
++echo "$as_me:$LINENO: checking for nc_open in -lnetcdf" >&5
++echo $ECHO_N "checking for nc_open in -lnetcdf... $ECHO_C" >&6
++if test "${ac_cv_lib_netcdf_nc_open+set}" = set; then
++  echo $ECHO_N "(cached) $ECHO_C" >&6
 +else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_lib_$ac_lib_var=no"
-+fi
-+rm -f conftest*
-+LIBS="$ac_save_LIBS"
++  ac_check_lib_save_LIBS=$LIBS
++LIBS="-lnetcdf  $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++#line $LINENO "configure"
++/* confdefs.h.  */
+ _ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
  
 -        echo "yes (in /opt/netcdf/include/netcdf.h and /opt/netcdf/lib/libnetcdf.a)"
 -    else
@@ -61,17 +42,39 @@ $NetBSD: patch-ag,v 1.1 2002/10/02 21:38:02 dillo Exp $
 -            if test $gri_cv_is_sun = yes ; then
 -		LIBS="$LIBS -lnsl"
 -	    fi
--	    cat >> confdefs.h <<\EOF
+-	    cat >>confdefs.h <<\_ACEOF
 -#define HAVE_LIBNETCDF 1
--EOF
-+fi
-+if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+  HAVE_LIBNETCDF="YES"
++/* Override any gcc2 internal prototype to avoid an error.  */
++#ifdef __cplusplus
++extern "C"
++#endif
++/* We use char because int might match the return type of a gcc2
++   builtin and then its argument prototype would still apply.  */
++char nc_open ();
++int
++main ()
++{
++nc_open ();
++  ;
++  return 0;
++}
+ _ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
++  (eval $ac_link) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++         { ac_try='test -s conftest$ac_exeext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  ac_cv_lib_netcdf_nc_open=yes
 +else
-+  echo "$ac_t""no" 1>&6
-+HAVE_LIBNETCDF=""
-+fi
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
  
 -            echo "yes (in /usr/local/include/netcdf.h and /usr/local/lib/libnetcdf.a)"
 -	else
@@ -83,9 +86,21 @@ $NetBSD: patch-ag,v 1.1 2002/10/02 21:38:02 dillo Exp $
 -                if test $gri_cv_is_sun = yes ; then
 -                    LIBS="$LIBS -lnsl"
 -                fi
--                cat >> confdefs.h <<\EOF
+-                cat >>confdefs.h <<\_ACEOF
 -#define HAVE_LIBNETCDF 1
--EOF
+-_ACEOF
++ac_cv_lib_netcdf_nc_open=no
++fi
++rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++echo "$as_me:$LINENO: result: $ac_cv_lib_netcdf_nc_open" >&5
++echo "${ECHO_T}$ac_cv_lib_netcdf_nc_open" >&6
++if test $ac_cv_lib_netcdf_nc_open = yes; then
++  HAVE_LIBNETCDF="YES"
++else
++  HAVE_LIBNETCDF=""
++fi
  
 -                echo "yes (in /usr/include/netcdf.h and /usr/lib/libnetcdf.a)"
 -            else
@@ -96,21 +111,20 @@ $NetBSD: patch-ag,v 1.1 2002/10/02 21:38:02 dillo Exp $
 -			LIBS="$LIBS -lnsl"
 -		    fi
 -                    echo "yes (in /boot/home/netcdf)"
--		    cat >> confdefs.h <<\EOF
++
 +if test -n "$HAVE_LIBNETCDF" ; then
-+    cat >> confdefs.h <<\EOF
+ 		    cat >>confdefs.h <<\_ACEOF
  #define HAVE_LIBNETCDF 1
- EOF
--
+ _ACEOF
+ 
 -		else
 -	            echo "no"
 -		fi
 -            fi
 -        fi
 -    fi
-+ 
 +   LIBS="-lnetcdf $LIBS"
 +fi
  
  
- echo $ac_n "checking for sin in -lm""... $ac_c" 1>&6
+