CVS commit: pkgsrc

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sun Mar 17 11:24:35 UTC 2024

Modified Files:
        pkgsrc/mk/defaults: options.description
        pkgsrc/net/openconnect: Makefile
Added Files:
        pkgsrc/net/openconnect: options.mk

Log Message:
openconnect: Add a libproxy option.

Compared to the rest of openconncet, it has some heavy C++ requirements.


To generate a diff of this commit:
cvs rdiff -u -r1.720 -r1.721 pkgsrc/mk/defaults/options.description
cvs rdiff -u -r1.33 -r1.34 pkgsrc/net/openconnect/Makefile
cvs rdiff -u -r0 -r1.1 pkgsrc/net/openconnect/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/mk/defaults/options.description
diff -u pkgsrc/mk/defaults/options.description:1.720 pkgsrc/mk/defaults/options.description:1.721
--- pkgsrc/mk/defaults/options.description:1.720        Mon Mar 11 12:44:13 2024
+++ pkgsrc/mk/defaults/options.description      Sun Mar 17 11:24:34 2024
@@ -520,6 +520,7 @@ libofa                      Enable Open Fingerprint Archite
 libofx                 Enable OFX support.
 libotf                 Enable libotf support.
 libpcap                        Enable libpcap support.
+libproxy               Use libproxy for automatic proxy configuration.
 libraw                 Enable libraw support.
 libsmi                 Use libsmi for SMI MIB support.
 libsoup                        Use libsoup for SOUP support.

Index: pkgsrc/net/openconnect/Makefile
diff -u pkgsrc/net/openconnect/Makefile:1.33 pkgsrc/net/openconnect/Makefile:1.34
--- pkgsrc/net/openconnect/Makefile:1.33        Wed Nov  8 13:20:33 2023
+++ pkgsrc/net/openconnect/Makefile     Sun Mar 17 11:24:34 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2023/11/08 13:20:33 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2024/03/17 11:24:34 nia Exp $
 
 DISTNAME=              openconnect-9.12
 PKGREVISION=           4
@@ -25,9 +25,9 @@ CONFIGURE_ARGS+=      --disable-docs
 REPLACE_PYTHON=                trojans/*.py
 REPLACE_BASH=          trojans/*.sh
 
+.include "options.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../lang/python/application.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
-.include "../../www/libproxy/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Added files:

Index: pkgsrc/net/openconnect/options.mk
diff -u /dev/null pkgsrc/net/openconnect/options.mk:1.1
--- /dev/null   Sun Mar 17 11:24:35 2024
+++ pkgsrc/net/openconnect/options.mk   Sun Mar 17 11:24:34 2024
@@ -0,0 +1,19 @@
+# $NetBSD: options.mk,v 1.1 2024/03/17 11:24:34 nia Exp $
+
+PKG_OPTIONS_VAR=               PKG_OPTIONS.openconnect
+PKG_SUPPORTED_OPTIONS=         libproxy
+
+.include "../../mk/compiler.mk"
+
+# libproxy requires C++11 support.
+.if !${CC_VERSION:Mgcc-[1-3].*} && !${CC_VERSION:Mgcc-4.[0-6].*}
+PKG_SUGGESTED_OPTIONS=         libproxy
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Mlibproxy)
+.  include "../../www/libproxy/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=       --without-libproxy
+.endif