Re: UPDATE: GNU make 4.4

2022-11-03 Thread Brad Smith
On Fri, Nov 04, 2022 at 01:48:30AM -0400, Brad Smith wrote:
> On 11/3/2022 3:43 PM, Brad Smith wrote:
> > Here is an update to GNU make 4.4.
> > 
> > Ran through a bulk by naddy@ on amd64.
> > 
> > https://lists.gnu.org/archive/html/info-gnu/2022-10/msg8.html
> > 
> > "There was one suspicious build failure: x11/lablgtk2 fails at the fake
> > step with
> > ocamlfind: sourceView2Enums.ml: No such file or directory
> > 
> > Other than that, no problems."
> 
> Regarding the lablgtk2 issue. naddy@ mentioned he was seeing messages like
> so
> during the fake stage.. "warning: pattern recipe did not update peer target"
> and the release notes mention.. * WARNING: Future backward-incompatibility!
> In the NEXT release of GNU Make, pattern rules will implement the same
> behavior change for multiple targets as explicit grouped targets, below: if
> any target of the rule is needed by the build, the recipe will be invoked if
> any target of the rule is missing or out of date. During testing some
> makefiles were found to contain pattern rules that do not build all targets;
> this can cause issues so we are delaying this change for one release cycle
> to allow these makefiles to be updated. GNU Make shows a warning if it
> detects this situation: "pattern recipe did not update peer target".

Ugh. Didn't look like that when I hit send.


Regarding the lablgtk2 issue. naddy@ mentioned he was seeing messages like so
during the fake stage.. "warning: pattern recipe did not update peer target"

and the release notes mention..

* WARNING: Future backward-incompatibility!
  In the NEXT release of GNU Make, pattern rules will implement the same
  behavior change for multiple targets as explicit grouped targets, below: if
  any target of the rule is needed by the build, the recipe will be invoked if
  any target of the rule is missing or out of date.  During testing some
  makefiles were found to contain pattern rules that do not build all targets;
  this can cause issues so we are delaying this change for one release cycle
  to allow these makefiles to be updated.  GNU Make shows a warning if it
  detects this situation: "pattern recipe did not update peer target".



Re: UPDATE: GNU make 4.4

2022-11-03 Thread Brad Smith

On 11/3/2022 3:43 PM, Brad Smith wrote:

Here is an update to GNU make 4.4.

Ran through a bulk by naddy@ on amd64.

https://lists.gnu.org/archive/html/info-gnu/2022-10/msg8.html

"There was one suspicious build failure: x11/lablgtk2 fails at the fake
step with
ocamlfind: sourceView2Enums.ml: No such file or directory

Other than that, no problems."


Regarding the lablgtk2 issue. naddy@ mentioned he was seeing messages 
like so
during the fake stage.. "warning: pattern recipe did not update peer 
target" and the release notes mention.. * WARNING: Future 
backward-incompatibility! In the NEXT release of GNU Make, pattern rules 
will implement the same behavior change for multiple targets as explicit 
grouped targets, below: if any target of the rule is needed by the 
build, the recipe will be invoked if any target of the rule is missing 
or out of date. During testing some makefiles were found to contain 
pattern rules that do not build all targets; this can cause issues so we 
are delaying this change for one release cycle to allow these makefiles 
to be updated. GNU Make shows a warning if it detects this situation: 
"pattern recipe did not update peer target".


Re: UPDATE: GNU make 4.4

2022-11-03 Thread Brad Smith
On Thu, Nov 03, 2022 at 07:36:37PM -0400, Brad Smith wrote:
> On Thu, Nov 03, 2022 at 03:43:17PM -0400, Brad Smith wrote:
> > Here is an update to GNU make 4.4.
> > 
> > Ran through a bulk by naddy@ on amd64.
> > 
> > https://lists.gnu.org/archive/html/info-gnu/2022-10/msg8.html
> > 
> > "There was one suspicious build failure: x11/lablgtk2 fails at the fake
> > step with
> > ocamlfind: sourceView2Enums.ml: No such file or directory
> > 
> > Other than that, no problems."
> 
> Fix the date in the man page patch.

Looks like this needs a tweak to build on non-Clang archs.


Index: Makefile
===
RCS file: /home/cvs/ports/devel/gmake/Makefile,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 Makefile
--- Makefile11 Mar 2022 18:50:08 -  1.65
+++ Makefile4 Nov 2022 03:17:06 -
@@ -1,6 +1,6 @@
 COMMENT=   GNU make
 
-DISTNAME=  make-4.3
+DISTNAME=  make-4.4
 PKGNAME=   g${DISTNAME}
 CATEGORIES=devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=make/}
@@ -25,6 +25,11 @@ CONFIGURE_ENV=   CPPFLAGS="-I${LOCALBASE}/
 MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/build-aux
 
 TEST_ENV=  SHELL=$$SHELL
+
+.include 
+.if !${PROPERTIES:Mclang}
+CFLAGS+=   -std=gnu99
+.endif
 
 # Known test failures:
 # output-sync can fail due to a race condition in the test itself
