ports/102864: [Update]: devel/cccc version update to 3.1.4.
Marcus von Appen
mva at sysfault.org
Mon Sep 4 20:00:55 UTC 2006
>Number: 102864
>Category: ports
>Synopsis: [Update]: devel/cccc version update to 3.1.4.
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Mon Sep 04 20:00:38 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Marcus von Appen
>Release: FreeBSD 6.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD medusa.sysfault.org 6.1-STABLE FreeBSD 6.1-STABLE #12: Tue Aug 29 19:10:11 CEST 2006 root at medusa.sysfault.org:/usr/obj/usr/src/sys/MEDUSA i386
>Description:
CCCC version update to 3.1.4, which is a fork of the original
PD 2.1.1 version. Unfortunately this fork removes Ada support,
but tends to be the most actual (and revised) version of CCCC.
Note to committer:
Please remove files/patch-aa
files/patch-ab
files/patch-ac
files/patch-ad
files/patch-ae
pkg-plist
and add patch-makefile
patch-pccts_makefile
>How-To-Repeat:
>Fix:
diff -Nur cccc/Makefile cccc.new/Makefile
--- cccc/Makefile Thu May 4 23:40:26 2006
+++ cccc.new/Makefile Mon Sep 4 21:45:36 2006
@@ -7,12 +7,10 @@
#
PORTNAME= cccc
-PORTVERSION= 2.1.1
-PORTREVISION= 1
+PORTVERSION= 3.1.4
CATEGORIES= devel textproc www
-MASTER_SITES= ${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR= devel/lang/c++
-DISTNAME= ${PORTNAME}-${PORTVERSION}.src
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= cccc
MAINTAINER= ports at FreeBSD.org
COMMENT= C and C++ Code Counter
@@ -20,23 +18,14 @@
BUILD_DEPENDS= antlr:${PORTSDIR}/devel/pccts \
dlg:${PORTSDIR}/devel/pccts
-WRKSRC= ${WRKDIR}/usr/local/src/${PORTNAME}-${PORTVERSION}
USE_GMAKE= yes
MAKEFILE= makefile
-MAKE_ENV= OSTYPE=FreeBSD
-USE_GCC= 2.95
-PORTDOCS= readme.txt
-
-post-patch:
- ${REINPLACE_CMD} -e 's,=g++,=${CXX},g' ${WRKSRC}/${MAKEFILE}
+PORTDOCS= readme.txt changes.txt
+PLIST_FILES= cccc
do-install:
- @${INSTALL_PROGRAM} ${WRKSRC}/cccc ${PREFIX}/bin
- @${MKDIR} ${DATADIR}
-.for f in cccc_inf.dat cccc_met.dat cccc_tmt.dat cccc_ug.htm
- @${INSTALL_DATA} ${WRKSRC}/${f} ${DATADIR}
-.endfor
+ @${INSTALL_PROGRAM} ${WRKSRC}/cccc/cccc ${PREFIX}/bin
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
.for f in ${PORTDOCS}
diff -Nur cccc/distinfo cccc.new/distinfo
--- cccc/distinfo Thu Nov 24 16:39:05 2005
+++ cccc.new/distinfo Mon Sep 4 21:05:17 2006
@@ -1,3 +1,3 @@
-MD5 (cccc-2.1.1.src.tar.gz) = 6a5fb32de6987db0e3e13e6d58733b79
-SHA256 (cccc-2.1.1.src.tar.gz) = c904943a134183f0dce5ce898f272bfa434f5ee976f10778dded3b298dff75a3
-SIZE (cccc-2.1.1.src.tar.gz) = 74931
+MD5 (cccc-3.1.4.tar.gz) = 7bd3ad868913a0beab2fde931737f928
+SHA256 (cccc-3.1.4.tar.gz) = 27b3eca9a83a66799332363a80cc4bcd6db9869eddbda1a59a25cdace3ff4dbf
+SIZE (cccc-3.1.4.tar.gz) = 632007
diff -Nur cccc/files/patch-aa cccc.new/files/patch-aa
--- cccc/files/patch-aa Thu Nov 4 02:20:49 2004
+++ cccc.new/files/patch-aa Thu Jan 1 01:00:00 1970
@@ -1,47 +0,0 @@
-*** makefile Sun Aug 10 16:52:24 1997
---- /home/andy/tmp/wrk/makefile Sat Sep 13 18:42:12 1997
-***************
-*** 12,17 ****
---- 12,21 ----
- CONF=djgpp
- endif
-
-+ ifeq "$(OSTYPE)" "FreeBSD"
-+ CONF=FreeBSD
-+ endif
-+
- ifeq "$(OSTYPE)" "Linux"
- CONF=linux
- endif
-***************
-*** 53,58 ****
---- 57,85 ----
- CCCC_BIN = ## the name of the cccc binary
- INSTALL_BINDIR = ## the location where the binary is to be installed
- INSTALL_LIBDIR = ## the location where the .dat files are to be installed
-+ endif
-+
-+ ifeq "$(CONF)" "FreeBSD"
-+
-+ ## preferred directories for FreeBSD is under /usr/local tree
-+ ## we need pccts installed from package
-+ PCCTS = $(LOCALBASE)
-+ PCCTS_H = $(PCCTS)/include/pccts
-+ PCCTS_BIN = $(PCCTS)/bin
-+
-+ ## using the GNU C++ compiler
-+ ## we need working templates - I use version 2.7.2, I am not sure whether
-+ ## versions earlier than 2.7 are OK
-+ CCC=g++
-+ LD=g++
-+ CFLAGS+= -I/usr/include/g++-include -I. -I$(PCCTS_H)
-+ CPPEXT=cpp
-+
-+ COPY = cp
-+ CCCC_BIN = cccc
-+ INSTALL_BINDIR = $(PREFIX)/bin
-+ INSTALL_LIBDIR = $(PREFIX)/share/cccc
-+
- endif
-
- ifeq "$(CONF)" "linux"
diff -Nur cccc/files/patch-ab cccc.new/files/patch-ab
--- cccc/files/patch-ab Sun Apr 18 20:52:16 1999
+++ cccc.new/files/patch-ab Thu Jan 1 01:00:00 1970
@@ -1,17 +0,0 @@
---- cccc.h.orig Sun Aug 10 09:52:24 1997
-+++ cccc.h Sun Apr 18 11:47:39 1999
-@@ -20,8 +20,13 @@
-
- #else
-
--#define SIGNAL_HEADER <sys/signal.h>
-+#ifdef __FreeBSD__
-+#define SIGNAL_HEADER <signal.h>
-+#define DEFAULT_LIBDIR "/usr/local/share/cccc"
-+#else
- #define DEFAULT_LIBDIR "/usr/local/lib/cccc"
-+#define SIGNAL_HEADER <sys/signal.h>
-+#endif
-
- #endif
-
diff -Nur cccc/files/patch-ac cccc.new/files/patch-ac
--- cccc/files/patch-ac Thu Mar 30 22:40:56 2000
+++ cccc.new/files/patch-ac Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
---- cccc_utl.cc.orig Thu Mar 30 12:22:38 2000
-+++ cccc_utl.cc Thu Mar 30 12:25:29 2000
-@@ -212,7 +212,8 @@
- for(i=0;i<pssLAST; i++) {
- CCCC_String sep;
- if(i==pssMODULE) { sep="::"; } else { sep=" "; }
-- if(string[i]!="") { os << string[i] << sep; }
-+ if(static_cast<const char*>(string[i])!="")
-+ os << string[i] << sep;
- }
- os << " Attributes: ";
- for(i=0; i<psfLAST; i++) {
diff -Nur cccc/files/patch-ad cccc.new/files/patch-ad
--- cccc/files/patch-ad Thu Mar 30 22:40:56 2000
+++ cccc.new/files/patch-ad Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- cccc_ast.h.orig Thu Mar 30 12:12:38 2000
-+++ cccc_ast.h Thu Mar 30 12:13:01 2000
-@@ -72,7 +72,7 @@
- int nEndLine();
-
- // access function for counts accumulated from tokens included in the AST
-- getCount(TokenCount tc);
-+ int getCount(TokenCount tc);
-
- char *filename, *classname, *membername;
-
diff -Nur cccc/files/patch-ae cccc.new/files/patch-ae
--- cccc/files/patch-ae Tue Jan 14 22:18:06 2003
+++ cccc.new/files/patch-ae Thu Jan 1 01:00:00 1970
@@ -1,19 +0,0 @@
---- cccc_stg.h.orig Sun Aug 10 18:52:24 1997
-+++ cccc_stg.h Sun Jan 12 15:15:42 2003
-@@ -13,6 +13,7 @@
- #include <string.h>
- #include <iostream.h>
- #include <strstream.h>
-+#include <fstream.h>
-
- class CCCC_String {
- char *cptr;
-@@ -63,7 +64,7 @@
- // we will deliberately read too many characters from the stream,
- // so the first thing we do is to mark our current position
- streampos start=is.tellg();
-- int state=is.rdstate();
-+ istream::iostate state=is.rdstate();
-
- char buffer[MAX_IN_SIZE];
- memset(buffer,0,MAX_IN_SIZE);
diff -Nur cccc/files/patch-makefile cccc.new/files/patch-makefile
--- cccc/files/patch-makefile Thu Jan 1 01:00:00 1970
+++ cccc.new/files/patch-makefile Mon Sep 4 21:17:37 2006
@@ -0,0 +1,25 @@
+--- makefile.orig Wed Apr 25 18:30:29 2001
++++ makefile Mon Sep 4 21:17:17 2006
+@@ -8,17 +8,17 @@
+
+ .PHONY : pccts cccc test install
+
+-all : pccts cccc test install
++all : pccts cccc test
+
+ pccts :
+- cd pccts ; make
++ cd pccts ; gmake
+
+ cccc :
+- cd cccc ; make -f posixgcc.mak
++ cd cccc ; gmake -f posixgcc.mak
+
+ test :
+- cd test ; make -f posix.mak
++ cd test ; gmake -f posix.mak
+
+ install :
+- cd install ; su root -c "make -f install.mak"
++ cd install ; gmake -f install.mak
+
diff -Nur cccc/files/patch-pccts_makefile cccc.new/files/patch-pccts_makefile
--- cccc/files/patch-pccts_makefile Thu Jan 1 01:00:00 1970
+++ cccc.new/files/patch-pccts_makefile Mon Sep 4 21:14:37 2006
@@ -0,0 +1,23 @@
+--- pccts/makefile.orig Mon Sep 4 21:13:16 2006
++++ pccts/makefile Mon Sep 4 21:13:28 2006
+@@ -41,16 +41,16 @@
+ #
+ if [ ! -d $(BINDIR) ] ; then mkdir $(BINDIR) ; fi
+ echo Making executables...
+- (cd antlr; make -s)
++ (cd antlr; gmake -s)
+ echo antlr executable now in $(BINDIR)
+- (cd dlg; make -s)
++ (cd dlg; gmake -s)
+ echo dlg executable now in $(BINDIR)
+ echo
+ echo " PCCTS 1.33MR20 installation complete"
+
+ clean:
+- (cd antlr; make -s clean)
+- (cd dlg; make -s clean)
++ (cd antlr; gmake -s clean)
++ (cd dlg; gmake -s clean)
+
+
+ manpages:
diff -Nur cccc/pkg-descr cccc.new/pkg-descr
--- cccc/pkg-descr Mon Nov 3 11:02:38 1997
+++ cccc.new/pkg-descr Mon Sep 4 21:38:37 2006
@@ -1,4 +1,6 @@
-Source code metric analyser for C, C++, Java and Ada
+Source code metric analyser for C, C++ and Java.
Presents a report in HTML with figures for
Lines of Code, McCabes Complexity, Ratio of Comments
-to Lines of Code and McCabe, module Fan-In and Fan-Out
+to Lines of Code and McCabe, module Fan-In and Fan-Out.
+
+WWW: http://cccc.sourceforge.net/
diff -Nur cccc/pkg-plist cccc.new/pkg-plist
--- cccc/pkg-plist Thu Nov 4 02:20:48 2004
+++ cccc.new/pkg-plist Thu Jan 1 01:00:00 1970
@@ -1,7 +0,0 @@
- at comment $FreeBSD: ports/devel/cccc/pkg-plist,v 1.3 2004/11/04 01:20:48 leeym Exp $
-bin/cccc
-%%DATADIR%%/cccc_inf.dat
-%%DATADIR%%/cccc_met.dat
-%%DATADIR%%/cccc_tmt.dat
-%%DATADIR%%/cccc_ug.htm
- at dirrm %%DATADIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list