[pkgsrc/trunk]: pkgsrc/net/couriertcpd couriertcpd: remove couriertls

[wiz <wiz%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/2f219eedc868
branches:  trunk
changeset: 340211:2f219eedc868
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Thu Sep 26 11:36:55 2019 +0000

description:
couriertcpd: remove couriertls

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

Bump PKGREVISION.

diffstat:

 net/couriertcpd/DESCR      |   3 +--
 net/couriertcpd/Makefile   |  13 +++----------
 net/couriertcpd/PLIST      |   5 +----
 net/couriertcpd/options.mk |  15 ++-------------
 4 files changed, 7 insertions(+), 29 deletions(-)

diffs (84 lines):

diff -r 16682f2b94b8 -r 2f219eedc868 net/couriertcpd/DESCR
--- a/net/couriertcpd/DESCR     Thu Sep 26 10:36:33 2019 +0000
+++ b/net/couriertcpd/DESCR     Thu Sep 26 11:36:55 2019 +0000
@@ -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 -r 16682f2b94b8 -r 2f219eedc868 net/couriertcpd/Makefile
--- a/net/couriertcpd/Makefile  Thu Sep 26 10:36:33 2019 +0000
+++ b/net/couriertcpd/Makefile  Thu Sep 26 11:36:55 2019 +0000
@@ -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 @@
 
 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 @@
        ${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 -r 16682f2b94b8 -r 2f219eedc868 net/couriertcpd/PLIST
--- a/net/couriertcpd/PLIST     Thu Sep 26 10:36:33 2019 +0000
+++ b/net/couriertcpd/PLIST     Thu Sep 26 11:36:55 2019 +0000
@@ -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 -r 16682f2b94b8 -r 2f219eedc868 net/couriertcpd/options.mk
--- a/net/couriertcpd/options.mk        Thu Sep 26 10:36:33 2019 +0000
+++ b/net/couriertcpd/options.mk        Thu Sep 26 11:36:55 2019 +0000
@@ -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)