This version adds support for function argument refactoring.

Furthermore, a new option controls the depth of function and macro
call graphs, which are now fully browsable in SVG-enabled browsers.
In addition, the web front-end provides support for hand-editing
of files, source code directory browsing, and functionality to
interactively explore the tree of a function's calling and called
functions.  Finally, the processing engine includes support for
gcc's include_next and preprocessor conditionals within macro
invocations directives.

Reviewed by:	bf <bf2006a at yahoo.com>

3 files changed, 62 insertions, 54 deletions

diff --git a/devel/cscout/Makefile b/devel/cscout/Makefile
index 7fcfa19faf8e..7901bd493a17 100644
--- a/devel/cscout/Makefile
+++ b/devel/cscout/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cscout
-PORTVERSION=	2.2
+PORTVERSION=	2.4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.spinellis.gr/cscout/ \
 		http://www.dmst.aueb.gr/dds/cscout/
@@ -20,13 +20,16 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 NO_BUILD=	yes
 ONLY_FOR_ARCHS=	i386 amd64 sparc64
 ONLY_FOR_ARCHS_REASON=	The port fetches and installs precompiled binaries
+USE_PERL5_RUN=	yes
 
 MAN1=	cscout.1 cswc.1
 
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 600000
-IGNORE=		fails to work on versions of FreeBSD before 6.0 (it installs FreeBSD 6.x binaries)
+IGNORE =	fails to work on versions of FreeBSD before 6.0 (it installs FreeBSD 6.x binaries)
+.elif ${OSVERSION} >= 700000
+LIB_DEPENDS+=	c.6:${PORTSDIR}/misc/compat6x
 .endif
 
 post-patch:
diff --git a/devel/cscout/distinfo b/devel/cscout/distinfo
index 37fc6ebd5ca1..d858fcd95bea 100644
--- a/devel/cscout/distinfo
+++ b/devel/cscout/distinfo
@@ -1,12 +1,12 @@
-MD5 (cscout-2.2-fbsd-i386.tar.gz) = 8304fae9f07077ef55561d38e5afc04c
-SHA256 (cscout-2.2-fbsd-i386.tar.gz) = e83c8af76144b2fd64d5b6d1d7dd6575ce47a3e588a7972853364655c2f9e30a
-SIZE (cscout-2.2-fbsd-i386.tar.gz) = 502605
-MD5 (cscout-2.2-fbsd-amd64.tar.gz) = 149b8c2463ae5b39418fdf30374ebbd3
-SHA256 (cscout-2.2-fbsd-amd64.tar.gz) = 1edb4cdee24ff4e241930cf3c3c3224926a3969f2891ade221d2d4382053b8b7
-SIZE (cscout-2.2-fbsd-amd64.tar.gz) = 527115
-MD5 (cscout-2.2-fbsd-sparc64.tar.gz) = 8174696d72d043d23828505bd119af36
-SHA256 (cscout-2.2-fbsd-sparc64.tar.gz) = 19a252d947616932af3cac60eee3bbeedb1ad50d4012af70aa163684e1beea2d
-SIZE (cscout-2.2-fbsd-sparc64.tar.gz) = 533827
-MD5 (cscout-2.2-neutral.tar.gz) = c1660fee01756a792ea64b3686f577b6
-SHA256 (cscout-2.2-neutral.tar.gz) = 422e560e363cbcd9ea8aadbf7868cdd6d0c513942cd43ccfd3edb7801bf1aa8c
-SIZE (cscout-2.2-neutral.tar.gz) = 312888
+MD5 (cscout-2.4-fbsd-i386.tar.gz) = 4e415e491d954ab3632c6db59ee6f3c2
+SHA256 (cscout-2.4-fbsd-i386.tar.gz) = fb6958f4cd7490212e89290570e411d399e660f4b98abba3dce0d9cf86092d57
+SIZE (cscout-2.4-fbsd-i386.tar.gz) = 596611
+MD5 (cscout-2.4-fbsd-amd64.tar.gz) = 878d85df503e0da62aa85b3997a33c96
+SHA256 (cscout-2.4-fbsd-amd64.tar.gz) = 0e36c2b4988c2429e4a4c0a27d27f5f963bb95dfcbef358af2a887ed14ff9f2d
+SIZE (cscout-2.4-fbsd-amd64.tar.gz) = 622618
+MD5 (cscout-2.4-fbsd-sparc64.tar.gz) = f67efef97d39a2371cc5cb0c175180ab
+SHA256 (cscout-2.4-fbsd-sparc64.tar.gz) = f362abc38315c7ee3389a4b47ce120491e9b9b366755f5ccc3adfd429e6abcc8
+SIZE (cscout-2.4-fbsd-sparc64.tar.gz) = 634760
+MD5 (cscout-2.4-neutral.tar.gz) = 34db680b3e603005935aa8f00faa4516
+SHA256 (cscout-2.4-neutral.tar.gz) = c6248bfdebd5656001e9faa53afa3f942f5cffd2ec54081b214c1beec1e548e0
+SIZE (cscout-2.4-neutral.tar.gz) = 371094
diff --git a/devel/cscout/pkg-plist b/devel/cscout/pkg-plist
index 6765a69d35d7..3bf824936560 100644
--- a/devel/cscout/pkg-plist
+++ b/devel/cscout/pkg-plist
@@ -1,8 +1,6 @@
 bin/cscout
 bin/csmake
 bin/cswc
