CVS: cvs.openbsd.org: ports

2020-07-08 Thread Matthieu Herrb
CVSROOT:/cvs
Module name:ports
Changes by: matth...@cvs.openbsd.org2020/07/08 23:43:41

Modified files:
print/fontforge: Makefile 

Log message:
Adjust WANTLIB after the removal of libxkbui. ok killi@ kn@

fontforge didn't really use libkxbui despite the configure check that
pulled it in.



CVS: cvs.openbsd.org: ports

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

Modified files:
archivers/libzip: Makefile distinfo 
archivers/libzip/pkg: PLIST 

Log message:
Update to libzip-1.7.1 -- note the minor bump
Changelog: https://libzip.org/news/
ok kn@



UPDATE: archivers/libzip 1.6.1 => 1.7.1

2020-07-08 Thread Brian Callahan
Hi ports --

Attached is an update to libzip. Not very exciting, changelog is here:
https://libzip.org/news/

I was able to rebuild all its consumers successfully on amd64. Also
passes a make test on amd64 and sparc64.

OK?

~Brian
Index: Makefile
===
RCS file: /cvs/ports/archivers/libzip/Makefile,v
retrieving revision 1.23
diff -u -p -r1.23 Makefile
--- Makefile	4 Feb 2020 01:44:05 -	1.23
+++ Makefile	8 Jul 2020 21:11:03 -
@@ -2,9 +2,9 @@
 
 COMMENT=		library for reading, creating and modifying zip archives
 
-DISTNAME=		libzip-1.6.1
+DISTNAME=		libzip-1.7.1
 CATEGORIES=		archivers
-SHARED_LIBS +=  zip  4.0  # 5.0
+SHARED_LIBS +=  zip  4.1  # 5.0
 
 HOMEPAGE=		https://libzip.org/
 MAINTAINER=		Brian Callahan 
Index: distinfo
===
RCS file: /cvs/ports/archivers/libzip/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo	4 Feb 2020 01:44:05 -	1.16
+++ distinfo	8 Jul 2020 21:11:03 -
@@ -1,2 +1,2 @@
-SHA256 (libzip-1.6.1.tar.gz) = BuuOkUH9GeJ4jKuuqcnC/U1IjZ4UhOtHS7/Kx457HYg=
-SIZE (libzip-1.6.1.tar.gz) = 1214227
+SHA256 (libzip-1.7.1.tar.gz) = tZV7/36t+nbseccKfGGXKUkepiw4TiyfXeGzQRndO84=
+SIZE (libzip-1.7.1.tar.gz) = 1220469
Index: pkg/PLIST
===
RCS file: /cvs/ports/archivers/libzip/pkg/PLIST,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST
--- pkg/PLIST	4 Feb 2020 01:44:05 -	1.11
+++ pkg/PLIST	8 Jul 2020 21:11:03 -
@@ -4,6 +4,12 @@
 @bin bin/ziptool
 include/zip.h
 include/zipconf.h
+lib/cmake/
+lib/cmake/libzip/
+lib/cmake/libzip/libzip-config.cmake
+lib/cmake/libzip/libzip-targets${MODCMAKE_BUILD_SUFFIX}
+lib/cmake/libzip/libzip-targets.cmake
+lib/cmake/libzip/libzip-version.cmake
 @lib lib/libzip.so.${LIBzip_VERSION}
 lib/pkgconfig/libzip.pc
 @man man/man1/zipcmp.1
@@ -14,9 +20,11 @@ lib/pkgconfig/libzip.pc
 @man man/man3/zip_add.3
 @man man/man3/zip_add_dir.3
 @man man/man3/zip_close.3
+@man man/man3/zip_compression_method_supported.3
 @man man/man3/zip_delete.3
 @man man/man3/zip_dir_add.3
 @man man/man3/zip_discard.3
+@man man/man3/zip_encryption_method_supported.3
 @man man/man3/zip_error_clear.3
 @man man/man3/zip_error_code_system.3
 @man man/man3/zip_error_code_zip.3
@@ -34,6 +42,7 @@ lib/pkgconfig/libzip.pc
 @man man/man3/zip_fclose.3
 @man man/man3/zip_fdopen.3
 @man man/man3/zip_file_add.3
+@man man/man3/zip_file_attributes_init.3
 @man man/man3/zip_file_error_clear.3
 @man man/man3/zip_file_error_get.3
 @man man/man3/zip_file_extra_field_delete.3


NEW: audio/spek

2020-07-08 Thread 3un0s
Hi,

This is a port of spek a tool used to visualize audio spectrums,
analyse them and generate spectograms of your audio files.
It's useful to check if your audio file is mastered nicely.

Any comments or OK?


spek.tgz
Description: application/compressed-tar


CVS: cvs.openbsd.org: ports

2020-07-08 Thread Andrew Fresh
CVSROOT:/cvs
Module name:ports
Changes by: afre...@cvs.openbsd.org 2020/07/08 18:31:15

Modified files:
devel/p5-Test-Warnings: Makefile 

Log message:
FIX_EXTRACT_PERMISSIONS for devel/p5-Test-Warnings

Turns out I was wrong about not needing it.



NEW: net/delphinusdnsd

2020-07-08 Thread Ricardo
Hey @ports,

Delphinus DNS is a non-caching, non-recursing DNS server that serves
authoritative answers for A, , CNAME, DNSKEY, DS, MX, NAPTR, NS,
NSEC3, NSEC3PARAM, PTR, RRSIG, SOA, SRV, SSHFP, TLSA, and TXT resource
records.

Homepage: https://delphinusdns.org/

Works well on amd64.
OK? Any comments?

Take care.
Ricardo Santos

delphinusdnsd.tgz
Description: application/compressed-tar


Re: fix print/fontforge after libxkbui removal

2020-07-08 Thread Klemens Nanni
Cc'ing maintainer.

On Wed, Jul 08, 2020 at 11:28:04PM +0200, Matthieu Herrb wrote:
> according to sqlports, print/fontforge is the only remaining port
> depending on libxkbui. And in fact, it doesn't seem to use any
> function from this (long obsolete) library and build fine on a system
> whithout libxbui.
OK kn

> While adjusting WANTLIB to remove it, I found that it needs other
> adjustments.
  
> @@ -25,10 +25,10 @@ PERMIT_PACKAGE=   Yes
>  
>  WANTLIB =  ${MODPY_WANTLIB}
>  WANTLIB += ICE SM X11 Xext Xft Xi Xrender c cairo expat ffi fontconfig
> -WANTLIB += freetype gif glib-2.0 gmodule-2.0 gobject-2.0 graphite2
> -WANTLIB += gthread-2.0 harfbuzz iconv intl jpeg lzma m pango-1.0
> +WANTLIB += freetype gif fribidi glib-2.0 gobject-2.0 graphite2
> +WANTLIB += harfbuzz iconv intl jpeg lzma m pango-1.0
Can you add fribidi in alphabetical order, please?



Re: UPDATE: archivers/libzip 1.6.1 => 1.7.1

2020-07-08 Thread Klemens Nanni
On Wed, Jul 08, 2020 at 09:22:02PM +, Brian Callahan wrote:
> I was able to rebuild all its consumers successfully on amd64. Also
> passes a make test on amd64 and sparc64.
OK kn



py-astroid, pylint: Move to py3

2020-07-08 Thread Klemens Nanni
There are no py2 consumers of these two ports in our tree:

