. Update to 0.8r40 (which will hopefully unbreak 5.x).

9 files changed, 93 insertions, 208 deletions

diff --git a/devel/ccdoc/Makefile b/devel/ccdoc/Makefile
index 60d3c248a7ae..cff7c652b99e 100644
--- a/devel/ccdoc/Makefile
+++ b/devel/ccdoc/Makefile
@@ -6,48 +6,45 @@
 #
 
 PORTNAME=	ccdoc
-PORTVERSION=	0.7a
+PORTVERSION=	0.8r40
 CATEGORIES=	devel textproc
-MASTER_SITES=	http://www.joelinoff.com/ccdoc/ \
-		http://www.flame.org/~lonewolf/distfiles/ \
-		http://www.earthmagic.org/FreeBSD/distfiles/
-DISTNAME=	ccdoc_v07a_src_taz
-EXTRACT_SUFX=	.exe
+MASTER_SITES=	http://www.joelinoff.com/ccdoc/downloads/
+DISTNAME=	src
+DIST_SUBDIR=	ccdoc
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extracting comments from C++ source and generating HTML
 
-WRKSRC=		${WRKDIR}/ccdoc_v07a
 USE_PERL5=	yes
+USE_REINPLACE=	yes
 
-DOCDIR=${PREFIX}/share/doc/ccdoc
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} >= 500113
-BROKEN=		"Does not compile on FreeBSD ${OSVERSION} (gcc3.3 string continuation)"
+WRKSRC=		${WRKDIR}/ccdocv08r40/src
+MAKEFILE=	mkopt_gcc.mk
+ALL_TARGET=	bld
+MAN1=		ccdoc.1
+PLIST_FILES=	bin/ccdoc
+.if !defined(NOPORTDOCS)
+PORTDOCS=	*
 .endif
 
