From amdmi3@amdmi3.ru  Sat Feb 15 15:21:26 2014
Return-Path: <amdmi3@amdmi3.ru>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 37FC8861;
	Sat, 15 Feb 2014 15:21:26 +0000 (UTC)
Received: from smtpout6.timeweb.ru (smtpout6.timeweb.ru [92.53.117.39])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id E5FF91FF0;
	Sat, 15 Feb 2014 15:21:25 +0000 (UTC)
Received: from [213.148.20.85] (helo=hive.panopticon)
	by smtp.timeweb.ru with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
	(Exim 4.76)
	(envelope-from <amdmi3@amdmi3.ru>)
	id 1WEh3M-0000Se-RX; Sat, 15 Feb 2014 19:21:16 +0400
Received: from hades.panopticon (hades.panopticon [192.168.0.32])
	by hive.panopticon (Postfix) with ESMTP id 77085C0B;
	Sat, 15 Feb 2014 19:21:16 +0400 (MSK)
Received: by hades.panopticon (Postfix, from userid 1000)
	id 56456F9D2; Sat, 15 Feb 2014 19:21:16 +0400 (MSK)
Message-Id: <20140215152116.56456F9D2@hades.panopticon>
Date: Sat, 15 Feb 2014 19:21:16 +0400 (MSK)
From: Dmitry Marakasov <amdmi3@amdmi3.ru>
To: FreeBSD-gnats-submit@freebsd.org
Cc: bf@FreeBSD.org
Subject: [PATCH] devel/cppcheck: fix manpage installation
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         186795
>Category:       ports
>Synopsis:       [PATCH] devel/cppcheck: fix manpage installation
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    bf
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Feb 15 15:30:01 UTC 2014
>Closed-Date:    Wed Mar 05 05:12:20 UTC 2014
>Last-Modified:  Wed Mar 05 05:12:20 UTC 2014
>Originator:     Dmitry Marakasov
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD hades.panopticon 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260807: Fri Jan 17 13:14:28 MSK
>Description:
- Add MANPAGES option
- Make manpage installation dependent on this option, not DOCS
- Fix plist in case of manpages disabled

Port maintainer (bf@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- cppcheck-1.63.patch begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 344403)
+++ Makefile	(working copy)
@@ -20,13 +20,13 @@
 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 @@
 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 @@
 	@${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
--- cppcheck-1.63.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->bf 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Feb 15 15:30:16 UTC 2014 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186795 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/186795: commit references a PR
Date: Mon,  3 Mar 2014 16:36:45 +0000 (UTC)

 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: bf 
State-Changed-When: Wed Mar 5 05:12:19 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=186795 
>Unformatted:
