From owner-freebsd-ports@FreeBSD.ORG Tue Jan 24 04:10:14 2006 Return-Path: X-Original-To: freebsd-ports@freebsd.org Delivered-To: freebsd-ports@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id CD38116A41F for ; Tue, 24 Jan 2006 04:10:14 +0000 (GMT) (envelope-from pauls@utdallas.edu) Received: from mail.stovebolt.com (mail.stovebolt.com [66.221.101.248]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8922943D49 for ; Tue, 24 Jan 2006 04:10:14 +0000 (GMT) (envelope-from pauls@utdallas.edu) Received: from [192.168.2.101] (adsl-66-140-61-148.dsl.rcsntx.swbell.net [66.140.61.148]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.stovebolt.com (Postfix) with ESMTP id BA26C114327 for ; Mon, 23 Jan 2006 22:10:08 -0600 (CST) Date: Mon, 23 Jan 2006 22:09:18 -0600 From: Paul Schmehl To: FreeBSD Ports Message-ID: <76943F76D033D25B87CB5749@Paul-Schmehls-Computer.local> In-Reply-To: References: X-Mailer: Mulberry/4.0.0 (Mac OS X) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline Subject: Re: Patching problem X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Paul Schmehl List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 24 Jan 2006 04:10:14 -0000 --On January 23, 2006 4:08:54 PM -0600 Paul Schmehl wrote: > I'm working on a slave port that applies some patches that are not needed > in the master port. > > Three of the files being patched are op_sguil.c, op_sguil.h and > op_plugbase.c. Those files exists in WRKDIR/src/output-plugins when the > tarball is extracted. How should I name these patches so that they will > be applied? > > I tried patch-src-output-plugins-op_*, but that fails. (I'm sure it's > because of the conflict in naming the output-plugins dir with a dash.) > > What's the workaround for this? > Just for the record, here's how I solved the problem. 1) Edited the patchfiles per Scott Hetzel's pointer (dumb mistake on my part) 2) Edited the Makefile to add PATCHDIR= files, so when the port builds it uses the patch files from its own FILESDIR but uses the RC script and pkg-message.in files from the master port's FILESDIR > Paul Schmehl (pauls@utdallas.edu) > Adjunct Information Security Officer > University of Texas at Dallas > AVIEN Founding Member > http://www.utdallas.edu/ir/security/ > _______________________________________________ > freebsd-ports@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/freebsd-ports > To unsubscribe, send any mail to "freebsd-ports-unsubscribe@freebsd.org" Paul Schmehl (pauls@utdallas.edu) Adjunct Information Security Officer University of Texas at Dallas AVIEN Founding Member http://www.utdallas.edu/