Re: XKBlib.h: C++17 doesn't allow 'register' storage class

[Matthieu Herrb]

On Sun, Nov 22, 2020 at 07:48:34AM -, Dimitri Karamazov wrote:
> is this diff okay?

It is part of the update to libX11 1.7.0 that was released earlier
this week and that I plan to import in Xenocara.

Can you wait  until that update ?

> 
> Index: lib/libX11/include/X11/XKBlib.h
> ===
> RCS file: /cvs/xenocara/lib/libX11/include/X11/XKBlib.h,v
> retrieving revision 1.4
> diff -u -p -r1.4 XKBlib.h
> --- lib/libX11/include/X11/XKBlib.h   30 May 2011 19:19:30 -  1.4
> +++ lib/libX11/include/X11/XKBlib.h   22 Nov 2020 07:44:40 -
> @@ -396,7 +396,11 @@ extern   BoolXkbTranslateKeyCode(
> 
>  extern   int XkbTranslateKeySym(
>  Display */* dpy */,
> +#if _LIBCPP_STD_VER > 11
> +KeySym * /* sym_return */,
> +#else
>  register KeySym */* sym_return */,
> +#endif
>  unsigned int /* modifiers */,
>  char *   /* buffer */,
>  int  /* nbytes */,
> 
> Or should I just remove the keyword?
> 
> Index: lib/libX11/include/X11/XKBlib.h
> ===
> RCS file: /cvs/xenocara/lib/libX11/include/X11/XKBlib.h,v
> retrieving revision 1.4
> diff -u -p -r1.4 XKBlib.h
> --- lib/libX11/include/X11/XKBlib.h   30 May 2011 19:19:30 -  1.4
> +++ lib/libX11/include/X11/XKBlib.h   22 Nov 2020 07:29:01 -
> @@ -396,7 +396,7 @@ externBoolXkbTranslateKeyCode(
> 
>  extern   int XkbTranslateKeySym(
>  Display */* dpy */,
> -register KeySym */* sym_return */,
> +KeySym * /* sym_return */,
>  unsigned int /* modifiers */,
>  char *   /* buffer */,
>  int  /* nbytes */,

-- 
Matthieu Herrb

Re: cyrus-imapd upstreamed patches and improvements

[Anatoli]

Hi Antoine, Stuart, All,

Stuart, thanks for updating wslay.

Antoine, thanks for your feedback.

The diff from my first mail is to be applied to the port when the upstream
publishes the new minor release in the 3.2 branch, which will be 3.2.5 and I
guess it should be released in a week.

The diff adjusts the port to accommodate all the cross-platform improvements
that we incorporated since the last 3.2.4 release (it mostly removes the no more
needed patches and slightly adjusts the PLIST to accommodate some minor
CONFIGURE_ARGS changes).


Then, I'm working now on the flavored version of the port, and my idea is to
apply it as soon as the new minor version is published (or maybe even before
this so not to deal with the REVISION) but this is my first time working with
ports, so I have no experience with the process and I have a couple of questions
about some aspects of flavors definition.

I've read the docs [1], [2], [3], [4] and [5] (not sure if there are other
places documenting it), but I can't find where the final flavor combinations are
defined.

E.g. in the vim port there are these flavors defined:

35:FLAVORS+=gtk2 gtk3 no_x11
37:FLAVORS+=lua perl python python3 ruby

But I can't find how they end up being those flavor options available to the
users for install via pkg_add:

1: vim-8.2.1805p0-gtk2
2: vim-8.2.1805p0-gtk2-lua
3: vim-8.2.1805p0-gtk2-perl-python-ruby
4: vim-8.2.1805p0-gtk2-perl-python3-ruby
5: vim-8.2.1805p0-gtk3
6: vim-8.2.1805p0-gtk3-lua
7: vim-8.2.1805p0-gtk3-perl-python-ruby
8: vim-8.2.1805p0-gtk3-perl-python3-ruby
9: vim-8.2.1805p0-no_x11-lua
10: vim-8.2.1805p0-no_x11
11: vim-8.2.1805p0-no_x11-perl-python-ruby
12: vim-8.2.1805p0-no_x11-perl-python3-ruby
13: vim-8.2.1805p0-no_x11-python
14: vim-8.2.1805p0-no_x11-python3
15: vim-8.2.1805p0-no_x11-ruby

Why, for example, lua is never combined with perl-python-ruby, etc. I don't see
where this restriction is defined.

[3] says: The port maintainer will set FLAVORS to be the list of possible
options in the Makefile. When building the port, the package builder will set
FLAVOR='option1 option2...' to build a specific flavor of the port.

Does that mean that someone responsible for building the packages will set the
combinations manually and the maintainer doesn't have control over the versions
built? And if this is the case, what's the process of communicating to the build
team what flavor combinations make sense for the port?


I'm planning to define the following flavors for cyrus-imapd:
 * an empty flavor (the default) with the options like it is now (with my
   initial diff applied that makes minor adjustments to the CONFIGURE_ARGS);
 * http: a http-enabled build which includes *DAV (WebDAV, CalDAV & CardDAV)
   functionality as well as the new IMAP replacement protocol JMAP;
 * replication: murder, replication and backup functionality;

They could be combined freely:

empty
http
replication
http-replication

I am using just the http flavor, so not sure if other combinations make sense to
the users (e.g. clamav integration, different storage options, databases, etc.).
Maybe we could enable just those listed above (e.g. the empty one, http,
replication and http-replication) and then ask users for feedback (I'm willing
to process all the feedback and adapt the port accordingly).

Then I have some other questions like what does 'M'(option1) and 'L' mean in
places like: .if ${FLAVOR:Moption1} or .if ${FLAVOR:L:Mcrypto}? I've seen other
letters (F) being used in a similar way, but haven't seen anything in the docs
explaining what they mean.

How PLIST, DESCR files should be prepared and what's the purpose of the PFRAG.xx
files? Looks like PLIST and DESCR could have versions for multi-packages, but
not for the flavors, though PFRAG files appear to be flavorable, but not sure
how exactly and what content/format they should have.

So how should I update the PLIST in order to accommodate flavor differences if
it's a single version for all flavors? And should I create other files (PFRAG)?


And a side note: this port probably should NOT be built on 32-bit archs due to
the devs supposition that all time-related structures are 64-bit and there could
be security implications if this is not the case (signedness and int overflow).
Here's a discussion about this without a definitive conclusion [6].

Regards,
Anatoli

[1] https://man.openbsd.org/ports.7#FLAVORS
[2] https://www.openbsd.org/faq/ports/ports.html#PortsFlavors
[3] https://man.openbsd.org/bsd.port.mk.5#FLAVORS_AND_MULTI_PACKAGES
[4] https://www.openbsd.org/faq/ports/guide.html
[5] https://man.openbsd.org/pkgpath.7
[6] https://github.com/cyrusimap/cyrus-imapd/pull/3262#issuecomment-723680233


On 19/11/20 09:16, Antoine Jacoutot wrote:
> On Wed, Nov 18, 2020 at 03:44:35PM -0300, Anatoli wrote:
>> Hi Antoine, all.
>>
>> For some months I was updating the cyrus-imapd port, upstreaming the
>> upstreamable patches and working 

Re: make py-txaio and py-autobahn python3 only

[Björn Ketelaars]

On Sun 22/11/2020 00:20, Daniel Dickman wrote:
> By making these two ports python3 only, we are getting rid of the only 
> consumers of the obsolete devel/py-trollius port (which can then be 
> deleted after diff below goes in).
> 
> These ports are only used by devel/py-buildbot which is already 
> python3-only.
> 
> ok?
> 
> (diff shows quirks and top-level makefile diffs for completeness)

Diff looks good, OK bket@

make py-txaio and py-autobahn python3 only

[Daniel Dickman]

By making these two ports python3 only, we are getting rid of the only 
consumers of the obsolete devel/py-trollius port (which can then be 
deleted after diff below goes in).

These ports are only used by devel/py-buildbot which is already 
python3-only.

ok?

(diff shows quirks and top-level makefile diffs for completeness)

Index: devel/Makefile
===
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.2038
diff -u -p -u -r1.2038 Makefile
--- devel/Makefile  19 Nov 2020 07:19:54 -  1.2038
+++ devel/Makefile  22 Nov 2020 05:11:34 -
@@ -1728,7 +1728,6 @@
  SUBDIR += py-trollius
  SUBDIR += py-twisted
  SUBDIR += py-twisted,python3
- SUBDIR += py-txaio
  SUBDIR += py-txaio,python3
  SUBDIR += py-typing
  SUBDIR += py-typing-extensions,python3
Index: www/Makefile
===
RCS file: /cvs/ports/www/Makefile,v
retrieving revision 1.987
diff -u -p -u -r1.987 Makefile
--- www/Makefile6 Nov 2020 18:18:37 -   1.987
+++ www/Makefile22 Nov 2020 05:11:34 -
@@ -415,7 +415,6 @@
  SUBDIR += py-CherryPy
  SUBDIR += py-CherryPy,python3
  SUBDIR += py-aiohttp
- SUBDIR += py-autobahn
  SUBDIR += py-autobahn,python3
  SUBDIR += py-beaker
  SUBDIR += py-beaker,python3
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1097
diff -u -p -u -r1.1097 Makefile
--- devel/quirks/Makefile   20 Nov 2020 05:41:11 -  1.1097
+++ devel/quirks/Makefile   22 Nov 2020 05:11:34 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-3.489
+PKGNAME =  quirks-3.490
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1115
diff -u -p -u -r1.1115 Quirks.pm
--- devel/quirks/files/Quirks.pm20 Nov 2020 05:41:11 -  1.1115
+++ devel/quirks/files/Quirks.pm22 Nov 2020 05:11:34 -
@@ -511,6 +511,8 @@ my $stem_extensions = {
'py-pygresql' => 'py3-pygresql',
'py-tagpy' => 'py3-tagpy',
'py-mpd2' => 'py3-mpd2',
+   'py-autobahn' => 'py3-autobahn',
+   'py-txaio' => 'py3-txaio',
 };
 
 my $obsolete_reason = {
Index: devel/py-txaio/Makefile
===
RCS file: /cvs/ports/devel/py-txaio/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- devel/py-txaio/Makefile 3 Jul 2020 21:12:51 -   1.7
+++ devel/py-txaio/Makefile 22 Nov 2020 05:11:34 -
@@ -19,13 +19,8 @@ MODPY_PI =   Yes
 MODULES =  lang/python
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR  =  python3
 
 MODPY_SETUPTOOLS = Yes
-
-.if empty (FLAVOR)
-RUN_DEPENDS =  devel/py-future \
-   devel/py-trollius
-.endif
 
 .include 
Index: devel/py-txaio/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-txaio/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- devel/py-txaio/pkg/PLIST23 Jun 2018 17:33:04 -  1.2
+++ devel/py-txaio/pkg/PLIST22 Nov 2020 05:11:34 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.2 2018/06/23 17:33:04 landry Exp $
+@conflict py-txaio-*
+@pkgpath devel/py-txaio
 lib/python${MODPY_VERSION}/site-packages/txaio/
 
lib/python${MODPY_VERSION}/site-packages/txaio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/txaio-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: www/py-autobahn/Makefile
===
RCS file: /cvs/ports/www/py-autobahn/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- www/py-autobahn/Makefile3 Jul 2020 21:13:18 -   1.6
+++ www/py-autobahn/Makefile22 Nov 2020 05:11:34 -
@@ -20,16 +20,12 @@ MODULES =   lang/python
 
 MODPY_SETUPTOOLS = Yes
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR  =  python3
 
 BUILD_DEPENDS =devel/py-txaio${MODPY_FLAVOR}>=18.8.1 \
devel/py-six${MODPY_FLAVOR}
-.if empty (FLAVOR)
-TEST_DEPENDS = devel/py-unittest2 \
-   devel/py-trollius
-.else
+
 # requires an update to unittest and then traceback2 and linecache2
 NO_TEST =  Yes
-.endif
 
 .include 
Index: www/py-autobahn/pkg/PLIST
===
RCS file: /cvs/ports/www/py-autobahn/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -r1.3 PLIST
--- www/py-autobahn/pkg/PLIST   23 Apr 2019 16:43:01 -  1.3
+++ www/py-autobahn/pkg/PLIST   22 Nov 2020 05:11:34 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.3 2019/04/23 

update py-six to 1.15.0

[Daniel Dickman]

The main benefit of this update is some improved pyton 3.9 support.

Tested by building over 100 consumers under python2 and python3 on amd64. 
No compile-time issues were seen.

ok?


Index: Makefile
===
RCS file: /cvs/ports/devel/py-six/Makefile,v
retrieving revision 1.24
diff -u -p -u -r1.24 Makefile
--- Makefile3 Jul 2020 21:12:49 -   1.24
+++ Makefile22 Nov 2020 03:57:45 -
@@ -1,10 +1,11 @@
 # $OpenBSD: Makefile,v 1.24 2020/07/03 21:12:49 sthen Exp $
 
 COMMENT =  Python 2 and 3 compatibility library
-MODPY_EGG_VERSION =1.13.0
+
+MODPY_EGG_VERSION =1.15.0
 DISTNAME = six-${MODPY_EGG_VERSION}
 PKGNAME =  py-six-${MODPY_EGG_VERSION}
-REVISION = 1
+
 CATEGORIES =   devel
 
 HOMEPAGE = https://github.com/benjaminp/six
@@ -15,13 +16,14 @@ PERMIT_PACKAGE =Yes
 MODPY_PI = Yes
 
 MODULES =  lang/python
+
+FLAVORS =  python3
+FLAVOR ?=
+
 MODPY_SETUPTOOLS = Yes
 MODPY_PYTEST = Yes
 MODPY_PYTEST_ARGS =-v
 
 TEST_DEPENDS = devel/py-py${MODPY_FLAVOR}
-
-FLAVORS =  python3
-FLAVOR ?=
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/devel/py-six/distinfo,v
retrieving revision 1.12
diff -u -p -u -r1.12 distinfo
--- distinfo6 Nov 2019 15:55:57 -   1.12
+++ distinfo22 Nov 2020 03:57:45 -
@@ -1,2 +1,2 @@
-SHA256 (six-1.13.0.tar.gz) = MPYQJ56LJXjKttsgdBEwMxc1x4G1YFPFnEB22ifwa2Y=
-SIZE (six-1.13.0.tar.gz) = 33726
+SHA256 (six-1.15.0.tar.gz) = MGOcA1zbI1NM1Kot1Sw79I8G5fSpQVCci6/YzhEIAlk=
+SIZE (six-1.15.0.tar.gz) = 33917

convert py-bokeh to flavored port

[Daniel Dickman]

I need to convert py-bokeh to a flavored port for an upcoming port that 
will depend on it. While here, update HOMEPAGE.

Can someone confirm that I made the right change to pkg/PLIST below?

ok to commit this?

Index: Makefile
===
RCS file: /cvs/ports/www/py-bokeh/Makefile,v
retrieving revision 1.31
diff -u -p -u -r1.31 Makefile
--- Makefile30 Aug 2020 09:24:13 -  1.31
+++ Makefile22 Nov 2020 02:47:33 -
@@ -5,21 +5,24 @@ COMMENT=  statistical and novel interact
 MODPY_EGG_VERSION= 2.2.0
 DISTNAME=  bokeh-${MODPY_EGG_VERSION}
 PKGNAME=   py-bokeh-${MODPY_EGG_VERSION}
+REVISION=  0
 
 CATEGORIES=www graphics
 
-HOMEPAGE=  http://bokeh.pydata.org/
+HOMEPAGE=  https://bokeh.org/
 
 # BSD
 PERMIT_PACKAGE=Yes
 
 MODULES=   lang/python
 
+FLAVORS=   python3
+FLAVOR =   python3
+
 MODPY_PI=  Yes
+MODPY_SETUPTOOLS=  Yes
 MODPY_PYTEST=  Yes
 MODPY_PYTEST_ARGS= bokeh
-MODPY_SETUPTOOLS=  Yes
-MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
 
 RUN_DEPENDS=   devel/py-dateutil${MODPY_FLAVOR} \
devel/py-typing-extensions${MODPY_FLAVOR} \
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-bokeh/pkg/PLIST,v
retrieving revision 1.22
diff -u -p -u -r1.22 PLIST
--- pkg/PLIST   30 Aug 2020 09:24:13 -  1.22
+++ pkg/PLIST   22 Nov 2020 02:47:34 -
@@ -1,6 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.22 2020/08/30 09:24:13 ajacoutot Exp $
 @conflict py-bokeh-*
-@pkgpath www/py-bokeh,python3
+@pkgpath www/py-bokeh
 bin/bokeh
 lib/python${MODPY_VERSION}/site-packages/bokeh/
 
lib/python${MODPY_VERSION}/site-packages/bokeh-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/

NEW: sysutils/py-vsphere-automation

[Pavel Korovin]

Dear all,

I'm looking for OKs to import this.

$ pkg_info py3-vsphere-automation

Comment:
VMware vSphere Automation SDK for Python

Description:
VMware vSphere Automation SDK for Python

Maintainer: Pavel Korovin 

WWW: https://github.com/vmware/vsphere-automation-sdk-python

-- 
With best regards,
Pavel Korovin


py-vsphere-automation.tgz
Description: Binary data

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2020/11/21 15:17:54

Modified files:
www/p5-WWW-Search: Makefile distinfo 

Log message:
Update to p5-WWW-Search-2.519.

CVS: cvs.openbsd.org: ports

[Pavel Korovin]

CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/11/21 15:03:39

Modified files:
sysutils/py-vmomi: Makefile distinfo 
Added files:
sysutils/py-vmomi/patches: patch-pyVmomi_Version_py 

Log message:
Update py-vmomi 7.0 -> 7.0.1
Release notes: https://github.com/vmware/pyvmomi/releases/tag/v7.0.1

CVS: cvs.openbsd.org: ports

[Kurt Mosiejczuk]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/11/21 15:03:13

Modified files:
www/snownews   : Makefile 

Log message:
snownews uses C11 so base-gcc doesn't work to built it

Switch to ports-gcc for base-gcc arches (like sparc64)

ok sthen

CVS: cvs.openbsd.org: ports

[Pavel Korovin]

CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/11/21 15:02:56

ports/sysutils/py-vmomi/patches

Update of /cvs/ports/sysutils/py-vmomi/patches
In directory cvs.openbsd.org:/tmp/cvs-serv15711/patches

Log Message:
Directory /cvs/ports/sysutils/py-vmomi/patches added to the repository

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2020/11/21 14:37:16

Modified files:
www/py-jonpy   : Makefile distinfo 

Log message:
Update to py-jonpy-0.14.

XKBlib.h: C++17 doesn't allow 'register' storage class

[Dimitri Karamazov]

I'm trying to update blender to the latest version, but stumbled upon
some errors.
C++17 doesn't support register storage class, but it is part of XKBLIb headers,

I tried things like "-Wno-register" to MAKE_FLAGS, then
#pragma Clang diagnostic ignored "-Wregister" before the
header to no avail.

FAILED: intern/ghost/CMakeFiles/bf_intern_ghost.dir/intern/GHOST_ISystem.cpp.o
/usr/ports/pobj/blender-2.90.1/bin/c++  -DGLEW_NO_GLU -DNDEBUG 
-DWITH_ASSERT_ABORT -DWITH_GHOST_X11
-DWITH_GL_PROFILE_CORE -DWITH_OPENGL -DWITH_X11_ALPHA -DWITH_X11_XF86VMODE 
-DWITH_X11_XFIXES -DWITH_X11_XINPUT
-DWITH_XDND -DWITH_XF86KEYSYM -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE 
-D_LARGEFILE_SOURCE -D__LITTLE_ENDIAN__
-I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/intern/ghost
-I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/intern/glew-mx
-I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/source/blender/imbuf
-I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/source/blender/makesdna
-I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/extern/xdnd -Wall 
-Wno-tautological-compare -Wno-unknown-pragmas
-Wno-char-subscripts -Wno-overloaded-virtual -Wno-sign-compare 
-Wno-invalid-offsetof -O2 -pipe  -I/usr/local/include
-I/usr/X11R6/include -pthread  -std=c++11 -std=c++17 -pipe -fPIC 
-funsigned-char -fno-strict-aliasing -DNDEBUG -MD -MT
intern/ghost/CMakeFiles/bf_intern_ghost.dir/intern/GHOST_ISystem.cpp.o -MF
intern/ghost/CMakeFiles/bf_intern_ghost.dir/intern/GHOST_ISystem.cpp.o.d -o
intern/ghost/CMakeFiles/bf_intern_ghost.dir/intern/GHOST_ISystem.cpp.o -c
/usr/ports/pobj/blender-2.90.1/blender-2.90.1/intern/ghost/intern/GHOST_ISystem.cpp
In file included from 
/usr/ports/pobj/blender-2.90.1/blender-2.90.1/intern/ghost/intern/GHOST_ISystem.cpp:37:
In file included from 
/usr/ports/pobj/blender-2.90.1/blender-2.90.1/intern/ghost/intern/GHOST_SystemX11.h:27:
/usr/X11R6/include/X11/XKBlib.h:399:5: error: ISO C++17 does not allow 
'register' storage class specifier [-Wregister]
register KeySym *   /* sym_return */,
^
1 error generated.
ninja: build stopped: subcommand failed.
*** Error 1 in /usr/ports/graphics/blender 
(/usr/ports/devel/cmake/cmake.port.mk:34 'do-build': @cd
/usr/ports/pobj/blender-2.90.1/build-amd...)
*** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2921
'/usr/ports/pobj/blender-2.90.1/build-amd64/.build_done': @cd /usr/ports/gra...)
*** Error 2 in /usr/ports/graphics/blender 
(/usr/ports/infrastructure/mk/bsd.port.mk:2584 'build':
@lock=blender-2.90.1;  export _LOCKS_HELD...)

Is forcing -std=c++11 good enough? It goes past that error to

FAILED: 
intern/libmv/CMakeFiles/bf_intern_libmv.dir/libmv/multiview/fundamental.cc.o
/usr/ports/pobj/blender-2.90.1/bin/c++  -DCERES_STD_UNORDERED_MAP 
-DCERES_USE_CXX_THREADS -DGFLAGS_DLL_DECL=""
-DGFLAGS_DLL_DECLARE_FLAG="" -DGFLAGS_DLL_DEFINE_FLAG="" 
-DGOOGLE_GLOG_DLL_DECL="" -DLIBMV_GFLAGS_NAMESPACE=gflags
-DLIBMV_NO_FAST_DETECTOR="" -DNDEBUG -DWITH_ASSERT_ABORT 
-DWITH_LIBMV_GUARDED_ALLOC -DWITH_OPENGL
-D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -D_LARGEFILE_SOURCE 
-D__LITTLE_ENDIAN__
-I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/intern/libmv
-I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/extern/gflags/src
-I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/extern/glog/include
-I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/extern/ceres/include
-I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/extern/ceres/config
-I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/intern/guardedalloc -isystem
/usr/ports/pobj/blender-2.90.1/blender-2.90.1/extern/Eigen3 -Wall 
-Wno-tautological-compare -Wno-unknown-pragmas
-Wno-char-subscripts -Wno-overloaded-virtual -Wno-sign-compare 
-Wno-invalid-offsetof -O2 -pipe  -I/usr/local/include
-I/usr/X11R6/include -pthread  -std=c++17 -std=c++11 -pipe -fPIC 
-funsigned-char -fno-strict-aliasing -DNDEBUG -MD -MT
intern/libmv/CMakeFiles/bf_intern_libmv.dir/libmv/multiview/fundamental.cc.o -MF
intern/libmv/CMakeFiles/bf_intern_libmv.dir/libmv/multiview/fundamental.cc.o.d 
-o
intern/libmv/CMakeFiles/bf_intern_libmv.dir/libmv/multiview/fundamental.cc.o -c
/usr/ports/pobj/blender-2.90.1/blender-2.90.1/intern/libmv/libmv/multiview/fundamental.cc
In file included from 
/usr/ports/pobj/blender-2.90.1/blender-2.90.1/intern/libmv/libmv/multiview/fundamental.cc:23:
In file included from 
/usr/ports/pobj/blender-2.90.1/blender-2.90.1/extern/ceres/include/ceres/ceres.h:37:
In file included from
/usr/ports/pobj/blender-2.90.1/blender-2.90.1/extern/ceres/include/ceres/autodiff_cost_function.h:130:
In file included from 
/usr/ports/pobj/blender-2.90.1/blender-2.90.1/extern/ceres/include/ceres/internal/autodiff.h:151:
In file included from
/usr/ports/pobj/blender-2.90.1/blender-2.90.1/extern/ceres/include/ceres/internal/parameter_dims.h:37:
/usr/ports/pobj/blender-2.90.1/blender-2.90.1/extern/ceres/include/ceres/internal/integer_sequence_algorithm.h:64:21:
error: no template named 'integer_sequence' in namespace 'std'; did you mean 

Re: UPDATE: Tor Browser 10.0.5

[Caspar Schutijser]

Hi,

On Thu, Nov 19, 2020 at 07:46:22PM -, Dimitri Karamazov wrote:
> Caspar I'll let you know that I tried to look for something related to video 
> issues by diffing
> across source directories of firefox-esr and tor-browser and couldn't find 
> anything worthwhile.
> Don't know where to go from there.

Thanks for checking that out. Unfortunately, I don't have an idea where
to look besides that as well, right now. It probably doesn't help that
I'm not very knowledgeable about how Firefox actually displays video,
what libraries are involved and how, etc.. I'll let you know if I have
any other ideas and/or if I make any progress on this topic.

Caspar

Re: handbrake-1.3.3 high CPU load while idle on amd64

[Morgan Aldridge]

On Fri, Oct 30, 2020 at 10:12 PM Brian Callahan  wrote:
>
> On Thursday, October 29, 2020 1:29 PM, Morgan Aldridge 
>  wrote:
>
> > Hi Brian and @ports,
> >
> > Thanks for the HandBrake port. I'm seeing high CPU load with
> > handbrake-1.3.3 on 6.8-stable amd64 while ghb is open and idle,
> > starting at first launch. This is without opening any sources.
> >
> > Top shows high CPU load for gbh:
> >
> > 25307 1000 2 0 42M 69M onproc/1 poll 19:23 179.64% ghb
> >
> > And I ran a ktrace, which shows tight looping of the following:
> >
> > 25307 ghb 0.11 CALL open(0x6c1edf35b40,0)
>
> Thanks for the report. I will try to find some time this weekend to
> look at it.

Thanks, Brian.

I can confirm the same issue on a recent snapshot of 6.8-current on
the same Core2 Duo hardware.

I have reached out to the Handbrake folks on IRC and they're not aware
of any issues, but don't have that many users of the GTK+ interface on
BSDs. They seemed to think it was likely a GTK+ issue. I did try `gbh
-x` for debug output, plus the GTK+ Inspector, but neither gave me any
additional clues as to potential causes.

Morgan

NEW: x11/mlvwm

[Morgan Aldridge]

MLVWM is a lightweight Macintosh-[L]ike Virtual Window Manager for X11:



I have been using it on OpenBSD 6.4 thru 6.8-current and find it
stable on i386 & amd64. I'd love to have someone test on macppc (it
seems rather appropriate) and other platforms.

If you need additional configuration files for testing, please see my
mlvwmrc project: .

Despite its age, I do intend to maintain this port. I am currently
trying to reach the original author as it was released as freeware
with source included. It's okay to distribute, but I need to obtain
proper permission to do further new development beyond patches in the
port.

Morgan


mlvwm.tgz
Description: application/gzip

CVS: cvs.openbsd.org: ports

[Christopher Zimmermann]

CVSROOT:/cvs
Module name:ports
Changes by: chr...@cvs.openbsd.org  2020/11/21 13:15:05

Modified files:
fonts  : Makefile 

Log message:
enable build of new ttyp0 font and single flavor variants.
More flavors could be added if need arises.

update py-scikit-image to 0.17.2

[Daniel Dickman]

Paul, see below for an update of py-scikit-image to the latest release.

I moved the MODPY_* variables to a more standard location and dropped 
TEST_DEPENDS which is already taken care of by MODPY_PYTEST

ok?


Index: Makefile
===
RCS file: /cvs/ports/math/py-scikit-image/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- Makefile3 Jul 2020 21:12:57 -   1.4
+++ Makefile21 Nov 2020 20:03:05 -
@@ -2,11 +2,10 @@
 
 COMMENT =  image processing routines for SciPy
 
-MODPY_EGG_VERSION =0.16.2
+MODPY_EGG_VERSION =0.17.2
 DISTNAME = scikit-image-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   math
-REVISION = 1
 
 MAINTAINER =   Paul Irofti 
 
@@ -18,6 +17,10 @@ MODULES =lang/python
 FLAVORS =  python3
 FLAVOR =   python3
 
+MODPY_PI = Yes
+MODPY_SETUPTOOLS = Yes
+MODPY_PYTEST = Yes
+
 RUN_DEPENDS =  math/py-numpy${MODPY_FLAVOR} \
math/py-scipy${MODPY_FLAVOR} \
graphics/py-matplotlib${MODPY_FLAVOR} \
@@ -29,11 +32,5 @@ RUN_DEPENDS =math/py-numpy${MODPY_FLAV
 BUILD_DEPENDS = lang/cython${MODPY_FLAVOR} \
devel/py-wheel${MODPY_FLAVOR} \
math/py-numpy${MODPY_FLAVOR}
-
-TEST_DEPENDS = devel/py-test${MODPY_FLAVOR}
-
-MODPY_PI = Yes
-MODPY_SETUPTOOLS = Yes
-MODPY_PYTEST = Yes
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/math/py-scikit-image/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo26 Jun 2020 09:03:41 -  1.1.1.1
+++ distinfo21 Nov 2020 20:03:05 -
@@ -1,2 +1,2 @@
-SHA256 (scikit-image-0.16.2.tar.gz) = 
3X+9Mtp01OmWfcFYRfcx8W55Zs7mH13A4S4quxMFBow=
-SIZE (scikit-image-0.16.2.tar.gz) = 28945695
+SHA256 (scikit-image-0.17.2.tar.gz) = 
vZVMBYjw9+gdl2PcleBpUOaCR9VAR24Gy3e8vNjC2LM=
+SIZE (scikit-image-0.17.2.tar.gz) = 29818001
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/py-scikit-image/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- pkg/PLIST   26 Jun 2020 12:57:45 -  1.2
+++ pkg/PLIST   21 Nov 2020 20:03:05 -
@@ -32,6 +32,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/skimage/_shared/_geometry.py
 lib/python${MODPY_VERSION}/site-packages/skimage/_shared/_tempfile.py
 lib/python${MODPY_VERSION}/site-packages/skimage/_shared/_warnings.py
+@so lib/python${MODPY_VERSION}/site-packages/skimage/_shared/fast_exp.so
 lib/python${MODPY_VERSION}/site-packages/skimage/_shared/fft.py
 @so lib/python${MODPY_VERSION}/site-packages/skimage/_shared/geometry.so
 @so lib/python${MODPY_VERSION}/site-packages/skimage/_shared/interpolation.so
@@ -41,6 +42,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/skimage/_shared/tests/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/skimage/_shared/tests/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/skimage/_shared/tests/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/skimage/_shared/tests/${MODPY_PYCACHE}test_fast_exp.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/skimage/_shared/tests/${MODPY_PYCACHE}test_geometry.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/skimage/_shared/tests/${MODPY_PYCACHE}test_interpolation.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/skimage/_shared/tests/${MODPY_PYCACHE}test_safe_as_int.${MODPY_PYC_MAGIC_TAG}pyc
@@ -48,6 +50,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/skimage/_shared/tests/${MODPY_PYCACHE}test_utils.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/skimage/_shared/tests/${MODPY_PYCACHE}test_version_requirements.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/skimage/_shared/tests/${MODPY_PYCACHE}test_warnings.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/skimage/_shared/tests/test_fast_exp.py
 lib/python${MODPY_VERSION}/site-packages/skimage/_shared/tests/test_geometry.py
 
lib/python${MODPY_VERSION}/site-packages/skimage/_shared/tests/test_interpolation.py
 
lib/python${MODPY_VERSION}/site-packages/skimage/_shared/tests/test_safe_as_int.py
@@ -80,72 +83,34 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/skimage/color/tests/${MODPY_PYCACHE}test_colorconv.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/skimage/color/tests/${MODPY_PYCACHE}test_colorlabel.${MODPY_PYC_MAGIC_TAG}pyc
 

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2020/11/21 13:01:41

Modified files:
math/py-sympy  : Makefile distinfo 
math/py-sympy/patches: patch-setup_py 
math/py-sympy/pkg: PLIST README 

Log message:
update sympy to 1.6.2

Re: net/nextcloudclient not talking to keyring for credentials

[Tom Murphy]

Hi,

On 2020-11-20 17:24, Rafael Sadowski wrote:

On Thu Nov 19, 2020 at 12:47:46PM +, Tom Murphy wrote:

Hi,

   I'm trying to get net/nextcloudclient to save my password but I get 
this

error:

   [ warning nextcloud.sync.credentials.http ]:Error while writing 
password

"Unknown error"

   I've tried installing gnome-keyring, libgnome-keyring, and 
py3-keyring

and it still doesn't
want to save the credentials anywhere. Any ideas? All I can find are 
reports

of it failing on Linux
and to install various gnome-keyring packages. I do have
gnome-keyring-daemon running but it doesn't
seem to talk to it.

Thanks,
Tom



I barley use any of the gnome-stack so I can't say anything about it 
but

kwallet works great with nextcloudclient.


Thanks for this. I installed 'kf5-kwallet' and it seems to work with it.
Pulled in a lot of dependencies though, but I guess that's KDE apps for 
you.


-Tom

Re: [Update] security/p5-Crypt-OpenSSL-Random : Update to 0.15

[Andrew Hewus Fresh]

On Sat, Oct 10, 2020 at 01:34:42AM +, wen heping wrote:
> Hi, ports@:
> 
> Here is a patch for security/p5-Crypt-OpenSSL-Random:
> i) Update to 0.15
> ii) Move up the CPAN_AUTHOR line
> iii) Add TEST_POD to MAKE_ENV
> 
> It build well and pass all tests on amd64-current system.
> One port depends on it: security/p5-Crypt-OpenSSL-RSA, it
> build and pass all tests with this patch.

