Date: Sun, 26 Jan 2003 10:50:04 -0800 (PST) From: Craig Rodrigues <rodrigc@attbi.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/42667: Update cccc port to 3.pre63 Message-ID: <200301261850.h0QIo4U4081367@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/42667; it has been noted by GNATS. From: Craig Rodrigues <rodrigc@attbi.com> To: freebsd-gnats-submit@FreeBSD.org Cc: ijliao@FreeBSD.org, Craig Rodrigues <rodrigc@attbi.com> Subject: Re: ports/42667: Update cccc port to 3.pre63 Date: Sun, 26 Jan 2003 13:46:40 -0500 --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Hi, Can you try the attached patch? cd /usr/ports/devel/cccc patch -p1 < cccc.diff cd /usr/ports/devel/cccc/files rm *.orig cd /usr/ports/devel/cccc make Thanks. -- Craig Rodrigues http://home.attbi.com/~rodrigc rodrigc@attbi.com --5mCyUwZo2JvN/JJP Content-Type: text/x-patch; charset=us-ascii Content-Disposition: attachment; filename="cccc.diff" diff -urN cccc.orig/Makefile cccc/Makefile --- cccc.orig/Makefile Wed Nov 6 22:10:44 2002 +++ cccc/Makefile Sun Jan 26 13:31:02 2003 @@ -7,29 +7,28 @@ # PORTNAME= cccc -PORTVERSION= 2.1.1 +PORTVERSION= 3.pre63 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= ${PORTNAME} +DISTNAME= ${PORTNAME}-${PORTVERSION} MAINTAINER= ports@FreeBSD.org BUILD_DEPENDS= antlr:${PORTSDIR}/devel/pccts \ dlg:${PORTSDIR}/devel/pccts -WRKSRC= ${WRKDIR}/usr/local/src/cccc-2.1.1 +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_GMAKE= yes MAKEFILE= makefile MAKE_ENV= OSTYPE=FreeBSD do-install: - @ ${INSTALL_PROGRAM} ${WRKSRC}/cccc ${PREFIX}/bin - @ ${MKDIR} ${PREFIX}/share/cccc -.for file in cccc_inf.dat cccc_met.dat cccc_tmt.dat cccc_ug.htm - @ ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/cccc -.endfor - @ ${MKDIR} ${PREFIX}/share/doc/cccc - @ ${INSTALL_DATA} ${WRKSRC}/readme.txt ${PREFIX}/share/doc/cccc + @ ${INSTALL_PROGRAM} ${WRKSRC}/cccc/cccc ${PREFIX}/bin +.if !defined(NOPORTDOCS) + @ ${MKDIR} ${DOCSDIR} + @ ${INSTALL_DATA} ${WRKSRC}/readme.txt ${DOCSDIR} + @ ${INSTALL_DATA} ${WRKSRC}/cccc/CCCC\ User\ Guide.html ${DOCSDIR}/CCCC_User_Guide.html +.endif .include <bsd.port.mk> diff -urN cccc.orig/distinfo cccc/distinfo --- cccc.orig/distinfo Mon Nov 3 05:02:36 1997 +++ cccc/distinfo Sun Jan 26 13:31:02 2003 @@ -1 +1 @@ -MD5 (cccc-2.1.1.src.tar.gz) = 6a5fb32de6987db0e3e13e6d58733b79 +MD5 (cccc-3.pre63.tar.gz) = 379e0b93c080aa6cddba6d6378e6187f diff -urN cccc.orig/files/patch-aa cccc/files/patch-aa --- cccc.orig/files/patch-aa Mon Nov 3 05:02:37 1997 +++ cccc/files/patch-aa Sun Jan 26 13:32:51 2003 @@ -1,47 +1,25 @@ -*** 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 = $(PREFIX) -+ 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" +--- makefile.orig Wed Apr 25 12:30:29 2001 ++++ makefile Wed Sep 11 15:11:35 2002 +@@ -8,17 +8,17 @@ + + .PHONY : pccts cccc test install + +-all : pccts cccc test install ++all : cccc test + + pccts : +- cd pccts ; make ++ cd pccts ; $(MAKE) + + cccc : +- cd cccc ; make -f posixgcc.mak ++ cd cccc ; $(MAKE) -f posixgcc.mak + + test : +- cd test ; make -f posix.mak ++ cd test ; $(MAKE) -f posix.mak + + install : +- cd install ; su root -c "make -f install.mak" ++ cd install ; su root -c "$(MAKE) -f install.mak" + diff -urN cccc.orig/files/patch-ab cccc/files/patch-ab --- cccc.orig/files/patch-ab Sun Apr 18 14:52:16 1999 +++ cccc/files/patch-ab Sun Jan 26 13:32:51 2003 @@ -1,17 +1,23 @@ ---- cccc.h.orig Sun Aug 10 09:52:24 1997 -+++ cccc.h Sun Apr 18 11:47:39 1999 -@@ -20,8 +20,13 @@ +--- pccts/makefile.orig Wed Sep 11 14:48:17 2002 ++++ pccts/makefile Wed Sep 11 14:48:42 2002 +@@ -41,16 +41,16 @@ + # + if [ ! -d $(BINDIR) ] ; then mkdir $(BINDIR) ; fi + echo Making executables... +- (cd antlr; make -s) ++ (cd antlr; $(MAKE) -s) + echo antlr executable now in $(BINDIR) +- (cd dlg; make -s) ++ (cd dlg; $(MAKE) -s) + echo dlg executable now in $(BINDIR) + echo + echo " PCCTS 1.33MR20 installation complete" - #else + clean: +- (cd antlr; make -s clean) +- (cd dlg; make -s clean) ++ (cd antlr; $(MAKE) -s clean) ++ (cd dlg; $(MAKE) -s clean) --#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 + manpages: diff -urN cccc.orig/files/patch-ac cccc/files/patch-ac --- cccc.orig/files/patch-ac Thu Mar 30 15:40:56 2000 +++ cccc/files/patch-ac Sun Jan 26 13:34:34 2003 @@ -1,12 +1,11 @@ ---- 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++) { +--- cccc/cccc_tbl.h.orig Sun Jan 26 13:34:03 2003 ++++ cccc/cccc_tbl.h Sun Jan 26 13:34:09 2003 +@@ -20,7 +20,7 @@ + : public std::map<string,T*> + { + typedef std::map<string,T*> map_t; +- map_t::iterator iter_; ++ typename map_t::iterator iter_; + bool sorted; + + public: diff -urN cccc.orig/files/patch-ad cccc/files/patch-ad --- cccc.orig/files/patch-ad Thu Mar 30 15:40:56 2000 +++ cccc/files/patch-ad Sun Jan 26 13:32:51 2003 @@ -1,11 +1,23 @@ ---- 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; +--- cccc/rules.mak.orig Wed May 1 09:50:09 2002 ++++ cccc/rules.mak Wed Sep 11 15:41:05 2002 +@@ -31,16 +31,16 @@ + # PCCTS is now packaged as part of the CCCC distribution. + PCCTS=..$(PATHSEP)pccts +-PCCTS_H=$(PCCTS)$(PATHSEP)h +-PCCTS_BIN=$(PCCTS)$(PATHSEP)bin ++PCCTS_H=/usr/local/include/pccts/ ++PCCTS_BIN=/usr/local/bin/ + # PCCTS_OBJDIR needs to be defined in the platform-specific makefile + # as some compilers put the obj file in $(PCCTS_H), others put it + # in the current directory. + + # locations and flags for antlr and dlg (don't change the flags unless you + # understand PCCTS) +-ANTLR = $(PCCTS_BIN)$(PATHSEP)antlr +-DLG = $(PCCTS_BIN)$(PATHSEP)dlg ++ANTLR = antlr ++DLG = dlg + # Flags for ANTLR: + # -CC = generate C++ output + # -k 2 = use at least 2 tokens of lookahead diff -urN cccc.orig/files/patch-ae cccc/files/patch-ae --- cccc.orig/files/patch-ae Tue Jan 14 16:18:06 2003 +++ cccc/files/patch-ae Sun Jan 26 13:32:51 2003 @@ -1,19 +1,11 @@ ---- 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> +--- cccc/posixgcc.mak.orig Sun Nov 11 10:09:38 2001 ++++ cccc/posixgcc.mak Wed Sep 11 15:27:29 2002 +@@ -18,7 +18,7 @@ - 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); + CCC=g++ + LD=g++ +-CFLAGS=-c -I../pccts/h $(CFLAGS_DEBUG) -x c++ ++CFLAGS=-c -I/usr/local/include/pccts $(CFLAGS_DEBUG) + C_OFLAG=-o + LDFLAGS=$(LDFLAGS_DEBUG) -static + LD_OFLAG=-o diff -urN cccc.orig/pkg-plist cccc/pkg-plist --- cccc.orig/pkg-plist Tue Nov 21 19:17:12 2000 +++ cccc/pkg-plist Sun Jan 26 13:31:13 2003 @@ -1,9 +1,5 @@ @comment $FreeBSD: ports/devel/cccc/pkg-plist,v 1.2 2000/11/22 00:17:12 obrien Exp $ bin/cccc -share/cccc/cccc_inf.dat -share/cccc/cccc_met.dat -share/cccc/cccc_tmt.dat -share/cccc/cccc_ug.htm -share/doc/cccc/readme.txt -@dirrm share/cccc -@dirrm share/doc/cccc +%%PORTDOCS%%share/doc/cccc/readme.txt +%%PORTDOCS%%share/doc/cccc/CCCC_User_Guide.html +%%PORTDOCS%%@dirrm share/doc/cccc --5mCyUwZo2JvN/JJP-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200301261850.h0QIo4U4081367>