CVS: cvs.openbsd.org: ports

2022-06-28 Thread Lucas Raab 
CVSROOT:/cvs
Module name:ports
Changes by: lr...@cvs.openbsd.org   2022/06/28 19:37:20

Modified files:
databases  : Makefile 

Log message:
+databases/py-influxdb_client

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Lucas Raab 
CVSROOT:/cvs
Module name:ports
Changes by: lr...@cvs.openbsd.org   2022/06/28 19:35:45

Log message:
import databases/py-influxdb_client

Python client library for the InfluxDB 1.8, 2.0+, and InfluxDB
Cloud

ok landry@, sthen@

Status:

Vendor Tag: lraab
Release Tags:   lraab_20220628

N ports/databases/py-influxdb_client/Makefile
N ports/databases/py-influxdb_client/distinfo
N ports/databases/py-influxdb_client/pkg/DESCR
N ports/databases/py-influxdb_client/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Lucas Raab 
CVSROOT:/cvs
Module name:ports
Changes by: lr...@cvs.openbsd.org   2022/06/28 15:29:47

Removed files:
sysutils/grafana/patches: patch-build_go 

Log message:
sysutils/grafana: register removal of old patch

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Lucas Raab 
CVSROOT:/cvs
Module name:ports
Changes by: lr...@cvs.openbsd.org   2022/06/28 15:23:45

Modified files:
sysutils/grafana: Makefile distinfo 
sysutils/grafana/pkg: PLIST 
sysutils/grafana/patches: patch-conf_sample_ini 
  
patch-pkg_cmd_grafana-cli_commands_commands_go 

Log message:
sysutils/grafana: update to 9.0.1

thanks to abieber@, jsing@, landry@, sthen@, and tb@ for the help!

ok landry@ and sthen@

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Claudio Jeker 
CVSROOT:/cvs
Module name:ports
Changes by: clau...@cvs.openbsd.org 2022/06/28 13:23:04

Modified files:
sysutils/prometheus: Makefile distinfo 
sysutils/prometheus/patches: patch-Makefile 
 patch-Makefile_common 
 patch-_promu_yml 
sysutils/prometheus/pkg: PLIST 
Added files:
sysutils/prometheus/patches: patch-mmap_openbsd 
 patch-scripts_compress_assets_sh 

Log message:
Update prometheus to v2.36.2

Switch the port to use the official prometheus-web-ui package to avoid
the nightmare of building the react project on the ports infrastructure.

Include a patch from an open pull request that works around the issue
of TSDB on systems with no unified buffer cache by using mmap both for
read and writes. For more info about patch-mmap_openbsd check out:
https://github.com/prometheus/prometheus/pull/9085
and
https://github.com/prometheus/prometheus/issues/8877
OK sthen@

Re: [new] databases/py-influx-client

2022-06-28 Thread Stuart Henderson 
On 2022/06/28 07:48, Lucas Raab wrote:
> On Mon, Jun 27, 2022 at 02:46:55PM +0100, Stuart Henderson wrote:
> > On 2022/06/27 08:39, Lucas Raab wrote:
> > > On Sun, Jun 26, 2022 at 06:15:47PM +0100, Stuart Henderson wrote:
> > > > On 2022/06/25 15:53, Lucas Raab wrote:
> > > > > Hello,
> > > > > 
> > > > > Here's a new port to connect to InfluxDB instances running 1.8,
> > > > > 2.0+, and Cloud. This is in contrast to the existing 
> > > > > databases/py-influxdb
> > > > > which is only for InfluxDB 1.7 or less.
> > > > > 
> > > > > Lightly tested against an InfluxDB Cloud instance running some
> > > > > queries. If anyone has 1.8/2.0 instances to try this with, that'd
> > > > > be great.
> > > > > 
> > > > > Other note: there's asynchronous support with aiohttp, but only
> > > > > with 3.8. 3.7.4 is in the tree currently and I haven't looked at
> > > > > updating it. Other optional dependencies are numpy and pandas if
> > > > > you wanted to use DataFrames for query/data import. I left those
> > > > > out of RUN_DEPENDS since they're marked as extra, but put a note
> > > > > in DESCR.
> > > > 
> > > > "Optional dependencies are:
> > > > math/py3-pandas
> > > > math/py3-numpy"
> > > > 
> > > > I prefer to use package rather than port names for this, when somebody
> > > > wants to install them they'll normally be using pkg_add and may not 
> > > > have a
> > > > ports tree available
> > > > 
> > > > It might be helpful to explain what they're useful for too?
> > > > 
> > > > Otherwise OK
> > > > 
> > > > 
> > > > 
> > > > 
> > > > 
> > > > > Other thoughts and feedback?
> > > > > 
> > > > > Thanks,
> > > > > Lucas
> > > > 
> > > > 
> > > 
> > > Something like this?:
> > > 
> > > These optional dependencies can be used to upload or query data using 
> > > pandas
> > > DataFrame objects:
> > > py3-pandas
> > > py3-numpy
> > 
> > Hmmm actually, py-pandas depends on numpy anyway (of course), and you're
> > not going to expect to do anything with pandas objects unless you have
> > pandas installed anyway...so I guess this can just be omitted
> > 
> Fair enough. Good to import after removing that part?

