Upgrade to 5.20.

6 files changed, 26 insertions, 45 deletions

diff --git a/devel/ragel/Makefile b/devel/ragel/Makefile
index e70ad3b0dcab..ffd71c809fc7 100644
--- a/devel/ragel/Makefile
+++ b/devel/ragel/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	ragel
-PORTVERSION=	5.14
+PORTVERSION=	5.20
 CATEGORIES=	devel
 MASTER_SITES=	http://www.cs.queensu.ca/home/thurston/ragel/ \
 		http://mirror.inerd.com/FreeBSD/distfiles/${PORTNAME}/
@@ -23,8 +23,8 @@ GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 MAKE_ENV=	GPERF="${LOCALBASE}/bin/gperf"
 
-MAN1=		ragel.1 rlcodegen.1
-PLIST_FILES=	bin/ragel bin/rlcodegen
+MAN1=		ragel.1 rlgen-cd.1 rlgen-dot.1 rlgen-java.1 rlgen-ruby.1
+PLIST_FILES=	bin/ragel bin/rlgen-cd
 
 PORTDOCS=	${PORTNAME}-guide-${PORTVERSION}.pdf
 
@@ -41,13 +41,14 @@ post-patch:
 post-build:
 	@cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \
 		${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} \
-		ragel.1 rlcodegen.1
+		${MAN1}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ragel/ragel ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/rlcodegen/rlcodegen ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/doc/ragel.1 ${MANPREFIX}/man/man1
-	${INSTALL_MAN} ${WRKSRC}/doc/rlcodegen.1 ${MANPREFIX}/man/man1
+	${INSTALL_PROGRAM} ${WRKSRC}/rlgen-cd/rlgen-cd ${PREFIX}/bin
+.for m in ${MAN1}
+	${INSTALL_MAN} ${WRKSRC}/doc/${m} ${MAN1PREFIX}/man/man1
+.endfor
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/ragel/distinfo b/devel/ragel/distinfo
index 4e6f94b89e0b..10692b3114da 100644
--- a/devel/ragel/distinfo
+++ b/devel/ragel/distinfo
@@ -1,6 +1,6 @@
-MD5 (ragel-5.14.tar.gz) = 17a49c58244da44edf9ff37586e78626
-SHA256 (ragel-5.14.tar.gz) = c520c362bb7b7c6efe6ffdff0e9c169b96aa2238e6d9b46481c07f5e2e571156
-SIZE (ragel-5.14.tar.gz) = 487787
-MD5 (ragel-guide-5.14.pdf) = 37b184640d7951b29277ed3be7a0ff85
-SHA256 (ragel-guide-5.14.pdf) = c0ede6252d26f10a9271ea6de7240697473058a7b52bd3b252e13738b52dbb52
-SIZE (ragel-guide-5.14.pdf) = 321868
+MD5 (ragel-5.20.tar.gz) = 511a016cb856f578c9cbeade4323c218
+SHA256 (ragel-5.20.tar.gz) = 75faf47026698140b63519138d19a00d5e4cbf1f2007a3f7fb407a3253e52cc8
+SIZE (ragel-5.20.tar.gz) = 526550
+MD5 (ragel-guide-5.20.pdf) = 498a833a3893cee61f0e44949b8747d1
+SHA256 (ragel-guide-5.20.pdf) = 9d89dc97009d37b0c47176055c450fba23f7d0b9878d323d865b42ff6084cb88
+SIZE (ragel-guide-5.20.pdf) = 526285
diff --git a/devel/ragel/files/patch-redfsm_gendata.cpp b/devel/ragel/files/patch-redfsm_gendata.cpp
new file mode 100644
index 000000000000..01804f04474e
--- /dev/null
+++ b/devel/ragel/files/patch-redfsm_gendata.cpp
@@ -0,0 +1,10 @@
+--- redfsm/gendata.cpp.orig	Sun Apr 29 15:46:19 2007
++++ redfsm/gendata.cpp	Sun Apr 29 15:47:38 2007
+@@ -21,6 +21,7 @@
+ 
+ #include "gendata.h"
+ #include <iostream>
++#include <climits>
+ 
+ using std::cerr;
+ using std::endl;
diff --git a/devel/ragel/files/patch-rlcodegen__gendata.cpp b/devel/ragel/files/patch-rlcodegen__gendata.cpp
deleted file mode 100644
index e98144e15943..000000000000
--- a/devel/ragel/files/patch-rlcodegen__gendata.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- rlcodegen/gendata.cpp.orig	Thu Dec 22 16:04:14 2005
-+++ rlcodegen/gendata.cpp	Mon Dec 26 13:21:36 2005
-@@ -31,6 +31,7 @@
- #include "fgotocodegen.h"
- #include "ipgotocodegen.h"
- 
-+#include <climits>
- #include <iostream>
- 
- using std::endl;
diff --git a/devel/ragel/files/patch-rlcodegen__xmlparse.y b/devel/ragel/files/patch-rlcodegen__xmlparse.y
deleted file mode 100644
index 5dd236025d0a..000000000000
--- a/devel/ragel/files/patch-rlcodegen__xmlparse.y
+++ /dev/null
@@ -1,20 +0,0 @@
---- rlcodegen/xmlparse.y.orig	Sun Jul 30 22:41:37 2006
-+++ rlcodegen/xmlparse.y	Wed Aug  9 01:05:51 2006
-@@ -474,7 +474,7 @@
- 			cgd->initStateCondList( curState, length );
- 			curStateCond = 0;
- 		}
--	}
-+	};
- 
- StateCondList:
- 	StateCondList StateCond |
-@@ -488,7 +488,7 @@
- 		Key highKey = readKey( td, &td );
- 		long condId = readOffsetPtr( td, &td );
- 		cgd->addStateCond( curState, lowKey, highKey, condId );
--	}
-+	};
- 	
- TagTransList:
- 	TagTransListHead
diff --git a/devel/ragel/files/patch-rlcodegen__fsmcodegen.cpp b/devel/ragel/files/patch-rlgen-cd_fsmcodegen.cpp
index 1a461baab33f..49448a474f94 100644
--- a/devel/ragel/files/patch-rlcodegen__fsmcodegen.cpp
+++ b/devel/ragel/files/patch-rlgen-cd_fsmcodegen.cpp
@@ -1,5 +1,5 @@
---- rlcodegen/fsmcodegen.cpp.orig	Wed Dec 21 15:15:28 2005
-+++ rlcodegen/fsmcodegen.cpp	Mon Dec 26 13:36:08 2005
+--- rlgen-cd/fsmcodegen.cpp.orig	Wed Dec 21 15:15:28 2005
++++ rlgen-cd/fsmcodegen.cpp	Mon Dec 26 13:36:08 2005
 @@ -25,6 +25,7 @@
  #include "fsmcodegen.h"
  #include "redfsm.h"