8 files changed, 45 insertions, 132 deletions

diff --git a/devel/re2c/Makefile b/devel/re2c/Makefile
index 56ece7d2208c..60dd6e949b2a 100644
--- a/devel/re2c/Makefile
+++ b/devel/re2c/Makefile
@@ -6,30 +6,34 @@
 #
 
 PORTNAME=	re2c
-PORTVERSION=	0.9.1
-PORTREVISION=	1
+PORTVERSION=	0.9.3
+PORTREVISION=	0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.tobez.org/download/port-mirrors/devel/re2c/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compile regular expression to C (much faster final code than flex)
 
-USE_GMAKE=	yes
-USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
 
+PLIST_FILES=	bin/re2c
 MAN1=		re2c.1
 
-ALL_TARGET=	default
-
-pre-patch:
-	@${REINPLACE_CMD} -e 's|^CFLAGS.*$$|CFLAGS+=-Wall -I. -Wno-unused -Wno-parentheses|' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|' ${WRKSRC}/parser.cc ${WRKSRC}/parser.y
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/re2c ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/re2c.1 ${PREFIX}/man/man1
-	${MKDIR} ${PREFIX}/share/doc/re2c
-	${INSTALL_DATA} ${WRKSRC}/doc/loplas.ps.gz ${WRKSRC}/doc/sample.bib \
-		${PREFIX}/share/doc/re2c
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
+.endif
+
+.if !defined(NOPORTDOCS)
+post-install:
+	@${MKDIR} ${DOCSDIR}
+	${CP} -R ${WRKSRC}/doc/ ${DOCSDIR}
+	@${MKDIR} ${EXAMPLESDIR}
+	${CP} -R ${WRKSRC}/examples/ ${EXAMPLESDIR}
+	@${FIND} ${EXAMPLESDIR} ! -type d | \
+		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${EXAMPLESDIR} -type d | ${SORT} -r | \
+		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+.endif
 
 .include <bsd.port.mk>
