From owner-freebsd-ports@FreeBSD.ORG Wed Jun 11 18:33:11 2014 Return-Path: Delivered-To: freebsd-ports@freebsd.org 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 A4070D7D for ; Wed, 11 Jun 2014 18:33:11 +0000 (UTC) Received: from ziemba.us (osmtp.ziemba.us [208.106.105.149]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 6A1782630 for ; Wed, 11 Jun 2014 18:33:10 +0000 (UTC) Received: from hairball.ziemba.us (localhost.ziemba.us [127.0.0.1]) by hairball.ziemba.us (8.14.6/8.14.6) with ESMTP id s5BI4k0N092867 for ; Wed, 11 Jun 2014 11:04:46 -0700 (PDT) (envelope-from pz-freebsd-ports@ziemba.us) Received: (from mailnull@localhost) by hairball.ziemba.us (8.14.6/8.14.6/Submit) id s5BI4kf1092866 for freebsd-ports@freebsd.org; Wed, 11 Jun 2014 11:04:46 -0700 (PDT) (envelope-from pz-freebsd-ports@ziemba.us) X-Authentication-Warning: hairball.ziemba.us: mailnull set sender to pz-freebsd-ports@ziemba.us using -f Received: (from news@localhost) by usenet.ziemba.us (8.14.5/8.14.5/Submit) id s5BI4WI2019658 for treehouse-mail-freebsd-ports@hairball.ziemba.us; Wed, 11 Jun 2014 11:04:32 -0700 (PDT) (envelope-from news) From: "G. Paul Ziemba" To: freebsd-ports@freebsd.org Subject: Re: poudriere and local patches to ports Date: Wed, 11 Jun 2014 18:04:32 +0000 (UTC) Message-id: References: <5C78F5B6-643F-4ABA-9FC2-CBED9C6C56B2@langille.org> Reply-to: paul+usenet@w6yx.stanford.edu Errors-to: "G. Paul Ziemba" 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: Wed, 11 Jun 2014 18:33:11 -0000 dan@langille.org (Dan Langille) writes: >I have a local patch = >(https://dan.langille.org/wp-content/uploads/2014/04/nagios-default-commen= >t-cmd-cgi.c.diff_.txt) which I wish to apply to net-mgmt/nagios before = >it is compiled by poudriere). >I have looked at ports-mgmt/portshaker but that seems to be related to = >merging rather than patching. >Any suggestions? Disclaimer: I set up my poudriere environment almost a year ago, so there could be new poudriere features to address this issue that I'm not aware of. I maintain a tree of local patches matching the structure of the ports tree (e.g., .///). This is not critical but just helps me keep track of things. In the /usr/local/etc/poudriere.d/*-make.conf files, I call out local patches this way: LOCALPATCHDIR=/usr/ports/LocalPatches .if ${.CURDIR:M*/graphics/xpdf} EXTRA_PATCHES=${LOCALPATCHDIR}/graphics/xpdf/patch-xpdf-3.03-rotate-cmd .endif [Aside: I'm not completely happy with using EXTRA_PATCHES because sometimes it collides with use by the port itself. I wish there were an additional LOCAL_PATCHES feature in the ports makefiles specifically for this purpose, but EXTRA_PATCHES is adequate for me at the moment. I haven't studied that issue in a couple of years, so maybe there is a new ports feature addressing it.] Before I run "poudriere bulk", I rsync my local patch tree to the ports tree that will be used by poudriere so that it shows up at /usr/ports/LocalPatches in the jail. -- G. Paul Ziemba FreeBSD unix: 11:01AM up 136 days, 12 hrs, 22 users, load averages: 1.45, 1.34, 1.37