Date: Mon, 3 Mar 2014 16:36:37 +0000 (UTC) From: Brendan Fabeny <bf@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r346928 - head/devel/cppcheck Message-ID: <201403031636.s23Gab6B004488@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bf Date: Mon Mar 3 16:36:37 2014 New Revision: 346928 URL: http://svnweb.freebsd.org/changeset/ports/346928 QAT: https://qat.redports.org/buildarchive/r346928/ Log: Correct the plist for the case when the manpage isn't built, and use a more specific option name PR: 186588, 186795 Submitted by: amdmi3, K. Zheng Modified: head/devel/cppcheck/Makefile Modified: head/devel/cppcheck/Makefile ============================================================================== --- head/devel/cppcheck/Makefile Mon Mar 3 16:23:58 2014 (r346927) +++ head/devel/cppcheck/Makefile Mon Mar 3 16:36:37 2014 (r346928) @@ -20,13 +20,13 @@ ALL_TARGET= cppcheck LDFLAGS+= -L${LOCALBASE}/lib MAKE_ENV+= TINYXML=-ltinyxml2 -OPTIONS_DEFINE= MATCHCOMPILER RULES -OPTIONS_DEFAULT= MATCHCOMPILER RULES +OPTIONS_DEFINE= MATCHCOMPILER RULES MANPAGES +OPTIONS_DEFAULT= MATCHCOMPILER RULES MANPAGES MATCHCOMPILER_DESC= Build-time optimizations via Python RULES_DESC= User-defined rule support (requires PCRE) -PLIST_FILES= bin/cppcheck bin/cppcheck-htmlreport man/man1/cppcheck.1.gz +PLIST_FILES= bin/cppcheck bin/cppcheck-htmlreport .include <bsd.port.options.mk> @@ -35,12 +35,14 @@ MAKE_ENV+= CFGDIR="${DATADIR}/cfg" PORTDATA= * .endif -.if ${PORT_OPTIONS:MDOCS} +.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 @@ -59,7 +61,7 @@ post-patch: @${REINPLACE_CMD} \ -e 's|-Iexternals -Iexternals/tinyxml|-I${LOCALBASE}/include|' \ ${WRKSRC}/Makefile -.if ${PORT_OPTIONS:MDOCS} +.if ${PORT_OPTIONS:MMANPAGES} @${REINPLACE_CMD} -e '\|DB2MAN=|d' \ ${WRKSRC}/Makefile .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403031636.s23Gab6B004488>