Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 24 Dec 2013 13:26:57 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r337352 - in head/devel/cccc: . files
Message-ID:  <201312241326.rBODQv60099170@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Tue Dec 24 13:26:57 2013
New Revision: 337352
URL: http://svnweb.freebsd.org/changeset/ports/337352

Log:
  - Respect CXX/CXXFLAGS (fixes build with clang)
  - Remove unnecessary BUILD_DEPENDS
  - Add LICENSE
  
  PR:		ports/184898
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Deleted:
  head/devel/cccc/files/patch-makefile
  head/devel/cccc/files/patch-pccts_makefile
Modified:
  head/devel/cccc/Makefile   (contents, props changed)
  head/devel/cccc/pkg-descr   (contents, props changed)

Modified: head/devel/cccc/Makefile
==============================================================================
--- head/devel/cccc/Makefile	Tue Dec 24 13:17:14 2013	(r337351)
+++ head/devel/cccc/Makefile	Tue Dec 24 13:26:57 2013	(r337352)
@@ -3,28 +3,45 @@
 
 PORTNAME=	cccc
 PORTVERSION=	3.1.4
+PORTREVISION=	1
 CATEGORIES=	devel textproc www
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C and C++ Code Counter
 
-BUILD_DEPENDS=	antlr:${PORTSDIR}/devel/pccts \
-		dlg:${PORTSDIR}/devel/pccts
+LICENSE=	GPLv2 # (or later)
 
 USES=		gmake
 MAKEFILE=	makefile
+MAKE_ENV=	CCC="${CXX}" LD="${CXX}" CFLAGS_DEBUG="${CXXFLAGS}"
 MAKE_JOBS_UNSAFE=	yes
-MAKE_ARGS=	CCC="${CXX}"
 
 PORTDOCS=	readme.txt changes.txt
 PLIST_FILES=	bin/cccc
 
+post-patch:
+	@${REINPLACE_CMD} -e \
+		'/^all/s|install|| ; \
+		 s| make| $$(MAKE)| ; \
+		 s|su root -c|| ; \
+		 s|"make|"$$(MAKE)|' ${WRKSRC}/makefile
+	@${REINPLACE_CMD} -e \
+		's|^CCC=|CCC?=| ; \
+		 s|^LD=|LD?=|' ${WRKSRC}/cccc/posixgcc.mak
+	@${REINPLACE_CMD} -e \
+		's| make| $$(MAKE)|' ${WRKSRC}/pccts/makefile
+.for i in antlr dlg
+	@${REINPLACE_CMD} -e \
+		's|^CC=|CC?=| ; \
+		 s|^CFLAGS= -O |CFLAGS +=|' ${WRKSRC}/pccts/${i}/makefile
+.endfor
+
 do-install:
-	@${INSTALL_PROGRAM} ${WRKSRC}/cccc/cccc ${STAGEDIR}${PREFIX}/bin
+	(cd ${WRKSRC}/cccc && ${INSTALL_PROGRAM} cccc ${STAGEDIR}${PREFIX}/bin)
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+.for i in ${PORTDOCS}
+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${STAGEDIR}${DOCSDIR})
 .endfor
 
 .include <bsd.port.mk>

Modified: head/devel/cccc/pkg-descr
==============================================================================
--- head/devel/cccc/pkg-descr	Tue Dec 24 13:17:14 2013	(r337351)
+++ head/devel/cccc/pkg-descr	Tue Dec 24 13:26:57 2013	(r337352)
@@ -1,6 +1,6 @@
-Source code metric analyser for C, C++ and Java.
+Source code metric analyser for C, C++, Java and Ada
 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/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312241326.rBODQv60099170>