CVS: cvs.openbsd.org: ports

[Kevin Lo]

CVSROOT:/cvs
Module name:ports
Changes by: ke...@cvs.openbsd.org   2021/10/18 21:55:31

Modified files:
devel  : Makefile 

Log message:
+arm-compute-library

CVS: cvs.openbsd.org: ports

[Kevin Lo]

CVSROOT:/cvs
Module name:ports
Changes by: ke...@cvs.openbsd.org   2021/10/18 21:54:59

Log message:
Import arm-compute-library

DESCR: Arm Compute Library is a software library for computer vision and
machine learning.  It is a collection of low-level functions optimized for
Arm CPU and GPU architectures targeted at image processing, computer vision,
and machine learning.

Input and ok sthen@

Status:

Vendor Tag: kevlo
Release Tags:   kevlo_20211019

N ports/devel/arm-compute-library/Makefile
N ports/devel/arm-compute-library/distinfo
N ports/devel/arm-compute-library/patches/patch-SConscript
N ports/devel/arm-compute-library/patches/patch-SConstruct
N 
ports/devel/arm-compute-library/patches/patch-src_common_cpuinfo_CpuInfo_cpp
N 
ports/devel/arm-compute-library/patches/patch-src_runtime_CPP_CPPScheduler_cpp
N 
ports/devel/arm-compute-library/patches/patch-tests_framework_instruments_Instruments_h
N ports/devel/arm-compute-library/patches/patch-src_cpu_CpuContext_cpp
N 
ports/devel/arm-compute-library/patches/patch-src_core_NEON_kernels_arm_gemm_interleave_indirect_cpp
N 
ports/devel/arm-compute-library/patches/patch-src_core_NEON_kernels_arm_gemm_transform_cpp
N 
ports/devel/arm-compute-library/patches/patch-src_core_NEON_kernels_arm_gemm_gemm_hybrid_indirect_hpp
N ports/devel/arm-compute-library/pkg/DESCR
N ports/devel/arm-compute-library/pkg/PLIST

No conflicts created by this import

Re: neomutt segmentation fault

[Bjorn Ketelaars]

On Mon 18/10/2021 23:48, Theo Buehler wrote:
> +Cc maintainer
> 
> On Mon, Oct 18, 2021 at 09:07:07PM +, James Cook wrote:
> > I don't know if this is related to the other recent neomutt segfault
> > thread.
> 
> Unlikely.
> 
> > falsifian moth ~ $ pkg_info neomutt
> > Information for inst:neomutt-20211015
> 
> So it seems you're running -current, right?
> 
> > Thread 1 received signal SIGSEGV, Segmentation fault.
> > _libc_freeaddrinfo (ai=0x0) at /usr/src/lib/libc/net/freeaddrinfo.c:46
> > 46  free(p->ai_canonname);
> > (gdb) bt
> > #0  _libc_freeaddrinfo (ai=0x0) at /usr/src/lib/libc/net/freeaddrinfo.c:46
> > #1  0x079ac809e2b6 in getdnsdomainname ()
> 
> freeaddrinfo(3) is not NULL safe.
> 
> > falsifian moth ~ $ dmesg|head -n1
> > OpenBSD 7.0 (GENERIC.MP) #232: Thu Sep 30 14:25:29 MDT 2021
> > 
> > falsifian moth ~ $ uname -a
> > OpenBSD moth.falsifian.org 7.0 GENERIC.MP#43 amd64
> 
> These two kernel lines don't match and don't immediately tell me if
> you're on release or -current. 'sysctl kern.version' is better.

I'm reading your mail just after committing a similar diff:

I sent this diff yesterday afternoon, offlist, to sthen@ who Ok'ed it. I
did not commit earlier because of other things. However, I did manage to
open a PR upstream [0].

Hope I did not ruin your plans?

https://github.com/neomutt/neomutt/pull/3077

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2021/10/18 21:12:11

Modified files:
mail/neomutt   : Makefile 
Added files:
mail/neomutt/patches: patch-conn_getdomain_c 

Log message:
Fix segfault in NeoMutt

OK sthen@

Re: [PATCH 7/9] Upgrade devel/git-annex 8.20210223->8.20211011

[Solene Rapenne]

On Sun, 17 Oct 2021 20:39:12 -0700
Greg Steuck :

> I only built this and confirmed the executable is doesn't die right
> away. Somebody who cares should test.
> 
> OK?

works for me
ok solene@

Re: neomutt segmentation fault

[James Cook]

> > falsifian moth ~ $ pkg_info neomutt
> > Information for inst:neomutt-20211015
> 
> So it seems you're running -current, right?

Yes.

> > falsifian moth ~ $ dmesg|head -n1
> > OpenBSD 7.0 (GENERIC.MP) #232: Thu Sep 30 14:25:29 MDT 2021
> > 
> > falsifian moth ~ $ uname -a
> > OpenBSD moth.falsifian.org 7.0 GENERIC.MP#43 amd64
> 
> These two kernel lines don't match and don't immediately tell me if
> you're on release or -current. 'sysctl kern.version' is better.

Sorry, the dmesg line must have been preserved from a previous boot.

falsifian moth ~ $ sysctl kern.version
kern.version=OpenBSD 7.0-current (GENERIC.MP) #43: Mon Oct 18 07:58:26 MDT 2021
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP

> The diff below should fix your problem. Could you check, please?

Yes, that fixes it, thanks. Using it now.

-- 
James

Re: powerpc bulk build report

[George Koehler]

On Sat, 16 Oct 2021 17:43:35 +0100
Edd Barrett  wrote:

> On Sat, Oct 16, 2021 at 10:16:48AM -0600, c...@openbsd.org wrote:
> > http://build-failures.rhaalovely.net/powerpc/2021-09-28/games/odamex.log
> 
> > :1:9: error: macro name must be an identifier
> > #define -faltivec 1
> 
> Can you try this?

Edd, your diff pointed at the correct place in client/CMakeLists.txt.
I have a diff below, is my diff ok?

odamex uses OpenGL and macppc has trouble with OpenGL.  What works for
me is to run "GALLIUM_DRIVER=softpipe odamex" on a macppc G4 without
radeondrm.  Then the frame rate is too slow (press an arrow key, wait
5 seconds), so I can only try the first few menus.  Also, the title
screen (from doomdata) is tinted blue.  My G4 cpu has altivec; I tried
those menus with both the GENERIC kernel and a no-ALTIVEC kernel.

In client/CMakeLists.txt, remove -faltivec and pass -maltivec to just
one file.  This alone unbreaks the build on powerpc and powerpc64, but
the powerpc package would never call the -maltivec file (because clang
doesn't define __ALTIVEC__ in other files).  Add 2 more patches to
change __ALTIVEC__ to __powerpc__; my intent is to restore the
SDL_HasAltivec() check and call the -maltivec file if and only if the
powerpc cpu has altivec.

My powerpc64 isn't running X, so I didn't try to play my powerpc64
package.  clang for powerpc64 defaults to enabling -maltivec.

--George

Index: patches/patch-client_CMakeLists_txt
===
RCS file: /cvs/ports/games/odamex/patches/patch-client_CMakeLists_txt,v
retrieving revision 1.3
diff -u -p -r1.3 patch-client_CMakeLists_txt
--- patches/patch-client_CMakeLists_txt 29 Aug 2021 22:09:09 -  1.3
+++ patches/patch-client_CMakeLists_txt 17 Oct 2021 21:26:10 -
@@ -1,9 +1,12 @@
 $OpenBSD: patch-client_CMakeLists_txt,v 1.3 2021/08/29 22:09:09 sthen Exp $
 
+To fix powerpc* altivec, add -maltivec only in r_drawt_altivec.cpp,
+and allow r_draw.cpp to detect altivec at runtime.
+
 Index: client/CMakeLists.txt
 --- client/CMakeLists.txt.orig
 +++ client/CMakeLists.txt
-@@ -163,7 +163,7 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
+@@ -163,13 +163,14 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
  elseif(ODAMEX_TARGET_ARCH STREQUAL "i386")
if(NOT MSVC)
  # Pentium M has SSE2.
@@ -12,7 +15,15 @@ Index: client/CMakeLists.txt
else()
  target_compile_definitions(odamex PRIVATE /arch:SSE2)
endif()
-@@ -220,7 +220,7 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
+   message(STATUS "Default SIMD flags set to SSE2")
+ elseif(ODAMEX_TARGET_ARCH MATCHES "ppc")
+-  target_compile_definitions(odamex PRIVATE -faltivec)
++  set_source_files_properties(src/r_drawt_altivec.cpp
++PROPERTIES COMPILE_OPTIONS -maltivec)
+   message(STATUS "Default SIMD flags set to AltiVec")
+ endif()
+   else()
+@@ -220,7 +221,7 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
endif()
  
if(UNIX AND NOT APPLE)
Index: patches/patch-client_src_r_draw_cpp
===
RCS file: patches/patch-client_src_r_draw_cpp
diff -N patches/patch-client_src_r_draw_cpp
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-client_src_r_draw_cpp 17 Oct 2021 21:26:10 -
@@ -0,0 +1,26 @@
+$OpenBSD$
+
+To fix powerpc* altivec, add -maltivec only in r_drawt_altivec.cpp,
+and allow r_draw.cpp to detect altivec at runtime.
+
+Index: client/src/r_draw.cpp
+--- client/src/r_draw.cpp.orig
 client/src/r_draw.cpp
+@@ -1511,7 +1511,7 @@ static bool detect_optimizations()
+   if (SDL_HasSSE2())
+   optimizations_available.push_back(OPTIMIZE_SSE2);
+   #endif
+-  #ifdef __ALTIVEC__
++  #ifdef __powerpc__
+   if (SDL_HasAltiVec())
+   optimizations_available.push_back(OPTIMIZE_ALTIVEC);
+   #endif
+@@ -1609,7 +1609,7 @@ void R_InitVectorizedDrawers()
+   r_dimpatchD = r_dimpatchD_MMX;
+   }
+   #endif
+-  #ifdef __ALTIVEC__
++  #ifdef __powerpc__
+   else if (optimize_kind == OPTIMIZE_ALTIVEC)
+   {
+   R_DrawSpanD = R_DrawSpanD_c;
// TODO
Index: patches/patch-common_r_draw_h
===
RCS file: patches/patch-common_r_draw_h
diff -N patches/patch-common_r_draw_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-common_r_draw_h   17 Oct 2021 21:26:10 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+To fix powerpc* altivec, add -maltivec only in r_drawt_altivec.cpp,
+and allow r_draw.cpp to detect altivec at runtime.
+
+Index: common/r_draw.h
+--- common/r_draw.h.orig
 common/r_draw.h
+@@ -174,7 +174,7 @@ void R_DrawSlopeSpanD_MMX(void);
+ void r_dimpatchD_MMX(IWindowSurface*, argb_t color, int alpha, int x1, int 
y1, int w, int h);
+ #endif
+ 
+-#ifdef __ALTIVEC__
++#ifdef __powerpc__
+ void R_DrawSpanD_ALTIVEC(void);
+ 

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2021/10/18 16:20:15

Modified files:
mail/imapproxy : Makefile 
mail/imapproxy/patches: patch-src_main_c 

Log message:
mail/imapproxy: prepare for upcoming libcrypto bump. This has an
old verify callback that is only half compatible with opaque X509
structs. Fix the other half.

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2021/10/18 16:19:20

Modified files:
net/pavuk  : Makefile 
net/pavuk/patches: patch-src_myssl_openssl_c 

Log message:
net/pavuk: prepare for upcoming libcrypto bump. This has an old
verify callback that is only half compatible with opaque X509
structs. Fix the other half.

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2021/10/18 16:12:23

Modified files:
mail/pop3d : Makefile 
mail/pop3d/patches: patch-ssl_privsep_c 

Log message:
mail/pop3d: Prepare for upcoming libcrypto bump: X509_LOOKUP_METHOD
will become opaque, so this will no longer compile. Upstream never
updated this to be compatible with OpenSSL 1.1, so patch out the
port's copy of LibreSSL code and replace it with LibreSSL API.

ok jturner (maintainer)

Re: neomutt segmentation fault

[Theo Buehler]

+Cc maintainer

On Mon, Oct 18, 2021 at 09:07:07PM +, James Cook wrote:
> I don't know if this is related to the other recent neomutt segfault
> thread.

Unlikely.

> falsifian moth ~ $ pkg_info neomutt
> Information for inst:neomutt-20211015

So it seems you're running -current, right?

> Thread 1 received signal SIGSEGV, Segmentation fault.
> _libc_freeaddrinfo (ai=0x0) at /usr/src/lib/libc/net/freeaddrinfo.c:46
> 46  free(p->ai_canonname);
> (gdb) bt
> #0  _libc_freeaddrinfo (ai=0x0) at /usr/src/lib/libc/net/freeaddrinfo.c:46
> #1  0x079ac809e2b6 in getdnsdomainname ()

freeaddrinfo(3) is not NULL safe.

> falsifian moth ~ $ dmesg|head -n1
> OpenBSD 7.0 (GENERIC.MP) #232: Thu Sep 30 14:25:29 MDT 2021
> 
> falsifian moth ~ $ uname -a
> OpenBSD moth.falsifian.org 7.0 GENERIC.MP#43 amd64

These two kernel lines don't match and don't immediately tell me if
you're on release or -current. 'sysctl kern.version' is better.

The diff below should fix your problem. Could you check, please?

Index: Makefile
===
RCS file: /cvs/ports/mail/neomutt/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile15 Oct 2021 11:09:00 -  1.67
+++ Makefile18 Oct 2021 21:15:46 -
@@ -5,6 +5,7 @@ COMMENT=tty-based e-mail client, Mutt w
 GH_ACCOUNT=neomutt
 GH_PROJECT=neomutt
 GH_TAGNAME=20211015
+REVISION=  0
 
 CATEGORIES=mail
 HOMEPAGE=  https://neomutt.org/
Index: patches/patch-conn_getdomain_c
===
RCS file: patches/patch-conn_getdomain_c
diff -N patches/patch-conn_getdomain_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-conn_getdomain_c  18 Oct 2021 21:15:34 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+Index: conn/getdomain.c
+--- conn/getdomain.c.orig
 conn/getdomain.c
+@@ -149,7 +149,8 @@ int getdnsdomainname(struct Buffer *result)
+ rc = 0;
+ mutt_debug(LL_DEBUG1, "Hostname: %s\n", mutt_buffer_string(result));
+   }
+-  freeaddrinfo(lookup_result);
++  if (lookup_result)
++freeaddrinfo(lookup_result);
+ #endif
+ 
+   return rc;

