CVS: cvs.openbsd.org: ports

[Jonathan Gray]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2021/07/27 20:54:39

Modified files:
sysutils/firmware/amdgpu: Makefile distinfo 
sysutils/firmware/amdgpu/pkg: PLIST 

Log message:
update amdgpu-firmware to 20210716

kettenis reported seeing hangs with 20210511 on x395 with picasso which
have not occurred with 20210716

[NEW] mail/p5-OpenSMTPd-Filter 0.0.2

[Andrew Hewus Fresh]

This module is a helper to make writing OpenSMTPd
 filters in perl easier.

https://metacpan.org/release/OpenSMTPd-Filter

While this module is somewhat new, I've been using it on my home server
for a while with seemingly good success.  I've been wanting to figure
out how to make it work with an async library of some sort so it could
process mail in parallel which would be super important for a busy
server.  However, on my very low throughput server that isn't a
limitation, so I figure this might help other folks even though I
haven't had time to figure out how to be async.

Questions, comments, OK for import?

l8rZ,
-- 
andrew - http://afresh1.com

The programmer's national anthem is 'GH!!'.


p5-OpenSMTPd-Filter-0.0.2.tar.gz
Description: application/tar-gz

Re: update inputmethods/fcitx-anthy: 0.2.3 -> 0.2.4

[Kevin Lo]

On Tue, Jul 27, 2021 at 01:24:01PM +0200, Jeremie Courreges-Anglas wrote:
> 
> On Tue, Jul 27 2021, Kevin Lo  wrote:
> > On Mon, Jul 26, 2021 at 04:36:52PM +, openbsd wrote:
> >> 
> >> Hi,
> >> 
> >> This is a minor version bump for fcitx-anthy includes small bug 
> >> fixes/cleanups and translation updates.
> >> 
> >> Tested on amd64 with fcitx-4.2.9.8p1, no problem found.
> >
> > Committed, thanks.
> 
> Note that this adds
> 
>   @tag gtk-update-icon-cache %D/share/icons/hicolor
> 
> without adding an RDEP on x11/gtk+3,-guic.  portcheck(1) even warns
> about this:
> 
>   russell /usr/ports/inputmethods/fcitx-anthy$ portcheck
>   missing RDEP on x11/gtk+3,-guic
> 
> This is not strictly needed since inputmethods/fcitx,-main already
> depends on x11/gtk+3,-guic.  But in theory this could change later.
> I think it's good practice to match "@tag gtk-update-icon-cache" with
> the appropriate RDEP.
> 
> ok?

My bad.  ok kevlo@

Re: Gomuks patch, adds notification support through notify-send

[Solene Rapenne]

On Tue, 27 Jul 2021 19:33:45 -
negatet...@envs.net:

> Gomuks has desktop notifications support through notify-send, but requires 
> lib/notification/notify_openbsd.go in order for notification support to build 
> and work on OpenBSD. These patches add that file, based on the 
> lib/notification/notify_linux.go file.
> 
> This also makes Gomuks compatible with herbe, the daemon-less notification 
> system [1], using the script that hijacks notify-send calls and passes them 
> on to herbe [2].
> 
> [1] https://github.com/dudik/herbe/
> [2] https://github.com/dudik/herbe/pull/10
> 
> -- Negate This
> 
> Index: lib/notification/notify_openbsd.go
> --- lib/notification/notify_openbsd.go.orig
> +++ lib/notification/notify_openbsd.go
> @@ -0,0 +1,32 @@
> +// gomuks - A terminal Matrix client written in Go.
> +// Copyright (C) 2020 Tulir Asokan
> +//
> +// This program is free software: you can redistribute it and/or modify
> +// it under the terms of the GNU Affero General Public License as published 
> by
> +// the Free Software Foundation, either version 3 of the License, or
> +// (at your option) any later version.
> +//
> +// This program is distributed in the hope that it will be useful,
> +// but WITHOUT ANY WARRANTY; without even the implied warranty of
> +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> +// GNU Affero General Public License for more details.
> +//
> +// You should have received a copy of the GNU Affero General Public License
> +// along with this program.  If not, see .
> +
> +package notification
> +
> +import "os/exec"
> +
> +func Send(title, text string, critical, sound bool) error {
> + args := []string{"-a", "gomuks"}
> + if !critical {
> + args = append(args, "-u", "low")
> + }
> + //  if iconPath {
> + //  args = append(args, "-i", iconPath)
> + //  }
> + args = append(args, title, text)
> +
> + return exec.Command("notify-send", args...).Run()
> +}
> 
> Index: lib/notification/notify_unsupported.go
> --- lib/notification/notify_unsupported.go.orig
> +++ lib/notification/notify_unsupported.go
> @@ -1,4 +1,4 @@
> -// +build !linux,!darwin,!windows
> +// +build !linux,!darwin,!windows,!openbsd
>  
>  // gomuks - A terminal Matrix client written in Go.
>  // Copyright (C) 2020 Tulir Asokan
> 

hi,

could you get this change committed upstream?

while we can use patches through the ports tree,
we shouldn't hold patches adding features, they add
maintenance and should go upstream for sure.

Gomuks patch, adds notification support through notify-send

[negatethis]

Gomuks has desktop notifications support through notify-send, but requires 
lib/notification/notify_openbsd.go in order for notification support to build 
and work on OpenBSD. These patches add that file, based on the 
lib/notification/notify_linux.go file.

This also makes Gomuks compatible with herbe, the daemon-less notification 
system [1], using the script that hijacks notify-send calls and passes them on 
to herbe [2].

[1] https://github.com/dudik/herbe/
[2] https://github.com/dudik/herbe/pull/10

-- Negate This

Index: lib/notification/notify_openbsd.go
--- lib/notification/notify_openbsd.go.orig
+++ lib/notification/notify_openbsd.go
@@ -0,0 +1,32 @@
+// gomuks - A terminal Matrix client written in Go.
+// Copyright (C) 2020 Tulir Asokan
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see .
+
+package notification
+
+import "os/exec"
+
+func Send(title, text string, critical, sound bool) error {
+   args := []string{"-a", "gomuks"}
+   if !critical {
+   args = append(args, "-u", "low")
+   }
+   //  if iconPath {
+   //  args = append(args, "-i", iconPath)
+   //  }
+   args = append(args, title, text)
+
+   return exec.Command("notify-send", args...).Run()
+}

Index: lib/notification/notify_unsupported.go
--- lib/notification/notify_unsupported.go.orig
+++ lib/notification/notify_unsupported.go
@@ -1,4 +1,4 @@
-// +build !linux,!darwin,!windows
+// +build !linux,!darwin,!windows,!openbsd
 
 // gomuks - A terminal Matrix client written in Go.
 // Copyright (C) 2020 Tulir Asokan

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2021/07/27 14:42:24

Modified files:
devel/py-sh: Makefile 
lang/cython: Makefile 

Log message:
Drop MAINTAINER.

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2021/07/27 14:36:26

Modified files:
lang/racket-minimal: Makefile distinfo 
lang/racket-minimal/pkg: PLIST 

Log message:
Update to racket 8.2.

Re: zim writes to HOME

[Sebastian Benoit]

Theo Buehler(t...@theobuehler.org) on 2021.06.12 14:27:48 +0200:
> When building zim, it leaves a /tmp/zim-zim-0.73.5_writes_to_HOME/
> behind. The build log shows these warnings (among others):
> 
> Environment variable $HOME does not point to an existing folder: 
> /zim-0.73.5_writes_to_HOME
> ...
> XDG_RUNTIME_DIR is not set, using /tmp/zim-zim-0.73.5_writes_to_HOME as a 
> fallback
> 
> This fixes it. No change in the package.

Hi, sorry i missed replying to this.

Seems ok to me.

/B.

> Index: Makefile
> ===
> RCS file: /cvs/ports/productivity/zim/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- Makefile  29 Apr 2021 22:31:00 -  1.26
> +++ Makefile  12 May 2021 20:53:02 -
> @@ -32,4 +32,7 @@ RUN_DEPENDS =   ${COMMON_DEPENDS} \
>   misc/shared-mime-info \
>   x11/gtk+3,-guic
>  
> +PORTHOME =   ${WRKDIR}
> +MAKE_ENV +=  XDG_RUNTIME_DIR=${PORTHOME}
> +
>  .include 
> 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/07/27 13:21:54

Modified files:
sysutils/awscli: Makefile distinfo 

Log message:
Update to awscli-1.20.7.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/07/27 13:21:40

Modified files:
net/py-boto3   : Makefile distinfo 

Log message:
Update to py3-boto3-1.18.7.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/07/27 13:21:30