yep

Re: CVS: cvs.openbsd.org: ports

2022-06-28 Thread Marc Espie 
On Tue, Jun 28, 2022 at 11:01:47AM -0600, Marc Espie wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   es...@cvs.openbsd.org   2022/06/28 11:01:47
> 
> Modified files:
>   databases/iodbc: Makefile 
> 
> Log message:
> provide a bootstrap without all the gfx dependencies in order to break
> the swig loop when enabling php
> 
> 
Forgot to say this is okay sthen@ (maintainer)

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Marc Espie 
CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2022/06/28 11:01:47

Modified files:
databases/iodbc: Makefile 

Log message:
provide a bootstrap without all the gfx dependencies in order to break
the swig loop when enabling php

[update] xmenu 4.5.5

2022-06-28 Thread Guy Godfroy 

Hello,

This diff updates xmenu to 4.5.5.

The only functional change is support for mouse scrolling.

Changelog [1]

No issue on amd64.

Thanks.

[1] https://github.com/phillbush/xmenu/blob/master/CHANGELOG

Index: Makefile
===
RCS file: /cvs/ports/x11/xmenu/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile11 Mar 2022 20:18:04 -  1.3
+++ Makefile28 Jun 2022 14:09:19 -
@@ -2,7 +2,7 @@ COMMENT =   contextual menu for X11

 GH_ACCOUNT =   phillbush
 GH_PROJECT =   xmenu
-GH_TAGNAME =   v4.5.4
+GH_TAGNAME =   v4.5.5

 CATEGORIES =   x11

Index: distinfo
===
RCS file: /cvs/ports/x11/xmenu/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo10 Mar 2021 17:21:30 -  1.1.1.1
+++ distinfo28 Jun 2022 14:09:19 -
@@ -1,2 +1,2 @@
-SHA256 (xmenu-4.5.4.tar.gz) = XBHd5+WwfRq9j+M4omTuwaEhpjP2sn4rzvi6pM67gsk=
-SIZE (xmenu-4.5.4.tar.gz) = 142076
+SHA256 (xmenu-4.5.5.tar.gz) = E/2oBo04hqWQNl0Z1v+E8EwKTJpRbXlWkABRQGe053s=
+SIZE (xmenu-4.5.5.tar.gz) = 29397

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/06/28 08:13:24

Modified files:
telephony/baresip/baresip: Makefile distinfo 
telephony/baresip/baresip/patches: patch-Makefile 
   patch-mk_modules_mk 
   patch-src_config_c 
telephony/baresip/baresip/pkg: PLIST-gtk PLIST-main 

Log message:
telephony/baresip/baresip: major update to 2.4.0.

see https://github.com/baresip/baresip/blob/main/CHANGELOG.md#240---2022-06-01

i've been able to place calls to various sip2sip.info & other testing urls,
connect to an ippi.com account and receive calls from linphone.