Re: neomutt segmentation fault

[Jon Fineman]

Under 6.9 I had submitted several seq fault traces and had even more 
not submitted. I was experiencing a fault once a day at least.


Stuart provided a patch under 6.9 that greatly reduced the dumps. I 
had I think two with the patch.


With the new version of neomutt (20210205) using 7.0 release I have 
had it up since 15 Oct and I have not had one dump.


With your release I guess you upgraded to snapshots?


On Mon, Oct 18, 2021 at 09:07:07PM +, James Cook wrote:

I don't know if this is related to the other recent neomutt segfault
thread.

After sysupgrade -s and pkg_add -u, neomutt crashes immediately when I
start it. Is anyone else seeing this? Details below. I took filesystem
backups before upgrading, so I can probably figure out the exact
(working) neomutt version I had before if that's useful.

I guess my next step will be to see whether it's related to my
some particular part of my .neomuttrc.

falsifian moth ~ $ pkg_info neomutt
Information for inst:neomutt-20211015

...

falsifian moth ~ $ egdb neomutt
GNU gdb (GDB) 7.12.1
Copyright (C) 2017 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later 
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
and "show warranty" for details.
This GDB was configured as "x86_64-unknown-openbsd7.0".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
.
Find the GDB manual and other documentation resources online at:
.
For help, type "help".
Type "apropos word" to search for commands related to "word"...
Reading symbols from neomutt...(no debugging symbols found)...done.
(gdb) run
Starting program: /usr/local/bin/neomutt
[New process 13376]

Thread 1 received signal SIGSEGV, Segmentation fault.
_libc_freeaddrinfo (ai=0x0) at /usr/src/lib/libc/net/freeaddrinfo.c:46
46  free(p->ai_canonname);
(gdb) bt
#0  _libc_freeaddrinfo (ai=0x0) at /usr/src/lib/libc/net/freeaddrinfo.c:46
#1  0x079ac809e2b6 in getdnsdomainname ()
#2  0x079ac800ee1f in mutt_init ()
#3  0x079ac80171f4 in main ()
(gdb)

falsifian moth ~ $ dmesg|head -n1
OpenBSD 7.0 (GENERIC.MP) #232: Thu Sep 30 14:25:29 MDT 2021

falsifian moth ~ $ uname -a
OpenBSD moth.falsifian.org 7.0 GENERIC.MP#43 amd64

Let me know if more details would be useful.

--
James



--

Re: Teeworlds update - Teeworlds 0.7.5

[Thomas Frohwein]

On Thu, Sep 16, 2021 at 10:32:37AM +0200, Stefan Hagen wrote:
> Stefan Hagen wrote:
> > Daniel Dickman wrote:
> > > On Tue, Sep 14, 2021 at 2:16 AM Stefan Hagen
> > >  wrote:
> > > >
> > > > Daniel Dickman wrote:
> > > > > I’ve tried the update and unfortunately it doesn’t work for me. Which
> > > > > is too bad because I really want to switch this one over to python3.
> > > > >
> > > > > After I launch teeworlds, I see a loading bar and hear the music. Then
> > > > > the screen goes red and I don’t see anything.
> > > > >
> > > > > I’m on the latest OpenBSD release that sysupgrade gives me. And this
> > > > > box (a lenovo amd64 laptop) has an amdgpu video card.
> > > > >
> > > > > If you want me to try anything else let me know.
> > > >
> > > > This is unexpected, because I'm running it on amdgpu as well.
> > > > See: https://codevoid.de/9/p/rec-screen-20210914_080244.mp4
> > > >
> > > > Is there any console output that looks interesting? Something in
> > > > /var/log/messages or Xorg.0.log?
> > > 
> > > nothing stands out.
> > > 
> > > >
> > > > The only issue on amdgpu for me (which is not present on intel) is that
> > > > amdgpu freaks out when switching from window mode to fullscreen mode.
> > > > Starting the game in one of these modes is fine, but switching within
> > > > the game leads to weird flickering and I need to restart X.
> > > >
> > > 
> > > if it works for you, i'm willing to commit it to get rid of the
> > > python2 dep (and if no one else objects to doing this)
> > > 
> > > and if other people have the same issue as me then maybe it could
> > > create more motivation to help fix the issue.
> > > 
> > > my 2 cents (the port itself looked fine to me).

I agree. Haven't checked it on amdgpu; only inteldrm.

> > Maybe we should really submit it and someone who can reproduce the crash
> > is able to provide a fix or more info before 7.0. And if not... it's not
> > mission critical software.
> 
> Sorry, I mixed up the symptoms. You had the red screen. Solene
> experienced a crash on quitting the application and had to kill -9 it
> (on intel).

I get a segfault on quitting with the gamecontroller plugged in, but
not without it. There might be a bug in the SDL2 backend:

(gdb) bt full
#0  0x08455211e1a2 in BSD_JoystickClose () from 
/usr/local/lib/libSDL2.so.0.10
No symbol table info available.
#1  0x084552056dc8 in SDL_JoystickClose_REAL () from 
/usr/local/lib/libSDL2.so.0.10
No symbol table info available.
#2  0x0842a2c7aa1c in CInput::CloseJoysticks() ()
No symbol table info available.
#3  0x0842a2c7aab2 in CInput::~CInput() ()
No symbol table info available.
#4  0x0842a2c7498e in main ()
No symbol table info available.

Can probably look into that later. For now I think that teeworlds 0.6.4
is getting too old and we should update and fix the remaining issues as
needed based on the new version.

The following lines are superfluous and the port builds fine without
them:

WRKSRC= ${WRKDIR}/${DISTNAME}
WRKDIST=${WRKSRC}

ok thfr@ for the update with those 2 lines removed.

Re: [update] net/usockets-0.8.1 ,www/uwebsockets-20.6.0, www/purritobin-0.6.7, databases/lmdbxx-1.0.0 (new)

[aisha]

ping

usockets - 0.8.1
uwebsockets - 20.6.0
purritobin - 0.6.7
 Additions to www/purritobin
 - auto cleaning of pastes
 - web portal for pasting
 - in-built http server, good for tiny pastes and testing setups
 - http header manipulation

depends on a new port databases/lmdbxx, which is attached in the
patch as well.

Cheers,
Aisha