Modified files:
net/py-botocore: Makefile distinfo 

Log message:
Update to py3-botocore-1.21.7.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/07/27 13:15:18

Modified files:
devel/libidn   : Makefile distinfo 
devel/libidn/pkg: DESCR 

Log message:
Update to libidn-1.38.

[macppc] devel/clang-tools-extra: remove BROKEN

[Charlene Wendling]

Hi,

Since i've set up BROKEN for this port, due to time wasted because it's
lacking consumers, rust has taken out many ports, the bootstrapped
guile2 now builds in a reasonable time, and even recently we're finally
free from Qt4.

I'm proposing to bring back clang-tools-extra. It builds fine [0] if
you wonder.

OK?

Charlène.

[0] https://bin.charlenew.xyz/clang-tools-extra-11.1.0p0.log


Index: Makefile
===
RCS file: /cvs/ports/devel/clang-tools-extra/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile18 May 2021 06:19:48 -  1.16
+++ Makefile27 Jul 2021 18:42:43 -
@@ -9,7 +9,6 @@
 # patches: rm patches/patch-*lld*
 
 ONLY_FOR_ARCHS =   ${LLVM_ARCHS}
-BROKEN-powerpc =   no consumers on powerpc, save 25 build hours in bulks
 
 COMMENT=   Clang extra tools
 

[macppc] Unbreak games/cataclysm-dda

[Charlene Wendling]

Hi,

It was expected to happen one day :)

>From the current macppc bulk:

> obj/tiles/active_item_cache_test.o: In function 
> `::_ZL29C_A_T_C_HT_E_S_T__(void)':
> active_item_cache_test.cpp:(.text+0x1b4): relocation truncated to fit: 
> R_PPC_PLTREL24 [...]
> active_item_cache_test.cpp:(.text+0xcb4): additional relocation overflows 
> omitted from the output

The below diff allowed me to build CDDA [0].

Runtime test: it is slow, but OK.

LDFLAGS is empty and this version has never been built on macppc, so
REVISION bump is not needed.

Comments/feedback are welcome,

Charlène.


[0] https://bin.charlenew.xyz/cataclysm-dda-0.Fv0.log


Index: Makefile
===
RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v
retrieving revision 1.18
diff -u -p -u -p -r1.18 Makefile
--- Makefile14 Jul 2021 03:50:15 -  1.18
+++ Makefile27 Jul 2021 18:05:20 -
@@ -30,7 +30,7 @@ RUN_DEPENDS=  devel/desktop-file-utils \
 
 LIB_DEPENDS=   devel/gettext,-runtime
 
-MAKE_ENV=  CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV=  CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
 
 MAKE_FLAGS=ASTYLE=0 RELEASE=1 USE_XDG_DIR=1 \
LINTJSON=0 LANGUAGES=all
@@ -52,6 +52,12 @@ MAN_TILES=   -tiles
 USE_GMAKE= Yes
 
 NO_TEST=   Yes
+
+# relocation truncated to fit: R_PPC_PLTREL24 -- to be removed once lld is the
+# default linker on powerpc
+.if ${MACHINE_ARCH} == "powerpc"
+LDFLAGS+=  -Wl,-relax
+.endif
 
 post-install:
${INSTALL_MAN} ${WRKSRC}/doc/cataclysm${MAN_TILES}.6 ${PREFIX}/man/man6/

Re: sysutils/bat

[Erling Westenvik]

On Tue, Jul 27, 2021 at 12:36:09PM -0400, Kenneth R Westerback wrote:
> On Tue, Jul 27, 2021 at 10:15:23AM -0600, Theo de Raadt wrote:
> > Ingo Schwarze  wrote:
> > 
> > > Theo de Raadt wrote on Tue, Jul 27, 2021 at 09:12:58AM -0600:
> > > > Ian Darwin  wrote:
> > > >> On Tue, Jul 27, 2021 at 04:47:46PM +0200, Ingo Schwarze wrote:
> > > 
> > >  Changes by:  st...@cvs.openbsd.org   2021/07/27 05:55:36
> > >  
> > >  Modified files:
> > >   sysutils/bat   : Makefile 
> > >  
> > >  Log message:
> > >  set sysutils/bat to ONLY_FOR_ARCHS=${LP64_ARCHS}, one of the 147
> > >  dependencies (sys-info) has a 32 vs 64 bit issue when checking
> > >  the number of CPUs online
> > > 
> > > >>> Wait, a cat with 147 dependencies?  Looks like it's a rabbit after 
> > > >>> all!
> > > >>> At least there can be no doubt that it inhabits a rabbit hole, 
> > > >>> doesn't it?
> > > >>> 
> > > >>> Besides, isn't a program that stops working once your machine has
> > > >>> more than four billion CPUs utterly useless in the 31st century?
> > > >>> 
> > > >>> If it didn't constantly trip up otherwise busy porters, this port
> > > >>> would be a really good laugh.
> > > >>> 
> > > >>> *Looking at the calendar*
> > > >>> No, it's unlikely to be the Easter bunny.
> > > >>> We are not that close to Apil 1.
> > > 
> > > >> And to think that Rob Pike once wrote a paper "cat -v considered 
> > > >> harmful"
> > > >> since it added unnecessary functionality to cat, whose only job is
> > > >> to catenate files...
> > > 
> > > > bat is my favorite rust program
> > > > 
> > > > please continue maintaining it in ports,
> > > > i don't want the standup comedy to end
> > > 
> > > I didn't mean to summon tedu@ regarding the port,
> > > quite to the contary, i might even contribute to it!
> > > 
> > > https://github.com/sharkdp/bat/pull/1756
> > 
> > I won't use bat until it has an emacs mode.
> > 
> 
> I thought the classic indication of maturity was when it sprouted a full LISP 
> interpreter.
> 
>  Ken
> 

Let's not get carried away. Script kiddies like me will be happy if it
can parse, send and receive email automatically.

CVS: cvs.openbsd.org: ports

[joshua stein]

CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2021/07/27 11:05:38

Modified files:
lang/crystal   : Makefile 
lang/crystal/files: crystal 

Log message:
use TRUEPREFIX instead of LOCALBASE

noted by ajacoutot

Re: sysutils/bat

[Ian Darwin]

On Tue, Jul 27, 2021 at 10:15:23AM -0600, Theo de Raadt wrote:
> > >> And to think that Rob Pike once wrote a paper "cat -v considered harmful"
> > >> since it added unnecessary functionality to cat, whose only job is
> > >> to catenate files...
> > 
> > > bat is my favorite rust program
> > > 
> > > please continue maintaining it in ports,
> > > i don't want the standup comedy to end
> > 
> > I didn't mean to summon tedu@ regarding the port,
> > quite to the contary, i might even contribute to it!
> > 
> > https://github.com/sharkdp/bat/pull/1756
> 
> I won't use bat until it has an emacs mode.

If 'bat' is 'cat with wings', it's just to prove that pigs can fly. 

Re: sysutils/bat

[Kenneth R Westerback]

On Tue, Jul 27, 2021 at 10:15:23AM -0600, Theo de Raadt wrote:
> Ingo Schwarze  wrote:
> 
> > Theo de Raadt wrote on Tue, Jul 27, 2021 at 09:12:58AM -0600:
> > > Ian Darwin  wrote:
> > >> On Tue, Jul 27, 2021 at 04:47:46PM +0200, Ingo Schwarze wrote:
> > 
> >  Changes by:st...@cvs.openbsd.org   2021/07/27 05:55:36
> >  
> >  Modified files:
> > sysutils/bat   : Makefile 
> >  
> >  Log message:
> >  set sysutils/bat to ONLY_FOR_ARCHS=${LP64_ARCHS}, one of the 147
> >  dependencies (sys-info) has a 32 vs 64 bit issue when checking
> >  the number of CPUs online
> > 
> > >>> Wait, a cat with 147 dependencies?  Looks like it's a rabbit after all!
> > >>> At least there can be no doubt that it inhabits a rabbit hole, doesn't 
> > >>> it?
> > >>> 
> > >>> Besides, isn't a program that stops working once your machine has
> > >>> more than four billion CPUs utterly useless in the 31st century?
> > >>> 
> > >>> If it didn't constantly trip up otherwise busy porters, this port
> > >>> would be a really good laugh.
> > >>> 
> > >>> *Looking at the calendar*
> > >>> No, it's unlikely to be the Easter bunny.
> > >>> We are not that close to Apil 1.
> > 
> > >> And to think that Rob Pike once wrote a paper "cat -v considered harmful"
> > >> since it added unnecessary functionality to cat, whose only job is
> > >> to catenate files...
> > 
> > > bat is my favorite rust program
> > > 
> > > please continue maintaining it in ports,
> > > i don't want the standup comedy to end
> > 
> > I didn't mean to summon tedu@ regarding the port,
> > quite to the contary, i might even contribute to it!
> > 
> > https://github.com/sharkdp/bat/pull/1756
> 
> I won't use bat until it has an emacs mode.
> 

I thought the classic indication of maturity was when it sprouted a full LISP 
interpreter.

 Ken

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/07/27 10:28:43

Modified files:
net/termshark  : Makefile 
Added files:
net/termshark  : modules.inc 

Log message:
termshark: replace handrolled MODGO_MOD* with modgo-gen-modules generated file.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/07/27 10:28:03

Modified files:
net/termshark  : Makefile distinfo 
Added files:
net/termshark/pkg: MESSAGE 
net/termshark/patches: patch-go_mod patch-go_sum 

Log message:
termshark: change dependency from kr/pty to kreack/pty allowing build
on arm arches. add a MESSAGE warning about problems with colours with
TERM=xterm etc and a possible workaround. based on a diff from kn@,
feedback & earlier version ok kn@

Re: termshark: unbreak arm*: replace pty module

[Stuart Henderson]

On 2021/07/27 13:04, Klemens Nanni wrote:
> On Tue, Jul 27, 2021 at 12:08:30PM +0100, Stuart Henderson wrote:
> > On 2021/07/27 02:20, Klemens Nanni wrote:
> > > On Mon, Jul 26, 2021 at 10:13:16PM +, Klemens Nanni wrote:
> > > > The update to 2.2.0 not only broke the build on aarch64 and armv7 due to
> > > > use of the outdated kr/pty module, it also broke termshark's colors
> > > > with our default `TERM=xterm'.
> > > > 
> > > > I replaced the go pty module to see if that would fix color issues,
> > > > replacing worked but colors didn't.
> > > > 
> > > > The color issue needs more work, "termshark 2.2.x not visible"
> > > > https://github.com/gcla/termshark/issues/114 seems to be the same issue
> > > > on other OSes/platforms.
> > > > 
> > > > tl;dr: Use `TERM=vt100' or `TERM=xterm-256color' for a monochrome or
> > > > working colorful TUI, respectively.
> > > > 
> > > > 
> > > > Regardless of colors, using the new module makes arm* work and I have
> > > > successfully built and used it on my Pinebook Pro, which is nice.
> > > > 
> > > > I've added `pre-build' doing exactly what you'd do manually to replace
> > > > and checksum the module upfront prior to building;  it's not pretty but
> > > > that's how this go ecosystem works...
> > > > 
> > > > Should we go ahead with something like this to unbreak arm*?
> > > 
> > > New diff after creack/pty cut another release about 40 minutes ago with
> > > abieber's fix for mips64 builds.
> > 
> > How about this?
> 
> Not sure why you move things into another file rather than editing the
> few lines, especially since the factual diff gets lost in the noise.

