[pkgsrc/trunk]: pkgsrc/mail/imap-uw Use package options framework to (de)acti...

[tron <tron%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/bf7fb0295b32
branches:  trunk
changeset: 497711:bf7fb0295b32
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Aug 03 09:43:58 2005 +0000

description:
Use package options framework to (de)active Kerberos support.

diffstat:

 mail/imap-uw/Makefile |  29 +++++++++++++++--------------
 1 files changed, 15 insertions(+), 14 deletions(-)

diffs (55 lines):

diff -r fd3c8d532246 -r bf7fb0295b32 mail/imap-uw/Makefile
--- a/mail/imap-uw/Makefile     Wed Aug 03 08:28:07 2005 +0000
+++ b/mail/imap-uw/Makefile     Wed Aug 03 09:43:58 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2005/08/01 20:34:31 tron Exp $
+# $NetBSD: Makefile,v 1.97 2005/08/03 09:43:58 tron Exp $
 #
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
@@ -39,24 +39,19 @@
 BUILD_TARGET=  sgi
 .  endif
 .else
-# USE_KERBEROS=no is explicitly set on NetBSD 1.x due to interoperability
+BUILD_TARGET=  neb
+
+# Kerberos is explicitly not enabled on NetBSD 1.x due to interoperability
 # issues with later versions of OpenSSL (e.g. 0.9.7)
-BUILD_TARGET=  neb
-.  if !empty(MACHINE_PLATFORM:MNetBSD-1.*)
-USE_KERBEROS=  no
-.  endif
-.  if defined(USE_KERBEROS) && ${USE_KERBEROS} != "no"
-PKG_USE_KERBEROS=      # defined
-BUILD_TARGET+= EXTRAAUTHENTICATORS="gss"
-.    if !empty(MACHINE_PLATFORM:MNetBSD-1.5*)
-# NetBSD-1.5 didn't have "des_new_random_key" in libcrypto
-MAKE_ENV+=     GSS_EXTRA_LDFLAGS="-ldes"
-.    endif
+.  if empty(MACHINE_PLATFORM:MNetBSD-1.*)
+PKG_SUPPORTED_OPTIONS+=                kerberos
+
+PKG_OPTIONS_LEGACY_VARS+=      USE_KERBEROS:kerberos
 .  endif
 .endif
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.imap-uw
-PKG_SUPPORTED_OPTIONS=         inet6
+PKG_SUPPORTED_OPTIONS+=        inet6
 
 .include "../../mk/bsd.options.mk"
 
@@ -66,6 +61,12 @@
 MAKE_ENV+=     IP=6
 .endif
 
+.if !empty(PKG_OPTIONS:Mkerberos)
+PKG_USE_KERBEROS=      # defined
+
+BUILD_TARGET+= EXTRAAUTHENTICATORS="gss"
+.endif
+
 BUILD_DEFS+=   IMAP_UW_CCLIENT_MBOX_FMT IMAP_UW_NO_CLEARTEXT IMAP_UW_USE_WHOSON
 CCLIENT_INCS=  c-client.h env.h env_unix.h flocksim.h flstring.h       \
                fs.h ftl.h imap4r1.h linkage.c linkage.h mail.h misc.h  \