Import of pkgsrc-2016Q3

devel/cppcheck/Makefile

@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.35 2015/05/08 19:35:33 bsiegert Exp $
+# $NetBSD: Makefile,v 1.38 2016/09/19 11:05:53 wiz Exp $
 
-DISTNAME=	cppcheck-1.69
+DISTNAME=	cppcheck-1.75
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=cppcheck/}
 EXTRACT_SUFX=	.tar.bz2
@@ -14,52 +14,43 @@ BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 DEPENDS+=	${PYPKGPREFIX}-pygments-[0-9]*:../../textproc/py-pygments
 
-FIND_PREFIX:=	DBXSLDIR=docbook-xsl
-.include "../../mk/find-prefix.mk"
-
 USE_LANGUAGES=		c c++
 USE_TOOLS+=		gmake
+
 BUILD_TARGET=		all man
-BUILD_MAKE_FLAGS+=	DB2MAN=${DBXSLDIR}/share/xsl/docbook/manpages/docbook.xsl
+BUILD_MAKE_FLAGS+=	DB2MAN=${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl
 # tell cppcheck where its config is
 MAKE_FLAGS+=		CFGDIR=${PREFIX}/share/cppcheck/cfg
 # rules support (needs pcre)
 MAKE_FLAGS+=		HAVE_RULES=yes
 
 # use pkgsrc tinyxml2 instead of included copy
-MAKE_FLAGS+=		TINYXML= INCLUDE_FOR_LIB=-Ilib 
-MAKE_FLAGS+=		INCLUDE_FOR_CLI=-Ilib
-MAKE_FLAGS+=		INCLUDE_FOR_TEST=-Ilib\ -Icli
+MAKE_FLAGS+=		TINYXML=
+MAKE_FLAGS+=		INCLUDE_FOR_LIB="-Ilib -Iexternals/simplecpp"
+MAKE_FLAGS+=		INCLUDE_FOR_CLI="-Ilib -Iexternals/simplecpp"
+MAKE_FLAGS+=		INCLUDE_FOR_TEST="-Ilib -Icli -Iexternals/simplecpp"
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.tinyxml2}/include
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.tinyxml2}/lib -L${BUILDLINK_PREFIX.tinyxml2}/lib -ltinyxml2
 
-# http://5.150.254.56:443/trac-cppcheck/ticket/6026#ticket
-.include "../../mk/bsd.fast.prefs.mk"
-.if !empty(MACHINE_PLATFORM:MNetBSD-[0-6].*-*) || empty(MACHINE_PLATFORM:MNetBSD-*)
-# no backtrace() on NetBSD<7 (6.99.8 actually); add other systems with backtrace() when you find them
-CPPFLAGS+=		-DNO_UNIX_BACKTRACE_SUPPORT=1
-.else
-LDFLAGS+=		-lexecinfo
-.endif
+# needs C++0x
+CXXFLAGS+=		-std=c++0x
 
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc-4.[0-5]*) || !empty(CC_VERSION:Mgcc-3.*)
 CXXFLAGS+= -include lib/cxx11emu.h
 .endif
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man1
+INSTALLATION_DIRS+=	${PKGMANDIR}/man1
 
 REPLACE_PYTHON+=	htmlreport/cppcheck-htmlreport
+REPLACE_PYTHON+=	addons/y2038/y2038.py
 
 .include "options.mk"
 
-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
+.PHONY: man-install
+post-install: man-install
+man-install:
+	${INSTALL_DATA} ${WRKSRC}/cppcheck.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 
 .include "../../lang/python/application.mk"
 .include "../../devel/pcre/buildlink3.mk"

devel/cppcheck/PLIST

@@ -1,7 +1,13 @@
-@comment $NetBSD: PLIST,v 1.5 2015/05/08 19:35:33 bsiegert Exp $
+@comment $NetBSD: PLIST,v 1.6 2016/09/19 11:05:53 wiz Exp $
+bin/cert.py
 bin/cppcheck
-${PLIST.qt}bin/cppcheck-gui
+${PLIST.qt5}bin/cppcheck-gui
 bin/cppcheck-htmlreport
+bin/cppcheckdata.py
+bin/findcasts.py
+bin/naming.py
+bin/threadsafety.py
+bin/y2038.py
 man/man1/cppcheck.1
 share/cppcheck/cfg/avr.cfg
 share/cppcheck/cfg/cppcheck-cfg.rng

devel/cppcheck/distinfo

@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.11 2015/05/08 19:35:33 bsiegert Exp $
+$NetBSD: distinfo,v 1.13 2016/09/19 11:05:53 wiz Exp $
 
-SHA1 (cppcheck-1.69.tar.bz2) = d54f5fa90abd5a3e4e581f85915d46aec5408141
-RMD160 (cppcheck-1.69.tar.bz2) = 70ac3979017d7c9618da9c3021b35d05d211a281
-Size (cppcheck-1.69.tar.bz2) = 1052984 bytes
+SHA1 (cppcheck-1.75.tar.bz2) = d15523edd24dbf7a26024779526ff825237552d6
+RMD160 (cppcheck-1.75.tar.bz2) = f8133b13d8c24af6137044b163db03899b3ee6ee
+SHA512 (cppcheck-1.75.tar.bz2) = 74116a7a2cd1c8c9a06c81f3f4de3de281f24ee30692729de5506dc7572ed694e55c32d1ad72196a9b95005e9f8d749bd82655323f8ff56051997c2ffc4ed57f
+Size (cppcheck-1.75.tar.bz2) = 1152511 bytes

devel/cppcheck/options.mk

@@ -1,21 +1,25 @@
-# $NetBSD: options.mk,v 1.5 2013/04/05 15:14:03 adam Exp $
+# $NetBSD: options.mk,v 1.6 2016/09/19 11:05:53 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cppcheck
-PKG_SUPPORTED_OPTIONS=	qt
+PKG_SUPPORTED_OPTIONS=	qt5
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=	qt
+PLIST_VARS+=	qt5
 
-.if !empty(PKG_OPTIONS:Mqt)
-PLIST.qt=	yes
+.if !empty(PKG_OPTIONS:Mqt5)
+PLIST.qt5=	yes
+USE_LIBTOOL=	yes
 
-.include "../../x11/qt4-libs/buildlink3.mk"
-BUILDLINK_DEPMETHOD.qt4-tools+= full
-.include "../../x11/qt4-tools/buildlink3.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qttools/buildlink3.mk"
 
 post-build:
 	cd ${WRKSRC}/gui && \
 		${CONFIGURE_ENV} QTDIR=${QTDIR} HAVE_RULES=yes ${QTDIR}/bin/qmake gui.pro && \
 		${MAKE_ENV} QTDIR=${QTDIR} make
+
+post-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/gui/cppcheck-gui ${DESTDIR}${PREFIX}/bin
+
 .endif