summaryrefslogtreecommitdiff
path: root/mail/qpopper
diff options
context:
space:
mode:
authorwiz <wiz>2005-06-01 21:12:28 +0000
committerwiz <wiz>2005-06-01 21:12:28 +0000
commit3ef148dceb1732be0b518d359ced8aa59893b91d (patch)
tree6790e990c04bf7f5d60f50c2eed0cbb4f5b4fce2 /mail/qpopper
parent6152218d80df3907d2d7e27e170c96a08f5fa21c (diff)
downloadpkgsrc-3ef148dceb1732be0b518d359ced8aa59893b91d.tar.gz
Add drac, kerberos, and qpopper-servermode options.
Replace PAM with pam.
Diffstat (limited to 'mail/qpopper')
-rw-r--r--mail/qpopper/Makefile.common20
-rw-r--r--mail/qpopper/options.mk21
2 files changed, 19 insertions, 22 deletions
diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common
index c27be92e551..413331e2cf6 100644
--- a/mail/qpopper/Makefile.common
+++ b/mail/qpopper/Makefile.common
@@ -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 @@ PATCH_DIST_STRIP= -p1
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 --git a/mail/qpopper/options.mk b/mail/qpopper/options.mk
index 7a56d3a67cd..0e7c354b394 100644
--- a/mail/qpopper/options.mk
+++ b/mail/qpopper/options.mk
@@ -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 @@ CONFIGURE_ARGS+= --disable-ipv6
.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