Re: Error in audio/speex/options.mk

["Thomas Mueller" <mueller6724%bellsouth.net@localhost>]

Apparently there is still a bug in audio/speex/options.mk , lines 30, 33 and 36
look screwy, and look screwy to "make" too:


# $NetBSD: options.mk,v 1.2 2011/02/24 23:02:32 wiz Exp $
#

PKG_OPTIONS_VAR=        PKG_OPTIONS.speex
PKG_SUPPORTED_OPTIONS=  fftw
PKG_OPTIONS_GROUP.i386= simd
###
### XXX TODO: add logic for enabling arm, fixed point, and alternate fft
###     implementations, etc.
###
.include "../../mk/bsd.fast.prefs.mk"

.if defined(PKG_OPTIONS_GROUP.${MACHINE_GNU_ARCH})
PKG_OPTIONS_OPTIONAL_GROUPS+=   ${MACHINE_GNU_ARCH}
.endif

.include "../../mk/bsd.options.mk"
###
### XXX The configure script seems to detect sse based upon user-supplied
###     CFLAGS.  If this is indeed OK, then we should not explicitly
###     disable it, as people might be using devel/cpuflags, etc.
###
.if !empty(PKG_OPTIONS:Msimd)
CONFIGURE_ARGS+=        --enable-sse
#.else
#CONFIGURE_ARGS+=       --disable-sse
.endif

.if !empty(PKG_OPTIONS:Mfftw)
<<<<<<< options.mk
#CONFIGURE_ARGS+=       --with-fft=fftw3
.  include "../../math/fftw/buildlink3.mk"
=======
CONFIGURE_ARGS+=        --with-fft=gpl-fftw3
.  include "../../math/fftwf/buildlink3.mk"
>>>>>>> 1.2
.endif
(end)

Even putting # at the beginning of these lines was not enough, and I deleted 
the 
offending lines, beginning with <<<<<<< , ======= , and >>>>>>> .

Then pkg_rolling-replace ran OK, and I succeeded in building emulators/dosbox .

I excluded, or tried to exclude, audio/speex from pkg_rolling-replace, figuring
I had already fixed it even before updating pkgsrc.

Tom