3 files changed, 24 insertions, 15 deletions

diff --git a/devel/bisoncpp/Makefile b/devel/bisoncpp/Makefile
index 330730f4f7c3..3c8afeaf282b 100644
--- a/devel/bisoncpp/Makefile
+++ b/devel/bisoncpp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bisoncpp
-PORTVERSION=	2.5.1
+PORTVERSION=	2.7.0
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/bisonc%2B%2B/${PORTVERSION}
 DISTNAME=	bisonc++_${PORTVERSION}
@@ -17,7 +17,7 @@ COMMENT=	LALR(1) parser generator that generates C++ classes
 
 BUILD_DEPENDS=	icmake:${PORTSDIR}/devel/icmake \
 		yodl>=2.0:${PORTSDIR}/textproc/yodl \
-		libbobcat>=2.07.04:${PORTSDIR}/devel/libbobcat \
+		libbobcat>=2.08:${PORTSDIR}/devel/libbobcat \
 		g++45:${PORTSDIR}/lang/gcc45
 
 .if !defined(NO_INSTALL_MANPAGES)
@@ -33,24 +33,33 @@ PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 WRKSRC=		${WRKDIR}/bisonc++-${PORTVERSION}
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|"/usr"|"${PREFIX}"| ; \
+	@${REINPLACE_CMD} 's|"/usr"|"${PREFIX}"| ; \
 		s|"/share/bisonc++"|"/share/${PORTNAME}-${PORTVERSION}"| ; \
 		s|"/share/doc/bisonc++"|"/share/doc/${PORTNAME}-${PORTVERSION}"| ; \
 		s|"/share/man/man1"|"/man/man1"| ; \
 		s|"g++"|"g++45"|' \
 		${WRKSRC}/INSTALL.im
-	@${REINPLACE_CMD} -e 's|#!/usr/bin/icmake|#!${LOCALBASE}/bin/icmake|' \
+	@${REINPLACE_CMD} 's|#!/usr/bin/icmake|#!${LOCALBASE}/bin/icmake|' \
 		${WRKSRC}/build \
 		${WRKSRC}/scanner/driver/build \
 		${WRKSRC}/parser/driver/build
-	@${REINPLACE_CMD} -e 's|"-Wall -O3|"-Wall ${CXXFLAGS} -I${LOCALBASE}/include| ; \
+	@${REINPLACE_CMD} 's|#!/bin/bash|#!${LOCALBASE}/bin/bash|g' \
+		${WRKSRC}/documentation/regression/run \
+		${WRKSRC}/documentation/examples/bison++Example.NEW/make \
+		${WRKSRC}/documentation/manual/examples/rpn/build \
+		${WRKSRC}/documentation/manual/examples/errorcalc/build \
+		${WRKSRC}/documentation/manual/examples/calc/build \
+		${WRKSRC}/documentation/manual/examples/mfcalc/build \
+		${WRKSRC}/documentation/man/calculator/build \
+		${WRKSRC}/scanner/buildlexer
+	@${REINPLACE_CMD} 's|"-Wall -O3|"-Wall ${CXXFLAGS} -I${LOCALBASE}/include| ; \
 		s|""|"${LOCALBASE}/lib"|' \
 		${WRKSRC}/icmake/library
-	@${REINPLACE_CMD} -e 's|"cp -d |"cp -Pp | ; \
+	@${REINPLACE_CMD} 's|"cp -d |"cp -Pp | ; \
 		s|"cp -r |"cp -R | ; \
 		s|"-doc"|"/doc"|' \
 		${WRKSRC}/icmake/install
-	@${REINPLACE_CMD} -e 's|libpath|libpath, "-Wl,--allow-shlib-undefined"|' \
+	@${REINPLACE_CMD} 's|libpath|libpath, "-Wl,--allow-shlib-undefined"|' \
 		${WRKSRC}/icmake/program
 
 do-build:
diff --git a/devel/bisoncpp/distinfo b/devel/bisoncpp/distinfo
index 109945ab77c9..7927f7e3ded8 100644
--- a/devel/bisoncpp/distinfo
+++ b/devel/bisoncpp/distinfo
@@ -1,3 +1,3 @@
-MD5 (bisonc++_2.5.1.orig.tar.gz) = f3663b76e5a7b9ff47b1d5809a409a9a
-SHA256 (bisonc++_2.5.1.orig.tar.gz) = e18e2d884e2c4a7d420bed6e5cc1981c39a8871ee7b618e4ea60bbf0bc0c308b
-SIZE (bisonc++_2.5.1.orig.tar.gz) = 617729
+MD5 (bisonc++_2.7.0.orig.tar.gz) = d159d3a0951b1f99e6de91ec6b4874e6
+SHA256 (bisonc++_2.7.0.orig.tar.gz) = 965a32307540fe614d009a3f02b57f4247ab613ed4f56ff8603862eee0a2b0cc
+SIZE (bisonc++_2.7.0.orig.tar.gz) = 621100
diff --git a/devel/bisoncpp/files/patch-parser-parser.h b/devel/bisoncpp/files/patch-parser-parser.h
index 38366675455c..57052159b551 100644
--- a/devel/bisoncpp/files/patch-parser-parser.h
+++ b/devel/bisoncpp/files/patch-parser-parser.h
@@ -1,6 +1,6 @@
---- parser/parser.h.orig	2007-10-15 11:58:20.000000000 +0200
-+++ parser/parser.h	2009-03-05 15:50:45.000000000 +0100
-@@ -151,7 +151,7 @@
+--- ./parser/parser.h.orig	2010-03-31 14:28:49.000000000 +0200
++++ ./parser/parser.h	2010-06-05 01:02:00.913097223 +0200
+@@ -155,7 +155,7 @@
          void multiplyDefined(Symbol const *sp);
  
          void nestedBlock(Block &block); // define inner block as pseudo N
@@ -9,10 +9,10 @@
  
          std::string nextHiddenName();
          void noDefaultTypeWarning();
-@@ -382,7 +382,7 @@
+@@ -406,7 +406,7 @@
+ {
      return d_stackDecl;
  }
- 
 -inline std::string *Parser::newYYText() const
 +inline std::string *Parser::newYYText()
  {