cvs commit: ports/graphics/sng Makefile pkg-descr

Alexey Dokuchaev danfe at FreeBSD.org
Fri Jun 15 18:39:58 UTC 2007


On Fri, Jun 15, 2007 at 10:30:34PM +0400, Andrew Pantyukhin wrote:
> On 6/15/07, Alexey Dokuchaev <danfe at freebsd.org> wrote:
> >danfe       2007-06-15 18:00:11 UTC
> >
> >  FreeBSD ports repository
> >
> >  Modified files:
> >    graphics/sng         Makefile pkg-descr
> >  Log:
> >  - Fix the build with recent GCC [1]
> >  - Correctly assign RUN_DEPENDS
> >  - Minor indentation nit in Makefile
> >  - Kill EOL space in pkg-descr
> >
> >  Reported by:    pointyhat (logs) [1]
> >
> >  Revision  Changes    Path
> >  1.13      +3 -2      ports/graphics/sng/Makefile
> >  1.2       +1 -1      ports/graphics/sng/pkg-descr
> >_______________________________________________
> > pre-patch:
> >        @${REINPLACE_CMD} -e 's|-static||g' ${WRKSRC}/Makefile.in
> >+       @${REINPLACE_CMD} -e '33,34s|^static ||' ${WRKSRC}/sngd.c
> 
> I'd warn you against these numbered sed substitutions.
> For one, they're hard to maintain. They also can cause
> silent damage to sources which is very hard to track.

Well, since (luckily for us!) our REINPLACE_CMD implementation leaves
.bak-files, it is really not that hard to run diff(1) over them.

> 
> In this very case, it use this:
> '/^static png_/s|^static ||'

I'd buy your reasoning here.  It's just that I love sed(1)+conciseness too
freaking much :-) and want to avoid adding trivial patch files.

I'll try to think more about my regexps next time, thanks!

./danfe


More information about the cvs-all mailing list