From owner-freebsd-ports@FreeBSD.ORG Sat May 31 15:34:18 2014 Return-Path: Delivered-To: freebsd-ports@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 D585BF18 for ; Sat, 31 May 2014 15:34:18 +0000 (UTC) Received: from winston.madpilot.net (winston.madpilot.net [78.47.75.155]) by mx1.freebsd.org (Postfix) with ESMTP id 5E14B2277 for ; Sat, 31 May 2014 15:34:18 +0000 (UTC) Received: from winston.madpilot.net (localhost [127.0.0.1]) by winston.madpilot.net (Postfix) with ESMTP id 3ggmsP4s6MzFT9x; Sat, 31 May 2014 17:34:17 +0200 (CEST) Received: from winston.madpilot.net ([127.0.0.1]) by winston.madpilot.net (winston.madpilot.net [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zJqRkrNc3Qjn; Sat, 31 May 2014 17:34:15 +0200 (CEST) Received: from tommy.madpilot.net (micro.madpilot.net [88.149.173.206]) by winston.madpilot.net (Postfix) with ESMTPSA; Sat, 31 May 2014 17:34:15 +0200 (CEST) Message-ID: <5389F676.2080708@FreeBSD.org> Date: Sat, 31 May 2014 17:34:14 +0200 From: Guido Falsi User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: Steve Kargl Subject: FreeBSD port graphics/xfig: patch to fix packaging with DOCS disabled (was Re: please revert graphics/xfig r354029) References: <20140531000800.GA57984@troutmask.apl.washington.edu> <5389D9B6.8030005@FreeBSD.org> <20140531143509.GA60572@troutmask.apl.washington.edu> <5389EE92.5070105@FreeBSD.org> <20140531150936.GA60696@troutmask.apl.washington.edu> In-Reply-To: <20140531150936.GA60696@troutmask.apl.washington.edu> X-Enigmail-Version: 1.6 Content-Type: multipart/mixed; boundary="------------020801090603070503020609" Cc: freebsd-ports@freebsd.org, mjl@luckie.org.nz X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 31 May 2014 15:34:19 -0000 This is a multi-part message in MIME format. --------------020801090603070503020609 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit On 05/31/14 17:09, Steve Kargl wrote: > On Sat, May 31, 2014 at 05:00:34PM +0200, Guido Falsi wrote: >> On 05/31/14 16:35, Steve Kargl wrote: >>> On Sat, May 31, 2014 at 03:31:34PM +0200, Guido Falsi wrote: >>>> On 05/31/14 02:08, Steve Kargl wrote: >>>>> Can someone please revert r354029 for graphics/xfig? >>>>> This revision breaks the ability to install the port. >>>>> >>>>> cd /usr/ports/graphics/xfig >>>>> svn merge -r 354029:340725 . >>>>> >>>> >>>> Hi, >>>> >>>> I did commit the revision you mention. I just tested the port and it >>>> installs fine. >>> >>> Not on my system, which is an up-to-date freebsd-current. >>> >> >> After some digging I found out the port is broken when the DOCS option >> is disabled. >> >> I'm cooking a fix I'll get to you soon. >> >> Please always report if using custom options when reporting a problem. >> > > I forgot I had the DOCS option unset as it was unset ages ago > and updates have always worked. The question is "why are changes > to a port committed without proper testing?" Yes, "proper > testing" should include testing of the effects of (un)setting > individual Makefile options. > I'm going to fix it. I'm attaching a patch and CCing the maintainer to get his approval. Can you test this patch too and report back? Thanks! Please understand we all make mistakes from time to time. Also remember that this is a volunteer project and such a thorough testing as the one you are asking for isn't always possible with the resources at hand. for mjl@luckie.org.nz: A problem has been reported in the xfig port when trying to install it with the DOCS option disabled. I've created a patch which fixes the problem, can you approve it? Thanks in advance. -- Guido Falsi --------------020801090603070503020609 Content-Type: text/x-patch; name="xfig.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="xfig.diff" Index: Makefile =================================================================== --- Makefile (revision 355988) +++ Makefile (working copy) @@ -24,6 +24,7 @@ USE_XORG= ice sm x11 xaw xext xi xmu xpm xt USE_CSTD= gnu89 CFLAGS+= -Wno-return-type +INSTALL_TARGET= install install.libs MAKE_ENV+= DOCSDIR=${DOCSDIR} CHMOD=${CHMOD} TAR=${TAR} MAKE_ARGS+= INSTALLFLAGS="${COPY}" \ @@ -38,7 +39,7 @@ .include .if ${PORT_OPTIONS:MDOCS} -INSTALL_TARGET= install install.libs install.html +INSTALL_TARGET+= install.html .endif .if ! ${PORT_OPTIONS:MI18N} || ! ${PORT_OPTIONS:MDOCS} --------------020801090603070503020609--