CVS commit: pkgsrc/net/ucspi-ssl

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed Jun  7 15:11:53 UTC 2023

Modified Files:
        pkgsrc/net/ucspi-ssl: Makefile options.mk

Log Message:
ucspi-ssl: remove non-meaningful 'inet6' option. Bump PKGREVISION.

The dependency was to ensure the runtime presence of tcprules(1),
described at HOMEPAGE thus:

    Optional but indispensible: ucspi-tcp6 to build the cdb to control
    incoming connections for sslserver using tcprules coming with the
    ucspi-tcp6 package. Older versions of ucspi-tcp can be used as well,
    but don't provide neither IPv4 CIDR nor IPv6 capabilities. The
    generated cdb however, is binary compatible among all versions.

Depending on either of net/ucspi-tcp{,6} here was complicating the
dependency graph in exchange for... still getting in the way of other
packages installing what they need (e.g. mail/bincimap). Trust the
sysadmin to notice if they don't already have tcprules and decide what
to install in that case.


To generate a diff of this commit:
cvs rdiff -u -r1.59 -r1.60 pkgsrc/net/ucspi-ssl/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/net/ucspi-ssl/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/ucspi-ssl/Makefile
diff -u pkgsrc/net/ucspi-ssl/Makefile:1.59 pkgsrc/net/ucspi-ssl/Makefile:1.60
--- pkgsrc/net/ucspi-ssl/Makefile:1.59  Mon May 29 11:52:59 2023
+++ pkgsrc/net/ucspi-ssl/Makefile       Wed Jun  7 15:11:53 2023
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.59 2023/05/29 11:52:59 schmonz Exp $
+# $NetBSD: Makefile,v 1.60 2023/06/07 15:11:53 schmonz Exp $
 #
 
 DISTNAME=              ucspi-ssl-0.12.7
 PKGNAME=               ${DISTNAME:S/-0./-0.999./}
+PKGREVISION=           1
 CATEGORIES=            net
 MASTER_SITES=          https://www.fehcom.de/ipnet/ucspi-ssl/
 EXTRACT_SUFX=          .tgz

Index: pkgsrc/net/ucspi-ssl/options.mk
diff -u pkgsrc/net/ucspi-ssl/options.mk:1.11 pkgsrc/net/ucspi-ssl/options.mk:1.12
--- pkgsrc/net/ucspi-ssl/options.mk:1.11        Wed Nov 18 15:12:39 2020
+++ pkgsrc/net/ucspi-ssl/options.mk     Wed Jun  7 15:11:53 2023
@@ -1,16 +1,10 @@
-# $NetBSD: options.mk,v 1.11 2020/11/18 15:12:39 schmonz Exp $
+# $NetBSD: options.mk,v 1.12 2023/06/07 15:11:53 schmonz Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ucspi-ssl
-PKG_SUPPORTED_OPTIONS+=        inet6 perl
+PKG_SUPPORTED_OPTIONS+=        perl
 
 .include "../../mk/bsd.options.mk"
 
-.if !empty(PKG_OPTIONS:Minet6)
-DEPENDS+=              ucspi-tcp6>=1.10.7nb1:../../net/ucspi-tcp6
-.else
-DEPENDS+=              {ucspi-tcp6>=1.10.7nb1,ucspi-tcp-[0-9]*}:../../net/ucspi-tcp
-.endif
-
 PLIST_VARS+=           perl
 .PHONY: do-install-sslperl
 .if !empty(PKG_OPTIONS:Mperl)