-@unexec if cmp -s %D/etc/cscout/cscout_defs.h %D/etc/cscout/cscout_defs.FBSD_GCC; then rm -f %D/etc/cscout/cscout_defs.h; fi
-@unexec if cmp -s %D/etc/cscout/cscout_incs.h %D/etc/cscout/cscout_incs.FBSD_GCC; then  rm -f %D/etc/cscout/cscout_incs.h; fi
 etc/cscout/acl
 etc/cscout/cscout_defs.BORLAND
 etc/cscout/cscout_defs.FBSD_GCC
@@ -16,7 +14,6 @@ etc/cscout/cscout_incs.GENERIC
 etc/cscout/cscout_incs.LINUX_GCC
 etc/cscout/cscout_incs.WIN32_MINGW
 etc/cscout/cscout_incs.WIN32_MSC
-@dirrmtry etc/cscout
 %%PORTDOCS%%%%DOCSDIR%%/access.html
 %%PORTDOCS%%%%DOCSDIR%%/bib.html
 %%PORTDOCS%%%%DOCSDIR%%/cg.html
@@ -36,8 +33,10 @@ etc/cscout/cscout_incs.WIN32_MSC
 %%PORTDOCS%%%%DOCSDIR%%/flow.gif
 %%PORTDOCS%%%%DOCSDIR%%/flow.html
 %%PORTDOCS%%%%DOCSDIR%%/fun.html
+%%PORTDOCS%%%%DOCSDIR%%/funarg.html
 %%PORTDOCS%%%%DOCSDIR%%/funq.html
 %%PORTDOCS%%%%DOCSDIR%%/geglos.html
+%%PORTDOCS%%%%DOCSDIR%%/hedit.html
 %%PORTDOCS%%%%DOCSDIR%%/id.html
 %%PORTDOCS%%%%DOCSDIR%%/idq.html
 %%PORTDOCS%%%%DOCSDIR%%/idxprint.html
@@ -45,9 +44,11 @@ etc/cscout/cscout_incs.WIN32_MSC
 %%PORTDOCS%%%%DOCSDIR%%/indexw.html
 %%PORTDOCS%%%%DOCSDIR%%/intro.html
 %%PORTDOCS%%%%DOCSDIR%%/license.html
+%%PORTDOCS%%%%DOCSDIR%%/logo.png
 %%PORTDOCS%%%%DOCSDIR%%/maincall.gif
 %%PORTDOCS%%%%DOCSDIR%%/mancscout.html
 %%PORTDOCS%%%%DOCSDIR%%/mancswc.html
+%%PORTDOCS%%%%DOCSDIR%%/metrics.html
 %%PORTDOCS%%%%DOCSDIR%%/mismash.gif
 %%PORTDOCS%%%%DOCSDIR%%/name.html
 %%PORTDOCS%%%%DOCSDIR%%/obf.html
@@ -64,46 +65,50 @@ etc/cscout/cscout_incs.WIN32_MSC
 %%PORTDOCS%%%%DOCSDIR%%/simul.html
 %%PORTDOCS%%%%DOCSDIR%%/smlogo.png
 %%PORTDOCS%%%%DOCSDIR%%/sql.html
+%%PORTDOCS%%%%DOCSDIR%%/tree.png
 %%PORTDOCS%%%%DOCSDIR%%/walk.html
 %%PORTDOCS%%%%DOCSDIR%%/web.html
 %%PORTDOCS%%%%DOCSDIR%%/wsp.html
 %%PORTDOCS%%%%DOCSDIR%%/wspd.html
 %%PORTDOCS%%%%DOCSDIR%%/yacc.html
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.cscout/cscout_defs.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.cscout/cscout_incs.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/.cscout/options
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk.cs
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk.prj
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/FIXES
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/README
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/awk.1
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/awk.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/awkgram.y
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/b.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/buildwin.bat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/lex.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/lib.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/mac.code
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/main.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/makefile
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/makefile.win
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/maketab.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/missing95.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/parse.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/proctab.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/proto.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/run.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/tran.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/vcvars32.bat
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/ytab.c
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/ytab.h
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/ytabc.bak
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk/ytabh.bak
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bin.prj
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/mkproj
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sh.prj
+@unexec if cmp -s %D/etc/cscout/cscout_defs.h %D/etc/cscout/cscout_defs.FBSD_GCC ; then rm -f %D/etc/cscout/cscout_defs.h; fi
+@unexec if cmp -s %D/etc/cscout/cscout_incs.h %D/etc/cscout/cscout_incs.FBSD_GCC ; then  rm -f %D/etc/cscout/cscout_incs.h; fi
+@dirrmtry etc/cscout
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-%%PORTDOCS%%%%EXAMPLESDIR%%/.cscout/cscout_defs.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/.cscout/cscout_incs.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/.cscout/options
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk.cs
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk.prj
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/FIXES
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/awk.1
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/awk.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/awkgram.y
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/b.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/buildwin.bat
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/lex.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/lib.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/mac.code
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/main.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/makefile.win
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/maketab.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/missing95.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/parse.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/proctab.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/proto.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/run.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/tran.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/vcvars32.bat
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/ytab.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/ytab.h
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/ytabc.bak
-%%PORTDOCS%%%%EXAMPLESDIR%%/awk/ytabh.bak
-%%PORTDOCS%%%%EXAMPLESDIR%%/bin.prj
-%%PORTDOCS%%%%EXAMPLESDIR%%/mkproj
-%%PORTDOCS%%%%EXAMPLESDIR%%/sh.prj
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/.cscout
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/awk
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/.cscout
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/awk
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%