diff --git a/databases/lmdbxx/Makefile b/databases/lmdbxx/Makefile
new file mode 100644
index 000..b676b039ba3
--- /dev/null
+++ b/databases/lmdbxx/Makefile
@@ -0,0 +1,41 @@
+# $OpenBSD: $
+
+COMMENT =  C++17 wrapper for Lightning Memory-Mapped Database
+
+VERSION =  1.0.0
+DISTNAME = lmdbxx-${VERSION}
+
+CATEGORIES =   databases
+
+GH_ACCOUNT =   hoytech
+GH_PROJECT =   lmdbxx
+#GH_TAGNAME =  1.0.0
+GH_COMMIT =f1f00acf5f5045b43d7189c2b23ae5ca103a6faa
+
+HOMEPAGE = https://github.com/hoytech/lmdbxx
+
+MAINTAINER =   Aisha Tammy 
+
+# Unlicense
+PERMIT_PACKAGE =   Yes
+
+COMPILER = base-clang ports-gcc
+
+NO_BUILD = Yes
+
+RUN_DEPENDS =  databases/lmdb
+
+do-install:
+   cd ${WRKSRC} && \
+   mkdir -p ${PREFIX}/include && \
+   ${INSTALL_DATA} lmdb++.h ${PREFIX}/include 
+
+do-test:
+   cd ${WRKSRC} && \
+   rm -rf testdb && \
+   mkdir -p testdb && \
+   ${CXX} ${CXXFLAGS} -std=c++17 -Wall -I${LOCALBASE}/include -I. \
+   -o check check.cc ${LDFLAGS} -L${LOCALBASE}/lib -llmdb && \
+   ./check
+
+.include 
diff --git a/databases/lmdbxx/distinfo b/databases/lmdbxx/distinfo
new file mode 100644
index 000..2cd8254361c
--- /dev/null
+++ b/databases/lmdbxx/distinfo
@@ -0,0 +1,2 @@
+SHA256 (lmdbxx-1.0.0-f1f00acf.tar.gz) = 
hcZXFqDBZaZ8N3t6DP6m5mMypWnY2kadLD49v5mwSZo=
+SIZE (lmdbxx-1.0.0-f1f00acf.tar.gz) = 53347
diff --git a/databases/lmdbxx/pkg/DESCR b/databases/lmdbxx/pkg/DESCR
new file mode 100644
index 000..29e045d9927
--- /dev/null
+++ b/databases/lmdbxx/pkg/DESCR
@@ -0,0 +1,4 @@
+A comprehensive C++ wrapper for the LMDB embedded
+database library, offering both an error-checked
+procedural interface and an object-oriented resource
+interface with RAII semantics.
diff --git a/databases/lmdbxx/pkg/PLIST b/databases/lmdbxx/pkg/PLIST
new file mode 100644
index 000..cdf3f124dec
--- /dev/null
+++ b/databases/lmdbxx/pkg/PLIST
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST,v$
+include/lmdb++.h
diff --git a/net/usockets/Makefile b/net/usockets/Makefile
index a484c23f93a..c33d35207bc 100644
--- a/net/usockets/Makefile
+++ b/net/usockets/Makefile
@@ -3,38 +3,29 @@
 COMMENT=   eventing, networking & crypto for async applications
 CATEGORIES =   net
 
-VERSION =  0.6.0
-REVISION = 1
-
-DISTNAME = usockets-${VERSION}
-PKGNAME =  ${DISTNAME:L}
-
-SHARED_LIBS =  usockets 1.0
+SHARED_LIBS =  usockets 2.0
 
 GH_ACCOUNT =   uNetworking
 GH_PROJECT =   uSockets
-#GH_TAGNAME =  v0.6.0
-# cstdlib include error
-GH_COMMIT =7683672d87067cd75b854f4e36b9820f4809a4be
-
+GH_TAGNAME =   v0.8.1
+PKGNAME =  ${DISTNAME:L}
 
 MAINTAINER =   Aisha Tammy 
 
 # Apache 2.0
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += ${COMPILER_LIBCXX} crypto ssl uv
+WANTLIB += ${COMPILER_LIBCXX} crypto ssl uv
 
 # C11 C++17
 COMPILER = base-clang ports-gcc
 
 LIB_DEPENDS =  devel/libuv
 
-USE_GMAKE =Yes
-MAKE_FLAGS =   CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
-   CC="${CC}" CXX="${CXX}" \
-   LIBusockets_VERSION="${LIBusockets_VERSION}"
+MAKE_ENV = LIBusockets_VERSION="${LIBusockets_VERSION}"
+
+FAKE_FLAGS =   PREFIX=${TRUEPREFIX}
 
-NO_TEST =  Yes
+# tests need A LOT of file desrciptors ~5000-6000
 
 .include 
diff --git a/net/usockets/distinfo b/net/usockets/distinfo
index 964ba508e9e..a437989a34e 100644
--- a/net/usockets/distinfo
+++ b/net/usockets/distinfo
@@ -1,2 +1,2 @@
-SHA256 (usockets-0.6.0-7683672d.tar.gz) = 
0OooGCHD8ezNIcaB1zDPK6RQLGGYGZJb24Vemjlat7c=
-SIZE (usockets-0.6.0-7683672d.tar.gz) = 57634
+SHA256 (uSockets-0.8.1.tar.gz) = OzO1kkqSV3hU4jJrPi05OEnsAL64ZaEnG/JMDyEMwdY=
+SIZE (uSockets-0.8.1.tar.gz) = 65470
diff --git a/net/usockets/patches/patch-Makefile 
b/net/usockets/patches/patch-Makefile
index e718b65a265..5ea504d9f0f 100644
--- a/net/usockets/patches/patch-Makefile
+++ b/net/usockets/patches/patch-Makefile
@@ -1,4 +1,4 @@
-$OpenBSD: patch-Makefile,v 1.3 2020/12/11 22:33:22 sthen Exp $
+: patch-Makefile,v 1.3 2020/12/11 22:33:22 sthen Exp $
 
 add shared + static lib + pkg-config file
 remove -flto -O3
@@ -6,7 +6,7 @@ remove -flto -O3
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -1,60 +1,40 @@
+@@ -1,72 +1,46 @@
 -# WITH_OPENSSL=1 enables OpenSSL 1.1+ support or BoringSSL
 -# For now we need to link with C++ for OpenSSL support, but should be removed 
with time
 -ifeq ($(WITH_OPENSSL),1)
@@ -30,69 +30,85 @@ Index: Makefile
 -  override CFLAGS += -DLIBUS_USE_LIBUV
 -  override LDFLAGS += -luv
 -endif
-+PREFIX ?= "/usr/local"
++PREFIX ?= /usr/local
 +LIBDIR ?= "$(PREFIX)/lib"
 +INCLUDEDIR ?= 

neomutt segmentation fault

[James Cook]

I don't know if this is related to the other recent neomutt segfault
thread.

After sysupgrade -s and pkg_add -u, neomutt crashes immediately when I
start it. Is anyone else seeing this? Details below. I took filesystem
backups before upgrading, so I can probably figure out the exact
(working) neomutt version I had before if that's useful.

I guess my next step will be to see whether it's related to my
some particular part of my .neomuttrc.

falsifian moth ~ $ pkg_info neomutt
Information for inst:neomutt-20211015

...

falsifian moth ~ $ egdb neomutt
GNU gdb (GDB) 7.12.1
Copyright (C) 2017 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later 
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
and "show warranty" for details.
This GDB was configured as "x86_64-unknown-openbsd7.0".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
.
Find the GDB manual and other documentation resources online at:
.
For help, type "help".
Type "apropos word" to search for commands related to "word"...
Reading symbols from neomutt...(no debugging symbols found)...done.
(gdb) run
Starting program: /usr/local/bin/neomutt
[New process 13376]

Thread 1 received signal SIGSEGV, Segmentation fault.
_libc_freeaddrinfo (ai=0x0) at /usr/src/lib/libc/net/freeaddrinfo.c:46
46  free(p->ai_canonname);
(gdb) bt
#0  _libc_freeaddrinfo (ai=0x0) at /usr/src/lib/libc/net/freeaddrinfo.c:46
#1  0x079ac809e2b6 in getdnsdomainname ()
#2  0x079ac800ee1f in mutt_init ()
#3  0x079ac80171f4 in main ()
(gdb)

falsifian moth ~ $ dmesg|head -n1
OpenBSD 7.0 (GENERIC.MP) #232: Thu Sep 30 14:25:29 MDT 2021

falsifian moth ~ $ uname -a
OpenBSD moth.falsifian.org 7.0 GENERIC.MP#43 amd64

Let me know if more details would be useful.

-- 
James

Re: emulators/fceux: update 2.2.3 -> 2.4.0

[Omar Polo]

Rafael Sadowski  writes:

> On Mon Oct 18, 2021 at 09:08:17PM +0200, Omar Polo wrote:
>> Hello,
>> 
>> +
>> +MODULES =   devel/cmake \
>> +lang/lua \
>> +x11/qt5
>>  
>>  MAKE_ENV =  CC="${CC}" \
>>  CXX="${CXX}" \
>>  CXXFLAGS="${CXXFLAGS} -DIOAPI_NO_64" \
>>  LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lpthread"
>
> After the move to cmake I don't think we need all environment variables,
> or even any of them.

Yes, it builds fine without the explicit MAKE_ENV, attaching an updated
patch.

The -DIOAPI_NO_64 is used in src/utils/ioapi.cpp

  17 #if defined(__APPLE__) || defined(IOAPI_NO_64)
  18 // In darwin and perhaps other BSD variants off_t is a 64 bit value,
hence no need for specific 64 bit functions
  19 #define FOPEN_FUNC(filename, mode) fopen(filename, mode)
  20 #define FTELLO_FUNC(stream) ftello(stream)
  21 #define FSEEKO_FUNC(stream, offset, origin) fseeko(stream, offset, origin)
  22 #else
  23 #define FOPEN_FUNC(filename, mode) fopen64(filename, mode)
  24 #define FTELLO_FUNC(stream) ftello64(stream)
  ...

but that file is not built anymore, so I guess is safe to drop it.

Oh, I forgot one thing in the previous mail.  The port currently has a

# XXX scons picks up x264.h even though it's in an apparently unused ifdef block
DPB_PROPERTIES =nojunk 

I'm not sure what to do with that: I'm dropping it since now the port
depends on x264 directly, but I'm not sure.


Index: Makefile
===
RCS file: /home/cvs/ports/emulators/fceux/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile12 Jul 2019 20:46:08 -  1.20
+++ Makefile18 Oct 2021 20:49:22 -
@@ -2,13 +2,11 @@
 
 COMMENT =  emulator for Nintendo Entertainment System
 
-V =2.2.3
-DISTNAME = fceux-${V}.src
-PKGNAME =  fceux-${V}
+V =2.4.0
+DISTNAME = fceux-${V}
 CATEGORIES =   emulators games
-REVISION = 5
 
-HOMEPAGE = http://fceux.com/
+HOMEPAGE = https://fceux.com/web/home.html
 
 MAINTAINER =   Anthony J. Bentley 
 
