From da209745265b204a0d6734616ae37fcdc6077397 Mon Sep 17 00:00:00 2001 From: Brendan Fabeny Date: Mon, 3 Mar 2014 16:36:37 +0000 Subject: [PATCH] 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 --- devel/cppcheck/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile index ad33b23f5976..f9a612e373dc 100644 --- a/devel/cppcheck/Makefile +++ b/devel/cppcheck/Makefile @@ -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 @@ -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