From owner-freebsd-ports@FreeBSD.ORG Mon Jan 23 23:10:20 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 9DA4616A41F; Mon, 23 Jan 2006 23:10:20 +0000 (GMT) (envelope-from pauls@utdallas.edu) Received: from smtp1.utdallas.edu (smtp1.utdallas.edu [129.110.10.12]) by mx1.FreeBSD.org (Postfix) with ESMTP id 38EA343D48; Mon, 23 Jan 2006 23:10:20 +0000 (GMT) (envelope-from pauls@utdallas.edu) Received: from utd59514.utdallas.edu (utd59514.utdallas.edu [129.110.3.28]) by smtp1.utdallas.edu (Postfix) with ESMTP id C9D3538916D; Mon, 23 Jan 2006 17:10:19 -0600 (CST) Date: Mon, 23 Jan 2006 17:10:19 -0600 From: Paul Schmehl To: Thierry Thomas , FreeBSD Ports Message-ID: <9EA65C1B3E1C301CBDBF8061@utd59514.utdallas.edu> In-Reply-To: <20060123224155.GK57747@graf.pompo.net> References: <20060123224155.GK57747@graf.pompo.net> X-Mailer: Mulberry/3.1.6 (Linux/x86) MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1; format=flowed Content-Transfer-Encoding: quoted-printable Content-Disposition: inline Cc: Subject: Re: Patching problem 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: Mon, 23 Jan 2006 23:10:20 -0000 --On Monday, January 23, 2006 23:41:55 +0100 Thierry Thomas=20 wrote: > Le Lun 23 jan 06 =E0 23:08:54 +0100, Paul Schmehl > =E9crivait=A0: >> 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? > > You can set different FILESDIR, e.g. the port cad/astk-serveur. > I don't understand how this helps me. I need to patch configure.in as well = as the three files in src/output-plugins. configure.in is patching just=20 fine, but the other three are not. I tried using the syntax in=20 astk-serveur (patch-dir::subdir::file), but that didn't work either. Here's the Makefile: # New ports collection makefile for: barnyard-sguil6 # Date created: 23 Jan 2006 # Whom: pauls # # $FreeBSD$ # PORTNAME=3D barnyard-sguil6 PORTVERSION=3D 0.2.0 CATEGORIES=3D security MAINTAINER=3D pauls@utdallas.edu COMMENT=3D Patches barnyard for sguil6 MASTERDIR=3D ${.CURDIR}/../barnyard FILESDIR=3D files .if defined(WITH_MYSQL) USE_MYSQL=3D yes CONFIGURE_ARGS+=3D --enable-mysql .endif .if defined(WITH_POSTGRESQL) USE_PGSQL=3D yes CONFIGURE_ARGS+=3D --enable-postgres .endif .include "${MASTERDIR}/Makefile" And here's the contents of FILESDIR: barnyard.sh patch-configure.in patch-src::output-plugins::op_plugbase.c patch-src::output-plugins::op_sguil.c patch-src::output-plugins::op_sguil.h What exactly do I need to do to overcome this problem? Paul Schmehl (pauls@utdallas.edu) Adjunct Information Security Officer University of Texas at Dallas AVIEN Founding Member http://www.utdallas.edu/ir/security/