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, 68 insertions, 196 deletions

diff --git a/graphics/gri/patches/patch-ac b/graphics/gri/patches/patch-ac
index 3759a5449d0..7eeb2f0c59c 100644
--- a/graphics/gri/patches/patch-ac
+++ b/graphics/gri/patches/patch-ac
@@ -1,198 +1,70 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/05/03 23:45:17 jtb Exp $
+$NetBSD: patch-ac,v 1.1.1.1.48.1 2008/09/29 13:47:18 tron Exp $
 
---- doc/Makefile.orig	Wed Apr  3 20:09:30 2002
-+++ doc/Makefile	Wed May  1 23:00:29 2002
-@@ -1,8 +1,8 @@
- # Makefile for Gri documentation files.
- 
--            DOC_DIR = $(prefix)/share/gri/doc
--           HTML_DIR = $(DOC_DIR)/html
--       EXAMPLES_DIR = $(DOC_DIR)/examples
-+            DOC_DIR = $(prefix)/share/doc/gri
-+           HTML_DIR = $(prefix)/share/doc/html/gri
-+       EXAMPLES_DIR = $(prefix)/share/examples/gri
-                  RM = rm -f
-             REFCARD = refcard
-         CMD_REFCARD = cmdrefcard
-@@ -13,12 +13,12 @@
- FORCE:
- 
- all:
--	make info
--	make html
-+	$(MAKE) info
-+	$(MAKE) html
- 
- install:
--	make info-install
--	make html-install
-+	$(MAKE) info-install
-+	$(MAKE) html-install
- 
- read:
- 	chmod a+r Makefile
-@@ -31,25 +31,25 @@
- 	lynx -dump FAQ.html > FAQ
- 
- the_resources:
--	cd resources ; make
-+	cd resources ; $(MAKE)
- 
- test:
- 	cat test.texi | texinfo2HTML > test.html
- 
- html: gri.texi gri.info texinfo2HTML HTML_subdivide
--	cd examples ; make png
-+	cd examples ; $(MAKE) png
- 	-cp examples/*.png ./
--	cd examples ; make html
-+	cd examples ; $(MAKE) html
- 	cp examples/*.html ./
--	cd tst_suite ; make html
--	cd screenshots; make png
-+	cd tst_suite ; $(MAKE) html
-+	cd screenshots; $(MAKE) png
- 	cat gri.texi     		>  TMP
- 	perl make_html_index		>> TMP
- 	perl make_html_commandindex	>> TMP
- 	perl make_html_builtinindex	>> TMP
- 	cat TMP | perl texinfo2HTML	>  $(HTML_LONG_NAME)
- 	rm -f TMP
--	make read
-+	$(MAKE) read
- 	rm -f gri[1-9]*.html
- 	perl HTML_subdivide  $(HTML_LONG_NAME) "The Gri graphing language"
- 	rm -f $(HTML_LONG_NAME)
-@@ -63,43 +63,28 @@
- 	$(INSTALL) -m 644 cmdrefcard.ps $(CARD_DIR)
- 
- html-tar: html
--	make html-install DOC_DIR=./gridoc
-+	$(MAKE) html-install DOC_DIR=./gridoc
- 	tar -c -f gridoc.tar ./gridoc
- 	gzip -f --best gridoc.tar
- 
- html-install:	html
--	$(INSTALL) -d          $(HTML_DIR)
--	chmod a+rx             $(HTML_DIR)
--	$(INSTALL) -d          $(HTML_DIR)/resources
--	chmod a+rx             $(HTML_DIR)/resources
--	cp resources/*.gif     $(HTML_DIR)/resources
--	chmod 644              $(HTML_DIR)/resources/*.gif
--	$(INSTALL) -d          $(HTML_DIR)/tst_suite
--	chmod a+rx             $(HTML_DIR)/tst_suite
--	cp tst_suite/*html     $(HTML_DIR)/tst_suite
--	-cp examples/*.png     $(HTML_DIR)/
--	-chmod 644             $(HTML_DIR)/*.png
--	$(INSTALL) -d          $(HTML_DIR)/screenshots
--	chmod a+rx             $(HTML_DIR)/screenshots
--	cp screenshots/*.png   $(HTML_DIR)/screenshots
--	chmod a+rx             $(HTML_DIR)/screenshots
--	chmod 644              $(HTML_DIR)/screenshots/*.png
--	cp *.html              $(HTML_DIR)
--	chmod 644              $(HTML_DIR)/*.html
-+	$(BSD_INSTALL_DATA_DIR) $(HTML_DIR)
-+	$(BSD_INSTALL_DATA_DIR) $(HTML_DIR)/resources
-+	$(BSD_INSTALL_DATA) resources/*.gif $(HTML_DIR)/resources
-+	$(BSD_INSTALL_DATA_DIR) $(HTML_DIR)/tst_suite
-+	$(BSD_INSTALL_DATA) tst_suite/*html $(HTML_DIR)/tst_suite
-+	$(BSD_INSTALL_DATA) examples/*.png $(HTML_DIR)/
-+	$(BSD_INSTALL_DATA_DIR) $(HTML_DIR)/screenshots
-+	$(BSD_INSTALL_DATA) screenshots/*.png $(HTML_DIR)/screenshots
-+	$(BSD_INSTALL_DATA) *.html $(HTML_DIR)
- #       Now install the examples
--	$(INSTALL) -d          $(EXAMPLES_DIR)
--	chmod a+rx             $(EXAMPLES_DIR)
--	cp examples/model*     $(EXAMPLES_DIR)
--	chmod 644              $(EXAMPLES_DIR)/model*
--	cp examples/*.dat      $(EXAMPLES_DIR)
--	chmod 644              $(EXAMPLES_DIR)/*.dat
--	cp examples/*.gri      $(EXAMPLES_DIR)
--	chmod 644              $(EXAMPLES_DIR)/*.gri
--	cp examples/*.ps       $(EXAMPLES_DIR)
--	chmod 644              $(EXAMPLES_DIR)/*.ps
--	cp examples/FEM.pl     $(EXAMPLES_DIR)
--	chmod 755              $(EXAMPLES_DIR)/FEM.pl
+--- doc/Makefile.in.orig	2008-09-08 12:35:24.000000000 -0400
++++ doc/Makefile.in	2008-09-16 18:35:52.000000000 -0400
+@@ -179,31 +179,13 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ info_TEXINFOS = gri.texi
+-@OS_IS_FINK_FALSE@@OS_IS_FREEBSD_FALSE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@MAN_DIR = $(DESTDIR)$(prefix)/share/man/man1
+-@OS_IS_FINK_FALSE@@OS_IS_FREEBSD_TRUE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@MAN_DIR = $(DESTDIR)$(prefix)/man/man1
+-@OS_IS_FINK_TRUE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@MAN_DIR = $(DESTDIR)$(prefix)/share/man/man1
+-@OS_IS_LINUX_DEBIAN_TRUE@@OS_IS_LINUX_REDHAT_FALSE@MAN_DIR = $(DESTDIR)$(prefix)/share/man/man1
+-@OS_IS_LINUX_REDHAT_TRUE@MAN_DIR = $(DESTDIR)$(prefix)/share/man/man1
+-@OS_IS_FINK_FALSE@@OS_IS_FREEBSD_FALSE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@INFO_DIR = $(DESTDIR)$(prefix)/share/info
+-@OS_IS_FINK_FALSE@@OS_IS_FREEBSD_TRUE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@INFO_DIR = $(DESTDIR)$(prefix)/info
+-@OS_IS_FINK_TRUE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@INFO_DIR = $(DESTDIR)$(prefix)/share/info
+-@OS_IS_LINUX_DEBIAN_TRUE@@OS_IS_LINUX_REDHAT_FALSE@INFO_DIR = $(DESTDIR)$(prefix)/share/info
+-@OS_IS_LINUX_REDHAT_TRUE@INFO_DIR = $(DESTDIR)$(prefix)/share/info
+-@OS_IS_FINK_FALSE@@OS_IS_FREEBSD_FALSE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@DOC_DIR = $(DESTDIR)$(prefix)/share/gri/doc
+-@OS_IS_FINK_FALSE@@OS_IS_FREEBSD_TRUE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@DOC_DIR = $(DESTDIR)$(prefix)/share/doc/gri
+-@OS_IS_FINK_TRUE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@DOC_DIR = $(DESTDIR)$(prefix)/share/doc/gri-${PACKAGE_VERSION}
+-@OS_IS_LINUX_DEBIAN_TRUE@@OS_IS_LINUX_REDHAT_FALSE@DOC_DIR = $(DESTDIR)$(prefix)/share/doc/gri
+-@OS_IS_LINUX_REDHAT_TRUE@DOC_DIR = $(DESTDIR)$(prefix)/share/doc/gri-${PACKAGE_VERSION}
+-@OS_IS_FINK_FALSE@@OS_IS_FREEBSD_FALSE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@HTML_DIR = $(DOC_DIR)/html
+-@OS_IS_FINK_FALSE@@OS_IS_FREEBSD_TRUE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@HTML_DIR = $(DOC_DIR)/html
+-@OS_IS_FINK_TRUE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@HTML_DIR = $(DOC_DIR)/html
+-@OS_IS_LINUX_DEBIAN_TRUE@@OS_IS_LINUX_REDHAT_FALSE@HTML_DIR = $(DOC_DIR)/html
+-@OS_IS_LINUX_REDHAT_TRUE@HTML_DIR = $(DOC_DIR)/html
+-@OS_IS_FINK_FALSE@@OS_IS_FREEBSD_FALSE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@EXAMPLES_DIR = $(DOC_DIR)/examples
+-@OS_IS_FINK_FALSE@@OS_IS_FREEBSD_TRUE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@EXAMPLES_DIR = $(DESTDIR)$(prefix)/share/examples/gri
+-@OS_IS_FINK_TRUE@@OS_IS_LINUX_DEBIAN_FALSE@@OS_IS_LINUX_REDHAT_FALSE@EXAMPLES_DIR = $(DOC_DIR)/examples
+-@OS_IS_LINUX_DEBIAN_TRUE@@OS_IS_LINUX_REDHAT_FALSE@EXAMPLES_DIR = $(DOC_DIR)/examples
+-@OS_IS_LINUX_REDHAT_TRUE@EXAMPLES_DIR = $(DOC_DIR)/examples
++
++MAN_DIR=$(DESTDIR)$(prefix)/${PKGMANDIR}/man1
++INFO_DIR=$(DESTDIR)$(prefix)/${PKGINFODIR}
++DOC_DIR=$(DESTDIR)$(prefix)/share/doc/gri
++HTML_DIR=$(DESTDIR)$(prefix)/share/doc/html/gri
++EXAMPLES_DIR=$(DESTDIR)$(prefix)/share/examples/gri
++
+ RM = rm -f
+ #           REFCARD = refcard
+ #       CMD_REFCARD = cmdrefcard
+@@ -822,7 +804,7 @@ html-install:
+ 	$(INSTALL_DATA) $(srcdir)/examples/*.gri      $(EXAMPLES_DIR)
+ 	$(INSTALL_DATA) $(srcdir)/examples/e*.ps      $(EXAMPLES_DIR)
+ 	$(INSTALL_SCRIPT) $(srcdir)/examples/FEM.pl  $(EXAMPLES_DIR)
 -	(cd $(HTML_DIR); rm -rf examples ; ln -sf ../examples)
-+	$(BSD_INSTALL_DATA_DIR) $(EXAMPLES_DIR)
-+	$(BSD_INSTALL_DATA) examples/model* $(EXAMPLES_DIR)
-+	$(BSD_INSTALL_DATA) examples/*.dat      $(EXAMPLES_DIR)
-+	$(BSD_INSTALL_DATA) examples/*.gri      $(EXAMPLES_DIR)
-+	$(BSD_INSTALL_DATA) examples/*.ps       $(EXAMPLES_DIR)
-+	$(BSD_INSTALL_DATA) examples/FEM.pl     $(EXAMPLES_DIR)
-+	(cd $(HTML_DIR); ln -sf ../../examples/gri examples)
- 
- card-clean:
- 	-rm -f refcard.dvi refcard.log refcard.ps
-@@ -125,10 +110,7 @@
- 	makeinfo gri.texi
- 
- info-install:
--	$(INSTALL) -d $(INFO_DIR)
--	cp gri.info* $(INFO_DIR)
--	(cd $(INFO_DIR) ; gzip -f --best gri.info gri.info-[0-9] gri.info-[0-9][0-9])
--	chmod 644 $(INFO_DIR)/gri.info*
-+	$(BSD_INSTALL_DATA) gri.info* $(INFO_DIR)
- 
- info-install-solaris:
- 	$(INSTALL) -d $(INFO_DIR_SOLARIS)
-@@ -161,10 +143,10 @@
- 		gri.vr gri.vrs 		\
- 		FAQ cmdrefcard.ps refcard.ps
- 	$(RM) gri.texi
--	(cd examples    ; make clean)
--	(cd screenshots ; make clean)
--#	(cd resources   ; make clean)
--	(cd tst_suite   ; make clean)
-+	(cd examples    ; $(MAKE) clean)
-+	(cd screenshots ; $(MAKE) clean)
-+#	(cd resources   ; $(MAKE) clean)
-+	(cd tst_suite   ; $(MAKE) clean)
- 	-rm -rf gridoc
- 	-rm -f gridoc.tar.gz
- 
-@@ -173,15 +155,15 @@
- 	@grep '^[^ ]*:' Makefile | sed -e "s/^/  make /" -e "s/:.*//"
- 
- linux_redhat:
--	make info
--	make html
--	make refcard.ps
--	make cmdrefcard.ps
-+	$(MAKE) info
-+	$(MAKE) html
-+	$(MAKE) refcard.ps
-+	$(MAKE) cmdrefcard.ps
- 
- gri.ps: gri.texi
--	cd examples    ; make eps
--	cd screenshots ; make eps
--	cd tst_suite   ; make texi
-+	cd examples    ; $(MAKE) eps
-+	cd screenshots ; $(MAKE) eps
-+	cd tst_suite   ; $(MAKE) texi
- 	tex gri.texi
- 	texindex gri.cp
- 	texindex gri.fn
-@@ -193,9 +175,9 @@
- 	dvips -o gri.ps -t letter gri.dvi
- 
- gri.pdf: gri.texi
--	cd examples    ; make pdf
--	cd screenshots ; make pdf
--	cd tst_suite   ; make texi
-+	cd examples    ; $(MAKE) pdf
-+	cd screenshots ; $(MAKE) pdf
-+	cd tst_suite   ; $(MAKE) texi
- 	pdftex gri.texi
- 	texindex gri.cp
- 	texindex gri.fn
-@@ -213,7 +195,7 @@
- # make debian-html DOC_DIR=../debian/gri-html-doc/usr/share/doc/gri
- # builds and installs under $(DOC_DIR)
- debian-html:
--	make html-install
-+	$(MAKE) html-install
- 
- # make debian-ps DOC_DIR=../debian/gri-ps-doc/usr/share/doc/gri
- # builds and installs under $(DOC_DIR)
++	(cd $(HTML_DIR); rm -rf examples ; ln -sf ../../../examples/gri examples)
+ 
+ # Sun Jun  8 11:40:52 UTC 2003  [Dan Kelley]
+ # This is commented-out because it's not used.  Later it will be deleted.
+@@ -898,7 +880,7 @@ install-data-local:
+ #       This is handled by gri.spec [2003-may-31 Dan Kelley]
+ @OS_IS_LINUX_REDHAT_FALSE@	$(INSTALL_DATA) refcard.ps                       $(DOC_DIR)
+ @OS_IS_LINUX_REDHAT_FALSE@	$(INSTALL_DATA) cmdrefcard.ps                    $(DOC_DIR)
+-	mkdir -m 755 -p                                    $(MAN_DIR)
++	$(MKDIR_P)                                       $(MAN_DIR)
+ 	cat $(srcdir)/../doc/$(gri_manpage_name) | sed -e s,VERSION,${PACKAGE_VERSION}, > tmp
+ 	$(INSTALL_DATA)    tmp                             $(MAN_DIR)/gri.1
+ 	$(RM) tmp
+@@ -906,7 +888,7 @@ install-data-local:
+ #	they are supposed to go, at least on linux/redhat systems [2003-jun-8 Dan Kelley]
+ 	$(INSTALL_DATA) $(srcdir)/../doc/gri_merge.1-skel  $(MAN_DIR)/gri_merge.1
+ 	$(INSTALL_DATA) $(srcdir)/../doc/gri_unpage.1-skel $(MAN_DIR)/gri_unpage.1
+-	mkdir -m 755 -p                                    $(INFO_DIR)
++	$(MKDIR_P)                                         $(INFO_DIR)
+ 	echo "INSTALLING INTO INFO_DIR WHICH IS [$(INFO_DIR)]"
+ @OS_IS_FINK_FALSE@	$(INSTALL_DATA)    $(srcdir)/../doc/gri.info*      $(INFO_DIR)
+ @OS_IS_FINK_TRUE@	@echo "DEBUG: The OS is fink"