Re: [Update] lang/tinyscheme : Update to 1.42

2020-09-20 Thread George Koehler
On Tue, 15 Sep 2020 00:47:09 +
wen heping  wrote:

> Hi, ports@ :
> 
>   Here is a simple patch to update lang/tinyscheme to 1.42.
>   It build well and run well on amd64-current system.
>   No other ports depends on it.
> 
> 
> Cheers !
> wen

Also works on macppc and powerpc64.  Thanks for the update;
I committed it to CVS.--George



Re: gmake: parse error: error in archive specification

2020-09-20 Thread Rafael Sadowski
On Sun Sep 20, 2020 at 10:16:32PM +0200, Christian Weisgerber wrote:
> Rafael Sadowski:
> 
> > It is very easy to reproduce:
> > $ cd /usr/ports/security/argon2 && make test
> > 
> > ===>  Regression tests for argon2-20190702
> > Building without optimizations
> > cc -O2 -pipe -std=c89 -Wall -g -Iinclude -Isrc -pthread  -Wextra 
> > -Wno-type-limits src/argon2.c src/core.c src/blake2/blake2b.c src/thread.c 
> > src/encoding.c src/ref.c src/test.c -o testcase
> > Default build
> > *** Parse error in 
> > /usr/ports/pobj/argon2-20190702/phc-winner-argon2-20190702: Error in 
> > archive specification: "(, 1)" (Makefile:42)
> 
> The test target runs "sh kats/test.sh", which in turn calls "make"(!).
> The errors are from our make(1) choking on the GNU makefile syntax.
> 
> Here's a fix: Export the MAKE variable, which always contains the
> path with which the current make was invoked, and use it in the
> kat/test.sh script.

Thanks for looking at it. OK rsadowski

