diff options
| author | jlam <jlam@pkgsrc.org> | 2008-02-21 15:50:29 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-02-21 15:50:29 +0000 |
| commit | 2e3f8a1cf711202acb7c65bc285785eb71cc9a4c (patch) | |
| tree | 3f0eaaa9b435f850c53c7bf2c6b8383d8f44843a /mail/courier-mta | |
| parent | 4c718bd4e0341e207e1e0bc15191ee6b0495d187 (diff) | |
| download | pkgsrc-2e3f8a1cf711202acb7c65bc285785eb71cc9a4c.tar.gz | |
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 (limited to 'mail/courier-mta')
| -rw-r--r-- | mail/courier-mta/Makefile | 3 | ||||
| -rw-r--r-- | mail/courier-mta/options.mk | 24 |
2 files changed, 12 insertions, 15 deletions
diff --git a/mail/courier-mta/Makefile b/mail/courier-mta/Makefile index 26ffd9b937b..c9b65a4075e 100644 --- a/mail/courier-mta/Makefile +++ b/mail/courier-mta/Makefile @@ -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 --git a/mail/courier-mta/options.mk b/mail/courier-mta/options.mk index b3a96bdb1a3..825ba940900 100644 --- a/mail/courier-mta/options.mk +++ b/mail/courier-mta/options.mk @@ -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 @@ CONFIGURE_ARGS+= --without-ldapaliasd ###################################################################### ### -### 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" |