CVS: cvs.openbsd.org: ports

2022-09-10 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2022/09/10 23:22:39

Modified files:
devel/py-characteristic: Makefile 
devel/py-characteristic/pkg: PLIST 
devel/py-fields: Makefile 
devel/py-fields/pkg: PLIST 
devel/py-mock  : Makefile 
devel/py-mock/pkg: PLIST 
devel/py-process-tests: Makefile 
devel/py-process-tests/pkg: PLIST 

Log message:
Convert several of my python ports to MODPY_PEP517



Re: [update] devel/py-algorithm-munkres 1.1.2 -> 1.1.4

2022-09-10 Thread Kurt Mosiejczuk
On Wed, Jul 20, 2022 at 01:25:02AM -0400, Kurt Mosiejczuk wrote:
> https://github.com/bmc/munkres/blob/master/CHANGELOG.md

> Upstream integrated the patch I made to the tests, so removed the patch.
> Includes a fix.

> All tests pass on amd64.  The only consumer is audio/beets which passes its
> tested identically for both the old version and this new one.

> ok?

ping.

New version that switches to using MODPY-PEP517

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/devel/py-algorithm-munkres/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile11 Mar 2022 18:52:31 -  1.12
+++ Makefile11 Sep 2022 05:17:50 -
@@ -1,9 +1,8 @@
 COMMENT =  munkres algorithm for the Assignment Problem
 
-MODPY_EGG_VERSION =1.1.2
+MODPY_EGG_VERSION =1.1.4
 DISTNAME = munkres-${MODPY_EGG_VERSION}
 PKGNAME =  py-algorithm-${DISTNAME}
-REVISION =  2
 
 CATEGORIES =   devel
 
@@ -14,8 +13,7 @@ PERMIT_PACKAGE =  Yes
 
 MODULES =  lang/python
 MODPY_PI = Yes
-MODPY_SETUPTOOLS = Yes
-MODPY_PYTEST = Yes
+MODPY_PEP517 = setuptools
 
 FLAVORS =  python3
 FLAVOR =   python3
Index: distinfo
===
RCS file: /cvs/ports/devel/py-algorithm-munkres/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo10 Nov 2019 21:45:47 -  1.5
+++ distinfo11 Sep 2022 05:17:50 -
@@ -1,2 +1,2 @@
-SHA256 (munkres-1.1.2.tar.gz) = genO1Aw9D/xIvkttpc/fqkkEH6qrqAdbFZl07EeSauo=
-SIZE (munkres-1.1.2.tar.gz) = 10860
+SHA256 (munkres-1.1.4.tar.gz) = /ES/PDl52tpLa2M93uuP++g4julAnk1OgxDC2heS2wM=
+SIZE (munkres-1.1.4.tar.gz) = 14047
Index: patches/patch-test_test_munkres_py
===
RCS file: patches/patch-test_test_munkres_py
diff -N patches/patch-test_test_munkres_py
--- patches/patch-test_test_munkres_py  11 Mar 2022 18:52:32 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,97 +0,0 @@
-Move tests from nose to pytest
-https://github.com/bmc/munkres/pull/32
-
-Index: test/test_munkres.py
 test/test_munkres.py.orig