Because the previous MODGO_MOD* was handwritten and I thought it
would make sense to replace with a current generated one. But you're
right it makes the diff less clear, I'll do it in two parts.

> Either way, the MESSAGE addition is nice and you probably have a good
> reason for modules.inc, so OK kn
> 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/net/termshark/Makefile,v
> > retrieving revision 1.7
> > diff -u -p -r1.7 Makefile
> > --- Makefile23 Mar 2021 22:17:36 -  1.7
> > +++ Makefile27 Jul 2021 11:07:55 -
> > @@ -1,12 +1,14 @@
> >  # $OpenBSD: Makefile,v 1.7 2021/03/23 22:17:36 sthen Exp $
> >  
> > -BROKEN-aarch64=old kr/pty doesn't support OpenBSD arm arches; needs 
> > creack/pty@v1.1.11
> > -BROKEN-armv7=  old kr/pty doesn't support OpenBSD arm arches; needs 
> > creack/pty@v1.1.11
> > +# patched to replace kr/pty with kreack/pty; see modules.inc XXX
> > +WRKDIST=   ${WRKSRC}
> > +# remove pkg/MESSAGE if colours get fixed for TERM=xterm.
> >  
> >  COMMENT=   terminal UI for tshark, inspired by Wireshark
> >  
> >  MODGO_MODNAME= github.com/gcla/termshark/v2
> >  MODGO_VERSION= v2.2.0
> > +REVISION=  0
> >  
> >  DISTNAME=  termshark-${MODGO_VERSION}
> >  
> > @@ -22,93 +24,11 @@ WANTLIB += c pthread
> >  MODULES=   lang/go
> >  RUN_DEPENDS=   net/wireshark,-text
> >  
> > -MODGO_MODULES= \
> > -   github.com/!burnt!sushi/toml  v0.3.1 \
> > -   github.com/adam-hanna/array!operations  v0.2.5 \
> > -   github.com/alecthomas/template  v0.0.0-20160405071501-a0175ee3bccc \
> > -   github.com/alecthomas/units  v0.0.0-20151022065526-2efee857e7cf \
> > -   github.com/antchfx/xmlquery  v1.0.0 \
> > -   github.com/antchfx/xpath  v1.0.0 \
> > -   github.com/armon/consul-api  v0.0.0-20180202201655-eb2c6b5be1b6 \
> > -   github.com/blang/semver  v3.5.1+incompatible \
> > -   github.com/coreos/etcd  v3.3.10+incompatible \
> > -   github.com/coreos/go-etcd  v2.0.0+incompatible \
> > -   github.com/coreos/go-semver  v0.2.0 \
> > -   github.com/davecgh/go-spew  v1.1.1 \
> > -   github.com/fsnotify/fsnotify  v1.4.7 \
> > -   github.com/gcla/deep  v1.0.2 \
> > -   github.com/gcla/gowid  v1.1.1-0.20201029034135-cc3f828591d3 \
> > -   github.com/gcla/tail  v1.0.1-0.20190505190527-650e90873359 \
> > -   github.com/gcla/tcell  v1.1.2-0.20200927150251-decc2045f510 \
> > -   github.com/gcla/term  v0.0.0-20191015020247-31cba2f9f402 \
> > -   github.com/gdamore/encoding  v1.0.0 \
> > -   github.com/gdamore/tcell  v1.3.1-0.20200115030318-bff4943f9a29 \
> > -   github.com/go-test/deep  v1.0.2 \
> > -   github.com/guptarohit/asciigraph  v0.4.1 \
> > -   github.com/hashicorp/golang-lru  v0.5.3 \
> > -   github.com/hashicorp/hcl  v1.0.0 \
> > -   github.com/jessevdk/go-flags  v1.4.0 \
> > -   github.com/kballard/go-shellquote  v0.0.0-20180428030007-95032a82bc51 \
> > -   github.com/konsorten/go-windows-terminal-sequences  v1.0.2 \
> > -   github.com/kr/pretty  v0.1.0 \
> > -   github.com/kr/pty  v1.1.4 \
> > -   github.com/kr/text  v0.1.0 \
> > -   github.com/lucasb-eyer/go-colorful  v1.0.3 \
> > -   github.com/magiconair/properties  v1.8.0 \
> > -   github.com/mattn/go-isatty  v0.0.9 \
> > -   github.com/mattn/go-runewidth  v0.0.7 \
> > -   github.com/mitchellh/mapstructure  v1.1.2 \
> > -   

Re: sysutils/bat

[Theo de Raadt]

Ingo Schwarze  wrote:

> Theo de Raadt wrote on Tue, Jul 27, 2021 at 09:12:58AM -0600:
> > Ian Darwin  wrote:
> >> On Tue, Jul 27, 2021 at 04:47:46PM +0200, Ingo Schwarze wrote:
> 
>  Changes by:  st...@cvs.openbsd.org   2021/07/27 05:55:36
>  
>  Modified files:
>   sysutils/bat   : Makefile 
>  
>  Log message:
>  set sysutils/bat to ONLY_FOR_ARCHS=${LP64_ARCHS}, one of the 147
>  dependencies (sys-info) has a 32 vs 64 bit issue when checking
>  the number of CPUs online
> 
> >>> Wait, a cat with 147 dependencies?  Looks like it's a rabbit after all!
> >>> At least there can be no doubt that it inhabits a rabbit hole, doesn't it?
> >>> 
> >>> Besides, isn't a program that stops working once your machine has
> >>> more than four billion CPUs utterly useless in the 31st century?
> >>> 
> >>> If it didn't constantly trip up otherwise busy porters, this port
> >>> would be a really good laugh.
> >>> 
> >>> *Looking at the calendar*
> >>> No, it's unlikely to be the Easter bunny.
> >>> We are not that close to Apil 1.
> 
> >> And to think that Rob Pike once wrote a paper "cat -v considered harmful"
> >> since it added unnecessary functionality to cat, whose only job is
> >> to catenate files...
> 
> > bat is my favorite rust program
> > 
> > please continue maintaining it in ports,
> > i don't want the standup comedy to end
> 
> I didn't mean to summon tedu@ regarding the port,
> quite to the contary, i might even contribute to it!
> 
> https://github.com/sharkdp/bat/pull/1756

