Update to ascii-3.8. I don't see a ChangeLog anywhere, but this

satisfies doc/TODO. ;)  Seems to need gmake now.

3 files changed, 47 insertions, 15 deletions

diff --git a/misc/ascii/Makefile b/misc/ascii/Makefile
index 1bf82ff8088..bd887595238 100644
--- a/misc/ascii/Makefile
+++ b/misc/ascii/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2008/03/04 19:21:11 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/19 17:33:50 bjs Exp $
 #
 
-DISTNAME=	ascii-3.0
+DISTNAME=	ascii-3.8
 CATEGORIES=	misc
-MASTER_SITES=	http://www.catb.org/~esr/
+MASTER_SITES=	${HOMEPAGE}
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.catb.org/~esr/ascii/
@@ -11,15 +11,14 @@ COMMENT=	ASCII character table program
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-BUILD_TARGET= ascii
+USE_TOOLS=		gmake
+USE_LIBTOOL=		yes
 
-INSTALLATION_DIRS=	bin ${PKGMANDIR}/man1
+BUILD_TARGET= 		ascii
+EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ascii ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/ascii.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/examples/ascii
-	${INSTALL_DATA} ${WRKSRC}/ascii.cgi \
-		${DESTDIR}${PREFIX}/share/examples/ascii
+post-install:
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/ascii.cgi ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/ascii/distinfo b/misc/ascii/distinfo
index 5efe96741fd..5050811d8e2 100644
--- a/misc/ascii/distinfo
+++ b/misc/ascii/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2005/02/24 11:02:50 agc Exp $
+$NetBSD: distinfo,v 1.4 2008/06/19 17:33:50 bjs Exp $
 
-SHA1 (ascii-3.0.tar.gz) = faf4c7d90ab4a55cda42a3a8c6124f4f8f5d7429
-RMD160 (ascii-3.0.tar.gz) = eb7badcf0a25f1649f83e0b73120c408ef1c8843
-Size (ascii-3.0.tar.gz) = 10804 bytes
+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
diff --git a/misc/ascii/patches/patch-aa b/misc/ascii/patches/patch-aa
new file mode 100644
index 00000000000..e4fa3ac663a
--- /dev/null
+++ b/misc/ascii/patches/patch-aa
@@ -0,0 +1,32 @@
+$NetBSD: patch-aa,v 1.1 2008/06/19 17:33:50 bjs Exp $
+
+--- Makefile.orig	2005-03-03 16:03:38.000000000 -0500
++++ Makefile
+@@ -2,10 +2,11 @@
+ 
+ VERS=$(shell sed <ascii.spec -n -e '/Version: \(.*\)/s//\1/p')
+ 
+-CFLAGS = -O
++CFLAGS ?= -O
+ 
+ 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
+ 
+ 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
+ 
+ install: ascii ascii.1
+-	cp ascii $(DESTDIR)/usr/bin/ascii
+-	cp ascii.1 $(DESTDIR)/usr/share/man/man1
++	$(BSD_INSTALL_PROGRAM_DIR) $(DESTDIR)$(PREFIX)/bin
++	$(LIBTOOL) --mode=install \
++		$(BSD_INSTALL_PROGRAM) ascii $(DESTDIR)$(PREFIX)/bin
++	$(BSD_INSTALL_MAN_DIR) $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1
++	$(BSD_INSTALL_MAN) ascii.1 $(DESTDIR)$(PREFIX)/$(PKGMANDIR)/man1/ascii.1
+ 
+ uninstall:
+ 	rm $(DESTDIR)/usr/bin/ascii