4 files changed, 28 insertions, 21 deletions

diff --git a/devel/bisoncpp/Makefile b/devel/bisoncpp/Makefile
index a1a5ad887c62..d54412195b76 100644
--- a/devel/bisoncpp/Makefile
+++ b/devel/bisoncpp/Makefile
@@ -1,11 +1,10 @@
 # $FreeBSD$
 
 PORTNAME=	bisoncpp
-PORTVERSION=	4.08.00
+PORTVERSION=	4.09.01
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/bisonc%2B%2B/${PORTVERSION}
-DISTNAME=	bisonc++_${PORTVERSION}
-EXTRACT_SUFX=	.orig.tar.gz
+DISTNAME=	bisonc++_${PORTVERSION}.orig
 
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	LALR(1) parser generator that generates C++ classes
@@ -16,11 +15,9 @@ BUILD_DEPENDS=	icmake:${PORTSDIR}/devel/icmake \
 		yodl>=3.0:${PORTSDIR}/textproc/yodl \
 		libbobcat>=3.18:${PORTSDIR}/devel/libbobcat
 
-DOCSDIR=	${PREFIX}/share/doc/bisonc++-${PORTVERSION}
+DOCSDIR=	${PREFIX}/share/doc/bisonc++
 PORTDOCS=	*
 
-PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
-
 WRKSRC=		${WRKDIR}/bisonc++-${PORTVERSION}
 
 USE_GCC=	yes
@@ -44,8 +41,7 @@ SHEBANG_FILES=	build \
 		scanner/driver/build
 
 post-patch:
-	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g; \
-		s|%%PORTVERSION%%|${PORTVERSION}|g' \
+	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' \
 		${WRKSRC}/INSTALL.im
 	@${REINPLACE_CMD} 's|"g++|"${CXX}|' \
 		${WRKSRC}/INSTALL.im \
diff --git a/devel/bisoncpp/distinfo b/devel/bisoncpp/distinfo
index 8ce4962d83a6..45a394ca7ce3 100644
--- a/devel/bisoncpp/distinfo
+++ b/devel/bisoncpp/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bisonc++_4.08.00.orig.tar.gz) = 39fd079d252867f6e2a38e2ef46d8aeb02ebf71e8d515249703d6d7c641a48b5
-SIZE (bisonc++_4.08.00.orig.tar.gz) = 667353
+SHA256 (bisonc++_4.09.01.orig.tar.gz) = 447cb90975251e4b6de51ccafe637184859f1ea4ad38ddb3b5988eebda42603c
+SIZE (bisonc++_4.09.01.orig.tar.gz) = 654635
diff --git a/devel/bisoncpp/files/patch-INSTALL.im b/devel/bisoncpp/files/patch-INSTALL.im
index 572c05f34024..37bbfdd38968 100644
--- a/devel/bisoncpp/files/patch-INSTALL.im
+++ b/devel/bisoncpp/files/patch-INSTALL.im
@@ -5,7 +5,7 @@
      // flags passed to the linker
  
 -#define SKEL    "/usr/share/bisonc++"
-+#define SKEL    "%%PREFIX%%/share/"${PROGRAM}"-%%PORTVERSION%%"
++#define SKEL    "%%PREFIX%%/share/"${PROGRAM}
      // the directory where the skeleton files are installed
      // Recompile options/data.cc if the skeleton location changes
  
@@ -22,15 +22,15 @@
      // the directory whre the manual page is stored
  
 -#define MANUAL   "/usr/share/doc/"${PROGRAM}"-doc/manual"
-+#define MANUAL   "%%PREFIX%%/share/doc/"${PROGRAM}"-%%PORTVERSION%%/manual"
++#define MANUAL   "%%PREFIX%%/share/doc/"${PROGRAM}"/manual"
      // the directory whre the manual page is stored
  
 -#define STD     "/usr/share/doc/"${PROGRAM}
-+#define STD     "%%PREFIX%%/share/doc/"${PROGRAM}"-%%PORTVERSION%%"
++#define STD     "%%PREFIX%%/share/doc/"${PROGRAM}
      // the directory where the standard documentation is stored 
  
 -#define EXTRA   "/usr/share/doc/"${PROGRAM}"-doc"
-+#define EXTRA   "%%PREFIX%%/share/doc/"${PROGRAM}"-%%PORTVERSION%%"
++#define EXTRA   "%%PREFIX%%/share/doc/"${PROGRAM}
      // the directory where the extra documentation is stored 
  
  
diff --git a/devel/bisoncpp/pkg-plist b/devel/bisoncpp/pkg-plist
index a18b5d3f8f88..4c8664691174 100644
--- a/devel/bisoncpp/pkg-plist
+++ b/devel/bisoncpp/pkg-plist
@@ -1,9 +1,20 @@
 bin/bisonc++
 man/man1/bisonc++.1.gz
-share/bisonc++-%%PORTVERSION%%/bisonc++.cc
-share/bisonc++-%%PORTVERSION%%/bisonc++.h
-share/bisonc++-%%PORTVERSION%%/bisonc++.ih
-share/bisonc++-%%PORTVERSION%%/bisonc++base.h
-share/bisonc++-%%PORTVERSION%%/bisonc++polymorphic
-share/bisonc++-%%PORTVERSION%%/bisonc++polymorphic.inline
-@dirrm share/bisonc++-%%PORTVERSION%%
+share/bisonc++/bisonc++.cc
+share/bisonc++/bisonc++.h
+share/bisonc++/bisonc++.ih
+share/bisonc++/bisonc++base.h
+share/bisonc++/bisonc++polymorphic
+share/bisonc++/bisonc++polymorphic.inline
+share/bisonc++/debugdecl.in
+share/bisonc++/debugfunctions1.in
+share/bisonc++/debugfunctions2.in
+share/bisonc++/debugfunctions3.in
+share/bisonc++/debugincludes.in
+share/bisonc++/debuglookup.in
+share/bisonc++/lex.in
+share/bisonc++/ltype.in
+share/bisonc++/ltypedata.in
+share/bisonc++/print.in
+share/bisonc++/threading.in
+@dirrm share/bisonc++