Pullup ticket #2535 - requested by dholland

gri: security update

Revisions pulled up:
- graphics/gri/Makefile			1.33-1.35
- graphics/gri/PLIST			1.8
- graphics/gri/distinfo			1.7-1.8
- graphics/gri/patches/patch-aa		1.3
- graphics/gri/patches/patch-ab		1.3
- graphics/gri/patches/patch-ac		1.2
- graphics/gri/patches/patch-ac		1.3
- graphics/gri/patches/patch-ad		delete
- graphics/gri/patches/patch-ae		1.3
- graphics/gri/patches/patch-af		delete
- graphics/gri/patches/patch-ag		1.4
- graphics/gri/patches/patch-ag		1.5
---
Module Name:	pkgsrc
Committed By:	dholland
Date:		Thu Sep  4 06:43:06 UTC 2008

Modified Files:
	pkgsrc/graphics/gri: Makefile PLIST distinfo
	pkgsrc/graphics/gri/patches: patch-aa patch-ab patch-ac patch-ae
	    patch-ag
Removed Files:
	pkgsrc/graphics/gri/patches: patch-ad patch-af

Log Message:
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
---
Module Name:	pkgsrc
Committed By:	dholland
Date:		Tue Sep 16 22:47:41 UTC 2008

Modified Files:
	pkgsrc/graphics/gri: Makefile distinfo
	pkgsrc/graphics/gri/patches: patch-ac patch-ag

Log Message:
Update to 2.12.18.
Changes from 2.12.17 (properly part of the previous update) included
for reference.

Version 2.12.18 [2008 Sep 8  International Literacy Day]
Bug Fixes

    * Improve security of temporary-file handling.

    * Fix SourceForge bug #1985862 ... SVG output had axis linewidth
      equal to curve line width.

Version 2.12.17 [2008 May 29  Oak Apple Day (England)]
New Features

    * Add GNU readline support so that interactive mode will have
      history, command editing, etc.

Bug Fixes

    * Fix SourceForge bug #1913577 ... superscripts did not end
      correctly, if preceeded by an inline `{}' block.

    * Fix SourceForge bug #1761562 ... y axis name printed upside
      down, for log axes in which user specified a high values at the
      bottom end of the axis
---
Module Name:	pkgsrc
Committed By:	dholland
Date:		Sat Sep 20 18:53:11 UTC 2008

Modified Files:
	pkgsrc/graphics/gri: Makefile

Log Message:
needs build dep on tex

1 files changed, 11 insertions, 8 deletions

diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile
index 7e490e12450..d715c671bf3 100644
--- a/graphics/gri/Makefile
+++ b/graphics/gri/Makefile
@@ -1,25 +1,28 @@
-# $NetBSD: Makefile,v 1.32 2007/02/15 14:58:21 joerg Exp $
+# $NetBSD: Makefile,v 1.32.14.1 2008/09/29 13:47:18 tron Exp $
 
-DISTNAME=		gri-2.12.5
-PKGREVISION=	3
+DISTNAME=		gri-2.12.18
 CATEGORIES=		graphics
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=gri/}
-EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://gri.sourceforge.net/
 COMMENT=		Language for scientific graphics applications
 
-BUILD_DEPENDS+=		ImageMagick-[0-9]*:../../graphics/ImageMagick
+PKG_DESTDIR_SUPPORT=	user-destdir
 
-BROKEN_IN=		pkgsrc-2006Q4
+BUILD_DEPENDS+=		ImageMagick-[0-9]*:../../graphics/ImageMagick
 
 GNU_CONFIGURE=		yes
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake gs:run makeinfo perl
-REPLACE_PERL+=		gri_merge gri_unpage
+REPLACE_PERL+=		src/gri_merge src/gri_unpage
 INFO_FILES=		# PLIST
-INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} INFO_DIR=${PREFIX:Q}/${PKGINFODIR:Q}
+INSTALL_MAKE_FLAGS=	${MAKE_FLAGS} PKGINFODIR=${PKGINFODIR:Q}
+
+TEX_DEPMETHOD=		build	
 
+.include "../../mk/tex.buildlink3.mk"
 .include "../../devel/netcdf/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"