diff options
| author | bf <bf@FreeBSD.org> | 2011-09-18 00:19:05 +0800 |
|---|---|---|
| committer | bf <bf@FreeBSD.org> | 2011-09-18 00:19:05 +0800 |
| commit | c7be65eb1c3a5a620d01a2c52d9f4c067535b38c (patch) | |
| tree | 9794344aa3d05cadd1cf84f212faa423f898ccbd /devel | |
| parent | f89de53076044d0664a4793a226f8be5be9e476a (diff) | |
| download | freebsd-ports-graphics-c7be65eb1c3a5a620d01a2c52d9f4c067535b38c.tar.gz freebsd-ports-graphics-c7be65eb1c3a5a620d01a2c52d9f4c067535b38c.tar.zst freebsd-ports-graphics-c7be65eb1c3a5a620d01a2c52d9f4c067535b38c.zip | |
fix a build problem by switching from the bundled tinyxml to textproc/tinyxml
Submitted by: kevlo (slightly different patch)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/cppcheck/Makefile | 16 | ||||
| -rw-r--r-- | devel/cppcheck/files/patch-cli__cmdlineparser.cpp | 11 |
2 files changed, 19 insertions, 8 deletions
diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile index 633bec27c66..230bbe347e0 100644 --- a/devel/cppcheck/Makefile +++ b/devel/cppcheck/Makefile @@ -7,6 +7,7 @@ PORTNAME= cppcheck PORTVERSION= 1.50 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}/ @@ -15,20 +16,23 @@ COMMENT= Static analysis of C/C++ code LICENSE= GPLv3 -LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre +LIB_DEPENDS= pcre.0:${PORTSDIR}/devel/pcre \ + tinyxml.3:${PORTSDIR}/textproc/tinyxml USE_GMAKE= yes USE_BZIP2= yes LDFLAGS+= ${PTHREAD_LIBS} -L${LOCALBASE}/lib CPPFLAGS+= -I${LOCALBASE}/include -MAKE_ENV+= LDFLAGS="${LDFLAGS}" +MAKE_ENV+= LDFLAGS="${LDFLAGS}" TINYXML=-ltinyxml PLIST_FILES= bin/cppcheck ALL_TARGET= cppcheck +.include <bsd.port.pre.mk> + .if !defined(NO_INSTALL_MANPAGES) -BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \ +BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl MANCOMPRESSED= no @@ -39,10 +43,6 @@ post-install: @${INSTALL_MAN} ${WRKSRC}/cppcheck.1 ${PREFIX}/man/man1 .endif -post-patch: - @${REINPLACE_CMD} -e '/CXXFLAGS=/d ; /CXX=/d' \ - ${WRKSRC}/Makefile - do-install: @${INSTALL_PROGRAM} ${WRKSRC}/cppcheck ${PREFIX}/bin @@ -50,4 +50,4 @@ check regression-test test: build @(cd ${BUILD_WRKSRC}; \ ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} ${MAKE_ARGS} test) -.include <bsd.port.mk> +.include <bsd.port.post.mk> diff --git a/devel/cppcheck/files/patch-cli__cmdlineparser.cpp b/devel/cppcheck/files/patch-cli__cmdlineparser.cpp new file mode 100644 index 00000000000..a643ec09b8e --- /dev/null +++ b/devel/cppcheck/files/patch-cli__cmdlineparser.cpp @@ -0,0 +1,11 @@ +--- ./cli/cmdlineparser.cpp.orig 2011-08-14 03:45:53.000000000 -0400 ++++ ./cli/cmdlineparser.cpp 2011-09-17 03:13:23.000000000 -0400 +@@ -535,7 +535,7 @@ + if (doc.LoadFile(12+argv[i])) + { + TiXmlElement *node = doc.FirstChildElement(); +- for (; node && node->ValueStr() == "rule"; node = node->NextSiblingElement()) ++ for (; node && node->Value() == "rule"; node = node->NextSiblingElement()) + { + Settings::Rule rule; + |