This is still OK afresh1@, as is the new p5-Crypt-OpenSSL-Guess
dependency that wen heping sent in previously.  Both the diff and new
port are attached for convenience.



Index: Makefile
===
RCS file: /cvs/ports/security/p5-Crypt-OpenSSL-Random/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile3 Jul 2020 21:45:41 -   1.21
+++ Makefile21 Nov 2020 18:50:07 -
@@ -1,17 +1,20 @@
 # $OpenBSD: Makefile,v 1.21 2020/07/03 21:45:41 sthen Exp $
 
-COMMENT=   routines for accessing the OpenSSL prng
+COMMENT =  routines for accessing the OpenSSL prng
 
-MODULES=   cpan
-DISTNAME=  Crypt-OpenSSL-Random-0.11
-CATEGORIES=security
-REVISION=  0
+MODULES =  cpan
+DISTNAME = Crypt-OpenSSL-Random-0.15
+CATEGORIES =   security
+CPAN_AUTHOR =  RURBAN
 
 # perl
-PERMIT_PACKAGE=Yes
+PERMIT_PACKAGE =   Yes
 
-WANTLIB += c crypto perl ssl
+WANTLIB += c crypto perl ssl
 
-CPAN_AUTHOR=   RURBAN
+MAKE_ENV +=TEST_POD=Yes
+
+RUN_DEPENDS =  security/p5-Crypt-OpenSSL-Guess
+BUILD_DEPENDS = ${RUN_DEPENDS}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/security/p5-Crypt-OpenSSL-Random/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo17 Jan 2016 23:02:25 -  1.7
+++ distinfo21 Nov 2020 18:50:07 -
@@ -1,2 +1,2 @@
-SHA256 (Crypt-OpenSSL-Random-0.11.tar.gz) = 
u4yBxqObmxOiLYGO6adGJC8Tbw+tzra5d2rmFedSTHo=
-SIZE (Crypt-OpenSSL-Random-0.11.tar.gz) = 15161
+SHA256 (Crypt-OpenSSL-Random-0.15.tar.gz) = 
8IdvqhujER45uGqnMMYDIR7/KQXkYMcqV7YejPR1zvQ=
+SIZE (Crypt-OpenSSL-Random-0.15.tar.gz) = 15506



