Date: Sun, 25 May 2008 00:00:57 +0400 From: Boris Samorodov <bsam@ipt.ru> To: "Ganael LAPLANCHE" <ganael.laplanche@martymac.com> Cc: ports@freebsd.org, Alexander Leidinger <Alexander@Leidinger.net>, emulation@freebsd.org, John E Hein <jhein@timing.com> Subject: Re: USE_LINUX_RPM and PORTDOCS Message-ID: <49030486@ipt.ru> In-Reply-To: <20080524193744.M30720@martymac.com> (Ganael LAPLANCHE's message of "Sat\, 24 May 2008 21\:44\:12 %2B0200 \(CEST\)") 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>
next in thread | previous in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?49030486>