couriertcpd: remove couriertls

The code does not compile against current version of neither openssl
nor gnutls.

Bump PKGREVISION.

4 files changed, 7 insertions, 29 deletions

diff --git a/net/couriertcpd/DESCR b/net/couriertcpd/DESCR
index 58bf6359140..2dfe4fb35bc 100644
--- a/net/couriertcpd/DESCR
+++ b/net/couriertcpd/DESCR
@@ -1,3 +1,2 @@
 This package contains couriertcpd(1), used to daemonize the Courier
-services, and couriertls(1) used to provide TLS support for the Courier
-services that support them.
+services.
diff --git a/net/couriertcpd/Makefile b/net/couriertcpd/Makefile
index bd567541857..b4ee0d64a2e 100644
--- a/net/couriertcpd/Makefile
+++ b/net/couriertcpd/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2019/07/20 22:46:37 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2019/09/26 11:36:55 wiz Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGNAME=	${DISTNAME:S/-/tcpd-/}
-PKGREVISION=	8
+PKGREVISION=	9
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=courier/}
 EXTRACT_SUFX=	.tar.bz2
@@ -13,7 +13,7 @@ HOMEPAGE=	http://www.courier-mta.org/
 
 CONFLICTS=	courier-imap<4.1.1
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake pkg-config
 USE_LANGUAGES=		c c++
 
 .include "options.mk"
@@ -55,11 +55,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/tcpd/couriertcpd.html			\
 		${DESTDIR}${DOCDIR}/couriertcpd.html
 
-	${INSTALL_PROGRAM} ${WRKSRC}/tcpd/couriertls			\
-		${DESTDIR}${PREFIX}/bin/couriertls
-	${INSTALL_MAN} ${WRKSRC}/tcpd/couriertls.1			\
-		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/couriertls.1
-	${INSTALL_DATA} ${WRKSRC}/tcpd/couriertls.html			\
-		${DESTDIR}${DOCDIR}/couriertls.html
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/couriertcpd/PLIST b/net/couriertcpd/PLIST
index fda4fa6bfac..ad5babf02f6 100644
--- a/net/couriertcpd/PLIST
+++ b/net/couriertcpd/PLIST
@@ -1,7 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/06/26 05:21:17 jlam Exp $
-bin/couriertls
+@comment $NetBSD: PLIST,v 1.3 2019/09/26 11:36:55 wiz Exp $
 man/man1/couriertcpd.1
-man/man1/couriertls.1
 sbin/couriertcpd
 share/doc/courier/couriertcpd.html
-share/doc/courier/couriertls.html
diff --git a/net/couriertcpd/options.mk b/net/couriertcpd/options.mk
index ef3a99cf9e8..f2298ae1601 100644
--- a/net/couriertcpd/options.mk
+++ b/net/couriertcpd/options.mk
@@ -1,23 +1,12 @@
-# $NetBSD: options.mk,v 1.2 2008/02/21 15:50:29 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2019/09/26 11:36:55 wiz Exp $
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.couriertcpd
-PKG_SUPPORTED_OPTIONS=		courier-gnutls inet6
+PKG_SUPPORTED_OPTIONS=		inet6
 PKG_SUGGESTED_OPTIONS=		inet6
 
 .include "../../mk/bsd.options.mk"
 
 ###
-### Support using GNU TLS as the underlying crypto library; otherwise,
-### default to using OpenSSL.
-###
-.if !empty(PKG_OPTIONS:Mcourier-gnutls)
-.  include "../../security/gnutls/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-gnutls
-.else
-.  include "../../security/openssl/buildlink3.mk"
-.endif
-
-###
 ### IPv6 support.
 ###
 .if !empty(PKG_OPTIONS:Minet6)