I won't use bat until it has an emacs mode.

Re: sysutils/bat

[Ingo Schwarze]

Theo de Raadt wrote on Tue, Jul 27, 2021 at 09:12:58AM -0600:
> Ian Darwin  wrote:
>> On Tue, Jul 27, 2021 at 04:47:46PM +0200, Ingo Schwarze wrote:

 Changes by:st...@cvs.openbsd.org   2021/07/27 05:55:36
 
 Modified files:
sysutils/bat   : Makefile 
 
 Log message:
 set sysutils/bat to ONLY_FOR_ARCHS=${LP64_ARCHS}, one of the 147
 dependencies (sys-info) has a 32 vs 64 bit issue when checking
 the number of CPUs online

>>> Wait, a cat with 147 dependencies?  Looks like it's a rabbit after all!
>>> At least there can be no doubt that it inhabits a rabbit hole, doesn't it?
>>> 
>>> Besides, isn't a program that stops working once your machine has
>>> more than four billion CPUs utterly useless in the 31st century?
>>> 
>>> If it didn't constantly trip up otherwise busy porters, this port
>>> would be a really good laugh.
>>> 
>>> *Looking at the calendar*
>>> No, it's unlikely to be the Easter bunny.
>>> We are not that close to Apil 1.

>> And to think that Rob Pike once wrote a paper "cat -v considered harmful"
>> since it added unnecessary functionality to cat, whose only job is
>> to catenate files...

> bat is my favorite rust program
> 
> please continue maintaining it in ports,
> i don't want the standup comedy to end

I didn't mean to summon tedu@ regarding the port,
quite to the contary, i might even contribute to it!

https://github.com/sharkdp/bat/pull/1756

CVS: cvs.openbsd.org: ports

[Otto Moerbeek]

CVSROOT:/cvs
Module name:ports
Changes by: o...@cvs.openbsd.org2021/07/27 10:01:31

Modified files:
net/powerdns   : Makefile distinfo 
net/powerdns/pkg: PLIST-main 
Added files:
net/powerdns/patches: patch-configure_ac 

Log message:
Update to PowerDNS Authoritative Server 4.5.1

Re: sysutils/bat

[Theo de Raadt]

Ian Darwin  wrote:

> On Tue, Jul 27, 2021 at 04:47:46PM +0200, Ingo Schwarze wrote:
> > > Changes by:   st...@cvs.openbsd.org   2021/07/27 05:55:36
> > > 
> > > Modified files:
> > >   sysutils/bat   : Makefile 
> > > 
> > > Log message:
> > > set sysutils/bat to ONLY_FOR_ARCHS=${LP64_ARCHS}, one of the 147
> > > dependencies (sys-info) has a 32 vs 64 bit issue when checking
> > > the number of CPUs online
> > 
> > Wait, a cat with 147 dependencies?  Looks like it's a rabbit after all!
> > At least there can be no doubt that it inhabits a rabbit hole, doesn't it?
> > 
> > Besides, isn't a program that stops working once your machine has
> > more than four billion CPUs utterly useless in the 31st century?
> > 
> > If it didn't constantly trip up otherwise busy porters, this port
> > would be a really good laugh.
> > 
> > *Looking at the calendar*
> > No, it's unlikely to be the Easter bunny.
> > We are not that close to Apil 1.
> 
> And to think that Rob Pike once wrote a paper "cat -v considered harmful"
> since it added unnecessary functionality to cat, whose only job is
> to catenate files...

bat is my favorite rust program

please continue maintaining it in ports, i don't want the standup comedy
to end

Re: sysutils/bat

[Ian Darwin]

On Tue, Jul 27, 2021 at 04:47:46PM +0200, Ingo Schwarze wrote:
> > Changes by: st...@cvs.openbsd.org   2021/07/27 05:55:36
> > 
> > Modified files:
> > sysutils/bat   : Makefile 
> > 
> > Log message:
> > set sysutils/bat to ONLY_FOR_ARCHS=${LP64_ARCHS}, one of the 147
> > dependencies (sys-info) has a 32 vs 64 bit issue when checking
> > the number of CPUs online
> 
> Wait, a cat with 147 dependencies?  Looks like it's a rabbit after all!
> At least there can be no doubt that it inhabits a rabbit hole, doesn't it?
> 
> Besides, isn't a program that stops working once your machine has
> more than four billion CPUs utterly useless in the 31st century?
> 
> If it didn't constantly trip up otherwise busy porters, this port
> would be a really good laugh.
> 
> *Looking at the calendar*
> No, it's unlikely to be the Easter bunny.
> We are not that close to Apil 1.

And to think that Rob Pike once wrote a paper "cat -v considered harmful"
since it added unnecessary functionality to cat, whose only job is
to catenate files...

Re: sysutils/bat

[Ingo Schwarze]

> Changes by:   st...@cvs.openbsd.org   2021/07/27 05:55:36
> 
> Modified files:
>   sysutils/bat   : Makefile 
> 
> Log message:
> set sysutils/bat to ONLY_FOR_ARCHS=${LP64_ARCHS}, one of the 147
> dependencies (sys-info) has a 32 vs 64 bit issue when checking
> the number of CPUs online

Wait, a cat with 147 dependencies?  Looks like it's a rabbit after all!
At least there can be no doubt that it inhabits a rabbit hole, doesn't it?

Besides, isn't a program that stops working once your machine has
more than four billion CPUs utterly useless in the 31st century?

If it didn't constantly trip up otherwise busy porters, this port
would be a really good laugh.

*Looking at the calendar*
No, it's unlikely to be the Easter bunny.
We are not that close to Apil 1.

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2021/07/27 08:37:41

Modified files:
editors/libreoffice: Makefile distinfo 
editors/libreoffice/patches: patch-configure 
editors/libreoffice/pkg: PLIST-main 

Log message:
update to 7.1.5.2

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
lang/go: go.port.mk 

Log message:
output # $OpenBSD$ in modgo-gen-modules output, to make it easier for
people who redirect straight to modules.inc.  ok abieber@

Re: termshark: unbreak arm*: replace pty module

[Klemens Nanni]

On Tue, Jul 27, 2021 at 12:08:30PM +0100, Stuart Henderson wrote:
> On 2021/07/27 02:20, Klemens Nanni wrote:
> > On Mon, Jul 26, 2021 at 10:13:16PM +, Klemens Nanni wrote:
> > > The update to 2.2.0 not only broke the build on aarch64 and armv7 due to
> > > use of the outdated kr/pty module, it also broke termshark's colors
> > > with our default `TERM=xterm'.
> > > 
> > > I replaced the go pty module to see if that would fix color issues,
> > > replacing worked but colors didn't.
> > > 
> > > The color issue needs more work, "termshark 2.2.x not visible"
> > > https://github.com/gcla/termshark/issues/114 seems to be the same issue
> > > on other OSes/platforms.
> > > 
> > > tl;dr: Use `TERM=vt100' or `TERM=xterm-256color' for a monochrome or
> > > working colorful TUI, respectively.
> > > 
> > > 
> > > Regardless of colors, using the new module makes arm* work and I have
> > > successfully built and used it on my Pinebook Pro, which is nice.
> > > 
> > > I've added `pre-build' doing exactly what you'd do manually to replace
> > > and checksum the module upfront prior to building;  it's not pretty but
> > > that's how this go ecosystem works...
> > > 
> > > Should we go ahead with something like this to unbreak arm*?
> > 
> > New diff after creack/pty cut another release about 40 minutes ago with
> > abieber's fix for mips64 builds.
> 
> How about this?

Not sure why you move things into another file rather than editing the
few lines, especially since the factual diff gets lost in the noise.

Either way, the MESSAGE addition is nice and you probably have a good
reason for modules.inc, so OK kn

