CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/28 00:51:06

Modified files:
devel/goopy: Makefile 

Log message:
Missed bump after the move to python 3.

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2021/02/28 00:38:02

Modified files:
games/stepmania: Makefile 

Log message:
fix build (missing build depends)

Re: [NEW][WIP] games/openxray game engine port for S.T.A.L.K.E.R.

[Eugene Moz.]

Here's updated ports, for anyone that follows, openxray now *almost* builds.
games/openxray
devel/lockfile
graphics/freeimageplus

Also fixed error in freeimageplus, be wary both freeimage and
freeimageplus are required to build openxray.
Thanks to Stuart for his efforts =)
--
Eugene Moz.


openxray.tar.gz
Description: Binary data


lockfile.tar.gz
Description: Binary data


freeimageplus.tar.gz
Description: Binary data

Re: new: lang/zig

[Evan Silberman]

> On Feb 27, 2021, at 11:02 PM, Theo de Raadt  wrote:
> 
> I met a programmer using an obscure
> language...

Who said “One vast and branchless trunk of code
Stands in the desert...Near it on the sand
Half-sunk a shattered memory protection barrier lies…

That’s all I got

Re: new: lang/zig

[Theo de Raadt]

Sebastien Marie  wrote:

I take no position on what lands in ports, but want to make a public
comment.  I doubt you wrote the following sentence:

> Zig is a general-purpose programming language and toolchain for
> maintaining robust, optimal, and reusable software.

I am sure both csh and php aspired to do the same.

One thing Rust has done, is to teach everyone they must lead with
propoganda.  After all if your propoganda isn't overbearing, obviously
you've got nothing?  It is pretty sad others feel compelled to repeat
such bombastic same-old same-old glowing terms, rather than describing
"what we do is different".

Robust?  Show us 100 critical and meaningful programs.
Optimal?  That results from LLVM in the back-end.
Reusable?  Uhm show us 100 critical and meaningful programs.

Perhaps these authors don't understand that those of us attempting to
use modern techniques like privsep in C (proper privsep is exceedingly
rare outside of the C universe because memory-safe makes privsep
irrelevant /sarc) remain uninspired by such lead-ins.  We recognize all
the tools in the world are imperfect, but wow, such a first sentence
does wonders to lose the audience.  I met a programmer using an obscure
language...