p5-Crypt-OpenSSL-Guess-0.11.tar.gz
Description: application/tar-gz

[sparc64/base-gcc] Fix build of math/matio

[Kurt Mosiejczuk]

Compiling matio with base-gcc fails with 

mat73.c:1: error: stray '\357' in program
mat73.c:1: error: stray '\273' in program
mat73.c:1: error: stray '\277' in program

Shifting to ports-gcc fixes the built.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/math/matio/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- Makefile18 Nov 2020 14:20:14 -  1.17
+++ Makefile21 Nov 2020 18:15:30 -
@@ -13,6 +13,8 @@
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=matio/}
 
+COMPILER=  base-clang ports-gcc
+
 WANTLIB =  c hdf5 m z
 
 LIB_DEPENDS=   math/hdf5

[sparc64/base-gcc] Fix build of www/snownews

[Kurt Mosiejczuk]

snownews using C11 constructs so base-gcc doesn't work.

This fixes it.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/www/snownews/Makefile,v
retrieving revision 1.40
diff -u -r1.40 Makefile
--- Makefile20 Nov 2020 20:48:11 -  1.40
+++ Makefile21 Nov 2020 18:16:54 -
@@ -12,6 +12,9 @@
 # GPLv3 only
 PERMIT_PACKAGE=Yes
 
+# C11
+COMPILER=  base-clang ports-gcc
+
 WANTLIB += c curses iconv intl xml2 z
 
 NO_TEST=   Yes

