- Update to 6.4

PR:		133313
Submitted by:	Ports Fury

4 files changed, 26 insertions, 50 deletions

diff --git a/devel/ragel/Makefile b/devel/ragel/Makefile
index b00585d34a75..e84435315fb5 100644
--- a/devel/ragel/Makefile
+++ b/devel/ragel/Makefile
@@ -7,34 +7,29 @@
 #
 
 PORTNAME=	ragel
-PORTVERSION=	6.3
+PORTVERSION=	6.4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.complang.org/ragel/
+.if !defined(NOPORTDOCS)
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTFILES_DOC}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+.endif
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Compile regular languages into executable C/C++ code
 
-BUILD_DEPENDS=	${LOCALBASE}/bin/gperf:${PORTSDIR}/devel/gperf
-
-USE_BISON=	build
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-MAKE_ENV=	GPERF="${LOCALBASE}/bin/gperf"
-
-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
+MAN1=		${PORTNAME}.1
+PORTDOCS=	*
+PORTEXAMPLES=	*
+PLIST_FILES=	bin/${PORTNAME}
 
-.if !defined(NOPORTDOCS)
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${PORTDOCS}
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
-.endif
+DISTFILES_DOC=	${PORTNAME}-guide-${PORTVERSION}.pdf
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|$$(CFLAGS)|$$(CXXFLAGS)|g ; \
-		 s|gperf -L|$$(GPERF) -L|g'
+	@${REINPLACE_CMD} -e 's|= -g|=|g' ${WRKSRC}/ragel/Makefile.in
 
 post-build:
 	@cd ${WRKSRC}/doc && ${SETENV} ${MAKE_ENV} \
@@ -42,16 +37,17 @@ post-build:
 		${MAN1}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ragel/ragel ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/rlgen-cd/rlgen-cd ${PREFIX}/bin
-.for m in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/doc/${m} ${MAN1PREFIX}/man/man1
-.endfor
-
-post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/ragel/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/doc/${PORTNAME}.1 ${MANPREFIX}/man/man1
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${DISTDIR}/${PORTDOCS} ${DOCSDIR}
+.for file in ${DISTFILES_DOC}
+	${INSTALL_DATA} ${DISTDIR}/${file} ${DOCSDIR}
+.endfor
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	@(cd ${WRKSRC}/examples; ${COPYTREE_SHARE} . ${EXAMPLESDIR})
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/ragel/distinfo b/devel/ragel/distinfo
index cf86110040ee..489493021937 100644
--- a/devel/ragel/distinfo
+++ b/devel/ragel/distinfo
@@ -1,6 +1,6 @@
-MD5 (ragel-6.3.tar.gz) = 61b53fb53c28b31bec28da8e7bd21351
-SHA256 (ragel-6.3.tar.gz) = 018cedc8a68be85cda330fc53d0bb8a1ca6ad39b1cf790eed0311e7baa5a2520
-SIZE (ragel-6.3.tar.gz) = 597390
-MD5 (ragel-guide-6.3.pdf) = 044a4661129fa0adf4bab326271cc9d7
-SHA256 (ragel-guide-6.3.pdf) = 7a3a14fb3ec9ec73ad6b732ba56de920e2a4f64123cc51d8c197122f0d6eecc5
-SIZE (ragel-guide-6.3.pdf) = 571996
+MD5 (ragel-6.4.tar.gz) = c0dc274083e9d825bfb48966810de046
+SHA256 (ragel-6.4.tar.gz) = dab2360332abf07aff903e834c18f687322a682f55cb0b44aafe383a7ab88cb7
+SIZE (ragel-6.4.tar.gz) = 571767
+MD5 (ragel-guide-6.4.pdf) = 26ca81689cda4277f276a62bd8f60cec
+SHA256 (ragel-guide-6.4.pdf) = 6268f2b1cfc98fdd9d856742cf27361fb1921aa5f1c434bdf7d26043692c8527
+SIZE (ragel-guide-6.4.pdf) = 576521
diff --git a/devel/ragel/files/patch-redfsm_gendata.cpp b/devel/ragel/files/patch-redfsm_gendata.cpp
deleted file mode 100644
index 01804f04474e..000000000000
--- a/devel/ragel/files/patch-redfsm_gendata.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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-rlgen-cd_fsmcodegen.cpp b/devel/ragel/files/patch-rlgen-cd_fsmcodegen.cpp
deleted file mode 100644
index 49448a474f94..000000000000
--- a/devel/ragel/files/patch-rlgen-cd_fsmcodegen.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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"
- #include "gendata.h"
-+#include <climits>
- #include <sstream>
- 
- /* Determine if a string is only whitespace. Code blocks that are only