Date: Mon, 23 Jan 2006 17:10:19 -0600 From: Paul Schmehl <pauls@utdallas.edu> To: Thierry Thomas <thierry@FreeBSD.org>, FreeBSD Ports <freebsd-ports@freebsd.org> Subject: Re: Patching problem Message-ID: <9EA65C1B3E1C301CBDBF8061@utd59514.utdallas.edu> In-Reply-To: <20060123224155.GK57747@graf.pompo.net> References: <D7B25AB7C48991A6558EB00E@utd59514.utdallas.edu> <20060123224155.GK57747@graf.pompo.net>
next in thread | previous in thread | raw e-mail | index | archive | help
--On Monday, January 23, 2006 23:41:55 +0100 Thierry Thomas=20 <thierry@FreeBSD.org> wrote: > Le Lun 23 jan 06 =E0 23:08:54 +0100, Paul Schmehl <pauls@utdallas.edu> > =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/
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?9EA65C1B3E1C301CBDBF8061>