Update to 2.12.17. Fixes broken amd64 build, among other things.

pkgsrc changes: now uses readline and popt; added destdir support.

Upstream changes (not including for 2.12.17, which doesn't appear to
be posted):

Version 2.12.16 [2007 Jul 20  anniversary of the first moon landing, in 1969]
Bug Fixes

    * Fix Debian bug #130802 ... postscript problem in landscape mode,
      refreshed in gv viewer

    * Fix Debian bug #434010 ... `set page landscape' requires `set
      page size' first, but it should really default to something
      reasonable instead.

Version 2.12.15 [2007 Apr 16 Mawlid, celebration of birthday of Muhammad]
Bug Fixes

    * Fix SourceForge bug #1700978 ... html concept index mostly broken

    * Fix SourceForge bug #1698924 ... box plots show missing data

    * Fix Debian bug #417217 ... will not compile in GCC 4.3

    * Fix SourceForge bug #1698116 ... poorly-positioned name of RHS y-axis

Version 2.12.14 [2007 Jan 08: Coming-of-Age Day (Japan)]
Bug Fixes

    * Fix SourceForge bug #1630768 ... Fix to segfault in clipped
      images (a bug that may have developed after version 2.13.3)

Version 2.12.13 [2006 Nov 06: Constitution Day (Tajikistan)]
Bug Fixes

    * Fix SourceForge bug #1591475 ... Fix to compile in Solaris CC

    * Fix SourceForge bug #1591062 ... Fix to compile in OpenBSD

Version 2.12.12 [2006 July 16: Yellow Pigs Day]
Bug Fixes

    * Fix SourceForge bug #1523033 ... Malloc error (freeing something
      already freed?)

    * Fix SourceForge bug #1523032 ... `create columns from function'
      bug, if there is an existing directory called `tmp'.

    * Fix SourceForge bug #1491105 ... `set x axis labels' had no
      affect for log axes (same for y)

Version 2.12.11 [2006 Mar 30: Hindu New Year]
Bug Fixes

    * Fix SourceForge bug #1449546 ... x axis limits not correctly
      inferred from `set x grid' (same for y).

Version 2.12.10 [2006 Jan 26: Australia Day]
Bug Fixes

    * Fix SourceForge bug #1408259 ... PostScript file contained
      private information. This was fixed by adding new commandline
      arguments `-private' and `-no_private', the former of which (the
      new default) means to not include the user's name, the
      invocation arguments, or the command-file contents (see Invoking
      Gri).

    * Fix SourceForge bug #1285180 ... NaN was mishandled. (The bug
      may have arisen in version 2.12.7 or thereabouts.)

    * Port to the FreeBSD operating system, with help from Christopher
      Illies and Roman Neuhauser.

    * Fix SourceForge bug #1217273 ... missing some version numbers
      within docs

    * Fix SourceForge bug #1196613 ... user-supplied x-axis labels can
      run offscale (fix for y-axis later...)

    * Fix SourceForge bug #1198341 ... x-axis labels incorrectly
      rotated (sometimes)

    * Fix SourceForge bug #1199280 ... warning about `malloc' for RPN
      assignments

    * Fix SourceForge bug #1196115 ... `gri_unpage' and `gri_merge'
      mis-installed

    * Fix SourceForge bug #1153209 ... Emacs mode incompatible with
      new version of `gv' PostScript viewer

      Fix SourceForge bug #1101172 ... `gri -help' incorrectly stated
      meaning of last argument(s)

    * Fix SourceForge bug #835711 ... `draw gri logo' fails.

    * Fix SourceForge bug #1098269 ... problem compiling on AMD64
      machine. (Solution provided by Andreas Jochens, a Debian user.)

    * Fix SourceForge bug #867515 ... problem with junk appearing in images.

    * Fix SourceForge bug #875881 ... problem compiling with gcc
      2.95.3 compiler.

Version 2.12.9 [2005 Jan 6: Feast of Epiphany]
Bug Fixes

    * Fix SourceForge bug #1094087 ... `set path to' incorrectly
      parsed colon-separated paths

    * Fix SourceForge bug #1085788 ... `image *=', `image /=', `image
      ^=', and `image _=' all gave incorrect results

    * Fix SourceForge bug #1084123 ... does not compile in fink

    * Fix SourceForge bug #676767 ... on fink systems, `help' does not work

Version 2.12.8 [2004]
Bug Fixes

    * Fix SourceForge bug #1019141 ... `draw arc' ignores the present
      pen color

    * Fix SourceForge bug #997741 ... PostScript broken on images with
      y-axis decreasing, and enclosed by PostScript clipping

    * Fix SourceForge bug #978822 ... documentation wrong on `set path to'

    * Fix SourceForge bug #932203 ... misplaced labels caused by `set
      x axis labels'

    * Fix SourceForge bug #928277 ... `draw polygon' should take `cm'
      and `pt' units

    * Fix SourceForge bug #930259 ... fix `draw arc''s drawing of an
      extra line (thanks for the fix, Wolfgang Voegeli)

    * Fix SourceForge bug #923719 ... `draw curve overlying' ignored
      the effect of `set dash'

    * Fix SourceForge bug #914125 ... offpage points in axes were
      reported as having been drawn by `draw curve'.

    * Fix SourceForge bug #877613 ... `help' (and other commands using
      temporary files) does not work in OSX/Fink version.

    * Fix SourceForge bug #874483 ... `state save' doesn't keep track
      of `dash' settings.

    * Fix SourceForge bug #873245 ... inaccurate times are given in
      the warnings about slow operations on OSX platform (days are
      reported instead of seconds)

    * Fix SourceForge bug #871477 ... the `missing value' feature
      should not be the default. The solution involved adding a new
      command `set missing value none', which is now the default.

Version 2.12.7 [2003 Sep 4]
Bug Fixes

    * Fix SourceForge bug #800022 AKA Debian bug #208589, ... did not
      build on some Debian platforms because it was based on an old
      version of `automake'.