$ show-reverse-deps devel/py-astroid
devel/pylint
devel/pylint,-gui
devel/pylint,-main
devel/pylint,python3
devel/pylint,python3,-gui
devel/pylint,python3,-main
devel/spyder/spyder,python3
meta/gnome
meta/gnome,-extras
meta/gnome,-main
x11/gnome/totem
$ show-reverse-deps devel/pylint
devel/pylint,-gui
devel/pylint,python3,-gui
devel/spyder/spyder,python3
meta/gnome
meta/gnome,-extras
meta/gnome,-main
x11/gnome/totem

gnome depends on totem which uses ${MODY_DEFAULT_VERSION_3}.

Can we remove py2 versions of pylint and py-astroid?  If so, I'd
appreciate double checking of pylint's @conflict and @pkgpath markers.

Feedback? OK?

Index: devel/Makefile
===
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.2000
diff -u -p -r1.2000 Makefile
--- devel/Makefile  7 Jul 2020 13:06:07 -   1.2000
+++ devel/Makefile  8 Jul 2020 23:12:01 -
@@ -1323,7 +1323,6 @@
  SUBDIR += py-asn1,python3
  SUBDIR += py-asn1-modules
  SUBDIR += py-asn1-modules,python3
- SUBDIR += py-astroid
  SUBDIR += py-astroid,python3
  SUBDIR += py-async-timeout
  SUBDIR += py-atomicwrites
@@ -1767,7 +1766,6 @@
  SUBDIR += pyflakes,python3
  SUBDIR += pygame
  SUBDIR += pygame,python3
- SUBDIR += pylint
  SUBDIR += pylint,python3
  SUBDIR += pyrex
  SUBDIR += pyusb
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.990
diff -u -p -r1.990 Makefile
--- devel/quirks/Makefile   8 Jul 2020 21:03:02 -   1.990
+++ devel/quirks/Makefile   8 Jul 2020 23:07:08 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-3.382
+PKGNAME =  quirks-3.383
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1008
diff -u -p -r1.1008 Quirks.pm
--- devel/quirks/files/Quirks.pm8 Jul 2020 21:03:02 -   1.1008
+++ devel/quirks/files/Quirks.pm8 Jul 2020 23:11:33 -
@@ -439,8 +439,11 @@ my $stem_extensions = {
'py-cloudpickle' => 'py3-cloudpickle',
'py-podcastparser' => 'py3-podcastparser',
'py-configargparse' => 'py3-configargparse',
-'py-aiodns' => 'py3-aiodns',
+   'py-aiodns' => 'py3-aiodns',
'ebc' => 'bc-gh',
+   'py-astroid' => 'py3-astroid',
+   'pylint' => 'pylint3',
+   'pylint-gui' => 'pylint3-gui',
 };
 
 my $obsolete_reason = {
Index: devel/py-astroid/Makefile
===
RCS file: /cvs/ports/devel/py-astroid/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- devel/py-astroid/Makefile   3 Jul 2020 21:12:40 -   1.11
+++ devel/py-astroid/Makefile   8 Jul 2020 22:58:17 -
@@ -6,7 +6,7 @@ MODPY_EGG_VERSION = 1.4.9
 DISTNAME = astroid-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 CATEGORIES =   devel
-REVISION = 3
+REVISION = 4
 
 HOMEPAGE = http://www.astroid.org/
 
@@ -23,7 +23,7 @@ RUN_DEPENDS = devel/py-lazy-object-prox
devel/py-wrapt${MODPY_FLAVOR}
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR ?=  python3
 
 do-test:
cd ${WRKSRC} && \
Index: devel/py-astroid/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-astroid/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- devel/py-astroid/pkg/PLIST  13 Jun 2016 10:59:57 -  1.2
+++ devel/py-astroid/pkg/PLIST  8 Jul 2020 22:58:54 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.2 2016/06/13 10:59:57 shadchin Exp $
+@conflict py-astroid-*
+@pkgpath devel/py-astroid
 @pkgpath devel/py-logilab-astng
 lib/python${MODPY_VERSION}/site-packages/astroid/
 
lib/python${MODPY_VERSION}/site-packages/astroid-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
Index: devel/pylint/Makefile
===
RCS file: /cvs/ports/devel/pylint/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- devel/pylint/Makefile   3 Jul 2020 21:12:53 -   1.31
+++ devel/pylint/Makefile   8 Jul 2020 23:06:33 -
@@ -4,8 +4,8 @@ COMMENT-main=   lint-like code checker fo
 COMMENT-gui=   GUI for pylint
 
 MODPY_EGG_VERSION= 1.6.5
-REVISION-gui=  2
-REVISION-main= 2
+REVISION-gui=  3
+REVISION-main= 3
 DISTNAME=  

CVS: cvs.openbsd.org: ports

2020-07-08 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/07/08 16:57:41

Modified files:
devel/p5-ExtUtils-CppGuess: Makefile 
devel/p5-ExtUtils-Typemaps-Default: Makefile 
devel/p5-local-lib: Makefile 
devel/p5-Test-Command: Makefile 
math/nlopt : Makefile 
sysutils/ranger: Makefile 

Log message:
Drop myself as MAINTAINER



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Edd Barrett
CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2020/07/08 16:35:54

Modified files:
textproc/mdbook: Makefile distinfo 

Log message:
Update textproc/mdbook to 0.4.1.

Just as soon as I've committed 0.4.0, they've already released 0.4.1!

This release removes a load of unused dependencies.



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Edd Barrett
CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2020/07/08 16:18:41

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

Log message:
Update textproc/mdbook to version 0.4.0.

OK abieber@. Many thanks.



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Thomas Frohwein
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2020/07/08 15:40:43

Modified files:
games/vkquake  : Makefile 
Added files:
games/vkquake/patches: patch-Quake_gl_rmisc_c 

Log message:
replace removed VK_DYNAMIC_STATE_RANGE_SIZE
commit a869a22d9b51c68e57646fa20e4c40fc6db36760 on GitHub
noticed by naddy@



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Thomas Frohwein
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2020/07/08 15:37:50

Modified files:
graphics/vulkan-validation-layers: Makefile 

Log message:
now BDEP on spirv-headers; found by naddy@



fix print/fontforge after libxkbui removal

2020-07-08 Thread Matthieu Herrb
Hi,

according to sqlports, print/fontforge is the only remaining port
depending on libxkbui. And in fact, it doesn't seem to use any
function from this (long obsolete) library and build fine on a system
whithout libxbui.

While adjusting WANTLIB to remove it, I found that it needs other
adjustments.

diff --git print/fontforge/Makefile print/fontforge/Makefile
index 5973f811e32..ab815a63167 100644
--- print/fontforge/Makefile
+++ print/fontforge/Makefile
@@ -12,7 +12,7 @@ SHARED_LIBS=  fontforge   4.0 \
gioftp  2.1 \
gunicode5.1 \
gutils  2.1
-REVISION=  3
+REVISION=  4
 
 CATEGORIES=print
 
@@ -25,10 +25,10 @@ PERMIT_PACKAGE= Yes
 
 WANTLIB =  ${MODPY_WANTLIB}
 WANTLIB += ICE SM X11 Xext Xft Xi Xrender c cairo expat ffi fontconfig
-WANTLIB += freetype gif glib-2.0 gmodule-2.0 gobject-2.0 graphite2
-WANTLIB += gthread-2.0 harfbuzz iconv intl jpeg lzma m pango-1.0
+WANTLIB += freetype gif fribidi glib-2.0 gobject-2.0 graphite2
+WANTLIB += harfbuzz iconv intl jpeg lzma m pango-1.0
 WANTLIB += pangocairo-1.0 pangoft2-1.0 pangoxft-1.0 pcre pixman-1 png
-WANTLIB += pthread tiff util xcb xcb-render xcb-shm xkbfile xkbui xml2 z
+WANTLIB += pthread tiff util xcb xcb-render xcb-shm xml2 z zstd
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=fontforge/}
 

