Update to 1.44. Set LICENSE.

1.44

Modern g++ seems to dislike *printf without a constant format string if there
are no other aguuments and was causing compiles to fail.  Fixed warning
and patch from Tobias Quathamer.

Manpage spelling fix from Tobias Quathamer.

John Heidemann pointed out that plot doesn't accept modifiers to strings
(though he didn't phrase it that way).  The short form is that

plot bullet at x,y

wasn't working.  I've adjusted plot to make the string modifiers into
active keywords, which fixes the problem.

Someone named Y T pointed out that there was no mod operator (%).  There
is now.

This marks the transition from my home brewed Makefiles to automake-generated
makefiles.  A couple largely unused options went away, but with any luck
we still build everywhere.

Robert Daasch submitted a patch to include floor and ceil fuctions.
That's been incorporated.  (His patch also included adding a mod
operator, but I'd already done that.)

Added minimal support for dates, by adding versions of strftime and
strptime that return and accept seconds since the unix epoch.

1.43

Bruce Lilly pointed out that g++ 4.3.1 was emitting all sorts of dire
warnings about the hash_map data structure and associated support being
pulled from g++ in the future.  SuSe seems to ship with this and there's
no point scaring people (or letting a time bomb tick).  Grap now detects
and uses unordered_map if it's present on your system, which stops the
wailing and gnashing of teeth from g++ 4.3.1 .  That g++ version also
requires a compiler option to support that include file, which we also
autodetect and use.  (This is essentially autodetecting the flags described in
the changes to grap 1.41 below, along with some code changes to make that
actually function correctly.)

A fellow named Fergus had a Cygwin compilation problem as well.  His
system apparently had rand but not random (a very rare configuration
these days).  This led me to find a corner of the autoconf code that I
apparently hadn't checked sufficiently.  If rand was found and a
declaration made in the system files, the grap config stuff failed to
note the declaration and made its own incompatible one.  This should be
gone now.

Fergus's system also seemed to be lacking snprintf - which again is very
odd.  I hadn't reflected the change to grap sprintf in version 1.23 into
the code that emulates snprintf on systems without it.  That code has
been added.

Changed the examples to include a brief tutorial on string matching in
grap.  Suggested by John Heidemann.

1.42

There's been a long standing bug with how different versions of pic
interpret the "line from (x,y) then down 5" construct.  There was once a
bug report at
http://lists.gnu.org/archive/html/groff/2008-03/msg00003.html
about this.  As of version 1.42 grap no longer outputs this pic construct.

Dan Lasley pointed out that the key was incomplete for the bar graph example.
His fix to restore the key is included.

John Heidemann points out that bars in coordinate systems other than the
default just didn't work.  This was a bug in my yacc grammer - for
heaven's sake.  It's corrected to match the manual page.

For loops were strange in that

.G1
for xx  from  15 to 13  do  { print "YYY" }
print "ZZZZ"
.G2

would loop infinitely.  xx never passes 13.  Added a test to make that a
null loop as well as making

.G1
for xx  from  13 to 13  do  { print "YYY" }
print "ZZZZ"
.G2

print one "YYY".  You can still confuse loops, using strange by clauses
- for example "by 0" or "by * -1" but common cases should be covered.

Spotted by a fellow named Yuval.

Found a lurking initializer bug while fixing the for loop thing.

I added references to standard plot strings in a couple places to make
them somewhat easier to find.

4 files changed, 11 insertions, 52 deletions

diff --git a/graphics/grap/Makefile b/graphics/grap/Makefile
index 531d17c0a20..65358c61487 100644
--- a/graphics/grap/Makefile
+++ b/graphics/grap/Makefile
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.18 2012/10/06 14:10:57 asau Exp $
+# $NetBSD: Makefile,v 1.19 2014/07/22 11:33:47 wiz Exp $
 
-DISTNAME=	grap-1.41
-PKGREVISION=	1
+DISTNAME=	grap-1.44
 CATEGORIES=	graphics
 MASTER_SITES=	http://www.lunabase.org/~faber/Vault/software/grap/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.lunabase.org/~faber/Vault/software/grap/
 COMMENT=	Language for typesetting graphs
+LICENSE=	2-clause-bsd
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
diff --git a/graphics/grap/distinfo b/graphics/grap/distinfo
index bfcd731f13b..432562e93d6 100644
--- a/graphics/grap/distinfo
+++ b/graphics/grap/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.11 2007/12/22 19:42:01 tnn Exp $
+$NetBSD: distinfo,v 1.12 2014/07/22 11:33:47 wiz Exp $
 
-SHA1 (grap-1.41.tar.gz) = 16225879a1a2e85abe53483254143b45f5ca92d4
-RMD160 (grap-1.41.tar.gz) = 02f683385af226f743bff074fcf2063a596f937b
-Size (grap-1.41.tar.gz) = 183947 bytes
-SHA1 (patch-aa) = 79ee9c5514fe8eb332630922336a927f2bbb88be
+SHA1 (grap-1.44.tar.gz) = b15e4e04525301cfbd2900b1f1a028e81a12ba92
+RMD160 (grap-1.44.tar.gz) = b595468dc91a5c2fdca49edc7a31d635ec5b9350
+Size (grap-1.44.tar.gz) = 184876 bytes
 SHA1 (patch-ab) = 20fca93edd15d4c1220b642671fb66fa2c40c2fe
 SHA1 (patch-ac) = abd8fef7dd04e58c5a408cc8dc73f43debe84f37
-SHA1 (patch-ad) = fdafc8d4e3a4ac2887b7cfcecddd7b9c2c4577c9
+SHA1 (patch-ad) = 60e58decb12681b34c826a3d0b86006e8015cb9f
diff --git a/graphics/grap/patches/patch-aa b/graphics/grap/patches/patch-aa
deleted file mode 100644
index 7c07ea53d5e..00000000000
--- a/graphics/grap/patches/patch-aa
+++ /dev/null
@@ -1,40 +0,0 @@
-$NetBSD: patch-aa,v 1.4 2007/12/22 19:42:01 tnn Exp $
-
---- Makefile.in.orig	2007-12-18 07:20:38.000000000 +0100
-+++ Makefile.in
-@@ -38,7 +38,8 @@ MKDEPFLAGS=@MKDEPFLAGS@;
- SOURCES=grap.cc grap_lex.cc *.cc
- DISTDIR=@PACKAGE_TARNAME@-@PACKAGE_VERSION@
- 
--CXXFLAGS +=@GXXFLAGS@ @DEFS@
-+CXXFLAGS = @CXXFLAGS@
-+CPPFLAGS +=@DEFS@
- 
- # To suppress optimization of certain files under g++ where
- # optimization is costly at compilation time and of minimial use at
-@@ -55,7 +56,7 @@ SPOTLESSFILES=grap.1 grap.ps grap.man
- include Makefile.common
- 
- grap:	${OBJS}
--	${CXX} ${CXXFLAGS} ${LDFLAGS} ${OBJS} ${LDLIBS} -o grap
-+	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${LDFLAGS} ${OBJS} ${LDLIBS} -o grap
- 
- .l.cc:
- 	${LEX} -o$@ $<
-@@ -74,7 +75,7 @@ grap_lex.cc:	grap_lex.l y.tab.h
- # that file under g++ by default.  If --optimize-grap_tokenizer is
- # given to configure, no attempt to suppress optimization is made.
- grap_tokenizer.o:	grap_tokenizer.cc
--	${CXX} ${CXXFLAGS} ${SUPPRESS_OPT} -c grap_tokenizer.cc
-+	${CXX} ${CXXFLAGS} ${CPPFLAGS} ${SUPPRESS_OPT} -c grap_tokenizer.cc
- 
- # flex defines an unused static function.  This rule supresses that
- # warning under g++.
-@@ -98,7 +99,6 @@ grap.1:	grap.doc
- # The || true lines allow make to continue on systems where install -d
- # fails on existing directories.
- install:	@INSTALL_DEPS@
--	strip grap || true
- 	${INSTALL} -d ${DESTDIR}${BINDIR} || true
- 	${INSTALL} -d ${DESTDIR}${MANDIR} || true
- 	${INSTALL} -d ${DESTDIR}${DEFINESDIR} || true
diff --git a/graphics/grap/patches/patch-ad b/graphics/grap/patches/patch-ad
index 1cd49662bc9..531394e062b 100644
--- a/graphics/grap/patches/patch-ad
+++ b/graphics/grap/patches/patch-ad
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.1 2006/01/09 19:46:01 joerg Exp $
+$NetBSD: patch-ad,v 1.2 2014/07/22 11:33:47 wiz Exp $
 
---- grap_lex.l.orig	2006-01-09 19:42:35.000000000 +0000
-+++ grap_lex.l
+--- grap_lex.ll.orig	2006-01-09 19:42:35.000000000 +0000
++++ grap_lex.ll
 @@ -25,7 +25,7 @@ extern "C" {
  #include "grap_draw.h" 
  #include "y.tab.h"