Index: distinfo
===
RCS file: /home/cvs/ports/devel/gmake/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo1 Feb 2020 15:29:24 -   1.10
+++ distinfo31 Oct 2022 17:34:34 -
@@ -1,2 +1,2 @@
-SHA256 (make-4.3.tar.lz) = 3hpEHE7flSUh2zC/yoC6roag/xrNCgBAKZk0TwTEXoI=
-SIZE (make-4.3.tar.lz) = 1266180
+SHA256 (make-4.4.tar.lz) = SND8CyoEu1DykRwW2mVyMoX39IBMdPxaISSj32xfeMQ=
+SIZE (make-4.4.tar.lz) = 1283355
Index: patches/patch-Makefile_in
===
RCS file: /home/cvs/ports/devel/gmake/patches/patch-Makefile_in,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Makefile_in
--- patches/patch-Makefile_in   11 Mar 2022 18:50:08 -  1.6
+++ patches/patch-Makefile_in   31 Oct 2022 17:38:15 -
@@ -1,12 +1,12 @@
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1039,7 +1039,7 @@ make_SOURCES = $(make_SRCS) $(am__append_1) $(am__appe
-   $(am__append_4) $(am__append_5)
- EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS)
- make_LDADD = $(LIBOBJS) $(GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \
+@@ -564,7 +564,7 @@ EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS)
+ @HAVE_GUILE_FALSE@_GUILE_LIBS = 
+ @HAVE_GUILE_TRUE@_GUILE_LIBS = $(GUILE_LIBS)
+ make_LDADD = $(LIBOBJS) $(_GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \
 -  @LIBINTL@
 +  @LTLIBINTL@
  
  AM_CPPFLAGS = -Isrc -I$(top_srcdir)/src -Ilib -I$(top_srcdir)/lib \
-   -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" \
+   -DLIBDIR=\"$(libdir)\" -DLOCALEDIR=\"$(localedir)\" \
Index: patches/patch-doc_make_1
===
RCS file: /home/cvs/ports/devel/gmake/patches/patch-doc_make_1,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-doc_make_1
--- patches/patch-doc_make_111 Mar 2022 18:50:08 -  1.2
+++ patches/patch-doc_make_13 Nov 2022 23:33:07 -
@@ -5,8 +5,8 @@ Index: doc/make.1
 --- doc/make.1.orig
 +++ doc/make.1
 @@ -1,13 +1,13 @@
--.TH MAKE 1 "28 February 2016" "GNU" "User Commands"
-+.TH GMAKE 1 "28 February 2016" "GNU" "User Commands"
+-.TH MAKE 1 "31 May 2022" "GNU" "User Commands"
++.TH GMAKE 1 "31 May 2022" "GNU" "User Commands"
  .SH NAME
 -make \- GNU make utility to maintain groups of programs
 +gmake \- GNU make utility to maintain groups of programs
@@ -40,7 +40,7 @@ Index: doc/make.1
 +.BR gmake ,
  you must write a file called the
  .I makefile
- that describes the relationships among files in your program, and the states
+ that describes the relationships among files in your program, and provides
 @@ -35,17 +35,17 @@ Once a suitable makefile exists, each time you change 
  this simple shell command:
  .sp 1
@@ -61,7 +61,7 @@ Index: doc/make.1
 +.B gmake
  executes commands in the
  .I makefile
- to update one or more target
+ to update one or more
 @@ -56,7 +56,7 @@ is typically a program.
  If no
  .B \-f
@@ -98,7 +98,7 @@ Index: doc/make.1
  decides what to do.
  .TP 0.5i
  .BI \-\-debug "[=FLAGS]"
-@@ -172,7 +172,7 @@ If several
+@@ -179,7 +179,7 @@ If several
  options are used to specify several directories, the directories are
  searched in the order specified.
  Unlike the arguments to other flags of
@@ -107,7 +107,7 @@ Index: doc/make.1
  directories given with
  .B \-I
  flags may come directly after the flag:
-@@ -195,7 +195,7 @@ option, the last one is effective.
+@@ -202,7 +202,7 @@ option, the last one is effective.
  If the
  .B \-j
  option is given without an argument,
@@ -115,8 

NEW: libcsteamworks - implementation of a commonly used intermediate Steam API wrapper

2022-11-03 Thread Thomas Frohwein
Hi,

This is a port libCSteamworks, a commonly used library with games like
the ones we can run with games/fna primarily. It is part of my work to
have better compatibility for more of those games.

For explanation, here is a schematic of common use of Steam libraries
in how they are distributed with Linux as the usual target platform:

(FNA/MonoGame) Game
|
Steamworks.NET.dll
|
libCSteamworks.so
|
libsteam_api.so

Currently, a stubbed Steamworks.NET.dll from games/steamworks-nosteam
cuts these calls short, but there are issues with different versions
and missing functionality that cause problems.

Since the import of games/goldberg_emulator, we have an implementation
of libsteam_api.so that can handle most API calls just fine, so the
need for the large stub library is gone.

Future versions of fnaify (and planned successor IndieRunner) are
therefore designed to leave the bundled Steamworks.NET.dll in place, and
rely on libCSteamworks.so and libsteam_api.so in the ld.so path for
compatibility where needed.

The code is from MIT-licensed GitHub repository. This is missing some
API used in some games (likely a local addition done for the games) and
the patches for src/steam_api.cpp contain missing API - some as calls to
libsteam_api functions, others for now as stubs.

Given the above layers, in order to test this port one needs a game that
uses these dependencies, and then run it without removing
Steamworks.NET.dll while having this port installed. Current checkout of
fnaify [1] can be used to test - it doesn't remove Steamworks.NET.dll
anymore (use the bundled fnaify.dllmap.config!):

$ cd /path/to/game/directory
$ /path/to/fnaify -c /path/to/fnaify.dllmap.config 

There are many games that use these layers. You can try this out for
example with the game Salt & Sanctuary (on Steam, e.g. via steamctl).

The FNA games that use this are pretty much all proprietary. Maybe just
look if the port makes sense for an ok without runtime testing...

[1] https://github.com/rfht/fnaify


libcsteamworks.tgz
Description: application/tar-gz


update x11/kitty to 0.26.4

2022-11-03 Thread Thomas Frohwein
Hi,

This is a diff to update kitty to 0.26.4. Since 0.26.0, there is an
"encrypted communication" functionality [1] that causes some problems
with the port, so this diff disables it.

The practical problem is that it doesn't build with LibreSSL functions
and would require OpenSSL 3 from ports, but that is proving challenging
to get right. OpenSSL has had its share of security concerns and issues
with the development practices. Kitty also is trying increasingly to do
everything and the kitchen sink.

I personally don't use kitty remote control features. Sharing this diff
before update so that other users of kitty can check if their use of the
port is affected, or offer other solutions for the update.

PS: make test now fails cryptically, and I can't find an easy fix:

===>  Regression tests for kitty-0.26.4
mkdir -p /usr/ports/pobj/kitty-0.26.4/tmp/cache
python3 setup.py  test
Traceback (most recent call last):
  File "/usr/ports/pobj/kitty-0.26.4/kitty-0.26.4/setup.py", line 1668, in 

main()
  File "/usr/ports/pobj/kitty-0.26.4/kitty-0.26.4/setup.py", line 1622, in main
os.execl(texe, texe, '+launch', 'test.py')
  File "/usr/local/lib/python3.9/os.py", line 542, in execl
execv(file, args)
FileNotFoundError: [Errno 2] No such file or directory

[1] https://sw.kovidgoyal.net/kitty/rc_protocol/#encrypted-communication

Index: Makefile
===
RCS file: /cvs/ports/x11/kitty/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile13 Mar 2022 16:22:00 -  1.13
+++ Makefile3 Nov 2022 23:52:03 -
@@ -3,7 +3,7 @@ ONLY_FOR_ARCHS =aarch64 amd64 i386
 
 COMMENT =  fast, feature full, GPU-based terminal emulator
 
-MODPY_EGG_VERSION =0.24.4
+MODPY_EGG_VERSION =0.26.4
 DISTNAME = kitty-${MODPY_EGG_VERSION}
 CATEGORIES =   x11
 HOMEPAGE = https://sw.kovidgoyal.net/kitty/
@@ -12,7 +12,7 @@ MAINTAINER =  Thomas Frohwein  bytes:
+ return b'\x1bP@kitty-cmd' + json.dumps(response).encode('utf-8') + 
b'\x1b\\'
+ 
+ 
+-def parse_cmd(serialized_cmd: str, encryption_key: EllipticCurveKey) -> 
Dict[str, Any]:
++def parse_cmd(serialized_cmd: str, encryption_key: '') -> Dict[str, Any]:
+ try:
+ pcmd = json.loads(serialized_cmd)
+ except Exception:
+@@ -48,6 +48,8 @@ def parse_cmd(serialized_cmd: str, encryption_key: Ell
+ return {}
+ pcmd.pop('password', None)
+ if 'encrypted' in pcmd:
++raise NotImplementedError("encrypted communication disabled on 
OpenBSD")
++"""
+ if pcmd.get('enc_proto', '1') != RC_ENCRYPTION_PROTOCOL_VERSION:
+ log_error(f'Ignoring encrypted rc command with unsupported 
protocol: {pcmd.get("enc_proto")}')
+ return {}
+@@ -65,6 +67,7 @@ def parse_cmd(serialized_cmd: str, encryption_key: Ell
+ f'Ignoring encrypted rc command with timestamp {delta / 
1e9:.1f} seconds from now.'
+ ' Could be an attempt at a replay attack or an incorrect 
clock on a remote machine.')
+ return {}
++"""
+ return pcmd
+ 
+ 
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/x11/kitty/patches/patch-setup_py,v
retrieving revision 1.8
diff -u -p -r1.8 patch-setup_py
--- patches/patch-setup_py  13 Mar 2022 16:22:00 -  1.8
+++ patches/patch-setup_py  3 Nov 2022 23:52:03 -
@@ -1,11 +1,11 @@
 remove -O3 and -march=native optimizations
 fix man directory
-disable wayland
+disable wayland, libcrypto
 
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
-@@ -314,7 +314,6 @@ def init_env(
+@@ -355,7 +355,6 @@ def init_env(
  df += ' -Og'
  float_conversion = '-Wfloat-conversion'
  fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2'
@@ -13,7 +13,7 @@ Index: setup.py
  sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
  cppflags_ = os.environ.get(
  'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'),
-@@ -328,12 +327,11 @@ def init_env(
+@@ -369,12 +368,11 @@ def init_env(
  werror = '' if ignore_compiler_warnings else '-pedantic-errors -Werror'
  std = '' if is_openbsd else '-std=c11'
  sanitize_flag = ' '.join(sanitize_args)
@@ -28,7 +28,7 @@ Index: setup.py
  )
  )
  cflags = shlex.split(cflags_) + shlex.split(
-@@ -341,7 +339,7 @@ def init_env(
+@@ -382,7 +380,7 @@ def init_env(
  )
  ldflags_ = os.environ.get(
  'OVERRIDE_LDFLAGS',
@@ -37,7 +37,25 @@ Index: setup.py
  )
  ldflags = shlex.split(ldflags_)
  ldflags.append('-shared')
-@@ -732,7 +730,7 @@ def find_c_files() -> Tuple[List[str], List[str]]:
+@@ -447,7 +445,7 @@ def kitty_env() -> Env:
+ at_least_version('harfbuzz', 1, 5)
+ cflags.extend(pkg_config('libpng', '--cflags-only-I'))
+ cflags.extend(pkg_config('lcms2', '--cflags-only-I'))

Re: update: x11/kitty: 0.24.4 -> 0.25.1

2022-11-03 Thread Thomas Frohwein
On Wed, Jun 08, 2022 at 12:50:13AM +, Yifei Zhan wrote:
> update x11/kitty from 0.24.4 to 0.25.1
[...]

Hi,

Sorry for the long delay until response. I was busy moving cross country
this summer. I have an update to 0.26.4 now. Had to patch out encrypted
communication functionality [1] as this would need OpenSSL 3 and with
this making a working build has proved exceedingly difficult. Other
porters suggested patching this out, so this is what I'm attempting.

I don't use remote control features, but would be interested if you run
into problems with the update. I'm attaching the diff below.

[1] https://sw.kovidgoyal.net/kitty/rc_protocol/#encrypted-communication

Index: Makefile
===
RCS file: /cvs/ports/x11/kitty/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile13 Mar 2022 16:22:00 -  1.13
+++ Makefile3 Nov 2022 23:52:03 -
@@ -3,7 +3,7 @@ ONLY_FOR_ARCHS =aarch64 amd64 i386
 
 COMMENT =  fast, feature full, GPU-based terminal emulator
 
-MODPY_EGG_VERSION =0.24.4
+MODPY_EGG_VERSION =0.26.4
 DISTNAME = kitty-${MODPY_EGG_VERSION}
 CATEGORIES =   x11
 HOMEPAGE = https://sw.kovidgoyal.net/kitty/
@@ -12,7 +12,7 @@ MAINTAINER =  Thomas Frohwein  bytes:
+ return b'\x1bP@kitty-cmd' + json.dumps(response).encode('utf-8') + 
b'\x1b\\'
+ 
+ 
+-def parse_cmd(serialized_cmd: str, encryption_key: EllipticCurveKey) -> 
Dict[str, Any]:
++def parse_cmd(serialized_cmd: str, encryption_key: '') -> Dict[str, Any]:
+ try:
+ pcmd = json.loads(serialized_cmd)
+ except Exception:
+@@ -48,6 +48,8 @@ def parse_cmd(serialized_cmd: str, encryption_key: Ell
+ return {}
+ pcmd.pop('password', None)
+ if 'encrypted' in pcmd:
++raise NotImplementedError("encrypted communication disabled on 
OpenBSD")
++"""
+ if pcmd.get('enc_proto', '1') != RC_ENCRYPTION_PROTOCOL_VERSION:
+ log_error(f'Ignoring encrypted rc command with unsupported 
protocol: {pcmd.get("enc_proto")}')
+ return {}
+@@ -65,6 +67,7 @@ def parse_cmd(serialized_cmd: str, encryption_key: Ell
+ f'Ignoring encrypted rc command with timestamp {delta / 
1e9:.1f} seconds from now.'
+ ' Could be an attempt at a replay attack or an incorrect 
clock on a remote machine.')
+ return {}
++"""
+ return pcmd
+ 
+ 
Index: patches/patch-setup_py
===
RCS file: /cvs/ports/x11/kitty/patches/patch-setup_py,v
retrieving revision 1.8
diff -u -p -r1.8 patch-setup_py
--- patches/patch-setup_py  13 Mar 2022 16:22:00 -  1.8
+++ patches/patch-setup_py  3 Nov 2022 23:52:03 -
@@ -1,11 +1,11 @@
 remove -O3 and -march=native optimizations
 fix man directory
-disable wayland
+disable wayland, libcrypto
 
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
-@@ -314,7 +314,6 @@ def init_env(
+@@ -355,7 +355,6 @@ def init_env(
  df += ' -Og'
  float_conversion = '-Wfloat-conversion'
  fortify_source = '' if sanitize and is_macos else '-D_FORTIFY_SOURCE=2'
@@ -13,7 +13,7 @@ Index: setup.py
  sanitize_args = get_sanitize_args(cc, ccver) if sanitize else set()
  cppflags_ = os.environ.get(
  'OVERRIDE_CPPFLAGS', '-D{}DEBUG'.format('' if debug else 'N'),
-@@ -328,12 +327,11 @@ def init_env(
+@@ -369,12 +368,11 @@ def init_env(
  werror = '' if ignore_compiler_warnings else '-pedantic-errors -Werror'
  std = '' if is_openbsd else '-std=c11'
  sanitize_flag = ' '.join(sanitize_args)
@@ -28,7 +28,7 @@ Index: setup.py
  )
  )
  cflags = shlex.split(cflags_) + shlex.split(
-@@ -341,7 +339,7 @@ def init_env(
+@@ -382,7 +380,7 @@ def init_env(
  )
  ldflags_ = os.environ.get(
  'OVERRIDE_LDFLAGS',
@@ -37,7 +37,25 @@ Index: setup.py
  )
  ldflags = shlex.split(ldflags_)
  ldflags.append('-shared')
-@@ -732,7 +730,7 @@ def find_c_files() -> Tuple[List[str], List[str]]:
+@@ -447,7 +445,7 @@ def kitty_env() -> Env:
+ at_least_version('harfbuzz', 1, 5)
+ cflags.extend(pkg_config('libpng', '--cflags-only-I'))
+ cflags.extend(pkg_config('lcms2', '--cflags-only-I'))
+-cflags.extend(libcrypto_cflags)
++#cflags.extend(libcrypto_cflags)
+ if is_macos:
+ platform_libs = [
+ '-framework', 'Carbon', '-framework', 'CoreText', '-framework', 
'CoreGraphics',
+@@ -472,7 +470,7 @@ def kitty_env() -> Env:
+ gl_libs = ['-framework', 'OpenGL'] if is_macos else pkg_config('gl', 
'--libs')
+ libpng = pkg_config('libpng', '--libs')
+ lcms2 = pkg_config('lcms2', '--libs')
+-ans.ldpaths += pylib + platform_libs + gl_libs + libpng + lcms2 + 
libcrypto_ldflags
++ans.ldpaths += pylib + platform_libs + gl_libs + libpng + lcms2 #+ 
libcrypto_ldflags
+ if is_macos:
+ 

Re: UPDATE: GNU make 4.4

2022-11-03 Thread Brad Smith
On Thu, Nov 03, 2022 at 09:48:30PM +, v...@ljabl.com wrote:
> > ===
> > RCS file: /home/cvs/ports/devel/gmake/patches/patch-doc_make_1,v
> > retrieving revision 1.2
> > diff -u -p -u -p -r1.2 patch-doc_make_1
> > --- patches/patch-doc_make_111 Mar 2022 18:50:08 -  1.2
> > +++ patches/patch-doc_make_131 Oct 2022 17:38:12 -
> > @@ -5,7 +5,7 @@ Index: doc/make.1
> > --- doc/make.1.orig
> > +++ doc/make.1
> > @@ -1,13 +1,13 @@
> > --.TH MAKE 1 "28 February 2016" "GNU" "User Commands"
> > +-.TH MAKE 1 "31 May 2022" "GNU" "User Commands"
> > +.TH GMAKE 1 "28 February 2016" "GNU" "User Commands"
> >  .SH NAME
> 
> The replacement date is not updated.

Thanks.



Re: UPDATE: GNU make 4.4

2022-11-03 Thread Brad Smith
On Thu, Nov 03, 2022 at 03:43:17PM -0400, Brad Smith wrote:
> Here is an update to GNU make 4.4.
> 
> Ran through a bulk by naddy@ on amd64.
> 
> https://lists.gnu.org/archive/html/info-gnu/2022-10/msg8.html
> 
> "There was one suspicious build failure: x11/lablgtk2 fails at the fake
> step with
> ocamlfind: sourceView2Enums.ml: No such file or directory
> 
> Other than that, no problems."

Fix the date in the man page patch.


Index: Makefile
===
RCS file: /home/cvs/ports/devel/gmake/Makefile,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 Makefile
--- Makefile11 Mar 2022 18:50:08 -  1.65
+++ Makefile31 Oct 2022 17:34:26 -
@@ -1,6 +1,6 @@
 COMMENT=   GNU make
 
-DISTNAME=  make-4.3
+DISTNAME=  make-4.4
 PKGNAME=   g${DISTNAME}
 CATEGORIES=devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=make/}
Index: distinfo
===
RCS file: /home/cvs/ports/devel/gmake/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo1 Feb 2020 15:29:24 -   1.10
+++ distinfo31 Oct 2022 17:34:34 -
@@ -1,2 +1,2 @@
-SHA256 (make-4.3.tar.lz) = 3hpEHE7flSUh2zC/yoC6roag/xrNCgBAKZk0TwTEXoI=
-SIZE (make-4.3.tar.lz) = 1266180
+SHA256 (make-4.4.tar.lz) = SND8CyoEu1DykRwW2mVyMoX39IBMdPxaISSj32xfeMQ=
+SIZE (make-4.4.tar.lz) = 1283355
Index: patches/patch-Makefile_in
===
RCS file: /home/cvs/ports/devel/gmake/patches/patch-Makefile_in,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Makefile_in
--- patches/patch-Makefile_in   11 Mar 2022 18:50:08 -  1.6
+++ patches/patch-Makefile_in   31 Oct 2022 17:38:15 -
@@ -1,12 +1,12 @@
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1039,7 +1039,7 @@ make_SOURCES = $(make_SRCS) $(am__append_1) $(am__appe
-   $(am__append_4) $(am__append_5)
- EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS)
- make_LDADD = $(LIBOBJS) $(GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \
+@@ -564,7 +564,7 @@ EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS)
+ @HAVE_GUILE_FALSE@_GUILE_LIBS = 
+ @HAVE_GUILE_TRUE@_GUILE_LIBS = $(GUILE_LIBS)
+ make_LDADD = $(LIBOBJS) $(_GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \
 -  @LIBINTL@
 +  @LTLIBINTL@
  
  AM_CPPFLAGS = -Isrc -I$(top_srcdir)/src -Ilib -I$(top_srcdir)/lib \
-   -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" \
+   -DLIBDIR=\"$(libdir)\" -DLOCALEDIR=\"$(localedir)\" \
Index: patches/patch-doc_make_1
===
RCS file: /home/cvs/ports/devel/gmake/patches/patch-doc_make_1,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-doc_make_1
--- patches/patch-doc_make_111 Mar 2022 18:50:08 -  1.2
+++ patches/patch-doc_make_13 Nov 2022 23:33:07 -
@@ -5,8 +5,8 @@ Index: doc/make.1
 --- doc/make.1.orig
 +++ doc/make.1
 @@ -1,13 +1,13 @@
--.TH MAKE 1 "28 February 2016" "GNU" "User Commands"
-+.TH GMAKE 1 "28 February 2016" "GNU" "User Commands"
+-.TH MAKE 1 "31 May 2022" "GNU" "User Commands"
++.TH GMAKE 1 "31 May 2022" "GNU" "User Commands"
  .SH NAME
 -make \- GNU make utility to maintain groups of programs
 +gmake \- GNU make utility to maintain groups of programs
@@ -40,7 +40,7 @@ Index: doc/make.1
 +.BR gmake ,
  you must write a file called the
  .I makefile
- that describes the relationships among files in your program, and the states
+ that describes the relationships among files in your program, and provides
 @@ -35,17 +35,17 @@ Once a suitable makefile exists, each time you change 
  this simple shell command:
  .sp 1
@@ -61,7 +61,7 @@ Index: doc/make.1
 +.B gmake
  executes commands in the
  .I makefile
- to update one or more target
+ to update one or more
 @@ -56,7 +56,7 @@ is typically a program.
  If no
  .B \-f
@@ -98,7 +98,7 @@ Index: doc/make.1
  decides what to do.
  .TP 0.5i
  .BI \-\-debug "[=FLAGS]"
-@@ -172,7 +172,7 @@ If several
+@@ -179,7 +179,7 @@ If several
  options are used to specify several directories, the directories are
  searched in the order specified.
  Unlike the arguments to other flags of
@@ -107,7 +107,7 @@ Index: doc/make.1
  directories given with
  .B \-I
  flags may come directly after the flag:
-@@ -195,7 +195,7 @@ option, the last one is effective.
+@@ -202,7 +202,7 @@ option, the last one is effective.
  If the
  .B \-j
  option is given without an argument,
@@ -115,8 +115,8 @@ Index: doc/make.1
 +.BR gmake
  will not limit the number of jobs that can run simultaneously.
  .TP 0.5i
- \fB\-k\fR, \fB\-\-keep\-going\fR
-@@ -256,7 +256,7 @@ This also prints the version information given by the
+ \fB\--jobserver-style=\fR\fIstyle\fR
+@@ -273,7 +273,7 @@ This also prints the version information given by the
  .B \-v
  switch (see below).
  To print the data base without trying to remake any files, use
@@ -125,7 +125,7 @@ Index: 

Re: pcre2: newline any => anycrlf

2022-11-03 Thread Jeremie Courreges-Anglas
On Thu, Nov 03 2022, Christian Weisgerber  wrote:
> YASUOKA Masahiko:
>
>> Currently pcre2 is configured with "--enable-newline-is-any".
>> I think we should change it to --enable-newline-is-anycrlf to avoid the
>> conflict.
>
> If I may ask: Why do we diverge from the default newline setting
> at all?
>
> I notice that (1) the FreeBSD port doesn't and (2) callers that
> need to process non-Unix newlines can individually set this.

I took a look yesterday and I suspect that czarkoff@ enabled it out of
excessive zeal, along with the other --enable-* flags.  This is present
since 
https://github.com/jasperla/openbsd-wip/commit/07650bf8fcd5da17ccdf71387917f5e30da5eb50
with no rationale or discussion on this list.

-- 
jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE



Re: UPDATE: GNU make 4.4

2022-11-03 Thread vol

===
RCS file: /home/cvs/ports/devel/gmake/patches/patch-doc_make_1,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-doc_make_1
--- patches/patch-doc_make_111 Mar 2022 18:50:08 -  1.2
+++ patches/patch-doc_make_131 Oct 2022 17:38:12 -
@@ -5,7 +5,7 @@ Index: doc/make.1
--- doc/make.1.orig
+++ doc/make.1
@@ -1,13 +1,13 @@
--.TH MAKE 1 "28 February 2016" "GNU" "User Commands"
+-.TH MAKE 1 "31 May 2022" "GNU" "User Commands"
+.TH GMAKE 1 "28 February 2016" "GNU" "User Commands"
 .SH NAME


The replacement date is not updated.



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Jonathan Matthew
CVSROOT:/cvs
Module name:ports
Changes by: jmatt...@cvs.openbsd.org2022/11/03 16:29:01

Modified files:
net/irssi  : Makefile 

Log message:
Unbreak on ld.bfd arches, disable -Wl,--as-needed

ok kmos@ sthen@



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Stefan Sperling
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2022/11/03 15:57:18

Modified files:
devel/got  : Makefile 
Added files:
devel/got/patches: patch-lib_diff_main_c 

Log message:
remove C99-ism that broke the build on sparc64; patch from Ted Bullock



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Stefan Sperling
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2022/11/03 15:53:28

ports/devel/got/patches

Update of /cvs/ports/devel/got/patches
In directory cvs.openbsd.org:/cvs.d/hack/stsp/got/patches

Log Message:
Directory /cvs/ports/devel/got/patches added to the repository



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2022/11/03 14:37:22

Modified files:
textproc/p5-XML-LibXML: Makefile distinfo 
textproc/p5-XML-LibXML/patches: patch-Makefile_PL 

Log message:
update p5-XML-LibXML to 2.0208



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2022/11/03 13:57:45

Modified files:
devel/got  : Makefile 

Log message:
got now needs to c99 dance for base-gcc

Fixes build on sparc64



[powerpc64 rust] unbreak sysutils/broot

2022-11-03 Thread George Koehler
Hi, I want someone who knows rust to check this.

I had never used broot, but built it for powerpc64 to check that rustc
is working.  Because powerpc64 is big-endian, the build failed,

  --> 
/usr/ports/pobj/broot-1.14.2/broot-1.14.2/modcargo-crates/exr-1.4.2/src/compression/rle.rs:39:29
   |
39 | unimplemented!(this function probably returns little-endian data);
   |  expected `,`

error: could not compile `exr` due to previous error

powerpc64 can build exr-1.5.0 (the next version after 1.4.2).  This
diff uses 1.5.0 and fixes the build for powerpc64.  "make test" fails,
but I can install broot and run it.

After I updated exr to 1.5.0, I got a dependency error on lebe 0.5.2,
so I updated lebe.  I manually edited the version numbers in
crates.inc, but I later ran "make modcargo-gen-crates-licenses",
which changed lede's license comment.

ok or not?

--George

Index: Makefile
===
RCS file: /cvs/ports/sysutils/broot/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile28 Oct 2022 10:00:47 -  1.8
+++ Makefile3 Nov 2022 19:03:32 -
@@ -3,7 +3,7 @@ COMMENT =   new way to see and navigate d
 GH_ACCOUNT =   Canop
 GH_PROJECT =   broot
 GH_TAGNAME =   v1.14.2
-REVISION = 1
+REVISION = 2
 
 CATEGORIES =   sysutils
 
@@ -19,7 +19,8 @@ DISTFILES +=  ${DISTNAME}${EXTRACT_SUFX}
 
 MODULES =  devel/cargo
 # for riscv64 and powerpc64, please keep: cc >= 1.0.73 and libc >= 0.2.113
-MODCARGO_CRATES_UPDATE =   cc libc
+# for powerpc64, please keep: exr >= 1.5.0 (depends on lebe >= 0.5.2)
+MODCARGO_CRATES_UPDATE =   cc libc exr lebe
 MODCARGO_CRATES_KEEP += libgit2-sys
 
 CONFIGURE_STYLE =  cargo
Index: crates.inc
===
RCS file: /cvs/ports/sysutils/broot/crates.inc,v
retrieving revision 1.6
diff -u -p -r1.6 crates.inc
--- crates.inc  12 Sep 2022 07:49:20 -  1.6
+++ crates.inc  3 Nov 2022 19:03:32 -
@@ -56,7 +56,7 @@ MODCARGO_CRATES +=dirs-sys-next   0.1.2   #
 MODCARGO_CRATES += doc-comment 0.3.3   # MIT
 MODCARGO_CRATES += either  1.7.0   # MIT/Apache-2.0
 MODCARGO_CRATES += error-code  2.3.1   # BSL-1.0
-MODCARGO_CRATES += exr 1.4.2   # BSD-3-Clause
+MODCARGO_CRATES += exr 1.5.0   # BSD-3-Clause
 MODCARGO_CRATES += fallible-iterator   0.2.0   # MIT/Apache-2.0
 MODCARGO_CRATES += fallible-streaming-iterator 0.1.9   # MIT/Apache-2.0
 MODCARGO_CRATES += fastrand1.7.0   # Apache-2.0 OR MIT
@@ -96,7 +96,7 @@ MODCARGO_CRATES +=js-sys  0.3.58  # MIT/A
 MODCARGO_CRATES += lazy-regex  2.3.0   # MIT
 MODCARGO_CRATES += lazy-regex-proc_macros  2.3.0   # MIT
 MODCARGO_CRATES += lazy_static 1.4.0   # MIT/Apache-2.0
-MODCARGO_CRATES += lebe0.5.1   # LICENSE.md
+MODCARGO_CRATES += lebe0.5.2   # BSD-3-Clause
 MODCARGO_CRATES += lfs-core0.11.0  # MIT
 MODCARGO_CRATES += libc0.2.126 # MIT OR Apache-2.0
 MODCARGO_CRATES += libgit2-sys 0.13.4+1.4.2# MIT OR Apache-2.0
Index: distinfo
===
RCS file: /cvs/ports/sysutils/broot/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo12 Sep 2022 07:49:20 -  1.4
+++ distinfo3 Nov 2022 19:03:32 -
@@ -57,7 +57,7 @@ SHA256 (cargo/dirs-sys-next-0.1.2.tar.gz
 SHA256 (cargo/doc-comment-0.3.3.tar.gz) = 
/qQbujLZabUTmXdSc1YFBUvA36krTFa/EYny4XS+ehA=
 SHA256 (cargo/either-1.7.0.tar.gz) = 
PxB7h7avwqZP0TysVf4G1siFnxLUsUy83Sxn0Jdngb4=
 SHA256 (cargo/error-code-2.3.1.tar.gz) = 
ZPGJkee/Eef/7kUbUxi1wac8UtDQrablowF8jBztaiE=
-SHA256 (cargo/exr-1.4.2.tar.gz) = FMwOBvtfZ+XWvq3zo4L+ybrKGqdRxtU2j97uflkywhU=
+SHA256 (cargo/exr-1.5.0.tar.gz) = eMJqkNndQRo9EZ1vVXUvtME0yiQyUMMvucq3slYWONI=
 SHA256 (cargo/fallible-iterator-0.2.0.tar.gz) = 
REMXap8sFiaSvT01LXRe+UE+7FeCqA2P1vihrGkqB/c=
 SHA256 (cargo/fallible-streaming-iterator-0.1.9.tar.gz) = 
c2BJHOZ2o2v5uzxWwap5FlgYOlTSdEEg8nKFc42QRlo=
 SHA256 (cargo/fastrand-1.7.0.tar.gz) = 
w/zwzuU1GchmwJtd4fbFb/nWRxAfgcGWT6Yy4UiJbN8=
@@ -97,7 +97,7 @@ SHA256 (cargo/js-sys-0.3.58.tar.gz) = w/
 SHA256 (cargo/lazy-regex-2.3.0.tar.gz) = 
trEvLrbtfTlAXF6yWgNLTBBqmth6bZvjKY3mxfMv1X0=
 SHA256 (cargo/lazy-regex-proc_macros-2.3.0.tar.gz) = 
8kluUmQGm8cmzPN+t2uc2JQGrhENg2w/dnKfmciiMpM=
 SHA256 (cargo/lazy_static-1.4.0.tar.gz) = 
4qutI/vEKzcA8vJ5hE3IMq2ysusGmy35GPRVxOGMxkY=
-SHA256 (cargo/lebe-0.5.1.tar.gz) = fv0daY2wdZ5u8Rp81EQHQHOZqRDHdN2ATGTAMtp4Jv8=
+SHA256 (cargo/lebe-0.5.2.tar.gz) = Awh8K61eEDToys5ZJt7AU/s3kCSDcIZfURen0CEzVMg=
 SHA256 (cargo/lfs-core-0.11.0.tar.gz) = 
81DAqTgRwpIi+5ISnJ2YGChZIIzuqjlkAjyV4itxiJ4=
 SHA256 (cargo/libc-0.2.126.tar.gz) = 
NJ1aWRzSi0nh0QN0cWF6Mt3NpXMbmUGQCAhfctWlODY=
 SHA256 

UPDATE: GNU make 4.4

2022-11-03 Thread Brad Smith
Here is an update to GNU make 4.4.

Ran through a bulk by naddy@ on amd64.

https://lists.gnu.org/archive/html/info-gnu/2022-10/msg8.html

"There was one suspicious build failure: x11/lablgtk2 fails at the fake
step with
ocamlfind: sourceView2Enums.ml: No such file or directory

Other than that, no problems."


Index: Makefile
===
RCS file: /home/cvs/ports/devel/gmake/Makefile,v
retrieving revision 1.65
diff -u -p -u -p -r1.65 Makefile
--- Makefile11 Mar 2022 18:50:08 -  1.65
+++ Makefile31 Oct 2022 17:34:26 -
@@ -1,6 +1,6 @@
 COMMENT=   GNU make
 
-DISTNAME=  make-4.3
+DISTNAME=  make-4.4
 PKGNAME=   g${DISTNAME}
 CATEGORIES=devel
 MASTER_SITES=  ${MASTER_SITE_GNU:=make/}
Index: distinfo
===
RCS file: /home/cvs/ports/devel/gmake/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo1 Feb 2020 15:29:24 -   1.10
+++ distinfo31 Oct 2022 17:34:34 -
@@ -1,2 +1,2 @@
-SHA256 (make-4.3.tar.lz) = 3hpEHE7flSUh2zC/yoC6roag/xrNCgBAKZk0TwTEXoI=
-SIZE (make-4.3.tar.lz) = 1266180
+SHA256 (make-4.4.tar.lz) = SND8CyoEu1DykRwW2mVyMoX39IBMdPxaISSj32xfeMQ=
+SIZE (make-4.4.tar.lz) = 1283355
Index: patches/patch-Makefile_in
===
RCS file: /home/cvs/ports/devel/gmake/patches/patch-Makefile_in,v
retrieving revision 1.6
diff -u -p -u -p -r1.6 patch-Makefile_in
--- patches/patch-Makefile_in   11 Mar 2022 18:50:08 -  1.6
+++ patches/patch-Makefile_in   31 Oct 2022 17:38:15 -
@@ -1,12 +1,12 @@
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -1039,7 +1039,7 @@ make_SOURCES = $(make_SRCS) $(am__append_1) $(am__appe
-   $(am__append_4) $(am__append_5)
- EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS)
- make_LDADD = $(LIBOBJS) $(GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \
+@@ -564,7 +564,7 @@ EXTRA_make_SOURCES = $(amiga_SRCS) $(vms_SRCS)
+ @HAVE_GUILE_FALSE@_GUILE_LIBS = 
+ @HAVE_GUILE_TRUE@_GUILE_LIBS = $(GUILE_LIBS)
+ make_LDADD = $(LIBOBJS) $(_GUILE_LIBS) lib/libgnu.a $(GETLOADAVG_LIBS) \
 -  @LIBINTL@
 +  @LTLIBINTL@
  
  AM_CPPFLAGS = -Isrc -I$(top_srcdir)/src -Ilib -I$(top_srcdir)/lib \
-   -DLIBDIR=\"$(libdir)\" -DINCLUDEDIR=\"$(includedir)\" \
+   -DLIBDIR=\"$(libdir)\" -DLOCALEDIR=\"$(localedir)\" \
Index: patches/patch-doc_make_1
===
RCS file: /home/cvs/ports/devel/gmake/patches/patch-doc_make_1,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-doc_make_1
--- patches/patch-doc_make_111 Mar 2022 18:50:08 -  1.2
+++ patches/patch-doc_make_131 Oct 2022 17:38:12 -
@@ -5,7 +5,7 @@ Index: doc/make.1
 --- doc/make.1.orig
 +++ doc/make.1
 @@ -1,13 +1,13 @@
--.TH MAKE 1 "28 February 2016" "GNU" "User Commands"
+-.TH MAKE 1 "31 May 2022" "GNU" "User Commands"
 +.TH GMAKE 1 "28 February 2016" "GNU" "User Commands"
  .SH NAME
 -make \- GNU make utility to maintain groups of programs
@@ -40,7 +40,7 @@ Index: doc/make.1
 +.BR gmake ,
  you must write a file called the
  .I makefile
- that describes the relationships among files in your program, and the states
+ that describes the relationships among files in your program, and provides
 @@ -35,17 +35,17 @@ Once a suitable makefile exists, each time you change 
  this simple shell command:
  .sp 1
@@ -61,7 +61,7 @@ Index: doc/make.1
 +.B gmake
  executes commands in the
  .I makefile
- to update one or more target
+ to update one or more
 @@ -56,7 +56,7 @@ is typically a program.
  If no
  .B \-f
@@ -98,7 +98,7 @@ Index: doc/make.1
  decides what to do.
  .TP 0.5i
  .BI \-\-debug "[=FLAGS]"
-@@ -172,7 +172,7 @@ If several
+@@ -179,7 +179,7 @@ If several
  options are used to specify several directories, the directories are
  searched in the order specified.
  Unlike the arguments to other flags of
@@ -107,7 +107,7 @@ Index: doc/make.1
  directories given with
  .B \-I
  flags may come directly after the flag:
-@@ -195,7 +195,7 @@ option, the last one is effective.
+@@ -202,7 +202,7 @@ option, the last one is effective.
  If the
  .B \-j
  option is given without an argument,
@@ -115,8 +115,8 @@ Index: doc/make.1
 +.BR gmake
  will not limit the number of jobs that can run simultaneously.
  .TP 0.5i
- \fB\-k\fR, \fB\-\-keep\-going\fR
-@@ -256,7 +256,7 @@ This also prints the version information given by the
+ \fB\--jobserver-style=\fR\fIstyle\fR
+@@ -273,7 +273,7 @@ This also prints the version information given by the
  .B \-v
  switch (see below).
  To print the data base without trying to remake any files, use
@@ -125,7 +125,7 @@ Index: doc/make.1
  .TP 0.5i
  \fB\-q\fR, \fB\-\-question\fR
  ``Question mode''.
-@@ -287,7 +287,7 @@ Touch files (mark them up to date without really chang
+@@ -304,7 +304,7 @@ Touch files (mark them up to date without really chang
  

CVS: cvs.openbsd.org: ports

2022-11-03 Thread Kirill Bychkov
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2022/11/03 13:30:22

Modified files:
www/goaccess   : Makefile distinfo 

Log message:
update to goaccess-1.6.5



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/11/03 11:45:48

Modified files:
x11/gtksourceview4: Makefile distinfo 
x11/gtksourceview4/pkg: PLIST 

Log message:
Update to gtksourceview4-4.8.4.



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2022/11/03 11:19:05

Modified files:
devel/p5-FFI-CheckLib: Makefile distinfo 

Log message:
update p5-FFI-CheckLib to 0.31



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2022/11/03 11:06:47

Modified files:
devel/p5-Exporter-Tiny: Makefile distinfo 

Log message:
update p5-Exporter-Tiny to 1.004004



[UPDATE] lang/erlang 25.1.2 was: lang/erlang: observer_backend missing in -main?

2022-11-03 Thread Volker Schlecht
The attached patch fixes the problem with observer_backend in 
lang/erlang/21 and lang/erlang/25. It also updates lang/erlang to the 
most recent release 25.1.2


rebar3, elixir and rabbitmq build without problems on amd64.

On 10/26/22 20:46, Volker Schlecht wrote:
Yes, the observer backend slipped through with my patch to update 
erlang/21 to 21.3.8.24, I dragged it from there into 25.x.

Thanks for pointing it out!

OK for Stuart's patch from my side.

NB: I also found that alongside observer-backend, the following files 
that used to be in -main moved to -wx:


lib/erlang21/lib/${ERL_OBSERVER}/ebin/cdv_persistent_cb.beam
lib/erlang21/lib/${ERL_OBSERVER}/src/cdv_persistent_cb.erl

Those include wx, though so that one wasn't a mistake:
https://github.com/erlang/otp/blob/2735ffc3d883afa727569fa5becba3d32e262ace/lib/observer/src/cdv_persistent_cb.erl#L24

On 10/25/22 21:20, Stuart Henderson wrote:

+CC maintainer

On 2022/10/22 12:51, la ninpre wrote:
I was updating my Pleroma instance two days ago after upgrading to 
OpenBSD

7.2.
Pleroma is written in Elixir, so I updated both Elixir/Erlang to
corresponding latest versions.
Then I rebuilt all the dependencies (before they were built with/for
Erlang-21).
When I tried to start Pleroma, it failed. The error was:

12:42:37.892 [notice] Application runtime_tools exited: 
:runtime_tools.start(:normal, []) returned an error: shutdown: failed 
to start child: :ttb_autostart

 ** (EXIT) an exception was raised:
 ** (UndefinedFunctionError) function 
:observer_backend.ttb_resume_trace/0 is undefined (module 
:observer_backend is not available)

 (runtime_tools 1.19) :observer_backend.ttb_resume_trace()
 (runtime_tools 1.19) ttb_autostart.erl:47: 
:ttb_autostart.init/1

 (stdlib 4.0.1) gen_server.erl:848: :gen_server.init_it/2
 (stdlib 4.0.1) gen_server.erl:811: :gen_server.init_it/6
 (stdlib 4.0.1) proc_lib.erl:240: 
:proc_lib.init_p_do_apply/3


Then I found that, indeed, observer_backend.beam is missing from
/usr/local/lib/erlang25/lib/runtime_tools-1.19.
I then checked the ports tree to see what is in PLIST for lang/erlang.
The file is missing there too, but it is available in -wx subpackage.

So my question is, shouldn't observer_backend.beam (and hrl and erl in
respective directories too)
be included in -main subpackage too? I'm no expert in Erlang, but I know
that Observer is a graphical
tool (so it's OK for it to be in -wx subpackage). But the 
observer_backend

module doesn't contain
any graphics and can be used in non-graphical environment (such as in
Pleroma above).

---

best regards,

la-ninpre.


I don't know Erlang at all, but if that is the case, then this diff
should do the trick.


Index: 21/Makefile
===
RCS file: /cvs/ports/lang/erlang/21/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- 21/Makefile    1 Sep 2022 20:03:37 -    1.13
+++ 21/Makefile    25 Oct 2022 19:18:05 -
@@ -6,13 +6,14 @@ COMMENT-wx=    WxWidgets bindings for Erlan
  PORTROACH=    limit:^OTP-21\.
  V=    21.3.8.24
-REVISION-main=    1
-REVISION-wx=    0
  DISTNAME=    otp_src_$V
  PKGNAME=    erlang-$V
  PKGNAME-main=    erlang-$V
  PKGNAME-wx=    erlang-wx-$V
  EPOCH=    0
+
+REVISION-main=    2
+REVISION-wx=    1
  VERSION_SPEC=    >=21v0,<22v0
  PKGSPEC-main=    erlang-${VERSION_SPEC}
Index: 21/pkg/PLIST-main
===
RCS file: /cvs/ports/lang/erlang/21/pkg/PLIST-main,v
retrieving revision 1.5
diff -u -p -r1.5 PLIST-main
--- 21/pkg/PLIST-main    11 Jul 2022 22:29:08 -    1.5
+++ 21/pkg/PLIST-main    25 Oct 2022 19:18:05 -
@@ -1,5 +1,6 @@
  @option no-default-conflict
  @pkgpath lang/erlang/21
+@conflict erlang-wx->=21v0,<=21.3.8.24p0v0
  bin/ct_run21
  bin/dialyzer21
  bin/epmd21
@@ -2183,6 +2184,7 @@ lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}
  lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/dyntrace.beam
  lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/erts_alloc_config.beam
  lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/msacc.beam
+lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/observer_backend.beam
  lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/runtime_tools.app
  lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/runtime_tools.appup
  lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/ebin/runtime_tools.beam
@@ -2214,6 +2216,7 @@ lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}
  lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/examples/user-probe.d
  lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/examples/user-probe.systemtap
  lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/include/
+lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/include/observer_backend.hrl
  lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/priv/
  lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/priv/lib/
  @so lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}/priv/lib/dyntrace.so
@@ -2225,6 +2228,7 @@ lib/${ERLANG_V}/lib/${ERL_RUNTIME_TOOLS}
  

CVS: cvs.openbsd.org: ports

2022-11-03 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2022/11/03 10:57:45

Modified files:
devel/p5-Devel-CheckOS: Makefile distinfo 
devel/p5-Devel-CheckOS/pkg: PLIST 

Log message:
update p5-Devel-CheckOS to 1.95



Re: Openbox py-xdg -> py3-xdg

2022-11-03 Thread Stuart Henderson
Run "make prepare FETCH_PACKAGES=" and it will attempt to just binary 
packages to satisfy dependencies



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

On 3 November 2022 15:04:44 "Heppler, J. Scott"  wrote:


Thanks.  I updated my ports tree and will be starting from scratch.
Could I get away with preloading cmake, rust and llvm binaries?


On Nov 03, 2022: 14:29, Stuart Henderson wrote:

On 2022/11/03 06:43, Heppler, J. Scott wrote:

I've found patches that implement py3-xdg for openbox startup.

https://gitlab.com/FreeBSD/freebsd-ports/-/tree/main/x11-wm/openbox

Debian' patch adds Python 3 while retaining python 2

https://sources.debian.org/src/openbox/3.6.1-10/debian/patches/python3.patch/

I could attempt the OpenBSD patch but my inclination is to not continue
python 2 support.


--
J. Scott Heppler



Does this work?

Index: Makefile
===
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile1 Apr 2022 19:09:43 -   1.88
+++ Makefile3 Nov 2022 14:29:19 -
@@ -1,7 +1,7 @@
COMMENT =   small, fast & usable window manager

V = 3.6.1
-REVISION = 9
+REVISION = 10
DISTNAME =  openbox-${V}
SHARED_LIBS +=  obrender12.0# 32.0
SHARED_LIBS +=  obt 1.1 # 2.2
@@ -27,9 +27,8 @@ WANTLIB += ${COMPILER_LIBCXX} Xdmcp jpeg
MASTER_SITES =  ${HOMEPAGE}dist/openbox/

MODULES =   lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}

-RUN_DEPENDS =  devel/py-xdg \
+RUN_DEPENDS =  devel/py-xdg${MODPY_FLAVOR} \
devel/desktop-file-utils
LIB_DEPENDS +=  devel/gettext,-runtime \
devel/pango \
@@ -41,7 +40,7 @@ LIB_DEPENDS +=devel/gettext,-runtime \
FAKE_FLAGS =sysconfdir="${PREFIX}/share/examples/openbox" \
rcdir="${PREFIX}/share/examples/openbox"

-API_V =${V:R}
+API_V =${V:R}
SUBST_VARS =API_V

USE_GMAKE = Yes
@@ -55,5 +54,7 @@ CONFIGURE_ENV =   CPPFLAGS="-I${LOCALBASE}

pre-configure:
${SUBST_CMD} ${WRKSRC}/data/autostart/autostart.in
+   2to3 --fix=all --no-diffs --nobackups --verbose --write \
+   ${WRKSRC}/data/autostart/openbox-xdg-autostart

.include 
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/openbox/pkg/PLIST,v
retrieving revision 1.31
diff -u -p -r1.31 PLIST
--- pkg/PLIST   11 Mar 2022 20:16:51 -  1.31
+++ pkg/PLIST   3 Nov 2022 14:29:19 -
@@ -29,10 +29,10 @@ include/openbox/${API_V}/obt/util.h
include/openbox/${API_V}/obt/version.h
include/openbox/${API_V}/obt/xml.h
include/openbox/${API_V}/obt/xqueue.h
-lib/libobrender.a
+@static-lib lib/libobrender.a
lib/libobrender.la
@lib lib/libobrender.so.${LIBobrender_VERSION}
-lib/libobt.a
+@static-lib lib/libobt.a
lib/libobt.la
@lib lib/libobt.so.${LIBobt_VERSION}
lib/pkgconfig/obrender-3.5.pc



--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.




Re: NEW: net/accounts-sso/{gsignond,signond,libaccounts-glib,libaccounts-qt}

2022-11-03 Thread Rafael Sadowski
On Tue Nov 01, 2022 at 09:55:08AM +0100, Antoine Jacoutot wrote:
> On Mon, Oct 31, 2022 at 07:16:49PM +0100, Rafael Sadowski wrote:
> > On Mon Oct 31, 2022 at 02:36:32PM +, Stuart Henderson wrote:
> > > On 2022/10/30 17:30, Rafael Sadowski wrote:
> > > > I add a conflict between gsignond and signond becouse both install
> > > > share/dbus-1/services/com.google.code.AccountsSSO.SingleSignOn.service
> > > 
> > > This is going to make things difficult for anything depending on them..
> > > 
> > 
> > Fixed by removing com.google.code.AccountsSSO.SingleSignOn.service from
> > gsignond because it ships with 
> > com.google.code.AccountsSSO.gSingleSignOn.service.
> >^
> > Now signond comes with com.google.code.AccountsSSO.SingleSignOn.service and 
> > gsignond
> > with com.google.code.AccountsSSO.gSingleSignOn.service.
> 
> Hi Rafael.
> 
> Are we sure we want to go this way?

After your question I would say NO. It seems that no other Linux
distributions ship both. Most ship signond but not gsignond.

https://repology.org/project/signond/versions
https://repology.org/project/gsignond/versions

I'd want to do it that way, too. The libs can both coexist.

> 
> It seems they both provide the same DBus interface and service so they should
> conflict. Because what you really depend on is the interface/service.
> gSingleSignOn.service and SingleSignOn.service do *not* provide the same
> interfaces (see dbus/interfaces/ in gsignond), so if you remove
> com.google.code.AccountsSSO.SingleSignOn.service from it, it will not export
> these interfaces anymore.
> 
> For dependant ports dependency can be handled with using each where needed.
> (just an example, not tested)
> e.g. RUN_DEPENDS +=   gsignond-*|signond-*:net/accounts-sso/gsignond
> 
> Did you ask upstream about the reason of this conflict maybe?
> Although they don't seem very active.
> 
> -- 
> Antoine
> 



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Sebastien Marie
CVSROOT:/cvs
Module name:ports
Changes by: sema...@cvs.openbsd.org 2022/11/03 09:44:04

Modified files:
lang/rust  : Makefile distinfo 
lang/rust/patches: 
   patch-compiler_rustc_session_src_filesearch_rs 
   patch-compiler_rustc_target_src_spec_mod_rs 
   patch-library_std_src_sys_unix_thread_rs 
   patch-src_bootstrap_bin_rustc_rs 
   patch-src_bootstrap_builder_rs 
   patch-src_bootstrap_lib_rs 
   patch-src_bootstrap_test_rs 
   
patch-src_test_run-make-fulldeps_relocation-model_Makefile 
   patch-vendor_libgit2-sys_build_rs 
Removed files:
lang/rust/patches: patch-compiler_rustc_llvm_build_rs 
   
patch-compiler_rustc_target_src_spec_powerpc64_unknown_openbsd_rs 
   patch-src_bootstrap_native_rs 
   patch-vendor_cc-1_0_69_src_lib_rs 

Log message:
update lang/rust to 1.65.0

Announce: https://blog.rust-lang.org/2022/11/03/Rust-1.65.0.html
ChangeLog: 
https://github.com/rust-lang/rust/blob/stable/RELEASES.md#version-1650-2022-11-03



Re: Openbox py-xdg -> py3-xdg

2022-11-03 Thread Heppler, J. Scott

Thanks.  I updated my ports tree and will be starting from scratch.
Could I get away with preloading cmake, rust and llvm binaries?


On Nov 03, 2022: 14:29, Stuart Henderson wrote:

On 2022/11/03 06:43, Heppler, J. Scott wrote:

I've found patches that implement py3-xdg for openbox startup.

https://gitlab.com/FreeBSD/freebsd-ports/-/tree/main/x11-wm/openbox

Debian' patch adds Python 3 while retaining python 2

https://sources.debian.org/src/openbox/3.6.1-10/debian/patches/python3.patch/

I could attempt the OpenBSD patch but my inclination is to not continue
python 2 support.


--
J. Scott Heppler



Does this work?

Index: Makefile
===
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile1 Apr 2022 19:09:43 -   1.88
+++ Makefile3 Nov 2022 14:29:19 -
@@ -1,7 +1,7 @@
COMMENT =   small, fast & usable window manager

V = 3.6.1
-REVISION = 9
+REVISION = 10
DISTNAME =  openbox-${V}
SHARED_LIBS +=  obrender12.0# 32.0
SHARED_LIBS +=  obt 1.1 # 2.2
@@ -27,9 +27,8 @@ WANTLIB += ${COMPILER_LIBCXX} Xdmcp jpeg
MASTER_SITES =  ${HOMEPAGE}dist/openbox/

MODULES =   lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}

-RUN_DEPENDS =  devel/py-xdg \
+RUN_DEPENDS =  devel/py-xdg${MODPY_FLAVOR} \
devel/desktop-file-utils
LIB_DEPENDS +=  devel/gettext,-runtime \
devel/pango \
@@ -41,7 +40,7 @@ LIB_DEPENDS +=devel/gettext,-runtime \
FAKE_FLAGS =sysconfdir="${PREFIX}/share/examples/openbox" \
rcdir="${PREFIX}/share/examples/openbox"

-API_V =${V:R}
+API_V =${V:R}
SUBST_VARS =API_V

USE_GMAKE = Yes
@@ -55,5 +54,7 @@ CONFIGURE_ENV =   CPPFLAGS="-I${LOCALBASE}

pre-configure:
${SUBST_CMD} ${WRKSRC}/data/autostart/autostart.in
+   2to3 --fix=all --no-diffs --nobackups --verbose --write \
+   ${WRKSRC}/data/autostart/openbox-xdg-autostart

.include 
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/openbox/pkg/PLIST,v
retrieving revision 1.31
diff -u -p -r1.31 PLIST
--- pkg/PLIST   11 Mar 2022 20:16:51 -  1.31
+++ pkg/PLIST   3 Nov 2022 14:29:19 -
@@ -29,10 +29,10 @@ include/openbox/${API_V}/obt/util.h
include/openbox/${API_V}/obt/version.h
include/openbox/${API_V}/obt/xml.h
include/openbox/${API_V}/obt/xqueue.h
-lib/libobrender.a
+@static-lib lib/libobrender.a
lib/libobrender.la
@lib lib/libobrender.so.${LIBobrender_VERSION}
-lib/libobt.a
+@static-lib lib/libobt.a
lib/libobt.la
@lib lib/libobt.so.${LIBobt_VERSION}
lib/pkgconfig/obrender-3.5.pc



--
J. Scott Heppler

Penguin Innovations

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 



NOTICE: This e-mail message and any attachments may
contain legally privileged and confidential information intended
solely for the use of the intended recipients. If you are not an
intended recipient, you are hereby notified that you have
received this message in error and any review, dissemination,
distribution, copying, or other unauthorized use of this email
and any attachment is strictly prohibited. If you have received
this email in error, please notify the sender immediately and
delete the message and any attachments from your system.



Re: fix net/irssi on ld.bfd arches

2022-11-03 Thread Kurt Mosiejczuk
On Thu, Nov 03, 2022 at 09:32:10PM +1000, Jonathan Matthew wrote:
> On Thu, Nov 03, 2022 at 06:00:00AM -0600, k...@openbsd.org wrote:
> > http://build-failures.rhaalovely.net/sparc64/2022-10-31/net/irssi.log

> Now that this uses meson, it needs -Wl,--as-needed disabled to build on ld.bfd
> arches.  I copied this bit from another port.

> ok?

This fixes the build on sparc64 for me. Thank you.

ok kmos

--Kurt

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/irssi/Makefile,v
> retrieving revision 1.99
> diff -u -p -r1.99 Makefile
> --- Makefile  2 Nov 2022 01:18:42 -   1.99
> +++ Makefile  3 Nov 2022 11:35:01 -
> @@ -34,6 +34,13 @@ MODMESON_CONFIGURE_ARGS += -Ddisable-utf
>   -Dwith-perl=yes \
>   -Dwith-proxy=yes
>  
> +# disable meson's default of using "-Wl,--as-needed" on ld.bfd arches;
> +# build failures due to undefined references are often seen.
> +.include 
> +.if !${PROPERTIES:Mlld}
> +MODMESON_CONFIGURE_ARGS +=  -Db_asneeded=false
> +.endif
> +
>  RUN_DEPENDS-otr =net/irssi,-main
>  LIB_DEPENDS-otr =devel/glib2>=2.28.0 \
>   security/libgcrypt>=1.2.0 \
> 



Re: Openbox py-xdg -> py3-xdg

2022-11-03 Thread Stuart Henderson
On 2022/11/03 06:43, Heppler, J. Scott wrote:
> I've found patches that implement py3-xdg for openbox startup.
> 
> https://gitlab.com/FreeBSD/freebsd-ports/-/tree/main/x11-wm/openbox
> 
> Debian' patch adds Python 3 while retaining python 2
> 
> https://sources.debian.org/src/openbox/3.6.1-10/debian/patches/python3.patch/
> 
> I could attempt the OpenBSD patch but my inclination is to not continue
> python 2 support.
> 
> 
> -- 
> J. Scott Heppler
> 

Does this work?

Index: Makefile
===
RCS file: /cvs/ports/x11/openbox/Makefile,v
retrieving revision 1.88
diff -u -p -r1.88 Makefile
--- Makefile1 Apr 2022 19:09:43 -   1.88
+++ Makefile3 Nov 2022 14:29:19 -
@@ -1,7 +1,7 @@
 COMMENT =  small, fast & usable window manager
 
 V =3.6.1
-REVISION = 9
+REVISION = 10
 DISTNAME = openbox-${V}
 SHARED_LIBS += obrender12.0# 32.0
 SHARED_LIBS += obt 1.1 # 2.2
@@ -27,9 +27,8 @@ WANTLIB += ${COMPILER_LIBCXX} Xdmcp jpeg
 MASTER_SITES = ${HOMEPAGE}dist/openbox/
 
 MODULES =  lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
 
-RUN_DEPENDS =  devel/py-xdg \
+RUN_DEPENDS =  devel/py-xdg${MODPY_FLAVOR} \
devel/desktop-file-utils
 LIB_DEPENDS += devel/gettext,-runtime \
devel/pango \
@@ -41,7 +40,7 @@ LIB_DEPENDS +=devel/gettext,-runtime \
 FAKE_FLAGS =   sysconfdir="${PREFIX}/share/examples/openbox" \
rcdir="${PREFIX}/share/examples/openbox"
 
-API_V =${V:R}
+API_V =${V:R}
 SUBST_VARS =   API_V
 
 USE_GMAKE =Yes
@@ -55,5 +54,7 @@ CONFIGURE_ENV =   CPPFLAGS="-I${LOCALBASE}
 
 pre-configure:
${SUBST_CMD} ${WRKSRC}/data/autostart/autostart.in
+   2to3 --fix=all --no-diffs --nobackups --verbose --write \
+   ${WRKSRC}/data/autostart/openbox-xdg-autostart
 
 .include 
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/openbox/pkg/PLIST,v
retrieving revision 1.31
diff -u -p -r1.31 PLIST
--- pkg/PLIST   11 Mar 2022 20:16:51 -  1.31
+++ pkg/PLIST   3 Nov 2022 14:29:19 -
@@ -29,10 +29,10 @@ include/openbox/${API_V}/obt/util.h
 include/openbox/${API_V}/obt/version.h
 include/openbox/${API_V}/obt/xml.h
 include/openbox/${API_V}/obt/xqueue.h
-lib/libobrender.a
+@static-lib lib/libobrender.a
 lib/libobrender.la
 @lib lib/libobrender.so.${LIBobrender_VERSION}
-lib/libobt.a
+@static-lib lib/libobt.a
 lib/libobt.la
 @lib lib/libobt.so.${LIBobt_VERSION}
 lib/pkgconfig/obrender-3.5.pc



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/11/03 08:22:00

Modified files:
mail   : Makefile 

Log message:
+stalwart



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/11/03 08:21:13

Log message:
import mail/stalwart 0.2.0

bundles 3 rust ports for:

* Stalwart JMAP is an open-source JSON Meta Application Protocol server
designed to be secure, fast, robust and scalable. JMAP is a modern
protocol for synchronising data such as mail, calendars, or contacts
that makes much more efficient use of network resources.

* Stalwart IMAP is an open-source Internet Message Access Protocol server
designed to be secure, fast, robust and scalable. A JSON Meta
Application Protocol (JMAP) backend such as Stalwart JMAP is required to
use Stalwart IMAP (in other words, Stalwart IMAP is an imap4-to-jmap
proxy).

* CLI to administer a Stalwart JMAP server. Allows to:
- manage domains (including DKIM)
- manage accounts
- manage lists (lightweight mailing lists)
- manage groups (lightweight aliases)
- import accounts & mailboxes

cf https://jmap.io for more details on JMAP protocol/specifications. A
bit rough around the edges, but works in simple testing with
mutt/thunderbird against the imap proxy, and should soon work with meli
against the jmap server. A README provides basic info on how to run the
whole thing.

thanks to semarie@ for help fighting with cargo modules.

ok sthen@

Status:

Vendor Tag: landry
Release Tags:   landry_20221103

N ports/mail/stalwart/Makefile.inc
N ports/mail/stalwart/Makefile
N ports/mail/stalwart/cli/distinfo
N ports/mail/stalwart/cli/Makefile
N ports/mail/stalwart/cli/crates.inc
N ports/mail/stalwart/cli/patches/patch-Cargo_toml
N 
ports/mail/stalwart/cli/patches/patch-modcargo-crates_jmap-client-0_1_0_src_client_rs
N ports/mail/stalwart/cli/pkg/DESCR
N ports/mail/stalwart/cli/pkg/PLIST
N ports/mail/stalwart/imap/distinfo
N ports/mail/stalwart/imap/Makefile
N ports/mail/stalwart/imap/crates.inc
N ports/mail/stalwart/imap/patches/patch-Cargo_toml
N ports/mail/stalwart/imap/patches/patch-resources_config_config_yml
N ports/mail/stalwart/imap/pkg/PLIST
N ports/mail/stalwart/imap/pkg/DESCR
N ports/mail/stalwart/imap/pkg/stalwart_imap.rc
N ports/mail/stalwart/jmap/distinfo
N ports/mail/stalwart/jmap/Makefile
N ports/mail/stalwart/jmap/crates.inc
N ports/mail/stalwart/jmap/patches/patch-components_jmap_mail_Cargo_toml
N ports/mail/stalwart/jmap/patches/patch-Cargo_toml
N ports/mail/stalwart/jmap/patches/patch-components_store_src_blob_local_rs
N ports/mail/stalwart/jmap/patches/patch-components_store_rocksdb_src_lib_rs
N ports/mail/stalwart/jmap/patches/patch-resources_config_config_yml
N 
ports/mail/stalwart/jmap/patches/patch-modcargo-crates_librocksdb-sys-0_8_0+7_4_4_build_rs
N ports/mail/stalwart/jmap/patches/patch-components_store_Cargo_toml
N 
ports/mail/stalwart/jmap/patches/patch-modcargo-crates_mail-builder-0_2_3_Cargo_toml
N 
ports/mail/stalwart/jmap/patches/patch-modcargo-crates_mail-builder-0_2_3_src_encoders_encode_rs
N 
ports/mail/stalwart/jmap/patches/patch-modcargo-crates_mail-builder-0_2_3_src_headers_text_rs
N 
ports/mail/stalwart/jmap/patches/patch-modcargo-crates_mail-builder-0_2_3_src_lib_rs
N 
ports/mail/stalwart/jmap/patches/patch-modcargo-crates_mail-builder-0_2_3_src_mime_rs
N 
ports/mail/stalwart/jmap/patches/patch-modcargo-crates_mail-builder-0_2_3_src_encoders_base64_rs
N ports/mail/stalwart/jmap/pkg/DESCR
N ports/mail/stalwart/jmap/pkg/PLIST
N ports/mail/stalwart/jmap/pkg/stalwart_jmap.rc
N ports/mail/stalwart/jmap/pkg/README

No conflicts created by this import



Re: pcre2: newline any => anycrlf

2022-11-03 Thread Christian Weisgerber
YASUOKA Masahiko:

> Currently pcre2 is configured with "--enable-newline-is-any".
> I think we should change it to --enable-newline-is-anycrlf to avoid the
> conflict.

If I may ask: Why do we diverge from the default newline setting
at all?

I notice that (1) the FreeBSD port doesn't and (2) callers that
need to process non-Unix newlines can individually set this.

-- 
Christian "naddy" Weisgerber  na...@mips.inka.de



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2022/11/03 08:15:03

Modified files:
infrastructure/db: user.list 

Log message:
user.list: reuse uid/gid 564/565 for upcoming stalwart JMAP/IMAP ports



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Stefan Sperling
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2022/11/03 08:11:06

Modified files:
devel/got  : Makefile distinfo 

Log message:
update to got 0.78 (powered by lots of miod cheese)

- gotsh.1: Use Sx for referencing EXAMPLES (patch by Josiah Frentsos)
- change got_pack_parse_offset_delta tslen argument to size_t (op)
- fix regression test failures with Git 2.30.5 / 2.38.1 or later installed
- fix gotd(8) usage() string (patch by Josiah Frentsos)
- regress/rebase.sh: remove accidentally included absolute path to "got" (naddy)
- fix off_t type mismatches in printf format string arguments (naddy, op)
- fix spelling of "FastCGI" (patch by Josiah Frentsos)
- add missing `goto done;' on error path of read_raw_delta_data() (op)
- add bounds check when reading a delta offset from a packed object (op)
- check size before calling mmap(2) (op)
- sort getopt() option lists and switch statements (patch by Josiah Frentsos)
- make got.conf(5) warn about remotes configured in locally-shared repositories
- add missing check for errors from got_gotconfig_read() in open_worktree()
- plug a memory leak on error in got_gotconfig_read()
- convert pack filesize variables to off_t for large packs on 32-bit arch (op)
- remove sendfd pledge promise from gotd repo_read and repo_write processes
- add gotctl(8); initially supported commands are 'info' and 'stop'
- respect umask when creating or changing files and directories (op)
- fix typo which caused a double-free in gotd repo_write_shutdown()
- got-fetch-pack: fix wrong memmove length leading to dubious checksum failures
- avoid incomplete writes of pack file data in gotsh and got-send-pack
- add a test suite for gotd(8); check basic clone and send functionality
- require space between commit author name and email, for Git compatibility
- gotwebd: avoid 500 error code if erroring out in plaintext mode (landry)
- gotwebd: add respect_exportok flag, defaulting to off (landry)
- respect open files resource limit when sizing pack cache; regression from 0.71
- provide a diff of changes in a temp file while editing a commit log message
- fix memory and file descriptor leak for raw objects (regression from 0.77)
- remove casts which made older gcc versions unhappy
- fix free of wrong address on error in gotweb's parse.y



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/11/03 07:55:53

Added files:
databases/recoll/patches: patch-common_conf_post_h 

Log message:
avoid #include of a gcc header that doesn't work with ports-gcc



Openbox py-xdg -> py3-xdg

2022-11-03 Thread Heppler, J. Scott

I've found patches that implement py3-xdg for openbox startup.

https://gitlab.com/FreeBSD/freebsd-ports/-/tree/main/x11-wm/openbox

Debian' patch adds Python 3 while retaining python 2

https://sources.debian.org/src/openbox/3.6.1-10/debian/patches/python3.patch/

I could attempt the OpenBSD patch but my inclination is to not continue
python 2 support.


--
J. Scott Heppler



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/11/03 07:41:47

Modified files:
games/gargoyle : Makefile 

Log message:
set COMPILER=base-clang; fails with ports-gcc
ld: error: undefined symbol: std::filesystem::__cxx11::path::_M_split_cmpts()



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Aaron Bieber
CVSROOT:/cvs
Module name:ports
Changes by: abie...@cvs.openbsd.org 2022/11/03 07:41:22

Modified files:
net/tailscale  : Makefile distinfo 

Log message:
Update tailscale to 1.32.2



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/11/03 07:40:56

Modified files:
databases/recoll: Makefile distinfo 
databases/recoll/patches: patch-Makefile_in 
databases/recoll/pkg: PLIST-gui PLIST-main 

Log message:
update to recoll-1.33.1



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/11/03 07:12:49

Modified files:
telephony/asterisk: Makefile.inc 

Log message:
fix LLD_EMUL handling to avoid passing "-Wl," to ld on systems
where LLD_EMUL is defined but empty



fix net/irssi on ld.bfd arches

2022-11-03 Thread Jonathan Matthew
On Thu, Nov 03, 2022 at 06:00:00AM -0600, k...@openbsd.org wrote:
> http://build-failures.rhaalovely.net/sparc64/2022-10-31/net/irssi.log

Now that this uses meson, it needs -Wl,--as-needed disabled to build on ld.bfd
arches.  I copied this bit from another port.

ok?


Index: Makefile
===
RCS file: /cvs/ports/net/irssi/Makefile,v
retrieving revision 1.99
diff -u -p -r1.99 Makefile
--- Makefile2 Nov 2022 01:18:42 -   1.99
+++ Makefile3 Nov 2022 11:35:01 -
@@ -34,6 +34,13 @@ MODMESON_CONFIGURE_ARGS +=   -Ddisable-utf
-Dwith-perl=yes \
-Dwith-proxy=yes
 
+# disable meson's default of using "-Wl,--as-needed" on ld.bfd arches;
+# build failures due to undefined references are often seen.
+.include 
+.if !${PROPERTIES:Mlld}
+MODMESON_CONFIGURE_ARGS +=  -Db_asneeded=false
+.endif
+
 RUN_DEPENDS-otr =  net/irssi,-main
 LIB_DEPENDS-otr =  devel/glib2>=2.28.0 \
security/libgcrypt>=1.2.0 \



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/11/03 04:36:35

Modified files:
net/bgpq4  : Makefile distinfo 

Log message:
update to bgpq4-1.7



sparc64 bulk build report

2022-11-03 Thread kmos
Bulk build on sparc64-0a.ports.openbsd.org

Started : Mon Oct 31 00:02:28 MDT 2022
Finished: Thu Nov  3 05:59:17 MDT 2022
Duration: 3 Days 5 hours 57 minutes

Built using OpenBSD 7.2-current (GENERIC.MP) #1511: Sat Oct 29 01:29:47 MDT 2022

Built 9392 packages

Number of packages built each day:
Oct 30: 2626
Oct 31: 5584
Nov 1: 978
Nov 2: 202
Nov 3: 2



Critical path missing pkgs:
http://build-failures.rhaalovely.net/sparc64/2022-10-31/summary.log

Build failures: 43
http://build-failures.rhaalovely.net/sparc64/2022-10-31/astro/calcmysky.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/audio/ocp.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/cad/dxf2gcode.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/cad/oce.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/databases/recoll.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/devel/avr/gcc.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/devel/clang-tools-extra.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/devel/got.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/devel/kf5/kservice.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/devel/qcoro.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/devel/xsd.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/devel/zeal.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/games/arx-libertatis.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/games/gargoyle.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/geo/pdal.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/graphics/aspect-crop.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/graphics/asymptote.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/graphics/birdfont.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/graphics/gimp/snapshot.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/graphics/makehuman.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/graphics/opencolorio.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/graphics/posterazor.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/inputmethods/libime.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/lang/guile3.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/mail/mu.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/misc/open62541.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/multimedia/mkvtoolnix.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/net/irssi.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/security/clamav.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/security/veracrypt.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/sysutils/broot.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/sysutils/u-boot-asahi.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/telephony/asterisk/16.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/telephony/asterisk/18.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/telephony/asterisk/19.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/telephony/asterisk/20.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/textproc/libmarisa.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/textproc/xxdiff.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/www/unit/unit-ruby.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/x11/gnome/gjs.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/x11/gnome/secrets.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/x11/lumina.log
http://build-failures.rhaalovely.net/sparc64/2022-10-31/x11/qt5/qttranslations.log

Recurrent failures:
 failures/astro/calcmysky.log
 failures/audio/ocp.log
 failures/cad/dxf2gcode.log
 failures/cad/oce.log
 failures/databases/recoll.log
 failures/devel/avr/gcc.log
 failures/devel/clang-tools-extra.log
 failures/devel/qcoro.log
 failures/devel/xsd.log
 failures/games/arx-libertatis.log
 failures/games/gargoyle.log
 failures/geo/pdal.log
 failures/graphics/opencolorio.log
 failures/graphics/posterazor.log
 failures/inputmethods/libime.log
 failures/lang/guile3.log
 failures/mail/mu.log
 failures/misc/open62541.log
 failures/multimedia/mkvtoolnix.log
 failures/net/irssi.log
 failures/security/clamav.log
 failures/security/veracrypt.log
 failures/sysutils/broot.log
 failures/telephony/asterisk/16.log
 failures/telephony/asterisk/18.log
 failures/telephony/asterisk/19.log
 failures/x11/gnome/gjs.log
 failures/x11/gnome/secrets.log
 failures/x11/lumina.log
 failures/x11/qt5/qttranslations.log

New failures:
+failures/devel/got.log
+failures/devel/kf5/kservice.log
+failures/devel/zeal.log
+failures/sysutils/u-boot-asahi.log

Resolved failures:
-failures/audio/mumble,-main.log
-failures/devel/ccache.log
-failures/devel/jdk/1.8.log
-failures/devel/kf5/kio.log
-failures/devel/libdispatch.log

Re: new: games/zelda3

2022-11-03 Thread Stefan Sperling
On Tue, Nov 01, 2022 at 10:03:40PM +0300, Mikhail wrote:
> Works fine for me on current/amd64, one remark is that in README, in
> this paragraph:
> 
> The game reads the configuration file zelda3.ini, which must be placed
> in the current working directory where the game is started.
> An example can be found at /usr/local/share/examples/zelda3.ini.
> 
> Path should be changed to /usr/local/share/examples/zelda3/zelda3.ini

Thanks, fixed in this updated version.

Additional changes:

 - Clarify usage in README.

 - Change version suffix from 'pl' to 'pre'. There has not been an 0.1
   release upstream yet, so 'pre' is more appropriate; 'pl' would
   prevent an update to an eventual 0.1 release. (This project has been
   in development only since last August, which might explain why there
   is no release yet. But it is surprisingly stable and playable already.
   The code compiled cleanly with a trivial patch, and I've seen zero
   crashes while testing.)

 - The games/zeldea3 port longer needs the assets to build, which allows
   us to distribute a binary package. It downloads and builds MIT-licensed
   code only.
   
 - Ship pre-compiled assets in the -data package, rather than the ROM file.
   The ROM file is now only used as a data source while building this port.

 - Tweak the example config to make default button assignment work.
   For some reason the Right Shift key is not working (checked in gnome
   and in fwvm). Until this issue is understood, make our example
   config assign another key instead.

 - Add a zelda3-sprites port which provides additional sprites for Link.
   There is no explicit licence provided for sprites, which means we cannot
   distribute a -sprites package. I will try to clarify with upstream.

ok?


zelda3.tgz
Description: application/tar-gz


CVS: cvs.openbsd.org: ports

2022-11-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/11/03 02:58:00

Modified files:
sysutils/terraform: Makefile distinfo modules.inc 

Log message:
Update to terraform-1.3.4.



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/11/03 02:55:37

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.27.1.



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/11/03 02:55:23

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py3-boto3-1.26.1.



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/11/03 02:55:13

Modified files:
net/py-botocore: Makefile distinfo 
net/py-botocore/pkg: PLIST 

Log message:
Update to py3-botocore-1.29.1.



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/11/03 02:44:33

Modified files:
devel/libsoup3 : Makefile distinfo 

Log message:
Update to libsoup3-3.2.2.



CVS: cvs.openbsd.org: ports

2022-11-03 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/11/03 02:10:51

Modified files:
x11/evilwm : Makefile distinfo 

Log message:
update to evilwm-1.4.1