-- 
Matthieu Herrb



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2020/07/08 15:02:26

Removed files:
math/ebc   : Makefile distinfo 
math/ebc/pkg   : DESCR PLIST 

Log message:
Remove math/ebc; it has been renamed to math/bc-gh



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2020/07/08 15:03:02

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
Register quirks entry for ebc => bc-gh.



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2020/07/08 15:01:52

Modified files:
math   : Makefile 

Log message:
+bc-gh
-ebc



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2020/07/08 15:01:13

Log message:
Re-import math/ebc as math/bc-gh. Renaming because of upstream preference
for this name, plus convergence with other packaging systems that use this
name.

While here, update bc-gh to version 3.1.1. Also improve 64-bit check in the
Makefile.

ok jca@ some time ago

This is an implementation of the POSIX bc calculator that implements GNU
bc extensions as well as the period (.) extension from the BSD flavor of
bc.

This bc also includes an implementation of dc in the same binary,
accessible via a symbolic link, which implements all *BSD and GNU
extensions, though the ! command is omitted for security concerns.

Status:

Vendor Tag: bcallah
Release Tags:   bcallah_20200708

N ports/math/bc-gh/Makefile
N ports/math/bc-gh/distinfo
N ports/math/bc-gh/pkg/DESCR
N ports/math/bc-gh/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2020/07/08 14:55:25

Modified files:
devel/angr/py-z3-solver: Makefile 

Log message:
this port has an independent version number, restore the dropped revision



CVS: cvs.openbsd.org: ports

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

Modified files:
multimedia/streamlink: Makefile distinfo 
multimedia/streamlink/pkg: PLIST 

Log message:
Update to streamlink-1.5.0
Changelog: https://github.com/streamlink/streamlink/releases/tag/1.5.0



[Update] cad/xschem to 2.9.7

2020-07-08 Thread Hannu Vuolasaho
Hello!
This is a fresh release update from today.

A lot of improvement has happened since 2.9.2
support for gschem symbols and schematics has been added
and the gschem symbol library is also imported to xschem. That's why
the diff is so long.

I hope I got the paths correctly.

Best regards,
hannu Vuolasaho
Index: Makefile
===
RCS file: /cvs/ports/cad/xschem/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile	26 Sep 2019 14:55:22 -	1.4
+++ Makefile	8 Jul 2020 20:00:56 -
@@ -2,7 +2,7 @@
 
 COMMENT =		hierarchical schematic capture program
 
-DISTNAME =		xschem-2.9.2
+DISTNAME =		xschem-2.9.7
 
 CATEGORIES =		cad
 
@@ -33,7 +33,8 @@ CONFIGURE_ARGS =	--cflags/libs/script/tc
 			--ldflags/libs/script/tcl="-L${LOCALBASE}/lib" \
 			--cflags/libs/script/tk="${CFLAGS} -I${MODTK_INCDIR}" \
 			--prefix="${LOCALBASE}" \
-			/arg/tk-version=${MODTK_VERSION}
+			/arg/tk-version=${MODTK_VERSION} \
+			--xschem-lib-path="${LOCALBASE}/share/xschem/xschem_library/devices:${LOCALBASE}/share/xschem/xschem_library/gschem_import/"
 
 FAKE_FLAGS =		MANDIR="${DESTDIR}${PREFIX}/man" \
 			XEXAMPLESDIR="${DESTDIR}${PREFIX}/share/examples/xschem"
Index: distinfo
===
RCS file: /cvs/ports/cad/xschem/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo	26 Sep 2019 14:55:22 -	1.3
+++ distinfo	8 Jul 2020 20:00:56 -
@@ -1,2 +1,2 @@
-SHA256 (xschem-2.9.2.tar.gz) = CruN0gAFNqGT5Q7I5dDCx/APxFa5NBwRNWj59vo+BYU=
-SIZE (xschem-2.9.2.tar.gz) = 3751442
+SHA256 (xschem-2.9.7.tar.gz) = zKlhSkWOuJy4QnF3SguRMtl+kNIZwHz4LiND8ZHoOrI=
+SIZE (xschem-2.9.7.tar.gz) = 10028879
Index: patches/patch-scconfig_src_default_find_uname_c
===
RCS file: patches/patch-scconfig_src_default_find_uname_c
diff -N patches/patch-scconfig_src_default_find_uname_c
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-scconfig_src_default_find_uname_c	8 Jul 2020 20:00:56 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+This will clean up -R/usr/pkg from compilation lines.
+After all this isn't NetBSD
+Index: scconfig/src/default/find_uname.c
+--- scconfig/src/default/find_uname.c.orig
 scconfig/src/default/find_uname.c
