update to detex-2.8, which has fixes for flex included (allows it

to compile on Darwin).

4 files changed, 26 insertions, 26 deletions

diff --git a/textproc/detex/Makefile b/textproc/detex/Makefile
index a2c55e08d4b..ec1a17654c6 100644
--- a/textproc/detex/Makefile
+++ b/textproc/detex/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2007/01/07 09:14:13 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2008/11/20 02:19:26 chuck Exp $
 #
 
-DISTNAME=	detex-2.7
+DISTNAME=	detex-2.8
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.cs.purdue.edu/homes/trinkle/detex/
 EXTRACT_SUFX=	.tar
diff --git a/textproc/detex/distinfo b/textproc/detex/distinfo
index 98b474c657f..286034550f3 100644
--- a/textproc/detex/distinfo
+++ b/textproc/detex/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.7 2006/01/02 10:33:28 joerg Exp $
+$NetBSD: distinfo,v 1.8 2008/11/20 02:19:26 chuck Exp $
 
-SHA1 (detex-2.7.tar) = 84b975a57ea199a29a795d699bb92dca0bad42d5
-RMD160 (detex-2.7.tar) = 059919ef4d7d16caa6c1a6a13b067ce73e2052c2
-Size (detex-2.7.tar) = 94720 bytes
-SHA1 (patch-aa) = 09c182dbc27c3ec34a9c9919f9564b5e4d1eefb3
-SHA1 (patch-ab) = 4b4e8c65ec57b8191a0d88f2bd3b0fb447e09b7e
+SHA1 (detex-2.8.tar) = 57691f8e4dd52cbf632f38abebfd8c3725de019b
+RMD160 (detex-2.8.tar) = 983ea90de9e3559317baf4a71de0e8de47863b7d
+Size (detex-2.8.tar) = 318976 bytes
+SHA1 (patch-aa) = 4ad2937ed0c6fbd00b3767c8bdeb92dd1e7e5652
+SHA1 (patch-ab) = 43234d568b157da60db666daab75d9df6c9a392d
diff --git a/textproc/detex/patches/patch-aa b/textproc/detex/patches/patch-aa
index 0f4e5f6cbf5..a9577deebd4 100644
--- a/textproc/detex/patches/patch-aa
+++ b/textproc/detex/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2004/06/04 18:34:17 jschauma Exp $
+$NetBSD: patch-aa,v 1.4 2008/11/20 02:19:26 chuck Exp $
 
---- Makefile.orig	1999-05-12 13:45:55.000000000 -0400
-+++ Makefile	2004-06-04 14:37:10.000000000 -0400
-@@ -37,7 +37,7 @@
+--- Makefile.orig	2008-11-19 20:18:35.000000000 -0500
++++ Makefile	2008-11-19 20:19:26.000000000 -0500
+@@ -69,7 +69,7 @@
  #
  #DEFS	+= ${DEFS} -DNO_MALLOC_DECL
  #
@@ -11,12 +11,12 @@ $NetBSD: patch-aa,v 1.3 2004/06/04 18:34:17 jschauma Exp $
  
  # Use your favorite lexical scanner
  #
-@@ -67,7 +67,7 @@
- all:	${PROGS}
+@@ -80,7 +80,7 @@
  
- detex: ${D_OBJ}
--	${CC} ${CFLAGS} -o $@ ${D_OBJ} -ll
-+	${CC} ${CFLAGS} -o $@ ${D_OBJ}
+ # scanner library
+ #
+-LEXLIB	= -ll
++#LEXLIB	= -ll
+ #LEXLIB	= -lfl
  
- detex.c:
- 	sed -f states.sed detex.l > xxx.l
+ LPR	= lpr -p
diff --git a/textproc/detex/patches/patch-ab b/textproc/detex/patches/patch-ab
index c76235fc83e..fc00ae8ed65 100644
--- a/textproc/detex/patches/patch-ab
+++ b/textproc/detex/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2006/01/02 10:33:28 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2008/11/20 02:19:26 chuck Exp $
 
---- detex.l.orig	1999-05-12 17:45:53.000000000 +0000
-+++ detex.l
-@@ -27,9 +27,7 @@ static char	rcsid[] = "$Header: /p/src/l
+--- detex.l.orig	2008-11-19 20:20:18.000000000 -0500
++++ detex.l	2008-11-19 20:20:54.000000000 -0500
+@@ -59,9 +59,7 @@
  #ifndef MAXPATHLEN
  #include <sys/param.h>
  #endif
@@ -11,9 +11,9 @@ $NetBSD: patch-ab,v 1.1 2006/01/02 10:33:28 joerg Exp $
 -#endif
  
  #define	LaBEGIN		if (fLatex) BEGIN
- #define	CITEBEGIN	if (fLatex && !fCite) BEGIN
-@@ -38,9 +36,6 @@ static char	rcsid[] = "$Header: /p/src/l
- #define	NEWLINE		if (!fWord) putchar('\n')
+ #define	IGNORE		if (fSpace && !fWord) putchar(' ')
+@@ -73,9 +71,6 @@
+ #define	CITE(x)		if (fLatex && !fCite) KILLARGS(x)
  
  char	*SafeMalloc();
 -#ifndef NO_MALLOC_DECL