-+++ test/test_munkres.py
-@@ -1,6 +1,6 @@
- from munkres import Munkres, DISALLOWED, UnsolvableMatrix
- import munkres
--from nose.tools import assert_equals, raises
-+import pytest
- 
- m = Munkres()
- 
-@@ -16,7 +16,7 @@ def test_documented_example():
-   [10, 3, 2],
-   [8, 7, 4]]
- cost = _get_cost(matrix)
--assert_equals(cost, 12)
-+assert cost == 12
- 
- def test_5_x_5():
- matrix = [[12, 9, 27, 10, 23],
-@@ -25,7 +25,7 @@ def test_5_x_5():
-   [9, 28, 26, 23, 13],
-   [16, 16, 24, 6, 9]]
- cost = _get_cost(matrix)
--assert_equals(cost, 51)
-+assert cost == 51
- 
- def test_10_x_10():
- matrix = [[37, 34, 29, 26, 19, 8, 9, 23, 19, 29],
-@@ -39,7 +39,7 @@ def test_10_x_10():
-   [21, 25, 23, 39, 31, 37, 32, 33, 38, 1],
-   [17, 34, 40, 10, 29, 37, 40, 3, 25, 3]]
- cost = _get_cost(matrix)
--assert_equals(cost, 66)
-+assert cost == 66
- 
- def test_20_x_20():
- matrix = [[5, 4, 3, 9, 8, 9, 3, 5, 6, 9, 4, 10, 3, 5, 6, 6, 1, 8, 10, 2],
-@@ -63,14 +63,14 @@ def test_20_x_20():
-   [9, 6, 3, 1, 8, 5, 7, 8, 7, 2, 1, 8, 2, 8, 3, 7, 4, 8, 7, 7],
-   [8, 4, 4, 9, 7, 10, 6, 2, 1, 5, 8, 5, 1, 1, 1, 9, 1, 3, 5, 3]]
- cost = _get_cost(matrix)
--assert_equals(cost, 22)
-+assert cost == 22
- 
- def test_disallowed():
- matrix = [[5, 9, DISALLOWED],
-   [10, DISALLOWED, 2],
-   [8, DISALLOWED, 4]]
- cost = _get_cost(matrix)
--assert_equals(cost, 19)
-+assert cost == 19
- 
- def test_profit():
- profit_matrix = [[94, 66, 100, 18, 48],
-@@ -84,7 +84,7 @@ def test_profit():
- )
- indices = m.compute(cost_matrix)
- profit = sum([profit_matrix[row][column] for row, column in indices])
--assert_equals(profit, 392)
-+assert profit == 392
- 
- def test_irregular():
- matrix = [[12, 26, 17],
-@@ -94,7 +94,7 @@ def test_irregular():
-   [15, 93, 55, 80]]
- 
- cost = _get_cost(matrix)
--assert_equals(cost, 43)
-+assert cost == 43
- 
- def test_rectangular():
- matrix = [[34, 26, 17, 12],
-@@ -106,13 +106,13 @@ def test_rectangular():
- padded_matrix = m.pad_matrix(matrix, 0)
- padded_cost = _get_cost(padded_matrix)
- cost = _get_cost(matrix)
--assert_equals(padded_cost, cost)
--assert_equals(cost, 70)
-+assert padded_cost == cost
-+assert cost == 70
- 
--@raises(UnsolvableMatrix)
- def test_unsolvable():
--matrix = [[5, 9, DISALLOWED],
--  [10, DISALLOWED, 2],
--  [DISALLOWED, DISALLOWED, DISALLOWED]]
--m.compute(matrix)
-+with 

Re: d

2022-09-10 Thread Kurt Mosiejczuk
On Fri, Sep 09, 2022 at 11:07:01PM +0200, Antoine Jacoutot wrote:
> Hi folks.

> Remove message:
> "*** Python 2.7 is end-of-life and no longer receives security updates."

> I don't have time to handle people sending me emails about what
> they should do about it because they installed gimp which pulls
> x11/py-gtk2 which pulls python2 (and as soon as there's gtk in the
> name, people contact me).  I don't care about outdated py2 gimp
> plugins but according to espie, these py2 plugins are essential to
> gimp even though linux moved away from it.

Having folks pester you was definitely not the intention.

> OK?

ok kmos (maintainer)

--Kurt

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/python/2.7/Makefile,v
> retrieving revision 1.79
> diff -u -p -r1.79 Makefile
> --- Makefile  2 Sep 2022 16:49:03 -   1.79
> +++ Makefile  9 Sep 2022 21:02:31 -
> @@ -8,7 +8,7 @@ SHARED_LIBS = python2.7 0.0
>  VERSION_SPEC =   >=2.7,<2.8
>  PORTROACH =  limit:^2\.7
>  
> -REVISION-main =  10
> +REVISION-main =  11
>  REVISION-idle =  1
>  REVISION-tests = 1
>  REVISION-bsddb = 0
> Index: pkg/MESSAGE-main
> ===
> RCS file: pkg/MESSAGE-main
> diff -N pkg/MESSAGE-main
> --- pkg/MESSAGE-main  23 Mar 2022 11:20:05 -  1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1 +0,0 @@
> -*** Python 2.7 is end-of-life and no longer receives security updates.
> 
> 
> -- 
> Antoine
> 



[update] sysutils/loki to 2.6.1

2022-09-10 Thread Lucas Raab
Hello,

Here's an update for loki up to 2.6.1 as well as breaking it apart
into -main and -promtail subpackages. promtail is the log forwarder
for loki and meant to be distributed to endpoints. For now, I've
bundled two extra merge requests from upstream that will be included
in the next release: https://github.com/grafana/loki/pull/6833 and
https://github.com/grafana/loki/pull/7021. These are to support
building with Go 1.19 and on OpenBSD after the syscall changes
respectively. Upstream does the vendoring within the repo itself so
when the next version is released, the MASTER_SITES can be removed.

This has been working for the past couple weeks with syslog forwarding
to it and with a grafana instance for searching.  Any other tests
and/or feedback?

Thanks,
Lucas
diff refs/heads/master refs/heads/loki-2.6.1
commit - 9ed778fd588da4df6b7e9c8aa6337a149a8dfd67
commit + 38ea452e06eb8492b04b0eab34e112458c19a5eb
blob - 3fdc638ddb0d4cc670a346b1bb9458b60d84cd45
blob + 8d01cc197e2c2cb05ea81572f47be56d5b323fec
--- sysutils/loki/Makefile
+++ sysutils/loki/Makefile
@@ -1,13 +1,17 @@
-COMMENT =  like Prometheus, but for logs
+COMMENT-main = like Prometheus, but for logs
+COMMENT-promtail = tails log files and pushes them to Loki
 
 GH_ACCOUNT =   grafana
 GH_PROJECT =   loki
-GH_TAGNAME =   v2.4.2
+GH_TAGNAME =   v2.6.1
 
 CATEGORIES =   sysutils
 
 HOMEPAGE = https://grafana.com/oss/loki/
+MASTER_SITES = https://ports.lucasraab.me/
 
+MULTI_PACKAGES =   -main -promtail
+
 # AGPLv3 + some bits Apache 2.0
 PERMIT_PACKAGE =   Yes
 
blob - 81d5f3b62999e665bbcef603474a53186a4268b6
blob + f11d2f4c8a93f986fd5a796aae4ec6746680419f
--- sysutils/loki/distinfo
+++ sysutils/loki/distinfo
@@ -1,2 +1,2 @@
-SHA256 (loki-2.4.2.tar.gz) = 
725af867fa3bece6ccd46e0722eb68fe72462b15faa15c8ada609b5b2a476b07
-SIZE (loki-2.4.2.tar.gz) = 26148143
+SHA256 (loki-2.6.1.tar.gz) = q3H2KQo+NGHL+yOOdZAOGGzo77X7CVuVOIfu1Sd+4zk=
+SIZE (loki-2.6.1.tar.gz) = 29338323
blob - 3569b2dff9eda69a2878087edfc649f0b302d379
blob + 87b384453c8075ac8da3a468b4db86426e086bca
--- sysutils/loki/patches/patch-cmd_loki_loki-local-config_yaml
+++ sysutils/loki/patches/patch-cmd_loki_loki-local-config_yaml
@@ -1,6 +1,7 @@
+Index: cmd/loki/loki-local-config.yaml
 --- cmd/loki/loki-local-config.yaml.orig
 +++ cmd/loki/loki-local-config.yaml
-@@ -5,11 +5,11 @@
+@@ -5,11 +5,11 @@ server:
grpc_listen_port: 9096
  
  common:
blob - e77c7f94b619cd025d5a543ac09b15c7281abafd (mode 644)
blob + /dev/null
--- sysutils/loki/pkg/DESCR
+++ /dev/null
@@ -1,17 +0,0 @@
-Loki is a log aggregation system inspired by Prometheus. It does not index the
-contents of the logs, but rather a set of labels for each log stream.
-
-Compared to other log aggregation systems, Loki:
-- does not do full text indexing on logs
-- indexes and groups log streams using the same labels as Prometheus, allowing
-  to seamlessly switch between metrics and logs using the same labels
-- has native support in Grafana
-
-A Loki-based logging stack consists of 3 components:
-- promtail is the agent, responsible for gathering logs and sending them to 
Loki
-- loki is the main server, responsible for storing logs and processing queries
-- Grafana for querying and displaying the logs
-
-Additionally 2 other components are provided:
-- logcli to run LoqQL queries against a Loki server
-- loki-canary to audit the log capturing performance of Loki
blob - /dev/null
blob + e77c7f94b619cd025d5a543ac09b15c7281abafd (mode 644)
--- /dev/null
+++ sysutils/loki/pkg/DESCR-main
@@ -0,0 +1,17 @@
+Loki is a log aggregation system inspired by Prometheus. It does not index the
+contents of the logs, but rather a set of labels for each log stream.
+
+Compared to other log aggregation systems, Loki:
+- does not do full text indexing on logs
+- indexes and groups log streams using the same labels as Prometheus, allowing
+  to seamlessly switch between metrics and logs using the same labels
+- has native support in Grafana
+
+A Loki-based logging stack consists of 3 components:
+- promtail is the agent, responsible for gathering logs and sending them to 
Loki
+- loki is the main server, responsible for storing logs and processing queries
+- Grafana for querying and displaying the logs
+
+Additionally 2 other components are provided:
+- logcli to run LoqQL queries against a Loki server
+- loki-canary to audit the log capturing performance of Loki
blob - 1f6c724bc149f23d72c3cfe1a656ee81eba2ff9b (mode 644)
blob + /dev/null
--- sysutils/loki/pkg/PLIST
+++ /dev/null
@@ -1,40 +0,0 @@
-@newgroup _loki:848
-@newuser _loki:848:848:daemon:Loki Daemon:/var/empty:/sbin/nologin
-@extraunexec rm -rf /var/loki/
-@extraunexec rm -rf /var/promtail/
-@rcscript ${RCDIR}/loki
-@rcscript ${RCDIR}/promtail
-@bin bin/logcli
-@bin bin/loki
-@bin bin/loki-canary
-@bin bin/promtail
-share/examples/loki/
-@mode 0755
-@owner root
-@group _loki
-@sample ${SYSCONFDIR}/loki/
-@mode
-@owner
-@group

lang/gcc/8 and lang/gcc/11 diff for riscv64

2022-09-10 Thread Jeremie Courreges-Anglas
On Fri, Sep 09 2022, Pascal Stumpf  wrote:
> OK as soon as the lld patch is in.  Great work!

This involved a fair amount of headdesks, thanks for your kind words. :)

It might be doable to work around the lld problem within the gcc ports.
Thay may be sufficient given that not many C++ ports will be built with
ports-gcc on riscv64.  I'm gonna work on this next.

Meanwhile, I fixed the lang/gcc/11 build with what I learnt from
lang/gcc/8, diff below.

> On Fri, 09 Sep 2022 00:34:21 +0200, Jeremie Courreges-Anglas wrote:
>> 
>> With the diff below I can build ports-gcc on riscv64.  PIE is disabled
>> by default because I hit crashes at build time.  Since not many ports
>> require ports-gcc for for C or C++ code I believe that's okay for now.
>> Trying to forcefully disable PIE led to some dubious patches, I'm not
>> sure yet why they are actually needed (see the comments).  The rest of
>> the patches are as riscv64-specific as possible.
>> 
>> One patch which isn't included here is for ld.lld in base, which I have
>> yet to submit.
>> 
>> With this I can build blas, lapack, numpy with fortran support... more
>> to come.
>> 
>> Thoughts?  oks?
>> 
>> PS: I have yet to backport my recent fixes to lang/gcc/11, crossing
>>   fingers...
>> 
>> PPS: the ONLY_FOR_ARCHS and GCC49_ARCHS changes aren't included for now
>>   but they're trivial

(This time with riscv64 added to ONLY_FOR_ARCHS.)


Index: 8/Makefile
===
RCS file: /cvs/ports/lang/gcc/8/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- 8/Makefile  24 Jul 2022 09:52:45 -  1.56
+++ 8/Makefile  9 Sep 2022 00:14:41 -
@@ -1,5 +1,5 @@
 ONLY_FOR_ARCHS = aarch64 alpha amd64 arm hppa i386 mips64 mips64el \
-   powerpc powerpc64 sparc64
+   powerpc powerpc64 riscv64 sparc64
 
 # XXX: sparc64
 ONLY_FOR_ARCHS-ada = amd64 hppa i386 mips64 powerpc
@@ -64,7 +64,7 @@ EXTRACT_ONLY =${DISTNAME}.tar.xz
 BUILD_DEPENDS +=   devel/bison
 
 .if ${MACHINE_ARCH} == "aarch64" || ${MACHINE_ARCH} == "arm" || \
