pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc Get rid of the "gnutls" and "ssl" options and replace ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/5e38c577a0ae
branches: trunk
changeset: 538938:5e38c577a0ae
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Feb 21 15:50:29 2008 +0000
description:
Get rid of the "gnutls" and "ssl" options and replace with a
"courier-gnutls" option/toggle that allows using GNU TLS instead of
defaulting to OpenSSL.
Bump the PKGREVISION of couriertcpd, courier-imap, and courier-mta to 1.
diffstat:
mail/courier-imap/Makefile | 3 +-
mail/courier-imap/options.mk | 45 ++++++++++++++++++++-----------------------
mail/courier-mta/Makefile | 3 +-
mail/courier-mta/options.mk | 24 +++++++++-------------
net/couriertcpd/Makefile | 5 +--
net/couriertcpd/options.mk | 17 +++++++--------
6 files changed, 45 insertions(+), 52 deletions(-)
diffs (190 lines):
diff -r 5417e95711a3 -r 5e38c577a0ae mail/courier-imap/Makefile
--- a/mail/courier-imap/Makefile Thu Feb 21 14:40:43 2008 +0000
+++ b/mail/courier-imap/Makefile Thu Feb 21 15:50:29 2008 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.67 2008/02/19 18:45:14 jlam Exp $
+# $NetBSD: Makefile,v 1.68 2008/02/21 15:50:29 jlam Exp $
DISTNAME= courier-imap-4.3.0
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
diff -r 5417e95711a3 -r 5e38c577a0ae mail/courier-imap/options.mk
--- a/mail/courier-imap/options.mk Thu Feb 21 14:40:43 2008 +0000
+++ b/mail/courier-imap/options.mk Thu Feb 21 15:50:29 2008 +0000
@@ -1,14 +1,30 @@
-# $NetBSD: options.mk,v 1.1 2008/02/19 18:45:14 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2008/02/21 15:50:29 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.courier-imap
-PKG_SUPPORTED_OPTIONS= fam
-PKG_OPTIONS_OPTIONAL_GROUPS= tls
-PKG_OPTIONS_GROUP.tls= gnutls ssl
-PKG_SUGGESTED_OPTIONS= ssl
+PKG_SUPPORTED_OPTIONS= courier-gnutls fam
+PKG_SUGGESTED_OPTIONS= # empty
.include "../../mk/bsd.options.mk"
###
+### Support using the GNU TLS tools for creating certificates; otherwise
+### default to using OpenSSL.
+###
+SUBST_CLASSES+= tls
+SUBST_FILES.tls= imap/mkimapdcert.in imap/mkpop3dcert.in
+SUBST_STAGE.tls= pre-configure
+COURIER_CERTTOOL= ${PREFIX}/bin/certtool
+COURIER_OPENSSL= ${PREFIX}/bin/openssl
+
+.if !empty(PKG_OPTIONS:Mcourier-gnutls)
+SUBST_SED.tls= -e "s|@ssllib@|gnutls|g"
+.else
+USE_TOOLS+= openssl:run
+COURIER_OPENSSL= ${TOOLS_OPENSSL}
+SUBST_SED.tls= -e "s|@ssllib@|openssl|g"
+.endif
+
+###
### File Alteration Monitor support. This allows multiple imapd or pop3d
### processes to be notified of changes to the underlying maildirs instead
### of needing to poll the maildirs.
@@ -16,22 +32,3 @@
.if !empty(PKG_OPTIONS:Mfam)
. include "../../mk/fam.buildlink3.mk"
.endif
-
-###
-### Default to using the OpenSSL or GNUTLS tools for creating certificates.
-###
-.if !empty(PKG_OPTIONS:Mgnutls) || !empty(PKG_OPTIONS:Mssl)
-SUBST_CLASSES+= tls
-SUBST_FILES.tls= imap/mkimapdcert.in imap/mkpop3dcert.in
-SUBST_STAGE.tls= pre-configure
-COURIER_CERTTOOL= ${PREFIX}/bin/certtool
-COURIER_OPENSSL= ${PREFIX}/bin/openssl
-.endif
-.if !empty(PKG_OPTIONS:Mgnutls)
-SUBST_SED.tls= -e "s|@ssllib@|gnutls|g"
-.endif
-.if !empty(PKG_OPTIONS:Mssl)
-USE_TOOLS+= openssl:run
-COURIER_OPENSSL= ${TOOLS_OPENSSL}
-SUBST_SED.tls= -e "s|@ssllib@|openssl|g"
-.endif
diff -r 5417e95711a3 -r 5e38c577a0ae mail/courier-mta/Makefile
--- a/mail/courier-mta/Makefile Thu Feb 21 14:40:43 2008 +0000
+++ b/mail/courier-mta/Makefile Thu Feb 21 15:50:29 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.24 2008/02/19 18:45:23 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2008/02/21 15:50:29 jlam Exp $
DISTNAME= courier-${COURIER_VERSION}
PKGNAME= ${DISTNAME:S/-/-mta-/}
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
diff -r 5417e95711a3 -r 5e38c577a0ae mail/courier-mta/options.mk
--- a/mail/courier-mta/options.mk Thu Feb 21 14:40:43 2008 +0000
+++ b/mail/courier-mta/options.mk Thu Feb 21 15:50:29 2008 +0000
@@ -1,14 +1,11 @@
-# $NetBSD: options.mk,v 1.9 2008/02/19 18:45:23 jlam Exp $
+# $NetBSD: options.mk,v 1.10 2008/02/21 15:50:29 jlam Exp $
# Global and legacy options
-PKG_OPTIONS_VAR= PKG_OPTIONS.courier-mta
-PKG_SUPPORTED_OPTIONS= courier-dsn courier-esmtp courier-local \
- courier-uucp inet6 ldap
-PKG_OPTIONS_OPTIONAL_GROUPS= tls
-PKG_OPTIONS_GROUP.tls= gnutls ssl
-PKG_SUGGESTED_OPTIONS= courier-dsn courier-esmtp courier-local \
- inet6 ssl
+PKG_OPTIONS_VAR= PKG_OPTIONS.courier-mta
+PKG_SUPPORTED_OPTIONS= courier-dsn courier-esmtp courier-gnutls \
+ courier-local courier-uucp inet6 ldap
+PKG_SUGGESTED_OPTIONS= courier-dsn courier-esmtp courier-local inet6
.include "../../mk/bsd.options.mk"
@@ -146,19 +143,18 @@
######################################################################
###
-### Default to using the OpenSSL or GNUTLS tools for creating certificates.
+### Support using the GNU TLS tools for creating certificates; otherwise,
+### default to using OpenSSL.
###
-.if !empty(PKG_OPTIONS:Mgnutls) || !empty(PKG_OPTIONS:Mssl)
SUBST_CLASSES+= tls
SUBST_FILES.tls= courier/module.esmtp/mkesmtpdcert.in
SUBST_STAGE.tls= pre-configure
COURIER_CERTTOOL= ${PREFIX}/bin/certtool
COURIER_OPENSSL= ${PREFIX}/bin/openssl
-.endif
-.if !empty(PKG_OPTIONS:Mgnutls)
+
+.if !empty(PKG_OPTIONS:Mcourier-gnutls)
SUBST_SED.tls= -e "s|@ssllib@|gnutls|g"
-.endif
-.if !empty(PKG_OPTIONS:Mssl)
+.else
USE_TOOLS+= openssl:run
COURIER_OPENSSL= ${TOOLS_OPENSSL}
SUBST_SED.tls= -e "s|@ssllib@|openssl|g"
diff -r 5417e95711a3 -r 5e38c577a0ae net/couriertcpd/Makefile
--- a/net/couriertcpd/Makefile Thu Feb 21 14:40:43 2008 +0000
+++ b/net/couriertcpd/Makefile Thu Feb 21 15:50:29 2008 +0000
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.14 2008/02/19 18:45:41 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2008/02/21 15:50:29 jlam Exp $
DISTNAME= courier-${COURIER_VERSION}
PKGNAME= ${DISTNAME:S/-/tcpd-/}
+PKGREVISION= 1
CATEGORIES= net
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=courier/}
EXTRACT_SUFX= .tar.bz2
@@ -47,8 +48,6 @@
REQD_DIRS= ${DOCDIR}
MAKE_DIRS+= ${COURIER_STATEDIR}
-.include "../../security/openssl/buildlink3.mk"
-
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/tcpd/couriertcpd \
${DESTDIR}${PREFIX}/sbin/couriertcpd
diff -r 5417e95711a3 -r 5e38c577a0ae net/couriertcpd/options.mk
--- a/net/couriertcpd/options.mk Thu Feb 21 14:40:43 2008 +0000
+++ b/net/couriertcpd/options.mk Thu Feb 21 15:50:29 2008 +0000
@@ -1,21 +1,20 @@
-# $NetBSD: options.mk,v 1.1 2008/02/19 18:45:41 jlam Exp $
+# $NetBSD: options.mk,v 1.2 2008/02/21 15:50:29 jlam Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.couriertcpd
-PKG_SUPPORTED_OPTIONS= inet6
-PKG_OPTIONS_REQUIRED_GROUPS= tls
-PKG_OPTIONS_GROUP.tls= gnutls ssl
-PKG_SUGGESTED_OPTIONS= inet6 ssl
+PKG_SUPPORTED_OPTIONS= courier-gnutls inet6
+PKG_SUGGESTED_OPTIONS= inet6
.include "../../mk/bsd.options.mk"
###
-### Build with OpenSSL or GNU TLS as the underlying crypto library.
+### Support using GNU TLS as the underlying crypto library; otherwise,
+### default to using OpenSSL.
###
-.if !empty(PKG_OPTIONS:Mssl)
-. include "../../security/openssl/buildlink3.mk"
-.elif !empty(PKG_OPTIONS:Mgnutls)
+.if !empty(PKG_OPTIONS:Mcourier-gnutls)
. include "../../security/gnutls/buildlink3.mk"
CONFIGURE_ARGS+= --with-gnutls
+.else
+. include "../../security/openssl/buildlink3.mk"
.endif
###
Home |
Main Index |
Thread Index |
Old Index