4 files changed, 8 insertions, 126 deletions

diff --git a/print/detex/Makefile b/print/detex/Makefile
index fe9d416ed199..d1609c9d8bf3 100644
--- a/print/detex/Makefile
+++ b/print/detex/Makefile
@@ -7,9 +7,9 @@
 #
 
 PORTNAME=	detex
-PORTVERSION=	2.6
+PORTVERSION=	2.7
 CATEGORIES=	print
-MASTER_SITES=	ftp://ftp.cs.purdue.edu/pub/trinkle/
+MASTER_SITES=	http://www.cs.purdue.edu/homes/trinkle/detex/
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	ports@FreeBSD.org
@@ -17,12 +17,14 @@ MAINTAINER=	ports@FreeBSD.org
 EXTRACT_CMD=		${TAR}
 EXTRACT_BEFORE_ARGS=	-xf
 EXTRACT_AFTER_ARGS=	#empty
+
 NO_WRKSUBDIR=	yes
+MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}"
 MAN1=		detex.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/detex ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/${MAN1}l ${PREFIX}/man/man1/${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/${MAN1}l ${MANPREFIX}/man/man1/${MAN1}
 
 
 .include <bsd.port.mk>
diff --git a/print/detex/distinfo b/print/detex/distinfo
index bc869305560b..0c45d598b6de 100644
--- a/print/detex/distinfo
+++ b/print/detex/distinfo
@@ -1 +1 @@
-MD5 (detex-2.6.tar) = 410ce52761054c6af7059cb3d9f98e5b
+MD5 (detex-2.7.tar) = df837b1adb40503f40b94b8169f0e154
diff --git a/print/detex/files/patch-01 b/print/detex/files/patch-01
deleted file mode 100644
index 74180e14f29e..000000000000
--- a/print/detex/files/patch-01
+++ /dev/null
@@ -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;
- 
diff --git a/print/detex/pkg-descr b/print/detex/pkg-descr
index 87702137f9d2..76a3f82dcf1d 100644
--- a/print/detex/pkg-descr
+++ b/print/detex/pkg-descr
@@ -1,3 +1,5 @@
 detex takes as input a TeX source file and strips the TeX commands.
 The result is output to stdout.  This is useful if you need a pure ASCII
 version of a TeX/LaTeX file.
+
+WWW: http://www.cs.purdue.edu/homes/trinkle/detex/