From owner-freebsd-ports@FreeBSD.ORG Sat May 24 19:44:13 2008 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 90CC51065682; Sat, 24 May 2008 19:44:13 +0000 (UTC) (envelope-from ganael.laplanche@martymac.com) Received: from data.galacsys.net (data.galacsys.net [217.24.81.1]) by mx1.freebsd.org (Postfix) with ESMTP id 6A8AC8FC0C; Sat, 24 May 2008 19:44:13 +0000 (UTC) (envelope-from ganael.laplanche@martymac.com) Received: from martymac.com (webmail.galacsys.net [217.24.81.215]) by data.galacsys.net (Postfix) with ESMTP id 5434B16B9F3; Sat, 24 May 2008 21:44:12 +0200 (CEST) From: "Ganael LAPLANCHE" To: John E Hein , Alexander Leidinger X-Openwebmail-Date: Sat, 24 May 2008 21:44:12 +0100 Message-Id: <20080524193744.M30720@martymac.com> In-Reply-To: <18488.23459.464314.727238@gromit.timing.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> X-Mailer: Open WebMail 2.01 20030425 X-OriginatingIP: 82.246.139.206 (ganael.laplanche@martymac.com) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-15 Date: Sat, 24 May 2008 21:44:12 +0200 (CEST) Cc: Boris Samorodov , ports@freebsd.org, Ganael LAPLANCHE , emulation@freebsd.org Subject: Re: USE_LINUX_RPM and PORTDOCS X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 May 2008 19:44:13 -0000 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 ;-) Ganaël LAPLANCHE ganael.laplanche@martymac.com http://www.martymac.com