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 /net | |
| 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 'net')
| -rw-r--r-- | net/couriertcpd/Makefile | 5 | ||||
| -rw-r--r-- | net/couriertcpd/options.mk | 17 |
2 files changed, 10 insertions, 12 deletions
diff --git a/net/couriertcpd/Makefile b/net/couriertcpd/Makefile index 64b6a68eee5..b235ea76c5d 100644 --- a/net/couriertcpd/Makefile +++ b/net/couriertcpd/Makefile @@ -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 @@ INSTALLATION_DIRS= bin sbin ${PKGMANDIR}/man1 ${DOCDIR} REQD_DIRS= ${DOCDIR} MAKE_DIRS+= ${COURIER_STATEDIR} -.include "../../security/openssl/buildlink3.mk" - do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tcpd/couriertcpd \ ${DESTDIR}${PREFIX}/sbin/couriertcpd diff --git a/net/couriertcpd/options.mk b/net/couriertcpd/options.mk index af5b5b50d06..ef3a99cf9e8 100644 --- a/net/couriertcpd/options.mk +++ b/net/couriertcpd/options.mk @@ -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 ### |