> Index: Makefile
> ===
> RCS file: /cvs/ports/net/termshark/Makefile,v
> retrieving revision 1.7
> diff -u -p -r1.7 Makefile
> --- Makefile  23 Mar 2021 22:17:36 -  1.7
> +++ Makefile  27 Jul 2021 11:07:55 -
> @@ -1,12 +1,14 @@
>  # $OpenBSD: Makefile,v 1.7 2021/03/23 22:17:36 sthen Exp $
>  
> -BROKEN-aarch64=  old kr/pty doesn't support OpenBSD arm arches; needs 
> creack/pty@v1.1.11
> -BROKEN-armv7=old kr/pty doesn't support OpenBSD arm arches; needs 
> creack/pty@v1.1.11
> +# patched to replace kr/pty with kreack/pty; see modules.inc XXX
> +WRKDIST= ${WRKSRC}
> +# remove pkg/MESSAGE if colours get fixed for TERM=xterm.
>  
>  COMMENT= terminal UI for tshark, inspired by Wireshark
>  
>  MODGO_MODNAME=   github.com/gcla/termshark/v2
>  MODGO_VERSION=   v2.2.0
> +REVISION=0
>  
>  DISTNAME=termshark-${MODGO_VERSION}
>  
> @@ -22,93 +24,11 @@ WANTLIB += c pthread
>  MODULES= lang/go
>  RUN_DEPENDS= net/wireshark,-text
>  
> -MODGO_MODULES=   \
> - github.com/!burnt!sushi/toml  v0.3.1 \
> - github.com/adam-hanna/array!operations  v0.2.5 \
> - github.com/alecthomas/template  v0.0.0-20160405071501-a0175ee3bccc \
> - github.com/alecthomas/units  v0.0.0-20151022065526-2efee857e7cf \
> - github.com/antchfx/xmlquery  v1.0.0 \
> - github.com/antchfx/xpath  v1.0.0 \
> - github.com/armon/consul-api  v0.0.0-20180202201655-eb2c6b5be1b6 \
> - github.com/blang/semver  v3.5.1+incompatible \
> - github.com/coreos/etcd  v3.3.10+incompatible \
> - github.com/coreos/go-etcd  v2.0.0+incompatible \
> - github.com/coreos/go-semver  v0.2.0 \
> - github.com/davecgh/go-spew  v1.1.1 \
> - github.com/fsnotify/fsnotify  v1.4.7 \
> - github.com/gcla/deep  v1.0.2 \
> - github.com/gcla/gowid  v1.1.1-0.20201029034135-cc3f828591d3 \
> - github.com/gcla/tail  v1.0.1-0.20190505190527-650e90873359 \
> - github.com/gcla/tcell  v1.1.2-0.20200927150251-decc2045f510 \
> - github.com/gcla/term  v0.0.0-20191015020247-31cba2f9f402 \
> - github.com/gdamore/encoding  v1.0.0 \
> - github.com/gdamore/tcell  v1.3.1-0.20200115030318-bff4943f9a29 \
> - github.com/go-test/deep  v1.0.2 \
> - github.com/guptarohit/asciigraph  v0.4.1 \
> - github.com/hashicorp/golang-lru  v0.5.3 \
> - github.com/hashicorp/hcl  v1.0.0 \
> - github.com/jessevdk/go-flags  v1.4.0 \
> - github.com/kballard/go-shellquote  v0.0.0-20180428030007-95032a82bc51 \
> - github.com/konsorten/go-windows-terminal-sequences  v1.0.2 \
> - github.com/kr/pretty  v0.1.0 \
> - github.com/kr/pty  v1.1.4 \
> - github.com/kr/text  v0.1.0 \
> - github.com/lucasb-eyer/go-colorful  v1.0.3 \
> - github.com/magiconair/properties  v1.8.0 \
> - github.com/mattn/go-isatty  v0.0.9 \
> - github.com/mattn/go-runewidth  v0.0.7 \
> - github.com/mitchellh/mapstructure  v1.1.2 \
> - github.com/mreiferson/go-snappystream  v0.2.3 \
> - github.com/pelletier/go-toml  v1.2.0 \
> - github.com/pkg/errors  v0.8.1 \
> - github.com/pkg/term  v0.0.0-20190109203006-aa71e9d9e942 \
> - github.com/pmezard/go-difflib  v1.0.0 \
> - github.com/rakyll/statik  v0.1.6 \
> - github.com/shibukawa/configdir  v0.0.0-20170330084843-e180dbdc8da0 \
> - 

Re: patch: make python-module(5) somewhat readable

[Klemens Nanni]

On Sun, Jul 25, 2021 at 03:49:50PM +0200, Marc Espie wrote:
> I surmise other similar manpages could use a bit of a rework as well.

One suggestion
OK kn

> Index: python-module.5
> ===
> RCS file: /cvs/src/share/man/man5/python-module.5,v
> retrieving revision 1.2
> diff -u -p -r1.2 python-module.5
> --- python-module.5   25 Jul 2021 11:29:42 -  1.2
> +++ python-module.5   25 Jul 2021 13:48:52 -
> @@ -37,8 +37,20 @@ in the
>  .Xr ports 7
>  tree.
>  .Pp
> -Sets
> -.Ev MODPY_VERSION ,
> +By default, the module sets
> +.Ev MODPY_VERSION
> +to the appropriate python version
> +.Po
> +depending on the existence/presence of a
> +.Sq python3
> +.Ev FLAVOR
> +.Pc .
> +but
> +.Ev MODPY_VERSION
> +may be set manually to ${MODPY_DEFAULT_VERSION_2}
> +for legacy ports.
> +.Pp
> +The module then sets
>  .Ev MODPY_BIN ,
>  .Ev MODPY_INCDIR ,
>  .Ev MODPY_LIBDIR ,
> @@ -52,20 +64,24 @@ Sets
>  .Ev MODPY_TEST_DEPENDS ,
>  .Ev MODPY_BUILD_DEPENDS ,
>  and
> -.Ev MODPY_ADJ_FILES .
> -Appends to
> +.Ev MODPY_ADJ_FILES
> +accordingly.
> +.Pp
> +The module also appends to
> +.Bl -bullet

I'd use `-compact' to zap the vertical space here as well, your choice.

> +.It
>  .Ev RUN_DEPENDS
>  unless
>  .Ev MODPY_RUNDEP
> -is set to No.
> -Appends to
> +is set to No,
> +.It
>  .Ev BUILD_DEPENDS
>  unless
>  .Ev MODPY_BUILDDEP
>  is set to No or
>  .Ev NO_BUILD
> -is set to Yes.
> -Appends to
> +is set to Yes,
> +.It
>  .Ev TEST_DEPENDS
>  if
>  .Ev MODPY_PYTEST
> @@ -73,18 +89,23 @@ is set to Yes
>  unless
>  .Ev MODPY_TESTDEP
>  is set to No.
> -Appends
> +.El
> +.Pp
> +It also appends
>  .Ev MODPY_TEST_LOCALE
>  to
> -.Ev TEST_ENV .
> -Changes to the directory specified in
> -.Ev MODPY_TEST_DIR ,
> -by default WRKSRC, before running tests.
> -.Ev MODPY_VERSION
> -is the default version used by all python modules.
> +.Ev TEST_ENV
> +and hanges to the directory specified in
> +.Ev MODPY_TEST_DIR
> +.Po
> +by default ${WRKSRC}
> +.Pc
> +before running tests.
> +.Pp
>  Ports which use the setuptools module should set
>  .Ev MODPY_SETUPTOOLS
>  to Yes.
> +.Pp
>  Ports which use the pytest module should set
>  .Ev MODPY_PYTEST
>  to Yes.
> @@ -92,6 +113,7 @@ Arguments can be passed to pytest during
>  .Cm test
>  with
>  .Ev MODPY_PYTEST_ARGS .
> +.Pp
>  All ports that generate egg-info files should set
>  .Ev MODPY_EGG_VERSION
>  to the version string used by the
> @@ -106,37 +128,48 @@ Extra arguments to the build and install
>  .Ev MODPY_DISTUTILS_BUILDARGS
>  and
>  .Ev MODPY_DISTUTILS_INSTALLARGS .
> -If any files have a python shebang line which needs to be replaced
> -using MODPY_BIN, list them in
> +.Pp
> +If any files have a python shebang line where the interpreter should be
> +${MODPY_BIN}, list them in
>  .Ev MODPY_ADJ_FILES .
> -These are prefixed with WRKSRC and replaced automatically
> +These filenames can be relative to ${WRKSRC} and will be modified
>  at the end of
>  .Cm pre-configure .
> -Also affects
> +.Pp
> +This module also affects
>  .Ev CATEGORIES ,
>  .Ev MAKE_ENV ,
>  .Ev CONFIGURE_ENV ,
>  and
> -.Ev SUBST_VARS .
> -May affect the
> +.Ev SUBST_VARS ,
> +and it may affect the
>  .Cm test
>  target.
> +.Pp
>  If
>  .Ev MODPY_PI
> -is set to Yes it will set
> +is set to
> +.Sq Yes
> +the module will provide a default for
>  .Ev HOMEPAGE
> -and
> -.Ev MASTER_SITES .
> -The subdirectory can be overridden with
> -.Ev MODPY_PI_DIR .
> -.Pp
> +and set
> +.Ev MASTER_SITES
> +.Po
> +the subdirectory can be overridden with
> +.Ev MODPY_PI_DIR
> +.Pc .
> +.Ss Packing-list generation
>  Python 2.x places .pyc files in the same directory as the associated .py 
> file.
>  Python 3.x places these in a separate __pycache__ directory and uses an
>  additional suffix.
>  In some cases, an ABI tag is also used for names of compiled extensions.
> -The python module defines variables to allow a single PLIST to be
> -used for both versions.
> -Generate or update the PLIST using the python3
> +The python module defines variables to allow a single
> +.Pa PLIST
> +to be
> +used for both versions:
> +generate or update the
> +.Pa PLIST
> +using the python3
>  .Ev FLAVOR ,
>  then edit it to prefix any lines creating
>  .Ev MODPY_PYCACHE
> 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
net/isc-bind   : Makefile 
net/isc-bind/patches: patch-lib_isc_unix_socket_c 

