diff options
| author | jlam <jlam> | 2008-02-21 15:50:29 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2008-02-21 15:50:29 +0000 |
| commit | 1479c0ba27e3455d25d38c0226a50af4c0530e93 (patch) | |
| tree | 3f0eaaa9b435f850c53c7bf2c6b8383d8f44843a /mail/courier-imap | |
| parent | 0a2cea6ec5d883b21517443bc5577da7c3a2b6b7 (diff) | |
| download | pkgsrc-1479c0ba27e3455d25d38c0226a50af4c0530e93.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-imap')
| -rw-r--r-- | mail/courier-imap/Makefile | 3 | ||||
| -rw-r--r-- | mail/courier-imap/options.mk | 37 |
2 files changed, 19 insertions, 21 deletions
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index a8f8770fc27..a8657747bf5 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -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 --git a/mail/courier-imap/options.mk b/mail/courier-imap/options.mk index cc7ff8176fd..64aee0743a5 100644 --- a/mail/courier-imap/options.mk +++ b/mail/courier-imap/options.mk @@ -1,37 +1,34 @@ -# $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" ### -### 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. +### Support using the GNU TLS tools for creating certificates; otherwise +### default to using OpenSSL. ### -.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) + +.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" .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. +### +.if !empty(PKG_OPTIONS:Mfam) +. include "../../mk/fam.buildlink3.mk" +.endif |