Update to version 1.20.

   This version adds some new features. Embedded troff and pic commands
   are  now  interleaved more rationally with the generated pic commands.
   Grap  is  considerably  more tolerant of using variable names that are
   the  same  as  keywords  or  coordinate  names.  Details  are  in  the
   CHANGES file.

4 files changed, 92 insertions, 30 deletions

diff --git a/graphics/grap/Makefile b/graphics/grap/Makefile
index 1468319db8d..5c3fe4da539 100644
--- a/graphics/grap/Makefile
+++ b/graphics/grap/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.3 2001/04/14 21:43:44 jtb Exp $
+# $NetBSD: Makefile,v 1.4 2001/07/15 12:22:43 jtb Exp $
 #
 
-DISTNAME=	grap-1.10
+DISTNAME=	grap-1.20
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.lunabase.org/~faber/Vault/software/grap/
 
@@ -9,7 +9,7 @@ MAINTAINER=	packages@netbsd.org
 HOMEPAGE=	http://www.lunabase.org/~faber/Vault/software/grap/
 COMMENT=	Language for typesetting graphs
 
-GNU_CONFIGURE=	YES
-USE_PERL5=	YES
+GNU_CONFIGURE=	yes
+USE_PERL5=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/grap/distinfo b/graphics/grap/distinfo
index 5a309943a4f..0958ea0d776 100644
--- a/graphics/grap/distinfo
+++ b/graphics/grap/distinfo
@@ -1,4 +1,5 @@
-$NetBSD: distinfo,v 1.2 2001/04/21 09:54:15 wiz Exp $
+$NetBSD: distinfo,v 1.3 2001/07/15 12:22:43 jtb Exp $
 