@@ -18,52 +16,41 @@ PERMIT_PACKAGE =Yes
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fceultra/}
 
 WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
-WANTLIB += Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender atk-1.0 cairo expat ffi fontconfig
-WANTLIB += GL SDL X11 c gd gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0
-WANTLIB += gobject-2.0 gtk-x11-2.0 lua5.1 m pthread z
-WANTLIB += freetype fribidi gio-2.0 gmodule-2.0 graphite2 harfbuzz
-WANTLIB += intl pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += png xcb xcb-render xcb-shm
+WANTLIB += GL GLU Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
+WANTLIB += SDL2 c m minizip x264 z
 
 COMPILER = base-clang ports-gcc base-gcc
 
 RUN_DEPENDS =  devel/desktop-file-utils
-LIB_DEPENDS =  devel/sdl \
-   graphics/gd \
-   x11/gtk+2 
-
-MODULES =  devel/scons \
-   lang/lua
-
-MAKE_ENV = CC="${CC}" \
-   CXX="${CXX}" \
-   CXXFLAGS="${CXXFLAGS} -DIOAPI_NO_64" \
-   LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lpthread"
-MODSCONS_FLAGS =   SYSTEM_LUA=1
-
-CONFIGURE_STYLE =  scons
-
-WRKDIST =  ${WRKDIR}/fceux-${V}
+LIB_DEPENDS =  archivers/minizip \
+   devel/sdl2 \
+   multimedia/x264
+
+MODULES =  devel/cmake \
+   lang/lua \
+   x11/qt5
 
 NO_TEST =  Yes
 
-SUBST_VARS +=  MODLUA_WANTLIB
-SUBST_VARS +=  MODLUA_LIB
+SUBST_VARS +=  HOMEPAGE V
 
 post-extract:
@perl -MExtUtils::Command -e dos2unix ${WRKSRC}
+   chmod +x ${WRKSRC}/scripts/genGitHdr.sh
 
 pre-configure:
-   ${SUBST_CMD} ${WRKDIST}/SConstruct ${WRKDIST}/fceux.desktop
+   ${SUBST_CMD} ${WRKDIST}/fceux.desktop ${WRKDIST}/scripts/genGitHdr.sh
+
+do-build:
+   @${MODCMAKE_BUILD_TARGET}
+   make -C ${WRKSRC}/fceux-server/
 
 do-install:
-   ${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} -C ${WRKSRC} \
-   ${MODSCONS_ENV} ${MODSCONS_FLAGS} \
-   --prefix=${PREFIX} ${INSTALL_TARGET}
-
-#BROKEN = nojunk
-# XXX scons picks up x264.h even though it's in an apparently unused ifdef 
block
-DPB_PROPERTIES =   nojunk
+   @${MODCMAKE_INSTALL_TARGET}
+   ${INSTALL_PROGRAM} ${WRKSRC}/fceux-server/fceux-net-server \
+   ${PREFIX}/bin/fceux-net-server
+   ${INSTALL_DATA_DIR} ${PREFIX}/etc
+   ${INSTALL_DATA} ${WRKSRC}/fceux-server/fceux-server.conf \
+   ${PREFIX}/etc/
 
 .include 
Index: distinfo

Re: emulators/fceux: update 2.2.3 -> 2.4.0

[Rafael Sadowski]

On Mon Oct 18, 2021 at 09:08:17PM +0200, Omar Polo wrote:
> Hello,
> 
> +
> +MODULES =devel/cmake \
> + lang/lua \
> + x11/qt5
>  
>  MAKE_ENV =   CC="${CC}" \
>   CXX="${CXX}" \
>   CXXFLAGS="${CXXFLAGS} -DIOAPI_NO_64" \
>   LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lpthread"

After the move to cmake I don't think we need all environment variables,
or even any of them.

Re: games/godot: proposal to add GodotSteam for broader compatibility

[Thomas Frohwein]

Now against HEAD... sorry.

On Mon, Oct 18, 2021 at 01:19:52PM -0600, Thomas Frohwein wrote:
> Hi,
> 
> I've been experimenting with running commercial games with our Godot
> port and a substantial number refuse to run because they can't find
> Steam in Godot's namespace. Those games seem to be built with a module
> "GodotSteam" added during compile time.
> 
> This diff below adds said module to the port. It allows running some
> more (indie) games on OpenBSD. I know of "Nightfall Hacker", "SJ-19
> Learns to Love!", and "Cruelty Squad" that I've been able to run with
> this change. There are probably more...
> 
> This diff just adds it to the existing port, but as it leads to a
> deviation from "vanilla" Godot, it might be preferrable to make this a
> flavor, maybe godot-godotsteam? Or 2 separate ports that are based on
> the same Makefile.inc? Of course, maintenance would likely be easier
> without adding such complexity...
> 
> You can test that the namespace now exists in Godot by opening a
> project in the editor and adding a script, then starting to enter
> something from the Steam namespace like 'Steam.getAchievement' into the
> code and seeing this show up in the auto completion. All this works
> through the Goldberg emulator library, so some Steam functionality may
> be stubbed or not return what you expect if used for actual development.
> 
> comments or oks?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/godot/Makefile,v
> retrieving revision 1.25
> diff -u -p -r1.25 Makefile
> --- Makefile  31 Aug 2021 11:59:56 -  1.25
> +++ Makefile  18 Oct 2021 18:53:50 -
> @@ -5,9 +5,11 @@ BROKEN-powerpc64 =   Unknown ISA
>  
>  COMMENT =2D and 3D game engine
>  
> -V =  3.3.3
> +V =  3.3.4
[...]

Index: Makefile
===
RCS file: /cvs/ports/games/godot/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile5 Oct 2021 07:00:08 -   1.26
+++ Makefile18 Oct 2021 19:32:54 -
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.26 2021/10/05 07:00:08 thfr Exp $
+# $OpenBSD: Makefile,v 1.25 2021/08/31 11:59:56 kirby Exp $
 
 BROKEN-powerpc =   fails at runtime, the UI is totally blank
 BROKEN-powerpc64 = Unknown ISA
@@ -6,8 +6,10 @@ BROKEN-powerpc64 = Unknown ISA
 COMMENT =  2D and 3D game engine
 
 V =3.3.4
+GODOTSTEAM_V = g333-s151-g397
 DISTNAME = godot-${V}-stable
 PKGNAME =  godot-${V}
+REVISION = 0
 CATEGORIES =   games
 HOMEPAGE = https://godotengine.org/
 MAINTAINER =   Omar Polo 
@@ -18,14 +20,18 @@ PERMIT_PACKAGE =Yes
 WANTLIB += ${COMPILER_LIBCXX}
 WANTLIB += GL X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender c enet execinfo freetype intl m mbedtls mbedcrypto
-WANTLIB += mbedx509 mpcdec ogg opus opusfile png sndio theora theoradec
-WANTLIB += vorbis vorbisfile webp xcb z pcre2-32 vpx zstd
+WANTLIB += mbedx509 mpcdec ogg opus opusfile png sndio steam_api theora
+WANTLIB += theoradec vorbis vorbisfile webp xcb z pcre2-32 vpx zstd
 
 # C++14
 COMPILER = base-clang ports-gcc
 
 MASTER_SITES = https://downloads.tuxfamily.org/godotengine/${V}/
+MASTER_SITES0 =https://github.com/Gramps/GodotSteam/archive/refs/tags/
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
+   ${GODOTSTEAM_V}.tar.gz:0
 EXTRACT_SUFX = .tar.xz
+DIST_SUBDIR =   ${PKGNAME}
 
 MODULES =  devel/scons
 # Can't disable builtin_bullet until devel/bullet has been updated to 2.88
@@ -33,7 +39,7 @@ MODULES = devel/scons
 # sharedlib_ext in modules/mono/config.py to '.so.1.0'
 MODSCONS_FLAGS =   CC="${CC}" \
CXX="${CXX}" \
-   CFLAGS="${CFLAGS}" \
+   CFLAGS="${CFLAGS} 
-I${LOCALBASE}/include/goldberg_emulator/sdk_includes" \
CXXFLAGS="${CXXFLAGS} -Wno-deprecated-register" \
LINKFLAGS="${LDFLAGS} -lintl -lmpcdec" \
builtin_enet=no \
@@ -51,6 +57,7 @@ MODSCONS_FLAGS =  CC="${CC}" \
builtin_pcre2=no \
builtin_zlib=no \
builtin_zstd=no \
+   
custom_modules=${WRKDIR}/GodotSteam-${GODOTSTEAM_V}/godotsteam \
progress=no \
pulseaudio=no \
target=release_debug \
@@ -63,6 +70,7 @@ LIB_DEPENDS = archivers/zstd \
audio/opusfile \
devel/gettext,-runtime \
devel/pcre2 \
+   games/goldberg_emulator \
graphics/libwebp \
graphics/png \
multimedia/libtheora \
@@ -84,6 +92,12 @@ post-extract:
 
 pre-configure:
${SUBST_CMD} ${WRKSRC}/drivers/unix/os_unix.cpp
+   sed -E -i 

games/godot: proposal to add GodotSteam for broader compatibility

[Thomas Frohwein]

Hi,

I've been experimenting with running commercial games with our Godot
port and a substantial number refuse to run because they can't find
Steam in Godot's namespace. Those games seem to be built with a module
"GodotSteam" added during compile time.

This diff below adds said module to the port. It allows running some
more (indie) games on OpenBSD. I know of "Nightfall Hacker", "SJ-19
Learns to Love!", and "Cruelty Squad" that I've been able to run with
this change. There are probably more...

This diff just adds it to the existing port, but as it leads to a
deviation from "vanilla" Godot, it might be preferrable to make this a
flavor, maybe godot-godotsteam? Or 2 separate ports that are based on
the same Makefile.inc? Of course, maintenance would likely be easier
without adding such complexity...

You can test that the namespace now exists in Godot by opening a
project in the editor and adding a script, then starting to enter
something from the Steam namespace like 'Steam.getAchievement' into the
code and seeing this show up in the auto completion. All this works
through the Goldberg emulator library, so some Steam functionality may
be stubbed or not return what you expect if used for actual development.

comments or oks?

Index: Makefile
===
RCS file: /cvs/ports/games/godot/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile31 Aug 2021 11:59:56 -  1.25
+++ Makefile18 Oct 2021 18:53:50 -
@@ -5,9 +5,11 @@ BROKEN-powerpc64 = Unknown ISA
 
 COMMENT =  2D and 3D game engine
 
-V =3.3.3
+V =3.3.4
+GODOTSTEAM_V = g333-s151-g397
 DISTNAME = godot-${V}-stable
 PKGNAME =  godot-${V}