Version 2.12.6 [2003 Sep 1: Labour Day]
New Features

    * Add `age' RPN function, for testing file ages (see age-rpn-operator).

Bug Fixes

    * Fix SourceForge bug #773850 ... bounding-box is increased by
      `draw symbol' even if (rectangular) postscript clipping is
      active.

    * Fix SourceForge bug #760130 ... Solaris cannot compile with
      `C-l' in Makefile.

    * Fix SourceForge bug #743134 ... bounding box not limited by `set
      clip postscript'

    * Fix SourceForge bug #750561 ... during compilation, `make'
      rebuilds HTML docs even if up-to-date

1 files changed, 26 insertions, 55 deletions

diff --git a/graphics/gri/patches/patch-aa b/graphics/gri/patches/patch-aa
index 767e78d581e..5971f78ec01 100644
--- a/graphics/gri/patches/patch-aa
+++ b/graphics/gri/patches/patch-aa
@@ -1,62 +1,33 @@
-$NetBSD: patch-aa,v 1.2 2003/07/10 08:27:39 jtb Exp $
+$NetBSD: patch-aa,v 1.3 2008/09/04 06:43:06 dholland Exp $
 
---- 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)
+--- configure.ac~	2008-03-16 10:18:52.000000000 -0400
++++ configure.ac	2008-09-04 01:45:01.000000000 -0400
+@@ -302,28 +302,13 @@ GRI_DETERMINE_ENDIAN
+ 
+ AC_CHECK_HEADERS(unistd.h)
+ 
+-
+-dnl Check for netcdf library.  It might be in one of several places,
+-dnl so check several locations, reporting the location if found.
 -define(CHECK_FOR_NETCDF, [
--    if test -d /opt/netcdf/include ; then
--	#
--	# Solaris often has it here
--	CXXFLAGS="$CXXFLAGS -I/opt/netcdf/include"
--        LIBS="$LIBS -L/opt/netcdf/lib -lnetcdf"
--	if test $gri_cv_is_sun = yes ; then
+-  AC_MSG_CHECKING(for netcdf library)
+-  for d in /opt/netcdf /usr/local /usr; do
+-      if test -f $d/include/netcdf.h; then
+-	 AM_CXXFLAGS="$AM_CXXFLAGS -I$d/include"
+-	 EXTRA_CFLAGS_TEMPLATE="$EXTRA_CFLAGS_TEMPLATE -I$d/include"
+-	 DEFS="$DEFS -I$d/include"
+-	 LIBS="$LIBS -L$d/lib -lnetcdf"
+-	 if test $gri_cv_is_sun = yes ; then
 -	    LIBS="$LIBS -lnsl"
--	fi
--	AC_DEFINE(HAVE_LIBNETCDF)
--        echo "yes (in /opt/netcdf/include/netcdf.h and /opt/netcdf/lib/libnetcdf.a)"
--    else
--	if test -f /usr/local/include/netcdf.h ; then
--	    CXXFLAGS="$CPPFLAGS -I/usr/local/include"
--	    LIBS="$LIBS -L/usr/local/lib -lnetcdf"
--            if test $gri_cv_is_sun = yes ; then
--		LIBS="$LIBS -lnsl"
--	    fi
--	    AC_DEFINE(HAVE_LIBNETCDF)
--            echo "yes (in /usr/local/include/netcdf.h and /usr/local/lib/libnetcdf.a)"
--	else
--	    #
--	    # Linux/debian often has it here.
--	    if test -f /usr/include/netcdf.h ; then
--                CXXFLAGS="$CPPFLAGS -I/usr/include/netcdf"
--                LIBS="$LIBS -L/usr/lib/netcdf -lnetcdf"
--                if test $gri_cv_is_sun = yes ; then
--                    LIBS="$LIBS -lnsl"
--                fi
--                AC_DEFINE(HAVE_LIBNETCDF)
--                echo "yes (in /usr/include/netcdf.h and /usr/lib/libnetcdf.a)"
--            else
--		if test -f /boot/home/lib/netcdf ; then
--		    CXXFLAGS="$CPPFLAGS -I/boot/home/include/netcdf"
--		    LIBS="$LIBS -L/boot/home/lib/netcdf -lnetcdf"
--                    if test $gri_cv_is_sun = yes ; then
--			LIBS="$LIBS -lnsl"
--		    fi
--                    echo "yes (in /boot/home/netcdf)"
--		    AC_DEFINE(HAVE_LIBNETCDF)
--		else
--	            echo "no"
--		fi
--            fi
--        fi
--    fi
+-	 fi
+-	 AC_DEFINE(HAVE_LIBNETCDF)
+-	 AC_MSG_RESULT(yes, in $d/include/netcdf.h and $d/lib/libnetcdf.a)
+-      fi
+-  done
+-  AC_MSG_RESULT(done)
 -])dnl
 -dnl
 -CHECK_FOR_NETCDF
-+
 +AC_CHECK_LIB(netcdf, nc_open, HAVE_LIBNETCDF="YES", HAVE_LIBNETCDF="")
 +[
 +if test -n "$HAVE_LIBNETCDF" ; then
@@ -65,5 +36,5 @@ $NetBSD: patch-aa,v 1.2 2003/07/10 08:27:39 jtb Exp $
 +fi
 +]
  
- dnl gri3 AC_CHECK_LIB(m,sin)
- dnl gri3 AC_CHECK_LIB(popt,poptGetNextOpt,[
+ dnl use this??
+ dnl AC_SUBST(EXTRA_CXXFLAGS)