Attachment 162844 Details for Bug 204325 – Patch

[patch] Patch

cppcheck.patch (text/plain), 3.50 KB, created by Dmitry Marakasov on 2015-11-06 09:37:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2015-11-06 09:37:49 UTC

Size: 3.50 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 400856)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	cppcheck
>-PORTVERSION=	1.69
>+PORTVERSION=	1.70
> CATEGORIES=	devel
> MASTER_SITES=	SF
> 
>@@ -17,9 +17,13 @@
> USES=		compiler:c++11-lib execinfo gmake tar:bzip2
> 
> ALL_TARGET=	cppcheck
>+TEST_TARGET=	test
> LDFLAGS+=	-L${LOCALBASE}/lib -lexecinfo
>-MAKE_ENV+=	TINYXML=-ltinyxml2
>+MAKE_ENV+=	TINYXML=-ltinyxml2 CFGDIR="${DATADIR}/cfg"
> 
>+PLIST_FILES=	bin/cppcheck bin/cppcheck-htmlreport
>+PORTDATA=	*
>+
> OPTIONS_DEFINE=		MATCHCOMPILER RULES MANPAGES
> OPTIONS_DEFAULT=	MATCHCOMPILER RULES MANPAGES
> 
>@@ -26,48 +30,32 @@
> MATCHCOMPILER_DESC=	Build-time optimizations via Python
> RULES_DESC=		User-defined rule support (requires PCRE)
> 
>-PLIST_FILES=	bin/cppcheck bin/cppcheck-htmlreport
>+MANPAGES_ALL_TARGET=	man
>+MANPAGES_BUILD_DEPENDS=	xsltproc:${PORTSDIR}/textproc/libxslt \
>+			${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
>+MANPAGES_MAKE_ENV=	DB2MAN="${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl"
>+MANPAGES_PLIST_FILES=	man/man1/cppcheck.1.gz
> 
>-.include <bsd.port.options.mk>
>+MATCHCOMPILER_MAKE_ENV=	SRCDIR=build
>+MATCHCOMPILER_USES=	python:2,build
> 
>-MAKE_ENV+=	CFGDIR="${DATADIR}/cfg"
>-PORTDATA=	*
>+RULES_LIB_DEPENDS=	libpcre.so:${PORTSDIR}/devel/pcre
>+RULES_MAKE_ENV=		HAVE_RULES=yes
> 
>-.if ${PORT_OPTIONS:MMANPAGES}
>-ALL_TARGET+=	man
>-BUILD_DEPENDS+=	xsltproc:${PORTSDIR}/textproc/libxslt \
>-		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl
>-MAKE_ENV+=	DB2MAN="${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl"
>-
>-PLIST_FILES+=	man/man1/cppcheck.1.gz
>-
>-post-install:
>-	@${INSTALL_MAN} ${WRKSRC}/cppcheck.1 ${STAGEDIR}${PREFIX}/man/man1
>-.endif
>-
>-.if ${PORT_OPTIONS:MMATCHCOMPILER}
>-MAKE_ENV+=	SRCDIR=build
>-USES+=		python:2,build
>-.endif
>-
>-.if ${PORT_OPTIONS:MRULES}
>-LIB_DEPENDS+=	libpcre.so:${PORTSDIR}/devel/pcre
>-MAKE_ENV+=	HAVE_RULES=yes
>-.endif
>-
> post-patch:
> 	@${REINPLACE_CMD} \
> 	-e 's|-Iexternals/tinyxml|-I${LOCALBASE}/include|' \
> 		${WRKSRC}/Makefile
>-.if ${PORT_OPTIONS:MMANPAGES}
>+
>+post-patch-MANPAGES-on:
> 	@${REINPLACE_CMD} -e '\|DB2MAN=|d' \
> 		${WRKSRC}/Makefile
>-.endif
>-.if ${PORT_OPTIONS:MMATCHCOMPILER}
>+
>+post-patch-MATCHCOMPILER-on:
> 	@${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' \
> 		${WRKSRC}/Makefile
>-.endif
>-.if ${PORT_OPTIONS:MRULES}
>+
>+post-patch-RULES-on:
> 	@${REINPLACE_CMD} \
> 	-e '\|CXXFLAGS +=| \
> 	s| -DTIXML_USE_STL $$(shell pcre-config --cflags)||' \
>@@ -74,7 +62,6 @@
> 	-e '\|$$(SRCDIR)/cppcheck.cpp| \
> 	s|$${INCLUDE_FOR_LIB}|& $$(shell pcre-config --cflags)|' \
> 			${WRKSRC}/Makefile
>-.endif
> 
> do-install:
> 	@${INSTALL_PROGRAM} ${WRKSRC}/cppcheck ${STAGEDIR}${PREFIX}/bin
>@@ -82,7 +69,7 @@
> 	@${MKDIR} ${STAGEDIR}${DATADIR}/cfg
> 	@cd ${WRKSRC}/cfg; ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/cfg/
> 
>-check regression-test test: build
>-	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
>+do-install-MANPAGES-on:
>+	@${INSTALL_MAN} ${WRKSRC}/cppcheck.1 ${STAGEDIR}${PREFIX}/man/man1
> 
> .include <bsd.port.mk>
>Index: distinfo
>===================================================================
>--- distinfo	(revision 400856)
>+++ distinfo	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (cppcheck-1.69.tar.bz2) = 4bd5c8031258ef29764a4c92666384238a625beecbb2aceeb7065ec388c7532e
>-SIZE (cppcheck-1.69.tar.bz2) = 1052984
>+SHA256 (cppcheck-1.70.tar.bz2) = c6aaafd41b4c2050f3fb96a4aa159507007403a163d05361bd9544e5baf18f39
>+SIZE (cppcheck-1.70.tar.bz2) = 1111291

Actions: View | Diff

Attachments on bug 204325: 162844