+REVISION = 0
 CATEGORIES =   games
 HOMEPAGE = https://godotengine.org/
 MAINTAINER =   Omar Polo 
@@ -18,14 +20,18 @@ PERMIT_PACKAGE =Yes
 WANTLIB += ${COMPILER_LIBCXX}
 WANTLIB += GL X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender c enet execinfo freetype intl m mbedtls mbedcrypto
-WANTLIB += mbedx509 mpcdec ogg opus opusfile png sndio theora theoradec
-WANTLIB += vorbis vorbisfile webp xcb z pcre2-32 vpx zstd
+WANTLIB += mbedx509 mpcdec ogg opus opusfile png sndio steam_api theora
+WANTLIB += theoradec vorbis vorbisfile webp xcb z pcre2-32 vpx zstd
 
 # C++14
 COMPILER = base-clang ports-gcc
 
 MASTER_SITES = https://downloads.tuxfamily.org/godotengine/${V}/
+MASTER_SITES0 =https://github.com/Gramps/GodotSteam/archive/refs/tags/
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
+   ${GODOTSTEAM_V}.tar.gz:0
 EXTRACT_SUFX = .tar.xz
+DIST_SUBDIR =   ${PKGNAME}
 
 MODULES =  devel/scons
 # Can't disable builtin_bullet until devel/bullet has been updated to 2.88
@@ -33,7 +39,7 @@ MODULES = devel/scons
 # sharedlib_ext in modules/mono/config.py to '.so.1.0'
 MODSCONS_FLAGS =   CC="${CC}" \
CXX="${CXX}" \
-   CFLAGS="${CFLAGS}" \
+   CFLAGS="${CFLAGS} 
-I${LOCALBASE}/include/goldberg_emulator/sdk_includes" \
CXXFLAGS="${CXXFLAGS} -Wno-deprecated-register" \
LINKFLAGS="${LDFLAGS} -lintl -lmpcdec" \
builtin_enet=no \
@@ -51,6 +57,7 @@ MODSCONS_FLAGS =  CC="${CC}" \
builtin_pcre2=no \
builtin_zlib=no \
builtin_zstd=no \
+   
custom_modules=${WRKDIR}/GodotSteam-${GODOTSTEAM_V}/godotsteam \
progress=no \
pulseaudio=no \
target=release_debug \
@@ -63,6 +70,7 @@ LIB_DEPENDS = archivers/zstd \
audio/opusfile \
devel/gettext,-runtime \
devel/pcre2 \
+   games/goldberg_emulator \
graphics/libwebp \
graphics/png \
multimedia/libtheora \
@@ -84,6 +92,12 @@ post-extract:
 
 pre-configure:
${SUBST_CMD} ${WRKSRC}/drivers/unix/os_unix.cpp
+   sed -E -i 's/ISteamHTMLSurface:://g' \
+   ${WRKDIR}/GodotSteam-${GODOTSTEAM_V}/godotsteam/godotsteam.cpp
+   sed -E -i 's/steam\/steam_api\.h/steam_api.h/g' \
+   
${WRKDIR}/GodotSteam-${GODOTSTEAM_V}/godotsteam/godotsteam.{h,cpp}
+   sed -E -i 
's,CPPPATH=.*,CPPPATH=["${LOCALBASE}/include/goldberg_emulator/sdk_includes"]),g'
 \
+   ${WRKDIR}/GodotSteam-${GODOTSTEAM_V}/godotsteam/SCsub
 
 do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/bin/godot* \
Index: distinfo
===
RCS file: /cvs/ports/games/godot/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo22 Aug 2021 01:43:49 -  1.8
+++ distinfo18 Oct 2021 18:53:50 -
@@ -1,2 +1,4 @@
-SHA256 

emulators/fceux: update 2.2.3 -> 2.4.0

[Omar Polo]

Hello,

(apologies for the double mail, I forgot to CC ports)

The current fceux version won't build with scons 4.  Instead of trying
to patch the SConstruct, I figured it would be easier to just update it
since upstream switched to cmake \o/

here's the changelog for 2.3.0:
https://fceux.com/web/pressrelease-2.3.0.html

and the one for 2.4.0:
https://fceux.com/web/pressrelease-2.4.0.html

with the most notable change being the switch from gtk to qt5/6 and sdl
to sdl2.

port-wise:

 - fixed HOMEPAGE
 - adjusted DESCR, uses qt now
 - switched to devel/cmake for the build
 - the server isn't built by cmake but by a custom makefile
 - while here I'm also installing the sample config file.  it's better
   to install it in share/examples/fceux/ ?
 - various patches are not needed anymore

It seems to build fine, and the GUI pops up and I can click around, but
I don't have any ROMs to test if it actually works.

Cheers,

Index: Makefile
===
RCS file: /home/cvs/ports/emulators/fceux/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile12 Jul 2019 20:46:08 -  1.20
+++ Makefile18 Oct 2021 17:03:34 -
@@ -2,13 +2,11 @@
 
 COMMENT =  emulator for Nintendo Entertainment System
 
-V =2.2.3
-DISTNAME = fceux-${V}.src
-PKGNAME =  fceux-${V}
+V =2.4.0
+DISTNAME = fceux-${V}
 CATEGORIES =   emulators games
-REVISION = 5
 
-HOMEPAGE = http://fceux.com/
+HOMEPAGE = https://fceux.com/web/home.html
 
 MAINTAINER =   Anthony J. Bentley 
 
@@ -18,49 +16,47 @@ PERMIT_PACKAGE =Yes
 MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=fceultra/}
 
 WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
-WANTLIB += Xau Xcomposite Xcursor Xdamage Xdmcp Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender atk-1.0 cairo expat ffi fontconfig
-WANTLIB += GL SDL X11 c gd gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0
-WANTLIB += gobject-2.0 gtk-x11-2.0 lua5.1 m pthread z
-WANTLIB += freetype fribidi gio-2.0 gmodule-2.0 graphite2 harfbuzz
-WANTLIB += intl pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
-WANTLIB += png xcb xcb-render xcb-shm
+WANTLIB += GL GLU Qt5Core Qt5Gui Qt5OpenGL Qt5Widgets
+WANTLIB += SDL2 c m minizip x264 z
 
 COMPILER = base-clang ports-gcc base-gcc
 
 RUN_DEPENDS =  devel/desktop-file-utils
-LIB_DEPENDS =  devel/sdl \
-   graphics/gd \
-   x11/gtk+2 
-
-MODULES =  devel/scons \
-   lang/lua
+LIB_DEPENDS =  archivers/minizip \
+   devel/sdl2 \
+   multimedia/x264
+
+MODULES =  devel/cmake \
+   lang/lua \
+   x11/qt5
 
 MAKE_ENV = CC="${CC}" \
CXX="${CXX}" \
CXXFLAGS="${CXXFLAGS} -DIOAPI_NO_64" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib -lpthread"
-MODSCONS_FLAGS =   SYSTEM_LUA=1
-
-CONFIGURE_STYLE =  scons
-
-WRKDIST =  ${WRKDIR}/fceux-${V}
 
 NO_TEST =  Yes
 
-SUBST_VARS +=  MODLUA_WANTLIB
-SUBST_VARS +=  MODLUA_LIB
+SUBST_VARS +=  HOMEPAGE V
 
 post-extract:
@perl -MExtUtils::Command -e dos2unix ${WRKSRC}
+   chmod +x ${WRKSRC}/scripts/genGitHdr.sh
 
 pre-configure:
-   ${SUBST_CMD} ${WRKDIST}/SConstruct ${WRKDIST}/fceux.desktop
+   ${SUBST_CMD} ${WRKDIST}/fceux.desktop ${WRKDIST}/scripts/genGitHdr.sh
+
+do-build:
+   @${MODCMAKE_BUILD_TARGET}
+   make -C ${WRKSRC}/fceux-server/
 
 do-install:
-   ${SETENV} ${MAKE_ENV} ${MODSCONS_BIN} -C ${WRKSRC} \
-   ${MODSCONS_ENV} ${MODSCONS_FLAGS} \
-   --prefix=${PREFIX} ${INSTALL_TARGET}
+   @${MODCMAKE_INSTALL_TARGET}
+   ${INSTALL_PROGRAM} ${WRKSRC}/fceux-server/fceux-net-server \
+   ${PREFIX}/bin/fceux-net-server
+   ${INSTALL_DATA_DIR} ${PREFIX}/etc
+   ${INSTALL_DATA} ${WRKSRC}/fceux-server/fceux-server.conf \
+   ${PREFIX}/etc/
 
 #BROKEN = nojunk
 # XXX scons picks up x264.h even though it's in an apparently unused ifdef 
block
Index: distinfo
===
RCS file: /home/cvs/ports/emulators/fceux/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo1 Aug 2016 18:31:29 -   1.4
+++ distinfo18 Oct 2021 14:53:23 -
@@ -1,2 +1,2 @@
-SHA256 (fceux-2.2.3.src.tar.gz) = S+bdqaNH+UGAmjxKkNIYFbUCOErf3Vlq2qey2vCIgj4=
-SIZE (fceux-2.2.3.src.tar.gz) = 9292792
+SHA256 (fceux-2.4.0.tar.gz) = p4wm2EfCIlPRTSZO8DiWk3GIowL8GQtgiLAaYFYsLno=
+SIZE (fceux-2.4.0.tar.gz) = 21807471
Index: patches/patch-SConstruct
===
RCS file: patches/patch-SConstruct
diff -N 

Re: [PATCH 7/9] Upgrade devel/git-annex 8.20210223->8.20211011

[James Cook]

On Sun, Oct 17, 2021 at 08:39:12PM -0700, Greg Steuck wrote:
> I only built this and confirmed the executable is doesn't die right
> away. Somebody who cares should test.

I did a few basic operations and it seems to work so far. I'll let you
know if something goes wrong.

-- 
James

Update sysutils/kopia to 0.9.3

[Denis Fondras]

Changelog : https://github.com/kopia/kopia/releases/tag/v0.9.3

Index: Makefile
===
RCS file: /cvs/ports/sysutils/kopia/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile15 Oct 2021 17:01:49 -  1.2
+++ Makefile18 Oct 2021 17:57:38 -
@@ -3,7 +3,7 @@
 COMMENT =  simple tool for managing encrypted backups in the cloud
 
 MODGO_MODNAME =github.com/kopia/kopia
-MODGO_VERSION =v0.9.2
+MODGO_VERSION =v0.9.3
 MODGO_FLAGS += -tags embedhtml
 
 DISTNAME = kopia-${MODGO_VERSION}