Re: [UPDATE] math/lrs -> 071a

[Dimitri Karamazov]

On Sat, November 21, 2020 13:05, Stuart Henderson wrote:
> Now it's committed here's some clean-up.
>
>
> - don't patch away upstream's INCLUDEDIR/LIBDIR mechanism to replace
> it with something using CPPFLAGS/LDFLAGS which does exactly the same; 
> simplifies the patch
>
> patch-makefile |  115 +++--- 1 file changed, 
> 23 insertions(+), 92 deletions(-)
>
>
> - building the targets chosen for the port requires a compiler with
> 128-bit int support; afaik this requires clang, or GCC 4.6 or newer,
> and a 64-bit arch. So I've set the compiler and restricted archs. 
> (alternatively we could use "ALL_TARGETS=lrs64" on
> those archs but that would mean extra mess with arch-specific PLISTs).
>
> - simplify the test target
>
>
> ok?
>
Works fine here, but what's the significance of COMPILER_LANGS?
What could break without it?

>
> Index: Makefile
> ===
> RCS file: /cvs/ports/math/lrs/Makefile,v
> retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile20 Nov 
> 2020 19:16:18 -  1.7
> +++ Makefile  21 Nov 2020 12:59:07 -
> @@ -3,6 +3,7 @@
> COMMENT = solve vertex enumeration and convex hull problems
>
>
> V =   071a
> +REVISION =   0
> DISTNAME =lrslib-${V}
> PKGNAME = lrs-${V}
> FIX_EXTRACT_PERMISSIONS=Yes
> @@ -25,22 +26,24 @@ MASTER_SITES =http://cgm.cs.mcgill.ca/
> USE_GMAKE =   Yes
>
>
> MAKE_FILE =   makefile
> -MAKE_FLAGS = CPPFLAGS=-I${LOCALBASE}/include \
> - LDFLAGS=-L${LOCALBASE}/lib \
> +MAKE_FLAGS = INCLUDEDIR="${LOCALBASE}/include" \
> + LIBDIR="${LOCALBASE}/lib" \
> CFLAGS="${CFLAGS} -Wall" \
> SONAME="liblrs.so.${LIBlrs_VERSION:R}" \
> SOMINOR=".${LIBlrs_VERSION:E}"
>
>
> -ALL_TARGET = lrs lrsnash single all-shared
> -
> LIB_DEPENDS = devel/gmp
>
>
> +# targets "lrs", "lrsnash", "single", "all-shared" require 128-bit ints
> +COMPILER =   base-clang ports-gcc
> +COMPILER_LANGS = c
> +ONLY_FOR_ARCHS = ${LP64_ARCHS}
> +ALL_TARGET = lrs lrsnash single all-shared
> +
> # A simple test to check it works
> -REGRESS_FILES =  test.ine expected_outcome.ine openbsd_regress.sh
> do-test:
> -.for i in ${REGRESS_FILES}
> - cp ${FILESDIR}/${i} ${WRKBUILD}
> -.endfor
> + cd ${FILESDIR} && \
> + cp test.ine expected_outcome.ine openbsd_regress.sh ${WRKBUILD}
> cd ${WRKBUILD} && sh openbsd_regress.sh
>
> .include 
> Index: patches/patch-makefile
> ===
> RCS file: /cvs/ports/math/lrs/patches/patch-makefile,v
> retrieving revision 1.2 diff -u -p -r1.2 patch-makefile --- 
> patches/patch-makefile20 Nov 2020 19:16:18 -  1.2
> +++ patches/patch-makefile21 Nov 2020 12:59:07 -
> @@ -1,95 +1,39 @@
> $OpenBSD: patch-makefile,v 1.2 2020/11/20 19:16:18 edd Exp $
>
>
> -Honour CFLAGS, LDFLAGS, CPPFLAGS
> +Honour CFLAGS
> Avoid library symlinks
> Rectify install targets
>
>
>  makefile.origSat Oct 17 11:48:42 2020
> -+++ makefile Thu Nov 19 07:01:15 2020
> -@@ -51,14 +51,14 @@ LRSOBJ64=lrs64.o lrslong1.o lrslib1.o lrslibgmp.o lrsg
> - MPLRSOBJ64=lrslong1-mplrs.o lrslib1-mplrs.o lrslibgmp-mplrs.o 
> lrsgmp-mplrs.o lrsdriver-mplrs.o mplrs64.o
> +Index: makefile
> +--- makefile.orig
>  makefile
> +@@ -52,8 +52,8 @@ MPLRSOBJ64=lrslong1-mplrs.o lrslib1-mplrs.o lrslibgmp-
>
>
> lrs: ${LRSOBJ}
> --$(CC) ${CFLAGS} -DMA -DB128 -L${LIBDIR} -o lrs ${LRSOBJ} -lgmp
> + $(CC) ${CFLAGS} -DMA -DB128 -L${LIBDIR} -o lrs ${LRSOBJ} -lgmp
> - $(CC)  -O3   -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c lrsgmp.c 
> lrsdriver.c -L${LIBDIR}  -lgmp
> - $(CC) -O3 hvref.c -o hvref
> -+$(CC) ${CFLAGS} -DMA -DB128 ${LDFLAGS} -o lrs ${LRSOBJ} -lgmp
> -+$(CC) ${CFLAGS} -DGMP ${CPPFLAGS} -o lrsgmp lrs.c lrslib.c lrsgmp.c 
> lrsdriver.c ${LDFLAGS} -lgmp
> ++$(CC) ${CFLAGS} -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c lrsgmp.c 
> lrsdriver.c -L${LIBDIR} -lgmp
> + $(CC) ${CFLAGS} hvref.c -o hvref
> ln -s -f lrs redund ln -s -f lrsgmp redundgmp
>
> - lrs64: ${LRSOBJ64}
> --$(CC) ${CFLAGS} -DMA -L${LIBDIR} -o lrs ${LRSOBJ64} -lgmp
> -+$(CC) ${CFLAGS} -DMA ${LDFLAGS} -o lrs ${LRSOBJ64} -lgmp
> -
> - lrs.o: lrs.c
> - $(CC) ${CFLAGS} -DMA -DB128 -c -o lrs.o lrs.c
> -@@ -79,10 +79,10 @@ lrslib2.o: lrslib.c lrslib.h
> - $(CC) ${CFLAGS} -DMA -DSAFE -DB128 -DLRSLONG -c -o lrslib2.o lrslib.c
> -
> - lrslibgmp.o: lrslib.c lrslib.h
> --$(CC) ${CFLAGS} -DMA -DGMP -I${INCLUDEDIR} -c -o lrslibgmp.o lrslib.c
> -+$(CC) ${CFLAGS} -DMA -DGMP ${CPPFLAGS} -c -o lrslibgmp.o lrslib.c
> -
> - lrsgmp.o: lrsgmp.c lrsgmp.h
> --$(CC) ${CFLAGS} -DMA -DGMP -I${INCLUDEDIR} -c -o lrsgmp.o lrsgmp.c
> -+$(CC) ${CFLAGS} -DMA -DGMP ${CPPFLAGS} -c -o lrsgmp.o lrsgmp.c
> -
> -
> - lrslong1-mplrs.o: lrslong.c 

Re: XKBlib.h: C++17 doesn't allow 'register' storage class

[Stuart Henderson]

On 2020/11/21 16:48, Dimitri Karamazov wrote:
> I'm trying to update blender to the latest version, but stumbled upon
> some errors.
> C++17 doesn't support register storage class, but it is part of XKBLIb 
> headers,
> 
> I tried things like "-Wno-register" to MAKE_FLAGS, then
> #pragma Clang diagnostic ignored "-Wregister" before the
> header to no avail.
> 
> FAILED: intern/ghost/CMakeFiles/bf_intern_ghost.dir/intern/GHOST_ISystem.cpp.o
> /usr/ports/pobj/blender-2.90.1/bin/c++  -DGLEW_NO_GLU -DNDEBUG 
> -DWITH_ASSERT_ABORT -DWITH_GHOST_X11
> -DWITH_GL_PROFILE_CORE -DWITH_OPENGL -DWITH_X11_ALPHA -DWITH_X11_XF86VMODE 
> -DWITH_X11_XFIXES -DWITH_X11_XINPUT
> -DWITH_XDND -DWITH_XF86KEYSYM -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE 
> -D_LARGEFILE_SOURCE -D__LITTLE_ENDIAN__
> -I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/intern/ghost
> -I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/intern/glew-mx
> -I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/source/blender/imbuf
> -I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/source/blender/makesdna
> -I/usr/ports/pobj/blender-2.90.1/blender-2.90.1/extern/xdnd -Wall 
> -Wno-tautological-compare -Wno-unknown-pragmas
> -Wno-char-subscripts -Wno-overloaded-virtual -Wno-sign-compare 
> -Wno-invalid-offsetof -O2 -pipe  -I/usr/local/include
> -I/usr/X11R6/include -pthread  -std=c++11 -std=c++17 -pipe -fPIC 
> -funsigned-char -fno-strict-aliasing -DNDEBUG -MD -MT
> intern/ghost/CMakeFiles/bf_intern_ghost.dir/intern/GHOST_ISystem.cpp.o -MF
> intern/ghost/CMakeFiles/bf_intern_ghost.dir/intern/GHOST_ISystem.cpp.o.d -o
> intern/ghost/CMakeFiles/bf_intern_ghost.dir/intern/GHOST_ISystem.cpp.o -c
> /usr/ports/pobj/blender-2.90.1/blender-2.90.1/intern/ghost/intern/GHOST_ISystem.cpp
> In file included from 
> /usr/ports/pobj/blender-2.90.1/blender-2.90.1/intern/ghost/intern/GHOST_ISystem.cpp:37:
> In file included from 
> /usr/ports/pobj/blender-2.90.1/blender-2.90.1/intern/ghost/intern/GHOST_SystemX11.h:27:
> /usr/X11R6/include/X11/XKBlib.h:399:5: error: ISO C++17 does not allow 
> 'register' storage class specifier [-Wregister]
> register KeySym *   /* sym_return */,
> ^
> 1 error generated.
> ninja: build stopped: subcommand failed.
> *** Error 1 in /usr/ports/graphics/blender 
> (/usr/ports/devel/cmake/cmake.port.mk:34 'do-build': @cd
> /usr/ports/pobj/blender-2.90.1/build-amd...)
> *** Error 2 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2921
> '/usr/ports/pobj/blender-2.90.1/build-amd64/.build_done': @cd 
> /usr/ports/gra...)
> *** Error 2 in /usr/ports/graphics/blender 
> (/usr/ports/infrastructure/mk/bsd.port.mk:2584 'build':
> @lock=blender-2.90.1;  export _LOCKS_HELD...)
> 
> Is forcing -std=c++11 good enough? It goes past that error to