> 
> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/security/argon2/patches/patch-Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-Makefile
> --- patches/patch-Makefile17 Sep 2020 04:41:43 -  1.2
> +++ patches/patch-Makefile20 Sep 2020 20:09:58 -
> @@ -21,3 +21,12 @@ Index: Makefile
>   LIB_CFLAGS := -shared -fPIC
>   PC_EXTRA_LIBS ?=
>   endif
> +@@ -212,6 +212,8 @@ $(PC_NAME): $(PC_SRC)
> + dist:
> + cd ..; \
> + tar -c --exclude='.??*' -z -f $(DIST)-`date "+%Y%m%d"`.tgz 
> $(DIST)/*
> ++
> ++export MAKE
> + 
> + .PHONY: test
> + test:   $(SRC) src/test.c
> Index: patches/patch-kats_test_sh
> ===
> RCS file: patches/patch-kats_test_sh
> diff -N patches/patch-kats_test_sh
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-kats_test_sh20 Sep 2020 20:09:58 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: kats/test.sh
> +--- kats/test.sh.orig
>  kats/test.sh
> +@@ -9,7 +9,7 @@ do
> + printf "Force OPTTEST=1\n"
> +   fi
> + 
> +-  make genkat $opttest > /dev/null
> ++  ${MAKE:-make} genkat $opttest > /dev/null
> +   if [ $? -ne 0 ]
> +   then
> + exit $?
> -- 
> Christian "naddy" Weisgerber  na...@mips.inka.de
> 



CVS: cvs.openbsd.org: ports

2020-09-20 Thread George Koehler
CVSROOT:/cvs
Module name:ports
Changes by: gkoeh...@cvs.openbsd.org2020/09/20 22:02:00

Modified files:
lang/tinyscheme: Makefile distinfo 

Log message:
Simple update to tinyscheme-1.42; from wen heping.



回复: 回复: 回复: [NEW]databases/p5-SQL-Abstract-More

2020-09-20 Thread wen heping
ping again ...
It is required by the update of databases/p5-DBIx-DataModel.

发件人: wen heping 
发送时间: 2019年11月14日 15:51
收件人: afre...@openbsd.org 
抄送: ports@openbsd.org 
主题: 回复: 回复: [NEW]databases/p5-SQL-Abstract-More

ping ...

发件人: owner-po...@openbsd.org  代表 wen heping 

发送时间: 2019年11月6日 15:27
收件人: afre...@openbsd.org 
抄送: ports@openbsd.org 
主题: 回复: [NEW]databases/p5-SQL-Abstract-More

Revised patch that add the missing TEST_DEPENDS.

wen

发件人: Andrew Hewus Fresh 
发送时间: 2019年9月21日 9:12
收件人: wen heping 
抄送: ports@openbsd.org 
主题: Re: [NEW]databases/p5-SQL-Abstract-More

On Fri, Sep 06, 2019 at 01:08:07PM +, wen heping wrote:
> Hi, ports@:
>
>Here is a patch to create new port databases/p5-SQL-Abstract-More,
> which is required by the update of databases/p5-DBIx-DataModel.
>Currently databases/p5-DBIx-DataModel failed with regression tests.
> We shall update it and it will pass all the tests.
>
>It build well and passed all tests on amd64-head system.
>
> Comments? OK?
> wen

Appears to be missing a TEST_DEPENDS += devel/p5-Test-Deep

With that, OK afresh1@



Re: gmake: parse error: error in archive specification

2020-09-20 Thread Jeremie Courreges-Anglas
On Sun, Sep 20 2020, Christian Weisgerber  wrote:
> Rafael Sadowski:
>
>> It is very easy to reproduce:
>> $ cd /usr/ports/security/argon2 && make test
>> 
>> ===>  Regression tests for argon2-20190702
>> Building without optimizations
>> cc -O2 -pipe -std=c89 -Wall -g -Iinclude -Isrc -pthread  -Wextra 
>> -Wno-type-limits src/argon2.c src/core.c src/blake2/blake2b.c src/thread.c 
>> src/encoding.c src/ref.c src/test.c -o testcase
>> Default build
>> *** Parse error in 
>> /usr/ports/pobj/argon2-20190702/phc-winner-argon2-20190702: Error in archive 
>> specification: "(, 1)" (Makefile:42)
>
> The test target runs "sh kats/test.sh", which in turn calls "make"(!).
> The errors are from our make(1) choking on the GNU makefile syntax.
>
> Here's a fix: Export the MAKE variable, which always contains the
> path with which the current make was invoked, and use it in the
> kat/test.sh script.

I had something similar but your version seems a better fit for
upstream.  ok jca@ fwiw

> Index: patches/patch-Makefile
> ===
> RCS file: /cvs/ports/security/argon2/patches/patch-Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-Makefile
> --- patches/patch-Makefile17 Sep 2020 04:41:43 -  1.2
> +++ patches/patch-Makefile20 Sep 2020 20:09:58 -
> @@ -21,3 +21,12 @@ Index: Makefile
>   LIB_CFLAGS := -shared -fPIC
>   PC_EXTRA_LIBS ?=
>   endif
> +@@ -212,6 +212,8 @@ $(PC_NAME): $(PC_SRC)
> + dist:
> + cd ..; \
> + tar -c --exclude='.??*' -z -f $(DIST)-`date "+%Y%m%d"`.tgz 
> $(DIST)/*
> ++
> ++export MAKE
> + 
> + .PHONY: test
> + test:   $(SRC) src/test.c
> Index: patches/patch-kats_test_sh
> ===
> RCS file: patches/patch-kats_test_sh
> diff -N patches/patch-kats_test_sh
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-kats_test_sh20 Sep 2020 20:09:58 -
> @@ -0,0 +1,14 @@
> +$OpenBSD$
> +
> +Index: kats/test.sh
> +--- kats/test.sh.orig
>  kats/test.sh
> +@@ -9,7 +9,7 @@ do
> + printf "Force OPTTEST=1\n"
> +   fi
> + 
> +-  make genkat $opttest > /dev/null
> ++  ${MAKE:-make} genkat $opttest > /dev/null
> +   if [ $? -ne 0 ]
> +   then
> + exit $?

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



Re: [NEW] games/multimc 0.6.11

2020-09-20 Thread Kurt Mosiejczuk
On Sun, Sep 20, 2020 at 10:38:40PM +0200, Peter Hessler wrote:
> Did some playing, I mean testing, of this and the port looks good to me.

> OK

Same here.

I'd like a couple tweaks just for the lines longer than 80 chars, but
that is the only quibble I have.

OK kmos for import

--Kurt



Re: [NEW] games/multimc 0.6.11

2020-09-20 Thread Peter Hessler
Did some playing, I mean testing, of this and the port looks good to me.

OK


On 2020 Sep 20 (Sun) at 04:50:56 +0200 (+0200), Muhammad Kaisar Arkhan wrote:
:Hello,
:
:Attached in this email is a port of multimc, here is the description of
:it:
:
:MultiMC is a free, open source launcher for Minecraft. It allows you
:to have multiple, cleanly separated instances of Minecraft (each with
:their own mods, texture packs, saves, etc) and helps you manage them
:and their associated options with a simple and powerful interface.
:
:OK?
:
:Thanks,
:Yuki
:


-- 
You're at the end of the road again.



Re: Remove net/pcapdiff?

2020-09-20 Thread Solene Rapenne
On Sat, 19 Sep 2020 14:22:51 -0400
Kurt Mosiejczuk :

> On Sat, Sep 19, 2020 at 08:00:41PM +0200, Solène Rapenne wrote:
> 
> > > Remove it?  
> 
> > Why remove it? Because it's python2? Do we have a python2 expiration
> > policy? (I see others OS have a deadline for python2 removal, maybe
> > we should do the same)  
> 
> It's python2.

Did someone ask to kill all python2 ports?

> It's not available from its author, only from our mirror of the distfile
> on ftp.openbsd.

I think we have a lot of cases like this.

> It parses packets and hasn't been updated.

But it works "offline" so I don't see the issue.

> 
> > If it works and that we don't have alternative in ports I think
> > we should keep it.  
> 
> If folks *use* it, I'm ok with keeping it. However, it was imported more
> than 11 years ago and hasn't been updated. It's homepage advises others to
> use a different project. The source file isn't available.
> 
> Honestly, the more I investigate this, the *less* I'd like it to stay.
> 
> > There is a python3 pcapdiff at https://github.com/isginf/pcap-diff
> > I don't know if it's a fork of net/pcapdiff though.  
> 
> Someone could do a port of that.
> 
> --Kurt
> 

I don't really care about the port itself, but I think we need to
define a clear policy about python2 removal crusade.

I get that python2 is end of life. We have lot of python2 ports that
are python2 only. Do we remove python2 in X months/year and projects
that still use python2 will have to be deleted? Do we try to delete
every port requiring python2 ? At which cost?

If we agree that python2 must disappear for 6.9 release, I would 
understand the choice of deleting python2 ports.

I am always ok to delete ports that are broken or network related
and abandoned for safety reasons. But if a port works and doesn't
seem to be a security risk to run I don't see strong reasons to
remove it.



Re: gmake: parse error: error in archive specification

2020-09-20 Thread Christian Weisgerber
Rafael Sadowski:

> It is very easy to reproduce:
> $ cd /usr/ports/security/argon2 && make test
> 
> ===>  Regression tests for argon2-20190702
> Building without optimizations
> cc -O2 -pipe -std=c89 -Wall -g -Iinclude -Isrc -pthread  -Wextra 
> -Wno-type-limits src/argon2.c src/core.c src/blake2/blake2b.c src/thread.c 
> src/encoding.c src/ref.c src/test.c -o testcase
> Default build
> *** Parse error in 
> /usr/ports/pobj/argon2-20190702/phc-winner-argon2-20190702: Error in archive 
> specification: "(, 1)" (Makefile:42)

The test target runs "sh kats/test.sh", which in turn calls "make"(!).
The errors are from our make(1) choking on the GNU makefile syntax.

Here's a fix: Export the MAKE variable, which always contains the
path with which the current make was invoked, and use it in the
kat/test.sh script.

Index: patches/patch-Makefile
===
RCS file: /cvs/ports/security/argon2/patches/patch-Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-Makefile
--- patches/patch-Makefile  17 Sep 2020 04:41:43 -  1.2
+++ patches/patch-Makefile  20 Sep 2020 20:09:58 -
@@ -21,3 +21,12 @@ Index: Makefile
LIB_CFLAGS := -shared -fPIC
PC_EXTRA_LIBS ?=
  endif
+@@ -212,6 +212,8 @@ $(PC_NAME): $(PC_SRC)
+ dist:
+   cd ..; \
+   tar -c --exclude='.??*' -z -f $(DIST)-`date "+%Y%m%d"`.tgz 
$(DIST)/*
++
++export MAKE
+ 
+ .PHONY: test
+ test:   $(SRC) src/test.c
Index: patches/patch-kats_test_sh
===
RCS file: patches/patch-kats_test_sh
diff -N patches/patch-kats_test_sh
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-kats_test_sh  20 Sep 2020 20:09:58 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: kats/test.sh
+--- kats/test.sh.orig
 kats/test.sh
+@@ -9,7 +9,7 @@ do
+ printf "Force OPTTEST=1\n"
+   fi
+ 
+-  make genkat $opttest > /dev/null
++  ${MAKE:-make} genkat $opttest > /dev/null
+   if [ $? -ne 0 ]
+   then
+ exit $?
-- 
Christian "naddy" Weisgerber  na...@mips.inka.de



[MAINTAINER UPDATE] math/cddlib 0.94j -> 0.94l

2020-09-20 Thread Dimitri Karamazov
Updated from 0.94j to 0.94l

Changelog:https://github.com/cddlib/cddlib/releases
Added a patch file to avoid the texlive build dep

Any Comments/Ok's?

Index: Makefile
===
RCS file: /cvs/ports/math/cddlib/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile16 Jul 2020 04:46:18 -  1.1.1.1
+++ Makefile20 Sep 2020 15:29:03 -
@@ -4,7 +4,7 @@ COMMENT =   C library for double descripti

 GH_ACCOUNT =   cddlib
 GH_PROJECT =   cddlib
-GH_TAGNAME =   0.94j
+GH_TAGNAME =   0.94l

 SHARED_LIBS += cdd 0.0 # 0.0
 SHARED_LIBS += cddgmp  0.0 # 0.0
@@ -20,7 +20,6 @@ PERMIT_PACKAGE =  Yes

 WANTLIB += c gmp

-BUILD_DEPENDS =print/texlive/base
 LIB_DEPENDS =  devel/gmp

 USE_GMAKE =Yes
Index: distinfo
===
RCS file: /cvs/ports/math/cddlib/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo16 Jul 2020 04:46:18 -  1.1.1.1
+++ distinfo20 Sep 2020 15:29:03 -
@@ -1,2 +1,2 @@
-SHA256 (cddlib-0.94j.tar.gz) = 9Uu6eFufaBS+XPbXaGHdYQgpl8e0jgJE/DzOpxlYktQ=
-SIZE (cddlib-0.94j.tar.gz) = 496651
+SHA256 (cddlib-0.94l.tar.gz) = 0TyOj7Pm6P/9A0bgo5b833zq4oyjxPe//68Pr4Novb0=
+SIZE (cddlib-0.94l.tar.gz) = 493895
Index: patches/patch-Makefile_am
===
RCS file: patches/patch-Makefile_am
diff -N patches/patch-Makefile_am
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_am   20 Sep 2020 15:29:03 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Avoid building documentation
+
+--- Makefile.am.orig   Sun Sep 20 20:38:23 2020
 Makefile.amSun Sep 20 20:38:36 2020
+@@ -1,5 +1,5 @@
+ # Directories where we can build something.
+-SUBDIRS  = doc lib-src src
++SUBDIRS  = lib-src src
+
+ # Install the examples into /usr/share/doc/cddlib/examples*
+ nobase_doc_DATA = $(srcdir)/examples/* $(srcdir)/examples-ine/* 
$(srcdir)/examples-ine3d/* $(srcdir)/examples-ext/*
Index: pkg/PLIST
===
RCS file: /cvs/ports/math/cddlib/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   16 Jul 2020 04:46:18 -  1.1.1.1
+++ pkg/PLIST   20 Sep 2020 15:29:03 -
@@ -27,24 +27,23 @@
 @bin bin/testlp3_gmp
 @bin bin/testshoot
 @bin bin/testshoot_gmp
-include/cdd.h
-include/cdd_f.h
-include/cddmp.h
-include/cddmp_f.h
-include/cddtypes.h
-include/cddtypes_f.h
-include/setoper.h
-include/splitmix64.h
+include/cddlib/
+include/cddlib/cdd.h
+include/cddlib/cdd_f.h
+include/cddlib/cddmp.h
+include/cddlib/cddmp_f.h
+include/cddlib/cddtypes.h
+include/cddlib/cddtypes_f.h
+include/cddlib/setoper.h
+include/cddlib/splitmix64.h
 @static-lib lib/libcdd.a
 lib/libcdd.la
 @lib lib/libcdd.so.${LIBcdd_VERSION}
 @static-lib lib/libcddgmp.a
 lib/libcddgmp.la
 @lib lib/libcddgmp.so.${LIBcddgmp_VERSION}
+lib/pkgconfig/cddlib.pc
 share/doc/cddlib/
-share/doc/cddlib/cddlibman.dvi
-share/doc/cddlib/cddlibman.pdf
-share/doc/cddlib/cddlibman.ps
 share/doc/cddlib/examples/
 share/doc/cddlib/examples-ext/
 share/doc/cddlib/examples-ext/ccc4.ext


diff
Description: Binary data


Re: [UPDATE] security/plaso

2020-09-20 Thread Björn Ketelaars
On Sun 20/09/2020 19:52, Remi Pointel wrote:
> Hi,
> 
> these are the diff to update plaso and its dependencies.
> 
> Ok?

Update for devel/py-dtfabric needs a @conflict- and @pkgpath-marker in
PLIST. Please remove py-dtfabric from devel/Makefile, and add a quirk.
Diff below should be applied on top of your diff.

diff --git devel/Makefile devel/Makefile
index 1f98b7d1586..6e460ebe3ce 100644
--- devel/Makefile
+++ devel/Makefile
@@ -1427,7 +1427,6 @@
  SUBDIR += py-docopt
  SUBDIR += py-docopt,python3
  SUBDIR += py-doit
- SUBDIR += py-dtfabric
  SUBDIR += py-dtfabric,python3
  SUBDIR += py-dulwich,python3
  SUBDIR += py-easyprocess
diff --git devel/py-dtfabric/pkg/PLIST devel/py-dtfabric/pkg/PLIST
index 84dbbdd3db3..c8c3bdf5e7a 100644
--- devel/py-dtfabric/pkg/PLIST
+++ devel/py-dtfabric/pkg/PLIST
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.3 2018/09/07 05:54:13 rpointel Exp $
+@conflict py-dtfabric-*
+@pkgpath devel/py-dtfabric
 bin/validate-definitions${MODPY_BIN_SUFFIX}
 lib/python${MODPY_VERSION}/site-packages/dtfabric/
 
lib/python${MODPY_VERSION}/site-packages/dtfabric-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
diff --git devel/quirks/Makefile devel/quirks/Makefile
index 371ce7d1297..2723661e3f2 100644
--- devel/quirks/Makefile
+++ devel/quirks/Makefile
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-3.436
+PKGNAME =  quirks-3.437
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
diff --git devel/quirks/files/Quirks.pm devel/quirks/files/Quirks.pm
index aacf0b23643..8c345f70bdf 100644
--- devel/quirks/files/Quirks.pm
+++ devel/quirks/files/Quirks.pm
@@ -478,6 +478,7 @@ my $stem_extensions = {
 'rgain' => 'rgain3',
'py-urwid' => 'py3-urwid',
'py-ply' => 'py3-ply',
+   'py-dtfabric' => 'py3-dtfabric',
 };
 
 my $obsolete_reason = {



CVS: cvs.openbsd.org: ports

2020-09-20 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/09/20 12:49:43

Modified files:
x11/qt5/qtspeech: Makefile 
x11/qt5/qtspeech/pkg: PLIST-main 

Log message:
Fix text-to-speech in Qt5 by adding missing dependency



Re: removal of devel/py-gobject3 (!python3)

2020-09-20 Thread Klemens Nanni
On Sun, Sep 20, 2020 at 07:09:43PM +0200, Klemens Nanni wrote:
> I looked at x11/py-qt5 as user of the Python 2 flavour and came up with
> editors/py-qscintilla as user of py-qt5's Python 2 flavour.
> 
> `show-reverse-deps editors/py-qscintilla' lists geo/qgis as only user
> and qgis is Python 3 only, so we can make py-qscintilla Python 3 only
> as well - first step towards py-qt5 becoming Python 3 only.
> 
> I tested the following diff with
> 
>   $ cd /usr/ports
>   $ make -C devel/quirks package
>   ...
>   $ make -C editors/py-qscintilla package
>   ...
>   $ doas pkg_add py-qscintilla
>   py-qscintilla-2.11.4p2: ok
>   $ doas pkg_add -Dunsigned ./packages/`arch -s`/all/quirks-3.437.tgz
>   quirks-3.435->3.437: ok
>   $ doas pkg_add -Dunsigned ./packages/`arch 
> -s`/all/py3-qscintilla-2.11.4p3.tgz
>   py-qscintilla-2.11.4p2->py3-qscintilla-2.11.4p3: ok
>   Read shared items: ok
I now see that the -common subpackage hardcodes the "py-" prefix even
though it uses Python 3;  I can fix this in a separate diff.



[UPDATE] security/plaso

2020-09-20 Thread Remi Pointel

Hi,

these are the diff to update plaso and its dependencies.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/devel/py-dtfabric/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- Makefile3 Jul 2020 21:12:43 -   1.7
+++ Makefile20 Sep 2020 17:47:40 -
@@ -2,11 +2,10 @@
 
 COMMENT =  data type fabric
 
-MODPY_EGG_VERSION =20181128
+MODPY_EGG_VERSION =20200621
 DISTNAME = dtfabric-${MODPY_EGG_VERSION}
 
 PKGNAME =  py-${DISTNAME}
-REVISION = 1
 
 CATEGORIES =   devel
 
@@ -22,7 +21,7 @@ MODPY_PI =Yes
 RUN_DEPENDS =  textproc/py-yaml${MODPY_FLAVOR}
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 # make it possible to install both (un)FLAVORed packages alongside
 post-install:
Index: distinfo
===
RCS file: /cvs/ports/devel/py-dtfabric/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo4 Jan 2019 15:30:43 -   1.4
+++ distinfo20 Sep 2020 17:47:40 -
@@ -1,2 +1,2 @@
-SHA256 (dtfabric-20181128.tar.gz) = 
WP3DH4IeLhUoiTughqZEIO4z38FQRXCtoTs2TgmIPrU=
-SIZE (dtfabric-20181128.tar.gz) = 64507
+SHA256 (dtfabric-20200621.tar.gz) = 
12+PtB+UU8qKAGict6DgnEsLowk3bVGCs4WPUJCWx2E=
+SIZE (dtfabric-20200621.tar.gz) = 67827
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-dtfabric/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST   7 Sep 2018 05:54:13 -   1.3
+++ pkg/PLIST   20 Sep 2020 17:47:40 -
@@ -7,23 +7,21 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/dtfabric-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
 
lib/python${MODPY_VERSION}/site-packages/dtfabric-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/dtfabric/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dtfabric/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dtfabric/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/dtfabric/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/dtfabric/${MODPY_PYCACHE}data_types.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/dtfabric/${MODPY_PYCACHE}definitions.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/dtfabric/${MODPY_PYCACHE}errors.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/dtfabric/${MODPY_PYCACHE}py2to3.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/dtfabric/${MODPY_PYCACHE}reader.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/dtfabric/${MODPY_PYCACHE}registry.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/dtfabric/data_types.py
 lib/python${MODPY_VERSION}/site-packages/dtfabric/definitions.py
 lib/python${MODPY_VERSION}/site-packages/dtfabric/errors.py
-lib/python${MODPY_VERSION}/site-packages/dtfabric/py2to3.py
 lib/python${MODPY_VERSION}/site-packages/dtfabric/reader.py
 lib/python${MODPY_VERSION}/site-packages/dtfabric/registry.py
 lib/python${MODPY_VERSION}/site-packages/dtfabric/runtime/
 lib/python${MODPY_VERSION}/site-packages/dtfabric/runtime/__init__.py
-${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dtfabric/runtime/${MODPY_PYCACHE}
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/dtfabric/runtime/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/dtfabric/runtime/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/dtfabric/runtime/${MODPY_PYCACHE}byte_operations.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/dtfabric/runtime/${MODPY_PYCACHE}data_maps.${MODPY_PYC_MAGIC_TAG}pyc
Index: Makefile
===
RCS file: /cvs/ports/security/plaso/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- Makefile3 Jul 2020 21:13:05 -   1.15
+++ Makefile20 Sep 2020 16:07:35 -
@@ -2,7 +2,7 @@
 
 COMMENT =  engine and tools to automate creation of super timeline
 
-MODPY_EGG_VERSION =20200121
+MODPY_EGG_VERSION =20200717
 DISTNAME = plaso-${MODPY_EGG_VERSION}
 
 CATEGORIES =   security
@@ -15,7 +15,6 @@ MAINTAINER =  Remi Pointel https://github.com/log2timeline/plaso/releases/download/${MODPY_EGG_VERSION}/
 
@@ -23,7 +22,9 @@ MODULES = lang/python
 MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 MODPY_SETUPTOOLS = Yes
 
-RUN_DEPENDS += devel/py-bencode${MODPY_FLAVOR} \
+RUN_DEPENDS += archivers/py-lz4 \
+   databases/py-redis${MODPY_FLAVOR} \
+   devel/py-bencode${MODPY_FLAVOR} \
devel/py-biplist${MODPY_FLAVOR} 

Re: removal of devel/py-gobject3 (!python3)

2020-09-20 Thread Klemens Nanni
On Sun, Sep 20, 2020 at 12:09:24PM +0200, Antoine Jacoutot wrote:
> Hi.
> 
> Next version of devel/py-gobject3 will loose python2 support.
> Direct dependencies involve:
> 
> audio/exaile
> misc/gpsd
> x11/dbus-python
> 
> Out of these 3, x11/dbus-python is the most problematic because these are
> dependending on the non python3 FLAVOR of it:
> 
> audio/exaile
> editors/py-qscintilla
> net/pidgin
> x11/py-qt4
> x11/py-qt5
> x11/compiz/ccsm
> 
> We could use some help moving these to x11/dbus-python,python3 :-)
> Thanks.
I looked at x11/py-qt5 as user of the Python 2 flavour and came up with
editors/py-qscintilla as user of py-qt5's Python 2 flavour.

`show-reverse-deps editors/py-qscintilla' lists geo/qgis as only user
and qgis is Python 3 only, so we can make py-qscintilla Python 3 only
as well - first step towards py-qt5 becoming Python 3 only.

I tested the following diff with

$ cd /usr/ports
$ make -C devel/quirks package
...
$ make -C editors/py-qscintilla package
...
$ doas pkg_add py-qscintilla
py-qscintilla-2.11.4p2: ok
$ doas pkg_add -Dunsigned ./packages/`arch -s`/all/quirks-3.437.tgz
quirks-3.435->3.437: ok
$ doas pkg_add -Dunsigned ./packages/`arch 
-s`/all/py3-qscintilla-2.11.4p3.tgz
py-qscintilla-2.11.4p2->py3-qscintilla-2.11.4p3: ok
Read shared items: ok


Feedback? OK?

Index: editors/Makefile
===
RCS file: /cvs/ports/editors/Makefile,v
retrieving revision 1.141
diff -u -p -r1.141 Makefile
--- editors/Makefile28 Jun 2020 21:25:18 -  1.141
+++ editors/Makefile20 Sep 2020 16:31:07 -
@@ -51,7 +51,6 @@
  SUBDIR += nvi,iconv
  SUBDIR += py-neovim
  SUBDIR += py-neovim,python3
- SUBDIR += py-qscintilla
  SUBDIR += py-qscintilla,python3
  SUBDIR += qscintilla
  SUBDIR += scintilla
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1044
diff -u -p -r1.1044 Makefile
--- devel/quirks/Makefile   20 Sep 2020 04:27:37 -  1.1044
+++ devel/quirks/Makefile   20 Sep 2020 16:31:45 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-3.436
+PKGNAME =  quirks-3.437
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1062
diff -u -p -r1.1062 Quirks.pm
--- devel/quirks/files/Quirks.pm20 Sep 2020 04:27:37 -  1.1062
+++ devel/quirks/files/Quirks.pm20 Sep 2020 16:34:05 -
@@ -478,6 +478,7 @@ my $stem_extensions = {
 'rgain' => 'rgain3',
'py-urwid' => 'py3-urwid',
'py-ply' => 'py3-ply',
+   'py-qscintilla' => 'py3-qscintilla',
 };
 
 my $obsolete_reason = {
Index: editors/py-qscintilla/Makefile
===
RCS file: /cvs/ports/editors/py-qscintilla/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- editors/py-qscintilla/Makefile  3 Jul 2020 21:12:53 -   1.25
+++ editors/py-qscintilla/Makefile  20 Sep 2020 16:30:52 -
@@ -4,7 +4,7 @@ COMMENT-main =  Python binding for the S
 COMMENT-common =   common files for py-qscintilla
 
 VERSION =  2.11.4
-REVISION = 2
+REVISION = 3
 MODPY_EGG_VERSION =${VERSION}
 DISTNAME = QScintilla-${VERSION}
 
@@ -35,12 +35,10 @@ PYQTVER =   PyQt5
 SIPDIR =   share/sip/PyQt5${MODPY_BIN_SUFFIX}
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
-.if ${FLAVOR:Mpython3}
 FULLPKGNAME-main = ${PKGNAME-main:S/^py-/py3-/}
 FULLPKGPATH-main = editors/py-qscintilla,-main${MODPY_FLAVOR}
-.endif
 
 BUILD_DEPENDS =${RUN_DEPENDS}
 RUN_DEPENDS =  devel/py-sip${MODPY_FLAVOR} \
Index: editors/py-qscintilla/pkg/PLIST-common
===
RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST-common,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-common
--- editors/py-qscintilla/pkg/PLIST-common  19 Feb 2020 17:35:36 -  
1.1
+++ editors/py-qscintilla/pkg/PLIST-common  20 Sep 2020 16:52:01 -
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST-common,v 1.1 2020/02/19 17:35:36 juanfra Exp $
-@conflict py3-qscintilla-${QTVER}-*
+@conflict ${MODPY_PY_PREFIX}qscintilla-${QTVER}-*
 @pkgpath editors/py-qscintilla,${QTVER}
 lib/${QTVER}/qsci/
 lib/${QTVER}/qsci/api/
Index: editors/py-qscintilla/pkg/PLIST-main
===
RCS file: /cvs/ports/editors/py-qscintilla/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST-main
--- 

Re: Remove net/pcapdiff?

2020-09-20 Thread Kurt Mosiejczuk
On Sun, Sep 20, 2020 at 06:23:41PM +0200, Solene Rapenne wrote:

> I don't really care about the port itself, but I think we need to
> define a clear policy about python2 removal crusade.

> I get that python2 is end of life. We have lot of python2 ports that
> are python2 only. Do we remove python2 in X months/year and projects
> that still use python2 will have to be deleted? Do we try to delete
> every port requiring python2 ? At which cost?

> If we agree that python2 must disappear for 6.9 release, I would 
> understand the choice of deleting python2 ports.

> I am always ok to delete ports that are broken or network related
> and abandoned for safety reasons. But if a port works and doesn't
> seem to be a security risk to run I don't see strong reasons to
> remove it.

Well, my thoughts are this. There are ports that are python2 that *are*
very useful and needed. sthen has pointed out that Ubuntu and Red Hat have
committed to providing security updates to Python 2.7 for at least a few
years. So, those python2 ports we _need_, we keep.

However, many python libraries are dropping python2 support. So, for me,
right now, if we don't _need_ a port that is python2-only (or a python2
FLAVOR), I'd like to get rid of it, to minimize the rot in the ports tree
that needing to hold back updates to support python2 causes. Yes, we can
start doing special python2 versions of ports, etc. But, if something is
clearly not maintained upstream, upstream recommends moving on to
something else, it has no consumers, and there isn't a compelling need
for it, I'd like to remove it.

I'm slowly removing unneeded python2 stuff so when/if we _do_ eventually
decide to remove python 2.7, it will be easier. Also so the maintenance
of the rest of the python ports is easier. The Python ports tend to suffer
from lack of maintenance anyway, so why not make it easier?

--Kurt



CVS: cvs.openbsd.org: ports

2020-09-20 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/09/20 10:04:52

Modified files:
audio/beets: Makefile 
devel  : Makefile 
devel/py-algorithm-munkres: Makefile 
devel/py-algorithm-munkres/pkg: PLIST 

Log message:
Move devel/py-algorithm-munkres from MODPY_DEFAULT_VERSION_3 to
FLAVOR=python3. Also adjust its only soncumer, audio/beets

ok kn bket



[UPDATE] databases/py-redis

2020-09-20 Thread Remi Pointel

Hi,

this diff updates py-redis to latest release.

Ok?

Cheers,

Remi.
Index: Makefile
===
RCS file: /cvs/ports/databases/py-redis/Makefile,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 Makefile
--- Makefile3 Jul 2020 21:12:37 -   1.37
+++ Makefile20 Sep 2020 15:49:10 -
@@ -2,7 +2,7 @@
 
 COMMENT =  Python interface to Redis
 
-MODPY_EGG_VERSION =3.4.1
+MODPY_EGG_VERSION =3.5.3
 
 GH_ACCOUNT =   andymccurdy
 GH_PROJECT =   redis-py
@@ -10,7 +10,6 @@ GH_TAGNAME =  ${MODPY_EGG_VERSION}
 
 PKGNAME =  py-redis-${MODPY_EGG_VERSION}
 CATEGORIES =   databases
-REVISION = 0
 
 HOMEPAGE = https://github.com/andymccurdy/redis-py/
 
Index: distinfo
===
RCS file: /cvs/ports/databases/py-redis/distinfo,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 distinfo
--- distinfo16 Feb 2020 13:02:19 -  1.24
+++ distinfo20 Sep 2020 15:49:10 -
@@ -1,2 +1,2 @@
-SHA256 (redis-py-3.4.1.tar.gz) = S2ygO5DMShghLunyMeH8iyEGJWp24w7qdsPXzBEFc60=
-SIZE (redis-py-3.4.1.tar.gz) = 126587
+SHA256 (redis-py-3.5.3.tar.gz) = Dj7wSvV9FyB8LxOklkGmO5jgBAoQdWqCR+gzRotaggY=
+SIZE (redis-py-3.5.3.tar.gz) = 129884


Re: Remove textproc/glimpse?

2020-09-20 Thread Ingo Schwarze
Hi Klemens,

Klemens Nanni wrote on Sat, Sep 19, 2020 at 10:45:19PM +0200:
> On Sat, Sep 19, 2020 at 08:08:43PM +0200, Stefan Hagen wrote:

>> misc/tkman depends on textproc/glimpse.

Judging from patch-Makefile, it ought to be trivial to remove the
dependency on glimpse.

>> This one would have to go too.
>> I haven't found any other dependency.

> Thanks for digging, tkman looks like a port we could zap:  I can start
> it with `MANPATH=/usr/share/man tkman' and the window appears for a few
> seconds but then closes again without any error message or non-zero exit
> code.

I fail to reproduce the crash you report, but the window does contain
lots of error messages when i start tkman(1):

|| Problems in component paths of MANPATH environment variable...
|| /usr/share/man -- no `whatis' file for apropos
||=> generate `whatis' with mkwhatis/makewhatis/catman

The above basically means tkman is incompatible with OpenBSD at
least in some respects, though patching that might be possible and
perhaps even easy.  It obviously requires an old-style "whatis"
database which we deleted years ago.  It doesn't respect our
man.conf(5) either, instead hardcoding the manpath in patch-Makefile.
Requiring MANPATH to be set is quite bad.  People should *not* set
MANPATH because that will sooner or later cause some manual pages
to not be found.  The MANPATH feature is only intended for rare and
exotic tasks like reading non-English manual pages, like temporarily
using non-standard trees (e.g. from the man-pages-posix port), or
for debugging individual trees.

|| Stray cats (formatted pages in .../man/catN without corresponding
||   source in .../man/manN)
|| /usr/local/man/cat1
||   mwm uil xmbind xwit

That means it doesn't understand the concept of preformatted-only
pages either (which is used for pages where the source code is of
insufficient quality for installation, or unavailable in the first
place).

All that said, significant numbers of features (of which there are
really many) work as advertised at least part-way, even some that
i would have thought likely to fail outright.  So even though i
don't know how good the overall code quality really is, it does
seem to be surprisingly robust.

> Does anyone have a use for such an outdated manual browser/reader GUI
> which does not work by default and requires another ancient port?

There are some feature that may be interesting to some users, like

 * hypertext links
 * texinfo support
 * expandable/collapsable sections in manual pages
 * some fancy syntax highlighting (personally, i hate syntax
   highlighting, but i know many like it)
 * and several others

At the very least, the port implements several interesting ideas
that could inspire future development of manual page browsing
tools, so it would seem a bit sad from where i stand to kill it.

> OK to remove misc/tkman?

I wouldn't very strongly object to deletion if porters think that
the port makes their life harder or impedes progress, but given
that it looks like the dependency on glimpse can easily be
removed, i don't see which kind of trouble the port could cause.

It could certainly benefit from an active maintainer who
investigated and fixed issues.  My impression is significant
numbers of minor issues exist, but nothing that strikes me as
making the port completely useless.  Also, the patch-Makefile
contains some very outdated decisions.  For example, it
explicitly uses groff for formatting rather than mandoc.

Some work should be done on this one.  I have to admit that personally,
i care more about console support than about GUIs, but if somebody
wants to improve GUI support for manual page display on OpenBSD,
this port seems like child likely to reward some love shown to it.
Also, i'm not aware of a better GUI to display manual pages.

Yours,
  Ingo



removal of devel/py-gobject3 (!python3)

2020-09-20 Thread Antoine Jacoutot
Hi.

Next version of devel/py-gobject3 will loose python2 support.
Direct dependencies involve:

audio/exaile
misc/gpsd
x11/dbus-python

Out of these 3, x11/dbus-python is the most problematic because these are
dependending on the non python3 FLAVOR of it:

audio/exaile
editors/py-qscintilla
net/pidgin
x11/py-qt4
x11/py-qt5
x11/compiz/ccsm

We could use some help moving these to x11/dbus-python,python3 :-)
Thanks.

-- 
Antoine



CVS: cvs.openbsd.org: ports

2020-09-20 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/09/20 03:32:08

Modified files:
print/cups-filters: Makefile 
print/cups-filters/pkg: README 

Log message:
Rework documentation about direct priting.



Re: Killing gpg1

2020-09-20 Thread Edd Barrett
On Sat, Sep 19, 2020 at 12:14:07PM +0100, Edd Barrett wrote:
> I've just started a mini-bulk on anything which {RUN,BUILD}_DEPENDS on
> gnupg. I'll post any failures as they come in.

This completed without any failures (that was with security/gnupg2
removed entirely to ensure nothing could use it).

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk