CVS commit: pkgsrc/net/s6-networking

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

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Sun Nov 22 11:33:22 UTC 2020

Modified Files:
        pkgsrc/net/s6-networking: Makefile PLIST
Added Files:
        pkgsrc/net/s6-networking: options.mk

Log Message:
Add --enable-absolute-paths, as these programs need to invoke each other
while often running in freshly cleared environments. Bump PKGREVISION.

While here, make TLS (via BearSSL) optional, still on by default.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/net/s6-networking/Makefile \
    pkgsrc/net/s6-networking/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/net/s6-networking/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/s6-networking/Makefile
diff -u pkgsrc/net/s6-networking/Makefile:1.1 pkgsrc/net/s6-networking/Makefile:1.2
--- pkgsrc/net/s6-networking/Makefile:1.1       Thu Nov 19 20:12:54 2020
+++ pkgsrc/net/s6-networking/Makefile   Sun Nov 22 11:33:22 2020
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2020/11/19 20:12:54 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2020/11/22 11:33:22 schmonz Exp $
 
 DISTNAME=      s6-networking-2.3.2.0
+PKGREVISION=   1
 CATEGORIES=    net
 MASTER_SITES=  ${HOMEPAGE}
 
@@ -13,13 +14,14 @@ USE_TOOLS+=         gmake
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 CONFIGURE_ARGS+=       --with-sysdeps=${PREFIX}/lib/skalibs/sysdeps
-CONFIGURE_ARGS+=       --enable-ssl=bearssl
+CONFIGURE_ARGS+=       --enable-absolute-paths
+
+.include "options.mk"
 
 BUILDLINK_API_DEPENDS.skalibs+=skalibs>=2.9.3.0
 .include "../../devel/skalibs/buildlink3.mk"
 BUILDLINK_API_DEPENDS.execline+=execline>=2.6.1.1
 .include "../../lang/execline/buildlink3.mk"
 .include "../../net/s6-dns/buildlink3.mk"
-.include "../../security/bearssl/buildlink3.mk"
 .include "../../sysutils/s6/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/net/s6-networking/PLIST
diff -u pkgsrc/net/s6-networking/PLIST:1.1 pkgsrc/net/s6-networking/PLIST:1.2
--- pkgsrc/net/s6-networking/PLIST:1.1  Thu Nov 19 20:12:54 2020
+++ pkgsrc/net/s6-networking/PLIST      Sun Nov 22 11:33:22 2020
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2020/11/19 20:12:54 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.2 2020/11/22 11:33:22 schmonz Exp $
 bin/minidentd
 bin/s6-clockadd
 bin/s6-clockview
@@ -16,14 +16,14 @@ bin/s6-tcpserver4d
 bin/s6-tcpserver6
 bin/s6-tcpserver6-socketbinder
 bin/s6-tcpserver6d
-bin/s6-tlsc
-bin/s6-tlsclient
-bin/s6-tlsd
-bin/s6-tlsserver
+${PLIST.tls}bin/s6-tlsc
+${PLIST.tls}bin/s6-tlsclient
+${PLIST.tls}bin/s6-tlsd
+${PLIST.tls}bin/s6-tlsserver
 include/s6-networking/config.h
 include/s6-networking/ident.h
 include/s6-networking/s6net.h
 include/s6-networking/sbearssl.h
 include/s6-networking/stls.h
 lib/s6-networking/libs6net.a
-lib/s6-networking/libsbearssl.a
+${PLIST.tls}lib/s6-networking/libsbearssl.a

Added files:

Index: pkgsrc/net/s6-networking/options.mk
diff -u /dev/null pkgsrc/net/s6-networking/options.mk:1.1
--- /dev/null   Sun Nov 22 11:33:22 2020
+++ pkgsrc/net/s6-networking/options.mk Sun Nov 22 11:33:22 2020
@@ -0,0 +1,14 @@
+# $NetBSD: options.mk,v 1.1 2020/11/22 11:33:22 schmonz Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.s6-networking
+PKG_SUPPORTED_OPTIONS+=        tls
+PKG_SUGGESTED_OPTIONS+=        tls
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS=            tls
+.if !empty(PKG_OPTIONS:Mtls)
+PLIST.tls=             yes
+.  include "../../security/bearssl/buildlink3.mk"
+CONFIGURE_ARGS+=       --enable-ssl=bearssl
+.endif