From owner-freebsd-emulation@FreeBSD.ORG  Sat May 24 20:01:32 2008
Return-Path: <owner-freebsd-emulation@FreeBSD.ORG>
Delivered-To: emulation@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id E820C106567E;
	Sat, 24 May 2008 20:01:32 +0000 (UTC) (envelope-from bsam@ipt.ru)
Received: from services.ipt.ru (services.ipt.ru [194.62.233.110])
	by mx1.freebsd.org (Postfix) with ESMTP id B49FF8FC12;
	Sat, 24 May 2008 20:01:32 +0000 (UTC) (envelope-from bsam@ipt.ru)
Received: from [85.173.16.45] (helo=localhost.my.domain)
	by services.ipt.ru with esmtpa (Exim 4.54 (FreeBSD))
	id 1Jzzvm-000Guv-KR; Sun, 25 May 2008 00:01:30 +0400
To: "Ganael LAPLANCHE" <ganael.laplanche@martymac.com>
References: <20080524073145.M76509@martymac.com> <07923414@ipt.ru>
	<20080524150909.M12444@martymac.com>
	<20080524160433.M17651@martymac.com> <15111974@ipt.ru>
	<20080524193545.0167e8a4@deskjail>
	<18488.23459.464314.727238@gromit.timing.com>
	<20080524193744.M30720@martymac.com>
From: Boris Samorodov <bsam@ipt.ru>
Date: Sun, 25 May 2008 00:00:57 +0400
In-Reply-To: <20080524193744.M30720@martymac.com> (Ganael LAPLANCHE's message
	of "Sat\, 24 May 2008 21\:44\:12 +0200 \(CEST\)")
Message-ID: <49030486@ipt.ru>
User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/22.2 (berkeley-unix)
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Cc: ports@freebsd.org, Alexander Leidinger <Alexander@Leidinger.net>,
	emulation@freebsd.org
Subject: Re: USE_LINUX_RPM and PORTDOCS
X-BeenThere: freebsd-emulation@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: Development of Emulators of other operating systems
	<freebsd-emulation.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-emulation>, 
	<mailto:freebsd-emulation-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-emulation>
List-Post: <mailto:freebsd-emulation@freebsd.org>
List-Help: <mailto:freebsd-emulation-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-emulation>, 
	<mailto:freebsd-emulation-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 24 May 2008 20:01:33 -0000

On Sat, 24 May 2008 21:44:12 +0200 (CEST) Ganael LAPLANCHE wrote:
> On Sat, 24 May 2008 12:17:07 -0600, John E Hein wrote

> > Why not pre- or post-patch - part of a stage that implies a
> > modification of unpacked distfile(s)?

> You are right, pre-patch may be better than post-extract in this way. I think
> pre-patch is better than post-patch because one does not want to patch files
> that won't be used in any way. It would also allow to avoid errors, not working
> on files that will be deleted :p

> I have successfully tested this patch against bsd.linux-rpm.mk with
> archivers/linux-par2cmdline, graphics/linux-png and
> /usr/ports/graphics/linux-png10 :

> 8<-----------------------
> --- bsd.linux-rpm.mk.orig       2008-05-24 20:46:04.931665759 +0200
> +++ bsd.linux-rpm.mk    2008-05-24 21:32:51.721449935 +0200
> @@ -105,6 +105,20 @@
>  BRANDELF_DIRS?=
>  BRANDELF_FILES?=

> +# For ports that define PORTDOCS, be sure not to install
> +# documentation if NOPORTDOCS is defined
> +.if defined(PORTDOCS) && defined(NOPORTDOCS)
> +pre-patch: linux-rpm-clean-portdocs
> +
> +.  if !target(linux-rpm-clean-portdocs)
> +linux-rpm-clean-portdocs:
> +.for x in ${PORTDOCS}
> +       @${RM} -f ${WRKDIR}/${DOCSDIR_REL}/${x}
> +.endfor
> +       @${RMDIR} ${WRKDIR}/${DOCSDIR_REL}
> +.  endif
> +.endif
> +
>  .  if defined(AUTOMATIC_PLIST)

>  .    if ${USE_LINUX} == "fc4" || ${USE_LINUX:L} == "yes"
> 8<-----------------------

> Any opinion welcome ;-)

Seems that we found a consensus here ;-)
The patch is OK to me, thanks!


-- 
WBR, bsam