pkg/29604: obsolete USE_SASL2 is broken

[Lloyd Parkes <lloyd%must-have-coffee.gen.nz@localhost>]

>Number:         29604
>Category:       pkg
>Synopsis:       USE_SASL2 adds sasl to PKG_DEFAULT_OPTIONS
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Sat Mar 05 22:48:00 +0000 2005
>Originator:     Lloyd Parkes
>Release:        NetBSD 2.0
>Organization:
Must Have Coffee
>Environment:
System: NetBSD ophidian.must-have-coffee.gen.nz 2.0 NetBSD 2.0 (GENERIC) #6: 
Mon Dec 13 23:12:09 NZDT 2004 
lloyd%ophidian.must-have-coffee.gen.nz@localhost:/data/src-2.0/sys/arch/i386/compile/obj/GENERIC
 i386
Architecture: i386
Machine: i386
>Description:

If you have USE_SASL2 defined in mk.conf, then pkgsrc tries to compile
in sasl instead of sasl2. If you set PKG_DEFAULT_OPTIONS to contain
sasl2 as well as defining USE_SASL2, then PKG_OPTIONS ends up
containing sasl2 and sasl which is all bad. Stuff won't build and it
isn't clear how to make 'sasl' go away.

The problem is that lines 63-65 of pkgsrc/mk/defaults/obsolete.mk are:

.if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
PKG_DEFAULT_OPTIONS+=   sasl
.endif

The last token on the middle line should be sasl2.

>How-To-Repeat:

Put USE_SASL2=YES in /etc/mk/conf

>Fix:

Change lines 63-65 on pkgsrc/mk/default/obsolete.mk to read

.if defined(USE_SASL2) && !empty(USE_SASL2:M[yY][eE][sS])
PKG_DEFAULT_OPTIONS+=   sasl2
.endif

i.e. change the sasl to sasl2.