From owner-freebsd-ports-bugs@FreeBSD.ORG Sun Feb 9 15:10:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org 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 BA141E0 for ; Sun, 9 Feb 2014 15:10:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 94D1E1C53 for ; Sun, 9 Feb 2014 15:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s19FA0gE077682 for ; Sun, 9 Feb 2014 15:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s19FA0FU077681; Sun, 9 Feb 2014 15:10:00 GMT (envelope-from gnats) Resent-Date: Sun, 9 Feb 2014 15:10:00 GMT Resent-Message-Id: <201402091510.s19FA0FU077681@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Kevin Zheng Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DAD0BF89 for ; Sun, 9 Feb 2014 15:03:47 +0000 (UTC) Received: from newred.freebsd.org (cgiserv.freebsd.org [IPv6:2001:1900:2254:206a::50:4]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id AA5911C25 for ; Sun, 9 Feb 2014 15:03:47 +0000 (UTC) Received: from cgiserv.freebsd.org ([127.0.1.6]) by newred.freebsd.org (8.14.7/8.14.7) with ESMTP id s19F3lYf037539 for ; Sun, 9 Feb 2014 15:03:47 GMT (envelope-from nobody@cgiserv.freebsd.org) Received: (from nobody@localhost) by cgiserv.freebsd.org (8.14.7/8.14.7/Submit) id s19F3l6t037534; Sun, 9 Feb 2014 15:03:47 GMT (envelope-from nobody) Message-Id: <201402091503.s19F3l6t037534@cgiserv.freebsd.org> Date: Sun, 9 Feb 2014 15:03:47 GMT From: Kevin Zheng To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-3.1 Subject: ports/186588: [patch] Fix installation failure without DOCS for devel/cppcheck X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Feb 2014 15:10:00 -0000 >Number: 186588 >Category: ports >Synopsis: [patch] Fix installation failure without DOCS for devel/cppcheck >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Feb 09 15:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Kevin Zheng >Release: 10.0-RELEASE >Organization: >Environment: FreeBSD epsilon.local 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC 2014 root@snap.freebsd.org:/usr/obj/usr/src/sys/GENERIC amd64 >Description: devel/cppcheck installs a man page when DOCS is set. If DOCS is not set, the man page is not installed, but still appears in PLIST_FILES, resulting in an installation failure. There are two ways to solve this problem: 1) Unconditionally install the man page, since they're pretty much essential for everybody (my way) 2) Change the PLIST_FILES to a conditional entry, that is: add the man page only if DOCS is enabled Personally I like #1, and that's what my patch does. >How-To-Repeat: Install devel/cppcheck without DOCS set. >Fix: Apply the attached patch. Patch attached with submission follows: diff --git a/devel/cppcheck/Makefile b/devel/cppcheck/Makefile index ad33b23..59a82ba 100644 --- a/devel/cppcheck/Makefile +++ b/devel/cppcheck/Makefile @@ -35,7 +35,6 @@ MAKE_ENV+= CFGDIR="${DATADIR}/cfg" PORTDATA= * .endif -.if ${PORT_OPTIONS:MDOCS} ALL_TARGET+= man BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \ ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl @@ -43,7 +42,6 @@ MAKE_ENV+= DB2MAN="${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl" post-install: @${INSTALL_MAN} ${WRKSRC}/cppcheck.1 ${STAGEDIR}${PREFIX}/man/man1 -.endif .if ${PORT_OPTIONS:MMATCHCOMPILER} MAKE_ENV+= SRCDIR=build @@ -59,10 +57,8 @@ post-patch: @${REINPLACE_CMD} \ -e 's|-Iexternals -Iexternals/tinyxml|-I${LOCALBASE}/include|' \ ${WRKSRC}/Makefile -.if ${PORT_OPTIONS:MDOCS} @${REINPLACE_CMD} -e '\|DB2MAN=|d' \ ${WRKSRC}/Makefile -.endif .if ${PORT_OPTIONS:MMATCHCOMPILER} @${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}|' \ ${WRKSRC}/Makefile >Release-Note: >Audit-Trail: >Unformatted: