(pkgsrc)

  - Add LICENSE= modified-bsd
(upstream)
  - Update  3.08 to 3.14
From: http://www.catb.org/~esr/ascii/NEWS
---------------------------------
3.14: 2013-11-27
  Recognize \0 as ASCII NUL.
  ascii.cgi deleted: the <isindex> it relies on is archaic and nonconformant.
  Markup improvements on the manual page.

3.13: 2013-11-20
  Tweak Makefile to obey $(PREFIX) convention (from MacPorts).

3.12: 2012-11-23
  Cygwin port fix.

3.11: 2011-03-15
  Recognize single decimal or hex digits.
  Minor bug fixes and additional character names from Debian.

3.10: 2010-10-19
  License change to BSD. Polish code to modern fully-ANSI C.

3.9: 2010-10-13
  Fix some bugs in the name table.

3 files changed, 24 insertions, 21 deletions

diff --git a/misc/ascii/Makefile b/misc/ascii/Makefile
index 6e669794f43..2db7c381872 100644
--- a/misc/ascii/Makefile
+++ b/misc/ascii/Makefile
@@ -1,13 +1,14 @@
-# $NetBSD: Makefile,v 1.13 2012/10/08 09:57:15 asau Exp $
+# $NetBSD: Makefile,v 1.14 2014/12/13 01:05:44 mef Exp $
 #
 
-DISTNAME=	ascii-3.8
+DISTNAME=	ascii-3.14
 CATEGORIES=	misc
 MASTER_SITES=	${HOMEPAGE}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.catb.org/~esr/ascii/
 COMMENT=	ASCII character table program
+LICENSE=	modified-bsd
 
 USE_TOOLS=		gmake
 USE_LIBTOOL=		yes
diff --git a/misc/ascii/distinfo b/misc/ascii/distinfo
index 5050811d8e2..663de6f4d24 100644
--- a/misc/ascii/distinfo
+++ b/misc/ascii/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2008/06/19 17:33:50 bjs Exp $
+$NetBSD: distinfo,v 1.5 2014/12/13 01:05:44 mef Exp $
 
-SHA1 (ascii-3.8.tar.gz) = c7a513cd52c0fec64491566b5db18fa070639ca4
-RMD160 (ascii-3.8.tar.gz) = 66fdcc1e46875f5d3cc296e6d26f06283b9fd812
-Size (ascii-3.8.tar.gz) = 19667 bytes
-SHA1 (patch-aa) = 019afb0b95b09e26ed9171d64c766ee0fc247471
+SHA1 (ascii-3.14.tar.gz) = fd8281078c1b3d52d4080ced1855f4f540d5a501
+RMD160 (ascii-3.14.tar.gz) = 2d5896a9064c298a181f0a7170b3927545f52785
+Size (ascii-3.14.tar.gz) = 13045 bytes
+SHA1 (patch-aa) = b8b73803d6e9a99e6c7493e5210b37c71ce62c45
diff --git a/misc/ascii/patches/patch-aa b/misc/ascii/patches/patch-aa
index e4fa3ac663a..cb7e11c2617 100644
--- a/misc/ascii/patches/patch-aa
+++ b/misc/ascii/patches/patch-aa
@@ -1,27 +1,29 @@
-$NetBSD: patch-aa,v 1.1 2008/06/19 17:33:50 bjs Exp $
+$NetBSD: patch-aa,v 1.2 2014/12/13 01:05:44 mef Exp $
 
---- Makefile.orig	2005-03-03 16:03:38.000000000 -0500
-+++ Makefile
-@@ -2,10 +2,11 @@
+--- Makefile.orig	2013-11-28 08:39:42.000000000 +0900
++++ Makefile	2014-12-13 09:59:58.000000000 +0900
+@@ -2,13 +2,14 @@
  
- VERS=$(shell sed <ascii.spec -n -e '/Version: \(.*\)/s//\1/p')
+ VERS=3.14
  
 -CFLAGS = -O
-+CFLAGS ?= -O
++CFLAGS? = -O
+ 
+ PREFIX = /usr
+ 
+ all: ascii ascii.1
  
  ascii: ascii.c splashscreen.h nametable.h
--	$(CC) -DREVISION=$(VERS) ascii.c -o ascii
 +	$(LIBTOOL) --mode=link --tag=CC \
-+		$(CC) $(CFLAGS) -DREVISION=$(VERS) ascii.c -o ascii
+ 	$(CC) $(CFLAGS) -DREVISION=$(VERS) ascii.c -o ascii
  
  splashscreen.h: splashscreen
- 	sed <splashscreen >splashscreen.h -e 's/\\/\\\\/g' -e 's/"/\\"/g' -e 's/.*/P("&");/' 
-@@ -23,8 +24,11 @@ clean:
- 	rm -f ascii ascii.o splashscreen.h nametable.h *.rpm *.tar.gz MANIFEST
+@@ -35,8 +36,11 @@ splint:
+ 	splint +quiet +posixlib $(SPLINT_SUPPRESSIONS) ascii.c
  
  install: ascii ascii.1
--	cp ascii $(DESTDIR)/usr/bin/ascii
--	cp ascii.1 $(DESTDIR)/usr/share/man/man1
+-	cp ascii $(DESTDIR)$(PREFIX)/bin/ascii
+-	cp ascii.1 $(DESTDIR)$(PREFIX)/share/man/man1
 +	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(PREFIX)/bin
 +	$(LIBTOOL) --mode=install \
 +		$(BSD_INSTALL_PROGRAM) ascii $(DESTDIR)$(PREFIX)/bin
@@ -29,4 +31,4 @@ $NetBSD: patch-aa,v 1.1 2008/06/19 17:33:50 bjs Exp $
 +	$(BSD_INSTALL_MAN) ascii.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1/ascii.1
  
  uninstall:
- 	rm $(DESTDIR)/usr/bin/ascii
+ 	rm $(DESTDIR)$(PREFIX)/bin/ascii