update and repair games/sdlpop (attempt #2)

[Daniel Dickman]

Here's another attempt to update sdlpop and fix the compile breakage.

Differences from the last proposal:
- we avoid adding EPOCH and continue to use the date of the last commit as 
  the package version
- update to the latest commit which is a bit newer than v1.21.
- remove sdl2_mixer dependencies

Retested this update by playing most of the first level again.

ok?

Index: Makefile
===
RCS file: /cvs/ports/games/sdlpop/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- Makefile12 Jul 2019 21:02:20 -  1.6
+++ Makefile28 Feb 2021 06:39:48 -
@@ -4,13 +4,13 @@ NOT_FOR_ARCHS=${BE_ARCHS}
 
 COMMENT=   open-source port of Prince of Persia
 
-DISTNAME=  sdlpop-20161103
-CATEGORIES=games
-REVISION=  1
-
+# XXX: switching to a tagged release will require bumping EPOCH
+DISTNAME=  sdlpop-20210227
 GH_ACCOUNT=NagyD
 GH_PROJECT=SDLPoP
-GH_COMMIT= 6185f28a3b8b74cfc5762aeeea38aedb4e142cbc
+GH_COMMIT= b91c1d4e8171440b9f47c1b246400509fde76d8c
+
+CATEGORIES=games
 
 MAINTAINER=Robert Nagy 
 
@@ -21,10 +21,9 @@ MAKE_FLAGS=  CC="${CC}" LOCALBASE="${LOCA
 # GPLv3
 PERMIT_PACKAGE=Yes
 
-WANTLIB=   SDL2 SDL2_image SDL2_mixer c m
+WANTLIB=   SDL2 SDL2_image c m
 
-LIB_DEPENDS=   devel/sdl2-image \
-   devel/sdl2-mixer
+LIB_DEPENDS=   devel/sdl2-image
 
 pre-configure:
${SUBST_CMD} ${WRKSRC}/seg009.c
Index: distinfo
===
RCS file: /cvs/ports/games/sdlpop/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo6 May 2017 15:10:17 -   1.2
+++ distinfo28 Feb 2021 06:39:48 -
@@ -1,2 +1,2 @@
-SHA256 (sdlpop-20161103-6185f28a.tar.gz) = 
U9CGdA+k12/MpS7hxVzQEh50tuWammV7cP2EVIKy624=
-SIZE (sdlpop-20161103-6185f28a.tar.gz) = 3705930
+SHA256 (sdlpop-20210227-b91c1d4e.tar.gz) = 
Qau9DV2I5F9WB7QxofQGjTOvxfgxf9VNPZ6gPQdiCvs=
+SIZE (sdlpop-20210227-b91c1d4e.tar.gz) = 639436
Index: patches/patch-src_Makefile
===
RCS file: /cvs/ports/games/sdlpop/patches/patch-src_Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 patch-src_Makefile
--- patches/patch-src_Makefile  5 Nov 2017 19:29:43 -   1.4
+++ patches/patch-src_Makefile  28 Feb 2021 06:39:48 -
@@ -2,16 +2,22 @@ $OpenBSD: patch-src_Makefile,v 1.4 2017/
 Index: src/Makefile
 --- src/Makefile.orig
 +++ src/Makefile
-@@ -14,9 +14,9 @@ LIBS := $(shell sdl2-config --libs) -lSDL2_image -lSDL
- INCS := -I/opt/local/include
- CFLAGS += $(INCS) -Wall -std=gnu99 -D_GNU_SOURCE=1 -D_THREAD_SAFE -DOSX -O2
+@@ -10,15 +10,15 @@ BIN = ../prince
+ OS  := $(shell uname)
+ 
+ CPPFLAGS += -Wall -D_GNU_SOURCE=1
+-CFLAGS += -std=gnu99 -O2
++CFLAGS += -std=gnu99
+ 
+ ifeq ($(OS),Darwin)
+ LIBS := $(shell sdl2-config --libs) -lSDL2_image
+ CFLAGS += -I/opt/local/include
+ CPPFLAGS += -D_THREAD_SAFE -DOSX
  else
--LIBS := $(shell pkg-config --libs   sdl2 SDL2_image SDL2_mixer)
--INCS := $(shell pkg-config --cflags sdl2 SDL2_image SDL2_mixer)
--CFLAGS += $(INCS) -Wall -std=gnu99 -O2
-+LIBS := $(shell pkg-config --libs   sdl2 SDL2_image SDL2_mixer) -lm
-+INCS := $(shell pkg-config --cflags sdl2 SDL2_image SDL2_mixer) 
-I${LOCALBASE}/include
-+CFLAGS += $(INCS) -Wall -std=gnu99
+-LIBS := $(shell pkg-config --libs   sdl2 SDL2_image)
+-CFLAGS += $(shell pkg-config --cflags sdl2 SDL2_image)
++LIBS := $(shell pkg-config --libs   sdl2 SDL2_image) -lm
++CFLAGS += $(shell pkg-config --cflags sdl2 SDL2_image) -I${LOCALBASE}/include
  endif
  
  all: $(BIN)
Index: patches/patch-src_seg009_c
===
RCS file: /cvs/ports/games/sdlpop/patches/patch-src_seg009_c,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-src_seg009_c
--- patches/patch-src_seg009_c  3 Nov 2016 17:30:32 -   1.1.1.1
+++ patches/patch-src_seg009_c  28 Feb 2021 06:39:48 -
@@ -1,39 +1,40 @@
 $OpenBSD: patch-src_seg009_c,v 1.1.1.1 2016/11/03 17:30:32 robert Exp $
 src/seg009.c.orig  Thu Nov  3 18:07:22 2016
-+++ src/seg009.c   Thu Nov  3 18:14:31 2016
-@@ -152,7 +152,7 @@ static FILE* open_dat_from_root_or_data_dir(const char
+Index: src/seg009.c
+--- src/seg009.c.orig
 src/seg009.c
+@@ -334,7 +334,7 @@ static FILE* open_dat_from_root_or_data_dir(const char
// if failed, try if the DAT file can be opened in the data/ directory, 
instead of the main folder
if (fp == NULL) {
char data_path[POP_MAX_PATH];
--  snprintf(data_path, sizeof(data_path), "data/%s", filename);
-+  snprintf(data_path, sizeof(data_path), 
"${PREFIX}/share/sdlpop/data/%s", filename);
+-  snprintf_check(data_path, sizeof(data_path), "data/%s", 
filename);
++  snprintf_check(data_path, sizeof(data_path)

Re: NEW: x11/plasma/{breeze-grub,breeze,breeze-gtk,kdecoration}

[Rafael Sadowski]

On Sun Feb 28, 2021 at 07:37:43AM +0100, Rafael Sadowski wrote:
> Please find attached a first attempted to import a x11/plasma tree.
> Some applications can be used without Wayland. I would like to start
> with some "style" applications to make Qt applications look good.
> 
> Information for inst:kdecoration-5.21.0

Maybe x11/kde-plasma is a better place?

> 
> Comment:
> plugin-based library to create KDE window decorations
> 
> Required by:
> breeze-5.21.0
> 
> Description:
> KDecoration2 is a library to create window decorations. These window 
> decorations can be used by
> for example an X11 based window manager which re-parents a Client window to a 
> window decoration
> frame.
> 
> The library consists of two parts:
> * Decoration API for implementing a Decoration theme
> * Private API to implement the backend part (e.g. from Window Manager side)
> 
> Maintainer: Rafael Sadowski 
> 
> -
> 
> 
> Information for inst:breeze-5.21.0
> 
> Comment:
> Breeze KDE desktop theme
> 
> Required by:
> breeze-gtk-5.21.0
> 
> Description:
> Native part of KDE desktop theme Breeze.
> 
> Maintainer: Rafael Sadowski 
> 
> -
> 
> 
> Information for inst:breeze-gtk-5.21.0
> 
> Comment:
> GTK2 theme matching KDE Breeze
> 
> Description:
> A GTK Theme Built to Match KDE's Breeze. GTK2 theme made by
> ScionicSpectre, https://github.com/scionicspectre/BreezyGTK .
> 
> Maintainer: Rafael Sadowski 
> 
> -
> 
> Information for inst:breeze-grub-5.21.0
> 
> Comment:
> KDE Breeze grub theme
> 
> Description:
> Breeze theme for GRUB 2
> 
> Maintainer: Rafael Sadowski 
> 
> 
> OK to import?

NEW: x11/plasma/{breeze-grub,breeze,breeze-gtk,kdecoration}

[Rafael Sadowski]

Please find attached a first attempted to import a x11/plasma tree.
Some applications can be used without Wayland. I would like to start
with some "style" applications to make Qt applications look good.

Information for inst:kdecoration-5.21.0

Comment:
plugin-based library to create KDE window decorations

Required by:
breeze-5.21.0

Description:
KDecoration2 is a library to create window decorations. These window 
decorations can be used by
for example an X11 based window manager which re-parents a Client window to a 
window decoration
frame.

The library consists of two parts:
* Decoration API for implementing a Decoration theme
* Private API to implement the backend part (e.g. from Window Manager side)

Maintainer: Rafael Sadowski 

-


Information for inst:breeze-5.21.0

Comment:
Breeze KDE desktop theme

Required by:
breeze-gtk-5.21.0

Description:
Native part of KDE desktop theme Breeze.

Maintainer: Rafael Sadowski 

-


Information for inst:breeze-gtk-5.21.0

Comment:
GTK2 theme matching KDE Breeze

Description:
A GTK Theme Built to Match KDE's Breeze. GTK2 theme made by
ScionicSpectre, https://github.com/scionicspectre/BreezyGTK .

Maintainer: Rafael Sadowski 

-

Information for inst:breeze-grub-5.21.0

Comment:
KDE Breeze grub theme

Description:
Breeze theme for GRUB 2

Maintainer: Rafael Sadowski 


OK to import?


x11_plasma.tar.gz
Description: Binary data

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2021/02/27 23:27:01

Modified files:
graphics/opensubdiv: Makefile distinfo 

Log message:
Update opensubdiv to 3.4.4

Update diff from maintainer, thanks

Fix -fno-common bugs in security/ossec-hids

[Greg Steuck]

This makes the package buildable. I have a version of the patches
combined with a 3.6.0 upgrade. Since I don't use the package, I don't
want to install it to figure out if something would be broken
post-build. I'll push the patches upstream separately.

>From 884278196c713f93efe6c3e657e3b2008d2e3641 Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sat, 27 Feb 2021 22:12:41 -0800
Subject: [PATCH] Fix -fno-common bugs in security/ossec-hids

---
 security/ossec-hids/Makefile  |  2 +-
 .../patches/patch-src_addagent_main_c | 24 +++
 .../patch-src_addagent_manage_agents_h| 13 ++
 .../patches/patch-src_client-agent_config_c   | 15 
 4 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 security/ossec-hids/patches/patch-src_addagent_main_c
 create mode 100644 
security/ossec-hids/patches/patch-src_addagent_manage_agents_h
 create mode 100644 security/ossec-hids/patches/patch-src_client-agent_config_c

diff --git a/security/ossec-hids/Makefile b/security/ossec-hids/Makefile
index be1e14ea8cc..a955dc71992 100644
--- a/security/ossec-hids/Makefile
+++ b/security/ossec-hids/Makefile
@@ -5,7 +5,7 @@ COMMENT =   host-based intrusion detection system
 GH_ACCOUNT =   ossec
 GH_PROJECT =   ossec-hids
 GH_TAGNAME =   3.0.0
-REVISION = 1
+REVISION = 2
 
 CATEGORIES =   security
 
diff --git a/security/ossec-hids/patches/patch-src_addagent_main_c 
b/security/ossec-hids/patches/patch-src_addagent_main_c
new file mode 100644
index 000..65c3b4edfb6
--- /dev/null
+++ b/security/ossec-hids/patches/patch-src_addagent_main_c
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+-fno-common
+
+Index: src/addagent/main.c
+--- src/addagent/main.c.orig
 src/addagent/main.c
+@@ -84,6 +84,8 @@ static void manage_shutdown(__attribute__((unused)) in
+ }
+ #endif
+ 
++int willchroot;
++
+ int main(int argc, char **argv)
+ {
+ char *user_msg;
+@@ -104,7 +106,6 @@ int main(int argc, char **argv)
+ int ret;
+ #endif
+ 
+-extern int willchroot;
+ willchroot = 1;
+ 
+ /* Set the name */
diff --git a/security/ossec-hids/patches/patch-src_addagent_manage_agents_h 
b/security/ossec-hids/patches/patch-src_addagent_manage_agents_h
new file mode 100644
index 000..36782067c0a
--- /dev/null
+++ b/security/ossec-hids/patches/patch-src_addagent_manage_agents_h
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+-fno-common
+
+Index: src/addagent/manage_agents.h
+--- src/addagent/manage_agents.h.orig
 src/addagent/manage_agents.h
+@@ -147,4 +147,4 @@ extern fpos_t fp_pos;
+ #define GMF_UNKN_ERROR  ARGV0 ": Could not run GetModuleFileName which 
returned (%ld).\n"
+ 
+ 
+-int willchroot;
++extern int willchroot;
diff --git a/security/ossec-hids/patches/patch-src_client-agent_config_c 
b/security/ossec-hids/patches/patch-src_client-agent_config_c
new file mode 100644
index 000..b466a41aeaa
--- /dev/null
+++ b/security/ossec-hids/patches/patch-src_client-agent_config_c
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+-fno-common
+
+Index: src/client-agent/config.c
+--- src/client-agent/config.c.orig
 src/client-agent/config.c
+@@ -17,7 +17,6 @@
+ time_t available_server;
+ int run_foreground;
+ keystore keys;
+-agent *agt;
+ 
+ 
+ /* Read the config file (for the remote client) */
-- 
2.30.1

new: lang/zig

[Sebastien Marie]

Hi,

I would like to import lang/zig.

Zig is a general-purpose programming language and toolchain for
maintaining robust, optimal, and reusable software.

https://ziglang.org/

The target version is a development version (0.8.0-dev.1038+58344e001)
as OpenBSD support is somehow partial in latest stable (0.7.1). The
current development version is mostly functional: zig is able to
build zig, testsuite mostly succeed (failure on crosscompilation), and
I still have problems with .event loop which needs EVFILT_USER (or I
need to implements .event differently).

Zig is using llvm as backend (it should become an optional dependency
at some point), and the current code support only llvm-11 (and work is
in progress to support llvm-12). As we don't have these llvm versions
in ports (neither in base), the port is using zig-bootstrap
(https://github.com/ziglang/zig-bootstrap) repository, which provides
llvm+clang+lld+zig all-in-one.

The port is first building llvm-11, and next zig, which is statically
linked to the llvm+clang+lld libraries (so no llvm-11 parts on disk at
runtime).

I polished the build to be able to build and link with llvm-11 whereas
devel/llvm is installed, without conflicts. Patches on llvm-11 are
minimal.

The port isn't using the ${WRKSRC}/build script from upstream: this
build script is intented to crosscompile zig to others platforms, and
so llvm and zig are built two times. Instead of, I am providing a
files/build.sh script to build, install and test.

The port should be buildable on ${LLVM_ARCHS}, but I restricted it to
a smaller archs sets: the zig0 compiler (zig stage0 compiler written
in C++, and used to bootstrap to stage1) requires an insane datasize
(6 Go). I kept only archs where datasize of pbuild user was big
enough (amd64 arm64 and powerpc64).

I have tested it on amd64 exclusively.

Comments or OK ?
-- 
Sebastien Marie


zig.tar.gz
Description: application/tar-gz

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2021/02/27 23:19:01

Modified files:
graphics/openvdb: Makefile distinfo 
graphics/openvdb/patches: patch-CMakeLists_txt 
graphics/openvdb/pkg: PLIST 

Log message:
Update openvdb to 8.0.1

Update diff from maintainer, thanks

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2021/02/27 23:17:31

Modified files:
devel/ipython  : Makefile distinfo 

Log message:
Update to ipython-7.21.0

Changes:
https://github.com/ipython/ipython/blob/7.21.0/docs/source/whatsnew/version7.rst

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2021/02/27 23:17:03

Modified files:
news/sabnzbd   : Makefile distinfo 
news/sabnzbd/pkg: PLIST 

Log message:
Update to sabnzbd-3.2.0

Release notes: https://github.com/sabnzbd/sabnzbd/releases/tag/3.2.0

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2021/02/27 23:13:34

Modified files:
games/corewars : Makefile 
games/corewars/pkg: DESCR 
Added files:
games/corewars/patches: patch-src_parser-cw_y 
patch-src_parser-rc_y 

Log message:
games/corewars fix -fno-common build error

With lots of help from daniel@ and naddy@, thank you!

OK naddy@

move games/ski to python3

[Daniel Dickman]

According to NEWS, games/ski was ported to python3 as of version 6.10.

Diff below updates to latest version and moves the port over to python3.

ok?

Index: Makefile
===
RCS file: /cvs/ports/games/ski/Makefile,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile
--- Makefile23 Feb 2021 19:39:23 -  1.16
+++ Makefile28 Feb 2021 05:56:59 -
@@ -2,7 +2,8 @@
 
 COMMENT=   skiing simulation game
 
-DISTNAME=  ski-6.11
+DISTNAME=  ski-6.13
+
 CATEGORIES=games
 
 HOMEPAGE=  http://catb.org/~esr/ski/
@@ -14,7 +15,6 @@ MAINTAINER=   Gleydson Soares 

Fix -fno-common bugs in multimedia/audiopreview

[Greg Steuck]

I confirmed that it runs and plays pieces of videos.

>From aac4e9a6da911a827b7119480400addfe0340ea5 Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sat, 27 Feb 2021 21:21:11 -0800
Subject: [PATCH] Fix -fno-common bugs in multimedia/audiopreview

---
 multimedia/audiopreview/Makefile  |  2 +-
 .../patches/patch-src_ap_config_c | 16 ++
 .../patches/patch-src_ap_config_h | 16 ++
 .../audiopreview/patches/patch-src_player_c   | 22 +++
 .../audiopreview/patches/patch-src_player_h   | 22 +++
 5 files changed, 77 insertions(+), 1 deletion(-)
 create mode 100644 multimedia/audiopreview/patches/patch-src_ap_config_c
 create mode 100644 multimedia/audiopreview/patches/patch-src_ap_config_h
 create mode 100644 multimedia/audiopreview/patches/patch-src_player_c
 create mode 100644 multimedia/audiopreview/patches/patch-src_player_h

diff --git a/multimedia/audiopreview/Makefile b/multimedia/audiopreview/Makefile
index 8b42085720f..8d3aeffda22 100644
--- a/multimedia/audiopreview/Makefile
+++ b/multimedia/audiopreview/Makefile
@@ -3,7 +3,7 @@
 COMMENT =  tool to play previews of audio and video files
 
 DISTNAME = audiopreview-0.6
-REVISION = 5
+REVISION = 6
 
 CATEGORIES =   multimedia
 
diff --git a/multimedia/audiopreview/patches/patch-src_ap_config_c 
b/multimedia/audiopreview/patches/patch-src_ap_config_c
new file mode 100644
index 000..4e2ef2ffdd3
--- /dev/null
+++ b/multimedia/audiopreview/patches/patch-src_ap_config_c
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+-fno-common fixes
+
+Index: src/ap_config.c
+--- src/ap_config.c.orig
 src/ap_config.c
+@@ -22,6 +22,8 @@
+ 
+ #include "ap_config.h"
+ 
++apconfig ap_config;
++
+ #define PREVIEW_DURATION 10
+ 
+ void ap_config_init (apconfig* ap)
diff --git a/multimedia/audiopreview/patches/patch-src_ap_config_h 
b/multimedia/audiopreview/patches/patch-src_ap_config_h
new file mode 100644
index 000..89bca3c0158
--- /dev/null
+++ b/multimedia/audiopreview/patches/patch-src_ap_config_h
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+-fno-common fixes
+
+Index: src/ap_config.h
+--- src/ap_config.h.orig
 src/ap_config.h
+@@ -73,7 +73,7 @@ typedef struct
+   StartPlayingPosition  position;
+ } apconfig;
+ 
+-apconfig ap_config;
++extern apconfig ap_config;
+ 
+ void ap_config_init (apconfig* ap);
+ void config_debug_print_start_position  ();
diff --git a/multimedia/audiopreview/patches/patch-src_player_c 
b/multimedia/audiopreview/patches/patch-src_player_c
new file mode 100644
index 000..d41b2ecdadc
--- /dev/null
+++ b/multimedia/audiopreview/patches/patch-src_player_c
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+-fno-common fixes
+
+Index: src/player.c
+--- src/player.c.orig
 src/player.c
+@@ -23,6 +23,14 @@
+ 
+ #include "player.h"
+ 
++void(*done_playing_callback)();
++GstElement  *pipeline;
++
++static GstElement  *audiofakesink;
++static GstElement  *videofakesink;
++static Stream  **currentstream;
++static Stream  *current_stream;
++
+ static gboolean loop_stream_was_played = FALSE; ///< endless loop prevention 
flag
+ 
+ /**
diff --git a/multimedia/audiopreview/patches/patch-src_player_h 
b/multimedia/audiopreview/patches/patch-src_player_h
new file mode 100644
index 000..14c8b29f4b4
--- /dev/null
+++ b/multimedia/audiopreview/patches/patch-src_player_h
@@ -0,0 +1,22 @@
+$OpenBSD$
+
+-fno-common fixes
+
+Index: src/player.h
+--- src/player.h.orig
 src/player.h
+@@ -29,12 +29,8 @@
+ #include "stream.h"
+ #include "log.h"
+ 
+-GstElement  *videofakesink;
+-GstElement  *audiofakesink;
+-GstElement  *pipeline;
+-void(*done_playing_callback)();
+-Stream  **currentstream;
+-Stream  *current_stream;
++extern GstElement  *pipeline;
++extern void(*done_playing_callback)();
+ 
+ static void player_begin  (Stream* stream);
+ voidplayer_set_position   (StartPlayingPosition position);
-- 
2.30.1

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2021/02/27 21:03:14

Modified files:
games/freedroidrpg: Makefile 
Added files:
games/freedroidrpg/patches: patch-src_global_h 
patch-src_lvledit_lvledit_tools_h 
patch-src_mapgen_mapgen_h 
patch-src_struct_h 

Log message:
Backport upstream fix for -fno-common.

While here:
- move homepage to https
- update license marker
- kill unnecessary post-install target

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/27 21:02:07

Modified files:
devel/goopy: Makefile 
devel/goopy/patches: patch-goopy_functional_py 
devel/goopy/pkg: PLIST 
Added files:
devel/goopy/patches: patch-goopy_functional_unittest_py 

Log message:
convert goopy to python3

switch compiz from pyrex to cython

[Daniel Dickman]

Is anyone actually using x11/compiz?

In the below diff we switch from pyrex to cython to build the .pyx file. 
The main goal is to retire pyrex and compiz is the last consumer.

The diff:
- patches the autoconf infrastructure to look for cython instead of 
  pyrex
- switches CONFIGURE_STYLE from gnu to autoreconf
- fixes the one cython compile problem, and
- regenerates plist

ok?

Index: compizconfig-python/Makefile
===
RCS file: /cvs/ports/x11/compiz/compizconfig-python/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- compizconfig-python/Makefile23 Feb 2021 19:39:49 -  1.5
+++ compizconfig-python/Makefile28 Feb 2021 02:25:59 -
@@ -3,7 +3,7 @@
 COMMENT =  compiz configuration system bindings
 
 DISTNAME = compizconfig-python-0.8.4
-REVISION = 2
+REVISION = 3
 
 MASTER_SITES = http://releases.compiz.org/components/compizconfig-python/
 
@@ -16,14 +16,17 @@ LIB_DEPENDS =   x11/compiz/libcompizconfig
 MODULES =  lang/python
 MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
 
-BUILD_DEPENDS =devel/pyrex
+BUILD_DEPENDS =lang/cython${MODPY_FLAVOR}
 
 LIBTOOL_FLAGS =--tag=disable-static
 
-CONFIGURE_STYLE = gnu
+AUTOCONF_VERSION = 2.63
+AUTOMAKE_VERSION = 1.12
+CONFIGURE_STYLE = autoreconf
 
 pre-patch:
@ln -s ${MODPY_BIN} ${WRKDIR}/bin/python
+   @ln -s ${LOCALBASE}/bin/cython${MODPY_BIN_SUFFIX} ${WRKDIR}/bin/cython
 
 pre-build:
@rm -f ${WRKSRC}/src/compizconfig.c
Index: compizconfig-python/patches/patch-configure_ac
===
RCS file: compizconfig-python/patches/patch-configure_ac
diff -N compizconfig-python/patches/patch-configure_ac
--- /dev/null   1 Jan 1970 00:00:00 -
+++ compizconfig-python/patches/patch-configure_ac  28 Feb 2021 02:25:59 
-
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: configure.ac
+--- configure.ac.orig
 configure.ac
+@@ -31,10 +31,10 @@ else
+   AM_PATH_PYTHON_VERSION(2.5,2.5.0)
+ fi
+ 
+-AC_CHECK_PROGS(PYREX, pyrexc)
++AC_CHECK_PROGS(PYREX, cython)
+ if test -z "$PYREX"
+ then
+-  AC_MSG_ERROR([Couldn't find Pyrex])
++  AC_MSG_ERROR([Couldn't find Cython])
+ fi
+ 
+ AC_CONFIG_FILES([
Index: compizconfig-python/patches/patch-src_Makefile_am
===
RCS file: compizconfig-python/patches/patch-src_Makefile_am
diff -N compizconfig-python/patches/patch-src_Makefile_am
--- /dev/null   1 Jan 1970 00:00:00 -
+++ compizconfig-python/patches/patch-src_Makefile_am   28 Feb 2021 02:25:59 
-
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/Makefile.am
+--- src/Makefile.am.orig
 src/Makefile.am
+@@ -3,7 +3,7 @@ INCLUDES=\
+@CCS_CFLAGS@
+ 
+ compizconfig.c: compizconfig.pyx
+-  -pyrexc compizconfig.pyx
++  -cython compizconfig.pyx
+ 
+ compizconfig_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex 
initcompizconfig -lX11
+ compizconfig_la_LIBADD = @CCS_LIBS@
Index: compizconfig-python/patches/patch-src_compizconfig_pyx
===
RCS file: 
/cvs/ports/x11/compiz/compizconfig-python/patches/patch-src_compizconfig_pyx,v
retrieving revision 1.1
diff -u -p -u -r1.1 patch-src_compizconfig_pyx
--- compizconfig-python/patches/patch-src_compizconfig_pyx  3 Dec 2013 
00:51:19 -   1.1
+++ compizconfig-python/patches/patch-src_compizconfig_pyx  28 Feb 2021 
02:25:59 -
@@ -1,6 +1,7 @@
 $OpenBSD: patch-src_compizconfig_pyx,v 1.1 2013/12/03 00:51:19 fgsch Exp $
 src/compizconfig.pyx.orig  Mon Feb 25 00:32:45 2013
-+++ src/compizconfig.pyx   Mon Feb 25 00:33:08 2013
+Index: src/compizconfig.pyx
+--- src/compizconfig.pyx.orig
 src/compizconfig.pyx
 @@ -583,7 +583,7 @@ cdef class Setting:
  cdef object extendedStrRestrictions
  cdef object baseStrRestrictions
@@ -10,6 +11,15 @@ $OpenBSD: patch-src_compizconfig_pyx,v 1
  cdef CCSSettingType t
  cdef CCSSettingInfo * i
  
+@@ -653,7 +653,7 @@ cdef class Setting:
+ 
+ property Hints:
+ def __get__ (self):
+-if self.ccsSetting.hints == '':
++if not self.ccsSetting.hints:
+ return []
+ else:
+ return str (self.ccsSetting.hints).split (";")[:-1]
 @@ -689,7 +689,7 @@ cdef class SSGroup:
  cdef object display
  cdef object screens
Index: compizconfig-python/pkg/PLIST
===
RCS file: /cvs/ports/x11/compiz/compizconfig-python/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -u -r1.1 PLIST
--- compizconfig-python/pkg/PLIST   3 Dec 2013 00:51:19 -   1.1
+++ compizconfig-python/pkg/PLIST   28 Feb 2021 02:25:59 -
@@ -1,3 +1,3 @@
 @comment $OpenBSD: PLIST,v 1.1 2013/12/03 00:51:19 fgsch Exp $
 lib/pkgconfig/compizconfig-python.pc

Re: [patch] editor/emacs: crash in Mew

[Jeremie Courreges-Anglas]

On Sat, Feb 27 2021, YASUOKA Masahiko  wrote:
> Hi,
>
> I'd like to add a patch to avoid crashes in Mew.  When I am composing
> mail messages on Mew, emacs crashes frequently.  The patch fixes this
> problem and come from the upstream.
>
> https://debbugs.gnu.org/cgi/bugreport.cgi?bug=46791 is the bug
> tracking page of the upstream.
>
> ok?

ok, please add the debbugs url as a comment in the patch.

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

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/27 18:25:20

Modified files:
textproc/rubber: Makefile distinfo 
textproc/rubber/pkg: PLIST 

Log message:
update to rubber 1.5.1 which is now python3-only

Re: UPDATE: libsndfile 1.0.31

[Brad Smith]

ping.

On 2/19/2021 8:48 PM, Brad Smith wrote:

Here is an update to libsndfile 1.0.31.


Index: Makefile
===
RCS file: /home/cvs/ports/audio/libsndfile/Makefile,v
retrieving revision 1.35
diff -u -p -u -p -r1.35 Makefile
--- Makefile13 Feb 2021 06:31:07 -  1.35
+++ Makefile20 Feb 2021 01:16:02 -
@@ -2,12 +2,12 @@
  
  COMMENT=	library to handle various audio file formats
  
-DISTNAME=	libsndfile-1.0.30

-REVISION=  0
+VER=   1.0.31
+DISTNAME=  libsndfile-${VER}
  CATEGORIES=   audio
  GH_ACCOUNT=   libsndfile
  GH_PROJECT=   libsndfile
-GH_TAGNAME=v1.0.30
+GH_TAGNAME=${VER}
  
  HOMEPAGE=	https://github.com/libsndfile/libsndfile/
  
Index: distinfo

===
RCS file: /home/cvs/ports/audio/libsndfile/distinfo,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 distinfo
--- distinfo16 Jan 2021 12:53:12 -  1.18
+++ distinfo20 Feb 2021 01:13:09 -
@@ -1,2 +1,2 @@
-SHA256 (libsndfile-1.0.30.tar.gz) = 
WUK5Y9HbPtirH/uFcIMiqpY333bZ/oTh3+Sal6kOj0c=
-SIZE (libsndfile-1.0.30.tar.gz) = 650659
+SHA256 (libsndfile-1.0.31.tar.gz) = 
jN7grLBrsKPBpspSRXVkPfix86VaCJO03Z+CnQgmN4U=
+SIZE (libsndfile-1.0.31.tar.gz) = 662584
Index: patches/patch-CMakeLists_txt
===
RCS file: patches/patch-CMakeLists_txt
diff -N patches/patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt16 Jan 2021 12:54:12 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,16 +0,0 @@
-$OpenBSD: patch-CMakeLists_txt,v 1.1 2021/01/16 12:54:12 sthen Exp $
-
-CMake: Fix INSTALL_MANPAGES option.
-
-Index: CMakeLists.txt
 CMakeLists.txt.orig
-+++ CMakeLists.txt
-@@ -74,7 +74,7 @@ if (NOT ENABLE_CPU_CLIP)
-   set (CPU_CLIPS_NEGATIVE FALSE)
- endif ()
- cmake_dependent_option (ENABLE_COMPATIBLE_LIBSNDFILE_NAME "Set DLL name to libsndfile-1.dll 
(canonical name), sndfile.dll otherwise" OFF "WIN32;BUILD_SHARED_LIBS" OFF)
--cmake_dependent_option (INSTALL_MANPAGES "Install man pages for programs" ON 
"BUILD_PROGRAMS AND (UNIX OR MINGW OR CYGWIN)" OFF)
-+cmake_dependent_option (INSTALL_MANPAGES "Install man pages for programs" ON 
"BUILD_PROGRAMS" OFF)
-
- set (HAVE_EXTERNAL_XIPH_LIBS ${ENABLE_EXTERNAL_LIBS})
- set (HAVE_SQLITE3 ${BUILD_REGTEST})
Index: patches/patch-src_aiff_c
===
RCS file: patches/patch-src_aiff_c
diff -N patches/patch-src_aiff_c
--- patches/patch-src_aiff_c16 Jan 2021 12:54:12 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,63 +0,0 @@
-$OpenBSD: patch-src_aiff_c,v 1.2 2021/01/16 12:54:12 sthen Exp $
-
-- Fix aiff_read_header() memory leak.
-- Fix memory leak in aiff_open.
-- Fix AIFF parsing bug.
-- Fix memory leak in aiff_read_basc_chunk.
-- Fix memory leak in aiff_read_header.
-
-Index: src/aiff.c
 src/aiff.c.orig
-+++ src/aiff.c
-@@ -243,6 +243,8 @@ aiff_open (SF_PRIVATE *psf)
-   if ((psf->container_data = calloc (1, sizeof (AIFF_PRIVATE))) == NULL)
-   return SFE_MALLOC_FAILED ;
-
-+  psf->container_close = aiff_close ;
-+
-   if (psf->file.mode == SFM_READ || (psf->file.mode == SFM_RDWR && 
psf->filelength > 0))
-   {   if ((error = aiff_read_header (psf, _fmt)))
-   return error ;
-@@ -283,7 +285,6 @@ aiff_open (SF_PRIVATE *psf)
-   psf->set_chunk   = aiff_set_chunk ;
-   } ;
-
--  psf->container_close = aiff_close ;
-   psf->command = aiff_command ;
-
-   switch (SF_CODEC (psf->sf.format))
-@@ -498,6 +499,11 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fm
-   return SFE_WAV_BAD_PEAK ;
-   } ;
-
-+  if (psf->peak_info)
-+  {   psf_log_printf (psf, "*** Found 
existing peak info, using last one.\n") ;
-+  free (psf->peak_info) ;
-+  psf->peak_info = NULL ;
-+  } ;
-   if ((psf->peak_info = peak_info_calloc 
(psf->sf.channels)) == NULL)
-   return SFE_MALLOC_FAILED ;
-
-@@ -800,6 +806,10 @@ aiff_read_header (SF_PRIVATE *psf, COMM_CHUNK *comm_fm
-   break ;
-   } ;
-
-+  if (psf->cues)
-+  {   free (psf->cues) ;
-+  psf->cues = NULL ;
-+  } ;
-   if ((psf->cues = psf_cues_alloc 

Re: [MAINTAINER UPDATE] graphics/opensubdiv -> 3.4.4

[Dimitri Karamazov]

Ping

On Wed, Feb 24, 2021 at 11:18:06AM +, Dimitri Karamazov wrote:
> Update graphics/opensubdiv to 3.4.4
> 
> Build & Run tested with Blender on amd64
> 
Index: Makefile
===
RCS file: /cvs/ports/graphics/opensubdiv/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile26 Jan 2021 13:16:46 -  1.1.1.1
+++ Makefile23 Feb 2021 17:37:41 -
@@ -2,14 +2,14 @@
 
 COMMENT=   open-source subdivision surface library
 
-V= 3.4.3
+V= 3.4.4
 GH_ACCOUNT=PixarAnimationStudios
 GH_PROJECT=OpenSubdiv
 GH_TAGNAME=v${V:S/./_/g}
 DISTNAME=  ${GH_PROJECT:L}-${V}
 
-SHARED_LIBS += osdCPU  0.0 # 3.4.3
-SHARED_LIBS += osdGPU  0.0 # 3.4.3
+SHARED_LIBS += osdCPU  1.0 # 3.4.4
+SHARED_LIBS += osdGPU  1.0 # 3.4.4
 
 CATEGORIES=graphics
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/opensubdiv/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo26 Jan 2021 13:16:46 -  1.1.1.1
+++ distinfo23 Feb 2021 17:37:41 -
@@ -1,2 +1,2 @@
-SHA256 (opensubdiv-3.4.3.tar.gz) = eyLrJ9Y2qwweA3Iselpb1PEWZO5lybSPNBptDOfzZ0U=
-SIZE (opensubdiv-3.4.3.tar.gz) = 39225589
+SHA256 (opensubdiv-3.4.4.tar.gz) = INSfgKK3eK1NAfCRrYjYwvkc9sc2OUDGITJBzm8QSPs=
+SIZE (opensubdiv-3.4.4.tar.gz) = 39228037

Re: [NEW] audio/zynaddsubfx

[Dimitri Karamazov]

Ping

On Wed, Feb 17, 2021 at 05:39:57PM +, Dimitri Karamazov wrote:
> This here is a terrific synthesizer and can be put to good use
> with some DAW with lv2 support. Can be used with lmms if 
> carla is ported or just wait until lv2 is supported(ongoing).
> https://github.com/LMMS/lmms/issues/562
> 
> I've a muse(https://vstwarehouse.com/d/muse/) port with me which
> can run this as plugin(both vst & lv2) but it brings along with 
> it 4-5 dependencies so might release it some other time.
> 
> Information for inst:zynaddsubfx-3.0.5
> 
> Comment:
> synth capable of making a countless number of instruments
> 
> Description:
> ZynAddSubFX is a opensource software synthesizer capable of making
> a countless number of instruments, from some common heard from
> expensive hardware to interesting sounds that you'll boost to an
> amazing universe of sounds.
> 
> Maintainer: Dimitri Karamazov 
> 
> WWW: http://zynaddsubfx.sourceforge.net
> 
> Port below adds a nice graphical interface to the synthesizer.
> Looks like this:https://zynaddsubfx.sourceforge.io/zyn-fusion.html
> Although there other interfaces available like fltk and ntk, both
> are quite cumbersome to use, and very ugly in comparison.
> 
> Information for inst:zyn-fusion-3.0.5pre
> 
> Comment:
> single window & tabbed version of the ZynAddSubFX interface
> 
> Required by:
> zynaddsubfx-3.0.5
> 
> Description:
> Zyn was plagued with a difficult to use interface and unstable, unofficial
> plugin versions. Fusion blows those issues away with a complete redesign and
> rewrite. Powered by a new custom window toolkit: zest, Zyn is now ready for
> any platform. With total separation of the UI from the synthesis engine.
> 
> Zyn-Fusion is enabling powerful features such as the new, officially-supported
> VST plugin version, remote control of a headless CPU with the UI on
> touchscreen, even multiple UI windows controlling a single sound engine. By
> fusing 28 windows of fine grained control into one, Zyn is now controlled with
> a single window design of tabbed views for a consistent, navigable interface.
> You think you've heard the sounds before, but you've never had the precision
> control of Fusion.
> 
> Maintainer: Dimitri Karamazov 
> 
> WWW: https://github.com/mruby-zest/mruby-zest-build
> 
> Both Build & Run tested on amd64


zynaddsubfx.tar.gz
Description: Binary data


zyn-fusion.tar.gz
Description: Binary data

Re: [MAINTAINER UPDATE] net/i2p -> 0.9.49

[Dimitri Karamazov]

Ping

On Sat, Feb 20, 2021 at 01:54:35PM +, Dimitri Karamazov wrote:
> Simple update for net/i2p to 0.9.49
> 
> *Fetch from github henceworth.
> *Most of doc/* files have been compressed
>  into *.wars of their respective webapps.
> *Some empty *{.jar,.wars} have been removed.
> 
> The given commit contains fixes to the themes
> bug which they missed while making the
> 0.9.49 release.
> 
> Build & Run tested on amd64
> 
Index: Makefile
===
RCS file: /cvs/ports/net/i2p/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- Makefile5 Dec 2020 17:21:55 -   1.6
+++ Makefile20 Feb 2021 13:32:39 -
@@ -7,16 +7,16 @@ ONLY_FOR_ARCHS=   amd64 i386
 
 COMMENT=   i2p routing protocol
 
-V= 0.9.48
-DISTNAME=  i2psource_${V}
-EXTRACT_SUFX=  .tar.bz2
-PKGNAME=   i2p-${V}
+GH_ACCOUNT=i2p
+GH_PROJECT=i2p.i2p
+GH_TAGNAME=5d5e6fa3c2365f6c9956d3691d620eb5797091f8
+PKGNAME=   i2p-0.9.49
 
 CATEGORIES=net
 
 HOMEPAGE=  https://geti2p.net/en/
 
-MAINTAINER=Dimitri karamazov 
+MAINTAINER=Dimitri Karamazov 
 
 # Apache-2.0 Artistic BSD CC-BY-2.5 CC-BY-3.0 CC-BY-SA-3.0
 # EPLv1.0 GPLv2 GPLv3 LGPLv2.1 LGPLv3 MIT public-domain WTFPLv2
@@ -24,9 +24,6 @@ PERMIT_PACKAGE=   Yes
 
 WANTLIB += gmp
 
-MASTER_SITES=  https://download.i2p2.de/releases/$V/ \
-   https://launchpad.net/i2p/trunk/$V/+download/
-
 MODULES=   java
 MODJAVA_VER=   1.8
 MODJAVA_BUILD= ant
@@ -49,8 +46,6 @@ DB_DIR=   ${LOCALSTATEDIR}/i2p
 SUBST_VARS=DB_DIR JAVA_HOME
 
 MAKE_ENV=  CC=${CC} BITS=${BITS}
-
-WRKDIST=   ${WRKDIR}/${PKGNAME}
 
 # test requires addition dependencies (atleast: junit, hamcrest, jmockfit)
 NO_TEST=   Yes
Index: distinfo
===
RCS file: /cvs/ports/net/i2p/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo5 Dec 2020 17:21:55 -   1.2
+++ distinfo20 Feb 2021 13:32:39 -
@@ -1,2 +1,2 @@
-SHA256 (i2psource_0.9.48.tar.bz2) = 
6MVbF7IGbY6rgrxAcSjx8DZlMMVCmhQT6gy/QPki1TI=
-SIZE (i2psource_0.9.48.tar.bz2) = 33029295
+SHA256 (i2p.i2p-5d5e6fa3c2365f6c9956d3691d620eb5797091f8.tar.gz) = 
/RaibIT2QhBb67tEMNqjm8CbDbFNOA+N8RTwh9lb90Y=
+SIZE (i2p.i2p-5d5e6fa3c2365f6c9956d3691d620eb5797091f8.tar.gz) = 37885005
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/i2p/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   5 Dec 2020 17:21:55 -   1.3
+++ pkg/PLIST   20 Feb 2021 13:32:40 -
@@ -23,13 +23,10 @@ share/i2p/certificates/family/gostcoin.c
 share/i2p/certificates/family/i2p-dev.crt
 share/i2p/certificates/family/i2pd-dev.crt
 share/i2p/certificates/family/volatile.crt
-share/i2p/certificates/i2cp/
-share/i2p/certificates/i2ptunnel/
 share/i2p/certificates/news/
 share/i2p/certificates/news/ampernand_at_gmail.com.crt
 share/i2p/certificates/news/echelon_at_mail.i2p.crt
 share/i2p/certificates/news/hankhill19580_at_gmail.com.crt
-share/i2p/certificates/news/str4d_at_mail.i2p.crt
 share/i2p/certificates/news/zzz_at_mail.i2p.crt
 share/i2p/certificates/plugin/
 share/i2p/certificates/plugin/backup_at_mail.i2p.crt
@@ -45,10 +42,9 @@ share/i2p/certificates/reseed/hottuna_at
 share/i2p/certificates/reseed/igor_at_novg.net.crt
 share/i2p/certificates/reseed/lazygravy_at_mail.i2p.crt
 share/i2p/certificates/reseed/reseed_at_diva.exchange.crt
-share/i2p/certificates/revocations/
 share/i2p/certificates/router/
 share/i2p/certificates/router/echelon_at_mail.i2p.crt
-share/i2p/certificates/router/str4d_at_mail.i2p.crt
+share/i2p/certificates/router/hankhill19580_at_gmail.com.crt
 share/i2p/certificates/router/zzz_at_mail.i2p.crt
 share/i2p/certificates/ssl/
 share/i2p/certificates/ssl/echelon.reseed2017.crt
@@ -56,21 +52,7 @@ share/i2p/certificates/ssl/i2pseed.creat
 share/i2p/certificates/ssl/isrgrootx1.crt
 share/i2p/clients.config
 share/i2p/docs/
-share/i2p/docs/ahelper-conflict-header.ht
-share/i2p/docs/ahelper-new-header.ht
-share/i2p/docs/ahelper-notfound-header.ht
-share/i2p/docs/auth-header.ht
-share/i2p/docs/b32-auth-header.ht
-share/i2p/docs/b32-header.ht
-share/i2p/docs/baduri-header.ht
 share/i2p/docs/console.ico
-share/i2p/docs/denied-header.ht
-share/i2p/docs/dnf-header.ht
-share/i2p/docs/dnfb-header.ht
-share/i2p/docs/dnfh-header.ht
-share/i2p/docs/dnfp-header.ht
-share/i2p/docs/enc-header.ht
-share/i2p/docs/encp-header.ht
 share/i2p/docs/icons/
 share/i2p/docs/icons/flags/
 share/i2p/docs/icons/flags/ad.png
@@ -312,665 +294,8 @@ share/i2p/docs/icons/flags/yt.png
 share/i2p/docs/icons/flags/za.png
 share/i2p/docs/icons/flags/zm.png
 share/i2p/docs/icons/flags/zw.png
-share/i2p/docs/icons/flags16x11/
-share/i2p/docs/icons/flags16x11/a0.png
-share/i2p/docs/icons/flags16x11/a1.png
-share/i2p/docs/icons/flags16x11/a2.png
-share/i2p/docs/icons/flags16x11/ap.png

Re: [MAINTAINER UPDATE] graphics/openvdb -> 8.0.1

[Dimitri Karamazov]

Ping

On Fri, Feb 19, 2021 at 03:53:43PM +, Dimitri Karamazov wrote:
> Update graphics/openvdb to 8.0.1
> 
> Changelog:https://github.com/dreamworksanimation/openvdb/releases
> 
> *release of OpenVDB AX, an open source C++ library.
> *ABI-breaking changes that improve performance & reduce memory usage.
> *various bug fixes.
> 
> Build & Run tested with blender on amd64
> 
Index: Makefile
===
RCS file: /cvs/ports/graphics/openvdb/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile26 Jan 2021 13:44:04 -  1.1.1.1
+++ Makefile19 Feb 2021 15:38:15 -
@@ -4,9 +4,9 @@ COMMENT=tools for storage and manipulat
 
 GH_ACCOUNT=dreamworksanimation
 GH_PROJECT=openvdb
-GH_TAGNAME=v7.1.0
+GH_TAGNAME=v8.0.1
 
-SHARED_LIBS +=  openvdb   0.0 # 7.1
+SHARED_LIBS +=  openvdb   1.0 # 8.0
 
 CATEGORIES=graphics
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/openvdb/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo26 Jan 2021 13:44:04 -  1.1.1.1
+++ distinfo19 Feb 2021 15:38:15 -
@@ -1,2 +1,2 @@
-SHA256 (openvdb-7.1.0.tar.gz) = DDWIwcpuZHYQc4ZU7Cxqr0GiA/15f2Cfvqscn3w9wRY=
-SIZE (openvdb-7.1.0.tar.gz) = 1956052
+SHA256 (openvdb-8.0.1.tar.gz) = poRdp8YE0scuQUHImJMKyKI3VSHlNfaWws2SvrvkPE8=
+SIZE (openvdb-8.0.1.tar.gz) = 2299276
Index: patches/patch-CMakeLists_txt
===
RCS file: /cvs/ports/graphics/openvdb/patches/patch-CMakeLists_txt,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-CMakeLists_txt
--- patches/patch-CMakeLists_txt26 Jan 2021 13:44:04 -  1.1.1.1
+++ patches/patch-CMakeLists_txt19 Feb 2021 15:38:15 -
@@ -2,14 +2,14 @@ $OpenBSD: patch-CMakeLists_txt,v 1.1.1.1
 
 zlib 1.2.7 not available on OpenBSD
 
 CMakeLists.txt.origThu Dec  3 15:33:54 2020
-+++ CMakeLists.txt Thu Dec  3 15:34:09 2020
-@@ -234,7 +234,7 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS)
-   set(MINIMUM_BOOST_VERSION 1.61)
-   set(MINIMUM_ILMBASE_VERSION 2.2)
-   set(MINIMUM_OPENEXR_VERSION 2.2)
+--- CMakeLists.txt.origSat Feb  6 00:51:38 2021
 CMakeLists.txt Fri Feb 19 17:44:45 2021
+@@ -216,7 +216,7 @@ if(NOT DISABLE_DEPENDENCY_VERSION_CHECKS)
+   set(MINIMUM_BOOST_VERSION 1.61)  # @warning should be 1.66, but H18 ships 
with 1.61
+   set(MINIMUM_ILMBASE_VERSION 2.2) # @warning should be 2.3, but H18 ships 
with 2.2
+   set(MINIMUM_OPENEXR_VERSION 2.2) # @warning should be 2.3, but H18 ships 
with 2.2
 -  set(MINIMUM_ZLIB_VERSION 1.2.7)
 +  set(MINIMUM_ZLIB_VERSION 1.2.3)
-   set(MINIMUM_TBB_VERSION 2017.0)
+   set(MINIMUM_TBB_VERSION 2018.0)
+   set(MINIMUM_LLVM_VERSION 6.0.0)
  
-   set(MINIMUM_PYTHON_VERSION 2.7)
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/openvdb/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   26 Jan 2021 13:44:04 -  1.1.1.1
+++ pkg/PLIST   19 Feb 2021 15:38:15 -
@@ -7,6 +7,7 @@ include/openvdb/MetaMap.h
 include/openvdb/Metadata.h
 include/openvdb/Platform.h
 include/openvdb/PlatformConfig.h
+include/openvdb/TypeList.h
 include/openvdb/Types.h
 include/openvdb/io/
 include/openvdb/io/Archive.h
@@ -86,6 +87,7 @@ include/openvdb/tools/LevelSetSphere.h
 include/openvdb/tools/LevelSetTracker.h
 include/openvdb/tools/LevelSetUtil.h
 include/openvdb/tools/Mask.h
+include/openvdb/tools/Merge.h
 include/openvdb/tools/MeshToVolume.h
 include/openvdb/tools/Morphology.h
 include/openvdb/tools/MultiResGrid.h
@@ -137,7 +139,6 @@ include/openvdb/util/logging.h
 include/openvdb/version.h
 lib/cmake/OpenVDB/
 lib/cmake/OpenVDB/FindBlosc.cmake
-lib/cmake/OpenVDB/FindCppUnit.cmake
 lib/cmake/OpenVDB/FindIlmBase.cmake
 lib/cmake/OpenVDB/FindJemalloc.cmake
 lib/cmake/OpenVDB/FindLog4cplus.cmake

Re: remove emulators/pcsxr

[Gleydson Soares]

> pcsxr has always been buggy on OpenBSD, and the upstream is dead and
> gone.

It seems a strong reason for removal. OK gsoares@

remove emulators/pcsxr

[Anthony J. Bentley]

Hi,

pcsxr has always been buggy on OpenBSD, and the upstream is dead and
gone.

There are two other PlayStation emulators in-tree: mednafen, and a
pcsxr-derived core for retroarch, libretro-pcsx-rearmed. Both of them
have seen much more development activity within the last few years
than pcsxr.

I would like to remove pcsxr.

ok?

-- 
Anthony J. Bentley

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/27 16:25:28

Modified files:
lang/pcbasic   : Makefile distinfo 
lang/pcbasic/pkg: PLIST 

Log message:
switch pcbasic to python3

ok bcallah@ (MAINTAINER)

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/27 15:28:51

Modified files:
www: Makefile 

Log message:
+py-repoze-profile,python3
+py-repoze-who,python3

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/27 15:28:00

Modified files:
www/py-repoze-who: Makefile 
www/py-repoze-who/pkg: PLIST 

Log message:
add python3 flavor

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/27 15:27:16

Modified files:
www/py-repoze-profile: Makefile 
www/py-repoze-profile/pkg: PLIST 

Log message:
add python3 flavor

Re: [PATCH 5/7] Use devel/cabal module for devel/darcs and upgrade to 2.16.3

[James Cook]

On Thu, Feb 25, 2021 at 08:16:43PM -0800, Greg Steuck wrote:
> From 3d80a96ac1803a72ea1fe7ab6ac28b5f79aad684 Mon Sep 17 00:00:00 2001
> From: Greg Steuck 
> Date: Mon, 24 Aug 2020 19:23:42 -0700
> Subject: [PATCH 5/7] Use devel/cabal module for devel/darcs and upgrade to
>  2.16.3

I gave this version a quick try and it seems to work; thanks.

-- 
James

CVS: cvs.openbsd.org: ports

[Pavel Korovin]

CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2021/02/27 14:43:27

Modified files:
security/ssh-audit: Makefile distinfo 
security/ssh-audit/pkg: PLIST 

Log message:
Update ssh-audit 2.3.1 -> 2.4.0
Changelog: https://github.com/jtesta/ssh-audit/releases/tag/v2.4.0

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 14:39:03

Modified files:
sysutils/nut   : Makefile 
sysutils/nut/pkg: PLIST-cgi PLIST-main 

Log message:
nut: change python BDEP to py3

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 14:33:56

Modified files:
lang/libv8 : Makefile 
lang/libv8/patches: patch-Makefile 
lang/libv8/pkg : PLIST 

Log message:
v8 port tweaks:
- use GH_* instead of DISTNAME/DISTFILES/MASTER_SITES
- use DPB_PROPERTIES=parallel
- build debug packages
- use py3 to build, disable python run dep
- remove bogus NO_CCACHE
- regen plist

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2021/02/27 14:27:18

Modified files:
security/gringotts: Makefile 
Added files:
security/gringotts/patches: patch-src_grg_attachs_h 
patch-src_grg_entries_h 
patch-src_grg_menus_c 
patch-src_grg_menus_h 
patch-src_grg_pix_h 
patch-src_grg_prefs_h 
patch-src_grg_recent_dox_h 
patch-src_grg_widgets_h 
patch-src_gringotts_h 

Log message:
security/gringotts: fix build with -fno-common

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 14:09:36

Modified files:
devel/gyp  : Makefile distinfo 
devel/gyp/pkg  : PLIST 
Added files:
devel/gyp/patches: patch-gyp patch-gyptest_py 

Log message:
update to newer gyp checkout, switch to py3

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 14:07:01

Modified files:
graphics/jbig2dec: Makefile 

Log message:
switch BDEP to py3

Re: FIX games/corewars -fno-common build error

[Christian Weisgerber]

Bjorn Ketelaars:

> I overlooked the second parser, good catch. I think you are right that
> we need to make current_line and root_line static, thus limiting the
> visibility of things within the same file.

Also, I suggest to patch the *.y source files rather than the
generated *.c ones.

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

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 13:57:10

Modified files:
net/isc-bind   : Tag: OPENBSD_6_8 Makefile distinfo 
net/isc-bind/patches: Tag: OPENBSD_6_8 patch-bin_dig_dig_c 
  patch-configure_ac patch-lib_dns_spnego_c 
  patch-lib_isc_netmgr_netmgr_c 
  patch-lib_isc_unix_socket_c 
  patch-lib_isccfg_aclconf_c 
net/isc-bind/pkg: Tag: OPENBSD_6_8 PLIST 
Removed files:
net/isc-bind/patches: Tag: OPENBSD_6_8 
  patch-bin_named_include_named_zoneconf_h 
  patch-bin_named_server_c 
  patch-bin_named_zoneconf_c 

Log message:
"upgrade" bind again, this time from patched 9.16.11 -> 9.16.10, which
lacks the feature that it leaks memory when you reload it.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 13:56:03

Modified files:
net/isc-bind   : Makefile distinfo 
net/isc-bind/patches: patch-configure_ac patch-lib_dns_spnego_c 
  patch-lib_isc_netmgr_netmgr_c 
  patch-lib_isc_unix_socket_c 
Removed files:
net/isc-bind/patches: patch-bin_named_include_named_zoneconf_h 
  patch-bin_named_server_c 
  patch-bin_named_zoneconf_c 

Log message:
"upgrade" bind again, this time to 9.16.10, in comparison with what we
currently have this removes the feature that it leaks memory when you
reload it

CVS: cvs.openbsd.org: ports

[Pavel Korovin]

CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2021/02/27 13:50:33

Modified files:
security/opendnssec: Makefile distinfo 

Log message:
Update opendnssec 2.1.7 -> 2.1.8
Announcement: https://www.opendnssec.org/2021/02/opendnssec-2-1-8/

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 12:41:18

Modified files:
benchmarks/hyperfine: Makefile distinfo 

Log message:
update to hyperfine-1.11.0

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 11:45:33

Modified files:
devel/py-pip   : Makefile distinfo 
devel/py-pip/patches: patch-docs_html_conf_py 
devel/py-pip/pkg: PLIST 

Log message:
update to pip-20.3.4 (last py2+3 one)

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/27 11:42:53

Modified files:
www: Makefile 

Log message:
+py-repoze-lru,python3

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/27 11:40:40

Modified files:
www/py-repoze-lru: Makefile 
www/py-repoze-lru/pkg: PLIST 

Log message:
add py3 flavor

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 11:40:32

Modified files:
databases/p5-ldap: Makefile distinfo 
databases/p5-ldap/pkg: PLIST 

Log message:
update to p5-ldap-0.68

Re: move flask to py3

[Lucas Raab]

On Sat, Feb 27, 2021 at 10:25:21AM -0600, Lucas Raab wrote:
> On Sat, Feb 27, 2021 at 04:12:47PM +, Stuart Henderson wrote:
> > On 2021/02/27 09:52, Lucas Raab wrote:
> > > On Fri, Feb 26, 2021 at 08:52:11PM -0600, Lucas Raab wrote:
> > > > Hello,
> > > > 
> > > > Here are some changes to move flask over to py3 and related packages.
> > > > 
> > > > flask deps:
> > > > * www/py-itsdangerous (rdep to www/py-flask and py-httpbin)
> > > >   * www/py-httpbin is included here as well
> > > > * www/py-werkzeug (rdep to devel/py-test-localserver and www/py-flask)
> > > >   * devel/py-test-localserver is included here as well
> > > > * devel/py-blinker (only rdep to www/py-flask)
> > > > 
> > > > flask rdeps:
> > > > * www/py-httpbin
> > > > 
> > > > httpbin chain:
> > > > * devel/py-test-httpbin
> > > > * www/py-vcrpy
> > > > * test/py-test-vcr
> > > > 
> > > > Follow-ups for later:
> > > > * move devel/py-click and related to py3
> > > > * update itsdangerous and werkzeug
> > > > * update flask
> > > > 
> > > > Missing anything?
> > > > 
> > > > cc: maintainer of py-vcrpy and py-test-vcr
> > > > 
> > > > Lucas
> > > 
> > > oops, forgot @pkgpath updates. Updated diff
> > 
> > >  FLAVORS =python3
> > > -FLAVOR ?=
> > > +FLAVOR ?=python3
> > 
> > FLAVOR in these cases is not optional, please use = not ?=
> > 
> > >   'py-pygal' => 'py3-pygal',
> > >   'py-wtforms' => 'py3-wtforms',
> > >   'py-apsw' => 'py3-apsw',
> > > + 'py-test-httpbin' => 'py3-test-httpbin',
> > > + 'py-test-localserver' => 'py3-test-localserver',
> > > + 'py-test-vcr' => 'py3-test-vcr',
> > > + 'py-flask' => 'py3-flask',
> > > + 'py-httpbin' => 'py3-httpbin',
> > > + 'py-itsdangerous' => 'py3-itsdangerous',
> > > + 'py-vcrpy' => 'py3-vcrpy',
> > > + 'py-werkzeug' => 'py3-werkzeug',
> > > + 'py-blinker' => 'py3-blinker'
> > >  };
> > 
> > and keep the trailing , here to reduce the risk of breakage for the
> > next person who adds to this ;-)
> > 
> 
> d'oh! :) Thanks for catching that
> 
> Updated diff with FLAVOR = and the comma (plus a bonus @pkgpath that I
> forgot for py-vcrpy)

One last tweak to remove the suffix off the flask bin. Sorry, should
have caught that earlier

diff 55af3c174820b3bc1cdb9fec4a467f1edff7836e /usr/ports
blob - bdac06fd56b722fed56f800606ef979f4e7131ee
file + devel/Makefile
--- devel/Makefile
+++ devel/Makefile
@@ -1384,7 +1384,6 @@
  SUBDIR += py-bitstring,python3
  SUBDIR += py-blessings
  SUBDIR += py-blessings,python3
- SUBDIR += py-blinker
  SUBDIR += py-blinker,python3
  SUBDIR += py-blist
  SUBDIR += py-blist,python3
@@ -1713,9 +1712,7 @@
  SUBDIR += py-test-expect,python3
  SUBDIR += py-test-forked
  SUBDIR += py-test-forked,python3
- SUBDIR += py-test-httpbin
  SUBDIR += py-test-httpbin,python3
- SUBDIR += py-test-localserver
  SUBDIR += py-test-localserver,python3
  SUBDIR += py-test-mock
  SUBDIR += py-test-mock,python3
@@ -1727,7 +1724,6 @@
  SUBDIR += py-test-subtesthack,python3
  SUBDIR += py-test-timeout
  SUBDIR += py-test-timeout,python3
- SUBDIR += py-test-vcr
  SUBDIR += py-test-vcr,python3
  SUBDIR += py-test-xdist
  SUBDIR += py-test-xdist,python3
blob - fe6be4e5ed19f8ab1934698b4fdd25f463149120
file + devel/py-blinker/Makefile
--- devel/py-blinker/Makefile
+++ devel/py-blinker/Makefile
@@ -3,7 +3,7 @@
 COMMENT =  fast, simple object-to-object and broadcast signaling
 
 MODPY_EGG_VERSION = 1.4
-REVISION = 5
+REVISION = 6
 DISTNAME = blinker-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 
@@ -22,7 +22,7 @@ MODPY_SETUPTOOLS =Yes
 MODPY_PYTEST = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${MODPY_PY_PREFIX}blinker
blob - 8499f3d6b3cf9bc15bfef927d7121a848a8212ce
file + devel/py-blinker/pkg/PLIST
--- devel/py-blinker/pkg/PLIST
+++ devel/py-blinker/pkg/PLIST
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.4 2015/09/23 15:33:38 jca Exp $
+@pkgpath devel/py-blinker
 lib/python${MODPY_VERSION}/site-packages/blinker/
 
lib/python${MODPY_VERSION}/site-packages/blinker-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/blinker-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
blob - 7de36735b336353d4352fc14b06a5db1425a3ab6
file + devel/py-test-httpbin/Makefile
--- devel/py-test-httpbin/Makefile
+++ devel/py-test-httpbin/Makefile
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 1.0.0
 DISTNAME = pytest-httpbin-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:S/py/py-/}
 CATEGORIES =   devel
-REVISION = 0
+REVISION = 1
 
 HOMEPAGE = https://github.com/kevin1024/pytest-httpbin
 
@@ -20,7 +20,7 @@ MODPY_SETUPTOOLS =Yes
 MODPY_PYTEST = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 RUN_DEPENDS =  devel/py-six${MODPY_FLAVOR} \
 

Re: FIX games/corewars -fno-common build error

[Bjorn Ketelaars]

On Sat 27/02/2021 18:59, Bjorn Ketelaars wrote:
> On Sat 27/02/2021 18:18, Christian Weisgerber wrote:
> > Bjorn Ketelaars:
> > 
> > > +--- src/parser-cw.c.orig
> > >  src/parser-cw.c
> > > +@@ -32,8 +32,8 @@
> > > + #include "program-cw.h"
> > > + #include "options.h"
> > > +   
> > > +-  int current_line;
> > > +-  struct cw_line *root_line;
> > > ++  extern int current_line;
> > > ++  extern struct cw_line *root_line;
> > 
> > Hmm.  There are two parsers, parser-cw.y and parser-rc.y, and each
> > has variables current_line and root_line.  Should those be static
> > instead?
> 
> I overlooked the second parser, good catch. I think you are right that
> we need to make current_line and root_line static, thus limiting the
> visibility of things within the same file.
> 
> dickman@ contacted me off list and told me that he had a similar diff

  ^ this should be daniel@


> except with WANTLIB updates and removal of trailing white spaces from
> pkg/DESCR. I'm not sure if he used static or extern.
> 
> New diff, OK?
> 
> 
> diff --git Makefile Makefile
> index f4bb9e4e1e7..564c9521cc1 100644
> --- Makefile
> +++ Makefile
> @@ -3,20 +3,20 @@
>  COMMENT= computer simulation game
>  
>  DISTNAME=corewars-0.9.13
> -REVISION=9
> +REVISION=10
>  
>  CATEGORIES=  games x11
>  
> -HOMEPAGE=http://corewars.org/
> +HOMEPAGE=https://corewars.org/
>  
>  # GPLv2
>  PERMIT_PACKAGE=  Yes
>  
> -WANTLIB =  GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> -WANTLIB += Xrandr Xrender atk-1.0 c cairo expat fontconfig freetype
> +WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
> +WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
>  WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
> -WANTLIB += gtk-x11-2.0 iconv intl m pango-1.0 pangocairo-1.0
> -WANTLIB += pangoft2-1.0 pixman-1 png pthread xcb xcb-render xcb-shm z
> +WANTLIB += gtk-x11-2.0 harfbuzz intl m pango-1.0 pangocairo-1.0
> +WANTLIB += pangoft2-1.0 z
>  
>  LIB_DEPENDS= x11/gtk+2
>  
> diff --git patches/patch-src_parser-cw_c patches/patch-src_parser-cw_c
> new file mode 100644
> index 000..04ad6db7ba2
> --- /dev/null
> +++ patches/patch-src_parser-cw_c
> @@ -0,0 +1,18 @@
> +$OpenBSD$
> +
> +Fix -fno-common build error.
> +
> +Index: src/parser-cw.c
> +--- src/parser-cw.c.orig
>  src/parser-cw.c
> +@@ -32,8 +32,8 @@
> + #include "program-cw.h"
> + #include "options.h"
> +   
> +-  int current_line;
> +-  struct cw_line *root_line;
> ++  static int current_line;
> ++  static struct cw_line *root_line;
> +   char cw_error_message[1024];
> +   
> +   void cw_error (char *s);
> diff --git patches/patch-src_parser-rc_c patches/patch-src_parser-rc_c
> new file mode 100644
> index 000..79f01f72bc3
> --- /dev/null
> +++ patches/patch-src_parser-rc_c
> @@ -0,0 +1,18 @@
> +$OpenBSD$
> +
> +Fix -fno-common build error.
> +
> +Index: src/parser-rc.c
> +--- src/parser-rc.c.orig
>  src/parser-rc.c
> +@@ -73,8 +73,8 @@
> +   void free_expr(struct expr *expr);
> +   struct expr *copy_expr(struct expr *expr);
> + 
> +-  int current_line, *current_cell;
> +-  struct line *root_line;
> ++  static int current_line, *current_cell;
> ++  static struct line *root_line;
> +   struct expr *org;
> +   struct label *label_list;
> +   struct label *for_index;
> diff --git pkg/DESCR pkg/DESCR
> index 554fc8aabe0..dff5a9c912f 100644
> --- pkg/DESCR
> +++ pkg/DESCR
> @@ -1,6 +1,6 @@
> -Corewars is a simulation game where a number of warriors try to crash 
> -each other while they are running in a virtual computer. The warriors 
> -can be written in one of two assembler-like languages called Corewars 
> -and Redcode. Corewars is the default language  and is easier to learn 
> -and understand. Redcode provides more advanced and powerful 
> -instructions but also requires more time to learn. 
> +Corewars is a simulation game where a number of warriors try to crash
> +each other while they are running in a virtual computer. The warriors
> +can be written in one of two assembler-like languages called Corewars
> +and Redcode. Corewars is the default language  and is easier to learn
> +and understand. Redcode provides more advanced and powerful
> +instructions but also requires more time to learn.

Re: [NEW PORT] math/mpdecimal

[Stefan Krah]

On Thu, Feb 25, 2021 at 10:36:10PM +, Stuart Henderson wrote:
> https://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs

Thanks! I'm not sure though how to replace SHARED_LIBS automatically in
the GNU machinery, so I resorted to patches (which will have to be
updated if SHARED_LIBS changes).


> missing WANTLIB, see "make port-lib-depends-check"

``make lib-depends-check'' is not happy about the internal dependency
of libmpdec++ on libmpdec:

openbsd-amd64# make lib-depends-check
 
mpdecimal-2.5.1(math/mpdecimal):
Missing lib: mpdec.0 (/usr/local/lib/libmpdec++.so.0.0) (NOT REACHABLE)
Extra:  c.96
Scanning: ok
*** Error 1 in /usr/ports/math/mpdecimal 
(/usr/ports/infrastructure/mk/bsd.port.mk:2430 'lib-depends-check': @case 
X${_DEPENDS_CACHE} in  X)...)



I also tried splitting the package into two libraries by literally
copying devel/gmp/Makefile and substituting the necessary parts.

But I never got that particular check to work.


> portcheck(1) may spot other things

portcheck -N is silent, I've attached a new version, which does not
split the library packages.


Stefan Krah




mpdecimal-openbsd-port-2.tar.gz
Description: application/gzip

Re: FIX games/corewars -fno-common build error

[Theo de Raadt]

Bjorn Ketelaars  wrote:

> On Sat 27/02/2021 18:18, Christian Weisgerber wrote:
> > Bjorn Ketelaars:
> > 
> > > +--- src/parser-cw.c.orig
> > >  src/parser-cw.c
> > > +@@ -32,8 +32,8 @@
> > > + #include "program-cw.h"
> > > + #include "options.h"
> > > +   
> > > +-  int current_line;
> > > +-  struct cw_line *root_line;
> > > ++  extern int current_line;
> > > ++  extern struct cw_line *root_line;
> > 
> > Hmm.  There are two parsers, parser-cw.y and parser-rc.y, and each
> > has variables current_line and root_line.  Should those be static
> > instead?
> 
> I overlooked the second parser, good catch. I think you are right that
> we need to make current_line and root_line static, thus limiting the
> visibility of things within the same file.

Sometimes these can be static.

Other times, they should have unique names.

The mistake is to assume a common was desirable sharing.  Sometimes the
sharing is incidental and erroneous.

This would actually have been a bug, if these parsers were nested.

Re: FIX games/corewars -fno-common build error

[Bjorn Ketelaars]

On Sat 27/02/2021 18:18, Christian Weisgerber wrote:
> Bjorn Ketelaars:
> 
> > +--- src/parser-cw.c.orig
> >  src/parser-cw.c
> > +@@ -32,8 +32,8 @@
> > + #include "program-cw.h"
> > + #include "options.h"
> > +   
> > +-  int current_line;
> > +-  struct cw_line *root_line;
> > ++  extern int current_line;
> > ++  extern struct cw_line *root_line;
> 
> Hmm.  There are two parsers, parser-cw.y and parser-rc.y, and each
> has variables current_line and root_line.  Should those be static
> instead?

I overlooked the second parser, good catch. I think you are right that
we need to make current_line and root_line static, thus limiting the
visibility of things within the same file.

dickman@ contacted me off list and told me that he had a similar diff
except with WANTLIB updates and removal of trailing white spaces from
pkg/DESCR. I'm not sure if he used static or extern.

New diff, OK?


diff --git Makefile Makefile
index f4bb9e4e1e7..564c9521cc1 100644
--- Makefile
+++ Makefile
@@ -3,20 +3,20 @@
 COMMENT=   computer simulation game
 
 DISTNAME=  corewars-0.9.13
-REVISION=  9
+REVISION=  10
 
 CATEGORIES=games x11
 
-HOMEPAGE=  http://corewars.org/
+HOMEPAGE=  https://corewars.org/
 
 # GPLv2
 PERMIT_PACKAGE=Yes
 
-WANTLIB =  GL X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
-WANTLIB += Xrandr Xrender atk-1.0 c cairo expat fontconfig freetype
+WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
-WANTLIB += gtk-x11-2.0 iconv intl m pango-1.0 pangocairo-1.0
-WANTLIB += pangoft2-1.0 pixman-1 png pthread xcb xcb-render xcb-shm z
+WANTLIB += gtk-x11-2.0 harfbuzz intl m pango-1.0 pangocairo-1.0
+WANTLIB += pangoft2-1.0 z
 
 LIB_DEPENDS=   x11/gtk+2
 
diff --git patches/patch-src_parser-cw_c patches/patch-src_parser-cw_c
new file mode 100644
index 000..04ad6db7ba2
--- /dev/null
+++ patches/patch-src_parser-cw_c
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix -fno-common build error.
+
+Index: src/parser-cw.c
+--- src/parser-cw.c.orig
 src/parser-cw.c
+@@ -32,8 +32,8 @@
+ #include "program-cw.h"
+ #include "options.h"
+   
+-  int current_line;
+-  struct cw_line *root_line;
++  static int current_line;
++  static struct cw_line *root_line;
+   char cw_error_message[1024];
+   
+   void cw_error (char *s);
diff --git patches/patch-src_parser-rc_c patches/patch-src_parser-rc_c
new file mode 100644
index 000..79f01f72bc3
--- /dev/null
+++ patches/patch-src_parser-rc_c
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix -fno-common build error.
+
+Index: src/parser-rc.c
+--- src/parser-rc.c.orig
 src/parser-rc.c
+@@ -73,8 +73,8 @@
+   void free_expr(struct expr *expr);
+   struct expr *copy_expr(struct expr *expr);
+ 
+-  int current_line, *current_cell;
+-  struct line *root_line;
++  static int current_line, *current_cell;
++  static struct line *root_line;
+   struct expr *org;
+   struct label *label_list;
+   struct label *for_index;
diff --git pkg/DESCR pkg/DESCR
index 554fc8aabe0..dff5a9c912f 100644
--- pkg/DESCR
+++ pkg/DESCR
@@ -1,6 +1,6 @@
-Corewars is a simulation game where a number of warriors try to crash 
-each other while they are running in a virtual computer. The warriors 
-can be written in one of two assembler-like languages called Corewars 
-and Redcode. Corewars is the default language  and is easier to learn 
-and understand. Redcode provides more advanced and powerful 
-instructions but also requires more time to learn. 
+Corewars is a simulation game where a number of warriors try to crash
+each other while they are running in a virtual computer. The warriors
+can be written in one of two assembler-like languages called Corewars
+and Redcode. Corewars is the default language  and is easier to learn
+and understand. Redcode provides more advanced and powerful
+instructions but also requires more time to learn.

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/27 10:49:20

Modified files:
www: Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
Removed files:
www/py-beautifulsoup: Makefile distinfo 
www/py-beautifulsoup/pkg: DESCR PLIST 

Log message:
retire py-beautifulsoup

py-beautifulsoup is python2-only and upstream moved to python3 via
py-beautifulsoup4 which all ports in the tree are already using.

ok sthen@, kmos@

Re: FIX games/corewars -fno-common build error

[Christian Weisgerber]

Bjorn Ketelaars:

> +--- src/parser-cw.c.orig
>  src/parser-cw.c
> +@@ -32,8 +32,8 @@
> + #include "program-cw.h"
> + #include "options.h"
> +   
> +-  int current_line;
> +-  struct cw_line *root_line;
> ++  extern int current_line;
> ++  extern struct cw_line *root_line;

Hmm.  There are two parsers, parser-cw.y and parser-rc.y, and each
has variables current_line and root_line.  Should those be static
instead?

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

UPDATE: Tor Browser 10.0.12

[Caspar Schutijser]

Hi,

The diff below updates Tor Browser to 10.0.12. Tested on amd64. More
information can be found here:
https://blog.torproject.org/new-release-tor-browser-10012

Upstream ships with NoScript 11.2.2 but the distfile for that version
does not seem to be available anymore. Therefore I upgraded to 11.2.3,
I don't think that hurts.

Thanks,
Caspar Schutijser


Index: meta/tor-browser/Makefile
===
RCS file: /cvs/ports/meta/tor-browser/Makefile,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile
--- meta/tor-browser/Makefile   6 Feb 2021 20:56:40 -   1.36
+++ meta/tor-browser/Makefile   27 Feb 2021 16:38:28 -
@@ -4,11 +4,11 @@ COMMENT=  Tor Browser meta package
 
 MAINTAINER=Caspar Schutijser 
 
-PKGNAME=   tor-browser-10.0.10
+PKGNAME=   tor-browser-10.0.12
 ONLY_FOR_ARCHS =   amd64 i386
 
-RUN_DEPENDS=   www/tor-browser/browser>=10.0.10 \
-   www/tor-browser/noscript>=11.2 \
+RUN_DEPENDS=   www/tor-browser/browser>=10.0.12 \
+   www/tor-browser/noscript>=11.2.3 \
net/tor>=0.4.4.6
 
 .include 
Index: www/tor-browser/Makefile.inc
===
RCS file: /cvs/ports/www/tor-browser/Makefile.inc,v
retrieving revision 1.36
diff -u -p -r1.36 Makefile.inc
--- www/tor-browser/Makefile.inc6 Feb 2021 20:56:40 -   1.36
+++ www/tor-browser/Makefile.inc27 Feb 2021 16:38:28 -
@@ -5,7 +5,7 @@ HOMEPAGE ?= https://www.torproject.org
 PERMIT_PACKAGE ?=  Yes
 CATEGORIES =   www
 BROWSER_NAME = tor-browser
-TB_VERSION =   10.0.10
+TB_VERSION =   10.0.12
 TB_PREFIX =tb
 
 SUBST_VARS +=  BROWSER_NAME TB_VERSION
Index: www/tor-browser/browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.59
diff -u -p -r1.59 Makefile
--- www/tor-browser/browser/Makefile23 Feb 2021 19:39:48 -  1.59
+++ www/tor-browser/browser/Makefile27 Feb 2021 16:38:28 -
@@ -16,7 +16,7 @@ EXTRACT_SUFX =.tar.xz
 PATCHORIG =.pat.orig
 
 PKGNAME =  ${TB_PREFIX}-browser-${TB_VERSION}
-DISTNAME = src-firefox-tor-browser-78.7.0esr-10.0-2-build1
+DISTNAME = src-firefox-tor-browser-78.8.0esr-10.0-1-build1
 
 FIX_EXTRACT_PERMISSIONS= Yes
 EXTRACT_ONLY +=${DISTNAME}.tar.xz \
Index: www/tor-browser/browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.35
diff -u -p -r1.35 distinfo
--- www/tor-browser/browser/distinfo6 Feb 2021 20:56:40 -   1.35
+++ www/tor-browser/browser/distinfo27 Feb 2021 16:38:28 -
@@ -1,8 +1,8 @@
 SHA256 (mozilla/https-everywhere-2021.1.27-eff.xpi) = 
g1ge5VObY9VPIICknsncfUN8hH+5wGq41TjU+AOcHOc=
-SHA256 (mozilla/src-firefox-tor-browser-78.7.0esr-10.0-2-build1.tar.xz) = 
ULIHhWWksmvRQxsSQGKLQBfB/d/m4lwZIxDbyqYzP2A=
+SHA256 (mozilla/src-firefox-tor-browser-78.8.0esr-10.0-1-build1.tar.xz) = 
eCq/RE0LpsnMzdBREEn9+whcZYpeJDeHE4f/t9WcyX8=
 SHA256 (mozilla/src-tor-launcher-0.2.26.tar.xz) = 
JNovULiGxs68qC1A5c4zKaZHGGGlpj9ohKT8nQFKmNU=
-SHA256 (mozilla/tor-browser-linux64-10.0.10_en-US.tar.xz) = 
vYWZ+NsGN8YH5O61+zrUjlFv3rieaBqjBQ+a18sQcZg=
+SHA256 (mozilla/tor-browser-linux64-10.0.12_en-US.tar.xz) = 
220fxv8BwnIdQIaqHbSIDtsx+tx+9XuiNPbYN09Kr0Q=
 SIZE (mozilla/https-everywhere-2021.1.27-eff.xpi) = 1742613
-SIZE (mozilla/src-firefox-tor-browser-78.7.0esr-10.0-2-build1.tar.xz) = 
364550288
+SIZE (mozilla/src-firefox-tor-browser-78.8.0esr-10.0-1-build1.tar.xz) = 
364015416
 SIZE (mozilla/src-tor-launcher-0.2.26.tar.xz) = 217792
-SIZE (mozilla/tor-browser-linux64-10.0.10_en-US.tar.xz) = 85351772
+SIZE (mozilla/tor-browser-linux64-10.0.12_en-US.tar.xz) = 85400268
Index: www/tor-browser/noscript/Makefile
===
RCS file: /cvs/ports/www/tor-browser/noscript/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- www/tor-browser/noscript/Makefile   14 Feb 2021 13:58:57 -  1.32
+++ www/tor-browser/noscript/Makefile   27 Feb 2021 16:38:28 -
@@ -1,12 +1,11 @@
 # $OpenBSD: Makefile,v 1.32 2021/02/14 13:58:57 kn Exp $
 
 ADDON_NAME =   noscript
-V =11.2
+V =11.2.3
 COMMENT =  Tor Browser add-on: flexible JS blocker
 HOMEPAGE = https://noscript.net
 MASTER_SITES = https://secure.informaction.com/download/releases/
 GUID = {73a6fe31-595d-460b-a920-fcc0f8843232}
 DISTFILE_IS_XPI =  Yes
-REVISION = 0
 
 .include 
Index: www/tor-browser/noscript/distinfo
===
RCS file: 

Re: move flask to py3

[Lucas Raab]

On Sat, Feb 27, 2021 at 04:12:47PM +, Stuart Henderson wrote:
> On 2021/02/27 09:52, Lucas Raab wrote:
> > On Fri, Feb 26, 2021 at 08:52:11PM -0600, Lucas Raab wrote:
> > > Hello,
> > > 
> > > Here are some changes to move flask over to py3 and related packages.
> > > 
> > > flask deps:
> > > * www/py-itsdangerous (rdep to www/py-flask and py-httpbin)
> > >   * www/py-httpbin is included here as well
> > > * www/py-werkzeug (rdep to devel/py-test-localserver and www/py-flask)
> > >   * devel/py-test-localserver is included here as well
> > > * devel/py-blinker (only rdep to www/py-flask)
> > > 
> > > flask rdeps:
> > > * www/py-httpbin
> > > 
> > > httpbin chain:
> > > * devel/py-test-httpbin
> > > * www/py-vcrpy
> > > * test/py-test-vcr
> > > 
> > > Follow-ups for later:
> > > * move devel/py-click and related to py3
> > > * update itsdangerous and werkzeug
> > > * update flask
> > > 
> > > Missing anything?
> > > 
> > > cc: maintainer of py-vcrpy and py-test-vcr
> > > 
> > > Lucas
> > 
> > oops, forgot @pkgpath updates. Updated diff
> 
> >  FLAVORS =  python3
> > -FLAVOR ?=
> > +FLAVOR ?=  python3
> 
> FLAVOR in these cases is not optional, please use = not ?=
> 
> > 'py-pygal' => 'py3-pygal',
> > 'py-wtforms' => 'py3-wtforms',
> > 'py-apsw' => 'py3-apsw',
> > +   'py-test-httpbin' => 'py3-test-httpbin',
> > +   'py-test-localserver' => 'py3-test-localserver',
> > +   'py-test-vcr' => 'py3-test-vcr',
> > +   'py-flask' => 'py3-flask',
> > +   'py-httpbin' => 'py3-httpbin',
> > +   'py-itsdangerous' => 'py3-itsdangerous',
> > +   'py-vcrpy' => 'py3-vcrpy',
> > +   'py-werkzeug' => 'py3-werkzeug',
> > +   'py-blinker' => 'py3-blinker'
> >  };
> 
> and keep the trailing , here to reduce the risk of breakage for the
> next person who adds to this ;-)
> 

d'oh! :) Thanks for catching that

Updated diff with FLAVOR = and the comma (plus a bonus @pkgpath that I
forgot for py-vcrpy)
diff 073f2087dde0c919c86b6af256ac9a835cc3dded /usr/ports
blob - bdac06fd56b722fed56f800606ef979f4e7131ee
file + devel/Makefile
--- devel/Makefile
+++ devel/Makefile
@@ -1384,7 +1384,6 @@
  SUBDIR += py-bitstring,python3
  SUBDIR += py-blessings
  SUBDIR += py-blessings,python3
- SUBDIR += py-blinker
  SUBDIR += py-blinker,python3
  SUBDIR += py-blist
  SUBDIR += py-blist,python3
@@ -1713,9 +1712,7 @@
  SUBDIR += py-test-expect,python3
  SUBDIR += py-test-forked
  SUBDIR += py-test-forked,python3
- SUBDIR += py-test-httpbin
  SUBDIR += py-test-httpbin,python3
- SUBDIR += py-test-localserver
  SUBDIR += py-test-localserver,python3
  SUBDIR += py-test-mock
  SUBDIR += py-test-mock,python3
@@ -1727,7 +1724,6 @@
  SUBDIR += py-test-subtesthack,python3
  SUBDIR += py-test-timeout
  SUBDIR += py-test-timeout,python3
- SUBDIR += py-test-vcr
  SUBDIR += py-test-vcr,python3
  SUBDIR += py-test-xdist
  SUBDIR += py-test-xdist,python3
blob - fe6be4e5ed19f8ab1934698b4fdd25f463149120
file + devel/py-blinker/Makefile
--- devel/py-blinker/Makefile
+++ devel/py-blinker/Makefile
@@ -3,7 +3,7 @@
 COMMENT =  fast, simple object-to-object and broadcast signaling
 
 MODPY_EGG_VERSION = 1.4
-REVISION = 5
+REVISION = 6
 DISTNAME = blinker-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 
@@ -22,7 +22,7 @@ MODPY_SETUPTOOLS =Yes
 MODPY_PYTEST = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${MODPY_PY_PREFIX}blinker
blob - 8499f3d6b3cf9bc15bfef927d7121a848a8212ce
file + devel/py-blinker/pkg/PLIST
--- devel/py-blinker/pkg/PLIST
+++ devel/py-blinker/pkg/PLIST
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.4 2015/09/23 15:33:38 jca Exp $
+@pkgpath devel/py-blinker
 lib/python${MODPY_VERSION}/site-packages/blinker/
 
lib/python${MODPY_VERSION}/site-packages/blinker-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/blinker-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
blob - 7de36735b336353d4352fc14b06a5db1425a3ab6
file + devel/py-test-httpbin/Makefile
--- devel/py-test-httpbin/Makefile
+++ devel/py-test-httpbin/Makefile
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 1.0.0
 DISTNAME = pytest-httpbin-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:S/py/py-/}
 CATEGORIES =   devel
-REVISION = 0
+REVISION = 1
 
 HOMEPAGE = https://github.com/kevin1024/pytest-httpbin
 
@@ -20,7 +20,7 @@ MODPY_SETUPTOOLS =Yes
 MODPY_PYTEST = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 RUN_DEPENDS =  devel/py-six${MODPY_FLAVOR} \
devel/py-test${MODPY_FLAVOR} \
blob - c1ca94f3f695db96b59a10486ee75519acc2c83d
file + devel/py-test-httpbin/pkg/PLIST
--- devel/py-test-httpbin/pkg/PLIST
+++ devel/py-test-httpbin/pkg/PLIST
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 

Re: move flask to py3

[Stuart Henderson]

On 2021/02/27 09:52, Lucas Raab wrote:
> On Fri, Feb 26, 2021 at 08:52:11PM -0600, Lucas Raab wrote:
> > Hello,
> > 
> > Here are some changes to move flask over to py3 and related packages.
> > 
> > flask deps:
> > * www/py-itsdangerous (rdep to www/py-flask and py-httpbin)
> >   * www/py-httpbin is included here as well
> > * www/py-werkzeug (rdep to devel/py-test-localserver and www/py-flask)
> >   * devel/py-test-localserver is included here as well
> > * devel/py-blinker (only rdep to www/py-flask)
> > 
> > flask rdeps:
> > * www/py-httpbin
> > 
> > httpbin chain:
> > * devel/py-test-httpbin
> > * www/py-vcrpy
> > * test/py-test-vcr
> > 
> > Follow-ups for later:
> > * move devel/py-click and related to py3
> > * update itsdangerous and werkzeug
> > * update flask
> > 
> > Missing anything?
> > 
> > cc: maintainer of py-vcrpy and py-test-vcr
> > 
> > Lucas
> 
> oops, forgot @pkgpath updates. Updated diff

>  FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR ?=python3

FLAVOR in these cases is not optional, please use = not ?=

>   'py-pygal' => 'py3-pygal',
>   'py-wtforms' => 'py3-wtforms',
>   'py-apsw' => 'py3-apsw',
> + 'py-test-httpbin' => 'py3-test-httpbin',
> + 'py-test-localserver' => 'py3-test-localserver',
> + 'py-test-vcr' => 'py3-test-vcr',
> + 'py-flask' => 'py3-flask',
> + 'py-httpbin' => 'py3-httpbin',
> + 'py-itsdangerous' => 'py3-itsdangerous',
> + 'py-vcrpy' => 'py3-vcrpy',
> + 'py-werkzeug' => 'py3-werkzeug',
> + 'py-blinker' => 'py3-blinker'
>  };

and keep the trailing , here to reduce the risk of breakage for the
next person who adds to this ;-)

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2021/02/27 09:06:27

Modified files:
multimedia/mkvtoolnix: Makefile distinfo 
multimedia/mkvtoolnix/patches: patch-src_common_os_h 

Log message:
Update mkvtoolnix to 54.0.0

Re: retire www/py-beautifulsoup

[Kurt Mosiejczuk]

On Fri, Feb 26, 2021 at 11:38:39PM -0500, Daniel Dickman wrote:
> In ports we have:

> py-beautifulsoup -- python2-only; no more development
> py-beautifulsoup4 -- python3 support; the current branch for development

> There are no consumers of py-beautifulsoup in the tree so I think it's 
> time to remove this port.

> ok?

ok kmos

--Kurt

Re: move flask to py3

[Lucas Raab]

On Fri, Feb 26, 2021 at 08:52:11PM -0600, Lucas Raab wrote:
> Hello,
> 
> Here are some changes to move flask over to py3 and related packages.
> 
> flask deps:
> * www/py-itsdangerous (rdep to www/py-flask and py-httpbin)
>   * www/py-httpbin is included here as well
> * www/py-werkzeug (rdep to devel/py-test-localserver and www/py-flask)
>   * devel/py-test-localserver is included here as well
> * devel/py-blinker (only rdep to www/py-flask)
> 
> flask rdeps:
> * www/py-httpbin
> 
> httpbin chain:
> * devel/py-test-httpbin
> * www/py-vcrpy
> * test/py-test-vcr
> 
> Follow-ups for later:
> * move devel/py-click and related to py3
> * update itsdangerous and werkzeug
> * update flask
> 
> Missing anything?
> 
> cc: maintainer of py-vcrpy and py-test-vcr
> 
> Lucas

oops, forgot @pkgpath updates. Updated diff
diff 1216bcec31bb2e0590f373c4c77b97b8bcb33810 /usr/ports
blob - bdac06fd56b722fed56f800606ef979f4e7131ee
file + devel/Makefile
--- devel/Makefile
+++ devel/Makefile
@@ -1384,7 +1384,6 @@
  SUBDIR += py-bitstring,python3
  SUBDIR += py-blessings
  SUBDIR += py-blessings,python3
- SUBDIR += py-blinker
  SUBDIR += py-blinker,python3
  SUBDIR += py-blist
  SUBDIR += py-blist,python3
@@ -1713,9 +1712,7 @@
  SUBDIR += py-test-expect,python3
  SUBDIR += py-test-forked
  SUBDIR += py-test-forked,python3
- SUBDIR += py-test-httpbin
  SUBDIR += py-test-httpbin,python3
- SUBDIR += py-test-localserver
  SUBDIR += py-test-localserver,python3
  SUBDIR += py-test-mock
  SUBDIR += py-test-mock,python3
@@ -1727,7 +1724,6 @@
  SUBDIR += py-test-subtesthack,python3
  SUBDIR += py-test-timeout
  SUBDIR += py-test-timeout,python3
- SUBDIR += py-test-vcr
  SUBDIR += py-test-vcr,python3
  SUBDIR += py-test-xdist
  SUBDIR += py-test-xdist,python3
blob - fe6be4e5ed19f8ab1934698b4fdd25f463149120
file + devel/py-blinker/Makefile
--- devel/py-blinker/Makefile
+++ devel/py-blinker/Makefile
@@ -3,7 +3,7 @@
 COMMENT =  fast, simple object-to-object and broadcast signaling
 
 MODPY_EGG_VERSION = 1.4
-REVISION = 5
+REVISION = 6
 DISTNAME = blinker-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 
@@ -22,7 +22,7 @@ MODPY_SETUPTOOLS =Yes
 MODPY_PYTEST = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR ?=  python3
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${MODPY_PY_PREFIX}blinker
blob - 8499f3d6b3cf9bc15bfef927d7121a848a8212ce
file + devel/py-blinker/pkg/PLIST
--- devel/py-blinker/pkg/PLIST
+++ devel/py-blinker/pkg/PLIST
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.4 2015/09/23 15:33:38 jca Exp $
+@pkgpath devel/py-blinker
 lib/python${MODPY_VERSION}/site-packages/blinker/
 
lib/python${MODPY_VERSION}/site-packages/blinker-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/blinker-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
blob - 7de36735b336353d4352fc14b06a5db1425a3ab6
file + devel/py-test-httpbin/Makefile
--- devel/py-test-httpbin/Makefile
+++ devel/py-test-httpbin/Makefile
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 1.0.0
 DISTNAME = pytest-httpbin-${MODPY_EGG_VERSION}
 PKGNAME =  ${DISTNAME:S/py/py-/}
 CATEGORIES =   devel
-REVISION = 0
+REVISION = 1
 
 HOMEPAGE = https://github.com/kevin1024/pytest-httpbin
 
@@ -20,7 +20,7 @@ MODPY_SETUPTOOLS =Yes
 MODPY_PYTEST = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR ?=  python3
 
 RUN_DEPENDS =  devel/py-six${MODPY_FLAVOR} \
devel/py-test${MODPY_FLAVOR} \
blob - c1ca94f3f695db96b59a10486ee75519acc2c83d
file + devel/py-test-httpbin/pkg/PLIST
--- devel/py-test-httpbin/pkg/PLIST
+++ devel/py-test-httpbin/pkg/PLIST
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2016/01/05 13:02:39 shadchin Exp $
+@pkgpath devel/py-test-httpbin
 lib/python${MODPY_VERSION}/site-packages/pytest_httpbin/
 
lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/pytest_httpbin-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
blob - d1a82d87a111001293d227d942574b08409c3f27
file + devel/py-test-localserver/Makefile
--- devel/py-test-localserver/Makefile
+++ devel/py-test-localserver/Makefile
@@ -5,7 +5,7 @@ COMMENT =   py.test plugin to test server 
connections l
 MODPY_EGG_VERSION =0.5.0
 DISTNAME = pytest-localserver-${MODPY_EGG_VERSION}
 PKGNAME =  py-test-localserver-${MODPY_EGG_VERSION}
-REVISION = 0
+REVISION = 1
 
 CATEGORIES =   devel
 
@@ -25,6 +25,6 @@ TEST_DEPENDS =devel/py-six${MODPY_FLAVOR} \
www/py-werkzeug${MODPY_FLAVOR}
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR ?=  python3
 
 .include 
blob - 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 08:45:37

Modified files:
audio/hydrogen : Makefile distinfo 
audio/hydrogen/files: SndioMidiDriver.h sndio_audio_driver.cpp 
  sndio_midi_driver.cpp 
audio/hydrogen/patches: patch-CMakeLists_txt 
patch-data_hydrogen_default_conf 
patch-src_core_include_hydrogen_Preferences_h 
patch-src_core_src_hydrogen_cpp 
patch-src_core_src_preferences_cpp 
patch-src_gui_src_PreferencesDialog_cpp 
audio/hydrogen/pkg: PLIST 
Removed files:
audio/hydrogen/patches: patch-src_gui_src_SplashScreen_cpp 
patch-src_tests_CMakeLists_txt 

Log message:
update to hydrogen-1.0.1

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 07:19:14

Modified files:
sysutils/entr  : Makefile distinfo 

Log message:
update to entr-4.8

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 06:57:38

Modified files:
x11/i3-mousedrag/patches: patch-libi3_is_debug_build_c 

Log message:
update comment

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 06:56:04

Modified files:
x11/i3 : Makefile distinfo 
Removed files:
x11/i3/patches : patch-libi3_is_debug_build_c 

Log message:
update to i3-4.19.2

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 06:55:47

Modified files:
x11/i3-gaps: Makefile 
Removed files:
x11/i3-gaps/patches: patch-libi3_is_debug_build_c 

Log message:
drop is_debug_build patch from i3-gaps, the release was done with the
correct version string already

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 06:37:24

Modified files:
x11/irrlicht   : Makefile 
multimedia/sfml: Makefile 
games/speeddreams: Makefile 
graphics/freeimage: Makefile 
devel/ois  : Makefile 

Log message:
add some FIX_CRLF_FILES for ports hiding behind s/\015//g
(left out games/dungeon which also has ^Z fixes in the same perl subst)

CVS: cvs.openbsd.org: ports

[Solene Rapenne]

CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2021/02/27 06:15:29

Modified files:
net/lagrange   : Makefile distinfo 

Log message:
Update to lagrange-1.2.0

Re: [NEW][WIP] games/openxray game engine port for S.T.A.L.K.E.R.

[Stuart Henderson]

On 2021/02/27 23:29, Jonathan Gray wrote:
> On Sat, Feb 27, 2021 at 01:53:22PM +0300, Eugene Moz. wrote:
> > Hello,
> > This is based on: https://github.com/OpenXRay/xray-16
> 
> Isn't this based on leaked code they don't have permission to distribute?
> 
> "All source code included with this distribution, unless declared
> otherwise, is commercial GSC Game World proprietary code."
> 
> "Be advised that this is a community project not sanctioned by GSC Game
> World in any way – and they remain the copyright holders of all the
> original source code and S.T.A.L.K.E.R. franchise."

The NVIDIA license in 
https://github.com/OpenXRay/OpenAutomate/blob/master/LICENSE
is delightful too

> > This is work in progress, at the time of writing, I'm stuck at
> > "undefined reference to `__cxa_atexit'", I've tried building
> > with both ports-gcc and base-clang, same error. For now I've
> > chosen gcc, clang is not officialy supported by ^1.
> > If anyone is willing to help get this working, please do so =)
> > I'll include my last build.log, for examination purposes:
> > https://clbin.com/WjJoU

You can't use gcc, the port uses libraries which are compiled with
clang and the two standard libraries will conflict.

I've attached a Makefile which fixes a few things but I lost interest
when I saw the licenses..
# $OpenBSD: Makefile,v 1.11 2020/12/17 07:41:42 thfr Exp $

# versions are in sync with FNA versions
V = 16
COMMENT =   unofficial improved version of X-Ray Engine

PKGNAME =   openxray-${V}

GH_ACCOUNT =OpenXRay
GH_PROJECT =xray-16
GH_TAGNAME =822-december-preview

MASTER_SITES0 = https://github.com/

DIST_SUBDIR =   openxray
DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
.for A N C in \
GPUOpen-LibrariesAndSDKs AGS_SDK 
dbeff30568aa1494d6f520232ea79cdaa1a2398f \
OpenXRay BugTrapc619077b40ee6e7ad6ffc5a194a5d3583af8f78e \
OpenXRay FreeMagic  ba39f90bef46fd79166ccdb661e902f45d48560e \
OpenXRay GameSpy5cd0fcdfd301e7e81d3da48717cf0bb55c59349c \
OpenXRay LuaJIT c114e08f1a15599102ff86afc7239de5c3231db8 \
OpenXRay OpenAutomate   9ee089894c6d403aba5968ce1c8c26578b8e2b0a \
g-truc   gli30808550a20ca53a255e6e1e77070493eda7b736 \
OpenXRay luabind-deboostified 70ef64fee4a9e41fb6ac540938311fc80a52d976 \
OpenXRay mimalloc   a43a51ad21e1620a14eae041d8c6b8badd01d2a3
DISTFILES +=$N-{$A/$N/archive/}$C.tar.gz:0
.endfor

CATEGORIES =games

HOMEPAGE =  https://github.com/OpenXRay/xray-16

MAINTAINER =Eugene Moz. 

# openxray: "commercial GSC Game World proprietary code"
# AGS_SDK, BugTrap, LuaJIT, gli, luabind, mimalloc: MIT/similar
# FreeMagic: likely free but "see some license pdf on a website which
#   no longer exists"
# OpenAutomate: NVIDIA license in Externals/OpenAutomate/LICENSE;
#   revocable(sic), renewable on 1 year terms, confidentiality clauses,
#   can only be distributed in unmodified form, etc
PERMIT_PACKAGE =license problems
PERMIT_DISTFILES =  license problems

# lockfile
WANTLIB += ${COMPILER_LIBCXX} SDL2 jpeg GLEW freeimage cryptopp
WANTLIB += tbb pthread theora ogg openal pcre lzo m xcb-glx xcb-dri3 xcb-present
WANTLIB += xcb-sync xcb-xfixes xshmfence c drm expat glapi xcb xcb-dri2 GL GLU 
X11
WANTLIB += X11-xcb Xdamage Xext Xfixes Xxf86vm

COMPILER =  base-clang ports-gcc

MODULES =   devel/cmake

LIB_DEPENDS =   archivers/lzo \
devel/cryptopp \
devel/sdl2 \
devel/tbb \
graphics/freeimage

post-extract:
.for D in AGS_SDK BugTrap FreeMagic GameSpy LuaJIT OpenAutomate \
gli luabind mimalloc
rmdir ${WRKSRC}/Externals/$D
mv ${WRKDIR}/$D* ${WRKSRC}/Externals/$D
.endfor

.include 

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2021/02/27 05:30:08

Modified files:
security/py-cryptodome: Makefile distinfo 
security/py-cryptodome/pkg: PFRAG.aesni PLIST 

Log message:
update to py-cryptodome-3.10.1

Re: [NEW][WIP] games/openxray game engine port for S.T.A.L.K.E.R.

[Jonathan Gray]

On Sat, Feb 27, 2021 at 01:53:22PM +0300, Eugene Moz. wrote:
> Hello,
> This is based on: https://github.com/OpenXRay/xray-16

Isn't this based on leaked code they don't have permission to distribute?

"All source code included with this distribution, unless declared
otherwise, is commercial GSC Game World proprietary code."

"Be advised that this is a community project not sanctioned by GSC Game
World in any way – and they remain the copyright holders of all the
original source code and S.T.A.L.K.E.R. franchise."

> This is work in progress, at the time of writing, I'm stuck at
> "undefined reference to `__cxa_atexit'", I've tried building
> with both ports-gcc and base-clang, same error. For now I've
> chosen gcc, clang is not officialy supported by ^1.
> If anyone is willing to help get this working, please do so =)
> I'll include my last build.log, for examination purposes:
> https://clbin.com/WjJoU
> --
> Eugene Moz.

Re: [NEW][WIP] games/openxray game engine port for S.T.A.L.K.E.R.

[Eugene Moz.]

Forgot to include additional ports required as dependencies.
devel/lockfile and graphics/freeimageplus
--
Eugene Moz.


freeimageplus.tar.gz
Description: Binary data


lockfile.tar.gz
Description: Binary data

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2021/02/27 05:03:43

Modified files:
x11/polybar: Makefile distinfo 
x11/polybar/patches: patch-include_modules_cpu_hpp 
 patch-src_modules_cpu_cpp 
 patch-src_modules_temperature_cpp 
 patch-src_utils_file_cpp 
x11/polybar/pkg: PLIST 
Removed files:
x11/polybar/patches: patch-cmake_02-opts_cmake 
 patch-doc_CMakeLists_txt 
 patch-lib_i3ipcpp_CMakeLists_txt 

Log message:
update to polybar-3.5.4

from Guy Godfroy with a change to disable i3

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2021/02/27 04:59:40

Modified files:
sysutils/salt  : Makefile distinfo 

Log message:
update to salt-3002.5

Re: FIX games/corewars -fno-common build error

[Marc Espie]

On Sat, Feb 27, 2021 at 07:19:10AM +0100, Bjorn Ketelaars wrote:
> Diff below fixes the build error for games/corewars. While here move
> HOMEPAGE to https.
> 
> It starts on amd64...
> 
> Comments/OK?
> 
> diff --git Makefile Makefile
> index f4bb9e4e1e7..d179e567ee2 100644
> --- Makefile
> +++ Makefile
> @@ -3,11 +3,11 @@
>  COMMENT= computer simulation game
>  
>  DISTNAME=corewars-0.9.13
> -REVISION=9
> +REVISION=10
>  
>  CATEGORIES=  games x11
>  
> -HOMEPAGE=http://corewars.org/
> +HOMEPAGE=https://corewars.org/
>  
>  # GPLv2
>  PERMIT_PACKAGE=  Yes
> diff --git patches/patch-src_parser-cw_c patches/patch-src_parser-cw_c
> new file mode 100644
> index 000..ecced62a75b
> --- /dev/null
> +++ patches/patch-src_parser-cw_c
> @@ -0,0 +1,18 @@
> +$OpenBSD$
> +
> +Fix -fno-common build error.
> +
> +Index: src/parser-cw.c
> +--- src/parser-cw.c.orig
>  src/parser-cw.c
> +@@ -32,8 +32,8 @@
> + #include "program-cw.h"
> + #include "options.h"
> +   
> +-  int current_line;
> +-  struct cw_line *root_line;
> ++  extern int current_line;
> ++  extern struct cw_line *root_line;
> +   char cw_error_message[1024];
> +   
> +   void cw_error (char *s);
> 
> 
Okay

Re: retire www/py-beautifulsoup

[Stuart Henderson]

On 2021/02/26 23:38, Daniel Dickman wrote:
> In ports we have:
> 
> py-beautifulsoup -- python2-only; no more development
> py-beautifulsoup4 -- python3 support; the current branch for development
> 
> There are no consumers of py-beautifulsoup in the tree so I think it's 
> time to remove this port.
> 
> ok?
> 

yep

Re: turn off all python2 tests

[Stuart Henderson]

On 2021/02/26 21:05, Daniel Dickman wrote:
> As much as I like running reggression tests, turning off all python2 tests 
> would make it quite a bit easier to move to python3.
> 
> Doing this would also allow us to update some of the ports used heavily in 
> tests like py-test, etc.
> 
> thoughts?

too big a hammer I think, the python module is used for ports which
aren't really "python ports",

$ grep python/2 /usr/ports/INDEX |cut -d'|' -f2|egrep -v /py2?-|cut -d, 
-f1|uniq|wc -l
 209

perhaps it should only disable tests where it's python.port.mk that
provides the test infrastructure? i.e. use the same conditional as where
do-test is defined later in the python.port.mk?

# setuptools supports regress testing from setup.py using a standard target
.  if !target(do-test) && \
  (${MODPY_SETUPUTILS:L} == "yes" || ${MODPY_PYTEST:L} == "yes")
do-test:
@${MODPY_TEST_TARGET}
.  endif

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/27 04:21:34

Modified files:
sysutils/diffoscope: Makefile 

Log message:
missing MODPY_FLAVOR in TEST_DEPENDS

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/27 04:13:36

Modified files:
audio/py-mpd2  : Makefile 
databases/py-ldap3: Makefile 
devel/pudb : Makefile 
devel/py-elftools: Makefile 
devel/py-ply   : Makefile 
devel/py-urwid : Makefile 
devel/py-r2pipe: Makefile 
devel/py-mulpyplexer: Makefile 
devel/py-lief  : Makefile 
devel/py-importlib_resources: Makefile 
math/py-networkx: Makefile 
misc/py-jdcal  : Makefile 
security/py-gnupg: Makefile 
sysutils/py-croniter: Makefile 
sysutils/py-lockfile: Makefile 
textproc/py-enchant: Makefile 
textproc/py-textfsm: Makefile 
textproc/py-toml: Makefile 
textproc/py-unicodecsv: Makefile 
textproc/py-et_xmlfile: Makefile 

Log message:
Fox python3 only ports, use the proper construct for FLAVOR and forcibly assign
the variable.
FLAVOR = python3
(not FLAVOR =?)

ok sthen@

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/27 04:11:08

Modified files:
net/bro: Makefile distinfo 

Log message:
Update to zeek-3.2.4.

CVS: cvs.openbsd.org: ports

[Martin Reindl]

CVSROOT:/cvs
Module name:ports
Changes by: mar...@cvs.openbsd.org  2021/02/27 04:01:49

Modified files:
sysutils/py-daemon: Makefile distinfo 
sysutils/py-daemon/patches: patch-setup_py 

Log message:
Update py-daemon to 2.3.0.

[NEW][WIP] games/openxray game engine port for S.T.A.L.K.E.R.

[Eugene Moz.]

Hello,
This is based on: https://github.com/OpenXRay/xray-16
This is work in progress, at the time of writing, I'm stuck at
"undefined reference to `__cxa_atexit'", I've tried building
with both ports-gcc and base-clang, same error. For now I've
chosen gcc, clang is not officialy supported by ^1.
If anyone is willing to help get this working, please do so =)
I'll include my last build.log, for examination purposes:
https://clbin.com/WjJoU
--
Eugene Moz.


openxray.tar.gz
Description: Binary data

[patch] editor/emacs: crash in Mew

[YASUOKA Masahiko]

Hi,

I'd like to add a patch to avoid crashes in Mew.  When I am composing
mail messages on Mew, emacs crashes frequently.  The patch fixes this
problem and come from the upstream.

https://debbugs.gnu.org/cgi/bugreport.cgi?bug=46791 is the bug
tracking page of the upstream.

ok?

Index: Makefile
===
RCS file: /disk/cvs/openbsd/ports/editors/emacs/Makefile,v
retrieving revision 1.96
diff -u -p -r1.96 Makefile
--- Makefile23 Aug 2020 09:55:00 -  1.96
+++ Makefile27 Feb 2021 10:26:45 -
@@ -3,6 +3,7 @@
 COMMENT=   GNU editor: extensible, customizable, self-documenting
 
 VERSION=   27.1
+REVISION=  0
 DISTNAME=  emacs-${VERSION}
 
 CATEGORIES=editors
Index: patches/patch-src_gtkutil_c
===
RCS file: patches/patch-src_gtkutil_c
diff -N patches/patch-src_gtkutil_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_gtkutil_c 27 Feb 2021 10:26:45 -
@@ -0,0 +1,48 @@
+$OpenBSD$
+
+Index: src/gtkutil.c
+--- src/gtkutil.c.orig
 src/gtkutil.c
+@@ -5019,11 +5019,10 @@ update_frame_tool_bar (struct frame *f)
+   GtkWidget *wbutton = NULL;
+   Lisp_Object specified_file;
+   bool vert_only = ! NILP (PROP (TOOL_BAR_ITEM_VERT_ONLY));
+-  const char *label
+-  = (EQ (style, Qimage) || (vert_only && horiz)) ? NULL
+-  : STRINGP (PROP (TOOL_BAR_ITEM_LABEL))
+-  ? SSDATA (PROP (TOOL_BAR_ITEM_LABEL))
+-  : "";
++  Lisp_Object label
++  = (EQ (style, Qimage) || (vert_only && horiz))
++  ? Qnil
++  : PROP (TOOL_BAR_ITEM_LABEL);
+ 
+   ti = gtk_toolbar_get_nth_item (GTK_TOOLBAR (wtoolbar), j);
+ 
+@@ -5136,8 +5135,11 @@ update_frame_tool_bar (struct frame *f)
+ 
+   /* If there is an existing widget, check if it's stale; if so,
+remove it and make a new tool item from scratch.  */
+-  if (ti && xg_tool_item_stale_p (wbutton, stock_name, icon_name,
+-img, label, horiz))
++  if (ti && xg_tool_item_stale_p (wbutton, stock_name, icon_name, img,
++NILP (label)
++? NULL
++: STRINGP (label) ? SSDATA (label) : "",
++horiz))
+   {
+ gtk_container_remove (GTK_CONTAINER (wtoolbar),
+   GTK_WIDGET (ti));
+@@ -5194,7 +5196,11 @@ update_frame_tool_bar (struct frame *f)
+ #else
+ if (w) gtk_misc_set_padding (GTK_MISC (w), hmargin, vmargin);
+ #endif
+-  ti = xg_make_tool_item (f, w, , label, i, horiz, 
text_image);
++  ti = xg_make_tool_item (f, w, ,
++NILP (label)
++? NULL
++: STRINGP (label) ? SSDATA (label) : "",
++i, horiz, text_image);
+   gtk_toolbar_insert (GTK_TOOLBAR (wtoolbar), ti, j);
+ }
+ 

new tool to help porters: pkg_check-version

[Marc Espie]

(there are two diffs, the man page for src, and the tool itself)


This is supposed to live in /usr/ports/infrastructure/bin

Index: pkg_check-version
===
RCS file: pkg_check-version
diff -N pkg_check-version
--- /dev/null   1 Jan 1970 00:00:00 -
+++ pkg_check-version   27 Feb 2021 10:12:21 -
@@ -0,0 +1,139 @@
+#! /usr/bin/perl
+
+# ex:ts=8 sw=4:
+# $OpenBSD$
+#
+# Copyright (c) 2021 Marc Espie 
+#
+# Permission to use, copy, modify, and distribute this software for any
+# purpose with or without fee is hereby granted, provided that the above
+# copyright notice and this permission notice appear in all copies.
+#
+# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+use strict;
+use warnings;
+
+package OpenBSD::VersionCheck::State;
+our @ISA = qw(OpenBSD::State);
+
+use OpenBSD::State;
+
+sub handle_options
+{
+   my $state = shift;
+
+   $state->SUPER::handle_options('Hv', '[Hv] pkg-name ...');
+   if (@ARGV == 0) {
+   $state->usage;
+   }
+}
+
+package OpenBSD::PackageName::dewey;
+sub human_print
+{
+   my ($self, $state) = @_;
+   $state->say("\tversion (split): #1", join(' ', @{$self->{deweys}}));
+   if ($self->{suffix} eq '') {
+   $state->say("\tno suffix");
+   } else {
+   $state->say("\twith suffix: #1 #2", $self->{suffix},
+   $self->{suffix_value});
+   }
+}
+
+package OpenBSD::PackageName::version;
+sub human_print
+{
+   my ($self, $state) = @_;
+   $self->{dewey}->human_print($state);
+   if (defined $self->{p}) {
+   $state->say("\tREVISION: #1", $self->{p});
+   } else {
+   $state->say("\tno REVISION");
+   }
+   if (defined $self->{v}) {
+   $state->say("\tEPOCH: #1", $self->{v});
+   } else {
+   $state->say("\tno EPOCH");
+   }
+}
+
+package OpenBSD::PackageName::Name;
+sub human_print
+{
+   my ($self, $state) = @_;
+   $state->say("\tstem: #1", $self->{stem});
+   $self->{version}->human_print($state);
+   $state->say("\tflavors: #1", 
+   join(' ', (sort keys %{$self->{flavors}})));
+}
+
+sub add_to_stems
+{
+   my ($self, $h) = @_;
+   push(@{$h->{$self->to_pattern}}, $self);
+}
+
+package OpenBSD::PackageName::Stem;
+sub human_print
+{
+   my ($self, $state) = @_;
+   $state->say("\tstem = #1", $self->{stem});
+}
+
+sub add_to_stems
+{
+   # nothing to do for "pure stems"
+}
+
+package OpenBSD::VersionCheck;
+
+use OpenBSD::PackageName;
+
+sub parse_and_run
+{
+   my $self = shift;
+   my $rc = 0;
+   my $state = OpenBSD::VersionCheck::State->new('pkg-check_version');
+   $state->handle_options;
+   my $by_stem = {};
+   for my $name (@ARGV) {
+   my $v = OpenBSD::PackageName->from_string($name);
+   if ($state->opt('H')) {
+   $state->say("#1:", $name);
+   $v->human_print($state);
+   }
+   my @issues = $v->has_issues;
+   if (@issues > 0) {
+   for my $s (@issues) {
+   $state->errsay("#1: #2", $name, $s);
+   $rc = 1;
+   }
+   } elsif ($state->opt('v')) {
+   $state->errsay("#1 has no issues", $name);
+   }
+   $v->add_to_stems($by_stem);
+   }
+   for my $stem (sort keys %$by_stem) {
+   my $list = $by_stem->{$stem};
+   if (@$list == 1 && !$state->opt('v')) {
+   next;
+   }
+   my $h = $state->opt('v') ?
+   "#1 sorts as (older to newer): #2" :
+   "#1 sorted: #2";
+   $state->say($h, $stem,
+   join(' ', map {$_->to_string} 
+   sort {$a->compare($b)} @$list));
+   }
+   return $rc;
+}
+
+exit(__PACKAGE__->parse_and_run);





Index: Makefile
===
RCS file: /cvs/src/share/man/man1/Makefile,v
retrieving revision 1.17
diff -u -p -r1.17 Makefile
--- Makefile12 Nov 2019 16:39:10 -  1.17
+++ Makefile27 Feb 2021 10:11:59 -
@@ -7,8 +7,8 @@ MAN=clang-local.1 help.1 intro.1 gcc-lo
 MAN+=  build-debug-info.1 check-lib-depends.1 clean-old-distfiles.1 \
dpb-replay.1 dpb.1 \
outdated-perl-ports.1 \
-   

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/27 02:28:51

Modified files:
databases/influxdb: Makefile 
databases/influxdb/pkg: influxdb.rc 
net/coredns: Makefile 
net/coredns/pkg: coredns.rc 
sysutils/prometheus: Makefile 
sysutils/prometheus/pkg: prometheus.rc 
sysutils/telegraf: Makefile 
sysutils/telegraf/pkg: telegraf.rc 
sysutils/node_exporter: Makefile 
sysutils/node_exporter/pkg: node_exporter.rc 
sysutils/snmp_exporter: Makefile 
sysutils/snmp_exporter/pkg: snmp_exporter.rc 
security/vault : Makefile 
security/vault/pkg: vault.rc 
sysutils/blackbox_exporter: Makefile 
sysutils/blackbox_exporter/pkg: blackbox_exporter.rc 
www/honk   : Makefile 
www/honk/pkg   : honk.rc 

Log message:
Use daemon_logger instead of hand crafter rc_start().

Re: x11/agar update + -fno-common fix

[Charlene Wendling]

Hi,

On Tue, 23 Feb 2021 02:28:47 -0700
"Anthony J. Bentley"  wrote:

> Hi,
> 
> Here's an update to agar-1.6.0 and agartest-1.6.0.
> 
> The update is actually still broken with -fno-common, but it's only
> one variable so it was easy enough to fix for real.
> 
> There was a lot of weird churn in this update. For instance, there's
> no point in enabling iconv because it will unfixably break the build.
> The end result seems to work though, as demonstrated by running the
> tests in agartest.
> 
> ok?

OK cwen@, but an extra patch is needed to make agar built on powerpc.
The 'rlwimi' powerpc instruction wants a 32-bit integer to work with.
It was already present in the 1.5.0 patches but in a different place.

Index: Makefile.inc
===
RCS file: /cvs/ports/x11/agar/Makefile.inc,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile.inc
--- Makefile.inc9 Nov 2020 21:48:25 -   1.4
+++ Makefile.inc27 Feb 2021 08:51:04 -
@@ -1,6 +1,6 @@
 # $OpenBSD: Makefile.inc,v 1.4 2020/11/09 21:48:25 cwen Exp $
 
-V ?=   1.5.0
+V ?=   1.6.0
 DISTNAME ?=agar-$V
 
 CATEGORIES ?=  x11
@@ -10,7 +10,7 @@ HOMEPAGE ?=   https://libagar.org/
 # BSD
 PERMIT_PACKAGE ?=  Yes
 
-MASTER_SITES ?=http://stable.hypertriton.com/agar/
+MASTER_SITES ?=https://stable.hypertriton.com/agar/
 
 CONFIGURE_STYLE ?= simple
 
Index: agar/Makefile
===
RCS file: /cvs/ports/x11/agar/agar/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- agar/Makefile   1 Aug 2020 18:47:33 -   1.7
+++ agar/Makefile   27 Feb 2021 08:51:04 -
@@ -3,31 +3,30 @@
 COMMENT =  cross-platform widget toolkit
 
 PKGNAME =  agar-$V
-REVISION = 4
 
-SHARED_LIBS +=  ag_au 0.0 # 5.0
-SHARED_LIBS +=  ag_core   0.0 # 5.0
-SHARED_LIBS +=  ag_dev0.0 # 5.0
-SHARED_LIBS +=  ag_gui0.0 # 5.0
-SHARED_LIBS +=  ag_math   0.0 # 5.0
-SHARED_LIBS +=  ag_vg 0.0 # 5.0
-
-WANTLIB += GL SDL X11 X11-xcb Xdamage Xext Xfixes Xinerama Xxf86vm
-WANTLIB += db drm expat fontconfig freetype glapi iconv jpeg m
-WANTLIB += png pthread sndio usbhid xcb xcb-dri2
-WANTLIB += xcb-glx z
+SHARED_LIBS +=  ag_au 0.1 # 5.0
+SHARED_LIBS +=  ag_core   1.0 # 5.0
+SHARED_LIBS +=  ag_gui1.0 # 5.0
+SHARED_LIBS +=  ag_map0.0 # 5.0
+SHARED_LIBS +=  ag_math   1.0 # 5.0
+SHARED_LIBS +=  ag_net0.0 # 5.0
+SHARED_LIBS +=  ag_sg 0.0 # 5.0
+SHARED_LIBS +=  ag_sk 0.0 # 5.0
+SHARED_LIBS +=  ag_vg 1.0 # 5.0
 
 LIB_DEPENDS =  audio/libsndfile \
audio/portaudio-svn \
-   converters/libiconv \
-   databases/db/v4 \
devel/sdl \
graphics/jpeg \
graphics/png
 
-CONFIGURE_ARGS +=  --with-gl=${X11BASE} \
+CONFIGURE_ARGS +=  --enable-au \
+   --enable-map \
+   --with-gl=${X11BASE} \
--with-x=${X11BASE} \
--with-portaudio=${LOCALBASE} \
--with-sndfile=${LOCALBASE}
+
+MAKE_FLAGS =   PKGCONFIG_LIBDIR=${PREFIX}/lib/pkgconfig
 
 .include 
Index: agar/distinfo
===
RCS file: /cvs/ports/x11/agar/agar/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- agar/distinfo   10 Oct 2016 09:33:17 -  1.1.1.1
+++ agar/distinfo   27 Feb 2021 08:51:04 -
@@ -1,2 +1,2 @@
-SHA256 (agar-1.5.0.tar.gz) = gjQt7TQsV4FBmEvv6TGPPTdhduX0J64yePiYXyZmPAA=
-SIZE (agar-1.5.0.tar.gz) = 2427644
+SHA256 (agar-1.6.0.tar.gz) = dQAC8LNo+1guRWlqjfxT+0X1U2eSp/BSDNzCC0iMni4=
+SIZE (agar-1.6.0.tar.gz) = 22133371
Index: agar/patches/patch-Makefile
===
RCS file: /cvs/ports/x11/agar/agar/patches/patch-Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 patch-Makefile
--- agar/patches/patch-Makefile 10 Oct 2016 09:33:17 -  1.1.1.1
+++ agar/patches/patch-Makefile 27 Feb 2021 08:51:04 -
@@ -1,15 +1,17 @@
 $OpenBSD: patch-Makefile,v 1.1.1.1 2016/10/10 09:33:17 bentley Exp $
 Makefile.orig  Mon Aug 24 03:08:39 2015
-+++ Makefile   Mon Aug 24 03:08:48 2015
-@@ -83,9 +83,9 @@ install-config:
-   ${SUDO} ${INSTALL_PROG} $$PROG ${DESTDIR}${BINDIR}; \
-   done
-   @echo "${INSTALL_DATA_DIR} ${PREFIX}/share/aclocal"
--  @${SUDO} ${INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/share/aclocal
-+  @${SUDO} 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/27 02:09:13

Modified files:
x11/gnome/vfs2 : Makefile 
x11/gnome/vfs2/pkg: PLIST 

Log message:
Regen WANTLIB+PLIST.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/27 01:59:37

Modified files:
x11/gtk+2  : Makefile 

Log message:
Use python3 for gtk-builder-convert.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/27 01:58:22

Modified files:
x11/gnome/keyring: Makefile 

Log message:
Use python3 for tests instead of python2 and set TEST_IS_INTERACTIVE.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/27 01:53:07

Modified files:
devel/codeblocks: Makefile 
devel/kf5/kcoreaddons: Makefile 
net/samba  : Makefile 
x11/gnome/vfs2 : Makefile 

Log message:
Bump for sysutils/gamin,-main -> sysutils/gamin

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/27 01:52:44

Modified files:
sysutils/gamin : Makefile 
Added files:
sysutils/gamin/pkg: DESCR PLIST README 
Removed files:
sysutils/gamin/pkg: DESCR-main DESCR-python PLIST-main 
PLIST-python README-main 

Log message:
Drop the -python subpackage.
It's py2 only and nothing uses it in tree.

cmake.port.mk cmake-configure-args improvement

[Rafael Sadowski]

Before I push it into a bulk build I would like to know what you guys
think. In some places we have such a workaround to help CMake to use the
needed FLAGS or compiler.

FreeBSD does something similar and I was inspired by it.

-DTHREADS_HAVE_PTHREAD_ARG: This causes cmake to add -pthread to the
depends list in stead of -lpthread.

Index: cmake.port.mk
===
RCS file: /cvs/ports/devel/cmake/cmake.port.mk,v
retrieving revision 1.70
diff -u -p -r1.70 cmake.port.mk
--- cmake.port.mk   23 Nov 2020 18:35:03 -  1.70
+++ cmake.port.mk   27 Feb 2021 08:33:48 -
@@ -98,12 +98,26 @@ MODCMAKE_DEBUG ?=   No
 .if empty(CONFIGURE_STYLE)
 CONFIGURE_STYLE =  cmake
 .endif
+
+_MODCMAKE_ARGS +=  -DCMAKE_C_COMPILER="${CC}" \
+   -DCMAKE_CXX_COMPILER="${CXX}" \
+   -DCMAKE_C_FLAGS="${CFLAGS}" \
+   -DCMAKE_C_FLAGS_DEBUG="${CFLAGS}" \
+   -DCMAKE_C_FLAGS_RELEASE="${CFLAGS}" \
+   -DCMAKE_CXX_FLAGS="${CXXFLAGS}" \
+   -DCMAKE_CXX_FLAGS_DEBUG="${CXXFLAGS}" \
+   -DCMAKE_CXX_FLAGS_RELEASE="${CXXFLAGS}" \
+   -DCMAKE_EXE_LINKER_FLAGS="${LDFLAGS}" \
+   -DCMAKE_MODULE_LINKER_FLAGS="${LDFLAGS}" \
+   -DCMAKE_SHARED_LINKER_FLAGS="${LDFLAGS}" \
+   -DTHREADS_HAVE_PTHREAD_ARG=ON \
+   -DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON \
+   -DCMAKE_VERBOSE_MAKEFILE=ON \
+   -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON
+
 MODCMAKE_configure =   cd ${WRKBUILD} && ${SETENV} \
-   CC="${CC}" CFLAGS="${CFLAGS}" \
-   CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
${CONFIGURE_ENV} ${LOCALBASE}/bin/cmake \
-   -DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON \
-   -G ${_MODCMAKE_GEN} ${CONFIGURE_ARGS} ${WRKSRC}
+   ${_MODCMAKE_ARGS} -G ${_MODCMAKE_GEN} ${CONFIGURE_ARGS} 
${WRKSRC}
 
 .if !defined(CONFIGURE_ARGS) || ! ${CONFIGURE_ARGS:M*CMAKE_BUILD_TYPE*}
 .  if ${MODCMAKE_DEBUG:L} == "yes"

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/27 01:40:03

Modified files:
x11/gnome/weather: Makefile 

Log message:
Use python3 for tests (drop MODPY_DEFAULT_VERSION_2).

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/27 01:37:37

Modified files:
devel/libglade2: Makefile 
devel/libglade2/pkg: PLIST 

Log message:
Remove dependency on py2: disable libglade-convert (python2 script that
nothing uses in ports)

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/27 01:33:43

Modified files:
sysutils/polkit: Makefile 

Log message:
Move to python 3 for SUBST_CMD.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/27 01:25:06

Modified files:
print/qpdf : Makefile distinfo 
print/qpdf/patches: patch-configure 
print/qpdf/pkg : PLIST 

Log message:
Update to qpdf-10.2.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/02/27 01:18:21

Modified files:
devel/gconf2   : Makefile 
devel/gconf2/patches: patch-gsettings_gsettings-data-convert_c 
devel/gconf2/pkg: PLIST 

Log message:
Move to python 3.
Fix a 64bit time_t format while here.

Re: CVS: cvs.openbsd.org: ports

[Brian Callahan]

On Friday, February 26th, 2021 at 11:07 PM, Daniel Dickman 
 wrote:

> On Fri, 26 Feb 2021, Brian Callahan wrote:
>
> > CVSROOT: /cvs
> >
> > Module name: ports
> >
> > Changes by: bcal...@cvs.openbsd.org 2021/02/26 20:54:02
> >
> > Modified files:
> >
> > sysutils/diffoscope: Makefile distinfo
> >
> > Log message:
> >
> > Update to diffoscope-167
> >
> > Switch to Python 3
>
> was already at python3, that's the MODPY_VERSION default when it's not
>
> specified.
>
> I would probably undo this change.

You're right. I must have had something outdated somewhere.
I will remove that line, thanks.

~Brian