From 6c27314604850e2557920e297254c5937a15fbbb Mon Sep 17 00:00:00 2001
From: bf <bf@FreeBSD.org>
Date: Mon, 5 Aug 2013 21:06:11 +0000
Subject: Update to 1.61

---
 devel/cppcheck/Makefile | 13 ++++++-------
 devel/cppcheck/distinfo |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

(limited to 'devel')

diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 2884f9b22adf..21937e3256fa 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	cppcheck
-PORTVERSION=	1.60.1
-PORTREVISION=	1
+PORTVERSION=	1.61
 CATEGORIES=	devel
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/
 
@@ -12,10 +11,10 @@ COMMENT=	Static analysis of C/C++ code
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	tinyxml2:${PORTSDIR}/textproc/tinyxml2
+LIB_DEPENDS=	libtinyxml2.so:${PORTSDIR}/textproc/tinyxml2
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
+USES=		gmake
 
 ALL_TARGET=	cppcheck
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -49,13 +48,13 @@ USE_PYTHON_BUILD=	-2.7
 .endif
 
 .if ${PORT_OPTIONS:MRULES}
-LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre
+LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
 MAKE_ENV+=	HAVE_RULES=yes
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} \
-	-e 's|-Iexternals/tinyxml|-I${LOCALBASE}/include|' \
+	-e 's|-Iexternals -Iexternals/tinyxml|-I${LOCALBASE}/include|' \
 		${WRKSRC}/Makefile
 .if ${PORT_OPTIONS:MDOCS}
 	@${REINPLACE_CMD} -e '\|DB2MAN=|d' \
@@ -79,7 +78,7 @@ do-install:
 
 check regression-test test: build
 	@(cd ${BUILD_WRKSRC}; \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} \
+		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${_MAKE_JOBS} ${MAKE_ARGS} test)
 
 .include <bsd.port.mk>
diff --git a/devel/cppcheck/distinfo b/devel/cppcheck/distinfo
index c4119e92e0fd..8d2dec6212e7 100644
--- a/devel/cppcheck/distinfo
+++ b/devel/cppcheck/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cppcheck-1.60.1.tar.bz2) = 08c754744c1d53c2368692c133a69778f3bbfcce5c93a3f5b32575b9d7699449
-SIZE (cppcheck-1.60.1.tar.bz2) = 1255595
+SHA256 (cppcheck-1.61.tar.bz2) = 7cb21cb0fb3aed22040065db2bbfc42bf855db46ad8f023b73d465f7214b70d5
+SIZE (cppcheck-1.61.tar.bz2) = 1140799
-- 
cgit