Index: distinfo
===
RCS file: /cvs/ports/sysutils/kopia/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo15 Oct 2021 17:01:49 -  1.2
+++ distinfo18 Oct 2021 17:57:39 -
@@ -1157,8 +1157,8 @@ SHA256 (go_modules/rsc.io/quote/v3/@v/v3
 SHA256 (go_modules/rsc.io/quote/v3/@v/v3.1.0.zip) = 
tDTLv8MsF7UijQsO3erqib707JvZC1yPxVtk+M4T7rk=
 SHA256 (go_modules/rsc.io/sampler/@v/v1.3.0.mod) = 
oq5uhUCkC4XldwPMYYuZxbEHU4bZWOiZmg4tTALzpwU=
 SHA256 (go_modules/rsc.io/sampler/@v/v1.3.0.zip) = 
2iArDagDqyZhq5imgLuk9kEjoyblQMJVgrbNu53BFKo=
-SHA256 (kopia-html-ui.v0.9.2.tgz) = 
DNo9Cd+TY8V4kENZ8HTMENmcce+6CCGmQ5uUmuEdsOw=
-SHA256 (kopia-v0.9.2.zip) = BjdNhZX3tFcPuhRUsDTm0VUAa94X2NnWeBVRLwW3IR0=
+SHA256 (kopia-html-ui.v0.9.3.tgz) = 
bUgR8YyJ4vOofuVBHcxpUGz1SRCt6YziZOI0ZT+3LT8=
+SHA256 (kopia-v0.9.3.zip) = E5+uGXySDK7odWBGBBpcYW+D/dUNA718L1qzditUI9c=
 SIZE (go_modules/bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.mod) = 22
 SIZE (go_modules/bazil.org/fuse/@v/v0.0.0-20180421153158-65cc252bf669.zip) = 
220785
 SIZE (go_modules/cloud.google.com/go/@v/v0.26.0.mod) = 27
@@ -2318,5 +2318,5 @@ SIZE (go_modules/rsc.io/quote/v3/@v/v3.1
 SIZE (go_modules/rsc.io/quote/v3/@v/v3.1.0.zip) = 2223
 SIZE (go_modules/rsc.io/sampler/@v/v1.3.0.mod) = 88
 SIZE (go_modules/rsc.io/sampler/@v/v1.3.0.zip) = 14308
-SIZE (kopia-html-ui.v0.9.2.tgz) = 1017277
-SIZE (kopia-v0.9.2.zip) = 3446073
+SIZE (kopia-html-ui.v0.9.3.tgz) = 1017531
+SIZE (kopia-v0.9.3.zip) = 3451565

Re: UPDATE: openimageio 2.2.18.0

[Dimitri Karamazov]

On Mon, Oct 18, 2021 at 12:28:48AM -0400, Brad Smith wrote:
> On 10/17/2021 11:30 AM, Dimitri Karamazov wrote:
> > On Sat, Oct 16, 2021 at 07:54:31PM -0400, Brad Smith wrote:
> > > On Sat, Oct 16, 2021 at 04:11:02PM -0400, Brad Smith wrote:
> > > > Here is an update to openimageio 2.2.18.0.
> > > An updated diff. Enable the HEIF support and fix the hardcoded library
> > > version in the PLIST.
> > > 
> > I guess you've your own reason for HEIF support since the only dependent
> > port (blender) I know doesn't need it, in that case know that the heif
> > test still fails, otherwise better to keep dependencies to a minimum.
> 
> It already includes every graphics library and format (tiff, png, gif, jpeg,
> jpeg 2k, openexr, webp, libraw), FFmpeg, OpenColorIO, Qt5 and Boost as
> dependencies.
> 
> As the COMMENT says it is a "library for reading and writing images" and it
> supports the new and increasingly common formats like WebP and now
> HEIC and AVIF.
> 
> Blender still does not appear to support WebP,?? but it has been enabled in
> the
> openimageio port since the very first commit 9.5 years ago.
> 
> The library comes with some tools. An image convertor (iconvert), that
> converted to and from HEIC and AVIF image formats, as well as others
> The image viewer (iv) worked as expected. As well as a program to show
> very minimal meta data.

You've run-tested it, so Okay with me.

regards,
  Dimitri

Re: NEW: games/vvvvvv - a retro platformer with gravity-reversal puzzle mechanics

[Thomas Frohwein]

On Sat, Oct 09, 2021 at 04:57:56PM +0200, Stefan Hagen wrote:
[...]
> > My read of the license is that it's zlib license with an addition
> > limiting it to non-commercial use. As there's no CD-ROMs anymore, I
> > don't think that matters for packaging the port.
> > 
> > Here is the license for review:
> > 
> > https://raw.githubusercontent.com/TerryCavanagh/VV/master/LICENSE.md
> 
> After reading the license, I believe as well that we're good to
> redistribute it.

Thanks, I appreciate the look. Could I get another set of porter eyes
and ok before I commit this with PERMIT_PACKAGE=Yes?

> However, this part may apply:
> 
> - Altered source/binary versions must be plainly marked as such, and
>   must not be misrepresented as being the original software.
> 
> Once there is a patch, the software is altered. Maybe a single sentence
> in the README about this would cover it.
> 
> "This version of VV has been changed to run on OpenBSD."

This is part of the standard zlib license [1]. As far as I know, we
don't do this for any of the other zlib-licensed ports. There are many,
among others are minizip, sdl*, optipng, sfml, tinyxml, and irrlicht. I
would say the assumption is that it being in ports with a patches/
directory is marking it clearly enough...

[1] https://opensource.org/licenses/Zlib

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/10/18 09:23:11

Modified files:
inputmethods/ibus-anthy: Makefile distinfo 
inputmethods/ibus-anthy/pkg: PLIST 

Log message:
Update to ibus-anthy-1.5.13.

mips64 bulk build report

[visa]

bulk build on octeon.ports.openbsd.org
started on  Thu Oct 7 14:27:00 UTC 2021
finished at Sun Oct 17 17:11:00 UTC 2021
lasted 11D02h44m
done with kern.version=OpenBSD 7.0-current (GENERIC.MP) #702: Wed Oct  6 
18:29:25 MDT 2021

built packages:9374
Oct 7:2221
Oct 8:934
Oct 9:482
Oct 10:669
Oct 11:674
Oct 12:227
Oct 13:375
Oct 14:471
Oct 15:422
Oct 16:684
Oct 17:2214


build failures: 78
http://build-failures.rhaalovely.net/mips64/2021-10-07/cad/kicad.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/chinese/libpinyin.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/databases/postgresql-pllua.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/devel/clang-tools-extra.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/devel/coccinelle.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/devel/go-sys.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/devel/promu.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/devel/py-unicorn,python3.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/devel/sdcc.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/editors/micro.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/emulators/openmsx.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/emulators/spike.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/games/astromenace.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/games/freeorion.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/games/godot.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/games/goldberg_emulator.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/games/hyperrogue.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/games/stone-soup.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/geo/gpstk.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/graphics/asymptote.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/graphics/enblend-enfuse.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/graphics/gimp/stable.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/graphics/gmic.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/graphics/simgear.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/lang/STk.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/lang/gforth.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/lang/librep.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/lang/pfe.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/mail/opensmtpd-filters/rspamd.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/math/gbc.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/math/lean.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/math/lrs.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/math/mlpack,-main.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/math/ntl.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/multimedia/assimp.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/multimedia/synfigstudio.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/net/barrier.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/net/gortr.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/net/gtk-gnutella.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/net/icinga/core2.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/net/minio/client.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/net/minio/server.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/net/powerdns.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/net/powerdns_recursor.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/net/syncthing.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/net/tailscale.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/net/utox.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/plan9/drawterm.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/print/scribus.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/productivity/gnucash.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/security/botan2.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/security/go-siphash.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/security/gobuster.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/security/py-keyring,python3.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/security/vault.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/shells/elvish.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/shells/ksh93.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/sysutils/amazon-ecs-cli.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/sysutils/beats/filebeat.log
http://build-failures.rhaalovely.net/mips64/2021-10-07/sysutils/beats/heartbeat.log

new inputmethods/ibus-typing-booster

[Solene Rapenne]

hello, this a port for an ibus plugin to suggest words while typing
a bit the same way phones keyboards do. Perfect if you have an
injured hand.

I rigorusly tested on amd64 and it's wonderful

many thanks to stsp@ for making a proper port from my original draft
based on a sysutils/tmate copy/paste port where I only changed a
few variables :D

tarball attached but I wouldn't be surprised I missed something in it


ibus-typing-booster.tgz
Description: application/compressed-tar

CVS: cvs.openbsd.org: ports

[Thomas Frohwein]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2021/10/18 09:14:58

Modified files:
x11/kitty  : Makefile distinfo 

Log message:
update to kitty 0.23.1
https://sw.kovidgoyal.net/kitty/changelog/

Re: aarch64 bulk build report

[Thomas Frohwein]

On Sun, Oct 17, 2021 at 11:44:51AM -0600, phess...@openbsd.org wrote:
[...]
> http://build-failures.rhaalovely.net/aarch64/2021-10-15/games/shockolate.log

This update that I just committed *should* fix the build on aarch64:
https://marc.info/?l=openbsd-ports-cvs=163456434527694=2

CVS: cvs.openbsd.org: ports

[Thomas Frohwein]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2021/10/18 07:39:44

Modified files:
games/shockolate: Makefile distinfo 
games/shockolate/patches: patch-CMakeLists_txt 

Log message:
update to more recent checkout
includes fix for va_list use to build on arm64 (GitHub PR 378); see
also GitHub issue #347
disable debug symbols for the build while here
runtime tested on amd64 without (new) issues

Index: Makefile

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2021/10/18 06:25:20

Modified files:
net/samba  : Makefile distinfo 
net/samba/patches: patch-buildtools_wafsamba_samba_autoconf_py 
   patch-lib_ldb_wscript 
   patch-lib_tevent_wscript 
   patch-source3_wscript 
   patch-source4_heimdal_build_wscript_build 
   patch-source4_scripting_bin_samba_upgradedns 
net/samba/pkg  : PLIST-docs PLIST-main 

Log message:
Update to samba-4.15.0

Release notes: https://www.samba.org/samba/history/samba-4.15.0.html

Tested by Ian McWilliam (co-maintainer) and bket@, input from bket@

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2021/10/18 06:23:50

Modified files:
devel/libtalloc: Makefile distinfo 

Log message:
Update to talloc-2.3.3, needed for samba-4.15.0

CVS: cvs.openbsd.org: ports

[Jeremie Courreges-Anglas]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2021/10/18 06:23:22

Modified files:
databases/tdb  : Makefile distinfo 

Log message:
Update to tdb-1.4.4, needed for samba-4.15.0

Re: [new] x11/alacritty

[Eric Auge]

Hello,

An update after some useful comments from a person (Alexis
Hildebrandt) off list, as diff:

--- alacritty/Makefile
+++ alacritty/Makefile
@@ -7,9 +7,9 @@
 DISTFILES += ${DISTNAME}${EXTRACT_SUFX}
 CATEGORIES = x11

-MAINTAINER = Eric Auge 
+MAINTAINER = Eric Auge 

-GH_ACCOUNT = jwilm
+GH_ACCOUNT = alacritty
 GH_PROJECT = alacritty
 GH_TAGNAME = v0.9.0

@@ -49,6 +49,7 @@
  ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/alacritty
  ${INSTALL_DATA} ${WRKSRC}/alacritty.yml \
  ${PREFIX}/share/examples/alacritty/alacritty.yml
+ tic -s -x -o ${PREFIX}/share/terminfo ${EXTRA_DIR}/alacritty.info

 .include "crates.inc"

Please let me know if anything else should be changed.
Attached the updated package.

hth,
Cheers,
Eric.



On Sat, Oct 16, 2021 at 10:39 PM Eric Auge  wrote:
>
> ping.
>
> On Sat, Sep 11, 2021 at 2:18 PM Eric Auge  wrote:
> >
> > Hello,
> >
> > attached the updated the port (followed Stuart comments):
> > - made a patch for the live_config_reload default.
> > - updated DESCR and README according to comments & alacritty updated
> > self description.
> > - the xcursors-themes port does not seem necessary anymore.
> >
> > Did I miss anything?
> >
> > HTH,
> > Eric.
> >
> > On Fri, Sep 3, 2021 at 2:41 PM Stuart Henderson  
> > wrote:
> > >
> > > On 2021/09/03 16:31, Frederic Cambus wrote:
> > > > On Mon, Aug 12, 2019 at 07:39:23AM +0200, Theo Buehler wrote:
> > > > > On Sun, Aug 11, 2019 at 11:30:09PM +0100, Stuart Henderson wrote:
> > > > > > So the claimed advantage is that it's super fast, but actually it 
> > > > > > uses way
> > > > > > more cpu than probably any other terminal emulator in the tree 
> > > > > > except
> > > > > > cool-retro-term?
> > > > >
> > > > > Yes, it is blazing fast. matthieu's test of 'cat /etc/termcap' 
> > > > > completes
> > > > > in under 0.1s while xterm uses 0.2-0.3s. It does feel way snappier 
> > > > > than
> > > > > xterm in general.
> > > > >
> > > > > It looks like I made CPU use worse by about a factor of 2 due to using
> > > > > vm.malloc_conf=CFJ. Still, ~5% is way more than it should need.
> > > > >
> > > > > Another advantage is that contrary to xterm it is trivial to configure
> > > > > thanks to a self-documenting .yml config file.
> > > > >
> > > > > > Is this useful enough to be worth adding so much time to a bulk 
> > > > > > build?
> > > > >
> > > > > I doubt it.
> > > > >
> > > > > > It will likely need to be amd64-only.
> > > > >
> > > > > Probably. Testing on other archs would need more time than I currently
> > > > > have.
> > > >
> > > > Resurrecting this as it seems the requirements are much more reasonable
> > > > nowadays, and I can build the latest version in 4 minutes on my Ryzen 5
> > > > PRO 2500U laptop:
> > > >
> > > > Finished release [optimized] target(s) in 4m 07s
> > > >
> > > > Here is a new tarball with the following changes:
> > > >
> > > > - Update to alacritty 0.9.0
> > > > - Move MODCARGO_CRATES directives into crates.inc.
> > > > - Remove the ulimit checks, as I was able to build the port as a regular
> > > >   user with the default limits without running out of memory
> > >
> > > README needs either rewriting or removing. Some of the sentences don't
> > > parse. The configuration section says what the program does but doesn't
> > > really say what the user should do with that information.
> > >
> > > There's a conflict between what DESCR says ("It provides sane choices
> > > for defaults and requires no additional setup") and README: "Although
> > > the default configuration work on OpenBSD, some values are not optimal
> > > [...] This option leads alacritty to a non negligeable CPU overhead on
> > > OpenBSD". If it's bad enough to document then I would suggest patching
> > > the default setting for live_config_reload instead. And rather than
> > > telling the user "please install pkg_add xcursors-themes port" it would
> > > be better to just RUN_DEPENDS on it. If that's done then there isn't
> > > really any more need for the pkg-readme, the standard documentation
> > > should suffice.
> > >


alacritty.tar.gz
Description: application/gzip

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2021/10/18 05:55:36

Modified files:
mail/pyzor : Makefile 

Log message:
Drop maintainership, no more use.

Re: [UPDATE] security/qtkeychain

[Kirill Bychkov]

On Fri, October 8, 2021 10:36, Kirill Bychkov wrote:
> Hi,
> Attached is an update for qtkeychaon 0.10.0>0.12.0.
> All consumers are building fine.
> OK?
>
>
ping

qtkeychain-0.12.0.diff
Description: Binary data

Re: new inputmethods/ibus-typing-booster

[Klemens Nanni]

On Mon, Oct 18, 2021 at 01:16:45PM +0200, Solene Rapenne wrote:
> hello, this a port for an ibus plugin to suggest words while typing
> a bit the same way phones keyboards do. Perfect if you have an
> injured hand.
> 
> I rigorusly tested on amd64 and it's wonderful
> 
> many thanks to stsp@ for making a proper port from my original draft
> based on a sysutils/tmate copy/paste port where I only changed a
> few variables :D
> 
> tarball attached but I wouldn't be surprised I missed something in it

Just a few space/tab nits around "=" at the end of Makefile.
You can use autoconf 2.71 (newest).
You can use SEPARATE_BUILD=Yes.

Upstream provides a proper release asset, please use that with
MASTER_SITES/DISTNAME as usual and drop GH_* autogenerated tarballs.
https://github.com/mike-fabian/ibus-typing-booster/releases/download/2.14.13/ibus-typing-booster-2.14.13.tar.gz

With the release asset OK kn, the rest is style/nit (your choice).

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2021/10/18 05:04:50

Modified files:
www/goaccess   : Makefile distinfo 

Log message:
update to goaccess-1.5.2

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/10/18 04:07:51

Modified files:
math/py-pandas : Makefile 

Log message:
adjust comments

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/10/18 04:07:18

Modified files:
math/py-pandas : Makefile distinfo 
math/py-pandas/pkg: PLIST 
Removed files:
math/py-pandas/patches: patch-setup_cfg patch-setup_py 

Log message:
update to py3-pandas-1.2.5 (newer versions are available, but require
numpy 1.17.3 or higher).

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/10/18 02:49:09

Modified files:
textproc/py-openpyxl: Makefile distinfo 
textproc/py-openpyxl/pkg: PLIST 

Log message:
update to py3-openpyxl-3.0.9

Re: UPDATE: openimageio 2.2.18.0

[Brad Smith]

On 10/17/2021 11:30 AM, Dimitri Karamazov wrote:

On Sat, Oct 16, 2021 at 07:54:31PM -0400, Brad Smith wrote:

On Sat, Oct 16, 2021 at 04:11:02PM -0400, Brad Smith wrote:

Here is an update to openimageio 2.2.18.0.

An updated diff. Enable the HEIF support and fix the hardcoded library
version in the PLIST.


I guess you've your own reason for HEIF support since the only dependent
port (blender) I know doesn't need it, in that case know that the heif
test still fails, otherwise better to keep dependencies to a minimum.


It already includes every graphics library and format (tiff, png, gif, jpeg,
jpeg 2k, openexr, webp, libraw), FFmpeg, OpenColorIO, Qt5 and Boost as
dependencies.

As the COMMENT says it is a "library for reading and writing images" and it
supports the new and increasingly common formats like WebP and now
HEIC and AVIF.

Blender still does not appear to support WebP,  but it has been enabled 
in the

openimageio port since the very first commit 9.5 years ago.

The library comes with some tools. An image convertor (iconvert), that
converted to and from HEIC and AVIF image formats, as well as others
The image viewer (iv) worked as expected. As well as a program to show
very minimal meta data.


88% tests passed, 11 tests failed out of 92

Total Test time (real) = 155.45 sec

The following tests FAILED:
  61 - texture-icwrite (Failed)
  62 - texture-icwrite.batch (Failed)
  63 - field3d-broken (Failed)
  64 - texture-field3d-broken (Failed)
  65 - texture-field3d-broken.batch (Failed)
  66 - heif (Failed)
  67 - openvdb-broken (Failed)
  68 - ptex-broken (Failed)
  75 - unit_strutil (Failed)
  81 - unit_timer (Failed)
  86 - unit_typedesc (Failed)


When I run make test I am not seeing 66 fail.

88% tests passed, 11 tests failed out of 92

Total Test time (real) = 188.53 sec

The following tests FAILED:
  6 - oiiotool-readerror (Failed)
 13 - missingcolor (Failed)
 61 - texture-icwrite (Failed)
 62 - texture-icwrite.batch (Failed)
 63 - field3d-broken (Failed)
 64 - texture-field3d-broken (Failed)
 65 - texture-field3d-broken.batch (Failed)
 67 - openvdb-broken (Failed)
 68 - ptex-broken (Failed)
 75 - unit_strutil (Failed)
 81 - unit_timer (Failed)

  Start 66: heif
66/92 Test #66: heif .   Passed 0.39 sec

I re-ran it a few times and it always passed.


regards,
   Dimitri

Re: powerpc bulk build report

[Brad Smith]

On Sat, Oct 16, 2021 at 11:32:39PM -0400, George Koehler wrote:
> On Sat, 16 Oct 2021 17:43:35 +0100
> Edd Barrett  wrote:
> 
> > On Sat, Oct 16, 2021 at 10:16:48AM -0600, c...@openbsd.org wrote:
> > > http://build-failures.rhaalovely.net/powerpc/2021-09-28/games/odamex.log
> > 
> > > :1:9: error: macro name must be an identifier
> > > #define -faltivec 1
> > 
> > Can you try this?
> 
> Fails because clang rejects -faltivec,
>   c++: error: the clang compiler does not support 'faltivec',
>   please use -maltivec and include altivec.h explicitly
> 
> I suspect that -faltivec was only for Apple gcc on Mac OS X (because
> our ports-gcc also rejects it).  It would also be wrong to build every
> file with -maltivec, because some macppc models (G3) have no altivec.
> It might be correct to build only r_drawt_altivec.cpp with -maltivec,
> because r_draw.cpp checks SDL_HasAltiVec().  Either that, or just
> disable altivec on powerpc.
> 
> I will try to unbreak the build on my macppc.
> --George

When I was looking at this I was thinking something like this, but I
don't have hw to test with.


Index: Makefile
===
RCS file: /home/cvs/ports/games/odamex/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile13 Sep 2021 19:51:30 -  1.7
+++ Makefile16 Oct 2021 18:54:31 -
@@ -33,6 +33,10 @@ CONFIGURE_ENV += CXXFLAGS=-I${LOCALBASE}
LDFLAGS=-L${LOCALBASE}/lib
 CONFIGURE_ARGS +=  -DNO_AG-ODALAUNCH_TARGET=YES
 
+.if ${MACHINE_ARCH} == "powerpc"
+CONFIGURE_ARGS +=  -DUSE_DEFAULT_SIMD=OFF
+.endif
+
 LIB_DEPENDS =  x11/wxWidgets \
audio/portmidi \
graphics/png \

> > Index: patches/patch-client_CMakeLists_txt
> > ===
> > RCS file: /cvs/ports/games/odamex/patches/patch-client_CMakeLists_txt,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 patch-client_CMakeLists_txt
> > --- patches/patch-client_CMakeLists_txt 29 Aug 2021 22:09:09 -  
> > 1.3
> > +++ patches/patch-client_CMakeLists_txt 16 Oct 2021 16:41:49 -
> > @@ -3,7 +3,7 @@ $OpenBSD: patch-client_CMakeLists_txt,v 
> >  Index: client/CMakeLists.txt
> >  --- client/CMakeLists.txt.orig
> >  +++ client/CMakeLists.txt
> > -@@ -163,7 +163,7 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
> > +@@ -163,13 +163,13 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
> >   elseif(ODAMEX_TARGET_ARCH STREQUAL "i386")
> > if(NOT MSVC)
> >   # Pentium M has SSE2.
> > @@ -12,6 +12,13 @@ Index: client/CMakeLists.txt
> > else()
> >   target_compile_definitions(odamex PRIVATE /arch:SSE2)
> > endif()
> > +   message(STATUS "Default SIMD flags set to SSE2")
> > + elseif(ODAMEX_TARGET_ARCH MATCHES "ppc")
> > +-  target_compile_definitions(odamex PRIVATE -faltivec)
> > ++  target_compile_options(odamex PRIVATE -faltivec)
> > +   message(STATUS "Default SIMD flags set to AltiVec")
> > + endif()
> > +   else()
> >  @@ -220,7 +220,7 @@ if(TARGET SDL2::SDL2 OR TARGET SDL::SDL)
> > endif()
> >   
> > -- 
> > Best Regards
> > Edd Barrett
> > 
> > https://www.theunixzoo.co.uk
> > 
> 
> 
> -- 
> George Koehler 
> 

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2021/10/18 02:23:19

Modified files:
games/cataclysm-dda: Makefile distinfo 
games/cataclysm-dda/pkg: PFRAG.no-no_x11 PLIST 

Log message:
Update to cataclysm-dda-0.F.2.
Drop former maintainer per his request and take maintainership.
OK thfr@

Re: [PATCH 4/9] Regenerate devel/shellcheck with newer dependency libs

[Stuart Henderson]

Needs a revision bump

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

On 18 October 2021 04:33:02 Greg Steuck  wrote:


Confirmed that it complains bitterly about /etc/rc :)

OK?

From 448d9e9f423d5bbe61d33af958c94e02a5c84a9c Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sun, 17 Oct 2021 19:08:37 -0700
Subject: [PATCH 4/9] Regenerate devel/shellcheck with newer dependency libs

---
devel/shellcheck/Makefile |  55 ++
devel/shellcheck/distinfo | 118 ++
2 files changed, 101 insertions(+), 72 deletions(-)

diff --git a/devel/shellcheck/Makefile b/devel/shellcheck/Makefile
index 03285f80dea..fdeb16d4c2d 100644
--- a/devel/shellcheck/Makefile
+++ b/devel/shellcheck/Makefile
@@ -17,39 +17,46 @@ PERMIT_PACKAGE =Yes

WANTLIB =   c charset ffi gmp iconv m pthread util

+# cabal-bundler --openbsd ShellCheck-0.7.2 --executable shellcheck
MODULES =   devel/cabal
MODCABAL_MANIFEST   = \
Diff0.4.0   0   \
QuickCheck  2.14.2  0   \
-aeson   1.5.6.0 1   \
+StateVar1.2.2   0   \
+aeson   2.0.1.0 0   \
assoc   1.0.2   1   \
attoparsec  0.14.1  0   \
-base-compat 0.11.2  0   \
-base-compat-batteries   0.11.2  0   \
-base-orphans0.8.4   0   \
-bifunctors  5.5.10  0   \
-comonad 5.0.8   0   \
-data-fix0.3.1   0   \
-distributive0.6.2.1 0   \
+base-compat 0.12.0  0   \
+base-compat-batteries   0.12.0  1   \
+base-orphans0.8.5   0   \
+bifunctors  5.5.11  1   \
+comonad 5.0.8   1   \
+contravariant   1.5.5   0   \
+data-fix0.3.2   0   \
+distributive0.6.2.1 1   \
dlist   1.0 0   \
-hashable1.3.1.0 0   \
-indexed-traversable 0.1.1   0   \
+hashable1.3.4.1 0   \
+indexed-traversable 0.1.1   1   \
+indexed-traversable-instances   0.1 0   \
integer-logarithms  1.0.3.1 0   \
-primitive   0.7.1.0 2   \
-random  1.2.0   5   \
-regex-base  0.94.0.10   \
-regex-tdfa  1.3.1.0 2   \
-scientific  0.3.6.2 0   \
+primitive   0.7.2.0 0   \
+random  1.2.1   0   \
+regex-base  0.94.0.11   \
+regex-tdfa  1.3.1.1 1   \
+scientific  0.3.7.0 0   \
+semialign   1.2 1   \
+semigroupoids   5.3.6   1   \
splitmix0.1.0.3 0   \
-strict  0.4.0.1 0   \
-tagged  0.8.6.1 1   \
-th-abstraction  0.4.2.0 0   \
-these   1.1.1.1 1   \
-time-compat 1.9.5   1   \
-transformers-compat 0.6.6   0   \
-unordered-containers0.2.13.00   \
-uuid-types  1.0.4   0   \
-vector  0.12.3.00
+strict  0.4.0.1 1   \
+tagged  0.8.6.1 2   \
+th-abstraction  0.4.3.0 0   \
+these   1.1.1.1 2   \
+time-compat 1.9.6.1 0   \
+transformers-compat 0.7 0   \
+unordered-containers0.2.14.00   \
+uuid-types  1.0.5   0   \
+vector  0.12.3.10   \
+witherable  0.4.2   0   \

LIB_DEPENDS =   converters/libiconv \
devel/gmp \
diff --git a/devel/shellcheck/distinfo b/devel/shellcheck/distinfo
index 1f47f949ae4..f23666ec28b 100644
--- a/devel/shellcheck/distinfo
+++ b/devel/shellcheck/distinfo
@@ -1,80 +1,102 @@
SHA256 (hackage/Diff-0.4.0.tar.gz) = 
cpCsCYrYtHSLnBDklMyFulSvaIImrmmkZap7THPxScc=
SHA256 (hackage/QuickCheck-2.14.2.tar.gz) = 
2HtshWlrYBF1J0Nh+mIheJRAHkAeFQw8XUATrFPNNvM=
SHA256 (hackage/ShellCheck-0.7.2.tar.gz) = 
/3U02Aw9yIF8B5Snb0MpeafVwuU37lp8GbQkrKQdhHI=
-SHA256 (hackage/aeson-1.5.6.0.tar.gz) = 
A2HDS+PS7JRSAfAlAWk0NvvaENzFSUaUgaCEst4iv+g=
-SHA256 (hackage/aeson-1.5.6.0_1.cabal) = 
0+docvhjTJzTPrEo1sTdG/DMjXHR8yBV13RJDV9t7fg=
+SHA256 (hackage/StateVar-1.2.2.tar.gz) = 
Xks52jlWVqWYJ7AoBQiq/ccDNXmLUOXW/VJZYCYlGCU=
+SHA256 (hackage/aeson-2.0.1.0.tar.gz) = 
OlCH4r/H/ZQbQXgnORvbpj2Xvb9mprgzuZ+Frd+kl34=
SHA256 (hackage/assoc-1.0.2.tar.gz) = 
2JiNxuhxjHo0VlFbdpyTNq7uxzDPhvxRdSR5af+PFE8=
SHA256 (hackage/assoc-1.0.2_1.cabal) = 
qCTk9hVGmietlJ2/SQe6JYvWtFne6+wAUkx7yz9lzJ8=
SHA256 (hackage/attoparsec-0.14.1.tar.gz) = 
hw+PgdkMKPl3wC44P8p4YX7jtboxvwtnGGrdSzatKbM=
-SHA256 (hackage/base-compat-0.11.2.tar.gz) = 
U6a1FFRC+6WkutbbK83t4X8WRkK0i8OblQFUIqOa29s=
-SHA256 (hackage/base-compat-batteries-0.11.2.tar.gz) = 
MeBmpaqWr5T+ZGWtuVnDjWOkngE1dkGqQyLHVKlNMCM=
-SHA256 (hackage/base-orphans-0.8.4.tar.gz) = 

Re: NEW: net/gmid

[Stephen Gregoratto]

Hi Stu,

Thanks for your feedback. Attached is a tarball with the changes you
requested. In v1, I actually installed an rc script that the author
wrote in the project's contrib directory. Now, I've put a copy of it
under pkg/gmid.rc. I believe this is OK to import?

Also attached inline is a patch that adds _gmid to the user list, in
case you need that.
-- 
Stephen Gregoratto

Index: infrastructure/db/user.list
===
RCS file: /cvs/ports/infrastructure/db/user.list,v
retrieving revision 1.390
diff -u -p -r1.390 user.list
--- infrastructure/db/user.list 27 Aug 2021 16:30:16 -  1.390
+++ infrastructure/db/user.list 17 Oct 2021 03:38:52 -
@@ -378,3 +378,4 @@ id  usergroup   port
 867 _notify_push   www/nextcloud_notify_push
 868 _igmpproxy _igmpproxy  net/igmpproxy
 869 _headscale _headscale  net/headscale
+870 _gmid  _gmid   net/gmid


gmid.tar.gz
Description: application/gzip

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2021/10/18 01:58:39

Modified files:
geo/py-proj: Makefile distinfo 
geo/py-proj/pkg: PLIST 

Log message:
Update to py-proj-3.2.1.

CVS: cvs.openbsd.org: ports

[Kirill Bychkov]

CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2021/10/18 00:01:57

Modified files:
net/owncloudclient: Makefile distinfo 

Log message:
update to ownCloudclient-2.9.1.5500