diff --git a/devel/re2c/distinfo b/devel/re2c/distinfo
index 16be2555dedf..d4e7beb513f2 100644
--- a/devel/re2c/distinfo
+++ b/devel/re2c/distinfo
@@ -1,2 +1,2 @@
-MD5 (re2c-0.9.1.tar.gz) = 574dc153ac4edd7ccbf712721af23040
-SIZE (re2c-0.9.1.tar.gz) = 115783
+MD5 (re2c-0.9.3.tar.gz) = e819faf66292cba9abc0438348e31af1
+SIZE (re2c-0.9.3.tar.gz) = 173075
diff --git a/devel/re2c/files/patch-action.cc b/devel/re2c/files/patch-action.cc
new file mode 100644
index 000000000000..71c6b0393065
--- /dev/null
+++ b/devel/re2c/files/patch-action.cc
@@ -0,0 +1,10 @@
+--- actions.cc.orig	Tue Jun  1 17:31:44 2004
++++ actions.cc	Tue Jun  1 17:32:05 2004
+@@ -1,6 +1,7 @@
+ /* $Id: actions.cc,v 1.5 2004/05/13 02:58:17 nuffer Exp $ */
+ #include <time.h>
+ #include <string.h>
++#include <ctype.h>
+ #include <iostream>
+ #include <iomanip>
+ 
diff --git a/devel/re2c/files/patch-scanner.h b/devel/re2c/files/patch-scanner.h
deleted file mode 100644
index a2a6dc2f5c33..000000000000
--- a/devel/re2c/files/patch-scanner.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- ./scanner.h.orig	Thu Aug 26 23:46:32 1999
-+++ ./scanner.h	Sat Oct  5 13:27:00 2002
-@@ -6,10 +6,10 @@
- class Scanner {
-   private:
-     int			in;
--    uchar		*bot, *tok, *ptr, *cur, *pos, *lim, *top, *eof;
-+    char		*bot, *tok, *ptr, *cur, *pos, *lim, *top, *eof;
-     uint		tchar, tline, cline;
-   private:
--    uchar *fill(uchar*);
-+    char *fill(char*);
-   public:
-     Scanner(int);
-     int echo(ostream&);
diff --git a/devel/re2c/files/patch-scanner.re b/devel/re2c/files/patch-scanner.re
deleted file mode 100644
index 368207c1286f..000000000000
--- a/devel/re2c/files/patch-scanner.re
+++ /dev/null
@@ -1,94 +0,0 @@
---- ./scanner.re.orig	Thu Aug 26 23:46:32 1999
-+++ ./scanner.re	Sat Oct  5 13:27:00 2002
-@@ -10,7 +10,7 @@
- 
- #define	BSIZE	8192
- 
--#define	YYCTYPE		uchar
-+#define	YYCTYPE		char
- #define	YYCURSOR	cursor
- #define	YYLIMIT		lim
- #define	YYMARKER	ptr
-@@ -25,7 +25,7 @@
-     ;
- }
- 
--uchar *Scanner::fill(uchar *cursor){
-+char *Scanner::fill(char *cursor){
-     if(!eof){
- 	uint cnt = tok - bot;
- 	if(cnt){
-@@ -37,7 +37,7 @@
- 	    lim -= cnt;
- 	}
- 	if((top - lim) < BSIZE){
--	    uchar *buf = new uchar[(lim - bot) + BSIZE];
-+	    char *buf = new char[(lim - bot) + BSIZE];
- 	    memcpy(buf, tok, lim - tok);
- 	    tok = buf;
- 	    ptr = &buf[ptr - bot];
-@@ -68,7 +68,7 @@
- */
- 
- int Scanner::echo(ostream &out){
--    uchar *cursor = cur;
-+    char *cursor = cur;
-     tok = cursor;
- echo:
- /*!re2c
-@@ -85,7 +85,7 @@
- 
- 
- int Scanner::scan(){
--    uchar *cursor = cur;
-+    char *cursor = cur;
-     uint depth;
- 
- scan:
---- ./scanner.cc.orig	Thu Aug 26 23:46:32 1999
-+++ ./scanner.cc	Sat Oct  5 13:27:00 2002
-@@ -12,7 +12,7 @@
- 
- #define	BSIZE	8192
- 
--#define	YYCTYPE		uchar
-+#define	YYCTYPE		char
- #define	YYCURSOR	cursor
- #define	YYLIMIT		lim
- #define	YYMARKER	ptr
-@@ -27,7 +27,7 @@
-     ;
- }
- 
--uchar *Scanner::fill(uchar *cursor){
-+char *Scanner::fill(char *cursor){
-     if(!eof){
- 	uint cnt = tok - bot;
- 	if(cnt){
-@@ -39,7 +39,7 @@
- 	    lim -= cnt;
- 	}
- 	if((top - lim) < BSIZE){
--	    uchar *buf = new uchar[(lim - bot) + BSIZE];
-+	    char *buf = new char[(lim - bot) + BSIZE];
- 	    memcpy(buf, tok, lim - tok);
- 	    tok = buf;
- 	    ptr = &buf[ptr - bot];
-@@ -62,7 +62,7 @@
- 
- 
- int Scanner::echo(ostream &out){
--    uchar *cursor = cur;
-+    char *cursor = cur;
-     tok = cursor;
- echo:
- {
-@@ -117,7 +117,7 @@
- 
- 
- int Scanner::scan(){
--    uchar *cursor = cur;
-+    char *cursor = cur;
-     uint depth;
- 
- scan:
diff --git a/devel/re2c/files/patch-substr.h b/devel/re2c/files/patch-substr.h
new file mode 100644
index 000000000000..b1ece44a71fd
--- /dev/null
+++ b/devel/re2c/files/patch-substr.h
@@ -0,0 +1,10 @@
+--- substr.h.orig	Thu May 13 10:58:18 2004
++++ substr.h	Tue Jun  1 17:31:18 2004
+@@ -2,6 +2,7 @@
+ #ifndef _substr_h
+ #define _substr_h
+ 
++#include <sys/types.h>
+ #include <iostream>
+ #include "basics.h"
+ 
diff --git a/devel/re2c/pkg-descr b/devel/re2c/pkg-descr
index f0a02698510b..f6355bc26cf7 100644
--- a/devel/re2c/pkg-descr
+++ b/devel/re2c/pkg-descr
@@ -4,3 +4,5 @@ languages, given similar specifications, an re2c-based scanner is
 typically almost twice as fast as a flex-based scanner with little or no
 increase in size (possibly a decrease on cisc architectures).  Indeed,
 re2c-based scanners are quite competitive with hand-crafted ones.
+
+WWW: http://re2c.sourceforge.net/
diff --git a/devel/re2c/pkg-plist b/devel/re2c/pkg-plist
deleted file mode 100644
index 34e62ebf07b1..000000000000
--- a/devel/re2c/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/re2c
-share/doc/re2c/loplas.ps.gz
-share/doc/re2c/sample.bib
-@dirrm share/doc/re2c