-${MACHINE_ARCH} == "powerpc64"
+${MACHINE_ARCH} == "powerpc64" || ${MACHINE_ARCH} == "riscv64"
 # would be helpful on i386/amd64 too, but some ports also need the old
 # ld.bfd in base which can't cope with new gas.
 BUILD_DEPENDS +=   devel/gas
@@ -133,9 +133,15 @@ CONFIGURE_ARGS += \
--with-gmp="${LOCALBASE}" \
--enable-languages=${LANGS} \
--disable-libstdcxx-pch \
-   --enable-default-ssp \
-   --enable-default-pie \
--without-isl
+
+.if ${MACHINE_ARCH} != "riscv64"
+CONFIGURE_ARGS += \
+   --enable-default-ssp \
+   --enable-default-pie
+.else
+EXTRA_ENV +=   PORTS_FORCE_DISABLE_PIE="-nopie"
+.endif
 
 # This is needed, as internal cpp is no longer compatible with the
 # visible beast
Index: 8/patches/patch-fixincludes_Makefile_in
===
RCS file: 8/patches/patch-fixincludes_Makefile_in
diff -N 8/patches/patch-fixincludes_Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ 8/patches/patch-fixincludes_Makefile_in 8 Sep 2022 21:58:03 -
@@ -0,0 +1,25 @@
+Add a knob to force-disable PIE to unbreak compilation where PIE isn't
+properly supported.
+
+Index: fixincludes/Makefile.in
+--- fixincludes/Makefile.in.orig
 fixincludes/Makefile.in
+@@ -107,15 +107,15 @@ oneprocess : full-stamp
+ twoprocess : test-stamp $(AF)
+ 
+ full-stamp : $(ALLOBJ) $(LIBIBERTY)
+-  $(CC) $(CFLAGS) $(LDFLAGS) -o $(FI) $(ALLOBJ) $(LIBIBERTY)
++  $(CC) $(CFLAGS) $(PORTS_FORCE_DISABLE_PIE) $(LDFLAGS) -o $(FI) 
$(ALLOBJ) $(LIBIBERTY)
+   $(STAMP) $@
+ 
+ test-stamp : $(TESTOBJ) $(LIBIBERTY)
+-  $(CC) $(CFLAGS) $(LDFLAGS) -o $(FI) $(TESTOBJ) $(LIBIBERTY)
++  $(CC) $(CFLAGS) $(PORTS_FORCE_DISABLE_PIE) $(LDFLAGS) -o $(FI) 
$(TESTOBJ) $(LIBIBERTY)
+   $(STAMP) $@
+ 
+ $(AF): $(FIXOBJ) $(LIBIBERTY)
+-  $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(FIXOBJ) $(LIBIBERTY)
++  $(CC) $(CFLAGS) $(PORTS_FORCE_DISABLE_PIE) $(LDFLAGS) -o $@ $(FIXOBJ) 
$(LIBIBERTY)
+ 
+ $(ALLOBJ)   : $(HDR)
+ fixincl.o   : fixincl.c  $(srcdir)/fixincl.x
Index: 8/patches/patch-gcc_config_gcc
===
RCS file: /cvs/ports/lang/gcc/8/patches/patch-gcc_config_gcc,v
retrieving revision 1.6
diff -u -p -r1.6 patch-gcc_config_gcc
--- 8/patches/patch-gcc_config_gcc  11 Mar 2022 19:28:59 -  1.6
+++ 8/patches/patch-gcc_config_gcc  5 Apr 2022 14:38:47 -
@@ -96,7 +96,28 @@ Index: gcc/config.gcc
  i[34567]86-*-linux* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-gnu* | 
i[34567]86-*-kopensolaris*-gnu)
# Intel 80386's running GNU/*
# with ELF format using glibc 2
-@@ -2394,6 +2432,18 @@ pdp11-*-*)
+@@ -2113,6 +2151,20 @@ riscv*-*-freebsd*)
+   # automatically detect that GAS supports it, yet we require it.
+   gcc_cv_initfini_array=yes
+   ;;

Re: [UPDATE+UNBREAK] handbrake

2022-09-10 Thread Brian Callahan
On 9/10/2022 12:39 PM, Rubén Llorente wrote:
>> One quick question for you Ruben: in patch-make_configure_py it looks
>> like configure will only work for amd64 and i386. Are there other archs
>> (like maybe arm64) where HandBrake ought to work? If not, we should
>> probably set ONLY_FOR_ARCHS = amd64 i386.
>>
> 
> I don't know if they were intended to work in other architectures, but
> according to the Debian people, it works in many others. Check the
> bottom of this page:
> 
> https://packages.debian.org/sid/handbrake
> 

In that case, I think I'd like to return to building HandBrake on all
platforms. If there are a few platforms where it doesn't build, that can
be handled once we know which (if any) platforms fail.

~Brian



Re: update audio/flac 1.4.0

2022-09-10 Thread Jeremie Courreges-Anglas
On Fri, Sep 09 2022, Nam Nguyen  wrote:
> Here is an update to audio/flac 1.4.0 released on Sep. 9, 2022.
>
> Release notes: https://github.com/xiph/flac/releases/tag/1.4.0
>
> This diff does the following:
> - removes cpu.c patch because there is a new else condition that sets
>   ppc.arch* = false instead of erroring out as before
> - removes flac.1 patch because flac.1 is empty.
> - flac.1 must be deleted in order for pandoc to run. I do not think
>   flac.1 was intended to be bundled so I reported this.
>   see: https://github.com/xiph/flac/issues/432
> - adds textproc/pandoc to BUILD_DEPENDS to generate man pages

pandoc is only available on amd64 on OpenBSD.  Depending on it at build
time effectively limits audio/flac to amd64.

