[pkgsrc/trunk]: pkgsrc/mail/qpopper Add drac, kerberos, and qpopper-servermod...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f019cf9a13ef
branches:  trunk
changeset: 495057:f019cf9a13ef
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Wed Jun 01 21:12:28 2005 +0000

description:
Add drac, kerberos, and qpopper-servermode options.
Replace PAM with pam.

diffstat:

 mail/qpopper/Makefile.common |  20 +-------------------
 mail/qpopper/options.mk      |  21 ++++++++++++++++++---
 2 files changed, 19 insertions(+), 22 deletions(-)

diffs (72 lines):

diff -r 347b13f7f713 -r f019cf9a13ef mail/qpopper/Makefile.common
--- a/mail/qpopper/Makefile.common      Wed Jun 01 21:09:02 2005 +0000
+++ b/mail/qpopper/Makefile.common      Wed Jun 01 21:12:28 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2005/06/01 20:55:16 adrianp Exp $
+# $NetBSD: Makefile.common,v 1.16 2005/06/01 21:12:28 wiz Exp $
 
 QPOPPER_MASTER_SITES=  ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \
                        http://core.ring.gr.jp/archives/net/mail/qpopper/
@@ -31,22 +31,4 @@
 CONFIGURE_ARGS+=       --enable-spool-dir=${QPOPPER_SPOOL_DIR}
 .endif
 
-.if defined(KERBEROS)
-PKG_USE_KERBEROS=      # defined
-CONFIGURE_ARGS+=       --enable-kerberos
-.endif
-
-BUILD_DEFS+=           QPOPPER_SERVERMODE USE_INET6
-
-.if defined(QPOPPER_SERVERMODE)
-CONFIGURE_ARGS+=       --enable-servermode
-.endif
-
-.if defined(QPOPPER_USE_DRAC) && !empty(QPOPPER_USE_DRAC:M[Yy][Ee][Ss])
-.include "../../mail/drac/buildlink3.mk"
-CONFIGURE_ARGS+=       --with-drac=${BUILDLINK_PREFIX.drac}
-.endif
-
-BUILD_DEFS+=           QPOPPER_USE_DRAC
-
 LIBS+=                 ${LDFLAGS}
diff -r 347b13f7f713 -r f019cf9a13ef mail/qpopper/options.mk
--- a/mail/qpopper/options.mk   Wed Jun 01 21:09:02 2005 +0000
+++ b/mail/qpopper/options.mk   Wed Jun 01 21:12:28 2005 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: options.mk,v 1.6 2005/06/01 21:09:02 adrianp Exp $
+# $NetBSD: options.mk,v 1.7 2005/06/01 21:12:28 wiz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.qpopper
-PKG_SUPPORTED_OPTIONS= inet6 ssl PAM
+PKG_SUPPORTED_OPTIONS= drac inet6 kerberos pam qpopper-servermode ssl
 PKG_SUGGESTED_OPTIONS= ssl
+PKG_OPTIONS_LEGACY_VARS+=      QPOPPER_SERVERMODE:qpopper-servermode
 
 .include "../../mk/bsd.options.mk"
 
@@ -20,9 +21,23 @@
 .endif
 
 # Please note this is currently experimental for platforms that support it
-.if !empty(PKG_OPTIONS:MPAM)
+.if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=        --with-pam
 .else
 CONFIGURE_ARGS+=       --without-pam
 .endif
+
+.if !empty(PKG_OPTIONS:Mkerberos)
+PKG_USE_KERBEROS=      # defined
+CONFIGURE_ARGS+=       --enable-kerberos
+.endif
+
+.if !empty(PKG_OPTIONS:Mqpopper-servermode)
+CONFIGURE_ARGS+=       --enable-servermode
+.endif
+
+.if !empty(PKG_OPTIONS:Mdrac)
+.include "../../mail/drac/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-drac=${BUILDLINK_PREFIX.drac}
+.endif