Subject: Re: CVS commit: pkgsrc/mail/fetchmail
To: None <frueauf@netbsd.org, pkgsrc-changes@NetBSD.org>
From: Dieter Baron <dillo@danbala.tuwien.ac.at>
List: pkgsrc-changes
Date: 05/30/2005 16:17:09 
In article <20050530140217.7E4402DA27@cvs.netbsd.org> Thorsten wrote:

: Module Name:    pkgsrc
: Committed By:   frueauf
: Date:           Mon May 30 14:02:17 UTC 2005

: Modified Files:
:         pkgsrc/mail/fetchmail: options.mk

: Log Message:
: Avoid that "kerberos" appears more than once in PKG_OPTIONS.
: Change suggested by Jukka Salmi.

-.if !empty(PKG_OPTIONS:Mgssapi)
+.if !empty(PKG_OPTIONS:Mgssapi) && empty(PKG_OPTIONS:Mkerberos)
 PKG_OPTIONS+=          kerberos
 CONFIGURE_ARGS+=       --with-gssapi=${KRB5BASE}
 .else
 CONFIGURE_ARGS+=       --with-gssapi=no
 fi

  I think this is wrong.  If PKG_OPTIONS contains both gssapi and
kerberos, gssapi will now be disabled.

  Instead of changing PKG_OPTIONS, I would enable kerberos support if
kerberos or gssapi is selected:

-.if !empty(PKG_OPTIONS:kerberos)
+.if !empty(PKG_OPTIONS:kerberos) || !empty(PKG_OPTIONS:gssapi)
 PKG_USE_KERBEROS=	#defined
 CONFIGURE_ARGS+=	-with-kerberos5=${KRB5BASE}

					yours,
					dillo