Log message:
patch isc-bind to stop using the IPV6_DONTFRAG socket option on OpenBSD;
this was added in the recent update, but the port is patched to use pledge
which doesn't allow this, resulting in it getting killed when trying to
do a lookup over IPv6.

found while checking that I did indeed have v6 glue on my domain when
trying to receive mail from someone whose work network is currently
carrying out an IPv6-only experiment (perhaps not intentionally ;)

CVS: cvs.openbsd.org: ports

[Daniel Jakots]

CVSROOT:/cvs
Module name:ports
Changes by: d...@cvs.openbsd.org2021/07/27 06:25:21

Modified files:
net/minio/client: modules.inc 
net/minio/server: modules.inc 

Log message:
Add missing rcsid

Pointed out by sthen on ports@ for a new port.
ok sthen

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/07/27 05:55:36

Modified files:
sysutils/bat   : Makefile 

Log message:
set sysutils/bat to ONLY_FOR_ARCHS=${LP64_ARCHS}, one of the 147 dependencies
(sys-info) has a 32 vs 64 bit issue when checking the number of CPUs online

Re: CVS: cvs.openbsd.org: ports

[Stuart Henderson]

On 2021/07/24 18:04, Kurt Mosiejczuk wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   k...@cvs.openbsd.org2021/07/24 18:04:09
> 
> Modified files:
>   games/lwjgl3   : Makefile distinfo 
> 
> Log message:
> Update to new upstream release (by me)
> 
> https://github.com/kmosiejczuk/lwjgl3/releases/tag/3.2.4alpha2
> 
> Also includes fix to get it building on i386 from Kurt Miller
> 

btw I have this on i386,

   [Linker] ld: error: undefined symbol: __stack_smash_handler




lwjgl3.log.gz
Description: application/gunzip

Re: update inputmethods/fcitx-anthy: 0.2.3 -> 0.2.4

[Antoine Jacoutot]

On Tue, Jul 27, 2021 at 01:24:01PM +0200, Jeremie Courreges-Anglas wrote:
> On Tue, Jul 27 2021, Kevin Lo  wrote:
> > On Mon, Jul 26, 2021 at 04:36:52PM +, openbsd wrote:
> >> 
> >> Hi,
> >> 
> >> This is a minor version bump for fcitx-anthy includes small bug 
> >> fixes/cleanups and translation updates.
> >> 
> >> Tested on amd64 with fcitx-4.2.9.8p1, no problem found.
> >
> > Committed, thanks.
> 
> Note that this adds
> 
>   @tag gtk-update-icon-cache %D/share/icons/hicolor
> 
> without adding an RDEP on x11/gtk+3,-guic.  portcheck(1) even warns
> about this:
> 
>   russell /usr/ports/inputmethods/fcitx-anthy$ portcheck
>   missing RDEP on x11/gtk+3,-guic
> 
> This is not strictly needed since inputmethods/fcitx,-main already
> depends on x11/gtk+3,-guic.  But in theory this could change later.
> I think it's good practice to match "@tag gtk-update-icon-cache" with
> the appropriate RDEP.

Agreed.

> ok?

ok aja


> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/inputmethods/fcitx-anthy/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile  27 Jul 2021 01:37:00 -  1.5
> +++ Makefile  27 Jul 2021 11:23:10 -
> @@ -5,6 +5,7 @@ COMMENT = anthy wrapper for fcitx
>  GH_ACCOUNT = fcitx
>  GH_PROJECT = fcitx-anthy
>  GH_TAGNAME = 0.2.4
> +REVISION =   0
>  
>  CATEGORIES = inputmethods japanese
>  
> @@ -23,7 +24,8 @@ MODULES =   devel/cmake
>  
>  BUILD_DEPENDS =  devel/gettext,-tools \
>   inputmethods/fcitx,-main
> -RUN_DEPENDS =inputmethods/fcitx,-main
> +RUN_DEPENDS =inputmethods/fcitx,-main \
> + x11/gtk+3,-guic
>  LIB_DEPENDS =inputmethods/anthy
>  
>  NO_TEST =Yes
> 
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> 

-- 
Antoine

Re: update inputmethods/fcitx-anthy: 0.2.3 -> 0.2.4

[Jeremie Courreges-Anglas]

On Tue, Jul 27 2021, Kevin Lo  wrote:
> On Mon, Jul 26, 2021 at 04:36:52PM +, openbsd wrote:
>> 
>> Hi,
>> 
>> This is a minor version bump for fcitx-anthy includes small bug 
>> fixes/cleanups and translation updates.
>> 
>> Tested on amd64 with fcitx-4.2.9.8p1, no problem found.
>
> Committed, thanks.

Note that this adds

  @tag gtk-update-icon-cache %D/share/icons/hicolor

without adding an RDEP on x11/gtk+3,-guic.  portcheck(1) even warns
about this:

  russell /usr/ports/inputmethods/fcitx-anthy$ portcheck
  missing RDEP on x11/gtk+3,-guic

This is not strictly needed since inputmethods/fcitx,-main already
depends on x11/gtk+3,-guic.  But in theory this could change later.
I think it's good practice to match "@tag gtk-update-icon-cache" with
the appropriate RDEP.

ok?


Index: Makefile
===
RCS file: /cvs/ports/inputmethods/fcitx-anthy/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile27 Jul 2021 01:37:00 -  1.5
+++ Makefile27 Jul 2021 11:23:10 -
@@ -5,6 +5,7 @@ COMMENT =   anthy wrapper for fcitx
 GH_ACCOUNT =   fcitx
 GH_PROJECT =   fcitx-anthy
 GH_TAGNAME =   0.2.4
+REVISION = 0
 
 CATEGORIES =   inputmethods japanese
 
@@ -23,7 +24,8 @@ MODULES = devel/cmake
 
 BUILD_DEPENDS =devel/gettext,-tools \
inputmethods/fcitx,-main
-RUN_DEPENDS =  inputmethods/fcitx,-main
+RUN_DEPENDS =  inputmethods/fcitx,-main \
+   x11/gtk+3,-guic
 LIB_DEPENDS =  inputmethods/anthy
 
 NO_TEST =  Yes


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

Re: termshark: unbreak arm*: replace pty module

[Stuart Henderson]

On 2021/07/27 02:20, Klemens Nanni wrote:
> On Mon, Jul 26, 2021 at 10:13:16PM +, Klemens Nanni wrote:
> > The update to 2.2.0 not only broke the build on aarch64 and armv7 due to
> > use of the outdated kr/pty module, it also broke termshark's colors
> > with our default `TERM=xterm'.
> > 
> > I replaced the go pty module to see if that would fix color issues,
> > replacing worked but colors didn't.
> > 
> > The color issue needs more work, "termshark 2.2.x not visible"
> > https://github.com/gcla/termshark/issues/114 seems to be the same issue
> > on other OSes/platforms.
> > 
> > tl;dr: Use `TERM=vt100' or `TERM=xterm-256color' for a monochrome or
> > working colorful TUI, respectively.
> > 
> > 
> > Regardless of colors, using the new module makes arm* work and I have
> > successfully built and used it on my Pinebook Pro, which is nice.
> > 
> > I've added `pre-build' doing exactly what you'd do manually to replace
> > and checksum the module upfront prior to building;  it's not pretty but
> > that's how this go ecosystem works...
> > 
> > Should we go ahead with something like this to unbreak arm*?
> 
> New diff after creack/pty cut another release about 40 minutes ago with
> abieber's fix for mips64 builds.

How about this?