disable gst modules in the default config since they trigger a crash
upon exit (cf https://github.com/baresip/baresip/issues/1928)

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/06/28 08:09:14

Modified files:
telephony/baresip/rem: Makefile distinfo 
telephony/baresip/rem/patches: patch-Makefile 
telephony/baresip/rem/pkg: PLIST 

Log message:
telephony/baresip/rem: update to 2.4.0.

see https://github.com/baresip/rem/blob/main/CHANGELOG.md#v240---2022-06-01

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/06/28 08:07:50

Modified files:
telephony/baresip/re: Makefile distinfo 
telephony/baresip/re/patches: patch-Makefile 
telephony/baresip/re/pkg: PLIST 
Removed files:
telephony/baresip/re/patches: patch-src_hmac_openssl_hmac_c 
  patch-src_tls_openssl_tls_h 

Log message:
telephony/baresip/re: update to 2.4.0.

see https://github.com/baresip/re/blob/main/CHANGELOG.md#v240---2022-06-01

[new] security/sops: a tool for managing secrets

2022-06-28 Thread Aaron Bieber 
Hi,

Here is a port of Mozilla's sops.

It makes handling shared encrypted data fairly trivial. It supports various
encryption methods (pgp, age, vault.. and more).

More info is available on the HOMEPAGE: https://github.com/mozilla/sops

pkg_info:
  Information for inst:sops-3.7.3
  
  Comment:
  tool for managing secrets
  
  Description:
  sops is an editor of encrypted files that supports YAML, JSON, ENV, INI and
  BINARY formats and encrypts with AWS KMS, GCP KMS, Azure Key Vault, age, and
  PGP.
  
  Maintainer: Aaron Bieber 
  
  WWW: https://github.com/mozilla/sops

OK?

Cheers,
Aaron


sops.tgz
Description: Binary data

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/06/28 07:29:52

Modified files:
devel/swig : Makefile 

Log message:
devel/swig: disable php support for now

it triggers a dependency loop as found out by ajacoutot@

www/pear -> lang/php/8.0 -> databases/freetds -> databases/iodbc,-main
-> x11/gtk+2 -> x11/gnome/icon-theme-symbolic -> x11/gnome/icon-theme ->
x11/gnome/librsvg -> lang/rust -> devel/llvm -> devel/swig -> lang/php/8.0

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/06/28 07:13:15

Modified files:
www/mozilla-firefox: Makefile distinfo 
www/mozilla-firefox/patches: 
 
patch-gfx_webrender_bindings_webrender_ffi_h 
 
patch-third_party_libwebrtc_common_audio_third_party_ooura_fft_size_128_gn_moz_build
 
 
patch-toolkit_components_downloads_DownloadIntegration_jsm 
www/mozilla-firefox/pkg: PLIST 
www/firefox-i18n: Makefile.inc distinfo 
Added files:
www/mozilla-firefox/files: pledge.utility 
   pledge.utility-audioDecoder 
   unveil.utility 
   unveil.utility-audioDecoder 
www/mozilla-firefox/patches: 
 
patch-toolkit_components_processtools_ProcInfo_linux_cpp 
 patch-toolkit_xre_glxtest_cpp 

Log message:
www/mozilla-firefox: update to 102.0.

see https://www.mozilla.org/en-US/firefox/102.0/releasenotes/
fixes https://www.mozilla.org/en-US/security/advisories/mfsa2022-24/

- add pledge/unveil configs for the new 'audioDecoder' subprocess.
- add patch from gkoehler@ implementing about:processes (#1772090)
- add patch from #1776713 to silence gfx hw lookup via libpci.so we
don't have, resulting in msgs on stderr:
Crash Annotation GraphicsCriticalError: |[0][GFX1-]: glxtest: libpci
missing (t=0.795265) [GFX1-]: glxtest: libpci missing

as a side effect, somehow improves amdgpu situation when in some
circumstances we the gpu is now properly detected instead of going
through llvmpipe/software rendering. No regression on intel.

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/06/28 07:05:21

Modified files:
www/firefox-esr: Tag: OPENBSD_7_1 Makefile distinfo 

Log message:
www/firefox-esr: MFC update to 91.11.0.

see https://www.mozilla.org/en-US/firefox/91.11.0/releasenotes/
Fixes https://www.mozilla.org/en-US/security/advisories/mfsa2022-25/

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/06/28 07:04:35

Modified files:
www/firefox-esr: Makefile distinfo 
www/firefox-esr-i18n: Makefile.inc distinfo 

Log message:
www/firefox-esr: update to 91.11.0.

see https://www.mozilla.org/en-US/firefox/91.11.0/releasenotes/
Fixes https://www.mozilla.org/en-US/security/advisories/mfsa2022-25/

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/06/28 07:02:40

Modified files:
mail/mozilla-thunderbird: Makefile 

Log message:
mail/mozilla-thunderbird: bump REVISION after mozilla.port.mk change

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/06/28 07:01:47

Modified files:
www/seamonkey  : Makefile 

Log message:
www/seamonkey: bump REVISION after mozilla.port.mk change

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/06/28 07:01:18

Modified files:
www/tor-browser/browser: Makefile 

Log message:
www/tor-browser/browser: bump REVISION after mozilla.port.mk change

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/06/28 07:00:45

Modified files:
www/mozilla: mozilla.port.mk 

Log message:
www/mozilla/mozilla.port.mk: bump nss/nspr dependencies for gecko 102

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Aaron Bieber 
CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2022/06/28 06:58:07

Modified files:
net: Makefile 

Log message:
+nheko

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Aaron Bieber 
CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2022/06/28 06:57:35

Modified files:
textproc   : Makefile 

Log message:
+nlohmann-json

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Aaron Bieber 
CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2022/06/28 06:56:53

Modified files:
devel  : Makefile 

Log message:
+coeurl, +mtxclient, +spdlog

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Aaron Bieber 
CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2022/06/28 06:52:30

Log message:
Import nheko: a desktop client for Matrix chat

Tweaks from sthen@, caspar@ and op@
OK caspar, op and landry

Status:

Vendor Tag: abieber
Release Tags:   abieber_20220628

N ports/net/nheko/Makefile
N ports/net/nheko/distinfo
N ports/net/nheko/patches/patch-src_LoginPage_h
N ports/net/nheko/patches/patch-src_main_cpp
N ports/net/nheko/patches/patch-src_notifications_Manager_h
N ports/net/nheko/pkg/DESCR
N ports/net/nheko/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Aaron Bieber 
CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2022/06/28 06:51:06

Log message:
Import nlohmann-json: a C++ JSON library

Tweaks from sthen@, caspar@ and op@
OK caspar, op and landry

Status:

Vendor Tag: abieber
Release Tags:   abieber_20220628

N ports/textproc/nlohmann-json/Makefile
N ports/textproc/nlohmann-json/distinfo
N ports/textproc/nlohmann-json/pkg/DESCR
N ports/textproc/nlohmann-json/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Stuart Henderson 
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/06/28 06:51:05

Modified files:
sysutils/dmidecode: Makefile distinfo 

Log message:
update to dmidecode-3.4, adds support for SMBIOS 3.4.0, 3.5.0, and some
HPE OEM records

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Aaron Bieber 
CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2022/06/28 06:50:20

Log message:
Import spdlog: fast C++ logging library

Tweaks from sthen@, caspar@ and op@
OK caspar, op and landry

Status:

Vendor Tag: abieber
Release Tags:   abieber_20220628

N ports/devel/spdlog/Makefile
N ports/devel/spdlog/distinfo
N ports/devel/spdlog/pkg/DESCR
N ports/devel/spdlog/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Aaron Bieber 
CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2022/06/28 06:49:25

Log message:
Import mtxclient: a client API for Matrix chat

Big thanks to tb@ for adding the needed bits to libressl!

Tweaks from sthen@, caspar@ and op@
OK caspar, op and landry

Status:

Vendor Tag: abieber
Release Tags:   abieber_20220628

N ports/devel/mtxclient/Makefile
N ports/devel/mtxclient/distinfo
N ports/devel/mtxclient/pkg/DESCR
N ports/devel/mtxclient/pkg/PLIST

No conflicts created by this import

Re: [new] databases/py-influx-client

2022-06-28 Thread Lucas Raab 
On Mon, Jun 27, 2022 at 02:46:55PM +0100, Stuart Henderson wrote:
> On 2022/06/27 08:39, Lucas Raab wrote:
> > On Sun, Jun 26, 2022 at 06:15:47PM +0100, Stuart Henderson wrote:
> > > On 2022/06/25 15:53, Lucas Raab wrote:
> > > > Hello,
> > > > 
> > > > Here's a new port to connect to InfluxDB instances running 1.8,
> > > > 2.0+, and Cloud. This is in contrast to the existing 
> > > > databases/py-influxdb
> > > > which is only for InfluxDB 1.7 or less.
> > > > 
> > > > Lightly tested against an InfluxDB Cloud instance running some
> > > > queries. If anyone has 1.8/2.0 instances to try this with, that'd
> > > > be great.
> > > > 
> > > > Other note: there's asynchronous support with aiohttp, but only
> > > > with 3.8. 3.7.4 is in the tree currently and I haven't looked at
> > > > updating it. Other optional dependencies are numpy and pandas if
> > > > you wanted to use DataFrames for query/data import. I left those
> > > > out of RUN_DEPENDS since they're marked as extra, but put a note
> > > > in DESCR.
> > > 
> > > "Optional dependencies are:
> > > math/py3-pandas
> > > math/py3-numpy"
> > > 
> > > I prefer to use package rather than port names for this, when somebody
> > > wants to install them they'll normally be using pkg_add and may not have a
> > > ports tree available
> > > 
> > > It might be helpful to explain what they're useful for too?
> > > 
> > > Otherwise OK
> > > 
> > > 
> > > 
> > > 
> > > 
> > > > Other thoughts and feedback?
> > > > 
> > > > Thanks,
> > > > Lucas
> > > 
> > > 
> > 
> > Something like this?:
> > 
> > These optional dependencies can be used to upload or query data using pandas
> > DataFrame objects:
> > py3-pandas
> > py3-numpy
> 
> Hmmm actually, py-pandas depends on numpy anyway (of course), and you're
> not going to expect to do anything with pandas objects unless you have
> pandas installed anyway...so I guess this can just be omitted
> 
Fair enough. Good to import after removing that part?

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/06/28 06:48:47

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.25.18.

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/06/28 06:48:35

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py3-boto3-1.24.18.

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Aaron Bieber 
CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2022/06/28 06:48:26

Log message:
Import coeurl: simple async wrapper around CURL for C++

Tweaks from sthen@, caspar@ and op@
OK caspar, op and landry

Status:

Vendor Tag: abieber
Release Tags:   abieber_20220628

N ports/devel/coeurl/Makefile
N ports/devel/coeurl/distinfo
N ports/devel/coeurl/pkg/DESCR
N ports/devel/coeurl/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/06/28 06:48:20

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py3-botocore-1.27.18.

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Stuart Henderson 
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/06/28 06:43:48

Modified files:
sysutils/entr  : Makefile distinfo 

Log message:
update to entr-5.2

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Stuart Henderson 
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/06/28 06:25:46

Modified files:
net/bird/2 : Makefile distinfo 

Log message:
update to bird-2.0.10

Re: scons and ccache

2022-06-28 Thread Omar Polo 
Stuart Henderson  wrote:
> On 2022/06/28 12:47, Omar Polo wrote:
> > [...]
> > --- infrastructure/mk/bsd.port.mk   19 May 2022 13:12:40 -  1.1573
> > +++ infrastructure/mk/bsd.port.mk   28 Jun 2022 10:13:18 -
> > @@ -447,7 +447,7 @@ CCACHE_ENV ?=
> >  CCACHE_DIR ?= ${WRKOBJDIR_${PKGPATH}}/.ccache
> >  MAKE_ENV += CCACHE_DIR=${CCACHE_DIR} ${CCACHE_ENV}
> >  CONFIGURE_ENV += CCACHE_DIR=${CCACHE_DIR}
> > -COMPILER_WRAPPER += ccache
> > +COMPILER_WRAPPER += env CCACHE_DIR=${CCACHE_DIR} ccache
> 
> In case somebody set another flag in CCACHE_ENV as well, it should add that,
> and I think it's worth a comment in this case:
> 
> # scons cleans the environment when calling the compiler
> COMPILER_WRAPPER += env CCACHE_DIR=${CCACHE_DIR} ${CCACHE_ENV} ccache
> 
> Otherwise OK, though I do wonder if scons.port.mk could arrange something so
> that ${MAKE_ENV} is passed through properly..

even if it was there, i completely forgot about CCACHE_ENV...  I've
tried to arrange something in scons.port.mk, but i'm still having issues
to propagate the environment variables.

scons is ignoring the CC and CXX env variables (even if defined) and
just use 'cc' and 'c++'.  (to be fair, this is probably an issue I
introduced with a patch.)

i'll look more into this...

Re: scons and ccache

2022-06-28 Thread Stuart Henderson 
On 2022/06/28 12:47, Omar Polo wrote:
> This is an attempt to use ccache with scons.  I'd really like to have
> something like this to avoid waiting 30/40 minutes for Godot to build.
> 
> part of the issue is that scons executes the compiler in a clear
> environment for some reasons and thus we loose CCACHE_DIR, ccache then
> tries to write to $HOME/.ccache and so we can't just unsed NO_CCACHE
> from scons.port.mk and enjoy the speed-up.
> 
> However, scons uses the compiler we want, so if we tweak the compiler
> wrapper to inject CCACHE_DIR we win!
> 
> This allows to pass from:
>  2244.08 real  7359.21 user   644.35 sys
> to
>   213.30 real   147.20 user   162.25 sys
> 
> when building games/godot with a warm cache.  it's really nice :)
> 
> To be fair, scons has its own caching mechanism built-in[0] but I don't
> think we can use it as we would need to patch the SConscript files to
> add CacheDir (well, we have to patch 'em anyway almost always in the
> end, but i don't think it'd be a good idea to add this too.)
> 
> [0]: https://scons.org/doc/production/HTML/scons-user.html#chap-caching
> 
> There are also other things that we may consider in the future to speed
> up scons builds a little bit more.  The recent-ish support for building
> with ninja is interesting for example, with that over ccache I can build
> godot with a warm cache in 197s, but it's still marked as experimental.
> 
> Thoughts?
> 
> Index: infrastructure/mk/bsd.port.mk
> ===
> RCS file: /home/cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.1573
> diff -u -p -r1.1573 bsd.port.mk
> --- infrastructure/mk/bsd.port.mk 19 May 2022 13:12:40 -  1.1573
> +++ infrastructure/mk/bsd.port.mk 28 Jun 2022 10:13:18 -
> @@ -447,7 +447,7 @@ CCACHE_ENV ?=
>  CCACHE_DIR ?= ${WRKOBJDIR_${PKGPATH}}/.ccache
>  MAKE_ENV += CCACHE_DIR=${CCACHE_DIR} ${CCACHE_ENV}
>  CONFIGURE_ENV += CCACHE_DIR=${CCACHE_DIR}
> -COMPILER_WRAPPER += ccache
> +COMPILER_WRAPPER += env CCACHE_DIR=${CCACHE_DIR} ccache

In case somebody set another flag in CCACHE_ENV as well, it should add that,
and I think it's worth a comment in this case:

# scons cleans the environment when calling the compiler
COMPILER_WRAPPER += env CCACHE_DIR=${CCACHE_DIR} ${CCACHE_ENV} ccache

Otherwise OK, though I do wonder if scons.port.mk could arrange something so
that ${MAKE_ENV} is passed through properly..

>  .  if !exists(${LOCALBASE}/bin/ccache)
>  ERRORS += "Fatal: USE_CCACHE is set, but ccache is not installed."
>  .  endif
> Index: devel/scons/scons.port.mk
> ===
> RCS file: /home/cvs/ports/devel/scons/scons.port.mk,v
> retrieving revision 1.11
> diff -u -p -r1.11 scons.port.mk
> --- devel/scons/scons.port.mk 7 Jun 2022 11:38:09 -   1.11
> +++ devel/scons/scons.port.mk 28 Jun 2022 10:13:44 -
> @@ -20,7 +20,6 @@ MODSCONS_ENV?=  CC="${CC}" \
>  
>  MODSCONS_FLAGS?=
>  ALL_TARGET?=
> -NO_CCACHE?=Yes
>  
>  MODSCONS_BUILD_TARGET = \
>   ${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} -C ${WRKSRC} \
>

scons and ccache

2022-06-28 Thread Omar Polo 
This is an attempt to use ccache with scons.  I'd really like to have
something like this to avoid waiting 30/40 minutes for Godot to build.

part of the issue is that scons executes the compiler in a clear
environment for some reasons and thus we loose CCACHE_DIR, ccache then
tries to write to $HOME/.ccache and so we can't just unsed NO_CCACHE
from scons.port.mk and enjoy the speed-up.

However, scons uses the compiler we want, so if we tweak the compiler
wrapper to inject CCACHE_DIR we win!

This allows to pass from:
 2244.08 real  7359.21 user   644.35 sys
to
  213.30 real   147.20 user   162.25 sys

when building games/godot with a warm cache.  it's really nice :)

To be fair, scons has its own caching mechanism built-in[0] but I don't
think we can use it as we would need to patch the SConscript files to
add CacheDir (well, we have to patch 'em anyway almost always in the
end, but i don't think it'd be a good idea to add this too.)

[0]: https://scons.org/doc/production/HTML/scons-user.html#chap-caching

There are also other things that we may consider in the future to speed
up scons builds a little bit more.  The recent-ish support for building
with ninja is interesting for example, with that over ccache I can build
godot with a warm cache in 197s, but it's still marked as experimental.

Thoughts?

Index: infrastructure/mk/bsd.port.mk
===
RCS file: /home/cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1573
diff -u -p -r1.1573 bsd.port.mk
--- infrastructure/mk/bsd.port.mk   19 May 2022 13:12:40 -  1.1573
+++ infrastructure/mk/bsd.port.mk   28 Jun 2022 10:13:18 -
@@ -447,7 +447,7 @@ CCACHE_ENV ?=
 CCACHE_DIR ?= ${WRKOBJDIR_${PKGPATH}}/.ccache
 MAKE_ENV += CCACHE_DIR=${CCACHE_DIR} ${CCACHE_ENV}
 CONFIGURE_ENV += CCACHE_DIR=${CCACHE_DIR}
-COMPILER_WRAPPER += ccache
+COMPILER_WRAPPER += env CCACHE_DIR=${CCACHE_DIR} ccache
 .  if !exists(${LOCALBASE}/bin/ccache)
 ERRORS += "Fatal: USE_CCACHE is set, but ccache is not installed."
 .  endif
Index: devel/scons/scons.port.mk
===
RCS file: /home/cvs/ports/devel/scons/scons.port.mk,v
retrieving revision 1.11
diff -u -p -r1.11 scons.port.mk
--- devel/scons/scons.port.mk   7 Jun 2022 11:38:09 -   1.11
+++ devel/scons/scons.port.mk   28 Jun 2022 10:13:44 -
@@ -20,7 +20,6 @@ MODSCONS_ENV?=CC="${CC}" \
 
 MODSCONS_FLAGS?=
 ALL_TARGET?=
-NO_CCACHE?=Yes
 
 MODSCONS_BUILD_TARGET = \
${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} -C ${WRKSRC} \

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Stuart Henderson 
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/06/28 04:13:51

Modified files:
security/opensc: Makefile 
security/opensc/patches: patch-src_pkcs11_Makefile_am 
Added files:
security/opensc/patches: patch-configure_ac 
 patch-src_libopensc_sc_c 

Log message:
patch opensc to avoid mlock, tweaked from an earlier diff by kn

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Stuart Henderson 
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/06/28 04:09:24

Modified files:
security/openssl/1.0.2: Makefile 
security/openssl/1.1: Makefile 
security/openssl/3.0: Makefile 

Log message:
tweak comments (noop)

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/06/28 02:59:16

Modified files:
devel/swig : Makefile 
Added files:
devel/swig/patches: patch-Lib_cdata_i patch-Lib_exception_i 
patch-Lib_php_php_swg 
patch-Lib_php_phprun_swg 
patch-Source_Modules_php_cxx patch-configure 

Log message:
devel/swig: backport php 8 support from upstream, & enable php support

https://github.com/swig/swig/pull/1978 via
https://src.fedoraproject.org/rpms/swig/c/62dded8bacb09398b03d1352820636182d2494ab
(pointed out by a debian developer)

this allows me to build php8 bindings for an upcoming mapserver 8.0 release.

went in a bulk build without fallout, thanks sthen@
ok sthen@

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Landry Breuil 
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/06/28 02:54:12

Modified files:
graphics/openjp2: Makefile distinfo 
graphics/openjp2/patches: patch-CMakeLists_txt 
  patch-src_bin_jp2_convert_c 
graphics/openjp2/pkg: PLIST 
Added files:
graphics/openjp2/patches: patch-thirdparty_CMakeLists_txt 
Removed files:
graphics/openjp2/patches: patch-src_lib_openmj2_opj_malloc_h 

Log message:
graphics/openjp2: update to 2.5.0.

see 
https://github.com/uclouvain/openjpeg/blob/v2.5.0/CHANGELOG.md#v250-2022-05-13

ok sthen@

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Stefan Hagen 
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2022/06/28 02:25:12

Modified files:
net/tg : Makefile distinfo 

Log message:
Update tg 0.17.0 => 0.19.0

v0.19.0
* Bump version of python-telegram to 0.15.0

v0.18.0
* Update to TDLib 1.7.10 (#259)
* Update readme.md (#251)
* Fix sticker view (#244)
* feat: add make backspace key work (#242)
* Do not quote file paths passed to mailcap entries (#239)
* show bot status (#227)
* Update readme.md (#228)
* Fix dockerfile
* Update poetry.lock file

OK op@

CVS: cvs.openbsd.org: ports

2022-06-28 Thread Antoine Jacoutot 
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/06/28 00:10:23

Modified files:
devel/spidermonkey91: Makefile distinfo 

Log message:
Update to spidermonkey91-91.11.0.