> - major bump to both libFLAC and libFLAC++
> - remove doc/ from configure and Makefile to avoid installing empty
>   FLAC.tag file and logos.
>
>   While doc/ used to contain html pages, upstream thought html is now
>   pointless to include.
>
>   see:
>   https://github.com/xiph/flac/commit/80d064e15d843eb137ff80c9e9797b9c180e1743
>   https://github.com/xiph/flac/commit/dd8a264c566292de4d7da8f43688a169ffb431a1
>
> Testing
> ===
> `make test' passes. I tested flac playback with the following consumers:
> libsndfile audacity cmus deadbeef flac123 moc sox pacpl.
>
> Feedback and tests are welcome. OK?

A major bump looks appropriate but the switch to using pandoc
unconditionally doesn't.

I suggest using lowdown(1) from textproc/lowdown to format them,
proposal below.  I added an override in CONFIGURE_ENV so that pandoc
isn't picked up even if the empty .1 files are removed in a subsequent
update.

If you and naddy agree, please use the diff below with my ok.


Index: Makefile
===
RCS file: /home/cvs/ports/audio/flac/Makefile,v
retrieving revision 1.64
diff -u -p -r1.64 Makefile
--- Makefile8 Mar 2022 14:27:48 -   1.64
+++ Makefile11 Sep 2022 00:18:54 -
@@ -1,11 +1,10 @@
 COMMENT=   free lossless audio codec
 
-DISTNAME=  flac-1.3.4
-REVISION=  0
+DISTNAME=  flac-1.4.0
 CATEGORIES=audio archivers
 HOMEPAGE=  https://www.xiph.org/flac/
-SHARED_LIBS +=  FLAC 12.0 # 11.0
-SHARED_LIBS +=  FLAC++   10.0 # 9.0
+SHARED_LIBS +=  FLAC 13.0 # 12.0
+SHARED_LIBS +=  FLAC++   11.0 # 10.0
 
 MAINTAINER=Christian Weisgerber 
 
@@ -20,6 +19,7 @@ WANTLIB=  c iconv m ogg ${COMPILER_LIBCXX
 
 COMPILER = base-clang ports-gcc base-gcc
 
+BUILD_DEPENDS= textproc/lowdown
 LIB_DEPENDS=   audio/libogg converters/libiconv
 
 .if ${MACHINE_ARCH} == "i386"
@@ -36,11 +36,23 @@ CONFIGURE_ENV=  CPPFLAGS="-I${LOCALBASE}/
 
 # powerpc64 doesn't support VSX yet
 CONFIGURE_ARGS += --disable-vsx
+# don't pick up pandoc to rebuild man pages
+CONFIGURE_ENV =ac_cv_prog_PANDOC=""
 
 DEBUG_PACKAGES=${BUILD_PACKAGES}
 
+post-extract:
+# skip doc/ which contains logos and empty doxygen file
+   sed -i 's;doc/Doxyfile doc/Makefile doc/images/Makefile;;' \
+   ${WRKSRC}/configure
+
+post-configure:
+   sed -i 's;SUBDIRS = doc;SUBDIRS =;' ${WRKSRC}/Makefile
+
 post-install:
-   ${SUBST_CMD} ${PREFIX}/man/man1/flac.1
-   rm ${PREFIX}/man/man1/flac.1.beforesubst
+.for manpage in flac metaflac
+   lowdown -s -tman -m section=1 -mtitle=${manpage} \
+   ${WRKSRC}/man/${manpage}.md > ${PREFIX}/man/man1/${manpage}.1
+.endfor
 
 .include 
Index: distinfo
===
RCS file: /home/cvs/ports/audio/flac/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo25 Feb 2022 20:45:09 -  1.14
+++ distinfo10 Sep 2022 23:30:35 -
@@ -1,2 +1,2 @@
-SHA256 (flac-1.3.4.tar.xz) = j/BgfnWjIt181uxI9PIlRxQEricw0OqUUSexNVFV5zc=
-SIZE (flac-1.3.4.tar.xz) = 1038356
+SHA256 (flac-1.4.0.tar.xz) = r0HAczyTwjfD5S9k3YfjsNmvOCWfHH0R6Mv1g8SMJQY=
+SIZE (flac-1.4.0.tar.xz) = 783372
Index: patches/patch-man_flac_1
===
RCS file: patches/patch-man_flac_1
diff -N patches/patch-man_flac_1
--- patches/patch-man_flac_18 Mar 2022 14:27:48 -   1.5
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,11 +0,0 @@
 man/flac.1.origTue Nov 25 04:40:14 2014
-+++ man/flac.1 Sun Nov 30 20:59:42 2014
-@@ -384,7 +384,7 @@ These flags can be used to invert the sense of the cor
- .PP
- metaflac(1)
- .PP
--The programs are documented fully by HTML format documentation, available in 
\fI/usr/share/doc/libflac-doc/html\fR on Debian GNU/Linux systems.
-+The programs are documented fully by HTML format documentation, available in 
\fI${TRUEPREFIX}/share/doc/flac/html\fR.
- .SH "AUTHOR"
- .PP
- This manual page was initially written by Matt Zimmerman  
for the Debian GNU/Linux system (but may be used by others). It has been kept 
up-to-date by the Xiph.org 

CVS: cvs.openbsd.org: ports

2022-09-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/09/10 15:52:12

Modified files:
biology/py-biopython: Makefile 
biology/py-biopython/patches: patch-Tests_run_tests_py 
biology/py-biopython/pkg: PLIST 
converters/py-num2words: Makefile 
converters/py-html2text: Makefile 
converters/py-html2text/pkg: PLIST 
converters/py-vdf: Makefile 
converters/py-vdf/pkg: PLIST 

Log message:
use MODPY_PEP517



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/09/10 15:47:28

Modified files:
benchmarks/netperf-wrapper: Makefile 
benchmarks/netperf-wrapper/pkg: PLIST-main 
benchmarks/speedtest-cli: Makefile 
benchmarks/speedtest-cli/pkg: PLIST 

Log message:
use MODPY_PEP517



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/09/10 15:37:12

Modified files:
net/py-websockets: Makefile 
net/py-websockets/pkg: PLIST 
security/py-in-toto: Makefile 
security/py-in-toto/pkg: PLIST 
security/py-securesystemslib: Makefile 
security/py-securesystemslib/pkg: PLIST 

Log message:
MODPY_PEP517 from George Rosamond



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/09/10 15:33:42

Modified files:
archivers/py-brotli: Makefile 
archivers/py-brotli/pkg: PLIST 
archivers/py-libarchive-c: Makefile 
archivers/py-libarchive-c/pkg: PLIST 
archivers/py-lz4: Makefile 
archivers/py-rarfile: Makefile 
archivers/py-rarfile/pkg: PLIST 
archivers/py-vpk: Makefile 
archivers/py-vpk/pkg: PLIST 
astro/py-astral: Makefile 
astro/py-astropy: Makefile 
astro/py-metar : Makefile 
astro/py-metar/pkg: PLIST 

Log message:
switch some ports to MODPY_PEP517



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Omar Polo
CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2022/09/10 15:31:47

Modified files:
devel/got  : Makefile 
devel/got/pkg  : gotwebd.rc 

Log message:
devel/got: add rc_configtest to gotwebd.rc;  ok stsp@



[UPDATE] net/py-websockets to PEP517

2022-09-10 Thread George Rosamond

Another change to MODPY_PEP517.

Bumped REVISION = 0

PLSIT changes.

Thanks

gIndex: py-websockets//Makefile
===
RCS file: /cvs/ports/net/py-websockets/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- py-websockets//Makefile	17 Aug 2022 15:13:53 -	1.1.1.1
+++ py-websockets//Makefile	10 Sep 2022 21:04:58 -
@@ -5,6 +5,8 @@ MODPY_EGG_VERSION =	10.3
 DISTNAME =		websockets-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 
+REVISION =		0
+
 CATEGORIES =		net
 
 HOMEPAGE =		https://websockets.readthedocs.io/en/stable/
@@ -19,7 +21,8 @@ WANTLIB +=		pthread
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PEP517 =		setuptools
+
 FLAVOR =		python3
 FLAVORS =		python3
 
Index: py-websockets//pkg/PLIST
===
RCS file: /cvs/ports/net/py-websockets/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- py-websockets//pkg/PLIST	17 Aug 2022 15:13:53 -	1.1.1.1
+++ py-websockets//pkg/PLIST	10 Sep 2022 21:04:58 -
@@ -1,30 +1,48 @@
 lib/python${MODPY_VERSION}/site-packages/websockets/
-lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
-lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/websockets-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/websockets/__init__.py
 lib/python${MODPY_VERSION}/site-packages/websockets/__main__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}auth.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}connection.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}datastructures.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}datastructures.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}frames.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}frames.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}headers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}headers.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/websockets/${MODPY_PYCACHE}http.${MODPY_PYC_MAGIC_TAG}pyc

[UPDATE] security/py-in-toto to PEP517

2022-09-10 Thread George Rosamond

Another dropping of MODPY_SETUPTOOLS and MODPY_PYTEST.

Bump Revision = 1

with a bunch of PLIST changes.

g
Index: py-in-toto//Makefile
===
RCS file: /cvs/ports/security/py-in-toto/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- py-in-toto//Makefile	31 Aug 2022 08:41:08 -	1.2
+++ py-in-toto//Makefile	10 Sep 2022 20:37:54 -
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	1.2.0
 
 DISTNAME =	in-toto-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	security
 
@@ -18,8 +18,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
-MODPY_PYTEST =		Yes
+MODPY_PEP517 =		setuptools
 
 FLAVOR =		python3
 FLAVORS =		python3
Index: py-in-toto//pkg/PLIST
===
RCS file: /cvs/ports/security/py-in-toto/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- py-in-toto//pkg/PLIST	23 Aug 2022 20:34:36 -	1.1.1.1
+++ py-in-toto//pkg/PLIST	10 Sep 2022 20:37:54 -
@@ -5,30 +5,46 @@ bin/in-toto-run
 bin/in-toto-sign
 bin/in-toto-verify
 lib/python${MODPY_VERSION}/site-packages/in_toto/
-lib/python${MODPY_VERSION}/site-packages/in_toto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/in_toto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/in_toto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/in_toto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/in_toto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt
-lib/python${MODPY_VERSION}/site-packages/in_toto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/in_toto-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/in_toto-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/in_toto-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/in_toto-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/in_toto-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/in_toto-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/in_toto-${MODPY_EGG_VERSION}.dist-info/entry_points.txt
+lib/python${MODPY_VERSION}/site-packages/in_toto-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/in_toto/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}common_args.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}common_args.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}formats.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}formats.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}in_toto_keygen.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}in_toto_keygen.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}in_toto_mock.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}in_toto_mock.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}in_toto_record.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}in_toto_record.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}in_toto_run.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}in_toto_run.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}in_toto_sign.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}in_toto_sign.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/in_toto/${MODPY_PYCACHE}in_toto_verify.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 

CVS: cvs.openbsd.org: ports

2022-09-10 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/09/10 14:44:31

Modified files:
net/nextcloudclient: Makefile 

Log message:
net/nextcloudclient: bump shlib, from Adriano Barbosa



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/09/10 14:38:10

Modified files:
audio/py-eyed3 : Makefile 

Log message:
put setuptools back for py-eyed3 for now, needs a different build
backend that is not in ports yet, reported by aja@



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2022/09/10 14:28:05

Modified files:
sysutils/borgbackup: Makefile.inc 
sysutils/borgbackup/1.1: Makefile 
sysutils/borgbackup/1.1/pkg: PLIST 
sysutils/borgbackup/1.2: Makefile 
sysutils/borgbackup/1.2/pkg: PLIST 

Log message:
move from MODPY_SETUPTOOLS to MODPY_PEP517=setuptools

While here sync WANTLIB of 1.2/



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Kirill Bychkov
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2022/09/10 14:20:37

Modified files:
graphics/zint  : Makefile 

Log message:
switch HOMEPAGE to HTTPS



[UPDATE] security/py-securesystemslib to PEP517 setup

2022-09-10 Thread George Rosamond

Another move to PEP517:

-MODPY_SETUPTOOLS = Yes
+MODPY_PEP517 = setuptools

Bump to REVISION = 1

PLIST changes. Diff attached.

Thanks.Index: py-securesystemslib//Makefile
===
RCS file: /cvs/ports/security/py-securesystemslib/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- py-securesystemslib//Makefile	31 Aug 2022 08:41:08 -	1.2
+++ py-securesystemslib//Makefile	10 Sep 2022 20:08:11 -
@@ -4,7 +4,7 @@ MODPY_EGG_VERSION =	0.23.0
 
 DISTNAME =	securesystemslib-${MODPY_EGG_VERSION}
 PKGNAME =	py-${DISTNAME}
-REVISION =	0
+REVISION =	1
 
 CATEGORIES =	security
 
@@ -18,7 +18,7 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_SETUPTOOLS =	Yes
+MODPY_PEP517 =		setuptools
 MODPY_PYTEST_ARGS =	tests
 
 FLAVOR =		python3
Index: py-securesystemslib//pkg/PLIST
===
RCS file: /cvs/ports/security/py-securesystemslib/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- py-securesystemslib//pkg/PLIST	23 Aug 2022 20:33:51 -	1.1.1.1
+++ py-securesystemslib//pkg/PLIST	10 Sep 2022 20:08:11 -
@@ -1,39 +1,61 @@
 lib/python${MODPY_VERSION}/site-packages/securesystemslib/
-lib/python${MODPY_VERSION}/site-packages/securesystemslib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/securesystemslib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/securesystemslib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/securesystemslib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/securesystemslib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
-lib/python${MODPY_VERSION}/site-packages/securesystemslib-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/securesystemslib-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/securesystemslib-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/securesystemslib-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/securesystemslib-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/securesystemslib-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/securesystemslib-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/securesystemslib/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}ecdsa_keys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}ecdsa_keys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}ed25519_keys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}ed25519_keys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}formats.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}formats.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}hash.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}hash.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}interface.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}keys.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}keys.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}process.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/securesystemslib/${MODPY_PYCACHE}process.${MODPY_PYC_MAGIC_TAG}pyc

CVS: cvs.openbsd.org: ports

2022-09-10 Thread Frederic Cambus
CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2022/09/10 14:12:37

Modified files:
audio/schismtracker: Makefile distinfo 
audio/schismtracker/patches: patch-configure_ac 

Log message:
Update schismtracker to 20220905.



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Frederic Cambus
CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2022/09/10 14:09:48

Modified files:
benchmarks/hyperfine: Makefile crates.inc distinfo 

Log message:
Update hyperfine to 1.15.0.



CVS: cvs.openbsd.org: ports

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

Modified files:
security/passphraseme: Makefile 
security/passphraseme/pkg: PLIST 

Log message:
use MODPY_PEP517, from George Rosamond (maintainer)



[UPDATE] security/passphraseme to PEP517 setup

2022-09-10 Thread George Rosamond

Migrating port from MODPY_SETUPTOOLS to MODPY_PEP517

Revision bump to 0

PLIST changes included.

Thanks

gIndex: passphraseme//Makefile
===
RCS file: /cvs/ports/security/passphraseme/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- passphraseme//Makefile	15 May 2022 17:43:21 -	1.3
+++ passphraseme//Makefile	10 Sep 2022 19:59:26 -
@@ -1,6 +1,7 @@
 COMMENT =	passphrase generator using EFF's wordlists
 
 MODPY_EGG_VERSION=	0.1.5
+REVISION =		0
 
 GH_ACCOUNT =	micahflee
 GH_PROJECT =	passphraseme
@@ -19,7 +20,7 @@ MAINTAINER =	George Rosamond 

CVS: cvs.openbsd.org: ports

2022-09-10 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2022/09/10 13:57:50

Modified files:
sysutils/bupstash: Makefile distinfo 
sysutils/bupstash/pkg: PLIST 

Log message:
Update to bupstash-0.11.1

Bug fix and maintenance release. Changes:
https://github.com/andrewchambers/bupstash/releases/tag/v0.11.1



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2022/09/10 13:57:15

Modified files:
net/py-msgpack : Makefile 
net/py-msgpack/pkg: PLIST 

Log message:
move from MODPY_SETUPTOOLS to MODPY_PEP517=setuptools



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/09/10 13:48:50

Modified files:
www: Makefile 

Log message:
+newsraft



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/09/10 13:48:32

Log message:
import ports/www/newsraft, ok tracey@

Newsraft is a feed reader with ncurses user interface. It is greatly
inspired by Newsboat and tries to be its lightweight counterpart.

Status:

Vendor Tag: sthen
Release Tags:   sthen_20220910

N ports/www/newsraft/Makefile
N ports/www/newsraft/distinfo
N ports/www/newsraft/pkg/PLIST
N ports/www/newsraft/pkg/DESCR
N ports/www/newsraft/pkg/README
N ports/www/newsraft/patches/patch-makefile

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/09/10 13:21:38

Modified files:
devel/boehm-gc : Makefile 

Log message:
add missing license marker



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/09/10 13:02:16

Modified files:
audio/py-eyed3 : Makefile 

Log message:
PEP517 builds of eyeD3 should use poetry not setuptools



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/09/10 11:40:52

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.25.71.



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/09/10 11:40:36

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py3-boto3-1.24.70.



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/09/10 11:40:18

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py3-botocore-1.27.70.



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/09/10 11:09:24

Modified files:
geo/qgis   : Makefile distinfo 
geo/qgis/pkg   : PLIST 
Added files:
geo/qgis/patches: patch-src_gui_qgsowssourceselect_cpp 

Log message:
geo/qgis: update to 3.26.3

backport fix for https://github.com/qgis/QGIS/issues/49513



CVS: cvs.openbsd.org: ports

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

Modified files:
multimedia/qtav: Makefile 

Log message:
Missing bump after Qt5 update.



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/09/10 10:26:36

Modified files:
net/nheko  : Makefile distinfo 
net/nheko/pkg  : PLIST 
Removed files:
net/nheko/patches: patch-src_notifications_Manager_h 

Log message:
net/nheko: update to 0.10.1

see https://github.com/Nheko-Reborn/nheko/releases/tag/v0.10.1 &
https://github.com/Nheko-Reborn/nheko/releases/tag/v0.10.0

ok abieber@



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/09/10 10:24:48

Modified files:
devel/mtxclient: Makefile distinfo 
devel/mtxclient/pkg: PLIST 

Log message:
devel/mtxclient: update to 0.8.2, ok abieber@



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/09/10 10:24:15

Modified files:
devel/olm  : Makefile distinfo 

Log message:
devel/olm: update to 3.2.12, ok abieber@



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/09/10 10:23:35

Modified files:
devel/coeurl   : Makefile distinfo 

Log message:
devel/coeurl: update to 0.2.1, ok abieber@



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2022/09/10 09:25:47

Modified files:
x11/qt5/qtbase : Makefile 

Log message:
Explicitly deactivate inotify

We thus still use qfilesystemwatcher_kqueue instead of
qfilesystemwatcher_inotify. Nothing has changed, move on!



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/09/10 09:03:59

Modified files:
sysutils/bat   : Makefile crates.inc distinfo 

Log message:
sysutils/bat: update to 0.22.0.

see https://github.com/sharkdp/bat/releases/tag/v0.22.0



[update] nheko 0.10.1 (and olm/mtxclient/coeurl)

2022-09-10 Thread Landry Breuil
Hi,

here's a diff to update nheko and its deps, seems to work fine here in
basic testing. havent tested other olm consumers but the changelog isnt
scary:
https://gitlab.matrix.org/matrix-org/olm/-/blob/master/CHANGELOG.rst

as for nheko changelog:
https://nheko.im/nheko-reborn/nheko/-/tags/v0.10.0
https://nheko.im/nheko-reborn/nheko/-/tags/v0.10.1

oks/testing welcome
? devel/mtxclient/mtxclient-0.7.0-libmatrix_client.so.0.0
? devel/mtxclient/mtxclient-0.8.2-libmatrix_client.so.0.0
? devel/coeurl/coeurl-0.2.0-libcoeurl.so.0.0
? devel/coeurl/coeurl-0.2.1-libcoeurl.so.0.1
? devel/olm/olm-3.2.12-libolm.so.1.1
? devel/olm/olm-3.2.6-libolm.so.1.1
Index: devel/mtxclient/Makefile
===
RCS file: /cvs/ports/devel/mtxclient/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- devel/mtxclient/Makefile28 Jun 2022 12:49:25 -  1.1.1.1
+++ devel/mtxclient/Makefile10 Sep 2022 14:56:21 -
@@ -1,11 +1,11 @@
 COMMENT =  client API for Matrix, built on libcurl
 CATEGORIES =   devel
 
-SHARED_LIBS +=  matrix_client 0.0 # 0.7.0
+SHARED_LIBS +=  matrix_client  1.0
 
 GH_ACCOUNT =   Nheko-Reborn
 GH_PROJECT =   mtxclient
-GH_TAGNAME =   v0.7.0
+GH_TAGNAME =   v0.8.2
 
 # MIT
 PERMIT_PACKAGE =   Yes
@@ -20,7 +20,7 @@
textproc/nlohmann-json
 
 LIB_DEPENDS =  devel/coeurl \
-   devel/olm
+   devel/olm>=3.2.7
 
 # C++17
 COMPILER = base-clang ports-gcc
Index: devel/mtxclient/distinfo
===
RCS file: /cvs/ports/devel/mtxclient/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- devel/mtxclient/distinfo28 Jun 2022 12:49:25 -  1.1.1.1
+++ devel/mtxclient/distinfo10 Sep 2022 14:56:21 -
@@ -1,2 +1,2 @@
-SHA256 (mtxclient-0.7.0.tar.gz) = 3YrVclw5G3xbGFZAdOUL/GZ/swR+aBVh5eQq7JnCWxI=
-SIZE (mtxclient-0.7.0.tar.gz) = 601042
+SHA256 (mtxclient-0.8.2.tar.gz) = TKoS3flUuUktHsm2yjLvD8ZHhVXyKdsHTUO8XMKanIk=
+SIZE (mtxclient-0.8.2.tar.gz) = 609627
Index: devel/mtxclient/pkg/PLIST
===
RCS file: /cvs/ports/devel/mtxclient/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 PLIST
--- devel/mtxclient/pkg/PLIST   28 Jun 2022 12:49:25 -  1.1.1.1
+++ devel/mtxclient/pkg/PLIST   10 Sep 2022 14:56:21 -
@@ -38,6 +38,7 @@
 include/mtx/events/nheko_extensions/
 include/mtx/events/nheko_extensions/hidden_events.hpp
 include/mtx/events/pinned_events.hpp
+include/mtx/events/policy_rules.hpp
 include/mtx/events/power_levels.hpp
 include/mtx/events/presence.hpp
 include/mtx/events/reaction.hpp
@@ -57,12 +58,12 @@
 include/mtx/requests.hpp
 include/mtx/responses/
 include/mtx/responses.hpp
+include/mtx/responses/capabilities.hpp
 include/mtx/responses/common.hpp
 include/mtx/responses/create_room.hpp
 include/mtx/responses/crypto.hpp
 include/mtx/responses/device.hpp
 include/mtx/responses/empty.hpp
-include/mtx/responses/groups.hpp
 include/mtx/responses/login.hpp
 include/mtx/responses/media.hpp
 include/mtx/responses/members.hpp
@@ -88,7 +89,6 @@
 include/mtxclient/http/client_impl.hpp
 include/mtxclient/http/errors.hpp
 include/mtxclient/utils.hpp
-lib/cmake/
 lib/cmake/MatrixClient/
 lib/cmake/MatrixClient/MatrixClientConfig.cmake
 lib/cmake/MatrixClient/MatrixClientConfigVersion.cmake
Index: devel/coeurl/Makefile
===
RCS file: /cvs/ports/devel/coeurl/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- devel/coeurl/Makefile   24 Jul 2022 13:40:49 -  1.2
+++ devel/coeurl/Makefile   10 Sep 2022 14:56:21 -
@@ -1,12 +1,11 @@
 COMMENT =  simple async wrapper around CURL for C++
 CATEGORIES =   devel
 
-V =v0.2.0
+V =v0.2.1
 DISTNAME = coeurl-${V}
 PKGNAME =  ${DISTNAME:S/v//}
-REVISION = 0
 
-SHARED_LIBS +=  coeurl0.0 # 0.2.0
+SHARED_LIBS +=  coeurl0.1 # 0.2.0
 
 MASTER_SITES = https://nheko.im/nheko-reborn/coeurl/-/archive/${V}/
 
Index: devel/coeurl/distinfo
===
RCS file: /cvs/ports/devel/coeurl/distinfo,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 distinfo
--- devel/coeurl/distinfo   28 Jun 2022 12:48:26 -  1.1.1.1
+++ devel/coeurl/distinfo   10 Sep 2022 14:56:21 -
@@ -1,2 +1,2 @@
-SHA256 (coeurl-v0.2.0.tar.gz) = 3vjlIju1S8J6pdbi/RkV4F3bKKxFRDoalhSOpsGIXis=
-SIZE (coeurl-v0.2.0.tar.gz) = 51566
+SHA256 (coeurl-v0.2.1.tar.gz) = CZ/rWVEv3TIfd3VH8NTx/DwtkZNpMw8xi4w23GRsB2Q=
+SIZE (coeurl-v0.2.1.tar.gz) = 51894
Index: devel/olm/Makefile
===
RCS file: /cvs/ports/devel/olm/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- devel/olm/Makefile  11 Mar 2022 18:50:54 -  1.4
+++ devel/olm/Makefile 

CVS: cvs.openbsd.org: ports

2022-09-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/09/10 08:54:11

Modified files:
audio/rhythmbox: Makefile 
audio/rhythmbox/pkg: PLIST 

Log message:
Move from libdmapsharing to libdmapsharing4.



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/09/10 08:48:51

Added files:
graphics/gimp/snapshot/patches: 
patch-plug-ins_common_file-heif_c 

Log message:
graphics/gimp/snapshot: fix build with heif 1.13.0.

from https://gitlab.gnome.org/GNOME/gimp/-/issues/8570



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/09/10 08:40:30

Modified files:
x11/gnome  : Makefile 

Log message:
+libdmapsharing4



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/09/10 08:39:12

Log message:
Import libdmapsharing4-3.9.10

Libdmapsharing is a library which allows programs to access, share and 
control
the playback of media content using DMAP (DAAP, DPAP & DACP).
<...>

ok robert@

Status:

Vendor Tag: ajacoutot
Release Tags:   ajacoutot_20220910

N ports/x11/gnome/libdmapsharing4/Makefile
N ports/x11/gnome/libdmapsharing4/distinfo
N ports/x11/gnome/libdmapsharing4/pkg/DESCR
N ports/x11/gnome/libdmapsharing4/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/09/10 07:48:13

Modified files:
graphics/gimp/snapshot: Makefile 
graphics/gimp/snapshot/patches: 

patch-extensions_goat-exercises_goat-exercise-lua_lua 
patch-meson_build 

Log message:
graphics/gimp/snapshot: use lua module to properly subst LUA_DEP_VERSION in 
shebang

luajit plugins will only work if one installs luajit, but lets keep it
as an optional runtime dependency, like gjs for javascript plugins.

discussed with ajacoutot@



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/09/10 06:59:17

Modified files:
graphics/gimp  : Makefile 

Log message:
link gimp3 to the build, and reorder Makefile



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/09/10 06:58:23

Log message:
import gimp 2.99.12 as graphics/gimp/snapshot

gimp 2.10 is one of the last user-visible python 2 consumers, so allow
users to start playing with gimp 3, and test their favourite plugins
against it.
cf for example 
https://github.com/bootchk/resynthesizer/wiki/Resynthesizer-and-GIMP-version-3
for resynthesizer.

port modeled after gimp/stable, main differences:
- uses meson instead of autotools, and Gtk+3 instead of Gtk+2
- gjs/luajit plugins available, runtime dependency not enforced
- all conflicting files are @comment'ed in PLIST to allow coexistence
- two different distinct instances can be started in parallel with 
gimp-2.99 -n

cf https://www.gimp.org/news/2022/08/27/gimp-2-99-12-released/ &
https://www.gimp.org/news/2022/02/25/gimp-2-99-10-released for details
about last gimp beta releases.

discussed with ajacoutot@ and espie@

Status:

Vendor Tag: landry
Release Tags:   landry_20220910

N ports/graphics/gimp/snapshot/Makefile
N ports/graphics/gimp/snapshot/distinfo
N ports/graphics/gimp/snapshot/patches/patch-app_core_gimptagcache_c
N ports/graphics/gimp/snapshot/patches/patch-meson_build
N 
ports/graphics/gimp/snapshot/patches/patch-extensions_goat-exercises_goat-exercise-lua_lua
N ports/graphics/gimp/snapshot/patches/patch-tools_defcheck_py
N ports/graphics/gimp/snapshot/pkg/DESCR
N ports/graphics/gimp/snapshot/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/09/10 06:49:22

Modified files:
graphics/gimp/stable: Makefile 
graphics/gimp/stable/pkg: PLIST 

Log message:
graphics/gimp/stable: add PLIST annotations to make it possible to install 
multiple versions

discussed with ajacoutot@



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/09/10 06:03:32

Modified files:
devel/epoll-shim: Makefile distinfo 
devel/epoll-shim/pkg: PLIST 

Log message:
Update to epoll-shim-0.0.20220703.



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2022/09/10 04:31:27

Modified files:
net/tdesktop   : Makefile 

Log message:
net/tdesktop: set DPB_PROPERTIES=parallel to save some time in bulks.

ok kn (maintainer) sthen



Re: net/tdesktop: set DPB_PROPERTIES=parallel?

2022-09-10 Thread Klemens Nanni
On Sat, Sep 10, 2022 at 10:22:42AM +0200, Theo Buehler wrote:
> I've been carrying this diff for quite a while and it saves a bunch of
> time in my bulks. The build never failed, so as far as I can tell
> tdesktop is happy with this.

sure



Re: net/tdesktop: set DPB_PROPERTIES=parallel?

2022-09-10 Thread Stuart Henderson

Should be fine for a cmake build, ok with me

--
 Sent from a phone, apologies for poor formatting.

On 10 September 2022 09:23:05 Theo Buehler  wrote:


I've been carrying this diff for quite a while and it saves a bunch of
time in my bulks. The build never failed, so as far as I can tell
tdesktop is happy with this.

Index: Makefile
===
RCS file: /cvs/ports/net/tdesktop/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile20 Aug 2022 17:18:14 -  1.40
+++ Makefile21 Aug 2022 12:04:27 -
@@ -10,6 +10,8 @@ DISTNAME =tdesktop-${V}-full
PKGNAME =   ${DISTNAME:-full=}
CATEGORIES =net

+DPB_PROPERTIES =   parallel
+
DEBUG_PACKAGES =${BUILD_PACKAGES}

HOMEPAGE =  https://desktop.telegram.org




Web WhatsApp and Chromium or Firefox, does not finish loading

2022-09-10 Thread Mikolaj Kucharski
Hi,

I've noticed this problem many weeks before, but didn't report at the
time, as I thought it was random cookie problem, but then I started to
open new instances of Chroimum or Firefox, like scripts show at the very
end of this email. WhatsApp never finishes loading for me. Can anyone of
you reproduce the problem?


Chromium

--->8---
#!/bin/sh

umask 077

temp=`mktemp -d "${TMPDIR:=/tmp}/chrome."` || exit 1
trap 'rm -rfP -- "$temp"' EXIT
trap 'exit 1' HUP INT QUIT TRAP PIPE TERM INFO USR1 USR2

if cd "$temp"
then
chrome \
--user-data-dir="$temp/${0##*/}" \
--incognito "$@"
exit $?
fi
---8<---


Firefox

--->8---
#!/bin/sh

umask 077

temp=`mktemp -d "${TMPDIR:=/tmp}/firefox."` || exit 1
trap 'rm -rfP -- "$temp"' EXIT
trap 'exit 1' HUP INT QUIT TRAP PIPE TERM INFO USR1 USR2

if cd "$temp"
then
if ! mkdir -m 0700 "$temp/${0##*/}"
then
exit 5
fi
/usr/local/bin/firefox \
--new-instance --private-window \
--profile "$temp/${0##*/}" "$@"
exit $?
fi
---8<---

-- 
Regards,
 Mikolaj



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/09/10 02:30:33

Modified files:
print/printrun : Makefile 

Log message:
Remove optional x11/dbus-python dependency as it's now py3 only.



net/tdesktop: set DPB_PROPERTIES=parallel?

2022-09-10 Thread Theo Buehler
I've been carrying this diff for quite a while and it saves a bunch of
time in my bulks. The build never failed, so as far as I can tell
tdesktop is happy with this.

Index: Makefile
===
RCS file: /cvs/ports/net/tdesktop/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile20 Aug 2022 17:18:14 -  1.40
+++ Makefile21 Aug 2022 12:04:27 -
@@ -10,6 +10,8 @@ DISTNAME =tdesktop-${V}-full
 PKGNAME =  ${DISTNAME:-full=}
 CATEGORIES =   net
 
+DPB_PROPERTIES =   parallel
+
 DEBUG_PACKAGES =   ${BUILD_PACKAGES}
 
 HOMEPAGE = https://desktop.telegram.org



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/09/10 02:17:00

Modified files:
devel/cargo: cargo.port.mk 

Log message:
Add `-p' to the mkdir call.
When mixing this module with other build systems, modcargo-crates may be
under a subdirectory.



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/09/10 02:04:46

