Re: purritobin-0.1.2 - new package + dependencies

2020-08-10 Thread Aisha Tammy
On 8/10/20 6:06 PM, Brian Callahan wrote:
> Hi Aisha --
> 
> When I extracted your tarball, it gave me a port of py-synapse-imap...
> 
> ~Brian
> 

OMG, lol, so sorry about that, that was another one I had just sent!
I made an error in the scp >.<

Thanks a lot for the correction,
I've attached the correct one.

Aisha


purritobin.tgz
Description: application/compressed-tar


Re: purritobin-0.1.2 - new package + dependencies

2020-08-10 Thread Brian Callahan
Hi Aisha --

On Sunday, August 9, 2020 5:20 PM, Aisha Tammy  wrote:

> On 7/5/20 5:58 AM, Aisha Tammy wrote:
>
> > Bump,
> >
> > > On 2020/06/23 23:33, Aisha Tammy wrote:
> > >
> > > > On 6/22/20 6:56 AM, Stuart Henderson wrote:
> > > >
> > > > > On 2020/06/21 21:32, Aisha Tammy wrote:
> > > > >
> > > > > > > I've added them again with the two from Brian and the uwebsockets
> > > > > > > updated to 18.3.0
> > > > > >
> > > > > > Another bump.
> > > > > > Also updated uwebsockets to 18.4.0
> > > > >
> > > > > OK sthen@ if someone wants to import uwebsockets/usockets with 
> > > > > usockets
> > > > > moved from devel to net, tgz attached.
> > > > > For purritobin, could you install the README under share/doc and maybe
> > > > > also paste.html and POSIX_shell_client.sh (either in share/examples or
> > > > > somewhere else). Might be a good idea to add an rc script and a userid
> > > > > to run it under (@newuser in plist) too?
> > > >
> > > > I've attached purritobin with the README and an rc file.
> > > > Changes
> > > >
> > > > -   new user and group
> > > >
> > > > -   rc file running as new user
> > > >
> > > > -   added paste.html and shell clients to /usr/local/share/purritobin/
> > > >
> > > > -   added pkg-readme with examples for httpd, cron cleanup and pf rate 
> > > > limiting
> > > >
> > > >
> > > > Also needs that uwebsockets and usockets be updated to latest version 
> > > > as the
> > > > current ones in the tree are broken (upstream messed up some SSL 
> > > > declarations).
> > > > I've added the diff for that as well.
> > >
> > > I've committed those, diff didn't work as it had extra blank lines
> > > so I did them by hand, SHARED_LIBS needed a bump too due to additional
> > > functions.
> > > purritobin looks good now, ok if someone would like to import (wonder if
> > > it might be better in www rather than net though)
>
> Another bump.
>
> There's one OK, so I think it should be good.
>
> Thanks a lot,
> Aisha

When I extracted your tarball, it gave me a port of py-synapse-imap...

~Brian



Re: LLVM 10: net/libtorrent-rasterbar

2020-08-10 Thread Nam Nguyen
Jeremie Courreges-Anglas writes:

> On Thu, Aug 06 2020, Nam Nguyen  wrote:
> Done, I have committed your diff + a few other tweaks yesterday.  I have
> pointed this bug and your diff to the folks who handled the LLVM update
> in base.  There have been discussions about moving to llvm-10.0.1.
>

Thank you.

>> I propose waiting until rsadowski@'s devel/boost 1.67 before unbreaking
>> libtorrent-rasterbar. I can look into updating libtorrent-rasterbar to
>> 1.2.8 until then. There is discussion regarding a mechanism for boost
>> python numbering.
>
> Is libtorrent-rasterbar currently broken for other reasons?

On a minor note ConvertUTF.cpp has a license issue that caused Debian to
remove libtorrent-rasterbar. Upstream is removing this file and
backporting it to an upcoming 1.2.9 release.

See: https://github.com/arvidn/libtorrent/issues/4951

More critically, I just noticed that the libtorrent-rasterbar that I
posted didn't fully use rsadowski@'s devel/boost patch.

I erroneously used:
--with-boost-python=boost_python3 \

