CVS commit: pkgsrc/net/couriertcpd

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Thu Sep 26 11:36:55 UTC 2019

Modified Files:
        pkgsrc/net/couriertcpd: DESCR Makefile PLIST options.mk

Log Message:
couriertcpd: remove couriertls

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

Bump PKGREVISION.


To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.2 pkgsrc/net/couriertcpd/DESCR
cvs rdiff -u -r1.29 -r1.30 pkgsrc/net/couriertcpd/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/couriertcpd/PLIST \
    pkgsrc/net/couriertcpd/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/couriertcpd/DESCR
diff -u pkgsrc/net/couriertcpd/DESCR:1.1.1.1 pkgsrc/net/couriertcpd/DESCR:1.2
--- pkgsrc/net/couriertcpd/DESCR:1.1.1.1        Fri Jun  9 22:11:03 2006
+++ pkgsrc/net/couriertcpd/DESCR        Thu Sep 26 11:36:55 2019
@@ -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.

Index: pkgsrc/net/couriertcpd/Makefile
diff -u pkgsrc/net/couriertcpd/Makefile:1.29 pkgsrc/net/couriertcpd/Makefile:1.30
--- pkgsrc/net/couriertcpd/Makefile:1.29        Sat Jul 20 22:46:37 2019
+++ pkgsrc/net/couriertcpd/Makefile     Thu Sep 26 11:36:55 2019
@@ -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"

Index: pkgsrc/net/couriertcpd/PLIST
diff -u pkgsrc/net/couriertcpd/PLIST:1.2 pkgsrc/net/couriertcpd/PLIST:1.3
--- pkgsrc/net/couriertcpd/PLIST:1.2    Mon Jun 26 05:21:17 2006
+++ pkgsrc/net/couriertcpd/PLIST        Thu Sep 26 11:36:55 2019
@@ -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
Index: pkgsrc/net/couriertcpd/options.mk
diff -u pkgsrc/net/couriertcpd/options.mk:1.2 pkgsrc/net/couriertcpd/options.mk:1.3
--- pkgsrc/net/couriertcpd/options.mk:1.2       Thu Feb 21 15:50:29 2008
+++ pkgsrc/net/couriertcpd/options.mk   Thu Sep 26 11:36:55 2019
@@ -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)