Index: Makefile
===
RCS file: /cvs/ports/net/termshark/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile23 Mar 2021 22:17:36 -  1.7
+++ Makefile27 Jul 2021 11:07:55 -
@@ -1,12 +1,14 @@
 # $OpenBSD: Makefile,v 1.7 2021/03/23 22:17:36 sthen Exp $
 
-BROKEN-aarch64=old kr/pty doesn't support OpenBSD arm arches; needs 
creack/pty@v1.1.11
-BROKEN-armv7=  old kr/pty doesn't support OpenBSD arm arches; needs 
creack/pty@v1.1.11
+# patched to replace kr/pty with kreack/pty; see modules.inc XXX
+WRKDIST=   ${WRKSRC}
+# remove pkg/MESSAGE if colours get fixed for TERM=xterm.
 
 COMMENT=   terminal UI for tshark, inspired by Wireshark
 
 MODGO_MODNAME= github.com/gcla/termshark/v2
 MODGO_VERSION= v2.2.0
+REVISION=  0
 
 DISTNAME=  termshark-${MODGO_VERSION}
 
@@ -22,93 +24,11 @@ WANTLIB += c pthread
 MODULES=   lang/go
 RUN_DEPENDS=   net/wireshark,-text
 
-MODGO_MODULES= \
-   github.com/!burnt!sushi/toml  v0.3.1 \
-   github.com/adam-hanna/array!operations  v0.2.5 \
-   github.com/alecthomas/template  v0.0.0-20160405071501-a0175ee3bccc \
-   github.com/alecthomas/units  v0.0.0-20151022065526-2efee857e7cf \
-   github.com/antchfx/xmlquery  v1.0.0 \
-   github.com/antchfx/xpath  v1.0.0 \
-   github.com/armon/consul-api  v0.0.0-20180202201655-eb2c6b5be1b6 \
-   github.com/blang/semver  v3.5.1+incompatible \
-   github.com/coreos/etcd  v3.3.10+incompatible \
-   github.com/coreos/go-etcd  v2.0.0+incompatible \
-   github.com/coreos/go-semver  v0.2.0 \
-   github.com/davecgh/go-spew  v1.1.1 \
-   github.com/fsnotify/fsnotify  v1.4.7 \
-   github.com/gcla/deep  v1.0.2 \
-   github.com/gcla/gowid  v1.1.1-0.20201029034135-cc3f828591d3 \
-   github.com/gcla/tail  v1.0.1-0.20190505190527-650e90873359 \
-   github.com/gcla/tcell  v1.1.2-0.20200927150251-decc2045f510 \
-   github.com/gcla/term  v0.0.0-20191015020247-31cba2f9f402 \
-   github.com/gdamore/encoding  v1.0.0 \
-   github.com/gdamore/tcell  v1.3.1-0.20200115030318-bff4943f9a29 \
-   github.com/go-test/deep  v1.0.2 \
-   github.com/guptarohit/asciigraph  v0.4.1 \
-   github.com/hashicorp/golang-lru  v0.5.3 \
-   github.com/hashicorp/hcl  v1.0.0 \
-   github.com/jessevdk/go-flags  v1.4.0 \
-   github.com/kballard/go-shellquote  v0.0.0-20180428030007-95032a82bc51 \
-   github.com/konsorten/go-windows-terminal-sequences  v1.0.2 \
-   github.com/kr/pretty  v0.1.0 \
-   github.com/kr/pty  v1.1.4 \
-   github.com/kr/text  v0.1.0 \
-   github.com/lucasb-eyer/go-colorful  v1.0.3 \
-   github.com/magiconair/properties  v1.8.0 \
-   github.com/mattn/go-isatty  v0.0.9 \
-   github.com/mattn/go-runewidth  v0.0.7 \
-   github.com/mitchellh/mapstructure  v1.1.2 \
-   github.com/mreiferson/go-snappystream  v0.2.3 \
-   github.com/pelletier/go-toml  v1.2.0 \
-   github.com/pkg/errors  v0.8.1 \
-   github.com/pkg/term  v0.0.0-20190109203006-aa71e9d9e942 \
-   github.com/pmezard/go-difflib  v1.0.0 \
-   github.com/rakyll/statik  v0.1.6 \
-   github.com/shibukawa/configdir  v0.0.0-20170330084843-e180dbdc8da0 \
-   github.com/sirupsen/logrus  v1.4.2 \
-   github.com/spf13/afero  v1.1.2 \
-   github.com/spf13/cast  v1.3.0 \
-   github.com/spf13/jwalterweatherman  v1.0.0 \
-   github.com/spf13/pflag  v1.0.3 \
-   github.com/spf13/viper  v1.3.2 \
-   github.com/stretchr/objx  v0.1.1 \
-   github.com/stretchr/testify  v1.4.0 \
-   github.com/tevino/abool  v0.0.0-20170917061928-9b9efcf221b5 \
-   github.com/ugorji/go/codec 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/07/27 04:58:41

ports/net/termshark/patches

Update of /cvs/ports/net/termshark/patches
In directory cvs.openbsd.org:/tmp/cvs-serv99511/patches

Log Message:
Directory /cvs/ports/net/termshark/patches added to the repository

Re: CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

On Tue, Jul 27, 2021 at 11:49:53AM +0100, Stuart Henderson wrote:
> On 2021/07/27 10:49, Antoine Jacoutot wrote:
> > On Mon, Jul 26, 2021 at 08:03:23PM -0600, joshua stein wrote:
> > > CVSROOT:  /cvs
> > > Module name:  ports
> > > Changes by:   j...@cvs.openbsd.org2021/07/26 20:03:23
> > > 
> > > Modified files:
> > >   lang/crystal   : Makefile distinfo 
> > > Added files:
> > >   lang/crystal/files: crystal 
> > > 
> > > Log message:
> > > update to crystal-1.1.1
> > 
> > I think you want PREFIX/TRUEPREFIX and not LOCALBASE in files/crystal
> 
> yes, if we have to have this abstraction we should use the right ones;
> PREFIX/TRUEPREFIX is "this port", LOCALBASE is "other ports"
> 
> Though I think there is about 0 chance the ports tree will build
> successfully if these are set to something other than /usr/local..

Oh I agree.
I still don't understand why we keep pretending to support any other prefix but
well...

-- 
Antoine

Re: termshark: unbreak arm*: replace pty module

[Stuart Henderson]