instead of rsadowski@'s:
--with-boost-python=boost_python${MODPY_VERSION:C/\.//g} \

This meant that I linked against libboost_python3.so.10.0 instead of
libboost_python38.so.11.0.

This is a good test to see if deluge is using libtorrent correctly.
$ python3 -c "from deluge._libtorrent import lt; print(lt.version)"

Alternatively, check the `make update-plist' of deluge:

broken:
Warning: libtorrent (libtorrent-rasterbar) not found: Cannot load specified 
object
===>  Faking installation for deluge-2.0.3p1

good:
Info: Found libtorrent (1.2.3.0) installed.
===>  Faking installation for deluge-2.0.3p1

It seems like I am running into the same problem I encountered while
trying to move to python 3 bindings a while ago. I will keep poking at
this with the goal of getting libtorrent-rasterbar to link against the
1.67 boost python bindings.

In summary:
- libtorrent-rasterbar 1.2.8 linked against proposed devel/boost 1.67 is
broken. deluge starts in thin client mode.
- libtorrent-rasterbar 1.2.3 linked against old devel/boost 1.66
(libboost_python3.so.10.0) with devel/llvm 10.0.1 patch works.

> If
> possible, I'd prefer if we could update/fix base-clang instead of moving
> libtorrent-rasterbar to ports-clang.

Yes, this sounds good.

from old e-mail:

Nam Nguyen writes:
> boost 1.67 changes the python naming convention to be of the form
> libboost_python{27,37}.so.9.0. boost 1.67 also tries to allow building
> against multiple versions of python in one run of b2. While my initial
> approach was to try to backport 1.67 fixes alluded to in the changelog,
> I quickly abandoned this effort because I was not getting
> libtorrent-rasterbar to link properly. `make port-lib-depends-check'
> inside libtorrent-rasterbar would report that boost_python3 was
> unused. I suggest revisiting this during the next boost update.
>
> https://www.boost.org/users/history/version_1_67_0.html
> https://github.com/boostorg/python/commit/d4d41d94aecc9f8098aabd3587fcb95458451f71
>
> Python:
>
> The library name now includes the version suffix of the Python
> version used to compile it. For example, a variant compiled with
> Python 2.7 will produce library names boost_python27 and
> boost_numpy27, etc.. Combined with a related fix in Boost.Build,
> this means that it is now possible to build variants for multiple
> Python versions in a single build process.
>



回复: PATCH: p5-NetAddr-MAC update

2020-08-10 Thread wen heping
Would it better list p5-NetAddr-MAC in TEST_DEPENDS ?

wen

发件人: owner-po...@openbsd.org  代表 Mikolaj Kucharski 

发送时间: 2020年8月11日 2:19
收件人: ports@openbsd.org 
主题: PATCH: p5-NetAddr-MAC update

Hi,

- simple update, from Changes:

0.972020-06-28
- Set minimum perl version to 5.10
- No other changes

however there are a bit more changes, hence modbuild line in below diff.
Also new `random` method to generate random MAC-address based on provided
OUI argument.

- make test pass

All tests successful.
Files=22, Tests=319,  2 wallclock secs ( 0.07 usr  0.19 sys +  0.95 cusr 0.40 
csys =  1.61 CPU)
Result: PASS

- it seems upstream is migrating to Module::Build


Index: Makefile
===
RCS file: /cvs/ports/net/p5-NetAddr-MAC/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- Makefile3 Jul 2020 21:45:37 -   1.6
+++ Makefile10 Aug 2020 13:32:22 -
@@ -2,8 +2,7 @@

 COMMENT =   module to handle hardware MAC addresses

-DISTNAME = NetAddr-MAC-0.96
-REVISION = 0
+DISTNAME = NetAddr-MAC-0.97

 CATEGORIES =net

@@ -16,5 +15,7 @@ MODULES = cpan
 PKG_ARCH =  *

 BUILD_DEPENDS = devel/p5-Test-Trap
+
+CONFIGURE_STYLE =  modbuild

 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/p5-NetAddr-MAC/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo18 May 2018 19:10:41 -  1.3
+++ distinfo10 Aug 2020 13:32:22 -
@@ -1,2 +1,2 @@
-SHA256 (NetAddr-MAC-0.96.tar.gz) = AnuGy6VJd/nLnWXQfroBdcgs73vVzh+CrXQdadKs68I=
-SIZE (NetAddr-MAC-0.96.tar.gz) = 27538
+SHA256 (NetAddr-MAC-0.97.tar.gz) = ZYusCMRqZ8RdDt1f0oi+k8EKzk9QOQ6mlRmBVI6d3vw=
+SIZE (NetAddr-MAC-0.97.tar.gz) = 29720

--
Regards,
 Mikolaj



Re: something broke net/syncthing

2020-08-10 Thread Aaron Bieber
I hit this with go-ipfs too. 
https://github.com/lucas-clemente/quic-go/issues/2614

Not sure what the best course of action is.

PGP: 0x1F81112D62A9ADCE / 3586 3350 BFEA C101 DB1A  4AF0 1F81 112D 62A9 ADCE

On Mon, Aug 10, 2020, at 5:01 PM, Edd Barrett wrote:
> Hi all,
> 
> Just got a email from a user saying that syncthing is broken on the
> latest snapshot. Just checked and I can reproduce it:
> 
> ```
> $ syncthing
> panic: qtls.ClientSessionState not compatible with tls.ClientSessionState
> 
> goroutine 1 [running]:
> github.com/syncthing/syncthing/vendor/github.com/lucas-clemente/quic-go/internal/handshake.init.1()
> 
> /usr/obj/ports/syncthing-1.5.0/go/src/github.com/syncthing/syncthing/vendor/github.com/lucas-clemente/quic-go/internal/handshake/unsafe.go:20
>  +0x112
> ```
> 
> Note that I could only reproduce this when removing and reinstalling the
> package. There hasn't been an update to syncthing recently, so something
> else must have busted it.
> 
> I'm out of time tonight, but any ideas? Clang 10? Surely not.
> 
> CC abieber@ -- local golang guru.
> 
> -- 
> Best Regards
> Edd Barrett
> 
> http://www.theunixzoo.co.uk
>



something broke net/syncthing

2020-08-10 Thread Edd Barrett
Hi all,

Just got a email from a user saying that syncthing is broken on the
latest snapshot. Just checked and I can reproduce it:

```
$ syncthing
panic: qtls.ClientSessionState not compatible with tls.ClientSessionState

goroutine 1 [running]:
github.com/syncthing/syncthing/vendor/github.com/lucas-clemente/quic-go/internal/handshake.init.1()

/usr/obj/ports/syncthing-1.5.0/go/src/github.com/syncthing/syncthing/vendor/github.com/lucas-clemente/quic-go/internal/handshake/unsafe.go:20
 +0x112
```

Note that I could only reproduce this when removing and reinstalling the
package. There hasn't been an update to syncthing recently, so something
else must have busted it.

I'm out of time tonight, but any ideas? Clang 10? Surely not.

CC abieber@ -- local golang guru.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



Re: minor update: neovim to 0.4.4

2020-08-10 Thread Edd Barrett
On Mon, Aug 10, 2020 at 08:59:34PM +0100, Edd Barrett wrote:
> There is a pynvim-0.4.1 python binding, which I'd like to commit at the same
> time. I'll look at that shortly.

Diff for pynvim:


Index: Makefile
===
RCS file: /cvs/ports/editors/py-neovim/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile3 Jul 2020 21:12:53 -   1.9
+++ Makefile10 Aug 2020 22:45:05 -
@@ -2,10 +2,9 @@
 
 COMMENT =  Python plugin support for Neovim
 
-MODPY_EGG_VERSION =0.4.0
+MODPY_EGG_VERSION =0.4.1
 DISTNAME = pynvim-${MODPY_EGG_VERSION}
 PKGNAME =  py-neovim-${MODPY_EGG_VERSION}
-REVISION = 0
 
 CATEGORIES =   editors devel
 HOMEPAGE = https://github.com/neovim/python-client
@@ -28,9 +27,13 @@ TEST_DEPENDS =   devel/py-test${MODPY_FLA
${BASE_PKGPATH}=${MODPY_EGG_VERSION}
 
 # You may need to increase the file descriptor ulimits to run tests.
+#
+# Test suite hangs if $HOME isn't valid.
+#
 # Some failures:
 # https://github.com/neovim/pynvim/issues/416
 do-test:
-   cd ${WRKSRC} && ${LOCALBASE}/bin/py.test${MODPY_BIN_SUFFIX}
+   cd ${WRKSRC} && env HOME=${WRKDIR} \
+   ${LOCALBASE}/bin/py.test${MODPY_BIN_SUFFIX}
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/editors/py-neovim/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo20 Nov 2019 13:44:36 -  1.5
+++ distinfo10 Aug 2020 22:03:09 -
@@ -1,2 +1,2 @@
-SHA256 (pynvim-0.4.0.tar.gz) = cf2Lsyhd7tqMJZODBmIU4NUiqWv7PKSHEzOt/LRU6dY=
-SIZE (pynvim-0.4.0.tar.gz) = 39884
+SHA256 (pynvim-0.4.1.tar.gz) = VekY1mRlTPocmInT2+fGPp8zjfXUlHFmP3jVTIXoTFg=
+SIZE (pynvim-0.4.1.tar.gz) = 41939
Index: patches/patch-setup_py
===
RCS file: patches/patch-setup_py
diff -N patches/patch-setup_py
--- patches/patch-setup_py  21 Nov 2019 12:29:52 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,19 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1 2019/11/21 12:29:52 edd Exp $
-
-pytest-runner isn't actually required:
-https://github.com/neovim/pynvim/issues/417
-
-Index: setup.py
 setup.py.orig
-+++ setup.py
-@@ -8,9 +8,7 @@ install_requires = [
- 'msgpack>=0.5.0',
- ]
- 
--setup_requires = [
--'pytest-runner'
--]
-+setup_requires = []
- 
- tests_require = [
- 'pytest>=3.4.0',

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/08/10 16:36:15

Modified files:
mail/roundcubemail: Tag: OPENBSD_6_7 Makefile distinfo 
mail/roundcubemail/patches: Tag: OPENBSD_6_7 
patch-config_defaults_inc_php 

Log message:
update to roundcubemail-1.4.8, including XSS fixes



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/08/10 16:36:07

Modified files:
mail/roundcubemail: Makefile distinfo 

Log message:
update to roundcubemail-1.4.8, including XSS fixes



Re: amd64 bulk build failures 2020-08-10

2020-08-10 Thread Christian Weisgerber
Christian Weisgerber:

> Here is the list of build failures from the amd64 bulk build started
> on 2020-08-10.

2020-08-09 actually, not that it matters.

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



amd64 bulk build failures 2020-08-10

2020-08-10 Thread Christian Weisgerber
Here is the list of build failures from the amd64 bulk build started
on 2020-08-10.  These are the remaining LLVM 10 fallout:

devel/py-llvmlite,python3
devel/rttr
games/fs2open
net/bro
print/scribus
productivity/aqbanking
x11/gnustep/back
x11/gnustep/renaissance

I didn't upload new logs.  These are still the same failures as in
earlier builds:
http://build-failures.rhaalovely.net/amd64/2020-08-07/

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



Re: minor update: neovim to 0.4.4

2020-08-10 Thread Edd Barrett
On Mon, Aug 10, 2020 at 08:59:34PM +0100, Edd Barrett wrote:
> If cscope is installed, there is a test failure:
> https://gist.github.com/vext01/1599e2f83dbd7ec12f6abbc0479a6c03

Raised an issue here:
https://github.com/neovim/neovim/issues/12744

Will add a comment linking to this.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Edd Barrett
CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2020/08/10 15:34:45

Modified files:
math/py-netcdf4: Makefile 

Log message:
math/py-netcdf4: remove misspelt (thus ineffectual) PORT_HOME.

OK martin@ (MAINTAINER).



Re: minor update: neovim to 0.4.4

2020-08-10 Thread Edd Barrett
On Mon, Aug 10, 2020 at 08:59:34PM +0100, Edd Barrett wrote:
> New diff for neovim -- please test!

Something went wrong with that diff. Let's try again.


Index: Makefile
===
RCS file: /cvs/ports/editors/neovim/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile25 Apr 2020 10:07:41 -  1.20
+++ Makefile10 Aug 2020 19:55:28 -
@@ -4,7 +4,7 @@ COMMENT =   continuation and extension of 
 
 GH_ACCOUNT =   neovim
 GH_PROJECT =   neovim
-GH_TAGNAME =   v0.4.3
+GH_TAGNAME =   v0.4.4
 
 CATEGORIES =   editors devel
 HOMEPAGE = https://neovim.io
@@ -101,9 +101,6 @@ pre-configure:
 
 # These are the "old tests". There is also a new suite, but we would need the
 # "busted" test suite for Lua, which is not yet ported.
-#
-# There is currently one (minor) test failure:
-# https://github.com/neovim/neovim/issues/10420
 do-test:
cd ${WRKSRC}/src/nvim/testdir && ${SETENV} LC_CTYPE=en_US.UTF-8 \
${MAKE_PROGRAM} NVIM_PRG=${WRKBUILD}/bin/nvim ${MAKE_FLAGS}
Index: distinfo
===
RCS file: /cvs/ports/editors/neovim/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo20 Nov 2019 13:43:35 -  1.7
+++ distinfo10 Aug 2020 18:52:17 -
@@ -1,4 +1,4 @@
 SHA256 (luv-1.30.1-1.tar.gz) = Tih77W9R/VDOA7p/qMwz2E4bnLhpEcSBK7H0eh4+0So=
-SHA256 (neovim-0.4.3.tar.gz) = kaC10yIEqCG/QUaQ5rSM9pIk0ZYdNxWMKzg/amz4VNI=
+SHA256 (neovim-0.4.4.tar.gz) = L3aqxZNjZ383WS6FOrLAYVHMqIMNSz/kZ1tKUtQfxCw=
 SIZE (luv-1.30.1-1.tar.gz) = 1354232
-SIZE (neovim-0.4.3.tar.gz) = 9556199
+SIZE (neovim-0.4.4.tar.gz) = 9558246
Index: patches/patch-src_nvim_CMakeLists_txt
===
RCS file: /cvs/ports/editors/neovim/patches/patch-src_nvim_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_nvim_CMakeLists_txt
--- patches/patch-src_nvim_CMakeLists_txt   17 Mar 2019 13:13:40 -  
1.2
+++ patches/patch-src_nvim_CMakeLists_txt   10 Aug 2020 18:54:08 -
@@ -6,7 +6,7 @@ luajit (we use lua instead).
 Index: src/nvim/CMakeLists.txt
 --- src/nvim/CMakeLists.txt.orig
 +++ src/nvim/CMakeLists.txt
-@@ -362,10 +362,6 @@ endforeach()
+@@ -366,10 +366,6 @@ endforeach()
  
  # Our dependencies come first.
  
Index: patches/patch-src_nvim_testdir_test_python2_vim
===
RCS file: patches/patch-src_nvim_testdir_test_python2_vim
diff -N patches/patch-src_nvim_testdir_test_python2_vim
--- patches/patch-src_nvim_testdir_test_python2_vim 1 Jul 2018 14:16:29 
-   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_nvim_testdir_test_python2_vim,v 1.1 2018/07/01 14:16:29 
edd Exp $
-
-Skip a known failing test until fixed upstream:
-https://github.com/neovim/neovim/issues/8554
-
-Index: src/nvim/testdir/test_python2.vim
 src/nvim/testdir/test_python2.vim.orig
-+++ src/nvim/testdir/test_python2.vim
-@@ -1,6 +1,8 @@
- " Test for python 2 commands.
- " TODO: move tests from test87.in here.
- 
-+finish
-+
- if !has('python')
-   finish
- endif
Index: patches/patch-src_nvim_testdir_test_python3_vim
===
RCS file: patches/patch-src_nvim_testdir_test_python3_vim
diff -N patches/patch-src_nvim_testdir_test_python3_vim
--- patches/patch-src_nvim_testdir_test_python3_vim 1 Jul 2018 14:16:29 
-   1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_nvim_testdir_test_python3_vim,v 1.1 2018/07/01 14:16:29 
edd Exp $
-
-Skip a known failing test until fixed upstream:
-https://github.com/neovim/neovim/issues/8554
-
-Index: src/nvim/testdir/test_python3.vim
 src/nvim/testdir/test_python3.vim.orig
-+++ src/nvim/testdir/test_python3.vim
-@@ -1,6 +1,8 @@
- " Test for python 2 commands.
- " TODO: move tests from test88.in here.
- 
-+finish
-+
- if !has('python3')
-   finish
- endif

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Solene Rapenne
CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2020/08/10 15:10:35

Modified files:
games/openttd  : Makefile distinfo 

Log message:
Update to openttd-1.10.3

ok paco@ bentley@



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Sebastian Reitenbach
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2020/08/10 14:45:07

Modified files:
sysutils/facter: Makefile distinfo 

Log message:
simple update 3.14.11 -> 3.14.12



Re: minor update: neovim to 0.4.4

2020-08-10 Thread Edd Barrett
On Mon, Aug 10, 2020 at 07:57:50AM -0700, Travis Cole wrote:
> > I also removed the comment about a single test failure because that
> > is fixed now. I get a clean 'make test'.

The patches needed regenerating; nothing more than 'make update-patches'
though.

The Python test skipping doesn't seem to be needed any more either, so
remove those patches.

If cscope is installed, there is a test failure:
https://gist.github.com/vext01/1599e2f83dbd7ec12f6abbc0479a6c03

^ I'll report that upstream. I don't think it should block the update.

There is a pynvim-0.4.1 python binding, which I'd like to commit at the same
time. I'll look at that shortly.


New diff for neovim -- please test!

Index: Makefile
===
RCS file: /cvs/ports/editors/neovim/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile 25 Apr 2020 10:07:41 - 1.20
+++ Makefile 10 Aug 2020 19:55:28 -
@@ -4,7 +4,7 @@ COMMENT = continuation and extension of 
 
 GH_ACCOUNT = neovim
 GH_PROJECT = neovim
-GH_TAGNAME = v0.4.3
+GH_TAGNAME = v0.4.4
 
 CATEGORIES = editors devel
 HOMEPAGE = https://neovim.io
@@ -101,9 +101,6 @@ pre-configure:
 
 # These are the "old tests". There is also a new suite, but we would need the
 # "busted" test suite for Lua, which is not yet ported.
-#
-# There is currently one (minor) test failure:
-# https://github.com/neovim/neovim/issues/10420
 do-test:
  cd ${WRKSRC}/src/nvim/testdir && ${SETENV} LC_CTYPE=en_US.UTF-8 \
   ${MAKE_PROGRAM} NVIM_PRG=${WRKBUILD}/bin/nvim ${MAKE_FLAGS}
Index: distinfo
===
RCS file: /cvs/ports/editors/neovim/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo 20 Nov 2019 13:43:35 - 1.7
+++ distinfo 10 Aug 2020 18:52:17 -
@@ -1,4 +1,4 @@
 SHA256 (luv-1.30.1-1.tar.gz) = Tih77W9R/VDOA7p/qMwz2E4bnLhpEcSBK7H0eh4+0So=
-SHA256 (neovim-0.4.3.tar.gz) = kaC10yIEqCG/QUaQ5rSM9pIk0ZYdNxWMKzg/amz4VNI=
+SHA256 (neovim-0.4.4.tar.gz) = L3aqxZNjZ383WS6FOrLAYVHMqIMNSz/kZ1tKUtQfxCw=
 SIZE (luv-1.30.1-1.tar.gz) = 1354232
-SIZE (neovim-0.4.3.tar.gz) = 9556199
+SIZE (neovim-0.4.4.tar.gz) = 9558246
Index: patches/patch-src_nvim_CMakeLists_txt
===
RCS file: /cvs/ports/editors/neovim/patches/patch-src_nvim_CMakeLists_txt,v
retrieving revision 1.2
diff -u -p -r1.2 patch-src_nvim_CMakeLists_txt
--- patches/patch-src_nvim_CMakeLists_txt 17 Mar 2019 13:13:40 - 1.2
+++ patches/patch-src_nvim_CMakeLists_txt 10 Aug 2020 18:54:08 -
@@ -6,7 +6,7 @@ luajit (we use lua instead).
 Index: src/nvim/CMakeLists.txt
 --- src/nvim/CMakeLists.txt.orig
 +++ src/nvim/CMakeLists.txt
-@@ -362,10 +362,6 @@ endforeach()
+@@ -366,10 +366,6 @@ endforeach()
  
  # Our dependencies come first.
  
Index: patches/patch-src_nvim_testdir_test_python2_vim
===
RCS file: patches/patch-src_nvim_testdir_test_python2_vim
diff -N patches/patch-src_nvim_testdir_test_python2_vim
--- patches/patch-src_nvim_testdir_test_python2_vim 1 Jul 2018 14:16:29 - 
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_nvim_testdir_test_python2_vim,v 1.1 2018/07/01 14:16:29 
edd Exp $
-
-Skip a known failing test until fixed upstream:
-https://github.com/neovim/neovim/issues/8554
-
-Index: src/nvim/testdir/test_python2.vim
 src/nvim/testdir/test_python2.vim.orig
-+++ src/nvim/testdir/test_python2.vim
-@@ -1,6 +1,8 @@
- " Test for python 2 commands.
- " TODO: move tests from test87.in here.
- 
-+finish
-+
- if !has('python')
-   finish
- endif
Index: patches/patch-src_nvim_testdir_test_python3_vim
===
RCS file: patches/patch-src_nvim_testdir_test_python3_vim
diff -N patches/patch-src_nvim_testdir_test_python3_vim
--- patches/patch-src_nvim_testdir_test_python3_vim 1 Jul 2018 14:16:29 - 
1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,17 +0,0 @@
-$OpenBSD: patch-src_nvim_testdir_test_python3_vim,v 1.1 2018/07/01 14:16:29 
edd Exp $
-
-Skip a known failing test until fixed upstream:
-https://github.com/neovim/neovim/issues/8554
-
-Index: src/nvim/testdir/test_python3.vim
 src/nvim/testdir/test_python3.vim.orig
-+++ src/nvim/testdir/test_python3.vim
-@@ -1,6 +1,8 @@
- " Test for python 2 commands.
- " TODO: move tests from test88.in here.
- 
-+finish
-+
- if !has('python3')
-   finish
- endif


-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



Re: i386/LLVM 10

2020-08-10 Thread Stuart Henderson
On 2020/08/08 19:54, Christian Weisgerber wrote:
> On 2020-08-08, Stuart Henderson  wrote:
> 
> > Updated failure logs. Many of these are broken on amd64 too, but
> > some are not.
> 
> # comments
> 
> > built packages
> > build failures: 23
> > databases/mariadb
> > databases/pgadmin3  # amd64
> > devel/geany
> > devel/py-llvmlite   # amd64
> > devel/rttr  # amd64
> > devel/woboq_codebrowser # FIXED
> > emulators/ppsspp# FIXED
> > games/fs2open   # amd64
> > geo/pgrouting
> > graphics/dia# amd64
> > mail/rspamd # amd64
> > multimedia/libtheoraplay
> > net/bro # amd64
> > net/fastnetmon
> > net/haproxy
> > net/knot
> > net/libtorrent-rasterbar# amd64, will be fixed by LLVM 10.0.1
> > shells/nsh  # FIXED, unrelated to LLVM
> > sysutils/xxhash
> > textproc/wkhtmltopdf
> > www/webkitgtk4
> > x11/gnustep/back# amd64
> > x11/gnustep/renaissance # amd64

With MariaDB fixed (and maybe something else) we can reach more failures.
Build is still running, thought I would send this first batch now rather
than wait 14h until it finished plus however long it takes me to send
mail.

geo/qgis

FAILED: output/bin/qgis_sqlcomposerdialog 
: && /pobj/qgis-3.14.1/bin/c++  -O2 -pipe -Wall -Wextra -Wno-long-long 
-Wformat-security -Wno-strict-aliasing -Wnon-virtual-dtor -Wno-redundant-move 
-Wno-return-type-c-linkage -Wno-overloaded-virtual -Wimplicit-fallthrough 
-Qunused-arguments -DNDEBUG  -Qunused-arguments 
tests/src/gui/CMakeFiles/qgis_sqlcomposerdialog.dir/qgis_sqlcomposerdialog_autogen/mocs_compilation.cpp.o
 
tests/src/gui/CMakeFiles/qgis_sqlcomposerdialog.dir/testqgssqlcomposerdialog.cpp.o
  -o output/bin/qgis_sqlcomposerdialog -L/pobj/qgis-3.14.1/build-i386/src/core  
 -L/pobj/qgis-3.14.1/build-i386/src/gui   -L/usr/local/lib/qt5/.   
-L/usr/local/lib   -L/pobj/qgis-3.14.1/build-i386/output/lib   
-L/usr/local/lib/qt5   -L/usr/lib   -L/usr/X11R6/lib 
-Wl,-z,origin,-rpath,/pobj/qgis-3.14.1/build-i386/src/core:/pobj/qgis-3.14.1/build-i386/src/gui:/usr/local/lib/qt5/.:/pobj/qgis-3.14.1/build-i386/output/lib:/usr/local/lib/qt5:/usr/local/lib:/usr/X11R6/lib
  -lQt5Test  -lproj  -lgeos_c  -lgdal  -lqwt-qt5  -lqgis_analysis  -lqgis_gui  
-lqgis_native  -lexiv2  -lqwt-qt5  -lqgis_core  -lQt5Xml -lQt5Svg  
-lQt5WebKitWidgets  -lQt5WebKit  -lQt5PrintSupport  -lQt5Sql  -lQt5Concurrent  
-lqca-qt5  -lqt5keychain  -lproj  -lgeos_c  -lgdal  -lspatialindex  -lexpat  
-lsqlite3  -lspatialite  -lzip  -lprotobuf-lite  -lz  -lQt5SerialPort  
-lQt5Positioning  -lQt5DBus  /usr/local/lib/qt5/./libQt5UiTools.a  -lQt5Widgets 
 -lQt5Gui  -lQt5Core  -lGL  -lQt5Widgets  -lQt5Gui  -lQt5Core  -lGL  
-lqscintilla2_qt5  -lQt5QuickWidgets  -lQt5Widgets  -lQt5Quick  -lQt5Gui  
-lQt5Qml  -lQt5Network  -lQt5Core  -Wl,-z,wxneeded  
-Wl,-rpath-link,/usr/local/lib/qt5:/usr/local/lib:/usr/X11R6/lib && :
ld: error: /usr/local/lib/libqscintilla2_qt5.so.1.0: undefined reference to 
Scintilla::RunStyles::SetValueAt(long, char)
ld: error: /usr/local/lib/libqscintilla2_qt5.so.1.0: undefined reference to 
Scintilla::RunStyles::DeleteRange(long, long)
ld: error: /usr/local/lib/libqscintilla2_qt5.so.1.0: undefined reference to 
Scintilla::RunStyles::InsertSpace(long, long)
[...]

x11/qt4

ld: error: relocation R_386_PC32 cannot be used against symbol cti_vm_throw; 
recompile with -fPIC
>>> defined in ../../JavaScriptCore/release/libjscore.a(JITStubs.o)
>>> referenced by JITStubs.cpp
>>>   JITStubs.o:(.text+0x21) in archive 
>>> ../../JavaScriptCore/release/libjscore.a



UPDATE textproc/py-mistune-0.8.4

2020-08-10 Thread Björn Ketelaars
A pending update of devel/py-nbconvert depends on a newer version of
py-mistune than we have in ports. As such, diff below updates py-mistune
to the latest version (0.8.4). Changes:
https://github.com/lepture/mistune/releases/tag/v0.8.4

Patch has been dropped as it is no longer relevant

Testing:
- 'make test' runs successfully:
  18 passed, 2 xfailed, 2 warnings in 0.72 seconds
- Build tested all consumers (see below)
- Regression tests of consumers run successfully

  LIB_DEPENDS
  BUILD_DEPENDS
  RUN_DEPENDS
/usr/ports/textproc/py-m2r
/usr/ports/textproc/py-m2rython3
/usr/ports/devel/py-nbconvertython3
  TEST_DEPENDS
/usr/ports/textproc/py-m2r
/usr/ports/textproc/py-m2rython3
/usr/ports/devel/py-nbconvertython3

Comments/OK?


diff --git Makefile Makefile
index 0c98af2e759..4587d90ffca 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,9 @@
 
 COMMENT =  markdown parser for Python
 
-MODPY_EGG_VERSION =0.7.4
+MODPY_EGG_VERSION =0.8.4
 DISTNAME = mistune-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 2
 
 CATEGORIES =   textproc
 
diff --git distinfo distinfo
index b50bdbc932d..563e767006a 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (mistune-0.7.4.tar.gz) = hRevn1zRhXu4P5oj2nWqUW11OMMqLF1cVvN4mp5M0i8=
-SIZE (mistune-0.7.4.tar.gz) = 49304
+SHA256 (mistune-0.8.4.tar.gz) = WaNCnbU8ULXGvMigf4hIywDX3IvbQxpKtBkg0gHUdW4=
+SIZE (mistune-0.8.4.tar.gz) = 58322
diff --git patches/patch-setup_py patches/patch-setup_py
deleted file mode 100644
index 51330a6..000
--- patches/patch-setup_py
+++ /dev/null
@@ -1,20 +0,0 @@
-$OpenBSD: patch-setup_py,v 1.1.1.1 2015/10/22 19:49:09 edd Exp $
-
-Disable cython for now. Will make it easier to port to Python3 on OpenBSD.
-
 setup.py.orig  Mon Oct 19 21:50:54 2015
-+++ setup.py   Mon Oct 19 21:51:12 2015
-@@ -13,11 +13,8 @@ from setuptools import setup, Extension
- 
- cmdclass = {}
- 
--try:
--from Cython.Distutils import build_ext
--except ImportError:
--have_cython = False
--else:
-+have_cython = False
-+if False:
- have_cython = True
- import sys
- 



Re: Update: fonts/iosevka-fonts 2.3.3 -> 3.0.1

2020-08-10 Thread Edd Barrett
On Sat, Aug 08, 2020 at 03:38:29AM -0600, Anthony J. Bentley wrote:
> I would much prefer that pkgname simply come from distname. So the pkgnames
> would be: iosevka{,-slab,-curly,-curly-slab,-ss01,-aile,-etoile,-sparkle}
> 
> Ditto for SUBDIR...

Agreed!

I think the attached is correct, but please check carefully.

(Also updated to latest version)

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk
Index: Makefile
===
RCS file: /cvs/ports/fonts/iosevka-fonts/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile6 Mar 2020 19:32:35 -   1.1.1.1
+++ Makefile10 Aug 2020 19:25:57 -
@@ -1,46 +1,20 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2020/03/06 19:32:35 edd Exp $
 
-COMMENT-main = slender typeface for code (default variant)
-COMMENT-term = slender typeface for code (term variant)
+# There are many different variants of Iosevka. We only package a subset of
+# them, but the layout of the port is designed for more to be added if need be.
+#
+# Each SUBDIR is one "variant" and because we use the TTC fonts (which allow
+# glyphs to be shared, thus saving space) each variant contains all of the
+# various "spacing variants".
+#
+# For details on variants and spacing variants, see:
+# https://github.com/be5invis/Iosevka/releases
+#
+# When adding a new variant, please use a SUBDIR whose name matches the suffix
+# on the DISTFILE, e.g. 'SUBDIR += slab' for 'ttc-iosevka-slab-x.y.z.zip'.
+# Similarly for the PKGNAME suffix.
 
-V =2.3.3
-PKGNAME =  iosevka-fonts-default-${V}
-PKGNAME-main = ${PKGNAME}
-PKGNAME-term = iosevka-fonts-term-${V}
+SUBDIR =
+SUBDIR += default
 
-# The font has many different variants. We are only packaging the 'default'
-# variant (for general use) and the 'term' variant (designed for monospace
-# terminals), but more could be added later if need be. See the releases page
-# on Github for a complete list.
-DISTFILES =01-iosevka-${V}${EXTRACT_SUFX} \
-   02-iosevka-term-${V}${EXTRACT_SUFX}
-
-CATEGORIES =   fonts x11
-
-HOMEPAGE = https://github.com/be5invis/iosevka
-
-MAINTAINER =   Edd Barrett 
-
-# SIL OFL 1.1
-PERMIT_PACKAGE =   Yes
-
-MASTER_SITES = 
https://github.com/be5invis/iosevka/releases/download/v${V}/
-EXTRACT_SUFX = .zip
-
-MULTI_PACKAGES =   -main -term
-
-NO_BUILD = Yes
-NO_TEST =  Yes
-
-# distfile is a zip bomb.
-WRKDIST =  ${WRKDIR}
-
-PKG_ARCH = *
-
-FONTDIR =  ${PREFIX}/share/fonts/iosevka
-
-do-install:
-   ${INSTALL_DATA_DIR} ${FONTDIR}
-   ${INSTALL_DATA} ${WRKDIST}/ttf/*.ttf ${FONTDIR}
-
-.include 
+.include 
Index: Makefile.inc
===
RCS file: Makefile.inc
diff -N Makefile.inc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ Makefile.inc10 Aug 2020 19:30:20 -
@@ -0,0 +1,22 @@
+# $OpenBSD$
+
+V =3.4.1
+CATEGORIES =   fonts x11
+HOMEPAGE = https://github.com/be5invis/iosevka
+MAINTAINER =   Edd Barrett 
+
+# SIL OFL 1.1
+PERMIT_PACKAGE =Yes
+
+MASTER_SITES = https://github.com/be5invis/iosevka/releases/download/v${V}/
+EXTRACT_SUFX = .zip
+
+NO_BUILD = Yes
+NO_TEST =  Yes
+
+# distfiles are zip bombs.
+WRKDIST =  ${WRKDIR}
+
+PKG_ARCH = *
+
+FONTDIR =  ${PREFIX}/share/fonts/iosevka
Index: distinfo
===
RCS file: distinfo
diff -N distinfo
--- distinfo6 Mar 2020 19:32:35 -   1.1.1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,4 +0,0 @@
-SHA256 (01-iosevka-2.3.3.zip) = zI3jyld7ih1JR9zN//ggUELkefAiOldN41kn4T9Qb5A=
-SHA256 (02-iosevka-term-2.3.3.zip) = 
APzmF0BfzNf79zFtrdP2s8yx4nbykQ6anN4S4/BYtNc=
-SIZE (01-iosevka-2.3.3.zip) = 20624208
-SIZE (02-iosevka-term-2.3.3.zip) = 16093865
Index: default/Makefile
===
RCS file: default/Makefile
diff -N default/Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ default/Makefile10 Aug 2020 18:55:54 -
@@ -0,0 +1,11 @@
+# $OpenBSD$
+
+COMMENT =  slender typeface for code (default variant)
+PKGNAME =  iosevka-fonts-${V}
+DISTFILES =ttc-iosevka-${V}${EXTRACT_SUFX}
+
+do-install:
+   ${INSTALL_DATA_DIR} ${FONTDIR}
+   ${INSTALL_DATA} ${WRKDIST}/*.ttc ${FONTDIR}
+
+.include 
Index: default/distinfo
===
RCS file: default/distinfo
diff -N default/distinfo
--- /dev/null   1 Jan 1970 00:00:00 -
+++ default/distinfo10 Aug 2020 19:32:26 -
@@ -0,0 +1,2 @@
+SHA256 (ttc-iosevka-3.4.1.zip) = OBvAjPn4TZB/BsG+RZ379/4/N+z1WgAqf21a9G3RCd8=
+SIZE (ttc-iosevka-3.4.1.zip) = 19746588
Index: 

Re: [MAINTAINER UPDATE] games/freebee 1.7

2020-08-10 Thread Brian Callahan


On Monday, August 10, 2020 11:29 AM, Tracey Emery  
wrote:

> Hello,
>
> Here is a small bump to games/freebee, bringing us to 1.7.
>
> ChangeLog
>
> Switch to the Public Domain ENABLE dictionary.
>
> Working fine on amd64.
>
> Ok?
>

ok



Re: py-netCDF4 and PORTHOME

2020-08-10 Thread Martin Reindl
Am 10.08.20 um 21:05 schrieb Edd Barrett:
> Hi,
> 
> math/py-netcdf4 has a misspelling of PORTHOME (with an underscore).
> 
> I guess it can be removed?
> 
> MAINTAINER in CC.
> 

You are right, it can be removed. OK martin@



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/08/10 13:28:41

Modified files:
games/py-minecraft-launcher-lib: Makefile 

Log message:
This needs py-requests as a BUILD_DEPENDS in addition to being a RUN_DEPENDS

Discovered by my test bulk cluster and naddy about the same time. :)



py-netCDF4 and PORTHOME

2020-08-10 Thread Edd Barrett
Hi,

math/py-netcdf4 has a misspelling of PORTHOME (with an underscore).

I guess it can be removed?

MAINTAINER in CC.

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



Re: NEW devel/py-pebble

2020-08-10 Thread Björn Ketelaars
On Mon 10/08/2020 20:10, Bjorn Ketelaars wrote:
> I would like to import py-pebble, which is needed for a future update of
> devel/py-nbconvert.
> 
> DESCR:
> Pebble aims to help managing threads and processes in an easier
> way. It wraps Python’s standard library threading and multiprocessing
> objects.
> 
> Output 'make test':
> === 79 passed, 162 skipped in 12.73 seconds 
> 
> 
> OK?

Oops, DESCR contained an unicode character. New tarball enclosed.


py-pebble.tgz
Description: application/tar-gz


CVS: cvs.openbsd.org: ports

2020-08-10 Thread Todd C . Miller
CVSROOT:/cvs
Module name:ports
Changes by: mill...@cvs.openbsd.org 2020/08/10 12:20:21

Modified files:
editors/nvi: Makefile distinfo 
Added files:
editors/nvi/patches: patch-CMakeLists_txt 
Removed files:
editors/nvi/patches: patch-build_CMakeLists_txt patch-cl_cl_h 
 patch-common_common_h patch-common_exf_h 
 patch-ex_ex_h patch-vi_vi_h 

Log message:
Update nvi to version 2.2.0.
They have moved to out-of-source builds so we can remove most of
our patches.  OK bentley@



PATCH: p5-NetAddr-MAC update

2020-08-10 Thread Mikolaj Kucharski
Hi,

- simple update, from Changes:

0.972020-06-28
- Set minimum perl version to 5.10
- No other changes

however there are a bit more changes, hence modbuild line in below diff.
Also new `random` method to generate random MAC-address based on provided
OUI argument.

- make test pass

All tests successful.
Files=22, Tests=319,  2 wallclock secs ( 0.07 usr  0.19 sys +  0.95 cusr 0.40 
csys =  1.61 CPU)
Result: PASS

- it seems upstream is migrating to Module::Build


Index: Makefile
===
RCS file: /cvs/ports/net/p5-NetAddr-MAC/Makefile,v
retrieving revision 1.6
diff -u -p -u -r1.6 Makefile
--- Makefile3 Jul 2020 21:45:37 -   1.6
+++ Makefile10 Aug 2020 13:32:22 -
@@ -2,8 +2,7 @@
 
 COMMENT =  module to handle hardware MAC addresses
 
-DISTNAME = NetAddr-MAC-0.96
-REVISION = 0
+DISTNAME = NetAddr-MAC-0.97
 
 CATEGORIES =   net
 
@@ -16,5 +15,7 @@ MODULES = cpan
 PKG_ARCH = *
 
 BUILD_DEPENDS =devel/p5-Test-Trap
+
+CONFIGURE_STYLE =  modbuild
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/net/p5-NetAddr-MAC/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo18 May 2018 19:10:41 -  1.3
+++ distinfo10 Aug 2020 13:32:22 -
@@ -1,2 +1,2 @@
-SHA256 (NetAddr-MAC-0.96.tar.gz) = AnuGy6VJd/nLnWXQfroBdcgs73vVzh+CrXQdadKs68I=
-SIZE (NetAddr-MAC-0.96.tar.gz) = 27538
+SHA256 (NetAddr-MAC-0.97.tar.gz) = ZYusCMRqZ8RdDt1f0oi+k8EKzk9QOQ6mlRmBVI6d3vw=
+SIZE (NetAddr-MAC-0.97.tar.gz) = 29720

-- 
Regards,
 Mikolaj



NEW devel/py-pebble

2020-08-10 Thread Bjorn Ketelaars
I would like to import py-pebble, which is needed for a future update of
devel/py-nbconvert.

DESCR:
Pebble aims to help managing threads and processes in an easier
way. It wraps Python’s standard library threading and multiprocessing
objects.

Output 'make test':
=== 79 passed, 162 skipped in 12.73 seconds 

OK?


py-pebble.tgz
Description: application/tar-gz


CVS: cvs.openbsd.org: ports

2020-08-10 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2020/08/10 11:00:50

Modified files:
cad/qcad   : Makefile 
Added files:
cad/qcad/patches: patch-src_core_RDebug_cpp 

Log message:
Don't use backtrace/backtrace_symbols, fixes the build with llvm10



Re: update devel/poedit to 2.4

2020-08-10 Thread Omar Polo


> Hello ports,
>
> The attached diff updates devel/poedit to the latest release.  The
> changelog for this version is:
>
> 1. Crowdin integration was greatly improved and now supports editing of
>any kind of localization: files from Crowdin projects, not just POs.
> 2. Improvements to editor user interface.
> 3. [macOS] Fixes to light/dark mode switching.
>
> 1) and 3) does not affects this ports, as crowdin integration is
> disabled (we miss a port for C++ rest), but the 2) is interesting, since
> I'm finally able to read the "Notes for translators".
>
> To successfully build without the C++ rest library the added patch is
> necessary.  Upstream already half-fixed it, see github pr 653[0].
>
> Cheers!
>
> [0]: https://github.com/vslavik/poedit/pull/653

ping :)

Upstream committed also the other half of the patch.  Diff reattached
for convenience.


Index: Makefile
===
RCS file: /cvs/ports/devel/poedit/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile5 Jul 2020 09:30:52 -   1.32
+++ Makefile10 Aug 2020 16:58:39 -
@@ -2,7 +2,7 @@
 
 COMMENT=   cross-platform gettext catalogs (PO-files) editor
 
-V= 2.3.1
+V= 2.4
 DISTNAME=  poedit-${V}
 CATEGORIES=devel
 
Index: distinfo
===
RCS file: /cvs/ports/devel/poedit/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo5 Jul 2020 09:30:52 -   1.5
+++ distinfo10 Aug 2020 16:58:39 -
@@ -1,2 +1,2 @@
-SHA256 (poedit-2.3.1.tar.gz) = oDFcpSqQi56gpuQ46mDOHpLZjB9Hf+1Y0LTmF+Ua/sQ=
-SIZE (poedit-2.3.1.tar.gz) = 2891956
+SHA256 (poedit-2.4.tar.gz) = smmyOWHdxPWOQdTc70UVs43U9Gf62my8MM/uM0a/jNc=
+SIZE (poedit-2.4.tar.gz) = 2905290
Index: patches/patch-src_crowdin_gui_h
===
RCS file: patches/patch-src_crowdin_gui_h
diff -N patches/patch-src_crowdin_gui_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_crowdin_gui_h 10 Aug 2020 16:58:39 -
@@ -0,0 +1,32 @@
+$OpenBSD$
+
+Fix compilation if !HAVE_HTTP_CLIENT.  See github pr #653
+
+Index: src/crowdin_gui.h
+--- src/crowdin_gui.h.orig
 src/crowdin_gui.h
+@@ -26,9 +26,10 @@
+ #ifndef Poedit_crowdin_gui_h
+ #define Poedit_crowdin_gui_h
+ 
++#include "catalog.h"
++
+ #ifdef HAVE_HTTP_CLIENT
+ 
+-#include "catalog.h"
+ #include "cloud_sync.h"
+ #include "customcontrols.h"
+ 
+@@ -120,6 +121,12 @@ void CrowdinOpenFile(wxWindow *parent, std::function catalog,
+  std::function)> onDone);
++
++#else // !HAVE_HTTP_CLIENT
++
++// convenience stubs to avoid additional checks all over other code:
++inline bool CanSyncWithCrowdin(CatalogPtr) { return false; }
++inline bool ShouldSyncToCrowdinAutomatically(CatalogPtr) { return false; }
+ 
+ #endif // HAVE_HTTP_CLIENT
+ 



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2020/08/10 10:53:56

Modified files:
www/webkitgtk4 : Makefile 
www/webkitgtk4/patches: 
patch-Source_JavaScriptCore_runtime_Options_cpp 

Log message:
Tentative llvm10 fix for webkitgtk4 on i386

Looks like the same failure that happened on powerpc can also happen on
i386, so always compile the missing function when building on OpenBSD
(not just on 64 bits systems).  Maybe a C++ type mismatch between us and
other systems.

powerpc test by cwen@, ok cwen@ ajacoutot@ (maintainer)



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Tracey Emery
CVSROOT:/cvs
Module name:ports
Changes by: tra...@cvs.openbsd.org  2020/08/10 10:16:15

Modified files:
net/thingsd: Makefile distinfo 

Log message:
Update to 3.0.2.

ok bket, kmos



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Tracey Emery
CVSROOT:/cvs
Module name:ports
Changes by: tra...@cvs.openbsd.org  2020/08/10 10:15:44

Modified files:
games/freebee  : Makefile distinfo 
games/freebee/pkg: PLIST 

Log message:
Update to 1.7.

ok bcallah, kmos



Update games/openttd

2020-08-10 Thread Solene Rapenne
This update openttd to 1.10.3 which is a minor update

https://cdn.openttd.org/openttd-releases/1.10.3/changelog.txt

game runs fine on amd64

Index: Makefile
===
RCS file: /home/reposync/ports/games/openttd/Makefile,v
retrieving revision 1.69
diff -u -p -r1.69 Makefile
--- Makefile15 Jun 2020 11:20:09 -  1.69
+++ Makefile10 Aug 2020 10:05:05 -
@@ -2,7 +2,7 @@
 
 COMMENT=   open source clone of the game Transport Tycoon Deluxe
 
-V =1.10.2
+V =1.10.3
 DISTNAME = openttd-$V-source
 PKGNAME =  openttd-$V
 
Index: distinfo
===
RCS file: /home/reposync/ports/games/openttd/distinfo,v
retrieving revision 1.36
diff -u -p -r1.36 distinfo
--- distinfo15 Jun 2020 11:20:09 -  1.36
+++ distinfo10 Aug 2020 10:05:14 -
@@ -1,2 +1,2 @@
-SHA256 (openttd/openttd-1.10.2-source.tar.xz) = 
k5xV0ln7E8tH37MkTo97ni9yOIPrshGUENiignJOtvU=
-SIZE (openttd/openttd-1.10.2-source.tar.xz) = 6766904
+SHA256 (openttd/openttd-1.10.3-source.tar.xz) = 
wRYB71R+sfbU+aA1vRngp2C0eHLOfZtBF6qkWsN3tTs=
+SIZE (openttd/openttd-1.10.3-source.tar.xz) = 6815924



Re: upgrade port libvips to 8.10.0

2020-08-10 Thread Stuart Henderson
On 2020/08/10 16:33, Stephane Guedon wrote:
> Hello all.
> 
> This is to tell about the port upgrade of libvips 8.10.0. To me it looks 
> like it's just a little bump upgrade, therefor just updating the version 
> number.
> 
> It builds fine for me.
> 
> Any comments ? Does it blocks for someone ?
> 
> Thanks and good day.

Please send a diff.



Re: [MAINTAINER UPDATE] net/thingsd 3.0.2

2020-08-10 Thread Bjorn Ketelaars
On Mon 10/08/2020 09:33, Tracey Emery wrote:
> Hello,
> 
> This brings net/thingsd to 3.0.2.
> 
> This release cleans up some code and fixes a free on subscription names.
> 
> This is running fine on amd64.
> 
> Ok?

OK bket@



CVS: cvs.openbsd.org: ports

2020-08-10 Thread James Turner
CVSROOT:/cvs
Module name:ports
Changes by: jtur...@cvs.openbsd.org 2020/08/10 09:34:03

Modified files:
www/openradtool: Makefile distinfo 

Log message:
Update openradtool to 0.9.1



[MAINTAINER UPDATE] net/thingsd 3.0.2

2020-08-10 Thread Tracey Emery
Hello,

This brings net/thingsd to 3.0.2.

This release cleans up some code and fixes a free on subscription names.

This is running fine on amd64.

Ok?
-- 

Tracey Emery

Index: Makefile
===
RCS file: /cvs/ports/net/thingsd/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- Makefile27 Jul 2020 20:09:12 -  1.4
+++ Makefile10 Aug 2020 14:08:00 -
@@ -5,7 +5,7 @@ CATEGORIES =net
 
 GH_ACCOUNT =   basepr1me
 GH_PROJECT =   thingsd
-GH_TAGNAME =   3.0.1
+GH_TAGNAME =   3.0.2
 
 MAINTAINER =   Tracey Emery 
 
Index: distinfo
===
RCS file: /cvs/ports/net/thingsd/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo27 Jul 2020 20:09:12 -  1.3
+++ distinfo10 Aug 2020 14:08:00 -
@@ -1,2 +1,2 @@
-SHA256 (thingsd-3.0.1.tar.gz) = LcQlS/x9z5dr9JTvdt4a1HoWFrwegCbx8KpiV1w9eow=
-SIZE (thingsd-3.0.1.tar.gz) = 47524
+SHA256 (thingsd-3.0.2.tar.gz) = 9OdlSxuCC8c3PnlXFHBWjzMPPrBkGTzIG8kfb0dX9Ms=
+SIZE (thingsd-3.0.2.tar.gz) = 47892



upgrade port libvips to 8.10.0

2020-08-10 Thread Stephane Guedon
Hello all.

This is to tell about the port upgrade of libvips 8.10.0. To me it looks 
like it's just a little bump upgrade, therefor just updating the version 
number.

It builds fine for me.

Any comments ? Does it blocks for someone ?

Thanks and good day.

libvips-8.10.tar.gz
Description: application/compressed-tar


CVS: cvs.openbsd.org: ports

2020-08-10 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2020/08/10 09:30:06

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
math   : Makefile 
math/py-numexpr: Makefile 
math/py-numexpr/pkg: PLIST 

Log message:
Drop py2-flavor

OK paco@



[MAINTAINER UPDATE] games/freebee 1.7

2020-08-10 Thread Tracey Emery
Hello,

Here is a small bump to games/freebee, bringing us to 1.7.

ChangeLog

Switch to the Public Domain ENABLE dictionary.

Working fine on amd64.

Ok?
-- 

Tracey Emery

Index: Makefile
===
RCS file: /cvs/ports/games/freebee/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 Makefile
--- Makefile28 Jul 2020 13:48:46 -  1.1.1.1
+++ Makefile10 Aug 2020 15:21:51 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2020/07/28 13:48:46 tracey Exp $
 
 COMMENT =  free clone of The New York Times game Spelling Bee
-DISTNAME = freebee-1.6
+DISTNAME = freebee-1.7
 CATEGORIES =   games
 
 HOMEPAGE = https://freebee.fun
Index: distinfo
===
RCS file: /cvs/ports/games/freebee/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 distinfo
--- distinfo28 Jul 2020 13:48:46 -  1.1.1.1
+++ distinfo10 Aug 2020 15:21:51 -
@@ -1,2 +1,2 @@
-SHA256 (freebee-1.6.tar.xz) = xlEMjGS1KdeVoC2tSpgTMm4Iarb6grgzl0H0UySIuP0=
-SIZE (freebee-1.6.tar.xz) = 568028
+SHA256 (freebee-1.7.tar.xz) = tQmhDHmQPy4l1+IhU4A25MXESPwsmShP0mwyAYCo60o=
+SIZE (freebee-1.7.tar.xz) = 370168
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/freebee/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 PLIST
--- pkg/PLIST   28 Jul 2020 13:48:46 -  1.1.1.1
+++ pkg/PLIST   10 Aug 2020 15:21:51 -
@@ -2,4 +2,4 @@
 @bin bin/freebee
 @man man/man6/freebee.6
 share/freebee/
-share/freebee/sowpods.txt
+share/freebee/enable1.txt



[MAINTAINER UPDATE] devel/arduino-esp8266 2.7.4

2020-08-10 Thread Tracey Emery
Hello,

Here is a minor bump, bringing devel/arduino-esp8266 to 2.7.4.

Their changelog:

Hotfixes:

Backport #7478: Fix uninitted class variables from #7464
Backport #7491: Fixed PUYA flash write buffer alignment

Working fine on amd64.

Ok?

-- 

Tracey Emery

Index: Makefile
===
RCS file: /cvs/ports/devel/arduino-esp8266/Makefile,v
retrieving revision 1.4
diff -u -p -u -r1.4 Makefile
--- Makefile27 Jul 2020 22:33:27 -  1.4
+++ Makefile9 Aug 2020 18:16:18 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.4 2020/07/27 22:33:27 tracey Exp $
 
 COMMENT =  esp8266 arduino core toolset
-V =2.7.3
+V =2.7.4
 DISTNAME = esp8266-${V}
 PKGNAME =  arduino-${DISTNAME}
 
Index: distinfo
===
RCS file: /cvs/ports/devel/arduino-esp8266/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo27 Jul 2020 22:33:27 -  1.3
+++ distinfo9 Aug 2020 18:16:18 -
@@ -1,2 +1,2 @@
-SHA256 (esp8266-2.7.3.zip) = bubH9OlfZlGoOyUUYhrcPI041vnIGBFF61mw3SFYLis=
-SIZE (esp8266-2.7.3.zip) = 34470434
+SHA256 (esp8266-2.7.4.zip) = pU25v/gclj4DRaNt5uhEPp0zdgyq0fX0hmNzG99eGdo=
+SIZE (esp8266-2.7.4.zip) = 34470452



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Giovanni Bechis
CVSROOT:/cvs
Module name:ports
Changes by: giova...@cvs.openbsd.org2020/08/10 09:17:12

Modified files:
www/apache-httpd: Makefile 
www/apache-httpd/patches: patch-modules_ssl_ssl_engine_init_c 
Added files:
www/apache-httpd/patches: patch-modules_proxy_mod_proxy_uwsgi_c 

Log message:
restore a patch removed in previous commit



Re: math/py-numexpr: remove py2-flavor

2020-08-10 Thread Paco Esteban
On Mon, 10 Aug 2020, Bjorn Ketelaars wrote:

> On Mon 10/08/2020 16:00, Paco Esteban wrote:
> > Hi Bjorn,
> > 
> > Comments inline.
> > Other that those seems good to me.
> > 
> > On Sun, 09 Aug 2020, Bjorn Ketelaars wrote:
> > 
> > >  FLAVORS =python3
> > > -FLAVOR ?=
> > > +FLAVOR ?=python3
> > 
> > Shouldn't this be FLAVOR = python3  ??
> 
> bket@zeus:/usr/ports$ ag -l -G Makefile 'FLAVOR[| ]\?=.*python3' | wc -l 
>   23
> bket@zeus:/usr/ports$ ag -l -G Makefile 'FLAVOR[| ]\=.*python3' | wc -l  
>  107
> 
> FLAVOR=python3 is preferred. I will change to the latter before
> committing.
> 
> 
> > > +@conflict py-numexpr-*
> > > +@pkgpath math/py-numexpr
> > 
> > This is probably ok but I've seen (even committed myself) conflict lines
> > both like you're doing and with `category/py-port-*`.  Not sure which
> > one is preferred (as they both seem to be ok).
> 
> As sthen@ stated: @conflict-marker should be used without category/.
> 
> OK?

ok paco@

-- 
Paco Esteban.
0x5818130B8A6DBC03



Re: minor update: neovim to 0.4.4

2020-08-10 Thread Travis Cole
On Sun, Aug 9, 2020, at 11:03, Travis Cole wrote:
> Hey Edd and ports@
> 
> Looks like a new Neovim minor release came out a few days ago.
> 
> https://github.com/neovim/neovim/releases/tag/v0.4.4
> 
> It's a trivial version bump and it builds and works fine for me. Built on the 
> latest snapshot with llvm 10.
> 
> I also removed the comment about a single test failure because that is fixed 
> now. I get a clean 'make test'.

Oops, here is a diff that should apply cleanly:

Index: Makefile
===
RCS file: /home/cvs/ports/editors/neovim/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile25 Apr 2020 10:07:41 -  1.20
+++ Makefile10 Aug 2020 14:55:47 -
@@ -4,7 +4,7 @@ COMMENT =   continuation and extension of 
 
 GH_ACCOUNT =   neovim
 GH_PROJECT =   neovim
-GH_TAGNAME =   v0.4.3
+GH_TAGNAME =   v0.4.4
 
 CATEGORIES =   editors devel
 HOMEPAGE = https://neovim.io
@@ -101,9 +101,6 @@ pre-configure:
 
 # These are the "old tests". There is also a new suite, but we would need the
 # "busted" test suite for Lua, which is not yet ported.
-#
-# There is currently one (minor) test failure:
-# https://github.com/neovim/neovim/issues/10420
 do-test:
cd ${WRKSRC}/src/nvim/testdir && ${SETENV} LC_CTYPE=en_US.UTF-8 \
${MAKE_PROGRAM} NVIM_PRG=${WRKBUILD}/bin/nvim ${MAKE_FLAGS}
Index: distinfo
===
RCS file: /home/cvs/ports/editors/neovim/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- distinfo20 Nov 2019 13:43:35 -  1.7
+++ distinfo10 Aug 2020 14:55:47 -
@@ -1,4 +1,4 @@
 SHA256 (luv-1.30.1-1.tar.gz) = Tih77W9R/VDOA7p/qMwz2E4bnLhpEcSBK7H0eh4+0So=
-SHA256 (neovim-0.4.3.tar.gz) = kaC10yIEqCG/QUaQ5rSM9pIk0ZYdNxWMKzg/amz4VNI=
+SHA256 (neovim-0.4.4.tar.gz) = L3aqxZNjZ383WS6FOrLAYVHMqIMNSz/kZ1tKUtQfxCw=
 SIZE (luv-1.30.1-1.tar.gz) = 1354232
-SIZE (neovim-0.4.3.tar.gz) = 9556199
+SIZE (neovim-0.4.4.tar.gz) = 9558246




CVS: cvs.openbsd.org: ports

2020-08-10 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2020/08/10 08:52:12

Modified files:
converters/p5-Net-IDN-Encode: Makefile 
net/py-aiodns  : Makefile 
net/py-cares   : Makefile 
mail/p5-Email-MIME: Makefile 

Log message:
Forgot to bump after fixing @conflict marker in PLIST



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2020/08/10 08:42:02

Modified files:
converters/p5-Net-IDN-Encode/pkg: PLIST 
net/py-aiodns/pkg: PLIST 
net/py-cares/pkg: PLIST 
mail/p5-Email-MIME/pkg: PLIST 

Log message:
category/ is wrong for @conflict, it must be package name

Found by sthen@



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2020/08/10 08:36:39

Modified files:
games/chocolate-doom: Makefile distinfo 
games/chocolate-doom/pkg: DESCR PLIST 
Added files:
games/chocolate-doom/pkg: README 
Removed files:
games/chocolate-doom/pkg: MESSAGE 

Log message:
Update to chocolate-doom-3.0.1. Fixes CVE-2020-14983.
While here, improve pkg/DESCR and replace pkg/MESSAGE with a more
comprehensive pkg/README, from MAINTAINER Ryan Freeman.
Testing from Nam Nguyen.
ok Ryan Freeman (MAINTAINER)



Re: math/py-numexpr: remove py2-flavor

2020-08-10 Thread Bjorn Ketelaars
On Mon 10/08/2020 16:00, Paco Esteban wrote:
> Hi Bjorn,
> 
> Comments inline.
> Other that those seems good to me.
> 
> On Sun, 09 Aug 2020, Bjorn Ketelaars wrote:
> 
> >  FLAVORS =  python3
> > -FLAVOR ?=
> > +FLAVOR ?=  python3
> 
> Shouldn't this be FLAVOR = python3  ??

bket@zeus:/usr/ports$ ag -l -G Makefile 'FLAVOR[| ]\?=.*python3' | wc -l 
  23
bket@zeus:/usr/ports$ ag -l -G Makefile 'FLAVOR[| ]\=.*python3' | wc -l  
 107

FLAVOR=python3 is preferred. I will change to the latter before
committing.


> > +@conflict py-numexpr-*
> > +@pkgpath math/py-numexpr
> 
> This is probably ok but I've seen (even committed myself) conflict lines
> both like you're doing and with `category/py-port-*`.  Not sure which
> one is preferred (as they both seem to be ok).

As sthen@ stated: @conflict-marker should be used without category/.

OK?



Re: math/py-numexpr: remove py2-flavor

2020-08-10 Thread Bjorn Ketelaars
On Mon 10/08/2020 15:04, Stuart Henderson wrote:
> On 2020/08/10 16:00, Paco Esteban wrote:
> > >  .include 
> > > diff --git math/py-numexpr/pkg/PLIST math/py-numexpr/pkg/PLIST
> > > index 562a4deac37..c9f63abe582 100644
> > > --- math/py-numexpr/pkg/PLIST
> > > +++ math/py-numexpr/pkg/PLIST
> > > @@ -1,4 +1,6 @@
> > >  @comment $OpenBSD: PLIST,v 1.1.1.1 2017/04/23 17:45:20 shadchin Exp $
> > > +@conflict py-numexpr-*
> > > +@pkgpath math/py-numexpr
> > 
> > This is probably ok but I've seen (even committed myself) conflict lines
> > both like you're doing and with `category/py-port-*`.  Not sure which
> > one is preferred (as they both seem to be ok).
> 
> category/ is wrong for @conflict, it must be package name.
> these need fixing:
> 
> $ ag -G pkg/P @conflict | grep conflict.*/
> converters/p5-Net-IDN-Encode/pkg/PLIST:2:@conflict 
> converters/p5-IDNA-Punycode-*
> mail/p5-Email-MIME/pkg/PLIST:2:@conflict mail/p5-Email-MIME-Creator-*
> mail/p5-Email-MIME/pkg/PLIST:3:@conflict mail/p5-Email-MIME-Modifier-*
> net/py-aiodns/pkg/PLIST:2:@conflict net/py-aiodns-*
> net/py-cares/pkg/PLIST:2:@conflict net/py-cares-*

I have a diff for the above, and will commit unless someone beats me to
it.



Re: math/py-numexpr: remove py2-flavor

2020-08-10 Thread Stuart Henderson
On 2020/08/10 16:00, Paco Esteban wrote:
> >  .include 
> > diff --git math/py-numexpr/pkg/PLIST math/py-numexpr/pkg/PLIST
> > index 562a4deac37..c9f63abe582 100644
> > --- math/py-numexpr/pkg/PLIST
> > +++ math/py-numexpr/pkg/PLIST
> > @@ -1,4 +1,6 @@
> >  @comment $OpenBSD: PLIST,v 1.1.1.1 2017/04/23 17:45:20 shadchin Exp $
> > +@conflict py-numexpr-*
> > +@pkgpath math/py-numexpr
> 
> This is probably ok but I've seen (even committed myself) conflict lines
> both like you're doing and with `category/py-port-*`.  Not sure which
> one is preferred (as they both seem to be ok).

category/ is wrong for @conflict, it must be package name.
these need fixing:

$ ag -G pkg/P @conflict | grep conflict.*/
converters/p5-Net-IDN-Encode/pkg/PLIST:2:@conflict converters/p5-IDNA-Punycode-*
mail/p5-Email-MIME/pkg/PLIST:2:@conflict mail/p5-Email-MIME-Creator-*
mail/p5-Email-MIME/pkg/PLIST:3:@conflict mail/p5-Email-MIME-Modifier-*
net/py-aiodns/pkg/PLIST:2:@conflict net/py-aiodns-*
net/py-cares/pkg/PLIST:2:@conflict net/py-cares-*



Re: math/py-numexpr: remove py2-flavor

2020-08-10 Thread Paco Esteban
Hi Bjorn,

Comments inline.
Other that those seems good to me.

On Sun, 09 Aug 2020, Bjorn Ketelaars wrote:

> Remove py2-flavor of math/py-numexpr. Consumers are already py3-only.
> 
> OK?
> 
> 
> diff --git devel/quirks/Makefile devel/quirks/Makefile
> index 3c7f46a4a3e..33f744dfa26 100644
> --- devel/quirks/Makefile
> +++ devel/quirks/Makefile
> @@ -5,7 +5,7 @@ CATEGORIES =  devel databases
>  DISTFILES =
>  
>  # API.rev
> -PKGNAME =quirks-3.396
> +PKGNAME =quirks-3.397
>  PKG_ARCH =   *
>  MAINTAINER = Marc Espie 
>  
> diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
> index 7f620c19826..90300d8e3bd 100644
> --- devel/quirks/files/Quirks.pm
> +++ devel/quirks/files/Quirks.pm
> @@ -454,6 +454,7 @@ my $stem_extensions = {
>   'py-cftime' => 'py3-cftime',
>   'py-astral' => 'py3-astral',
>   'py-ropper' => 'py3-ropper',
> + 'py-numexpr' => 'py3-numexpr',
>  };
>  
>  my $obsolete_reason = {
> diff --git math/Makefile math/Makefile
> index 90041544d47..c1dac648268 100644
> --- math/Makefile
> +++ math/Makefile
> @@ -133,7 +133,6 @@
>   SUBDIR += py-mpmath,python3
>   SUBDIR += py-networkx
>   SUBDIR += py-netcdf4
> - SUBDIR += py-numexpr
>   SUBDIR += py-numexpr,python3
>   SUBDIR += py-numpy
>   SUBDIR += py-numpy,python3
> diff --git math/py-numexpr/Makefile math/py-numexpr/Makefile
> index 6e6d53e33b0..f0687eb0b5c 100644
> --- math/py-numexpr/Makefile
> +++ math/py-numexpr/Makefile
> @@ -6,7 +6,7 @@ MODPY_EGG_VERSION =   2.6.4
>  DISTNAME =   numexpr-${MODPY_EGG_VERSION}
>  PKGNAME =py-${DISTNAME}
>  CATEGORIES = math
> -REVISION =   3
> +REVISION =   4
>  
>  # MIT
>  PERMIT_PACKAGE = Yes
> @@ -30,6 +30,6 @@ RUN_DEPENDS =   math/py-numpy${MODPY_FLAVOR}
>  BUILD_DEPENDS =  ${RUN_DEPENDS}
>  
>  FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR ?=python3

Shouldn't this be FLAVOR = python3  ??

>  
>  .include 
> diff --git math/py-numexpr/pkg/PLIST math/py-numexpr/pkg/PLIST
> index 562a4deac37..c9f63abe582 100644
> --- math/py-numexpr/pkg/PLIST
> +++ math/py-numexpr/pkg/PLIST
> @@ -1,4 +1,6 @@
>  @comment $OpenBSD: PLIST,v 1.1.1.1 2017/04/23 17:45:20 shadchin Exp $
> +@conflict py-numexpr-*
> +@pkgpath math/py-numexpr

This is probably ok but I've seen (even committed myself) conflict lines
both like you're doing and with `category/py-port-*`.  Not sure which
one is preferred (as they both seem to be ok).

>  lib/python${MODPY_VERSION}/site-packages/numexpr/
>  
> lib/python${MODPY_VERSION}/site-packages/numexpr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>  
> lib/python${MODPY_VERSION}/site-packages/numexpr-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
> @@ -19,7 +21,7 @@ 
> lib/python${MODPY_VERSION}/site-packages/numexpr/${MODPY_PYCACHE}utils.${MODPY_P
>  
> lib/python${MODPY_VERSION}/site-packages/numexpr/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
>  lib/python${MODPY_VERSION}/site-packages/numexpr/cpuinfo.py
>  lib/python${MODPY_VERSION}/site-packages/numexpr/expressions.py
> -lib/python${MODPY_VERSION}/site-packages/numexpr/interpreter.so
> +@so lib/python${MODPY_VERSION}/site-packages/numexpr/interpreter.so
>  lib/python${MODPY_VERSION}/site-packages/numexpr/necompiler.py
>  lib/python${MODPY_VERSION}/site-packages/numexpr/tests/
>  lib/python${MODPY_VERSION}/site-packages/numexpr/tests/__init__.py
> 

-- 
Paco Esteban.
0x5818130B8A6DBC03



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Kirill Bychkov
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2020/08/10 07:36:32

Modified files:
net/seafile/libsearpc: Makefile distinfo 
net/seafile/libsearpc/pkg: PLIST 
net/seafile/seafile: Makefile 
net/seafile/seafile/pkg: PLIST 

Log message:
Switch seafile to python3



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Kirill Bychkov
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2020/08/10 07:09:47

Modified files:
graphics/zint  : Makefile distinfo 

Log message:
Update zint to 2.9.0



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/08/10 06:25:17

Modified files:
net/dnsmasq: Makefile distinfo 
net/dnsmasq/patches: patch-src_config_h 

Log message:
update to dnsmasq-2.82, from Brad



Re: New: hw-probe-1.6

2020-08-10 Thread Stuart Henderson
- the PKGNAME hw-probe-1.6-beta is invalid, -beta is using the part of the
name that is reserved for a flavour. Should set e.g. PKGNAME=hw-probe-1.6beta

- looks like the default if you just run "hw-probe" is to upload data to
an internet server. there should be a warning about this somewhere, at
least in pkg/DESCR.



On 2020/08/10 06:58, David Dahlberg wrote:
> Hi ports@
> 
> Find attached a port of hw-probe, which is the system configuration
> upload tool of linux-hardware.org/bsd-hardware.org.
> 
> A few questions/remarks though: The tool is dual-licenced BSD-4/LGPL-
> 2.1+. Do I have to pick the licence files and install them somewhere?
> 
> Second, the tool would like do obtain kmem for dmidecode(8). I
> personally would not add any MESSAGE or README mentioning the right
> sysctl(2), because (a) the tool works well enough without and I would
> not generally recommend setting it (needs securelevel=0) and (b) the
> tool yells the appropriate command at you anyways.
> 
> Tested package and tool on several amd64 machines. On the one old i386
> that I still have in use, the package builds and installs fine, but the
> tool throws me into ddb - OTOH, a lot of things do that on that machine.




New: hw-probe-1.6

2020-08-10 Thread David Dahlberg
Hi ports@

Find attached a port of hw-probe, which is the system configuration
upload tool of linux-hardware.org/bsd-hardware.org.

A few questions/remarks though: The tool is dual-licenced BSD-4/LGPL-
2.1+. Do I have to pick the licence files and install them somewhere?

Second, the tool would like do obtain kmem for dmidecode(8). I
personally would not add any MESSAGE or README mentioning the right
sysctl(2), because (a) the tool works well enough without and I would
not generally recommend setting it (needs securelevel=0) and (b) the
tool yells the appropriate command at you anyways.

Tested package and tool on several amd64 machines. On the one old i386
that I still have in use, the package builds and installs fine, but the
tool throws me into ddb - OTOH, a lot of things do that on that machine.


hw-probe.tgz
Description: application/compressed-tar


Re: update net/gajim to 1.2.0

2020-08-10 Thread 3un0s
On Mon, 6 Jul 2020 20:53:47 +0200
3un0s <3u...@dismail.de> wrote:

> On Mon, 6 Jul 2020 16:24:45 +0200
> 3un0s <3u...@dismail.de> wrote:
> 
> > Hi,
> > 
> > This diff updates gajim to 1.2.0
> > It requires a new version of py-nbxmpp and new package called
> > py-css-parser.
> > I've already sent both of those to this mailing list.
> > Works for me on amd64.
> > 
> > Any comments or OK ?
> 
> This update requires a newer version of py3-nbxmpp I've sent already
> 

ping



Re: update net/py-nbxmpp to 1.0.1

2020-08-10 Thread 3un0s
On Sun, 12 Jul 2020 14:28:27 +0200
3un0s <3u...@dismail.de> wrote:

> A new version of py-nbxmpp has been released since I've sent my last
> message.
> 
> Important to note that this update breaks current version of gajim but
> I've already provided a diff for updating it to the current version.
> 
> I'm very sorry Pierre-Emmanuel Andre for not CCing you earlier, please
> also take a look at the gajim diff I've sent.
> 
> Any comments or OK?

ping



Re: NEW: textproc/py-css-parser

2020-08-10 Thread 3un0s
On Tue, 7 Jul 2020 16:28:08 +0200
3un0s <3u...@dismail.de> wrote:

> On Tue, 7 Jul 2020 16:16:35 +0200
> Landry Breuil  wrote:
> 
> > you sent your last mail 8 hours ago, it's a bit early for a ping.
> > 
> 
> Sorry about that, I'm new here and I didn't really know how long one
> should wait, again sorry.
> 
> > moreover, it's common for python stuff on pip to not have tests,
> > they're in github because github tags are not actual releases and
> > are a tarball of what's in the repo at the time of the tagging.
> > github tarballs have been unreliable in the past, but some claim
> > it's not true anymore.
> > 
> > personally, for the few python ports i care about, i keep the github
> > stuff commented out in the Makefile and enable it just to run the
> > tests locally before commiting, only trusting the pypi tarballs in
> > the end.
> > 
> > Landry
> > 
> 
> Okay, so I'll just leave it how it is now.
> 
> Any comments or OK?
> 

ping



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2020/08/10 05:38:43

Modified files:
devel/llvm : Makefile distinfo 
devel/llvm/patches: patch-lib_CodeGen_CMakeLists_txt 
patch-lib_CodeGen_SelectionDAG_DAGCombiner_cpp 
patch-lib_Target_AArch64_AArch64FrameLowering_cpp 
patch-lib_Target_AArch64_AArch64Subtarget_h 
patch-lib_Target_PowerPC_PPCISelLowering_cpp 
patch-lib_Target_X86_CMakeLists_txt 
patch-lib_Target_X86_X86Subtarget_h 
patch-lib_Target_X86_X86TargetMachine_cpp 
patch-tools_clang_include_clang_Driver_Options_td 
patch-tools_clang_lib_Basic_Targets_PPC_h 
patch-tools_clang_lib_CodeGen_TargetInfo_cpp 

patch-tools_clang_lib_Driver_ToolChains_Arch_X86_cpp 
patch-tools_clang_lib_Driver_ToolChains_Gnu_cpp 
patch-tools_lld_ELF_Driver_cpp 
patch-tools_lld_ELF_Writer_cpp 
devel/llvm/pkg : PLIST-main 
Removed files:
devel/llvm/patches: patch-tools_clang_lib_CodeGen_CGVTables_cpp 

Log message:
Follow base and update to llvm-10.0.1



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/08/10 05:15:58

Modified files:
net/libunbound : Makefile distinfo 
net/libunbound/patches: patch-Makefile_in 

Log message:
update to libunbound-1.11.0



Re: gimp install - Can't find gcc-libs-8.3.0p5

2020-08-10 Thread Stuart Henderson
"signature truncated" usually means the TCP connection was interrupted - 
retry or try a different mirror.


--
 Sent from a phone, apologies for poor formatting.
On 10 August 2020 00:21:05 Mihai Popescu  wrote:


amd64 recent snapshot install, getting this error.
Checking bulk build report, last, there is no mention of this package as
not being able to compile. Did I overlooked?

Also another error, first time when i see this:

https://ftp2.eu.openbsd.org/pub/OpenBSD/snapshots/packages/amd64/lame-3.100p1.tgz:
signify: signature truncated

Thanks.




Re: UPDATE: games/chocolate-doom 3.0.0 => 3.0.1 (fix CVE-2020-14983)

2020-08-10 Thread Ryan Freeman
On Sun, Aug 02, 2020 at 01:09:18PM -0700, Ryan Freeman wrote:
> On Sat, Aug 01, 2020 at 03:47:19AM +, Brian Callahan wrote:
> > Hi ports and Ryan --
> > 
> > I noticed via Repology that our version of chocolate-doom is
> > vulnerable to CVE-2020-14983 [0].
> > 
> > The simple solution is to update to version 3.0.1, which contains the
> > fix [1].
> > 
> > Doom works here for me.
> > 
> > OK?
> > 
> > ~Brian
> > 
> > [0] https://nvd.nist.gov/vuln/detail/CVE-2020-14983
> > [1] https://github.com/chocolate-doom/chocolate-doom/issues/1293
> 
> Hey Brian,
> 
> Thanks again for pointing this out!  I managed to roll my old DESCR and
> pkg README enhancements into your diff to upgrade to 3.0.1.  Please
> consider this one for commit, builds and runs fine on amd64 here.
> 
> This is based on a diff I had from last year that never made it in seen
> here, but with a bit more word-smoothing:
> https://marc.info/?l=openbsd-ports=156485054232532=2
> 
> Thanks!
> 

Ping

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/chocolate-doom/Makefile,v
> retrieving revision 1.27
> diff -u -p -r1.27 Makefile
> --- Makefile  12 Jul 2019 20:46:15 -  1.27
> +++ Makefile  2 Aug 2020 20:03:43 -
> @@ -1,10 +1,9 @@
>  # $OpenBSD: Makefile,v 1.27 2019/07/12 20:46:15 sthen Exp $
>  
>  COMMENT =portable release of Doom, Heretic, Hexen, and Strife
> -V =  3.0.0
> +V =  3.0.1
>  DISTNAME =   chocolate-doom-${V}
>  CATEGORIES = games x11
> -REVISION =   0
>  
>  HOMEPAGE =   https://www.chocolate-doom.org/
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/chocolate-doom/distinfo,v
> retrieving revision 1.9
> diff -u -p -r1.9 distinfo
> --- distinfo  18 Jan 2018 09:30:58 -  1.9
> +++ distinfo  2 Aug 2020 20:03:43 -
> @@ -1,2 +1,2 @@
> -SHA256 (chocolate-doom-3.0.0.tar.gz) = 
> c66mI5MMfRinp3juo5Hh3fvpCtGsQKkbOAr8pLDh2rg=
> -SIZE (chocolate-doom-3.0.0.tar.gz) = 2495591
> +SHA256 (chocolate-doom-3.0.1.tar.gz) = 
> 1DXWF3QjSR1gvnBtqfB9OrT6vz4HfsKj/CFuOU/PyMc=
> +SIZE (chocolate-doom-3.0.1.tar.gz) = 2514985
> Index: pkg/DESCR
> ===
> RCS file: /cvs/ports/games/chocolate-doom/pkg/DESCR,v
> retrieving revision 1.4
> diff -u -p -r1.4 DESCR
> --- pkg/DESCR 11 Dec 2014 08:10:51 -  1.4
> +++ pkg/DESCR 2 Aug 2020 20:03:43 -
> @@ -1,28 +1,7 @@
> -Chocolate Doom is a portable branch of the classic doom.exe experience
> -from the days of DOS. The author, Simon Howard, has worked to ensure
> -Chocolate Doom, which is nothing more than a directly modified version
> -of the released iD Software source code, has zero changes that affect
> -gameplay, look, or feel, and also re-created a DOS-like setup program to
> -configure the game much like the original setup.exe.  The project also
> -maintains versions of the engine for Heretic, Hexen, and Strife.
> +Chocolate Doom is an SDL-based port of the classic DOOM.EXE experience from
> +the days of DOS.  The project aims to provide an experience identical to that
> +of the original games on original hardware.  A game configuration program is 
> +included, and emulates the classic DOS-style SETUP.EXE of the originals.
>  
> -Chocolate Doom provides:
> -  chocolate-doom  - the Doom executable
> -  chocolate-doom-setup- the Doom setup executable
> -  chocolate-heretic   - the Heretic executable
> -  chocolate-heretic-setup - the Heretic setup executable
> -  chocolate-hexen - the Hexen executable
> -  chocolate-hexen-setup   - the Hexen setup executable
> -  chocolate-strife- the Strife executable
> -  chocolate-strife-setup  - the Strife setup executable
> -  chocolate-server- server for up to 4-player net games
> -
> -
> -Due to the port re-implementing the original games as closely as
> -possible, all original game PWADs and demos work flawlessly. Other
> -original features include a PC-speaker driver, just like the DOS
> -PC-speaker driver, and a working -left and -right network command
> -parameter system for the 'surround display' setup that was
> -obtainable with the original DOS executables over an IPX network.
> -
> -Check the chocolate-*(6) manpages for additional information.
> +The project also maintains versions of the engine for Heretic, Hexen, and
> +Strife.  All original game PWADs and demos should work flawlessly.
> Index: pkg/MESSAGE
> ===
> RCS file: pkg/MESSAGE
> diff -N pkg/MESSAGE
> --- pkg/MESSAGE   27 May 2014 06:35:01 -  1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,16 +0,0 @@
> -To play the game you will need an original Doom, Ultimate Doom,
> -Doom II, Final Doom, Heretic, Hexen, or Strife IWAD. Place the
> -doom.wad, doom2.wad, plutonia.wad, tnt.wad, heretic.wad, hexen.wad,
> -strife1.wad + voices.wad or all 

CVS: cvs.openbsd.org: ports

2020-08-10 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2020/08/10 01:57:37

Modified files:
math   : Makefile 
math/py-ecos   : Makefile 
math/py-ecos/pkg: PLIST 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
Drop py2-flavor

pirofti@ (maintainer): "...please go ahead"



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2020/08/10 01:53:59

Modified files:
math   : Makefile 
math/py-osqp   : Makefile 
math/py-osqp/pkg: PLIST 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
Drop py2-flavor

pirofti@ (maintainer): "...please go ahead"



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Sebastian Reitenbach
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2020/08/10 01:46:28

Modified files:
devel/leatherman: Makefile distinfo 

Log message:
simple update 1.12.0 -> 1.12.1



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2020/08/10 01:44:07

Modified files:
math   : Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
math/py-snuggs : Makefile 
math/py-snuggs/pkg: PLIST 

Log message:
Drop py2-flavor

OK martin@ (maintainer)



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2020/08/10 01:28:45

Modified files:
x11/xfce4/xfwm4: Makefile distinfo 

Log message:
Update to xfwm4 4.14.5



CVS: cvs.openbsd.org: ports

2020-08-10 Thread Solene Rapenne
CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2020/08/10 00:59:14

Modified files:
editors/kakoune: Makefile distinfo 
editors/kakoune/pkg: PLIST 

Log message:
Update to kakoune-2020.08.04

maintainer Frederic Galusik is ok