Update to detex-2.8 which has now a proper license. Thanks to Daniel

Trinkle (the author) for taking the time to talk to his University and
to clarify the copyright/licensing situation.

ok steven

print/detex/Makefile

@@ -1,28 +1,27 @@
-# $OpenBSD: Makefile,v 1.20 2007/10/02 14:01:12 steven Exp $
+# $OpenBSD: Makefile,v 1.21 2008/02/02 11:56:13 mbalmer Exp $
 
 COMMENT=		strip TeX/LaTeX codes from a file
 
-DISTNAME=		detex-2.6
-PKGNAME=		${DISTNAME}p0
+DISTNAME=		detex-2.8
 CATEGORIES=		print
 
 MASTER_SITES=		ftp://ftp.cs.purdue.edu/pub/trinkle/
 EXTRACT_SUFX=		.tar
 
-# free redistribution, see README
+MAINTAINER=		Marc Balmer <mbalmer@openbsd.org>
+
+# NCSA/University of Illinois Open Source License
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 WANTLIB=		c
 
-WRKDIST=		${WRKDIR}
-
 NO_REGRESS=		Yes
+MAKE_FLAGS=		CFLAGS="${CFLAGS}"
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/detex ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/detex.1l ${PREFIX}/man/man1/detex.1
 
-
 .include <bsd.port.mk>

print/detex/distinfo

@@ -1,5 +1,5 @@
-MD5 (detex-2.6.tar) = QQzlJ2EFTGr3BZyz2fmOWw==
-RMD160 (detex-2.6.tar) = sQpc/vRsNkUYiZddPqF/ViPL+rs=
-SHA1 (detex-2.6.tar) = 3/K+6M7/+umyCfuSO+VK4o+DdEE=
-SHA256 (detex-2.6.tar) = V3BTp5zmZtPPayyCA3okMOpTjm28D7lIKQoRLcGHrhk=
-SIZE (detex-2.6.tar) = 90112
+MD5 (detex-2.8.tar) = epa2R/Q7sHcyPN6S+qHokw==
+RMD160 (detex-2.8.tar) = mD6pDenjVZMXuvSnHeDo3keGO30=
+SHA1 (detex-2.8.tar) = V2kfjk3VLL9jLzir6/2MNyXeAZs=
+SHA256 (detex-2.8.tar) = E61nMR8jL6ox2p+oMiZFxXRejtWrl3zIWBgVT6vZQTQ=
+SIZE (detex-2.8.tar) = 318976

print/detex/patches/patch-01

