From owner-svn-ports-all@FreeBSD.ORG  Tue Jun 11 15:25:54 2013
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 329BC600;
 Tue, 11 Jun 2013 15:25:54 +0000 (UTC) (envelope-from bf@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2567C1A5D;
 Tue, 11 Jun 2013 15:25:54 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5BFPshT084014;
 Tue, 11 Jun 2013 15:25:54 GMT (envelope-from bf@svn.freebsd.org)
Received: (from bf@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5BFPsGT084013;
 Tue, 11 Jun 2013 15:25:54 GMT (envelope-from bf@svn.freebsd.org)
Message-Id: <201306111525.r5BFPsGT084013@svn.freebsd.org>
From: Brendan Fabeny <bf@FreeBSD.org>
Date: Tue, 11 Jun 2013 15:25:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r320605 - head/devel/cppcheck
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Jun 2013 15:25:54 -0000

Author: bf
Date: Tue Jun 11 15:25:53 2013
New Revision: 320605
URL: http://svnweb.freebsd.org/changeset/ports/320605

Log:
  Switch from the bundled tinyxml2 to the new textproc/tinyxml2 port

Modified:
  head/devel/cppcheck/Makefile

Modified: head/devel/cppcheck/Makefile
==============================================================================
--- head/devel/cppcheck/Makefile	Tue Jun 11 15:19:11 2013	(r320604)
+++ head/devel/cppcheck/Makefile	Tue Jun 11 15:25:53 2013	(r320605)
@@ -3,6 +3,7 @@
 
 PORTNAME=	cppcheck
 PORTVERSION=	1.60.1
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 
@@ -11,14 +12,14 @@ COMMENT=	Static analysis of C/C++ code
 
 LICENSE=	GPLv3
 
-#LIB_DEPENDS=	tinyxml:${PORTSDIR}/textproc/tinyxml
+LIB_DEPENDS=	tinyxml2:${PORTSDIR}/textproc/tinyxml2
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 
 ALL_TARGET=	cppcheck
 LDFLAGS+=	-L${LOCALBASE}/lib
-#MAKE_ENV+=	TINYXML=-ltinyxml
+MAKE_ENV+=	TINYXML=-ltinyxml2
 
 OPTIONS_DEFINE=		MATCHCOMPILER RULES
 OPTIONS_DEFAULT=	MATCHCOMPILER RULES
@@ -53,9 +54,9 @@ MAKE_ENV+=	HAVE_RULES=yes
 .endif
 
 post-patch:
-#	@${REINPLACE_CMD} \
-#	-e 's|-Iexternals/tinyxml|-I${LOCALBASE}/include|' \
-#		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} \
+	-e 's|-Iexternals/tinyxml|-I${LOCALBASE}/include|' \
+		${WRKSRC}/Makefile
 .if ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '\|DB2MAN=|d' \
 		${WRKSRC}/Makefile