> /usr/ports/pobj/blender-2.90.1/blender-2.90.1/extern/ceres/include/ceres/internal/integer_sequence_algorithm.h:64:21:
> error: no template named 'integer_sequence' in namespace 'std'; did you mean 
> '__integer_sequence'?
> struct SumImpl> {
>~^~~~
> __integer_sequence
> /usr/include/c++/v1/__tuple:93:8: note: '__integer_sequence' declared here
> 

If you look in the c++ headers in /usr/include you'll find

--snip-
#if _LIBCPP_STD_VER > 11

template
struct _LIBCPP_TEMPLATE_VIS integer_sequence
{
--snip-

suggesting it does need >11 for this. (this was added in c++14 I think).

Try removing "register" in your local xkblib headers to see if things
build with that.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 10:34:59

Modified files:
net/nfdump : Makefile distinfo 
Added files:
net/nfdump/patches: patch-configure_ac 

Log message:
update to nfdump-1.6.22

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 10:29:44

Modified files:
security/oath-toolkit: Makefile distinfo 
security/oath-toolkit/patches: 
   patch-libpskc_examples_pskctool-h_txt 
security/oath-toolkit/pkg: PLIST-main PLIST-pskc 

Log message:
update to oath-toolkit-2.6.4

Re: NEW: fonts/ttyp0-font

[Stuart Henderson]

On 2020/11/21 18:12, Christopher Zimmermann wrote:
> Ok,
> 
> I imported the font. Now I'm wondering which combinations of the variants
> should be enabled by default.
> Looking at terminus people seem to use centered tilde and I suspect most
> people would want an invisible no-breaking-space.
> Any other popular combinations ? OK as is ?
> 
> 
> Christopher
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/fonts/Makefile,v
> retrieving revision 1.71
> diff -u -p -r1.71 Makefile
> --- Makefile6 Aug 2020 09:09:49 -   1.71
> +++ Makefile21 Nov 2020 17:07:49 -
> @@ -94,6 +94,9 @@
>   SUBDIR += terminus-font,symquotes
>   SUBDIR += terminus-font,symquotes,centered_tilde
>   SUBDIR += terminus-font,centered_tilde
> + SUBDIR += ttyp0-font
> + SUBDIR += ttyp0-font,nbs
> + SUBDIR += ttyp0-font,nbs,ct

at least all of the single flavours:

SUBDIR += ttyp0-font,sq
SUBDIR += ttyp0-font,ct
SUBDIR += ttyp0-font,nbd
SUBDIR += ttyp0-font,sz

others by request I guess?

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 10:23:40

Modified files:
net/radcli : Makefile distinfo 
net/radcli/patches: patch-lib_util_h 

Log message:
update to radcli-1.3.0, mostly from bket@ but converted back to a plain
distfile now that one is available

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 10:15:34

Modified files:
net/nagios/check_esxi_hardware: Makefile distinfo 

Log message:
update to check_esxi_hardware-20200710

Re: NEW: fonts/ttyp0-font

[Christopher Zimmermann]

Ok,

I imported the font. Now I'm wondering which combinations of the 
variants should be enabled by default.
Looking at terminus people seem to use centered tilde and I suspect most 
people would want an invisible no-breaking-space.

Any other popular combinations ? OK as is ?


Christopher


Index: Makefile
===
RCS file: /cvs/ports/fonts/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile6 Aug 2020 09:09:49 -   1.71
+++ Makefile21 Nov 2020 17:07:49 -
@@ -94,6 +94,9 @@
  SUBDIR += terminus-font,symquotes
  SUBDIR += terminus-font,symquotes,centered_tilde
  SUBDIR += terminus-font,centered_tilde
+ SUBDIR += ttyp0-font
+ SUBDIR += ttyp0-font,nbs
+ SUBDIR += ttyp0-font,nbs,ct
  SUBDIR += ubuntu-fonts
  SUBDIR += un-fonts
  SUBDIR += unifont

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 10:12:32

Modified files:
sysutils/entr  : Makefile distinfo 

Log message:
update to entr-4.6

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2020/11/21 10:11:42

Modified files:
devel/py-pathlib2: Makefile distinfo 

Log message:
Update to py-pathlib2-2.3.5.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 10:11:06

Modified files:
graphics/libqrencode: Makefile distinfo 
graphics/libqrencode/pkg: PLIST 

Log message:
update to libqrencode-4.1.1

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 10:08:49

Modified files:
net/arouteserver: Makefile distinfo 

Log message:
update to arouteserver-1.0.1

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 10:03:20

Modified files:
devel/py-wbem  : Makefile 

Log message:
add comment with new dep requirements for updating

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 09:53:37

Modified files:
devel/py-tz: Makefile distinfo 
devel/py-tz/pkg: PLIST 

Log message:
update to pytz-2020.4

CVS: cvs.openbsd.org: ports

[Christopher Zimmermann]

CVSROOT:/cvs
Module name:ports
Changes by: chr...@cvs.openbsd.org  2020/11/21 09:47:17

Log message:
Import fonts/ttyp0-font

UW ttyp0 is a family of bitmap programmer's fonts. It covers most of the 
Latin
and Cyrillic alphabet, Greek, Armenian, Georgian (only Mkhedruli), Hebrew
(without cantillation marks), Thai, most of IPA (but no UPA), standard
punctuation, common symbols, some mathematics, line graphics, a few 
dingbats,
and Powerline delimiter symbols.

ok sthen@, Manuel Giraud (who ported the same font) is also fine with it.

Status:

Vendor Tag: chrisz
Release Tags:   chrisz_20201121

N ports/fonts/ttyp0-font/Makefile
N ports/fonts/ttyp0-font/distinfo
N ports/fonts/ttyp0-font/pkg/PLIST
N ports/fonts/ttyp0-font/pkg/DESCR

No conflicts created by this import

[UPDATE] graphics/freeglut -> 3.2.1

[Dimitri Karamazov]

Build and runtime tests:

games/crack-attack
games/glsfcave
textproc/mupdf,js

Build tests only:
graphics/gle
graphics/glpng
graphics/DevIL
graphics/py-opengl
graphics/mhgui
devel/bullet
lang/parrot
sysutils/mangl
print/gl2ps
math/eigen3
cad/kicad

untested:
asymptote - not for amd64

Bumped shared library since some exported functions are removed,
many more have been introduced. Output attached

Patch is redundant since changes have been marged.

Any comments/Ok's?

Index: Makefile
===
RCS file: /cvs/ports/graphics/freeglut/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile12 Jul 2019 20:46:58 -  1.20
+++ Makefile21 Nov 2020 12:27:10 -
@@ -2,10 +2,9 @@

 COMMENT =  open source alternative to glut

-DISTNAME = freeglut-3.0.0
-REVISION = 0
+DISTNAME = freeglut-3.2.1

-SHARED_LIBS +=  glut  6.0 # 3.10
+SHARED_LIBS +=  glut  7.0 # 3.11

 CATEGORIES =   graphics

Index: distinfo
===
RCS file: /cvs/ports/graphics/freeglut/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo5 Jul 2017 21:29:42 -   1.4
+++ distinfo21 Nov 2020 12:27:10 -
@@ -1,2 +1,2 @@
-SHA256 (freeglut-3.0.0.tar.gz) = KkO+hRWwHqgrz6F9Ka4NQL0Sg0LwkwzR83Xx/5mfdqI=
-SIZE (freeglut-3.0.0.tar.gz) = 419095
+SHA256 (freeglut-3.2.1.tar.gz) = 1AAOAhAqyvJZmYyHDiUhRznR8W9n+ZyzXk9GhBOZ2mg=
+SIZE (freeglut-3.2.1.tar.gz) = 440228
Index: patches/patch-include_GL_freeglut_ext_h
===
RCS file: patches/patch-include_GL_freeglut_ext_h
diff -N patches/patch-include_GL_freeglut_ext_h
--- patches/patch-include_GL_freeglut_ext_h 5 Jul 2017 21:29:42 -   
1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,23 +0,0 @@
-$OpenBSD: patch-include_GL_freeglut_ext_h,v 1.3 2017/07/05 21:29:42 rsadowski 
Exp $
-
-Index: include/GL/freeglut_ext.h
 include/GL/freeglut_ext.h.orig
-+++ include/GL/freeglut_ext.h
-@@ -193,7 +193,7 @@ FGAPI voidFGAPIENTRY glutSolidTeaspoon( double siz
- /*
-  * Extension functions, see fg_ext.c
-  */
--typedef void (*GLUTproc)();
-+typedef void (*GLUTproc)(void);
- FGAPI GLUTproc FGAPIENTRY glutGetProcAddress( const char *procName );
-
- /*
-@@ -249,7 +249,7 @@ FGAPI voidFGAPIENTRY glutSetVertexAttribNormal(GLi
- FGAPI voidFGAPIENTRY glutSetVertexAttribTexCoord2(GLint attrib);
-
- /* Mobile platforms lifecycle */
--FGAPI voidFGAPIENTRY glutInitContextFunc(void (* callback)());
-+FGAPI voidFGAPIENTRY glutInitContextFunc(void (* callback)(void));
- FGAPI voidFGAPIENTRY glutAppStatusFunc(void (* callback)(int));
- /* state flags that can be passed to callback set by glutAppStatusFunc */
- #define GLUT_APPSTATUS_PAUSE0x0001
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/freeglut/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   5 Jul 2017 21:29:42 -   1.3
+++ pkg/PLIST   21 Nov 2020 12:27:10 -
@@ -5,7 +5,14 @@ include/GL/
 include/GL/freeglut.h
 include/GL/freeglut_ext.h
 include/GL/freeglut_std.h
+include/GL/freeglut_ucall.h
 include/GL/glut.h
-lib/libglut.a
+lib/cmake/
+lib/cmake/FreeGLUT/
+lib/cmake/FreeGLUT/FreeGLUTConfig.cmake
+lib/cmake/FreeGLUT/FreeGLUTConfigVersion.cmake
+lib/cmake/FreeGLUT/FreeGLUTTargets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/FreeGLUT/FreeGLUTTargets.cmake
+@static-lib lib/libglut.a
 @lib lib/libglut.so.${LIBglut_VERSION}
-lib/pkgconfig/freeglut.pc
+lib/pkgconfig/glut.pc


check_sym
Description: Binary data

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 09:30:25

Modified files:
archivers  : Makefile 
archivers/pecl-rar: Makefile distinfo 
archivers/pecl-rar/pkg: PLIST 

Log message:
update to pecl-rar-4.1.0, enable for PHP 7.3 and 7.4

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 09:29:37

Modified files:
databases/pecl-redis: Makefile distinfo 
databases/pecl-redis/patches: patch-library_c 

Log message:
update to pecl-redis-5.3.2

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2020/11/21 09:23:27

Modified files:
sysutils/p5-Proc-ProcessTable: Makefile distinfo 
sysutils/p5-Proc-ProcessTable/pkg: PLIST 

Log message:
Update to p5-Proc-ProcessTable-0.59.

Re: 4 of 8 cores always idle on Ryzen 7 4750U Pro

[Stuart Henderson]

On 2020/11/21 16:06, Stuart Henderson wrote:
> On 2020/11/07 23:24, Ashton Fagg wrote (on bugs@):
> > 
> > I'm running a Ryzen 4750U (8 cores, 16 with SMT). Obviously SMT
> > being disabled means only 8 of them show up in htop and the
> > like. However, I've noticed that 4 of my cores are always
> > idle. They never, ever leave 0% usage no matter what I do -
> > running stress tests, running make with -j8, doesn't matter,
> > only 4 cores ever have usage >0.
> 
> Does this help?

(I have an update to 3.0.2 as well but easier to test this separately)


> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/htop/Makefile,v
> retrieving revision 1.23
> diff -u -p -r1.23 Makefile
> --- Makefile  12 Sep 2020 17:25:21 -  1.23
> +++ Makefile  21 Nov 2020 16:01:17 -
> @@ -5,6 +5,7 @@ COMMENT = interactive process viewer
>  GH_ACCOUNT = htop-dev
>  GH_PROJECT = htop
>  GH_TAGNAME = 3.0.1
> +REVISION =   0
>  
>  CATEGORIES = sysutils
>  
> Index: patches/patch-openbsd_OpenBSDProcessList_c
> ===
> RCS file: 
> /cvs/ports/sysutils/htop/patches/patch-openbsd_OpenBSDProcessList_c,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-openbsd_OpenBSDProcessList_c
> --- patches/patch-openbsd_OpenBSDProcessList_c11 Sep 2020 12:34:28 
> -  1.2
> +++ patches/patch-openbsd_OpenBSDProcessList_c21 Nov 2020 16:01:17 
> -
> @@ -63,3 +63,12 @@ Index: openbsd/OpenBSDProcessList.c
>  }
>   
>  return pl;
> +@@ -372,7 +397,7 @@ static void OpenBSDProcessList_scanCPUTime(OpenBSDProc
> +u_int64_t avg[CPUSTATES] = {0};
> + 
> +for (int i = 0; i < this->super.cpuCount; i++) {
> +-  getKernelCPUTimes(i, kernelTimes);
> ++  getKernelCPUTimes(this->cpuIndex[i], kernelTimes);
> +   CPUData* cpu = this->cpus + i + 1;
> +   kernelCPUTimesToHtop(kernelTimes, cpu);
> + 
> 

Re: 4 of 8 cores always idle on Ryzen 7 4750U Pro

[Stuart Henderson]

On 2020/11/07 23:24, Ashton Fagg wrote (on bugs@):
> 
> I'm running a Ryzen 4750U (8 cores, 16 with SMT). Obviously SMT
>   being disabled means only 8 of them show up in htop and the
>   like. However, I've noticed that 4 of my cores are always
>   idle. They never, ever leave 0% usage no matter what I do -
>   running stress tests, running make with -j8, doesn't matter,
>   only 4 cores ever have usage >0.

Does this help?

Index: Makefile
===
RCS file: /cvs/ports/sysutils/htop/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile12 Sep 2020 17:25:21 -  1.23
+++ Makefile21 Nov 2020 16:01:17 -
@@ -5,6 +5,7 @@ COMMENT =   interactive process viewer
 GH_ACCOUNT =   htop-dev
 GH_PROJECT =   htop
 GH_TAGNAME =   3.0.1
+REVISION = 0
 
 CATEGORIES =   sysutils
 
Index: patches/patch-openbsd_OpenBSDProcessList_c
===
RCS file: /cvs/ports/sysutils/htop/patches/patch-openbsd_OpenBSDProcessList_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-openbsd_OpenBSDProcessList_c
--- patches/patch-openbsd_OpenBSDProcessList_c  11 Sep 2020 12:34:28 -  
1.2
+++ patches/patch-openbsd_OpenBSDProcessList_c  21 Nov 2020 16:01:17 -
@@ -63,3 +63,12 @@ Index: openbsd/OpenBSDProcessList.c
 }
  
 return pl;
+@@ -372,7 +397,7 @@ static void OpenBSDProcessList_scanCPUTime(OpenBSDProc
+u_int64_t avg[CPUSTATES] = {0};
+ 
+for (int i = 0; i < this->super.cpuCount; i++) {
+-  getKernelCPUTimes(i, kernelTimes);
++  getKernelCPUTimes(this->cpuIndex[i], kernelTimes);
+   CPUData* cpu = this->cpus + i + 1;
+   kernelCPUTimesToHtop(kernelTimes, cpu);
+ 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/11/21 09:00:43

Modified files:
x11/gnome/initial-setup: Makefile distinfo 

Log message:
Update to gnome-initial-setup-3.38.2.

CVS: cvs.openbsd.org: ports

[Pavel Korovin]

CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/11/21 08:58:41

Modified files:
sysutils/beats : Makefile Makefile.inc 
sysutils/beats/filebeat: Makefile distinfo 
sysutils/beats/filebeat/patches: patch-filebeat_filebeat_yml 
sysutils/beats/filebeat/pkg: PLIST filebeat.rc 
sysutils/beats/heartbeat: Makefile distinfo 
sysutils/beats/heartbeat/pkg: heartbeat.rc 
sysutils/beats/metricbeat: Makefile distinfo 
sysutils/beats/metricbeat/pkg: PLIST metricbeat.rc 
sysutils/beats/packetbeat: Makefile distinfo 
sysutils/beats/packetbeat/patches: 
   patch-packetbeat_packetbeat_yml 
sysutils/beats/packetbeat/pkg: PLIST packetbeat.rc 
Added files:
sysutils/beats/filebeat/patches: 
 patch-libbeat_cfgfile_cfgfile_go 
sysutils/beats/heartbeat/patches: 
  patch-libbeat_cfgfile_cfgfile_go 
sysutils/beats/metricbeat/patches: 
   patch-libbeat_cfgfile_cfgfile_go 
   
patch-metricbeat_include_list_common_go 
   patch-metricbeat_metricbeat_yml 
sysutils/beats/packetbeat/patches: 
   patch-libbeat_cfgfile_cfgfile_go 
Removed files:
sysutils/beats/filebeat/pkg: README 
sysutils/beats/packetbeat/pkg: README 

Log message:
Update beats 7.9.1 -> 7.10.0
Release notes: 
https://www.elastic.co/guide/en/beats/libbeat/current/release-notes-7.10.0.html

Port changes:
* Set default path.{config,data,home,logs} to OpenBSD-specific locations
on OpenBSD

* Add Kibana dashboards: name  setup --dashboards command work

* Remove modules (e.g. docker, k8, windows) and dashboards which are irrelevant
on OpenBSD

* Remove redundant pkg/README for filebeat and packetbeat

Thanks to David Alten for detailed reports on various usability issues

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 08:50:40

Modified files:
sysutils/htop/patches: patch-CPUMeter_c patch-Header_c 
   patch-openbsd_OpenBSDProcessList_h 

Log message:
regen patches

CVS: cvs.openbsd.org: ports

[Pavel Korovin]

CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/11/21 08:41:59

ports/sysutils/beats/heartbeat/patches

Update of /cvs/ports/sysutils/beats/heartbeat/patches
In directory cvs.openbsd.org:/tmp/cvs-serv9924/patches

Log Message:
Directory /cvs/ports/sysutils/beats/heartbeat/patches added to the repository

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2020/11/21 08:39:51

Modified files:
devel/py-selectors2: Makefile distinfo 

Log message:
Update to py-selectors2-2.0.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/11/21 08:36:25

Modified files:
x11/gnome/maps : Makefile distinfo 

Log message:
Update to gnome-maps-3.38.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/11/21 08:28:04

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

Log message:
Update to glib2mm-2.64.4.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2020/11/21 08:24:37

Modified files:
devel/py-pyprof2calltree: Makefile distinfo 
devel/py-pyprof2calltree/pkg: PLIST 

Log message:
Update to py-pyprof2calltree-1.4.5.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 08:07:47

Modified files:
net/zabbix : Tag: OPENBSD_6_8 Makefile distinfo 
net/zabbix/patches: Tag: OPENBSD_6_8 
patch-src_libs_zbxnix_daemon_c 
net/zabbix/pkg : Tag: OPENBSD_6_8 PLIST-web 

Log message:
update stable to zabbix-5.0.5, ok robert@
fixes problem reported by Federico Churca-Torrusio with fping 5.x

CVS: cvs.openbsd.org: ports

[Klemens Nanni]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/11/21 07:46:15

Modified files:
sysutils/coreboot-utils: Makefile distinfo 
sysutils/coreboot-utils/patches: patch-util_cbmem_cbmem_c 
 patch-util_ectool_ectool_c 

Log message:
Update to coreboot 4.13

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2020/11/21 07:46:07

Modified files:
devel/py-plugnplay: Makefile distinfo 
devel/py-plugnplay/pkg: PLIST 

Log message:
Update to py-plugnplay-0.5.4.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 07:45:49

Modified files:
security/sslscan: Makefile distinfo 

Log message:
update to sslscan-2.0.6

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 07:33:56

Modified files:
mail/rcube-contextmenu: Makefile distinfo 

Log message:
update to rcube-contextmenu-3.2.1

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 07:33:31

Modified files:
net/dhcpcd : Makefile 
Added files:
net/dhcpcd/patches: patch-src_if-options_c patch-src_route_c 

Log message:
dhcpcd: add a couple of upstream patches

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2020/11/21 07:28:01

Modified files:
devel/py-pathspec: Makefile distinfo 
devel/py-pathspec/pkg: PLIST 

Log message:
Update to py-pathspec-0.8.1.

Re: NEW: fonts/ttyp0-font

[Manuel Giraud]

Stuart Henderson  writes:

> let's go for chrisz's version of this, the flavour handling is easier
> to deal with, and he has already got it converting to otb (pcf bitmap
> fonts are no longer widely supported).

I don't know much about font file format. But neat! (i think)

> - don't set nbs flavour by default, i'd also be sort-of ok without this
> but it's not very intuitive to run "FLAVOR= make" if you want the default
> version

I too am ok to keep the defaults as default.
-- 
Manuel Giraud

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 07:13:06

Modified files:
math/lrs   : Makefile 
math/lrs/patches: patch-makefile 

Log message:
math/lrs tweaks, ok edd@, works for maintainer

- don't patch away upstream's INCLUDEDIR/LIBDIR mechanism to replace
it with something using CPPFLAGS/LDFLAGS which does exactly the same;
simplifies the patch

- building the targets chosen for the port requires a compiler with
128-bit int support; afaik this requires clang, or GCC 4.6 or newer,
and a 64-bit arch. So I've set the compiler and restricted archs.
(alternatively we could use "ALL_TARGETS=lrs64" on those archs but that
would mean extra mess with arch-specific PLISTs).

- simplify the test target

Re: [UPDATE] math/lrs -> 071a

[Stuart Henderson]

On 2020/11/21 14:08, Dimitri Karamazov wrote:
> On Sat, November 21, 2020 13:05, Stuart Henderson wrote:
> > Now it's committed here's some clean-up.
> >
> >
> > - don't patch away upstream's INCLUDEDIR/LIBDIR mechanism to replace
> > it with something using CPPFLAGS/LDFLAGS which does exactly the same; 
> > simplifies the patch
> >
> > patch-makefile |  115 +++--- 1 file 
> > changed, 23 insertions(+), 92 deletions(-)
> >
> >
> > - building the targets chosen for the port requires a compiler with
> > 128-bit int support; afaik this requires clang, or GCC 4.6 or newer,
> > and a 64-bit arch. So I've set the compiler and restricted archs. 
> > (alternatively we could use "ALL_TARGETS=lrs64" on
> > those archs but that would mean extra mess with arch-specific PLISTs).
> >
> > - simplify the test target
> >
> >
> > ok?
> >
> Works fine here, but what's the significance of COMPILER_LANGS?
> What could break without it?

The port will still work without it, but it will add an unnecessary
LIB_DEPENDS on gcc-libs for libestdc++.


> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/math/lrs/Makefile,v
> > retrieving revision 1.7 diff -u -p -r1.7 Makefile --- Makefile  20 Nov 
> > 2020 19:16:18 -  1.7
> > +++ Makefile21 Nov 2020 12:59:07 -
> > @@ -3,6 +3,7 @@
> > COMMENT =   solve vertex enumeration and convex hull problems
> >
> >
> > V = 071a
> > +REVISION = 0
> > DISTNAME =  lrslib-${V}
> > PKGNAME =   lrs-${V}
> > FIX_EXTRACT_PERMISSIONS=Yes
> > @@ -25,22 +26,24 @@ MASTER_SITES =  http://cgm.cs.mcgill.ca/
> > USE_GMAKE = Yes
> >
> >
> > MAKE_FILE = makefile
> > -MAKE_FLAGS =   CPPFLAGS=-I${LOCALBASE}/include \
> > -   LDFLAGS=-L${LOCALBASE}/lib \
> > +MAKE_FLAGS =   INCLUDEDIR="${LOCALBASE}/include" \
> > +   LIBDIR="${LOCALBASE}/lib" \
> > CFLAGS="${CFLAGS} -Wall" \
> > SONAME="liblrs.so.${LIBlrs_VERSION:R}" \
> > SOMINOR=".${LIBlrs_VERSION:E}"
> >
> >
> > -ALL_TARGET =   lrs lrsnash single all-shared
> > -
> > LIB_DEPENDS =   devel/gmp
> >
> >
> > +# targets "lrs", "lrsnash", "single", "all-shared" require 128-bit ints
> > +COMPILER = base-clang ports-gcc
> > +COMPILER_LANGS =   c
> > +ONLY_FOR_ARCHS =   ${LP64_ARCHS}
> > +ALL_TARGET =   lrs lrsnash single all-shared
> > +
> > # A simple test to check it works
> > -REGRESS_FILES =test.ine expected_outcome.ine openbsd_regress.sh
> > do-test:
> > -.for i in ${REGRESS_FILES}
> > -   cp ${FILESDIR}/${i} ${WRKBUILD}
> > -.endfor
> > +   cd ${FILESDIR} && \
> > +   cp test.ine expected_outcome.ine openbsd_regress.sh ${WRKBUILD}
> > cd ${WRKBUILD} && sh openbsd_regress.sh
> >
> > .include 
> > Index: patches/patch-makefile
> > ===
> > RCS file: /cvs/ports/math/lrs/patches/patch-makefile,v
> > retrieving revision 1.2 diff -u -p -r1.2 patch-makefile --- 
> > patches/patch-makefile  20 Nov 2020 19:16:18 -  1.2
> > +++ patches/patch-makefile  21 Nov 2020 12:59:07 -
> > @@ -1,95 +1,39 @@
> > $OpenBSD: patch-makefile,v 1.2 2020/11/20 19:16:18 edd Exp $
> >
> >
> > -Honour CFLAGS, LDFLAGS, CPPFLAGS
> > +Honour CFLAGS
> > Avoid library symlinks
> > Rectify install targets
> >
> >
> >  makefile.orig  Sat Oct 17 11:48:42 2020
> > -+++ makefile   Thu Nov 19 07:01:15 2020
> > -@@ -51,14 +51,14 @@ LRSOBJ64=lrs64.o lrslong1.o lrslib1.o lrslibgmp.o lrsg
> > - MPLRSOBJ64=lrslong1-mplrs.o lrslib1-mplrs.o lrslibgmp-mplrs.o 
> > lrsgmp-mplrs.o lrsdriver-mplrs.o mplrs64.o
> > +Index: makefile
> > +--- makefile.orig
> >  makefile
> > +@@ -52,8 +52,8 @@ MPLRSOBJ64=lrslong1-mplrs.o lrslib1-mplrs.o lrslibgmp-
> >
> >
> > lrs: ${LRSOBJ}
> > --  $(CC) ${CFLAGS} -DMA -DB128 -L${LIBDIR} -o lrs ${LRSOBJ} -lgmp
> > +   $(CC) ${CFLAGS} -DMA -DB128 -L${LIBDIR} -o lrs ${LRSOBJ} -lgmp
> > -   $(CC)  -O3   -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c lrsgmp.c 
> > lrsdriver.c -L${LIBDIR}  -lgmp
> > -   $(CC) -O3 hvref.c -o hvref
> > -+  $(CC) ${CFLAGS} -DMA -DB128 ${LDFLAGS} -o lrs ${LRSOBJ} -lgmp
> > -+  $(CC) ${CFLAGS} -DGMP ${CPPFLAGS} -o lrsgmp lrs.c lrslib.c lrsgmp.c 
> > lrsdriver.c ${LDFLAGS} -lgmp
> > ++  $(CC) ${CFLAGS} -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c lrsgmp.c 
> > lrsdriver.c -L${LIBDIR} -lgmp
> > +   $(CC) ${CFLAGS} hvref.c -o hvref
> > ln -s -f lrs redund ln -s -f lrsgmp redundgmp
> >
> > - lrs64: ${LRSOBJ64}
> > --  $(CC) ${CFLAGS} -DMA -L${LIBDIR} -o lrs ${LRSOBJ64} -lgmp
> > -+  $(CC) ${CFLAGS} -DMA ${LDFLAGS} -o lrs ${LRSOBJ64} -lgmp
> > -
> > - lrs.o: lrs.c
> > -   $(CC) ${CFLAGS} -DMA -DB128 -c -o lrs.o lrs.c
> > -@@ -79,10 +79,10 @@ lrslib2.o: lrslib.c lrslib.h
> > -   $(CC) ${CFLAGS} -DMA -DSAFE -DB128 -DLRSLONG -c -o lrslib2.o lrslib.c
> > -
> > - lrslibgmp.o: lrslib.c 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 07:08:14

Modified files:
net/dhcpcd : Makefile distinfo 

Log message:
update to dhcpcd-9.3.3

skytools [was Re: PostgreSQL 13.1 Upgrade]

[Stuart Henderson]

On 2020/11/20 17:06, Jeremy Evans wrote:
> skytools patch to fix build (dead upstream for about 3 years)

it's still actively developed, but has been reorganized into separate
projects (py-skytools, pgq, londiste, walmgr etc).

Since the current distfile is no longer available here's an update to
the most recent skytools-legacy version (the patches will still be
needed for 13.x though).. is anyone still using this that can test?

Index: Makefile
===
RCS file: /cvs/ports/databases/skytools/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile20 Mar 2020 16:44:22 -  1.32
+++ Makefile21 Nov 2020 14:06:55 -
@@ -2,44 +2,52 @@
 
 COMMENT=   PostgreSQL tools from Skype
 
-# XXX outdated; http://pgfoundry.org/frs/download.php/3622/skytools-3.2.tar.gz
-MODPY_EGG_VERSION= 3.1.1
-DISTNAME=  skytools-${MODPY_EGG_VERSION}
-REVISION=  6
+MODPY_EGG_VERSION= 3.2.6
+GH_ACCOUNT=pgq
+GH_PROJECT=skytools-legacy
+GH_TAGNAME=${MODPY_EGG_VERSION}
+PKGNAME=   skytools-${MODPY_EGG_VERSION}
 
 CATEGORIES=databases
 
-HOMEPAGE=  http://pgfoundry.org/projects/skytools
+HOMEPAGE=  https://wiki.postgresql.org/wiki/SkyTools
 
 MAINTAINER=Pierre-Emmanuel Andre 
 
 # BSD
 PERMIT_PACKAGE=Yes
 
-WANTLIB=   c pq pthread ${MODPY_WANTLIB}
-
-MASTER_SITES=  https://github.com/downloads/markokr/skytools/
+WANTLIB=   c pq pthread ${MODPY_WANTLIB}
 
 MODULES=   lang/python
 
+MASTER_SITES0= https://github.com/markokr/libusual/archive/
+DISTFILES= ${DISTNAME}.tar.gz 
libusual-{}2c1cb7f9bfa0a2a183354eb2630a3e4136d0f96b.tar.gz:0
+
 BUILD_DEPENDS= databases/postgresql,-server>=12 \
-   databases/postgresql,-main>=12
+   databases/postgresql,-main>=12 \
+   textproc/asciidoc \
+   textproc/xmlto
 LIB_DEPENDS=   databases/postgresql,-main>=12
-RUN_DEPENDS=databases/py-psycopg2
+RUN_DEPENDS=   databases/py-psycopg2
 
 NO_TEST=   Yes
 USE_GMAKE= Yes
 
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=--with-python=${MODPY_BIN}
+CONFIGURE_STYLE= autoreconf
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.16
+AUTORECONF=./autogen.sh
+CONFIGURE_ARGS=--with-python=${MODPY_BIN} \
+   --with-asciidoc
+
+MAKE_ENV=  PYTHON=${MODPY_BIN}
+MAKE_FLAGS=V=1
 
-BINFILES=  bulk_loader.py cube_dispatcher.py londiste.py \
-   pgqadm.py queue_mover.py queue_splitter.py \
-   scriptmgr.py skytools_upgrade.py table_dispatcher.py \
-   walmgr.py
+post-extract:
+   mv ${WRKDIR}/libusual-*/* ${WRKSRC}/lib/
 
 pre-configure:
-   ${SUBST_CMD} ${WRKSRC}/doc/Makefile
find ${WRKSRC} -name '*.py' \
-exec sed -i 's,/usr/bin/env python,${MODPY_BIN},' {} +
 
Index: distinfo
===
RCS file: /cvs/ports/databases/skytools/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo17 Oct 2012 20:22:46 -  1.9
+++ distinfo21 Nov 2020 14:06:55 -
@@ -1,2 +1,4 @@
-SHA256 (skytools-3.1.1.tar.gz) = Elpb0XPfYKFPqtHGQ8RtJoVMv3UWwAWoc0GiDdQivA0=
-SIZE (skytools-3.1.1.tar.gz) = 651345
+SHA256 (libusual-2c1cb7f9bfa0a2a183354eb2630a3e4136d0f96b.tar.gz) = 
Kd+d00RJyiefLINSu9eBQc++igtASgPfGp9ERG6kXE8=
+SHA256 (skytools-legacy-3.2.6.tar.gz) = 
XmMDNbzxJlKtqtyNcNofqWW0teq/YofNTnr0CXX7YtY=
+SIZE (libusual-2c1cb7f9bfa0a2a183354eb2630a3e4136d0f96b.tar.gz) = 236130
+SIZE (skytools-legacy-3.2.6.tar.gz) = 513553
Index: patches/patch-doc_Makefile
===
RCS file: patches/patch-doc_Makefile
diff -N patches/patch-doc_Makefile
--- patches/patch-doc_Makefile  17 Oct 2012 20:22:46 -  1.4
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-doc_Makefile,v 1.4 2012/10/17 20:22:46 pea Exp $
 doc/Makefile.orig  Tue Oct  9 12:36:51 2012
-+++ doc/Makefile   Wed Oct 17 16:00:07 2012
-@@ -35,8 +35,8 @@ FQMAN = $(FQMAN1) $(FQMAN1_SFX) $(FQMAN5)
- 
- COMMON = common.switches.txt common.config.txt
- 
--GETATTRS = $(PYTHON) ../misc/getattrs.py
--FIXMAN = $(PYTHON) ../misc/fixman.py
-+GETATTRS = ${MODPY_BIN} ../misc/getattrs.py
-+FIXMAN = ${MODPY_BIN} ../misc/fixman.py
- 
- #AFLAGS = -a linkcss
- #AFLAGS = -a stylesheet=extra.css
Index: patches/patch-sql_pgq_triggers_common_c
===
RCS file: 
/cvs/ports/databases/skytools/patches/patch-sql_pgq_triggers_common_c,v
retrieving revision 1.1
diff -u -p -r1.1 patch-sql_pgq_triggers_common_c
--- patches/patch-sql_pgq_triggers_common_c 19 Feb 2019 05:11:57 -  
1.1
+++ patches/patch-sql_pgq_triggers_common_c 21 Nov 2020 14:06:55 -
@@ -13,7 +13,7 @@ Index: sql/pgq/triggers/common.c
  #include 
  #include 
  #include 
-@@ -121,9 +122,9 @@ static void 

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2020/11/21 06:49:06

Modified files:
devel/py-guppy : Makefile distinfo 
devel/py-guppy/pkg: PLIST 

Log message:
Update to py-guppy-0.1.11.

Re: [UPDATE] math/lrs -> 071a

[Stuart Henderson]

Now it's committed here's some clean-up.

- don't patch away upstream's INCLUDEDIR/LIBDIR mechanism to replace
it with something using CPPFLAGS/LDFLAGS which does exactly the same;
simplifies the patch

 patch-makefile |  115 +++---
 1 file changed, 23 insertions(+), 92 deletions(-)

- building the targets chosen for the port requires a compiler with
128-bit int support; afaik this requires clang, or GCC 4.6 or newer,
and a 64-bit arch. So I've set the compiler and restricted archs.
(alternatively we could use "ALL_TARGETS=lrs64" on those archs but that
would mean extra mess with arch-specific PLISTs).

- simplify the test target

ok?


Index: Makefile
===
RCS file: /cvs/ports/math/lrs/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile20 Nov 2020 19:16:18 -  1.7
+++ Makefile21 Nov 2020 12:59:07 -
@@ -3,6 +3,7 @@
 COMMENT =  solve vertex enumeration and convex hull problems
 
 V =071a
+REVISION = 0
 DISTNAME = lrslib-${V}
 PKGNAME =  lrs-${V}
 FIX_EXTRACT_PERMISSIONS=Yes
@@ -25,22 +26,24 @@ MASTER_SITES =  http://cgm.cs.mcgill.ca/
 USE_GMAKE =Yes
 
 MAKE_FILE =makefile
-MAKE_FLAGS =   CPPFLAGS=-I${LOCALBASE}/include \
-   LDFLAGS=-L${LOCALBASE}/lib \
+MAKE_FLAGS =   INCLUDEDIR="${LOCALBASE}/include" \
+   LIBDIR="${LOCALBASE}/lib" \
CFLAGS="${CFLAGS} -Wall" \
SONAME="liblrs.so.${LIBlrs_VERSION:R}" \
SOMINOR=".${LIBlrs_VERSION:E}"
 
-ALL_TARGET =   lrs lrsnash single all-shared
-
 LIB_DEPENDS =  devel/gmp
 
+# targets "lrs", "lrsnash", "single", "all-shared" require 128-bit ints
+COMPILER = base-clang ports-gcc
+COMPILER_LANGS =   c
+ONLY_FOR_ARCHS =   ${LP64_ARCHS}
+ALL_TARGET =   lrs lrsnash single all-shared
+
 # A simple test to check it works
-REGRESS_FILES =test.ine expected_outcome.ine openbsd_regress.sh
 do-test:
-.for i in ${REGRESS_FILES}
-   cp ${FILESDIR}/${i} ${WRKBUILD}
-.endfor
+   cd ${FILESDIR} && \
+   cp test.ine expected_outcome.ine openbsd_regress.sh ${WRKBUILD}
cd ${WRKBUILD} && sh openbsd_regress.sh
 
 .include 
Index: patches/patch-makefile
===
RCS file: /cvs/ports/math/lrs/patches/patch-makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-makefile
--- patches/patch-makefile  20 Nov 2020 19:16:18 -  1.2
+++ patches/patch-makefile  21 Nov 2020 12:59:07 -
@@ -1,95 +1,39 @@
 $OpenBSD: patch-makefile,v 1.2 2020/11/20 19:16:18 edd Exp $
 
-Honour CFLAGS, LDFLAGS, CPPFLAGS
+Honour CFLAGS
 Avoid library symlinks
 Rectify install targets
 
 makefile.orig  Sat Oct 17 11:48:42 2020
-+++ makefile   Thu Nov 19 07:01:15 2020
-@@ -51,14 +51,14 @@ LRSOBJ64=lrs64.o lrslong1.o lrslib1.o lrslibgmp.o lrsg
- MPLRSOBJ64=lrslong1-mplrs.o lrslib1-mplrs.o lrslibgmp-mplrs.o lrsgmp-mplrs.o 
lrsdriver-mplrs.o mplrs64.o
+Index: makefile
+--- makefile.orig
 makefile
+@@ -52,8 +52,8 @@ MPLRSOBJ64=lrslong1-mplrs.o lrslib1-mplrs.o lrslibgmp-
  
  lrs: ${LRSOBJ}
--  $(CC) ${CFLAGS} -DMA -DB128 -L${LIBDIR} -o lrs ${LRSOBJ} -lgmp
+   $(CC) ${CFLAGS} -DMA -DB128 -L${LIBDIR} -o lrs ${LRSOBJ} -lgmp
 -  $(CC)  -O3   -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c lrsgmp.c 
lrsdriver.c -L${LIBDIR}  -lgmp
 -  $(CC) -O3 hvref.c -o hvref
-+  $(CC) ${CFLAGS} -DMA -DB128 ${LDFLAGS} -o lrs ${LRSOBJ} -lgmp
-+  $(CC) ${CFLAGS} -DGMP ${CPPFLAGS} -o lrsgmp lrs.c lrslib.c lrsgmp.c 
lrsdriver.c ${LDFLAGS} -lgmp
++  $(CC) ${CFLAGS} -DGMP -I${INCLUDEDIR} -o lrsgmp lrs.c lrslib.c lrsgmp.c 
lrsdriver.c -L${LIBDIR} -lgmp
 +  $(CC) ${CFLAGS} hvref.c -o hvref
ln -s -f lrs redund
ln -s -f lrsgmp redundgmp
  
- lrs64: ${LRSOBJ64}
--  $(CC) ${CFLAGS} -DMA -L${LIBDIR} -o lrs ${LRSOBJ64} -lgmp
-+  $(CC) ${CFLAGS} -DMA ${LDFLAGS} -o lrs ${LRSOBJ64} -lgmp
- 
- lrs.o: lrs.c
-   $(CC) ${CFLAGS} -DMA -DB128 -c -o lrs.o lrs.c
-@@ -79,10 +79,10 @@ lrslib2.o: lrslib.c lrslib.h
-   $(CC) ${CFLAGS} -DMA -DSAFE -DB128 -DLRSLONG -c -o lrslib2.o lrslib.c
- 
- lrslibgmp.o: lrslib.c lrslib.h
--  $(CC) ${CFLAGS} -DMA -DGMP -I${INCLUDEDIR} -c -o lrslibgmp.o lrslib.c
-+  $(CC) ${CFLAGS} -DMA -DGMP ${CPPFLAGS} -c -o lrslibgmp.o lrslib.c
- 
- lrsgmp.o: lrsgmp.c lrsgmp.h
--  $(CC) ${CFLAGS} -DMA -DGMP -I${INCLUDEDIR} -c -o lrsgmp.o lrsgmp.c
-+  $(CC) ${CFLAGS} -DMA -DGMP ${CPPFLAGS} -c -o lrsgmp.o lrsgmp.c
- 
- 
- lrslong1-mplrs.o: lrslong.c lrslong.h
-@@ -98,28 +98,28 @@ lrslib2-mplrs.o: lrslib.c lrslib.h
-   $(mpicxx) ${CFLAGS} -DTIMES -DSIGNALS -DMA -DSAFE -DB128 -DLRSLONG 
-DPLRS -c -o lrslib2-mplrs.o lrslib.c
- 
- lrslibgmp-mplrs.o: 

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/11/21 05:59:56

Modified files:
devel/glade: Makefile distinfo 

Log message:
update to glade-3.38.2

Re: Ping: [Update] x11/xbindkeys: 1.8.6 -> 1.8.7

[Stuart Henderson]

> > Relevant changelog can be viewed here at [1].
> >
> > "Version 1.8.7: Bugfix: Prevent scheme functions to be garbage collected
> > (Thanks Jason Miller)"

btw: we don't build the scheme support anyway, so this is essentially a noop
(still makes sense to update though, if only to get it out of the portroach
list!)

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 05:32:55

Modified files:
x11/xbindkeys  : Makefile 

Log message:
tidy whitespace, mix of "=" and " ="

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 05:28:02

Modified files:
sysutils/direnv: Makefile distinfo 

Log message:
update to direnv-2.24.0, from Ashton Fagg (maintainer)

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 05:26:50

Modified files:
infrastructure/db: user.list 
sysutils   : Makefile 

Log message:
+blackbox_exporter

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/11/21 05:25:58

Log message:
import ports/sysutils/blackbox_exporter, ok tracey@

This Prometheus exporter allows "blackbox" probing of endpoints over
HTTP, HTTPS, DNS, TCP and ICMP. That is, it allows making requests using
various protocols from a management machine to standard network servers
and gathering metrics from them.

Status:

Vendor Tag: sthen
Release Tags:   sthen_20201121

N ports/sysutils/blackbox_exporter/Makefile
N ports/sysutils/blackbox_exporter/distinfo
N ports/sysutils/blackbox_exporter/patches/patch-Makefile_common
N ports/sysutils/blackbox_exporter/pkg/DESCR
N ports/sysutils/blackbox_exporter/pkg/PLIST
N ports/sysutils/blackbox_exporter/pkg/blackbox_exporter.rc
N ports/sysutils/blackbox_exporter/pkg/README

No conflicts created by this import

Re: NEW: sysutils/blackbox_exporter

[Stuart Henderson]

On 2020/11/20 15:31, Tracey Emery wrote:
> There is trailing whitespace in the README file and an .orig in the
> patches folder. What's the rule on starting COMMENTS with a capital?

caps for proper nouns, otherwise lower-case

> Otherwise, works fine here. ok tracey

Thanks :)

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/11/21 03:46:40

Modified files:
www/webkitgtk4 : Makefile distinfo 
www/webkitgtk4/patches: patch-Source_WTF_wtf_PageBlock_h 
patch-Source_cmake_WebKitFeatures_cmake 

Log message:
Update to webkitgtk4-2.30.3.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/11/21 02:44:30

Modified files:
sysutils/consolekit: Makefile 
sysutils/consolekit/patches: patch-src_ck-sysdeps-openbsd_c 

Log message:
Simplify stat2proc.
Fix max_consoles.
Remove useless header.

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2020/11/21 02:40:10

Modified files:
multimedia/py-pafy: Makefile distinfo 
multimedia/py-pafy/pkg: PLIST 

Log message:
Update to py-pafy-0.5.5.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/11/21 02:38:40

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.18.183.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/11/21 02:38:26

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py3-boto3-1.16.23.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/11/21 02:38:15

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py3-botocore-1.19.23.

Re: maintainer update: www/hugo 0.76.5

[Paco Esteban]

Bump version to 0.78.2

As usual, tests from actual hugo users welcome.

OK to commit ?

This is the changelog from my last diff:

  * js: Let ESBuild handle all imports from node_modules 78f227b6
  * build(deps): bump github.com/evanw/esbuild from 0.8.5 to 0.8.6 5e03f644
  * build(deps): bump github.com/evanw/esbuild from 0.8.4 to 0.8.5 a92ef20f
  * build(deps): bump github.com/getkin/kin-openapi from 0.22.1 to 0.26.0 
0d54a844
  * Update GH docs to say "main" as default branch 943f3c93
  * Updated year in header 4f20bf29
  * Added first fuzzer 4c613d5d
  * build(deps): bump github.com/frankban/quicktest from 1.11.1 to 1.11.2 
82a182e5
  * build(deps): bump golang.org/x/text from 0.3.3 to 0.3.4 dfc662b2
  * build(deps): bump github.com/evanw/esbuild from 0.8.3 to 0.8.4 2f0917cc
  * Disable NPM test on Travis on Windows 3437174c
  * travis: Install nodejs on Windows f66302ca
  * js: Remove external source map option 944150ba
  * js: Misc fixes bf2837a3
  * Add avoidTDZ option 3b2fe3cd
  * Make js.Build fully support modules 85e4dd73
  * Generate tsconfig files 3089fc0b
  * Refactor time.AsTime location implementation 807db97a
  * Update Hugo time to support optional [LOCATION] parameter 26eeb291
  * Improve layout path construction acfa1538
  * Test all lookup permutations in TestLayout 78b26d53
  * Reformat TestLayout table 28179bd5
  * Allow absolute paths for project imports beabc8d9
  * Regen docs helper 332b65e4
  * Add module.replacements 173187e2
  * Do not call CDN service invalidation when executing a dry run deployment 
56a34350
  * Pass editor arguments from newContentEditor correctly d48a98c4
  * Bump github.com/spf13/cobra from 0.0.7 to 1.1.1 3261678f
  * Allow optional "nodeploy" tag to exclude deploy command from bin f465c5c3
  * Allow cascade _target to work with non toml fm 3400aff2
  * Allow getJSON errors to be ignored fdfa4a5f
  * bump github.com/evanw/esbuild from 0.7.15 to 0.7.18 8cbe2bbf
  * Revert "Add benchmark for building docs site" b886fa46
  * Avoid making unnecessary allocation 14bce18a
  * Add benchmark for building docs site 837e084b
  * Always show page number when 5 pages or less 08e4f9ff
  * bump github.com/frankban/quicktest from 1.11.0 to 1.11.1 f033d9f0
  * bump github.com/evanw/esbuild from 0.7.14 to 0.7.15 59fe2794
  * Merge branch 'release-0.76.5' 62119022
  * Render aliases even if render=link 79a022a1
  * Render aliases even if render=link ead5799f
  * bump github.com/spf13/afero from 1.4.0 to 1.4.1 d57be113
  * bump github.com/evanw/esbuild from 0.7.9 to 0.7.14 d0705966
  * Update to Go 1.15 and Alpine 3.12 f5ea359d
  * Install postcss v8 explicitly as it is now a peer dependency e9a7ebaf
  * Merge branch 'release-0.76.3' 49972d07
  * Add merge helper c98132e3
  * Add workaround for known language, but missing plural rule error 33e9d79b
  * Update to github.com/tdewolff/minify v2.9.4" 6dd60fca
  * Fix reflection bug in merge 6d95dc9d
  * Fix setting HUGO_MODULE_PROXY etc. via env vars 8a1c637c
  * Fix for language code case issue with pt-br etc. 50682043
  * Fix for bare TOML keys fc6abc39
  * Fix i18n .Count regression f9e798e8
  * Fix typo in 0.76.0 release note ee56efff

On Wed, 28 Oct 2020, Paco Esteban wrote:

> Hi ports@,
> 
> This is an update for www/hugo to its latest version 0.76.5.
> 
> Builds and runs ok for me on amd64.  As usual, testing from actual hugo
> users is really appreciated.
> 
> The changelog here and diff at the end.
> 
>   * Add Do Not Track (dnt) option to Vimeo shortcode edc5c474 @joshgerdes 
> #7700
>   * Regen docshelper b9318e43 @bep
>   * Make BuildConfig.Render an enum 63493890 @bep #7783
>   * Allow cascade to be a slice with a _target discriminator c63db7f1 @bep 
> #7782
>   * Add force flag to server redirects config 5e2a547c @bep #7778
>   * bump github.com/evanw/esbuild from 0.7.8 to 0.7.9 ee090c09 
> @dependabot[bot]
>   * bump github.com/tdewolff/minify/v2 from 2.9.5 to 2.9.7 05e358fd 
> @dependabot[bot]
>   * bump github.com/aws/aws-sdk-go from 1.34.34 to 1.35.0 a2e85d9a 
> @dependabot[bot]
>   * bump github.com/getkin/kin-openapi from 0.22.0 to 0.22.1 4fba78dd 
> @dependabot[bot]
>   * bump github.com/aws/aws-sdk-go from 1.34.33 to 1.34.34 c011b466 
> @dependabot[bot]
>   * bump github.com/evanw/esbuild from 0.7.7 to 0.7.8 35348b4b 
> @dependabot[bot]
>   * bump github.com/aws/aws-sdk-go from 1.34.27 to 1.34.33 34915777 
> @dependabot[bot]
>   * bump github.com/evanw/esbuild from 0.7.4 to 0.7.7 0f4a837e 
> @dependabot[bot]
>   * bump github.com/tdewolff/minify/v2 from 2.9.4 to 2.9.5 b395d686 
> @dependabot[bot]
>   * Upgrade to go-i18n v2 97987e5c @bep #5242
>   * bump github.com/evanw/esbuild from 0.7.2 to 0.7.4 4855c186 
> @dependabot[bot]
>   * bump github.com/aws/aws-sdk-go from 1.34.26 to 1.34.27 6f07ec7e 
> @dependabot[bot]
>   * bump github.com/alecthomas/chroma from 0.8.0 to 0.8.1 4318dc72 
> @dependabot[bot]
>   * bump github.com/evanw/esbuild from 0.7.1 to 0.7.2 acdc27a3 
> @dependabot[bot]
>   * Make sure CSS 

CVS: cvs.openbsd.org: ports

[Benoit Lecocq]

CVSROOT:/cvs
Module name:ports
Changes by: ben...@cvs.openbsd.org  2020/11/21 02:31:04

Modified files:
misc/p5-User-Identity: Makefile distinfo 

Log message:
Update to p5-User-Identity-1.00.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/11/21 02:09:24

Modified files:
x11/gnome/librsvg: Makefile distinfo 

Log message:
Update to librsvg-2.50.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/11/21 01:38:00

Modified files:
x11/gnome/nautilus: Makefile distinfo 
Removed files:
x11/gnome/nautilus/patches: patch-src_nautilus-tag-manager_c 

Log message:
Update to nautilus-3.38.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/11/21 01:16:28

Modified files:
x11/gnome/devhelp: Makefile distinfo 
x11/gnome/devhelp/pkg: PLIST 

Log message:
Update to devhelp-3.38.1.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/11/21 01:07:30

Modified files:
x11/gnome/tepl : Makefile distinfo 
x11/gnome/tepl/pkg: PLIST 

Log message:
Update to tepl-5.0.1.