@@ -1,122 +0,0 @@
---- detex.l.orig	Thu Aug 12 08:54:46 1993
-+++ detex.l	Mon Feb 17 23:01:15 1997
-@@ -76,7 +76,7 @@
- 
- <Normal>"\\begin"{S}"{"{S}"document"{S}"}"	{fLatex = !fForcetex; IGNORE;}
- 
--<Normal>"\\begin"     /* environment start */	{LaBEGIN LaBegin; IGNORE;}
-+<Normal>"\\begin"     {/* environment start */	 LaBEGIN LaBegin; IGNORE;}
- 
- <LaBegin>{S}"{"{S}"verbatim"{S}"}"		{   if (BeginEnv("verbatim"))
- 							BEGIN LaEnv;
-@@ -85,8 +85,8 @@
- 						    IGNORE;
- 						}
- 
--<LaVerbatim>"\\end"{S}"{"{S}"verbatim"{S}"}" /* verbatim mode */
--						{BEGIN Normal; IGNORE;}
-+<LaVerbatim>"\\end"{S}"{"{S}"verbatim"{S}"}" {/* verbatim mode */
-+						BEGIN Normal; IGNORE;}
- <LaVerbatim>.					ECHO;
- 
- <LaBegin>{W}					{   if (BeginEnv(yytext))
-@@ -98,11 +98,11 @@
- <LaBegin>"\n"					NEWLINE;
- <LaBegin>.					;
- 
--<LaEnv>"\\end"  /* absorb some environments */	{LaBEGIN LaEnd; IGNORE;}
-+<LaEnv>"\\end"  {/* absorb some environments */	LaBEGIN LaEnd; IGNORE;}
- <LaEnv>"\n"					NEWLINE;
- <LaEnv>.					;
- 
--<LaEnd>{W}		 /* end environment */	{   if (EndEnv(yytext))
-+<LaEnd>{W}		 {/* end environment */	   if (EndEnv(yytext))
- 							BEGIN Normal;
- 						    IGNORE;
- 						}
-@@ -110,8 +110,8 @@
- <LaEnd>"\n"					NEWLINE;
- <LaEnd>.					;
- 
--<Normal>"\\bibitem"	    /* ignore args  */	{LaBEGIN LaMacro2; IGNORE;}
--<Normal>"\\bibliography"    /* of these \cs */	{LaBEGIN LaMacro; IGNORE;}
-+<Normal>"\\bibitem"	    {/* ignore args  */	 LaBEGIN LaMacro2; IGNORE;}
-+<Normal>"\\bibliography"    {/* of these \cs */	LaBEGIN LaMacro; IGNORE;}
- <Normal>"\\bibstyle"				{LaBEGIN LaMacro; IGNORE;}
- <Normal>"\\cite"				{CITEBEGIN LaMacro2; IGNORE;}
- <Normal>"\\documentstyle"			{LaBEGIN LaMacro; IGNORE;}
-@@ -122,8 +122,8 @@
- <Normal>"\\pagestyle"				{LaBEGIN LaMacro; IGNORE;}
- <Normal>"\\ref"					{CITEBEGIN LaMacro; IGNORE;}
- <Normal>"\\setcounter"				{LaBEGIN LaMacro; IGNORE;}
--<Normal>"\\verb" /* ignore \verb<char>...<char> */
--						{   if (fLatex) {
-+<Normal>"\\verb" {/* ignore \verb<char>...<char> */
-+						   if (fLatex) {
- 						 	char verbchar, c;
- 						 	verbchar = input();
- 						 	while ((c = input()) != verbchar)
-@@ -143,33 +143,33 @@
- <LaMacro2>"\n"					NEWLINE;
- <LaMacro2>.					;
- 
--<Normal>"\\def"		/* ignore def begin */	{BEGIN Define; IGNORE;}
-+<Normal>"\\def"		{/* ignore def begin */	BEGIN Define; IGNORE;}
- <Define>"{"					BEGIN Normal;
- <Define>"\n"					NEWLINE;
- <Define>.					;
- 
--<Normal>"\\("		/* formula mode */	{LaBEGIN LaFormula; IGNORE;}
-+<Normal>"\\("		{/* formula mode */	LaBEGIN LaFormula; IGNORE;}
- <LaFormula>"\\)"				BEGIN Normal;
- <LaFormula>"\n"					NEWLINE;
- <LaFormula>.					;
- 
--<Normal>"\\["		/* display mode */	{LaBEGIN LaDisplay; IGNORE;}
-+<Normal>"\\["		{/* display mode */	LaBEGIN LaDisplay; IGNORE;}
- <LaDisplay>"\\]"				BEGIN Normal;
- <LaDisplay>"\n"					NEWLINE;
- <LaDisplay>.					;
- 
--<Normal>"$$"		/* display mode */	{BEGIN Display; IGNORE;}
-+<Normal>"$$"		{/* display mode */	BEGIN Display; IGNORE;}
- <Display>"$$"					BEGIN Normal;
- <Display>"\n"					NEWLINE;
- <Display>.					;
- 
--<Normal>"$"		/* math mode */		{BEGIN Math; IGNORE;}
-+<Normal>"$"		{/* math mode */		BEGIN Math; IGNORE;}
- <Math>"$"					BEGIN Normal;
- <Math>"\n"					NEWLINE;
- <Math>"\\$"					;
- <Math>.						;
- 
--<Normal>"\\include"	/* process files */	{LaBEGIN LaInclude; IGNORE;}
-+<Normal>"\\include"	{/* process files */	LaBEGIN LaInclude; IGNORE;}
- <LaInclude>[^{ \t\n}]+				{   IncludeFile(yytext);
- 						    BEGIN Normal;
- 						}
-@@ -192,11 +192,11 @@
- <Input>"\n"					NEWLINE;
- <Input>.					;
- 
--<Normal>\\(aa|AA|ae|AE|oe|OE|ss)[ \t]*[ \t\n}] /* handle ligatures */
--						{(void)printf("%.2s", yytext+1);}
-+<Normal>\\(aa|AA|ae|AE|oe|OE|ss)[ \t]*[ \t\n}] {/* handle ligatures */
-+						(void)printf("%.2s", yytext+1);}
- <Normal>\\[OoijLl][ \t]*[ \t\n}]		{(void)printf("%.1s", yytext+1);}
- 
--<Normal>\\[a-zA-Z@]+	/* ignore other \cs */	{BEGIN Control; IGNORE;}
-+<Normal>\\[a-zA-Z@]+	{/* ignore other \cs */	BEGIN Control; IGNORE;}
- <Normal>"\\ "					SPACE;
- <Normal>\\.					IGNORE;
- <Control>\\[a-zA-Z@]+				IGNORE;
-@@ -205,7 +205,7 @@
- <Control>[ \t]*[{]*				{BEGIN Normal; IGNORE;}
- <Control>.					{yyless(0);BEGIN Normal;}
- 
--<Normal>[{}\\|]	/* special characters */	IGNORE;
-+<Normal>[{}\\|]	{/* special characters */	IGNORE;}
- <Normal>[!?]"`"					IGNORE;
- <Normal>~					SPACE;
-