Modified files:
audio/pithos   : Makefile 
audio/quodlibet: Makefile 
audio/sonata   : Makefile 
editors/py-qscintilla: Makefile 
net/avahi  : Makefile 
net/gajim  : Makefile 
net/gpodder: Makefile 
net/netatalk3  : Makefile 
net/pidgin : Makefile 
print/hplip: Makefile 
print/system-config-printer: Makefile 
productivity/gtg: Makefile 
security/py-keyring: Makefile 
textproc/catfish: Makefile 
x11/gnome/gedit-plugins: Makefile 
x11/gnome/totem: Makefile 
x11/py-qt5 : Makefile 

Log message:
Missed bumps after recent x11/dbus-python pkgpath change.



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/09/10 02:01:18

Modified files:
x11/dbus-python: Makefile 
x11/dbus-python/pkg: PLIST 

Log message:
One missing @pkgpath.



Re: d

2022-09-10 Thread Marc Espie
On Fri, Sep 09, 2022 at 11:07:01PM +0200, Antoine Jacoutot wrote:
> Hi folks.
> 
> Remove message:
> "*** Python 2.7 is end-of-life and no longer receives security updates."
> 
> I don't have time to handle people sending me emails about what they should do
> about it because they installed gimp which pulls x11/py-gtk2 which pulls 
> python2
> (and as soon as there's gtk in the name, people contact me).
> I don't care about outdated py2 gimp plugins but according to espie, these py2
> plugins are essential to gimp even though linux moved away from it.
> 
> OK?
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/python/2.7/Makefile,v
> retrieving revision 1.79
> diff -u -p -r1.79 Makefile
> --- Makefile  2 Sep 2022 16:49:03 -   1.79
> +++ Makefile  9 Sep 2022 21:02:31 -
> @@ -8,7 +8,7 @@ SHARED_LIBS = python2.7 0.0
>  VERSION_SPEC =   >=2.7,<2.8
>  PORTROACH =  limit:^2\.7
>  
> -REVISION-main =  10
> +REVISION-main =  11
>  REVISION-idle =  1
>  REVISION-tests = 1
>  REVISION-bsddb = 0
> Index: pkg/MESSAGE-main
> ===
> RCS file: pkg/MESSAGE-main
> diff -N pkg/MESSAGE-main
> --- pkg/MESSAGE-main  23 Mar 2022 11:20:05 -  1.4
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1 +0,0 @@
> -*** Python 2.7 is end-of-life and no longer receives security updates.
> 
> 
> -- 
> Antoine
> 
Completely okay for me.



CVS: cvs.openbsd.org: ports

2022-09-10 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2022/09/10 00:44:17

Modified files:
meta/qt5   : Makefile 
x11/qt5: Makefile.version 
x11/qt5/docs   : distinfo 
x11/qt5/docs/pkg: PLIST-html 
x11/qt5/qt3d   : Makefile distinfo 
x11/qt5/qtbase : Makefile distinfo 
x11/qt5/qtbase/patches: 
patch-qmake_generators_unix_unixmake2_cpp 
x11/qt5/qtcharts: distinfo 
x11/qt5/qtconnectivity: distinfo 
x11/qt5/qtdatavis3d: distinfo 
x11/qt5/qtdeclarative: Makefile distinfo 
x11/qt5/qtgamepad: distinfo 
x11/qt5/qtgraphicaleffects: distinfo 
x11/qt5/qtimageformats: distinfo 
x11/qt5/qtlocation: distinfo 
x11/qt5/qtlottie: distinfo 
x11/qt5/qtmultimedia: distinfo 
x11/qt5/qtnetworkauth: distinfo 
x11/qt5/qtpurchasing: distinfo 
x11/qt5/qtquickcontrols: distinfo 
x11/qt5/qtquickcontrols2: Makefile distinfo 
x11/qt5/qtquickcontrols2/pkg: PLIST-main 
x11/qt5/qtremoteobjects: distinfo 
x11/qt5/qtscript: distinfo 
x11/qt5/qtscxml: distinfo 
x11/qt5/qtsensors: distinfo 
x11/qt5/qtserialbus: distinfo 
x11/qt5/qtserialport: distinfo 
x11/qt5/qtspeech: distinfo 
x11/qt5/qtsvg  : distinfo 
x11/qt5/qttools: distinfo 
x11/qt5/qttranslations: distinfo 
x11/qt5/qtvirtualkeyboard: distinfo 
x11/qt5/qtwayland: distinfo 
x11/qt5/qtwebchannel: distinfo 
x11/qt5/qtwebglplugin: distinfo 
x11/qt5/qtwebsockets: distinfo 
x11/qt5/qtwebview: distinfo 
x11/qt5/qtx11extras: distinfo 
x11/qt5/qtxmlpatterns: distinfo 

Log message:
Bugfix update Qt LTS open-source version to 5.15.6



update SDL2 to 2.24.0

2022-09-10 Thread Thomas Frohwein
Hi,

Based on a diff from Brad and with a fix for the gamecontroller support
found by namn@. I've tested several consumers runtime. sthen@ said
Brad's diff that was the same except for the gamecontroller patch ran
into problems building games/devilutionx and games/warzone2100.

I'm attaching the SDL2 update diff, as well as 2 more diffs to fix the
build of devilutionx and warzone2100.

Release Notes:
https://github.com/libsdl-org/SDL/releases/tag/release-2.24.0

ok?
? CHECK_SYM
Index: Makefile
===
RCS file: /cvs/ports/devel/sdl2/Makefile,v
retrieving revision 1.40
diff -u -p -r1.40 Makefile
--- Makefile2 May 2022 14:04:34 -   1.40
+++ Makefile10 Sep 2022 06:17:39 -
@@ -1,13 +1,12 @@
 COMMENT=   cross-platform multimedia library
 
-V= 2.0.20
+V= 2.24.0
 DISTNAME=  SDL2-${V}
 PKGNAME=   sdl2-${V}
-REVISION=  0
 CATEGORIES=devel
 MASTER_SITES=  https://www.libsdl.org/release/
 
-SHARED_LIBS=   SDL20.11# 0.18
+SHARED_LIBS=   SDL20.12# 0.18
 
 HOMEPAGE=  https://www.libsdl.org/
 
@@ -18,8 +17,8 @@ DEBUG_PACKAGES=   ${BUILD_PACKAGES}
 # zlib
 PERMIT_PACKAGE=Yes
 
-WANTLIB+=  X11 Xcursor Xext Xfixes Xi Xinerama Xrandr Xrender Xss
-WANTLIB+=  Xxf86vm m pthread samplerate sndio usbhid xcb
+WANTLIB+=  X11 Xcursor Xext Xfixes Xi Xrandr Xrender Xss m pthread 
samplerate
+WANTLIB+=  sndio usbhid xcb
 # GL library is dlopen'd
 WANTLIB+=  GL
 
@@ -62,5 +61,8 @@ CONFIGURE_ARGS+= --enable-altivec=no
 
 # tests in test subdir, but interactive and not hooked up to build
 NO_TEST=   Yes
+
+pre-configure:
+   ${SUBST_CMD} ${WRKSRC}/sdl2-config.cmake.in
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/sdl2/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo8 Mar 2022 11:38:36 -   1.14
+++ distinfo10 Sep 2022 06:17:39 -
@@ -1,2 +1,2 @@
-SHA256 (SDL2-2.0.20.tar.gz) = xWq6HXtbDn6Znkp2mMcLY6M5T/lwS19uHFfgwW8E3QY=
-SIZE (SDL2-2.0.20.tar.gz) = 7207221
+SHA256 (SDL2-2.24.0.tar.gz) = keTDSxdo+S05mweOFxRIxq8Yyv2nQ5h+0gZKKJVNbZc=
+SIZE (SDL2-2.24.0.tar.gz) = 7520541
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/sdl2/patches/patch-Makefile_in,v
retrieving revision 1.12
diff -u -p -r1.12 patch-Makefile_in
--- patches/patch-Makefile_in   8 Mar 2022 11:38:36 -   1.12
+++ patches/patch-Makefile_in   10 Sep 2022 06:17:39 -
@@ -1,7 +1,7 @@
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -133,7 +133,7 @@ LT_AGE  = @LT_AGE@
+@@ -135,7 +135,7 @@ LT_AGE  = @LT_AGE@
  LT_CURRENT  = @LT_CURRENT@
  LT_RELEASE  = @LT_RELEASE@
  LT_REVISION = @LT_REVISION@
Index: patches/patch-sdl2-config_cmake_in
===
RCS file: /cvs/ports/devel/sdl2/patches/patch-sdl2-config_cmake_in,v
retrieving revision 1.4
diff -u -p -r1.4 patch-sdl2-config_cmake_in
--- patches/patch-sdl2-config_cmake_in  8 Mar 2022 11:38:36 -   1.4
+++ patches/patch-sdl2-config_cmake_in  10 Sep 2022 06:17:39 -
@@ -1,76 +1,70 @@
+cmake: add library directories & pthread to imported targets of 
sdl2-config.cmake
+329794daf3f58088b56a64bdfa36b2021903be20
+
 Index: sdl2-config.cmake.in
 --- sdl2-config.cmake.in.orig
 +++ sdl2-config.cmake.in
-@@ -10,72 +10,3 @@ set(SDL2_LIBDIR "${libdir}")
- set(SDL2_INCLUDE_DIRS "${includedir}/SDL2")
- set(SDL2_LIBRARIES "-L${SDL2_LIBDIR} @SDL_RLD_FLAGS@ @SDL_LIBS@")
- string(STRIP "${SDL2_LIBRARIES}" SDL2_LIBRARIES)
--
--if(NOT TARGET SDL2::SDL2)
--  # provide SDL2::SDL2, SDL2::SDL2main and SDL2::SDL2-static targets, like 
SDL2Config.cmake does, for compatibility
--
--  # Remove -lSDL2 as that is handled by CMake, note the space at the end so 
it does not replace e.g. -lSDL2main
--  # This may require "libdir" beeing set (from above)
--  string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS "@SDL_RLD_FLAGS@ 
@SDL_LIBS@ ")
--  # also get rid of -lSDL2main, if you want to link against that use both 
SDL2::SDL2main and SDL2::SDL2 (in that order)
--  # (SDL2Config.cmake has the same behavior)
--  string(REPLACE "-lSDL2main" "" SDL2_EXTRA_LINK_FLAGS 
${SDL2_EXTRA_LINK_FLAGS})
--  string(STRIP "${SDL2_EXTRA_LINK_FLAGS}" SDL2_EXTRA_LINK_FLAGS)
--  string(REPLACE "-lSDL2 " "" SDL2_EXTRA_LINK_FLAGS_STATIC "@SDL_STATIC_LIBS@ 
")
--  string(STRIP "${SDL2_EXTRA_LINK_FLAGS_STATIC}" SDL2_EXTRA_LINK_FLAGS_STATIC)
--
--if(WIN32 AND NOT MSVC)
--  # MINGW needs very special handling, because the link order must be exactly 
-lmingw32 -lSDL2main -lSDL2
--  # for it to work at all (and -mwindows somewhere); a normal SHARED IMPORTED 
or STATIC IMPORTED library always puts itself first
--  # so handle this like a header-only lib and put everything in 
INTERFACE_LINK_LIBRARIES
--
--  

CVS: cvs.openbsd.org: ports

2022-09-10 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2022/09/10 00:23:06

Modified files:
graphics/ffmpeg: Makefile 
graphics/ffmpeg/pkg: PLIST 

Log message:
Fix examples installation directory

>From Brad (maintainer)