6 files changed, 34 insertions, 52 deletions

diff --git a/devel/bcpp/Makefile b/devel/bcpp/Makefile
index 5617248ad990..b42084265b3f 100644
--- a/devel/bcpp/Makefile
+++ b/devel/bcpp/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	bcpp
-PORTVERSION=	20020518
+PORTVERSION=	20050725
 CATEGORIES=	devel
 MASTER_SITES=	ftp://invisible-island.net/bcpp/
 EXTRACT_SUFX=	.tgz
@@ -14,28 +14,27 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	buchanon@msu.edu
 COMMENT=	A utility similar to indent for C++ code
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/code
+WRKSRC=		${WRKDIR}/${DISTNAME}
 MAKEFILE=	makefile
-ALL_TARGET=	${PORTNAME}
-USE_REINPLACE=	yes
+GNU_CONFIGURE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/bcpp.cpp
+	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
+		${WRKSRC}/code/bcpp.cpp
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.cfg \
+	${INSTALL_PROGRAM} ${WRKSRC}/code/${PORTNAME} ${PREFIX}/bin
+	${INSTALL_DATA} ${WRKSRC}/code/${PORTNAME}.cfg \
 		${PREFIX}/etc/${PORTNAME}.cfg.sample
 
+post-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/txtdocs/hirachy.txt ${DOCSDIR}
-	${INSTALL_MAN} ${WRKDIR}/${DISTNAME}/txtdocs/manual.txt ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/txtdocs/hirachy.txt ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/txtdocs/manual.txt ${DOCSDIR}
 .endif
-
-post-install:
-	@${ECHO} "************************************************************"
+	@${ECHO_CMD}
 	@${CAT} ${PKGMESSAGE}
-	@${ECHO} "************************************************************"
+	@${ECHO_CMD}
 
 .include <bsd.port.mk>
diff --git a/devel/bcpp/distinfo b/devel/bcpp/distinfo
index 833be72ae331..9e278c6592c7 100644
--- a/devel/bcpp/distinfo
+++ b/devel/bcpp/distinfo
@@ -1,3 +1,3 @@
-MD5 (bcpp-20020518.tgz) = bad74c11c3460a9f984c650f1320623d
-SHA256 (bcpp-20020518.tgz) = 67d652f028f4e648642496271fcce3ea2dea84ab37a1bf0399a4d389c59e473d
-SIZE (bcpp-20020518.tgz) = 74525
+MD5 (bcpp-20050725.tgz) = 6894cd9cb3a2ef173050810103b209c9
+SHA256 (bcpp-20050725.tgz) = 1a4b5e8e741d6be400eb68b7c4a3eebc6dabe29948a72a7a0bccb1db075eaa2a
+SIZE (bcpp-20020518.tgz) = 132649
diff --git a/devel/bcpp/files/patch-bcpp.cpp b/devel/bcpp/files/patch-code__bcpp.cpp
index f8f9708bea60..e6d787eb57af 100644
--- a/devel/bcpp/files/patch-bcpp.cpp
+++ b/devel/bcpp/files/patch-code__bcpp.cpp
@@ -1,21 +1,5 @@
---- bcpp.cpp.orig	Sat May 18 13:53:27 2002
-+++ bcpp.cpp	Fri Jun  7 14:39:33 2002
-@@ -1455,6 +1455,7 @@
- 
- }
- 
-+/*
- // purge an Indent-stack
- static void freeIndentStack(StackList* pImode)
- {
-@@ -1475,6 +1476,7 @@
-         dst -> push(temp);
-     }
- }
-+*/
- 
- // no extra indent immediately after any brace
- void resetSingleIndent(StackList* pIMode)
+--- code/bcpp.cpp.orig	Sat May 18 13:53:27 2002
++++ code/bcpp.cpp	Fri Jun  7 14:39:33 2002
 @@ -2755,6 +2757,7 @@
      char* pSPath      = getenv ("PATH");
      char* pEPath      = NULL;
diff --git a/devel/bcpp/files/patch-code__makefile.unx b/devel/bcpp/files/patch-code__makefile.unx
new file mode 100644
index 000000000000..5b7c20bbb065
--- /dev/null
+++ b/devel/bcpp/files/patch-code__makefile.unx
@@ -0,0 +1,13 @@
+--- code/makefile.unx.orig	Sat Apr 15 18:00:45 2006
++++ code/makefile.unx	Sat Nov 23 11:45:58 2002
+@@ -4,8 +4,8 @@
+ 
+ D		=./
+ 
+-CXX		=g++
+-CXXFLAGS	=-I$(D) -O2 -Wall #-DDEBUG -DDEBUG2
++CXX		?=g++
++CXXFLAGS	=-I$(D) -Wall #-DDEBUG -DDEBUG2
+ 
+ .SUFFIXES:	.cpp .o
+ 
diff --git a/devel/bcpp/files/patch-makefile b/devel/bcpp/files/patch-makefile
deleted file mode 100644
index 381e0a6cb045..000000000000
--- a/devel/bcpp/files/patch-makefile
+++ /dev/null
@@ -1,14 +0,0 @@
---- makefile.orig	Tue Aug 10 16:04:32 1999
-+++ makefile	Mon Jun  3 02:26:21 2002
-@@ -2,9 +2,8 @@
- 
- D		=./
- 
--CXX		=gcc
--CPPFLAGS	=-I$(D) -O2 -Wall #-DDEBUG -DDEBUG2
--CXXFLAGS	= -x c++ $(CPPFLAGS)
-+CXX		?=gcc
-+CXXFLAGS	+=-I$(D) -Wall #-DDEBUG -DDEBUG2
- 
- .SUFFIXES:	.cpp .o
- 
diff --git a/devel/bcpp/pkg-plist b/devel/bcpp/pkg-plist
index bcb7d2f2519f..4a2f216c371f 100644
--- a/devel/bcpp/pkg-plist
+++ b/devel/bcpp/pkg-plist
@@ -1,5 +1,5 @@
 bin/bcpp
 etc/bcpp.cfg.sample
-%%PORTDOCS%%share/doc/bcpp/hirachy.txt
-%%PORTDOCS%%share/doc/bcpp/manual.txt
-%%PORTDOCS%%@dirrm share/doc/bcpp
+%%PORTDOCS%%%%DOCSDIR%%/hirachy.txt
+%%PORTDOCS%%%%DOCSDIR%%/manual.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%