summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
Diffstat (limited to 'mail')
-rw-r--r--mail/qpopper/Makefile5
-rw-r--r--mail/qpopper/Makefile.common10
-rw-r--r--mail/qpopper/options.mk21
3 files changed, 29 insertions, 7 deletions
diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile
index ac59ec27b8d..8da947499d9 100644
--- a/mail/qpopper/Makefile
+++ b/mail/qpopper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2004/12/17 07:35:56 taca Exp $
+# $NetBSD: Makefile,v 1.45 2004/12/18 03:59:30 grant Exp $
#
DISTNAME= qpopper${VERSION}
@@ -19,7 +19,7 @@ COMMENT= Qualcomm's POP server for Eudora
USE_BUILDLINK3= yes
USE_PKGINSTALL= yes
-CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
+
RCD_SCRIPTS= qpopper
MESSAGE_SUBST+= RCD_SCRIPTS=${RCD_SCRIPTS} \
RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR}
@@ -38,5 +38,4 @@ post-install:
${INSTALL_DATA} ${WRKSRC}/samples/qpopper.config \
${PREFIX}/share/examples
-.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common
index b55a4568cdb..2ab3af8953b 100644
--- a/mail/qpopper/Makefile.common
+++ b/mail/qpopper/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2004/12/18 02:44:12 grant Exp $
+# $NetBSD: Makefile.common,v 1.13 2004/12/18 03:59:30 grant Exp $
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --libexecdir=${LOCALBASE}/libexec \
@@ -11,6 +11,7 @@ CONFIGURE_ARGS+= --libexecdir=${LOCALBASE}/libexec \
VERSION= 4.0.5
.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
QPOPPER_USER?= pop
QPOPPER_GROUP?= mail
@@ -18,6 +19,10 @@ QPOPPER_FAC?= LOCAL1
QPOPPER_APOP_AUTH?= ${PKG_SYSCONFDIR}/apop.auth
DB_SUFFIX?= db
+.if defined(QPOPPER_SPOOL_DIR)
+CONFIGURE_ARGS+= --enable-spool-dir=${QPOPPER_SPOOL_DIR}
+.endif
+
.if defined(KERBEROS)
PKG_USE_KERBEROS= # defined
CONFIGURE_ARGS+= --enable-kerberos
@@ -28,9 +33,6 @@ BUILD_DEFS+= QPOPPER_SERVERMODE USE_INET6
.if defined(QPOPPER_SERVERMODE)
CONFIGURE_ARGS+= --enable-servermode
.endif
-.if defined(USE_INET6) && ${USE_INET6} == YES
-CONFIGURE_ENV+= O_DEFS="${O_DEFS}" CFLAGS="-DINET6"
-.endif
.if defined(QPOPPER_USE_DRAC) && !empty(QPOPPER_USE_DRAC:M[Yy][Ee][Ss])
.include "../../mail/drac/buildlink3.mk"
diff --git a/mail/qpopper/options.mk b/mail/qpopper/options.mk
new file mode 100644
index 00000000000..51cfdfc954b
--- /dev/null
+++ b/mail/qpopper/options.mk
@@ -0,0 +1,21 @@
+# $NetBSD: options.mk,v 1.1 2004/12/18 03:59:30 grant Exp $
+
+PKG_OPTIONS_VAR= PKG_OPTIONS.qpopper
+PKG_SUPPORTED_OPTIONS= inet6 ssl
+
+.if !defined(PKG_OPTIONS.qpopper)
+PKG_DEFAULT_OPTIONS+= inet6 ssl
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mssl)
+. include "../../security/openssl/buildlink3.mk"
+CONFIGURE_ARGS+= --with-openssl=${SSLBASE}
+.else
+CONFIGURE_ARGS+= --without-ssl
+.endif
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ENV+= O_DEFS="${O_DEFS}" CFLAGS="-DINET6"
+.endif