pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mail/qpopper move ssl and ipv6 options to new options....
details: https://anonhg.NetBSD.org/pkgsrc/rev/aecd5c16899e
branches: trunk
changeset: 485643:aecd5c16899e
user: grant <grant%pkgsrc.org@localhost>
date: Sat Dec 18 03:59:30 2004 +0000
description:
move ssl and ipv6 options to new options.mk framework (no change to
existing defaults) and while here, add QPOPPER_SPOOL_DIR to define spool
directory (no change to existing default).
diffstat:
mail/qpopper/Makefile | 5 ++---
mail/qpopper/Makefile.common | 10 ++++++----
mail/qpopper/options.mk | 21 +++++++++++++++++++++
3 files changed, 29 insertions(+), 7 deletions(-)
diffs (87 lines):
diff -r 50d793882314 -r aecd5c16899e mail/qpopper/Makefile
--- a/mail/qpopper/Makefile Sat Dec 18 03:54:54 2004 +0000
+++ b/mail/qpopper/Makefile Sat Dec 18 03:59:30 2004 +0000
@@ -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 @@
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 @@
${INSTALL_DATA} ${WRKSRC}/samples/qpopper.config \
${PREFIX}/share/examples
-.include "../../security/openssl/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 50d793882314 -r aecd5c16899e mail/qpopper/Makefile.common
--- a/mail/qpopper/Makefile.common Sat Dec 18 03:54:54 2004 +0000
+++ b/mail/qpopper/Makefile.common Sat Dec 18 03:59:30 2004 +0000
@@ -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 @@
VERSION= 4.0.5
.include "../../mk/bsd.prefs.mk"
+.include "options.mk"
QPOPPER_USER?= pop
QPOPPER_GROUP?= mail
@@ -18,6 +19,10 @@
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 @@
.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 -r 50d793882314 -r aecd5c16899e mail/qpopper/options.mk
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/mail/qpopper/options.mk Sat Dec 18 03:59:30 2004 +0000
@@ -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
Home |
Main Index |
Thread Index |
Old Index