On 2021/07/27 08:25, Stuart Henderson wrote:
> On 2021/07/27 02:20, Klemens Nanni wrote:
> > On Mon, Jul 26, 2021 at 10:13:16PM +, Klemens Nanni wrote:
> > > The update to 2.2.0 not only broke the build on aarch64 and armv7 due to
> > > use of the outdated kr/pty module, it also broke termshark's colors
> > > with our default `TERM=xterm'.
> 
> It was broken there before the update to 2.2.0 as well.

(there = arm)

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/07/27 04:53:30

Modified files:
net/neochat: Makefile 

Log message:
missing RDEP on devel/kf5/kitemmodels, from Yifei Zhan

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/07/27 04:52:30

Modified files:
www/sblg   : Makefile distinfo 

Log message:
update to sblg-0.5.11 and enable tests, from Martin Ziemer,
feedback Stefan Hagen, earlier version ok maintainer

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
textproc/lowdown: Makefile distinfo 

Log message:
update to lowdown-0.8.5 and enable tests, from Martin Ziemer,
feedback Stefan Hagen, earlier version ok maintainer

Re: CVS: cvs.openbsd.org: ports

[Stuart Henderson]

On 2021/07/27 10:49, Antoine Jacoutot wrote:
> On Mon, Jul 26, 2021 at 08:03:23PM -0600, joshua stein wrote:
> > CVSROOT:/cvs
> > Module name:ports
> > Changes by: j...@cvs.openbsd.org2021/07/26 20:03:23
> > 
> > Modified files:
> > lang/crystal   : Makefile distinfo 
> > Added files:
> > lang/crystal/files: crystal 
> > 
> > Log message:
> > update to crystal-1.1.1
> 
> I think you want PREFIX/TRUEPREFIX and not LOCALBASE in files/crystal

yes, if we have to have this abstraction we should use the right ones;
PREFIX/TRUEPREFIX is "this port", LOCALBASE is "other ports"

Though I think there is about 0 chance the ports tree will build
successfully if these are set to something other than /usr/local..

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
net/ntopng : Makefile distinfo 
net/ntopng/patches: patch-configure_seed patch-nDPI_autogen_sh 
patch-nDPI_src_lib_Makefile_in 
patch-nDPI_src_lib_ndpi_community_id_c 
patch-src_HTTPserver_cpp patch-src_Ntop_cpp 
net/ntopng/pkg : PLIST 
Added files:
net/ntopng/patches: patch-nDPI_example_reader_util_c 

Log message:
update to newer ntopng checkout from the 4.2-release branch, and switch to
nDPI 4.0 branch

Re: [update patch] lowdown 0.8.3 ->0.8.5

[Martin Ziemer]

Am Thu, Jul 15, 2021 at 02:07:56PM +0200 schrieb Stefan Hagen:
> Stefan Hagen wrote:
> > Martin Ziemer wrote:
> >> This patch updates lowdown from 0.8.3 to 0.8.5.
> >
> > Tested with a few md files and working fine on sparc64.
> 
> I saw that this port has tests too, so I suggest:
> 
> -NO_TEST =  Yes
> +TEST_TARGET =  regress
> 
> Best Regards,
> Stefan
 
I updated the patch by adding the tests.

Tested on two amd64 systems.
Without these tests we also had OK from maintainer.

Index: Makefile
===
RCS file: /cvs/ports/textproc/lowdown/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile19 Mar 2021 15:48:29 -  1.25
+++ Makefile27 Jul 2021 09:43:14 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.25 2021/03/19 15:48:29 fcambus Exp $
 
 COMMENT =  simple markdown translator
-DISTNAME = lowdown-0.8.3
+DISTNAME = lowdown-0.8.5
 CATEGORIES =   textproc
 
 HOMEPAGE = https://kristaps.bsd.lv/lowdown/
@@ -20,6 +20,6 @@ CONFIGURE_ARGS =  PREFIX="${PREFIX}"
 
 ALL_TARGET =   lowdown
 
-NO_TEST =  Yes
+TEST_TARGET =  regress
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/textproc/lowdown/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- distinfo19 Mar 2021 15:48:29 -  1.22
+++ distinfo27 Jul 2021 09:43:14 -
@@ -1,2 +1,2 @@
-SHA256 (lowdown-0.8.3.tar.gz) = jKuGzHEMAv28Yae9cW/YlqRL2t4uFtyIr9x2rguw7yo=
-SIZE (lowdown-0.8.3.tar.gz) = 201286
+SHA256 (lowdown-0.8.5.tar.gz) = DMdpuJ4jXGHK84/eL35r0hBujnNNN7HqMh2WoTDwTwQ=
+SIZE (lowdown-0.8.5.tar.gz) = 209639

Re: [update patch] sblg 0.5.9 ->0.5.11

[Martin Ziemer]

Am Thu, Jul 15, 2021 at 02:04:33PM +0200 schrieb Stefan Hagen:
> Martin Ziemer wrote:
> > This patch updates sblg from 0.5.9 to 0.5.11.
> >
> > Tested on three amd64 systems.
> 
> Test on sparc64 is good as well.
> 
> I suggest to commit this with:
> -NO_TEST =  Yes
> +TEST_TARGET =  regress
> 
> Regression tests are running fine here:
> 
> Best Regards,
> Stefan

I updated the patch by adding the tests.

Tested on two amd64 systems.
Without these tests we also had OK from maintainer.

Index: Makefile
===
RCS file: /cvs/ports/www/sblg/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile12 Jul 2020 20:40:44 -  1.28
+++ Makefile27 Jul 2021 09:49:43 -
@@ -2,7 +2,7 @@
 
 COMMENT =  simple off-line blog utility
 
-DISTNAME = sblg-0.5.9
+DISTNAME = sblg-0.5.11
 CATEGORIES =   www
 
 HOMEPAGE = https://kristaps.bsd.lv/sblg/
@@ -21,7 +21,7 @@ MAKE_FLAGS =  CC="${CC}"
 
 CONFIGURE_STYLE =  simple
 
-NO_TEST =  Yes
+TEST_TARGET =  regress
 
 ALL_TARGET =   sblg
 
Index: distinfo
===
RCS file: /cvs/ports/www/sblg/distinfo,v
retrieving revision 1.26
diff -u -p -r1.26 distinfo
--- distinfo12 Jul 2020 20:40:44 -  1.26
+++ distinfo27 Jul 2021 09:49:43 -
@@ -1,2 +1,2 @@
-SHA256 (sblg-0.5.9.tar.gz) = 5TiVzJgUzy+o9fnnvmuPBg8kKgSGMDcT1N56psK6hVE=
-SIZE (sblg-0.5.9.tar.gz) = 1456016
+SHA256 (sblg-0.5.11.tar.gz) = 8Xi2ybUPhxVc9fBqe4UR5l/6DPxI5Ql0iNErzOadge0=
+SIZE (sblg-0.5.11.tar.gz) = 1480563

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

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

Modified files:
devel/yarn : Makefile distinfo 
devel/yarn/patches: patch-lib_cli_js 

Log message:
update to yarn-1.22.11

Re: CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

On Mon, Jul 26, 2021 at 08:03:23PM -0600, joshua stein wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   j...@cvs.openbsd.org2021/07/26 20:03:23
> 
> Modified files:
>   lang/crystal   : Makefile distinfo 
> Added files:
>   lang/crystal/files: crystal 
> 
> Log message:
> update to crystal-1.1.1

I think you want PREFIX/TRUEPREFIX and not LOCALBASE in files/crystal

-- 
Antoine

Re: termshark: unbreak arm*: replace pty module

[Stuart Henderson]

On 2021/07/27 02:20, Klemens Nanni wrote:
> On Mon, Jul 26, 2021 at 10:13:16PM +, Klemens Nanni wrote:
> > The update to 2.2.0 not only broke the build on aarch64 and armv7 due to
> > use of the outdated kr/pty module, it also broke termshark's colors
> > with our default `TERM=xterm'.

It was broken there before the update to 2.2.0 as well.

> +# manually replace old pty module with new one to enable arm64, armv7 and 
> mips64
> +# builds until upstream fixes this
> +pre-build:
> + ${MODGO_CMD} mod edit -replace \
> + github.com/kr/pty=github.com/creack/pty@v1.1.14 ${WRKSRC}/go.mod
> + sed -i '/github.com\/.*\/pty/d' ${WRKSRC}/go.sum
> + echo 'github.com/creack/pty v1.1.14 
> h1:55VbUWoBxE1iTAh3B6JztD6xyQ06CvW/31oD6rYwrtY=' >> ${WRKSRC}/go.sum
> + echo 'github.com/creack/pty v1.1.14/go.mod 
> h1:MOBLtS5ELjhRRrroQr9kyvTxUAFNvYEK993ew/Vr4O4=' >> ${WRKSRC}/go.sum

Ugh. I will see if I can figure out a less unpleasant way to do this.

>  # *shrug* builds ok with "go get" but ports build picks up something broken

Not new, but does anyone has an idea about what's different between
"go get" and a ports build?

Re: fix net/neochat: missing RUN_DEPENDS item

[Yifei Zhan]

On 21/07/27 02:55AM, Yifei Zhan wrote:
> Hi,
> 
> The current Makefile does not list devel/kf5/kitemmodels as a 
> RUN_DEPENDS but neochat will crush without it. The following patch add 
> devel/kf5/kitemmodels to the list of RUN_DEPENDS. Lightly tested on amd64.
> 

repost, forgot to bump REVISION.

Index: neochat/Makefile
===
RCS file: /cvs/ports/net/neochat/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- neochat/Makefile26 May 2021 22:18:54 -  1.2
+++ neochat/Makefile27 Jul 2021 03:22:10 -
@@ -4,7 +4,7 @@ COMMENT =   client for Matrix chat
 VERSION =  1.1.1
 DISTNAME = neochat-${VERSION}
 
-REVISION = 0
+REVISION = 1
 
 CATEGORIES=net
 
@@ -24,6 +24,7 @@ MODULES = devel/kf5
 
 RUN_DEPENDS =  devel/desktop-file-utils \
graphics/kquickimageeditor \
+   devel/kf5/kitemmodels \
x11/gtk+3,-guic
 
 

fix net/neochat: missing RUN_DEPENDS item

[Yifei Zhan]

Hi,

The current Makefile does not list devel/kf5/kitemmodels as a 
RUN_DEPENDS but neochat will crush without it. The following patch add 
devel/kf5/kitemmodels to the list of RUN_DEPENDS. Lightly tested on amd64.

Index: Makefile
===
RCS file: /cvs/ports/net/neochat/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- Makefile26 May 2021 22:18:54 -  1.2
+++ Makefile27 Jul 2021 01:38:48 -
@@ -24,6 +24,7 @@ MODULES = devel/kf5
 
 RUN_DEPENDS =  devel/desktop-file-utils \
graphics/kquickimageeditor \
+   devel/kf5/kitemmodels \
x11/gtk+3,-guic