+@@ -73,6 +73,7 @@ typedef struct {
+should depend on it.
+Order *does* matter */
+ uname_t unames[] = {
++	{"[Oo]pen[Bb][Ss][Dd]",   "OpenBSD", "UNIX",  sys_unix},
+ 	{"[Nn]et[Bb][Ss][Dd]",   "NetBSD", "UNIX",  sys_netbsd},
+ 	{"[Ll]inux", "Linux",  "UNIX",  sys_unix},
+ 	{"[Bb][Ss][Dd]", "BSD","UNIX",  sys_unix},
Index: patches/patch-src_Makefile_in
===
RCS file: patches/patch-src_Makefile_in
diff -N patches/patch-src_Makefile_in
--- /dev/null	1 Jan 1970 00:00:00 -
+++ patches/patch-src_Makefile_in	8 Jul 2020 20:00:56 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+Don't put rawtovcd to shared dir
+Index: src/Makefile.in
+--- src/Makefile.in.orig
 src/Makefile.in
+@@ -13,7 +13,7 @@ put /local/install_shares {
+  keys.help xschem.help xschem.tcl break.awk convert_to_verilog2001.awk
+  flatten.awk make_sym.awk symgen.awk order_labels.awk sort_labels.awk spice.awk
+  tedax.awk verilog.awk vhdl.awk hspice_backannotate.tcl change_index.tcl
+- xschemrc ngspice_backannotate.tcl rawtovcd gschemtoxschem.awk
++ xschemrc ngspice_backannotate.tcl gschemtoxschem.awk
+ }
+ 
+ # generate a list of objects from the list of source files
Index: patches/patch-xschem_library_Makefile
===
RCS file: /cvs/ports/cad/xschem/patches/patch-xschem_library_Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 patch-xschem_library_Makefile
--- patches/patch-xschem_library_Makefile	12 Feb 2019 17:17:24 -	1.2
+++ patches/patch-xschem_library_Makefile	8 Jul 2020 20:00:56 -
@@ -1,26 +1,91 @@
 $OpenBSD: patch-xschem_library_Makefile,v 1.2 2019/02/12 17:17:24 kn Exp $
 
-Put examples into right place
+Put examples into right place and gschem imported symbols available
 
 Index: xschem_library/Makefile
 --- xschem_library/Makefile.orig
 +++ xschem_library/Makefile
-@@ -5,13 +5,13 @@ all:
+@@ -5,45 +5,48 @@ all:
  include ../Makefile.conf
  
  install: FORCE
--	$(SCCBOX) mkdir -p $(system_library_dir) $(XDOCDIR)/examples $(XDOCDIR)/pcb
-+	$(SCCBOX) mkdir -p $(system_library_dir) $(XEXAMPLESDIR)/pcb
- 	$(SCCBOX) install -f -d devices/*.sym $(system_library_dir)
- 	$(SCCBOX) install -f -d devices/*.sch $(system_library_dir)
--	$(SCCBOX) install -f -d examples/*.sym $(XDOCDIR)/examples
--	$(SCCBOX) install -f -d examples/*.sch $(XDOCDIR)/examples
--	$(SCCBOX) install -f -d pcb/*.sym $(XDOCDIR)/pcb
--	$(SCCBOX) install -f -d pcb/*.sch $(XDOCDIR)/pcb
-+	$(SCCBOX) install -f -d examples/*.sym $(XEXAMPLESDIR)
-+	$(SCCBOX) install -f -d examples/*.sch $(XEXAMPLESDIR)
-+	$(SCCBOX) install -f -d 

[update] net/synapse -> 1.16.0

2020-07-08 Thread Renaud Allard

Hello,

Here is a quick diff for net/synapse to bring it to 1.16.0.

Regards
Index: Makefile
===
RCS file: /cvs/ports/net/synapse/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile5 Jul 2020 09:34:50 -   1.10
+++ Makefile8 Jul 2020 16:11:00 -
@@ -2,7 +2,7 @@
 
 COMMENT =  open network for secure, decentralized communication
 
-MODPY_EGG_VERSION =1.15.2
+MODPY_EGG_VERSION =1.16.0
 
 GH_ACCOUNT =   matrix-org
 GH_PROJECT =   synapse
Index: distinfo
===
RCS file: /cvs/ports/net/synapse/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo5 Jul 2020 09:34:50 -   1.8
+++ distinfo8 Jul 2020 16:11:00 -
@@ -1,2 +1,2 @@
-SHA256 (synapse-1.15.2.tar.gz) = FcGYwpYVlzD55bwud3zpSJKxrZPaDRAWE+lXeSp26hc=
-SIZE (synapse-1.15.2.tar.gz) = 6717409
+SHA256 (synapse-1.16.0.tar.gz) = jawOZPBC7tEIZ8IWPvgTTEHpWgrJ2saXJDYqSPP+8Zo=
+SIZE (synapse-1.16.0.tar.gz) = 6730312
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/synapse/pkg/PLIST,v
retrieving revision 1.7
diff -u -p -r1.7 PLIST
--- pkg/PLIST   11 Jun 2020 15:24:29 -  1.7
+++ pkg/PLIST   8 Jul 2020 16:11:00 -
@@ -117,6 +117,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}redis.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}registration.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}repository.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}room.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}room_directory.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}saml2_config.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/config/${MODPY_PYCACHE}server.${MODPY_PYC_MAGIC_TAG}pyc
@@ -154,6 +155,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/synapse/config/redis.py
 lib/python${MODPY_VERSION}/site-packages/synapse/config/registration.py
 lib/python${MODPY_VERSION}/site-packages/synapse/config/repository.py
+lib/python${MODPY_VERSION}/site-packages/synapse/config/room.py
 lib/python${MODPY_VERSION}/site-packages/synapse/config/room_directory.py
 lib/python${MODPY_VERSION}/site-packages/synapse/config/saml2_config.py
 lib/python${MODPY_VERSION}/site-packages/synapse/config/server.py
@@ -1153,6 +1155,8 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/delta/58/03persist_ui_auth.sql
 
lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/delta/58/05cache_instance.sql.postgres
 
lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/delta/58/06dlols_unique_idx.py
+lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/delta/58/08_media_safe_from_quarantine.sql.postgres
+lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/delta/58/08_media_safe_from_quarantine.sql.sqlite
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/delta/58/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/delta/58/${MODPY_PYCACHE}06dlols_unique_idx.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/synapse/storage/data_stores/main/schema/full_schemas/


smime.p7s
Description: S/MIME Cryptographic Signature


[MAINTAINER UPDATE] www/sblg to 0.5.9

2020-07-08 Thread Bryan Vyhmeister
This is another simple maintainer update of sblg from 0.5.8 to 0.5.9.
The changes included in this release are:

sblg 0.5.9: "Extensive portability work. Internally switches to
pkg-config(1) for detecting dependency locations. Now builds and
installs properly on most popular UNIX systems."

I did testing on amd64 with no issues. It should work fine everywhere.
If someone could ok and commit, that would be great. Thank you.

Bryan


Index: www/sblg/Makefile
===
RCS file: /cvs/ports/www/sblg/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- www/sblg/Makefile   3 Nov 2019 19:56:42 -   1.27
+++ www/sblg/Makefile   8 Jul 2020 19:11:52 -
@@ -2,7 +2,7 @@
 
 COMMENT =  simple off-line blog utility
 
-DISTNAME = sblg-0.5.8
+DISTNAME = sblg-0.5.9
 CATEGORIES =   www
 
 HOMEPAGE = https://kristaps.bsd.lv/sblg/
Index: www/sblg/distinfo
===
RCS file: /cvs/ports/www/sblg/distinfo,v
retrieving revision 1.25
diff -u -p -r1.25 distinfo
--- www/sblg/distinfo   3 Nov 2019 19:56:42 -   1.25
+++ www/sblg/distinfo   8 Jul 2020 19:11:52 -
@@ -1,2 +1,2 @@
-SHA256 (sblg-0.5.8.tar.gz) = Gy8xCfN1DN749+OFlTJ5wE6EuJMyjj1zrOVPN23bjsg=
-SIZE (sblg-0.5.8.tar.gz) = 1448005
+SHA256 (sblg-0.5.9.tar.gz) = 5TiVzJgUzy+o9fnnvmuPBg8kKgSGMDcT1N56psK6hVE=
+SIZE (sblg-0.5.9.tar.gz) = 1456016



Update: net/profanity 0.9.4 -> 0.9.5

2020-07-08 Thread 3un0s
This release fixes a segfault when running "/theme properties".

Tests pass.

Any comments or OK?
Index: Makefile
===
RCS file: /cvs/ports/net/profanity/Makefile,v
retrieving revision 1.16
diff -u -p -u -r1.16 Makefile
--- Makefile	3 Jul 2020 21:13:00 -	1.16
+++ Makefile	8 Jul 2020 12:53:34 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.16 2020/07/03 21:13:00 sthen Exp $
 
 COMMENT =	console based XMPP client
-DISTNAME =	profanity-0.9.4
+DISTNAME =	profanity-0.9.5
 CATEGORIES =	net
 REVISION =	0
 
Index: distinfo
===
RCS file: /cvs/ports/net/profanity/distinfo,v
retrieving revision 1.9
diff -u -p -u -r1.9 distinfo
--- distinfo	29 Jun 2020 04:54:59 -	1.9
+++ distinfo	8 Jul 2020 12:53:50 -
@@ -1,2 +1,2 @@
-SHA256 (profanity-0.9.4.tar.gz) = ZVcKAV5EE3+H2Q2q3R4+vHyNpQ8lMlsGqksT9YuThfo=
-SIZE (profanity-0.9.4.tar.gz) = 830413
+SHA256 (profanity-0.9.5.tar.gz) = I/ey5cbPhZE7nnoiiAK8qeyx0c87+PjyhelnYXaiSQI=
+SIZE (profanity-0.9.5.tar.gz) = 830966


Re: Update: net/py-slixmpp 1.4.2 -> 1.5.2

2020-07-08 Thread Björn Ketelaars
On Wed 08/07/2020 16:09, Paco Esteban wrote:
> On Wed, 08 Jul 2020, Björn Ketelaars wrote:
> 
> > On Wed 08/07/2020 10:39, Paco Esteban wrote:
> > > Comments/ok welcome.
> > 
> > Diff looks ok, though you should run 'make update-patches'. Builds ok.
> 
> You're right.  Diff included at the end with the update-patches.
> 
> > 
> > Guess having a newer version of py3-cares is important as (all) tests
> > fail when having the version from ports (py-cares-2.4.0;p1) around.
> > Updating to py-cares-3.1.1 (from kmos@, which has not been committed
> > yet) seems to be a requirement, though one test still fails.
> 
> Yes, but that's probably the new net/py-aiodns that depends on
> py-cares>=3.0.0
> 
> It went in yesterday, I did not realize that, sorry :-/
> 
> The failing test was there before the update, it's because it tries to
> connect to an xmpp server at localhost if I'm not mistaken.

After the update of py-cares has been committed, which has not happened
yet: OK bket@



Re: Update: net/py-slixmpp 1.4.2 -> 1.5.2

2020-07-08 Thread Paco Esteban
On Wed, 08 Jul 2020, Björn Ketelaars wrote:

> On Wed 08/07/2020 10:39, Paco Esteban wrote:
> > Comments/ok welcome.
> 
> Diff looks ok, though you should run 'make update-patches'. Builds ok.

You're right.  Diff included at the end with the update-patches.

> 
> Guess having a newer version of py3-cares is important as (all) tests
> fail when having the version from ports (py-cares-2.4.0;p1) around.
> Updating to py-cares-3.1.1 (from kmos@, which has not been committed
> yet) seems to be a requirement, though one test still fails.

Yes, but that's probably the new net/py-aiodns that depends on
py-cares>=3.0.0

It went in yesterday, I did not realize that, sorry :-/

The failing test was there before the update, it's because it tries to
connect to an xmpp server at localhost if I'm not mistaken.
> 
> = test session starts 
> ==
> platform openbsd6 -- Python 3.8.3, pytest-4.4.0, py-1.8.0, pluggy-0.11.0
> rootdir: /tmp/ports/pobj/py-slixmpp-1.5.2-python3/slixmpp-1.5.2
> collected 370 items
> 
> tests/live_multiple_streams.py ..[  
> 0%]
> tests/live_test.py F [  
> 0%]
> tests/test_cache.py  [  
> 1%]
> tests/test_events.py [  
> 2%]
> tests/test_jid.py    [ 
> 12%]
> tests/test_overall.py .. [ 
> 12%]
> tests/test_plugins.py .. [ 
> 14%]
> tests/test_stanza_base.py .  [ 
> 15%]
> tests/test_stanza_element.py ... [ 
> 24%]
> tests/test_stanza_error.py   [ 
> 25%]
> tests/test_stanza_gmail.py ..[ 
> 25%]
> tests/test_stanza_iq.py .[ 
> 27%]
> tests/test_stanza_message.py ... [ 
> 28%]
> tests/test_stanza_presence.py    [ 
> 29%]
> tests/test_stanza_roster.py ...  [ 
> 30%]
> tests/test_stanza_xep_0004.py ...[ 
> 31%]
> tests/test_stanza_xep_0009.py    [ 
> 35%]
> tests/test_stanza_xep_0030.py .  [ 
> 42%]
> tests/test_stanza_xep_0033.py    [ 
> 44%]
> tests/test_stanza_xep_0047.py    [ 
> 45%]
> tests/test_stanza_xep_0050.py .. [ 
> 46%]
> tests/test_stanza_xep_0059.py ...[ 
> 48%]
> tests/test_stanza_xep_0060.py ...[ 
> 53%]
> tests/test_stanza_xep_0085.py .  [ 
> 54%]
> tests/test_stanza_xep_0122.py .  [ 
> 55%]
> tests/test_stanza_xep_0184.py .. [ 
> 55%]
> tests/test_stanza_xep_0300.py .. [ 
> 56%]
> tests/test_stanza_xep_0323.py .  [ 
> 58%]
> tests/test_stanza_xep_0325.py    [ 
> 60%]
> tests/test_stanza_xep_0380.py .  [ 
> 60%]
> tests/test_stream.py ... [ 
> 61%]
> tests/test_stream_exceptions.py  [ 
> 62%]
> tests/test_stream_filters.py ..  [ 
> 62%]
> tests/test_stream_handlers.py .. [ 
> 64%]
> tests/test_stream_presence.py ...[ 
> 66%]
> tests/test_stream_roster.py ..   [ 
> 68%]
> tests/test_stream_xep_0030.py .. [ 
> 72%]
> tests/test_stream_xep_0047.py ...[ 
> 73%]
> tests/test_stream_xep_0050.py ...[ 
> 76%]
> tests/test_stream_xep_0060.py ...[ 
> 87%]
> tests/test_stream_xep_0066.py .  [ 
> 87%]
> tests/test_stream_xep_0085.py .  [ 
> 87%]
> tests/test_stream_xep_0092.py .. [ 
> 88%]
> tests/test_stream_xep_0128.py .. [ 
> 88%]
> tests/test_stream_xep_0249.py .. [ 
> 89%]
> tests/test_stream_xep_0323.py s  [ 
> 94%]
> 

Re: Update: net/py-slixmpp 1.4.2 -> 1.5.2

2020-07-08 Thread Björn Ketelaars
On Wed 08/07/2020 10:39, Paco Esteban wrote:
> Comments/ok welcome.

Diff looks ok, though you should run 'make update-patches'. Builds ok.

Guess having a newer version of py3-cares is important as (all) tests
fail when having the version from ports (py-cares-2.4.0;p1) around.
Updating to py-cares-3.1.1 (from kmos@, which has not been committed
yet) seems to be a requirement, though one test still fails.


= test session starts ==
platform openbsd6 -- Python 3.8.3, pytest-4.4.0, py-1.8.0, pluggy-0.11.0
rootdir: /tmp/ports/pobj/py-slixmpp-1.5.2-python3/slixmpp-1.5.2
collected 370 items

tests/live_multiple_streams.py ..[  0%]
tests/live_test.py F [  0%]
tests/test_cache.py  [  1%]
tests/test_events.py [  2%]
tests/test_jid.py    [ 12%]
tests/test_overall.py .. [ 12%]
tests/test_plugins.py .. [ 14%]
tests/test_stanza_base.py .  [ 15%]
tests/test_stanza_element.py ... [ 24%]
tests/test_stanza_error.py   [ 25%]
tests/test_stanza_gmail.py ..[ 25%]
tests/test_stanza_iq.py .[ 27%]
tests/test_stanza_message.py ... [ 28%]
tests/test_stanza_presence.py    [ 29%]
tests/test_stanza_roster.py ...  [ 30%]
tests/test_stanza_xep_0004.py ...[ 31%]
tests/test_stanza_xep_0009.py    [ 35%]
tests/test_stanza_xep_0030.py .  [ 42%]
tests/test_stanza_xep_0033.py    [ 44%]
tests/test_stanza_xep_0047.py    [ 45%]
tests/test_stanza_xep_0050.py .. [ 46%]
tests/test_stanza_xep_0059.py ...[ 48%]
tests/test_stanza_xep_0060.py ...[ 53%]
tests/test_stanza_xep_0085.py .  [ 54%]
tests/test_stanza_xep_0122.py .  [ 55%]
tests/test_stanza_xep_0184.py .. [ 55%]
tests/test_stanza_xep_0300.py .. [ 56%]
tests/test_stanza_xep_0323.py .  [ 58%]
tests/test_stanza_xep_0325.py    [ 60%]
tests/test_stanza_xep_0380.py .  [ 60%]
tests/test_stream.py ... [ 61%]
tests/test_stream_exceptions.py  [ 62%]
tests/test_stream_filters.py ..  [ 62%]
tests/test_stream_handlers.py .. [ 64%]
tests/test_stream_presence.py ...[ 66%]
tests/test_stream_roster.py ..   [ 68%]
tests/test_stream_xep_0030.py .. [ 72%]
tests/test_stream_xep_0047.py ...[ 73%]
tests/test_stream_xep_0050.py ...[ 76%]
tests/test_stream_xep_0060.py ...[ 87%]
tests/test_stream_xep_0066.py .  [ 87%]
tests/test_stream_xep_0085.py .  [ 87%]
tests/test_stream_xep_0092.py .. [ 88%]
tests/test_stream_xep_0128.py .. [ 88%]
tests/test_stream_xep_0249.py .. [ 89%]
tests/test_stream_xep_0323.py s  [ 94%]
tests/test_stream_xep_0325.py .  [ 97%]
tests/test_tostring.py .

=== FAILURES ===
_ TestLiveStream.testClientConnection __

self = 

def testClientConnection(self):
"""Test that we can interact with a live ClientXMPP instance."""
self.stream_start(mode='client',
  socket='live',
  skip=False,
  jid='user@localhost/test',
  password='user')

# Use sid=None to ignore any id sent by the 

NEW: devel/py-urwidtrees

2020-07-08 Thread deserter666
Hey, this is a new port, which provides widget container API for
urwid toolkit. It uses a MVC approach and allows you to build trees
of widgets. This is necessary dependency for the upcoming port.

Any comments?

py-urwidtrees.tar.gz
Description: application/gzip


CVS: cvs.openbsd.org: ports

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

Modified files:
audio/mpd  : Makefile distinfo 

Log message:
Update to mpd-0.21.25

Changes:
https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.25/NEWS

OK landry@



CVS: cvs.openbsd.org: ports

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

Modified files:
audio/libmpdclient: Makefile distinfo 
audio/libmpdclient/pkg: PLIST 

Log message:
Update to libmpdclient-2.19

Changes:
https://raw.githubusercontent.com/MusicPlayerDaemon/libmpdclient/v2.19/NEWS

Minor bump because of symbol addition.

OK landry@



CVS: cvs.openbsd.org: ports

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

Modified files:
devel/ipython  : Makefile 
Added files:
devel/ipython/patches: patch-IPython_core_interactiveshell_py 

Log message:
Fix ipython-5.8.0 on python-3.8

Fix issue due to changes in ast.Module.

"...fine by me. Please go ahead." edd@ (maintainer)



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2020/07/08 05:33:28

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
remove quirk for qtserialport

It was here for its qt4 version but x11/qt5/qtserialport has the same
PKGNAME, and is thus wrongly listed as obsolete..



Re: NEW: math/4ti2

2020-07-08 Thread deserter666
On Tue, July 7, 2020 11:47 pm, Daniel Dickman wrote:
>
>
> seems like it does everything except classify the finite simple groups
> :-)
>
>
> It's a nice port, but I had a few minor suggestions:
Appreciate the feedback :)

> 1) I simplified the top of the Makefile so there's only one place for the
> version for future updates (see below)
> 2) for CONFIGURE_ARGS, can we put each arg on a new line?
Hey I've made the appropriate changes and reattched the port.

> 3) Too bad about USE_GMAKE. I think it gets close to building without
gnu > make except for the use of $< in a few Makefile.am files. Maybe
report >  > upstream and see if they're willing to make slightly
> more portable?
Also I'll take the issue to upstream soon.

> 4) "make test" didn't work here. Not sure if I flubbed
> something on my end or you see the same thing. If it doesn't work add
> NO_TEST. If it can be
> made to work, even better.
The tests fail only because of a improper shebang.
sed -ie "s/bash/sh/" $(grep "bash" -R ${WRKSRC}/test | cut -d : -f 1)
And all should tests pass, as claimed. No need for NO_TEST.

Anyway I've added do-test: to the Makefile so no need to deal with that.

OK?

4ti2.tar.gz
Description: application/gzip


CVS: cvs.openbsd.org: ports

2020-07-08 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2020/07/08 05:01:00

Modified files:
geo/gdal   : Makefile distinfo 

Log message:
Update to gdal 3.1.2.

See https://lists.osgeo.org/pipermail/gdal-dev/2020-July/052395.html



Re: Update: net/py-cares 2.4.0 -> 3.1.1

2020-07-08 Thread Paco Esteban
On Tue, 07 Jul 2020, Kurt Mosiejczuk wrote:

> On Thu, Jun 18, 2020 at 01:30:43AM -0400, Kurt Mosiejczuk wrote:
> > On Fri, May 29, 2020 at 06:48:05AM +0200, Bjorn Ketelaars wrote:
> 
> > > > This updates net/py-cares to 3.1.1
> 
> > > > The biggest change is dropping Python 2.x support.
> 
> > > > None of the consumers were python2, so not a problem.
> 
> > > > I moved the tests to pytest.
> 
> > > > Tests pass except for a handful that don't seem to have anything to do
> > > > with the changes.
> 
> > > > ok?
> 
> > > As you are dropping py2-support, is there a reason for not setting a
> > > conflict- and pkgpath- marker in PLIST? 
> 
> > I thought that was to migrate someone automatically to the newer version,
> > which isn't necessarily what they would want.  If they are using the python2
> > version for some reason, installing the python3 version instead won't help
> > them.
> 
> Here's a version with the conflict and pkgpath markers in PLIST.
> 
> ok?
> 
> --Kurt
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/py-cares/Makefile,v
> retrieving revision 1.13
> diff -u -p -r1.13 Makefile
> --- Makefile  3 Jul 2020 21:13:00 -   1.13
> +++ Makefile  7 Jul 2020 18:37:42 -
> @@ -3,11 +3,10 @@
>  # using bundled c-ares which is patched for TTL support
>  COMMENT =python interface for c-ares
>  
> -MODPY_EGG_VERSION =  2.4.0
> +MODPY_EGG_VERSION =  3.1.1
>  DISTNAME =   pycares-${MODPY_EGG_VERSION}
>  PKGNAME =py-cares-${MODPY_EGG_VERSION}
>  CATEGORIES = net
> -REVISION =   1
>  
>  # MIT
>  PERMIT_PACKAGE = Yes
> @@ -18,17 +17,16 @@ MODULES = lang/python
>  
>  MODPY_PI =   Yes
>  MODPY_SETUPTOOLS =   Yes
> +MODPY_PYTEST =   Yes
> +MODPY_PYTEST_ARGS =  tests/tests.py
>  
>  USE_GMAKE =  Yes
>  
>  FLAVORS =python3
> -FLAVOR ?=
> +FLAVOR = python3
>  
>  RUN_DEPENDS =devel/py-cffi${MODPY_FLAVOR}
>  BUILD_DEPENDS =  ${RUN_DEPENDS}
>  TEST_DEPENDS =   ${FULLPKGNAME}:${BUILD_PKGPATH}
> -
> -do-test:
> - cd ${WRKSRC} && ${MODPY_BIN} tests/tests.py
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/py-cares/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo  3 Jan 2019 14:20:57 -   1.6
> +++ distinfo  7 Jul 2020 18:37:42 -
> @@ -1,2 +1,2 @@
> -SHA256 (pycares-2.4.0.tar.gz) = Dsy3bf8BVd33k6WJxicOG9v2l1soJNGNHSPbIHXX/JY=
> -SIZE (pycares-2.4.0.tar.gz) = 214021
> +SHA256 (pycares-3.1.1.tar.gz) = GN/U/TAPVw1sRTbB2Ye3t2c7Kp0UNGWSxdbtcW3w0QQ=
> +SIZE (pycares-3.1.1.tar.gz) = 233742
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/py-cares/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -r1.3 PLIST
> --- pkg/PLIST 12 Aug 2017 16:17:10 -  1.3
> +++ pkg/PLIST 7 Jul 2020 18:37:42 -
> @@ -1,9 +1,13 @@
>  @comment $OpenBSD: PLIST,v 1.3 2017/08/12 16:17:10 danj Exp $
> +@conflict net/py-cares-*
> +@pkgpath net/py-cares
>  lib/python${MODPY_VERSION}/site-packages/pycares/
>  
> lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>  
> lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
>  
> lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
>  
> lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> +lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/not-zip-safe
> +lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
>  
> lib/python${MODPY_VERSION}/site-packages/pycares-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
>  lib/python${MODPY_VERSION}/site-packages/pycares/__init__.py
>  lib/python${MODPY_VERSION}/site-packages/pycares/__main__.py
> @@ -12,6 +16,8 @@ lib/python${MODPY_VERSION}/site-packages
>  
> lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}errno.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/pycares/_core.so
> +lib/python${MODPY_VERSION}/site-packages/pycares/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
> +@so lib/python${MODPY_VERSION}/site-packages/pycares/_cares.so
>  lib/python${MODPY_VERSION}/site-packages/pycares/_version.py
>  lib/python${MODPY_VERSION}/site-packages/pycares/errno.py
> +lib/python${MODPY_VERSION}/site-packages/pycares/utils.py
> 

tests are more or less the 

Re: Update: poezio 0.12 -> 0.13.1

2020-07-08 Thread Paco Esteban
On Tue, 07 Jul 2020, Kurt Mosiejczuk wrote:

> Now updated to 0.13.1
> 
> ok?
> 
> --Kurt
> ...
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/net/poezio/pkg/PLIST,v
> retrieving revision 1.5
> diff -u -p -r1.5 PLIST
> --- pkg/PLIST 6 Sep 2018 15:50:41 -   1.5
> +++ pkg/PLIST 7 Jul 2020 18:49:05 -
> @@ -1,6 +1,8 @@
>  @comment $OpenBSD: PLIST,v 1.5 2018/09/06 15:50:41 danj Exp $
>  bin/poezio
>  bin/poezio_logs
> +lib/python${MODPY_VERSION}/
> +lib/python${MODPY_VERSION}/site-packages/

Are those 2 "normal" ?

Other than that, ok paco.

-- 
Paco Esteban.
0x5818130B8A6DBC03



Re: Update: net/py-slixmpp 1.4.2 -> 1.5.2

2020-07-08 Thread Paco Esteban
On Tue, 07 Jul 2020, Stuart Henderson wrote:

> On 2020/07/07 22:49, Solene Rapenne wrote:
> > On Thu, 28 May 2020 22:49:07 -0400
> > Kurt Mosiejczuk :
> > 
> > > This updates py-slixmpp to 1.5.2
> > > 
> > > Sadly, there doesn't seem to be a changelog.
> > > 
> > > While here I moved it to the new way to of doing python3-only
> > > libraries.
> > > 
> > > All tests but one pass and that seems to be an interaction with pytest.
> > > 
> > > (The one consumer is poezio, which has an update coming right after this)
> > > 
> > > ok?
> > 
> > hi
> > 
> > Using your diff (I changed the REVISION to 3 to make it apply)
> > I get a conflict error at "make install" step.
> > 
> > Link to /home/build/usr/ports/packages/amd64/ftp/py3-slixmpp-1.5.2.tgz
> > ===> py3-slixmpp-1.5.2 depends on: py3-asn1-* -> py3-asn1-0.4.8p0v0
> > ===> py3-slixmpp-1.5.2 depends on: py3-asn1-modules-* -> 
> > py3-asn1-modules-0.2.7p0
> > ===> py3-slixmpp-1.5.2 depends on: py3-aiodns-* -> py3-aiodns-1.2.0p2
> > ===> py3-slixmpp-1.5.2 depends on: py3-aiohttp-* -> py3-aiohttp-3.5.4p3
> > ===>  Installing py3-slixmpp-1.5.2 from 
> > /home/build/usr/ports/packages/amd64/all/
> > Can't install py3-slixmpp-1.5.2 because of conflicts (py3-slixmpp-1.4.2p3)
> > --- py3-slixmpp-1.5.2 ---
> > Can't install py3-slixmpp-1.5.2: conflicts
> > Couldn't install py3-slixmpp-1.5.2
> > 
> > 
> > I have slixmpp installed because I use poezio from git,
> > I'll try your poezio update after this.
> > I don't understand why pkg_add reports a conflicts though.
> > 
> > $ pkg_info | grep slixmpp
> > py3-slixmpp-1.4.2p3 slixmpp is an elegant Python library for XMPP
> > 
> 
> "make install" / "make update" don't handle pkgpath changes, if you
> "make package" then something like "doas env
> TRUSTED_PKG_PATH=/usr/ports/packages/$arch/all pkg_add -r py3-slixmpp"
> should do the trick.

kmos and I were talking about this yesterday.  This is his original diff
+ bket suggestions.

I tried it and works fine with the example code on the repo.  True that
I did not have it installed before.

Comments/ok welcome.

Index: Makefile
===
RCS file: /home/cvs/ports/net/py-slixmpp/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile3 Jul 2020 21:13:02 -   1.18
+++ Makefile7 Jul 2020 18:43:02 -
@@ -2,11 +2,10 @@
 
 COMMENT =  slixmpp is an elegant Python library for XMPP
 
-MODPY_EGG_VERSION =1.4.2
+MODPY_EGG_VERSION =1.5.2
 DISTNAME = slixmpp-${MODPY_EGG_VERSION}
-PKGNAME =  py3-${DISTNAME}
+PKGNAME =  py-${DISTNAME}
 CATEGORIES =   net
-REVISION = 3
 
 MAINTAINER =   Kurt Mosiejczuk 
 
@@ -20,7 +19,8 @@ MODPY_SETUPTOOLS =Yes
 MODPY_PYTEST = Yes
 MODPY_PYTEST_ARGS =tests/*.py
 
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
+FLAVORS =  python3
+FLAVOR =   python3
 
 RUN_DEPENDS =  devel/py-asn1${MODPY_FLAVOR} \
devel/py-asn1-modules${MODPY_FLAVOR} \
Index: distinfo
===
RCS file: /home/cvs/ports/net/py-slixmpp/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo7 Feb 2019 21:31:32 -   1.8
+++ distinfo7 Jul 2020 18:39:28 -
@@ -1,2 +1,2 @@
-SHA256 (slixmpp-1.4.2.tar.gz) = wyBPvo3tFI4eymcgugOYKYwVnynsdt/G991+2ZmuF2c=
-SIZE (slixmpp-1.4.2.tar.gz) = 864608
+SHA256 (slixmpp-1.5.2.tar.gz) = ZJX7+fTuWqaonYVJxbXQfNCX+mqgNTP3c6V+w0omrzA=
+SIZE (slixmpp-1.5.2.tar.gz) = 886383
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/net/py-slixmpp/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -r1.8 PLIST
--- pkg/PLIST   7 Feb 2019 21:31:32 -   1.8
+++ pkg/PLIST   7 Jul 2020 18:42:49 -
@@ -1,5 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.8 2019/02/07 21:31:32 danj Exp $
-@pkgpath net/${MODPY_PY_PREFIX}slixmpp
+@pkgpath net/py-slixmpp
 lib/python${MODPY_VERSION}/site-packages/slixmpp/
 
lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -8,7 +8,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
 
lib/python${MODPY_VERSION}/site-packages/slixmpp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/slixmpp/__init__.py
-lib/python${MODPY_VERSION}/site-packages/slixmpp/${MODPY_PYCACHE}/
+${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/slixmpp/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/slixmpp/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 

CVS: cvs.openbsd.org: ports

2020-07-08 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/07/08 02:33:59

Modified files:
devel/jenkins/devel: Makefile distinfo 

Log message:
Update jenkins-devel to 2.244



Re: [NEW] sysutils/fluent-bit

2020-07-08 Thread Masato Asou
Hi,

From: Stuart Henderson 
Date: Mon, 6 Jul 2020 10:55:14 +0100

> On 2020/07/06 16:30, Masato Asou wrote:
>> Hi,
>> 
>> I have already applied your previous patch.
> 
> My mail was about several things. Some were fixed by the patch, some were not.
> 
>> >> Several of these are in ports already (normally dependencies should be 
>> >> taken
>> >> from ports rather than bundled - so that patches needed for working on 
>> >> OpenBSD,
>> >> at least on some arches, are picked up - and so that security fixes don't 
>> >> have
>> >> to be made in multiple places - for example onigmo/oniguruma is an old 
>> >> version
>> >> missing security fixes).
>> >> Builds for some of these do things like force using gcc as the compiler,
>> >> setting opt flags like -O3 -funroll-loops which aren't allowed in ports.
> 
> Ports should normally use dependencies from the ports tree, not bundled
> ones. That way, when patches are made to fix some architecture, it fixes
> things for all programs using the library. And when a security fix is
> made, it doesn't require patches in separate copies across the ports tree.
> 
> If that is absolutely unavoidable then the build process for all of
> the different parts still needs to follow ports standards. Use the
> correct compiler (normally "cc"/"c++" but can be overridden on the
> make command line by setting CC/CXX variables). Use correct optimizer
> flags (CFLAGS/CXXFLAGS). Not pick up any software which is installed
> during the build unless listed as a dependency.

I did not correctly understand the first reply from you.

>> >> Those using autoconf bypass the normal ports infrastructure for this and
>> >> pick up tools like gsed/ggrep if present at build time, which in a bulk
>> >> build maybe removed part-way through the build.
> 
> -> at the stages when "configure" is run during the build it can pick up
> installed programs that are not listed as dependencies. in a bulk build,
> packages are installed and deinstalled _all the time_
> 
>> >> cmake checks for some things which aren't listed as dependencies too (and
>> >> finds them if installed), which need to be disabled properly or at least 
>> >> check
>> >> that they don't break things if they're present when configure is run but
>> >> removed during the build
>> >> 
>> >> -- Could NOT find GTest (missing: GTEST_LIBRARY GTEST_INCLUDE_DIR 
>> >> GTEST_MAIN_LIBRARY)
>> >> -- Found Doxygen: /usr/local/bin/doxygen (found version "1.8.18") found 
>> >> components: doxygen dot
>> >> -- Found PythonInterp: /usr/local/bin/python3.8 (found version "3.8.2")
>> >> -- Found PostgreSQL: /usr/local/lib/libpq.so.6.11 (found version "12.2")
> 
> -> a port build must produce the same results whether or not other
> packages are installed. either list all optional dependencies, or
> disable them.
> 
>> >> I've tidied up some things (diff below) but due to upstream's choices of
>> >> how to do things this is going to be complicated to get in proper shape 
>> >> for
>> >> commit.
>> > 
>> 
>> Here is the difference between my first and last email.
>> Am I misunderstanding something?
> 
> The basic problem is that the way this software is normally built is not
> really compatible with the way things are done in ports.

I will review the change to fluent-bit again, but I need time to work
on that.

Thank you for your explanation.
--
ASOU Masato



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/07/08 01:31:47

Modified files:
x11/gnome/shell: Makefile distinfo 

Log message:
update to gnome-shell-3.36.4



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/07/08 01:31:44

Modified files:
x11/gnome/mutter: Makefile distinfo 

Log message:
update to mutter-3.36.4



FIX: devel/ipython-5.8.0 broken on python-3.8

2020-07-08 Thread Bjorn Ketelaars
IPython-5.8.0 is broken on python-3.8, due to changes to ast.Module:

In [1]: import pandas
---
TypeError Traceback (most recent call last)
/usr/local/lib/python3.8/codeop.py in __call__(self, source, filename, symbol)
134 
135 def __call__(self, source, filename, symbol):
--> 136 codeob = compile(source, filename, symbol, self.flags, 1)
137 for feature in _features:
138 if codeob.co_flags & feature.compiler_flag:

TypeError: required field "type_ignores" missing from Module


This issue has been addressed by upstream in newer versions [0].
Updating to a newer version of IPython will take a bit of time because
of the DEPS (more recent versions are required). For the time being
apply a minimal patch.

Run tested on amd64.

Comments/OK?

[0] https://github.com/ipython/ipython/pull/11593


diff --git Makefile Makefile
index 2d21abe1ddf..0a51ef87712 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
 COMMENT =  enhanced interactive Python shell
 
 MODPY_EGG_VERSION =5.8.0
-REVISION = 4
+REVISION = 5
 DISTNAME = ipython-${MODPY_EGG_VERSION}
 PKGNAME =  ipython${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
 CATEGORIES =   devel
diff --git patches/patch-IPython_core_interactiveshell_py 
patches/patch-IPython_core_interactiveshell_py
new file mode 100644
index 000..af8f7759a33
--- /dev/null
+++ patches/patch-IPython_core_interactiveshell_py
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+IPython is broken on python-3.8, due to changes to ast.Module. Taken from
+https://www.mail-archive.com/debian-bugs-dist@lists.debian.org/msg1715405.html
+
+Index: IPython/core/interactiveshell.py
+--- IPython/core/interactiveshell.py.orig
 IPython/core/interactiveshell.py
+@@ -2813,7 +2813,7 @@ class InteractiveShell(SingletonConfigurable):
+ 
+ try:
+ for i, node in enumerate(to_run_exec):
+-mod = ast.Module([node])
++mod = ast.Module([node], [])
+ code = compiler(mod, cell_name, "exec")
+ if self.run_code(code, result):
+ return True



CVS: cvs.openbsd.org: ports

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

Modified files:
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 

Log message:
register net/p5-Net-GPSD removal



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Kirill Bychkov
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2020/07/08 00:50:59

Modified files:
net: Makefile 

Log message:
unhook p5-Net-GPSD



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Kirill Bychkov
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2020/07/08 00:49:52

Removed files:
net/p5-Net-GPSD: Makefile distinfo 
net/p5-Net-GPSD/pkg: DESCR PLIST 

Log message:
Remove p5-Net-GPSD wichi is only compatible with gpsd-2.x
For all versions of the gpsd greater than 2.90 one should use
Net::GPSD3 https://metacpan.org/pod/Net::GPSD3
Suggested by wen heping
OK sthen@ and afresh@



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/07/08 00:46:44

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

Log message:
update to bijiben-3.36.2



CVS: cvs.openbsd.org: ports

2020-07-08 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/07/08 00:46:46

Modified files:
sysutils/borgmatic: Makefile distinfo 

Log message:
update to borgmatic-1.5.8



Re: UPDATE audio/mpd-0.21.24

2020-07-08 Thread Landry Breuil
On Tue, Jul 07, 2020 at 10:26:15PM +0200, Bjorn Ketelaars wrote:
> On Sun 14/06/2020 11:06, Bjorn Ketelaars wrote:
> > Enclosed a simple diff for updating mpd to 0.21.24, which is a minor
> > bugfix release. Changes:
> > https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.24/NEWS
> > 
> > Run tested on amd64.
> > 
> > Comments/OK?
> 
> An even newer version of mpd is available (0.21.25), which fixes various
> bugs:
> https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.25/NEWS.
> 
> Run tested on amd64.
> 
> Comments/OK?

still works for me on 6.7, along ncmpc which uses the updated
libmpdclient. ok for both.

Thanks!

Landry