Date: Tue, 19 Jul 2005 14:41:18 -0500 From: Paul Schmehl <pauls@utdallas.edu> To: ports@freebsd.org Subject: Re: patch problem with new port Message-ID: <BBA53A48F789D9D6B42826FC@utd59514.utdallas.edu> In-Reply-To: <20050719213342.H27439@x12.dk> References: <7EA964ADB15B6C3F4E521554@utd59514.utdallas.edu> <790a9fff05071911356839b928@mail.gmail.com> <0D43EF3184DD2596A0C6F74E@utd59514.utdallas.edu> <20050719213342.H27439@x12.dk>
next in thread | previous in thread | raw e-mail | index | archive | help
--On Tuesday, July 19, 2005 21:34:25 +0200 Soeren Straarup <xride@x12.dk>
wrote:
> On Tue, 19 Jul 2005, Paul Schmehl wrote:
>
>> --On Tuesday, July 19, 2005 13:35:07 -0500 Scot Hetzel
>> <swhetzel@gmail.com> wrote:
>>>
>>> If you are repeatedly changing only one line in several files, you
>>> could use the ${REPLACE_CMD} variable to replace the line.
>>>
>>> USE_REINPLACE= yes
>>> WISH_CMD?= wish8.3
>>>
>>> post-patch:
>>> .for file in file1 file2
>>> @${REINPLACE_CMD} -e 's:exec wish:exec ${WISH_CMD}:g'
>>> ${WRKDIR}/$file .endfor
>>>
>>> You can use this trick even if you are patching one of the files, as
>>> the post-patch occurs after your patch is applied.
>>>
>> This looks like the way to go, but I can't seem to get it to work. The
>> file I want to patch is in ${WRKSRC}/client/, and here's the portion of
>> the Makefile that uses REINPLACE.
>>
>> NO_BUILD= yes
>> USE_REINPLACE= yes
>> WISH_CMD?= wish8.3
>> WRKSRC= ${WRKDIR}/sguil-${PORTVERSION}
>>
>> PORTDOCS= CHANGES INSTALL INSTALL.openbsd LICENSE.QPL \
>> OPENSSL.README TODO USAGE sguildb.dia
>>
>> .include <bsd.port.pre.mk>
>>
>> post-patch:
>> .for f in sguil.tk
>> @${REINPLACE_CMD} -e 's:exec wish:exec ${WISH_CMD}:'
>> ${WRKDIR}/client/${f}
> ^^^
> Should that not be SRC?
>
That's just it. I've tried ${WRKDIR}, ${WRKDIR}/${f}, ${WRKSRC}/${f},
${WRKSRC}/client/${f}, and several other combos with no joy.
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?BBA53A48F789D9D6B42826FC>