Update to 1.48. Ok reed except for the cmake dependency :)

Release notes for 1.48

There are no major new features in 1.48. There are more and better
checks.

New check: Wrong usage of ! operator in conditions.  Example: if
(!x == 0) {

New check: Use "throw" without arguments to rethrow exceptions.

New check: Comparison of substring with string literal will
always/never match because size doesn't match.

New check: Postfix increment of boolean

New check: Clarify condition with parantheses (when there are
assignment + comparison) Example: if (a = b > 0) {


Release notes for 1.47

It is now possible to exclude files and folders from the analysis.
Use -i on the command line (i=ignore).

Custom rules can now be created using regular expressions. To read
more about creating custom rules, see
http://sourceforge.net/projects/cppcheck/files/Articles/

A new XML format is launched. To use this format, the --xml-version=2
is used. The new xml format is incompatible with the xml format
used in previous versions. The old XML format will still be used
unless --xml-version=2 is given, so your existing scripts, tools
and plugins should still work.

New check: sizeof used on array variable that is a function parameter.
The expected bahaviour is most likely that the sizeof result is
the size of the array, but the actual sizeof result is the size of
the pointer.

New check: catching exception by value. It is better to catch by
reference for various reasons.

New check: memset calls filling 0 bytes. The given size might be
wrong.

4 files changed, 17 insertions, 44 deletions

diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 5265a04c8bc..1ab90107945 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2011/04/22 14:40:41 obache Exp $
+# $NetBSD: Makefile,v 1.10 2011/05/29 11:52:12 wiz Exp $
 #
 
-DISTNAME=	cppcheck-1.46.1
-PKGREVISION=	2
+DISTNAME=	cppcheck-1.48
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cppcheck/}
 EXTRACT_SUFX=	.tar.bz2
@@ -17,7 +16,8 @@ BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
 PKG_DESTDIR_SUPPORT=	user-destdir
-USE_LANGUAGES=		c++
+USE_LANGUAGES=		c c++
+USE_CMAKE=		yes
 USE_TOOLS+=		gmake
 
 BUILDLINK_TRANSFORM+=	rm:-Wlogical-op
@@ -34,4 +34,5 @@ man-build:
 		${PREFIX}/share/xsl/docbook/manpages/docbook.xsl \
 		cppcheck.1.xml
 
+.include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cppcheck/PLIST.qt b/devel/cppcheck/PLIST.qt
index c33023b513f..3ddef86a23a 100644
--- a/devel/cppcheck/PLIST.qt
+++ b/devel/cppcheck/PLIST.qt
@@ -1,10 +1,2 @@
-@comment $NetBSD: PLIST.qt,v 1.1 2010/02/03 09:46:42 wiz Exp $
+@comment $NetBSD: PLIST.qt,v 1.2 2011/05/29 11:52:12 wiz Exp $
 bin/cppcheck-gui
-lib/cppcheck-gui
-share/cppcheck/cppcheck_de.qm
-share/cppcheck/cppcheck_en.qm
-share/cppcheck/cppcheck_fi.qm
-share/cppcheck/cppcheck_nl.qm
-share/cppcheck/cppcheck_pl.qm
-share/cppcheck/cppcheck_ru.qm
-share/cppcheck/cppcheck_se.qm
diff --git a/devel/cppcheck/distinfo b/devel/cppcheck/distinfo
index ea9e4f94508..7ee7072a0a0 100644
--- a/devel/cppcheck/distinfo
+++ b/devel/cppcheck/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2010/12/15 13:01:38 wiz Exp $
+$NetBSD: distinfo,v 1.4 2011/05/29 11:52:12 wiz Exp $
 
-SHA1 (cppcheck-1.46.1.tar.bz2) = fb1bc1b44341c8fd111e06c217c91f108142b71c
-RMD160 (cppcheck-1.46.1.tar.bz2) = 5a82adb010c9bee0e96d2ac1fddd4b5fc4f7ad5c
-Size (cppcheck-1.46.1.tar.bz2) = 676586 bytes
+SHA1 (cppcheck-1.48.tar.bz2) = 10cf38034148b7cb258840febe620ba397114fd1
+RMD160 (cppcheck-1.48.tar.bz2) = de40627f6fced2694427f132d2d93f9f33211187
+Size (cppcheck-1.48.tar.bz2) = 833185 bytes
diff --git a/devel/cppcheck/options.mk b/devel/cppcheck/options.mk
index 339b40df7c5..c20342b6223 100644
--- a/devel/cppcheck/options.mk
+++ b/devel/cppcheck/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2010/02/03 09:52:32 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2011/05/29 11:52:12 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cppcheck
 PKG_SUPPORTED_OPTIONS=	qt
@@ -6,43 +6,23 @@ PKG_SUPPORTED_OPTIONS=	qt
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mqt)
-SUBST_CLASSES+=		lrelease
-SUBST_FILES.lrelease=	gui/gui.pro
-SUBST_STAGE.lrelease=	post-extract
-SUBST_SED.lrelease=	-e "s,lrelease gui.pro,${PREFIX}/qt4/bin/lrelease gui.pro,g"
-SUBST_MESSAGE.lrelease=	Fixing path to lrelease.
-
 INSTALLATION_DIRS+=	lib share/cppcheck
 
 PLIST_SRC+=		PLIST PLIST.qt
 
-do-configure:
-	cd ${WRKSRC} && ${PREFIX}/qt4/bin/qmake
-
-.PHONY: link-build
-post-build: link-build
-link-build:
-	${ECHO} '#!/bin/sh' > ${WRKSRC}/cppcheck-gui
-	${ECHO} 'cd ${PREFIX}/share/cppcheck && ${PREFIX}/lib/cppcheck-gui "$$@"' >> ${WRKSRC}/cppcheck-gui
-
-.PHONY: qt-install
-post-install: qt-install
-qt-install:
+do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cli/cppcheck ${DESTDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/cppcheck-gui ${DESTDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/gui/gui \
-		${DESTDIR}${PREFIX}/lib/cppcheck-gui
+	${INSTALL_PROGRAM} ${WRKSRC}/gui/cppcheck-gui \
+		${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/man/cppcheck.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKSRC}/gui/*.qm ${DESTDIR}${PREFIX}/share/cppcheck
 
 .include "../../x11/qt4-libs/buildlink3.mk"
+BUILDLINK_DEPMETHOD.qt4-tools?= full
 .include "../../x11/qt4-tools/buildlink3.mk"
 .else
-.PHONY: main-install
-post-install: main-install
-main-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cppcheck ${DESTDIR}${PREFIX}/bin/
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/cli/cppcheck ${DESTDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/man/cppcheck.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .endif