3 files changed, 30 insertions, 21 deletions

diff --git a/devel/cscout/Makefile b/devel/cscout/Makefile
index fceeb0cfbe60..ecff22b0adbf 100644
--- a/devel/cscout/Makefile
+++ b/devel/cscout/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cscout
-PORTVERSION=	2.4
+PORTVERSION=	2.7
 CATEGORIES=	devel
 MASTER_SITES=	http://www.spinellis.gr/cscout/ \
 		http://www.dmst.aueb.gr/dds/cscout/
@@ -47,8 +47,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/cscout ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/cswc ${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/csmake ${PREFIX}/bin
-	cd ${WRKSRC}/etc && ${FIND} . -print | \
-	   ${CPIO} -pdu -R ${BINOWN}:${BINGRP} --quiet ${PREFIX}/etc/${PORTNAME}
+	cd ${WRKSRC}/etc && ${COPYTREE_SHARE} . ${PREFIX}/etc/${PORTNAME}
 # don't overwrite an existing config
 .if !exists(${PREFIX}/etc/${PORTNAME}/cscout_incs.h)
 	${INSTALL_DATA} ${WRKSRC}/etc/cscout_incs.FBSD_GCC ${PREFIX}/etc/${PORTNAME}/cscout_incs.h
@@ -56,11 +55,11 @@ do-install:
 .if !exists(${PREFIX}/etc/${PORTNAME}/cscout_defs.h)
 	${INSTALL_DATA} ${WRKDIR}/cscout_defs.h ${PREFIX}/etc/${PORTNAME}/cscout_defs.h
 .endif
+.if !defined(NOPORTEXAMPLES)
+	cd ${WRKSRC}/example && ${COPYTREE_SHARE} . ${EXAMPLESDIR}
+.endif
 .if !defined(NOPORTDOCS)
-	cd ${WRKSRC}/example && ${FIND} . -print | \
-		${CPIO} -pdu -R ${BINOWN}:${BINGRP} --quiet ${EXAMPLESDIR}
-	cd ${WRKSRC}/doc && ${FIND} . -print | \
-		${CPIO} -pdu -R ${BINOWN}:${BINGRP} --quiet ${DOCSDIR}
+	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${DOCSDIR}
 .endif
 .if !defined(NO_INSTALL_MANPAGES)
 .for i in ${MAN1}
diff --git a/devel/cscout/distinfo b/devel/cscout/distinfo
index d858fcd95bea..dc9de753314b 100644
--- a/devel/cscout/distinfo
+++ b/devel/cscout/distinfo
@@ -1,12 +1,12 @@
-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
+MD5 (cscout-2.7-fbsd-i386.tar.gz) = 6560f405aa1eda69cce374ad29eb1cea
+SHA256 (cscout-2.7-fbsd-i386.tar.gz) = e6cc7d5f0bc5dd7b787865ece4a9b2d1672617b2ab8cc66ef481c4b1e2a6426c
+SIZE (cscout-2.7-fbsd-i386.tar.gz) = 652845
+MD5 (cscout-2.7-fbsd-amd64.tar.gz) = 916a334f343332a04a1e998b402f0f7e
+SHA256 (cscout-2.7-fbsd-amd64.tar.gz) = 2197bee348e0dd163cdc233dc0ae283acf9e09e237699b55857a23fded08bf6f
+SIZE (cscout-2.7-fbsd-amd64.tar.gz) = 680558
+MD5 (cscout-2.7-fbsd-sparc64.tar.gz) = 0ae8d58b396d3d3106b866dda2dfeaa7
+SHA256 (cscout-2.7-fbsd-sparc64.tar.gz) = ed18ee49cd533151075adbe62ec37c96539fdc5ceea649634254b5ca9461cad7
+SIZE (cscout-2.7-fbsd-sparc64.tar.gz) = 692352
+MD5 (cscout-2.7-neutral.tar.gz) = 12b1d8360a50007dfbfd421defc00a4b
+SHA256 (cscout-2.7-neutral.tar.gz) = ef0d3442756077f0623be3e5f9592d78bcd702c215a6766d1c6fc3b39b753cf2
+SIZE (cscout-2.7-neutral.tar.gz) = 730328
diff --git a/devel/cscout/pkg-plist b/devel/cscout/pkg-plist
index b80f027c483f..c52ba118de63 100644
--- a/devel/cscout/pkg-plist
+++ b/devel/cscout/pkg-plist
@@ -1,6 +1,7 @@
 bin/cscout
 bin/csmake
 bin/cswc
+etc/cscout/SWILL-License
 etc/cscout/acl
 etc/cscout/cscout_defs.BORLAND
 @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
@@ -17,11 +18,13 @@ etc/cscout/cscout_incs.LINUX_GCC
 etc/cscout/cscout_incs.WIN32_MINGW
 etc/cscout/cscout_incs.WIN32_MSC
 %%PORTDOCS%%%%DOCSDIR%%/access.html
+%%PORTDOCS%%%%DOCSDIR%%/awkinc.gif
 %%PORTDOCS%%%%DOCSDIR%%/bib.html
 %%PORTDOCS%%%%DOCSDIR%%/cg.html
 %%PORTDOCS%%%%DOCSDIR%%/change.html
 %%PORTDOCS%%%%DOCSDIR%%/concept.html
 %%PORTDOCS%%%%DOCSDIR%%/contents.html
+%%PORTDOCS%%%%DOCSDIR%%/context.png
 %%PORTDOCS%%%%DOCSDIR%%/copy_file.gif
 %%PORTDOCS%%%%DOCSDIR%%/csmake.html
 %%PORTDOCS%%%%DOCSDIR%%/cvs.html
@@ -30,7 +33,9 @@ etc/cscout/cscout_incs.WIN32_MSC
 %%PORTDOCS%%%%DOCSDIR%%/error.html
 %%PORTDOCS%%%%DOCSDIR%%/ext.html
 %%PORTDOCS%%%%DOCSDIR%%/faq.html
+%%PORTDOCS%%%%DOCSDIR%%/fgraph-opt.png
 %%PORTDOCS%%%%DOCSDIR%%/file.html
+%%PORTDOCS%%%%DOCSDIR%%/filefuncall.gif
 %%PORTDOCS%%%%DOCSDIR%%/fileq.html
 %%PORTDOCS%%%%DOCSDIR%%/flow.gif
 %%PORTDOCS%%%%DOCSDIR%%/flow.html
@@ -42,12 +47,14 @@ etc/cscout/cscout_incs.WIN32_MSC
 %%PORTDOCS%%%%DOCSDIR%%/id.html
 %%PORTDOCS%%%%DOCSDIR%%/idq.html
 %%PORTDOCS%%%%DOCSDIR%%/idxprint.html
+%%PORTDOCS%%%%DOCSDIR%%/ig.html
 %%PORTDOCS%%%%DOCSDIR%%/index.html
 %%PORTDOCS%%%%DOCSDIR%%/indexw.html
 %%PORTDOCS%%%%DOCSDIR%%/intro.html
 %%PORTDOCS%%%%DOCSDIR%%/license.html
-%%PORTDOCS%%%%DOCSDIR%%/logo.png
+%%PORTDOCS%%%%DOCSDIR%%/main-inc.gif
 %%PORTDOCS%%%%DOCSDIR%%/maincall.gif
+%%PORTDOCS%%%%DOCSDIR%%/mainpage.png
 %%PORTDOCS%%%%DOCSDIR%%/mancscout.html
 %%PORTDOCS%%%%DOCSDIR%%/mancswc.html
 %%PORTDOCS%%%%DOCSDIR%%/metrics.html
@@ -58,6 +65,7 @@ etc/cscout/cscout_incs.WIN32_MSC
 %%PORTDOCS%%%%DOCSDIR%%/opt.html
 %%PORTDOCS%%%%DOCSDIR%%/optf.html
 %%PORTDOCS%%%%DOCSDIR%%/pragma.html
+%%PORTDOCS%%%%DOCSDIR%%/proto-inc.gif
 %%PORTDOCS%%%%DOCSDIR%%/qeg.html
 %%PORTDOCS%%%%DOCSDIR%%/re.html
 %%PORTDOCS%%%%DOCSDIR%%/run.html
@@ -67,15 +75,18 @@ etc/cscout/cscout_incs.WIN32_MSC
 %%PORTDOCS%%%%DOCSDIR%%/simul.html
 %%PORTDOCS%%%%DOCSDIR%%/smlogo.png
 %%PORTDOCS%%%%DOCSDIR%%/sql.html
+%%PORTDOCS%%%%DOCSDIR%%/style.css
 %%PORTDOCS%%%%DOCSDIR%%/tree.png
 %%PORTDOCS%%%%DOCSDIR%%/walk.html
 %%PORTDOCS%%%%DOCSDIR%%/web.html
+%%PORTDOCS%%%%DOCSDIR%%/wrk-inc.gif
 %%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%%/.cscout/style.css
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk.cs
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/awk.prj
@@ -99,7 +110,6 @@ etc/cscout/cscout_incs.WIN32_MSC
 %%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