-SHA1 (grap-1.10.tar.gz) = ef059a2e4a84709ebc57aca56b0dfcf2bc7189b9
-Size (grap-1.10.tar.gz) = 127428 bytes
+SHA1 (grap-1.20.tar.gz) = 6c24cac98e7f1916c433db0a36e8e2f581415071
+Size (grap-1.20.tar.gz) = 136486 bytes
+SHA1 (patch-aa) = 61e4921e5fcd36abe8739bfec8657d1f6fe5b8ee
diff --git a/graphics/grap/patches/patch-aa b/graphics/grap/patches/patch-aa
new file mode 100644
index 00000000000..90bb98ce345
--- /dev/null
+++ b/graphics/grap/patches/patch-aa
@@ -0,0 +1,60 @@
+$NetBSD: patch-aa,v 1.1 2001/07/15 12:22:43 jtb Exp $
+
+--- Makefile.in.orig	Thu Jun 21 14:04:51 2001
++++ Makefile.in
+@@ -6,6 +6,8 @@
+ 
+ BINDIR = @bindir@
+ DEFINESDIR = @datadir@/grap
++DOCDIR = @datadir@/doc/grap
++EXAMPLESDIR = @datadir@/examples/grap
+ MANDIR = @mandir@/man1
+ 
+ PROGS=grap
+@@ -15,7 +17,7 @@
+ INSTALL_DATA=@INSTALL_DATA@
+ RM=rm -f
+ RMDIR=rm -rf
+-MKDIR=mkdir
++MKDIR=mkdir -p
+ LEX=@LEX@
+ YACC=@YACC@
+ CXX=@CXX@
+@@ -90,25 +92,27 @@
+ # The || true lines allow make to continue on systems where install -d
+ # fails on existing directories.
+ install:	grap grap.defines grap.1
+-	strip grap
+ 	$(INSTALL) -d $(BINDIR) || true
+ 	$(INSTALL) -d $(MANDIR) || true
+-	$(INSTALL) -d $(DEFINESDIR)/examples || true
++	$(INSTALL) -d $(DEFINESDIR) || true
++	$(INSTALL) -d $(DOCDIR) || true
++	$(INSTALL) -d $(EXAMPLESDIR) || true
+ 	$(INSTALL_PROGRAM) grap $(BINDIR)
+ 	$(INSTALL_DATA) grap.1 $(MANDIR)
+ 	$(INSTALL_DATA) grap*.defines $(DEFINESDIR)
+-	$(INSTALL_DATA) README $(DEFINESDIR)
+-	$(INSTALL_DATA) CHANGES $(DEFINESDIR)
+-	$(INSTALL_DATA) COPYRIGHT $(DEFINESDIR)
+-	$(INSTALL_DATA) grap.man $(DEFINESDIR)
+-	$(INSTALL_DATA) examples/*.d examples/example.ms examples/*.result examples/Makefile $(DEFINESDIR)/examples
++	$(INSTALL_DATA) README $(DOCDIR)
++	$(INSTALL_DATA) CHANGES $(DOCDIR)
++	$(INSTALL_DATA) COPYRIGHT $(DOCDIR)
++	$(INSTALL_DATA) grap.man $(DOCDIR)
++	$(INSTALL_DATA) examples/*.d examples/example.ms examples/*.result examples/Makefile $(EXAMPLESDIR)
+ 
+ deinstall:
+ 	$(RM) $(BINDIR)/grap
+ 	$(RM) $(MANDIR)/grap.1
+-	$(RM) $(DEFINESDIR)/grap*.defines $(DEFINESDIR)/README $(DEFINESDIR)/CHANGES $(DEFINESDIR)/COPYRIGHT $(DEFINESDIR)/grap.man
+-	$(RM) $(DEFINESDIR)/examples/*.d $(DEFINESDIR)/examples/*.ms $(DEFINESDIR)/examples/Makefile $(DEFINESDIR)/examples/*result
+-	$(RMDIR) $(DEFINESDIR)/examples
++	$(RM) $(DEFINESDIR)/grap*.defines $(DOCDIR)/README $(DOCDIR)/CHANGES $(DOCDIR)/COPYRIGHT $(DOCDIR)/grap.man
++	$(RM) $(EXAMPLESDIR)/*.d $(EXAMPLESDIR)/*.ms $(EXAMPLESDIR)/Makefile $(EXAMPLESDIR)/*result
++	$(RMDIR) $(DOCDIR)
++	$(RMDIR) $(EXAMPLESDIR)
+ 	$(RMDIR) $(DEFINESDIR)
+ 
+ check:	grap grap.defines examples/example.ms
diff --git a/graphics/grap/pkg/PLIST b/graphics/grap/pkg/PLIST
index 4e5cdcd88fa..f6cbaf4499b 100644
--- a/graphics/grap/pkg/PLIST
+++ b/graphics/grap/pkg/PLIST
@@ -1,28 +1,29 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/11/25 17:52:11 jtb Exp $
+@comment $NetBSD: PLIST,v 1.2 2001/07/15 12:22:44 jtb Exp $
 bin/grap
 man/man1/grap.1
-share/grap/CHANGES
-share/grap/COPYRIGHT
-share/grap/README
-share/grap/examples/400mpairs.d
-share/grap/examples/400mtimes.d
-share/grap/examples/400wpairs.d
-share/grap/examples/Makefile
-share/grap/examples/army.d
-share/grap/examples/boyhts.d
-share/grap/examples/cy_fatal.d
-share/grap/examples/example.ms
-share/grap/examples/internet.d
-share/grap/examples/prof2.d
-share/grap/examples/result.SQ_MESH.Fail1.S3.R0.Global.Random1500.succ.result
-share/grap/examples/result.SQ_MESH.Fail1.S3.R0.Hybrid.Random1500.succ.result
-share/grap/examples/result.SQ_MESH.Fail1.S3.R0.Local.Random1500.succ.result
-share/grap/examples/states.d
-share/grap/examples/states2.d
-share/grap/examples/states3.d
-share/grap/examples/usapop.d
+share/doc/grap/CHANGES
+share/doc/grap/COPYRIGHT
+share/doc/grap/README
+share/doc/grap/grap.man
+share/examples/grap/400mpairs.d
+share/examples/grap/400mtimes.d
+share/examples/grap/400wpairs.d
+share/examples/grap/Makefile
+share/examples/grap/army.d
+share/examples/grap/boyhts.d
+share/examples/grap/cy_fatal.d
+share/examples/grap/example.ms
+share/examples/grap/internet.d
+share/examples/grap/prof2.d
+share/examples/grap/result.SQ_MESH.Fail1.S3.R0.Global.Random1500.succ.result
+share/examples/grap/result.SQ_MESH.Fail1.S3.R0.Hybrid.Random1500.succ.result
+share/examples/grap/result.SQ_MESH.Fail1.S3.R0.Local.Random1500.succ.result
+share/examples/grap/states.d
+share/examples/grap/states2.d
+share/examples/grap/states3.d
+share/examples/grap/usapop.d
 share/grap/grap.defines
-share/grap/grap.man
 share/grap/grap.tex.defines
-@dirrm share/grap/examples
 @dirrm share/grap
+@dirrm share/examples/grap
+@dirrm share/doc/grap