Update to 1.57

* Drop cmake support (upstream does not cmake anymore)
* To build GUI, qmake is needed

Changelog:
* Bug fixes
* Many improvements
* Improve translations

3 files changed, 25 insertions, 35 deletions

diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile
index 0143ea5b25f..9a04b65dd04 100644
--- a/devel/cppcheck/Makefile
+++ b/devel/cppcheck/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.19 2012/10/31 11:16:48 asau Exp $
+# $NetBSD: Makefile,v 1.20 2012/11/29 13:52:51 ryoon Exp $
 #
 
-DISTNAME=	cppcheck-1.48
-PKGREVISION=	8
+DISTNAME=	cppcheck-1.57
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cppcheck/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,24 +14,24 @@ LICENSE=	gnu-gpl-v3
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 
-INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1
+FIND_PREFIX:=	DBXSLDIR=docbook-xsl
+.include "../../mk/find-prefix.mk"
+
+INSTALLATION_DIRS=	${PKGMANDIR}/man1
 USE_LANGUAGES=		c c++
-USE_CMAKE=		yes
 USE_TOOLS+=		gmake
-
-BUILDLINK_TRANSFORM+=	rm:-Wlogical-op
+BUILD_TARGET=		all man
+BUILD_MAKE_FLAGS+=	DB2MAN=${DBXSLDIR}/share/xsl/docbook/manpages/docbook.xsl
 
 .include "options.mk"
 
-.PHONY: man-build
-post-build: man-build
-man-build:
-	cd ${WRKSRC}/man && xsltproc --nonet \
-		--param man.charmap.use.subset "0" \
-		--param make.year.ranges "1" \
-		--param make.single.year.ranges "1" \
-		${PREFIX}/share/xsl/docbook/manpages/docbook.xsl \
-		cppcheck.1.xml
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/cppcheck.1 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+.if !empty(PKG_OPTIONS:Mqt)
+	${INSTALL_PROGRAM} ${WRKSRC}/gui/cppcheck-gui \
+		${DESTDIR}${PREFIX}/bin
+.endif
 
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cppcheck/distinfo b/devel/cppcheck/distinfo
index 7ee7072a0a0..8884965613f 100644
--- a/devel/cppcheck/distinfo
+++ b/devel/cppcheck/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2011/05/29 11:52:12 wiz Exp $
+$NetBSD: distinfo,v 1.5 2012/11/29 13:52:51 ryoon Exp $
 
-SHA1 (cppcheck-1.48.tar.bz2) = 10cf38034148b7cb258840febe620ba397114fd1
-RMD160 (cppcheck-1.48.tar.bz2) = de40627f6fced2694427f132d2d93f9f33211187
-Size (cppcheck-1.48.tar.bz2) = 833185 bytes
+SHA1 (cppcheck-1.57.tar.bz2) = 4753472689fdcb4276fde55e6e984597c87921bd
+RMD160 (cppcheck-1.57.tar.bz2) = ab8d78d80b501334cfcf236693c241fbf303e5ce
+Size (cppcheck-1.57.tar.bz2) = 1180272 bytes
diff --git a/devel/cppcheck/options.mk b/devel/cppcheck/options.mk
index c20342b6223..e345273c489 100644
--- a/devel/cppcheck/options.mk
+++ b/devel/cppcheck/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2011/05/29 11:52:12 wiz Exp $
+# $NetBSD: options.mk,v 1.4 2012/11/29 13:52:51 ryoon Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cppcheck
 PKG_SUPPORTED_OPTIONS=	qt
@@ -6,23 +6,14 @@ PKG_SUPPORTED_OPTIONS=	qt
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mqt)
-INSTALLATION_DIRS+=	lib share/cppcheck
-
 PLIST_SRC+=		PLIST PLIST.qt
 
-do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/cli/cppcheck ${DESTDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/gui/cppcheck-gui \
-		${DESTDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/man/cppcheck.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-
 .include "../../x11/qt4-libs/buildlink3.mk"
 BUILDLINK_DEPMETHOD.qt4-tools?= full
 .include "../../x11/qt4-tools/buildlink3.mk"
-.else
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cli/cppcheck ${DESTDIR}${PREFIX}/bin/
-	${INSTALL_DATA} ${WRKSRC}/man/cppcheck.1 \
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+
+post-build:
+	cd ${WRKSRC}/gui && \
+		${CONFIGURE_ENV} QTDIR=${QTDIR} HAVE_RULES=yes ${QTDIR}/bin/qmake gui.pro && \
+		${MAKE_ENV} QTDIR=${QTDIR} make
 .endif