-pre-patch:
-	@${ECHO} "Stripping ^M from all the files..."
-	@${FIND} ${WRKSRC} -type f | ${XARGS} perl -pi -e 's/\r//'
-
-do-build:
-	(cd ${WRKSRC}/ccdoc_dev/libjdl/src; ${PERL} mk.pl opt)
-	(cd ${WRKSRC}/ccdoc_dev/ccdoc/src; ${PERL} mk.pl opt)
+do-configure:
+	${REINPLACE_CMD} -e "s:%%PERL%%:${PERL}:" \
+		-e "s:%%CXX%%:${CXX}:" \
+		-e "s:%%CXXFLAGS%%:${CXXFLAGS}:" \
+		${WRKSRC}/${MAKEFILE}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/ccdoc_dev/ccdoc/bin_freebsd_opt/ccdoc.exe ${PREFIX}/bin/ccdoc
-
-post-install:
-	${STRIP_CMD} ${PREFIX}/bin/ccdoc
+	${INSTALL_PROGRAM} ${WRKSRC}/../bin_opt_gcc_/ccdoc.exe \
+		${PREFIX}/bin/ccdoc
+	${INSTALL_MAN} ${WRKSRC}/../doc/htdocs/ccdoc.man ${MAN1PREFIX}/man/man1/${MAN1}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.txt ${WRKSRC}/doc/*.gif ${DOCDIR}
-	${MKDIR} ${DOCDIR}/images
-	${INSTALL_MAN} ${WRKSRC}/doc/images/*.gif ${DOCDIR}/images
-	${MKDIR} ${DOCDIR}/autodoc
-	${INSTALL_MAN} ${WRKSRC}/doc/autodoc/* ${DOCDIR}/autodoc
+	${MKDIR} ${DOCSDIR}
+	${FIND} ${WRKSRC}/../doc \( -name '*.html' -o \
+		-name '*.htm' -o \
+		-name '*.gif' -o \
+		-name '*.txt' -o \
+		-name '*.jpg' \) -print | \
+		${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${DOCSDIR}
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/ccdoc/distinfo b/devel/ccdoc/distinfo
index e305682a1796..46e8a04dc34d 100644
--- a/devel/ccdoc/distinfo
+++ b/devel/ccdoc/distinfo
@@ -1,2 +1,2 @@
-MD5 (ccdoc_v07a_src_taz.exe) = dd9a24a374d10b00391d09a659878b28
-SIZE (ccdoc_v07a_src_taz.exe) = 856870
+MD5 (ccdoc/src.tar.gz) = d4f72e3453fdee0d8bc85ff425f5e164
+SIZE (ccdoc/src.tar.gz) = 1728021
diff --git a/devel/ccdoc/files/patch-aa b/devel/ccdoc/files/patch-aa
deleted file mode 100644
index f7b459075cb3..000000000000
--- a/devel/ccdoc/files/patch-aa
+++ /dev/null
@@ -1,17 +0,0 @@
---- ccdoc_dev/tools/mkmk.pl	Thu Oct  5 16:51:43 2000
-+++ ccdoc_dev/tools/mkmk.patched	Thu Oct  5 16:52:25 2000
-@@ -166,11 +166,11 @@
-     else {
- 	# UNIXes.
- 	print MK "CPP         = CC\n";
--	print MK "CPPFLAGS1   = -pto -pta +w\n";
-+	print MK "CPPFLAGS1   = \$(CFLAGS) \n";
- 	print MK "CPPFLAGS2   = -DJDL_DEFINE_LOCAL_TYPES -DJDL_DEFINE_LOCAL_BOOLEAN\n";
--	print MK "CPPFLAGS3   = -I. -I../..\n";
-+	print MK "CPPFLAGS3   = -I. -I../.. -o \$\@\n";
- 	print MK "CPPFLAGS4   = \$(MYCPPFLAGS)\n";
--	print MK "CPPFLAGS    = \$(CPPFLAGS1) \$(CPPFLAGS2) \$(CPPFLAGS3) \$(CPPFLAGS4) -c -o \$\@\n";
-+	print MK "CPPFLAGS    = \$(CPPFLAGS1) \$(CPPFLAGS2) \$(CPPFLAGS3) \$(CPPFLAGS4) -c\n";
- 	if ( $type == 1 ) {
- 	    print MK "LINK        = \$(CPP)\n";
- 	    if( $arch eq "hpux" ) {
diff --git a/devel/ccdoc/files/patch-ab b/devel/ccdoc/files/patch-ab
deleted file mode 100644
index 4735559efcd4..000000000000
--- a/devel/ccdoc/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- ccdoc_dev/ccdoc/src/ccdocphase3.h	Thu Oct  5 16:53:10 2000
-+++ ccdoc_dev/ccdoc/src/ccdocphase3.h.patched	Fri Oct  6 07:15:30 2000
-@@ -210,7 +210,7 @@
- 	   const char* trailer,
- 	   bool mcfFlag);
- private:
--  WriteTop();
-+  // WriteTop();
-   const char* GetCurrTime();
-   const char* GetProgram();
- private:
diff --git a/devel/ccdoc/files/patch-ac b/devel/ccdoc/files/patch-ac
deleted file mode 100644
index 116b58b5c305..000000000000
--- a/devel/ccdoc/files/patch-ac
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/main.html	Tue Jun 15 19:12:06 1999
-+++ doc/main.html.patched	Fri Oct  6 16:05:53 2000
-@@ -407,7 +407,7 @@
-         </tr>
-         <tr>
-             <td height="42">&nbsp;<a
--            href="ccdoc_v07a_bin_taz.exe">ccdoc_v07a bin_taz.exe</a></td>
-+            href="http://www.joelinoff.com/ccdoc/ccdoc_v07a_bin_taz.exe">ccdoc_v07a bin_taz.exe</a></td>
-             <td width="56%" height="42">The binary distribution
-             for Solaris 5.6, HP UX 10, and Windows 95/98/NT. It
-             is about 530K.</td>
-@@ -415,7 +415,7 @@
-         </tr>
-         <tr>
-             <td height="23">&nbsp;<a
--            href="ccdoc_v07a_src_taz.exe">ccdoc_v07a src_taz.exe</a></td>
-+            href="http://www.joelinoff.com/ccdoc/ccdoc_v07a_src_taz.exe">ccdoc_v07a src_taz.exe</a></td>
-             <td width="56%" height="23">The source code
-             distribution along with the binaries. It is about
-             834K.</td>
diff --git a/devel/ccdoc/files/patch-ad b/devel/ccdoc/files/patch-ad
deleted file mode 100644
index 2a1c0e202d9d..000000000000
--- a/devel/ccdoc/files/patch-ad
+++ /dev/null
@@ -1,54 +0,0 @@
---- ccdoc_dev/ccdoc/src/ccdocphase2.cpp	Mon Oct  9 08:28:09 2000
-+++ ccdoc_dev/ccdoc/src/ccdocphase2.cpp.patched	Mon Oct  9 08:29:50 2000
-@@ -53,10 +53,10 @@
-   // TODO: After all of the files are processed, run through
-   //       and "fix" the "scoped" records that have comments.
-   if(m_ScopedNodeList.GetNumItems()) {
--    ::fprintf(stderr,"DEBUG: %d scoped nodes found with comments.\n",
--	      m_ScopedNodeList.GetNumItems());
--    ::fprintf(stderr,"DEBUG: %d scoped node refs found for comment analysis.\n",
--	      m_ClassMap.GetNumItems());
-+    //::fprintf(stderr,"DEBUG: %d scoped nodes found with comments.\n",
-+	      //m_ScopedNodeList.GetNumItems());
-+    //::fprintf(stderr,"DEBUG: %d scoped node refs found for comment analysis.\n",
-+	      //m_ClassMap.GetNumItems());
-     {for(uint i=0;i<m_ScopedNodeList.GetNumItems();i++) {
-       CCcDocParserNode* node = m_ScopedNodeList.Get(i);
-       CCcDocParserNode* parent = node->GetParent();
-@@ -89,15 +89,15 @@
- 	}
-       }}
-       if(class_name) {
--	::fprintf(stderr,"DEBUG: %s::%s\n",class_name,node->GetName());
-+	//::fprintf(stderr,"DEBUG: %s::%s\n",class_name,node->GetName());
- 	if(m_ClassMap.Contains(class_name)) {
--	  ::fprintf(stderr,"DEBUG: found %s\n",class_name);
-+	  //::fprintf(stderr,"DEBUG: found %s\n",class_name);
- 	  CJdlVector<CCcDocParserNode*>* list = 0;
- 	  list = (CJdlVector<CCcDocParserNode*>*) m_ClassMap.Get(class_name);
- 	  assert(list);
- 	  {for(ulong j=0;j<list->GetNumItems();j++) {
- 	    CCcDocParserNode* cls = list->Get(j);
--	    ::fprintf(stderr,"DEBUG: checking node %d/%d\n",j+1,list->GetNumItems());
-+	    //::fprintf(stderr,"DEBUG: checking node %d/%d\n",j+1,list->GetNumItems());
- 
- 	    // Get arg list matching stuff.
- 	    ulong x2 = 0; // starting paren
-@@ -109,7 +109,7 @@
- 
- 	    // Find the method:
- 	    {for(ulong k=0;k<cls->GetNumChildren();k++) {
--	      ::fprintf(stderr,"DEBUG: checking children %d/%d\n",k+1,cls->GetNumChildren());
-+	      //::fprintf(stderr,"DEBUG: checking children %d/%d\n",k+1,cls->GetNumChildren());
- 	      CCcDocParserNode* nd = cls->GetChild(k);
- 	      assert(nd);
- 	      if(CCcDocParserNode::STMT_FUNCTION == nd->GetType()) {
-@@ -125,7 +125,7 @@
- 		  }}
- 		  ulong diff1 = nd->GetNumItems() - x1;
- 		  bool matched = false;
--		  ::fprintf(stderr,"DEBUG: diff1=%d, diff2=%d\n",diff1,diff2);
-+		  //::fprintf(stderr,"DEBUG: diff1=%d, diff2=%d\n",diff1,diff2);
- 		  if(diff1 == diff2) {
- 		    matched = true;
- 		    for(;x2<node->GetNumItems() && x1<nd->GetNumItems();x1++,x2++) {
diff --git a/devel/ccdoc/files/patch-mkopt_gcc.mk b/devel/ccdoc/files/patch-mkopt_gcc.mk
new file mode 100644
index 000000000000..298fad1f9700
--- /dev/null
+++ b/devel/ccdoc/files/patch-mkopt_gcc.mk
@@ -0,0 +1,29 @@
+$FreeBSD$
+
+--- mkopt_gcc.mk.orig	Tue Feb 17 10:33:54 2004
++++ mkopt_gcc.mk	Tue Feb 17 10:36:57 2004
+@@ -1,17 +1,17 @@
+ # ================================================
+ # GCC compiler, optimized mode, any platform.
+ # ================================================
+-PERL = perl
++PERL = %%PERL%%
+ PLATFORM = $(shell $(PERL) ../utils/platform.pl)
+ CCDOC_CID = bin_opt_gcc_${PLATFORM}
+ BIN_DIR = ../${CCDOC_CID}
+ OBJ_EXT = o
+-CXX = g++
+-CXX_FLAGS = -c -pedantic -Wall -O -DCCDOC_OPT -DCCDOC_CID=\"${CCDOC_CID}\"
+-CXX_OUT = -o 
++CXX = %%CXX%%
++CXX_FLAGS = -c -pedantic -Wall %%CXXFLAGS%% -DCCDOC_OPT -DCCDOC_CID=\"${CCDOC_CID}\"
++CXX_OUT = -o
+ LINK_TARG = ${BIN_DIR}/ccdoc.exe
+-LINK = g++
+-LINK_FLAGS = -g
+-LINK_OUT = -o 
++LINK = %%CXX%%
++LINK_FLAGS = %%CXXFLAGS%%
++LINK_OUT = -o
+ 
+ include mktargs.mk
diff --git a/devel/ccdoc/files/patch-statement.cc b/devel/ccdoc/files/patch-statement.cc
new file mode 100644
index 000000000000..0ff2ee761907
--- /dev/null
+++ b/devel/ccdoc/files/patch-statement.cc
@@ -0,0 +1,34 @@
+$FreeBSD$
+
+--- statement.cc.orig	Tue Feb 17 10:31:50 2004
++++ statement.cc	Tue Feb 17 10:32:53 2004
+@@ -975,18 +975,18 @@
+   // Define the search strings.
+   // ================================================
+   const char* prefixes[] = {
+-    {"dll_"},{"DLL_"},
+-    {"include_"},{"INCLUDE_"},
+-    {"included_"},{"INCLUDED_"},
+-    0 };
++    "dll_","DLL_",
++    "include_","INCLUDE_",
++    "included_","INCLUDED_",
++    NULL };
+   const char* suffixes[] = {
+-    {"_dll"},{"_DLL"},
+-    {"_h"},{"_H"},
+-    {"_hh"},{"_HH"},
+-    {"_include"},{"_INCLUDE"},
+-    {"_included"},{"_INCLUDED"},
+-    {"_included_"},{"_INCLUDED_"},
+-    0 };
++    "_dll","_DLL",
++    "_h","_H",
++    "_hh","_HH",
++    "_include","_INCLUDE",
++    "_included","_INCLUDED",
++    "_included_","_INCLUDED_",
++    NULL };
+   // ================================================
+   // Check the prefixes.
+   // ================================================
diff --git a/devel/ccdoc/pkg-plist b/devel/ccdoc/pkg-plist
deleted file mode 100644
index 092eed43c35a..000000000000
--- a/devel/ccdoc/pkg-plist
+++ /dev/null
@@ -1,73 +0,0 @@
-bin/ccdoc
-share/doc/ccdoc/bugs.html
-share/doc/ccdoc/ccdoc_flow_v07a.gif
-share/doc/ccdoc/faq.txt
-share/doc/ccdoc/index.html
-share/doc/ccdoc/main.html
-share/doc/ccdoc/relnotes.txt
-share/doc/ccdoc/sidebar.html
-share/doc/ccdoc/autodoc/ccdoc.ctf
-share/doc/ccdoc/autodoc/ccdoc.index.html
-share/doc/ccdoc/autodoc/ccdoc.index.pkg.CcDoc.html
-share/doc/ccdoc/autodoc/ccdoc.index.pkg.libjdl.html
-share/doc/ccdoc/autodoc/ccdoc.r126.html
-share/doc/ccdoc/autodoc/ccdoc.r134.html
-share/doc/ccdoc/autodoc/ccdoc.r148.html
-share/doc/ccdoc/autodoc/ccdoc.r160.html
-share/doc/ccdoc/autodoc/ccdoc.r1ad.html
-share/doc/ccdoc/autodoc/ccdoc.r1c7.html
-share/doc/ccdoc/autodoc/ccdoc.r25d.html
-share/doc/ccdoc/autodoc/ccdoc.r28b.html
-share/doc/ccdoc/autodoc/ccdoc.r32e.html
-share/doc/ccdoc/autodoc/ccdoc.r36f.html
-share/doc/ccdoc/autodoc/ccdoc.r389.html
-share/doc/ccdoc/autodoc/ccdoc.r38c.html
-share/doc/ccdoc/autodoc/ccdoc.r38f.html
-share/doc/ccdoc/autodoc/ccdoc.r397.html
-share/doc/ccdoc/autodoc/ccdoc.r400.html
-share/doc/ccdoc/autodoc/ccdoc.r413.html
-share/doc/ccdoc/autodoc/ccdoc.r456.html
-share/doc/ccdoc/autodoc/ccdoc.r491.html
-share/doc/ccdoc/autodoc/ccdoc.r4ce.html
-share/doc/ccdoc/autodoc/ccdoc.r59e.html
-share/doc/ccdoc/autodoc/ccdoc.r5b3.html
-share/doc/ccdoc/autodoc/ccdoc.r5cb.html
-share/doc/ccdoc/autodoc/ccdoc.r5d.html
-share/doc/ccdoc/autodoc/ccdoc.r610.html
-share/doc/ccdoc/autodoc/ccdoc.r68b.html
-share/doc/ccdoc/autodoc/ccdoc.r6d0.html
-share/doc/ccdoc/autodoc/ccdoc.r6fc.html
-share/doc/ccdoc/autodoc/ccdoc.r721.html
-share/doc/ccdoc/autodoc/ccdoc.r8.html
-share/doc/ccdoc/autodoc/ccdoc.rb2.html
-share/doc/ccdoc/autodoc/ccdoc.rf5.html
-share/doc/ccdoc/autodoc/ccdoc.xref.html
-share/doc/ccdoc/images/blue-ball-small.gif
-share/doc/ccdoc/images/blue-ball.gif
-share/doc/ccdoc/images/constructor-index.gif
-share/doc/ccdoc/images/constructors.gif
-share/doc/ccdoc/images/enum-index.gif
-share/doc/ccdoc/images/enums.gif
-share/doc/ccdoc/images/macro-index.gif
-share/doc/ccdoc/images/macros.gif
-share/doc/ccdoc/images/magenta-ball-small.gif
-share/doc/ccdoc/images/magenta-ball.gif
-share/doc/ccdoc/images/method-index.gif
-share/doc/ccdoc/images/methods.gif
-share/doc/ccdoc/images/package-index.gif
-share/doc/ccdoc/images/packages.gif
-share/doc/ccdoc/images/red-ball-small.gif
-share/doc/ccdoc/images/red-ball.gif
-share/doc/ccdoc/images/typedef-index.gif
-share/doc/ccdoc/images/typedefs.gif
-share/doc/ccdoc/images/variable-index.gif
-share/doc/ccdoc/images/variables.gif
-share/doc/ccdoc/images/yellow-ball-small.gif
-share/doc/ccdoc/images/yellow-ball.gif
-share/doc/ccdoc/images/zz_image1.gif
-share/doc/ccdoc/images/zz_image2.gif
-share/doc/ccdoc/images/zz_image3.gif
-share/doc/ccdoc/images/zz_image4.gif
-@dirrm share/doc/ccdoc/autodoc
-@dirrm share/doc/ccdoc/images
-@dirrm share/doc/ccdoc