from:"Björn Ketelaars"

[-stable UPDATE] samba-4.19.8

2024-08-15 Thread Björn Ketelaars

Here is an update to the latest release of the Samba 4.19 release series
for -stable. Release notes:
https://www.samba.org/samba/history/samba-4.19.8.html

libdcerpc and libsamba-credentials require a minor bump because of the
addition of new symbols.

OK for committing to -stable?


Index: Makefile
===
RCS file: /cvs/ports/net/samba/Makefile,v
retrieving revision 1.343.2.2
diff -u -p -r1.343.2.2 Makefile
--- Makefile11 Jun 2024 18:09:43 -  1.343.2.2
+++ Makefile15 Aug 2024 17:48:46 -
@@ -1,4 +1,4 @@
-VERSION =  4.19.7
+VERSION =  4.19.8
 DISTNAME = samba-${VERSION}
 EPOCH =0
 
@@ -10,7 +10,7 @@ PKGNAME-docs =samba-docs-${VERSION}
 
 PKG_ARCH-docs =*
 
-SHARED_LIBS =  dcerpc  1.1 \
+SHARED_LIBS =  dcerpc  1.2 \
dcerpc-binding  4.0 \
dcerpc-samr 1.0 \
dcerpc-server-core  3.0 \
@@ -20,7 +20,7 @@ SHARED_LIBS = dcerpc  1.1 \
ndr-nbt 2.1 \
ndr-standard5.0 \
netapi  3.3 \
-   samba-credentials   1.4 \
+   samba-credentials   1.5 \
samba-errors2.1 \
samba-hostconfig13.0 \
samba-passdb3.0 \
Index: distinfo
===
RCS file: /cvs/ports/net/samba/distinfo,v
retrieving revision 1.114.2.2
diff -u -p -r1.114.2.2 distinfo
--- distinfo11 Jun 2024 18:09:43 -  1.114.2.2
+++ distinfo15 Aug 2024 17:48:46 -
@@ -1,2 +1,2 @@
-SHA256 (samba-4.19.7.tar.gz) = K7uACvLWvHucI+cIzVjQCNo7+m735iHZ7ItTOH7+5EU=
-SIZE (samba-4.19.7.tar.gz) = 41851647
+SHA256 (samba-4.19.8.tar.gz) = Gu/3bCB/ODR3zkut69FUaRxAjS4VsBszPIXrd1Ro3fY=
+SIZE (samba-4.19.8.tar.gz) = 41878540
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/net/samba/pkg/PLIST-main,v
retrieving revision 1.73.2.1
diff -u -p -r1.73.2.1 PLIST-main
--- pkg/PLIST-main  11 Jun 2024 18:09:43 -  1.73.2.1
+++ pkg/PLIST-main  15 Aug 2024 17:48:46 -
@@ -1048,6 +1048,8 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_content.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}mdsearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}mdsearch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}misc_dfs_widelink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}misc_dfs_widelink.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}ndrdump.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}ndrdump.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}netads_dns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1080,6 +1082,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/http_chunk.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/http_content.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/mdsearch.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/misc_dfs_widelink.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/ndrdump.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/netads_dns.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/netads_json.py

UPDATE samba-4.20.4

2024-08-06 Thread Björn Ketelaars

This is an update to the latest stable release of the Samba 4.20 release
series and only fixes a regression in library version strings. See
https://www.samba.org/samba/history/samba-4.20.4.html and
https://bugzilla.samba.org/show_bug.cgi?id=15673.

Though some of the public samba libraries have consumers, OpenBSD is not
bitten by this.

Run tested on amd64.

OK?


diff --git Makefile Makefile
index d5badfad5f1..3824cb19ee8 100644
--- Makefile
+++ Makefile
@@ -1,4 +1,4 @@
-VERSION =  4.20.3
+VERSION =  4.20.4
 DISTNAME = samba-${VERSION}
 EPOCH =0
 
diff --git distinfo distinfo
index 0472bd72531..1d8169026e1 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.20.3.tar.gz) = r9WpuwPlySHEwdTktPpuoWz3mNlOXlv/uf1hcWZBzzA=
-SIZE (samba-4.20.3.tar.gz) = 42464180
+SHA256 (samba-4.20.4.tar.gz) = OpLpfq6zRbazIjL1A+FNNPA6eqZMRR/owlihG72pCOU=
+SIZE (samba-4.20.4.tar.gz) = 42462586

Re: new jupyter/jupyterlab deps

2024-07-15 Thread Björn Ketelaars

On Sun 14/07/2024 14:51, Daniel Dickman wrote:
> Attached are a few new ports needed in order to update jupyter and 
> jupyterlab.
> 
> This port is needed to update jupyter_server to the 2.x series:
> - devel/py-overrides
> 
> These 2 ports are needed by devel/py-jupyter_events (not in the tree yet):
> - textproc/py-python-json-logger
> - devel/py-test-console-scripts
> 
> These ports will be needed by jupyterlab 4.x:
> - devel/py-hatch-jupyter-builder
> - devel/py-async-lru
> - textproc/py-json5
> 
> ok to import these so I can move forward with updating the jupyter stack?

Ports look good and, with exception of devel/py-test-console-scripts,
build. py-test-console-scripts needs the diff below. Without it, it does
not build.

diff --git devel/py-test-console-scripts/Makefile 
devel/py-test-console-scripts/Makefile
index f7c59eaf6eb..096a6e643c1 100644
--- devel/py-test-console-scripts/Makefile
+++ devel/py-test-console-scripts/Makefile
@@ -15,6 +15,6 @@ FLAVORS = python3
 FLAVOR =   python3

 MODPY_PI = Yes
-MODPY_PYBUILD =setuptools
+MODPY_PYBUILD =setuptools_scm

 .include 



Would it make sense to rename rename py-python-json-logger to
py-json-logger? Seems a bit nicer, and is done by several other python
modules. Easily addressed by renaming the directory and applying the
diff below. It is up to you...

diff --git textproc/py-python-json-logger/Makefile 
textproc/py-python-json-logger/Makefile
index fa94b873aa2..a2602f45551 100644
--- textproc/py-python-json-logger/Makefile
+++ textproc/py-python-json-logger/Makefile
@@ -2,7 +2,7 @@ COMMENT =   Python library adding a json log 
formatter
 
 MODPY_EGG_VERSION =2.0.7
 DISTNAME = python-json-logger-${MODPY_EGG_VERSION}
-PKGNAME =  py-${DISTNAME}
+PKGNAME =  ${DISTNAME:S/python-/py-/}
 
 CATEGORIES =   textproc
 

With the first diff, OK bket@ for importing all ports.

Re: [update] security/rbw to 1.11.1

2024-07-07 Thread Björn Ketelaars

On Fri 05/07/2024 13:29, Lucas Raab wrote:
> Hello,
> 
> Here's an update for rbw that's been working fine here. Other tests?
> 
> changelogs:
> https://github.com/doy/rbw/releases/tag/1.11.0
> https://github.com/doy/rbw/releases/tag/1.11.1
> 
> Thanks,
> Lucas

Works for me. OK bket@

UPDATE net/samba-4.20.2

2024-06-19 Thread Björn Ketelaars

Update to the latest stable release of the Samba 4.20 release series for
current. Release notes:
https://www.samba.org/samba/history/samba-4.20.2.html

libdcerpc and libsamba-credentials require a minor bump because of the
addition of a couple of symbols.

Run tested on amd64.

Tests and OKs welcome.


diff --git Makefile Makefile
index 61777a12f00..311e62490ab 100644
--- Makefile
+++ Makefile
@@ -1,4 +1,4 @@
-VERSION =  4.20.1
+VERSION =  4.20.2
 DISTNAME = samba-${VERSION}
 EPOCH =0
 
@@ -10,7 +10,7 @@ PKGNAME-docs =samba-docs-${VERSION}
 
 PKG_ARCH-docs =*
 
-SHARED_LIBS =  dcerpc  1.1 \
+SHARED_LIBS =  dcerpc  1.2 \
dcerpc-binding  5.0 \
dcerpc-samr 1.0 \
dcerpc-server-core  3.1 \
@@ -20,7 +20,7 @@ SHARED_LIBS = dcerpc  1.1 \
ndr-nbt 2.1 \
ndr-standard6.0 \
netapi  3.3 \
-   samba-credentials   1.5 \
+   samba-credentials   1.6 \
samba-errors2.1 \
samba-hostconfig14.0 \
samba-passdb3.0 \
diff --git distinfo distinfo
index f75d0ea042a..d47334ad9a5 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.20.1.tar.gz) = +Tw69SlTQNCBBsfA3PuF5PhQV9/RRYeqiBe+sxr/iPc=
-SIZE (samba-4.20.1.tar.gz) = 42441898
+SHA256 (samba-4.20.2.tar.gz) = +Wn/7VjM8+hcu8wOM6FybQJcK0D0KmU7ESW4K5LS4OU=
+SIZE (samba-4.20.2.tar.gz) = 42458953
diff --git pkg/PLIST-main pkg/PLIST-main
index b826066f469..65400a77f88 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -1169,6 +1169,8 @@ 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}ht
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_content.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}mdsearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}mdsearch.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}misc_dfs_widelink.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}misc_dfs_widelink.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}ndrdump.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}ndrdump.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}netads_dns.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1206,6 +1208,7 @@ 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/downgradedatabase.
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/http_chunk.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/http_content.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/mdsearch.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/misc_dfs_widelink.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/ndrdump.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/netads_dns.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/netads_json.py

UPDATE net/samba-4.20.1

2024-05-08 Thread Björn Ketelaars

Update to the latest stable release of the Samba 4.20 release series.
Release notes: https://www.samba.org/samba/history/samba-4.20.1.html

Tests and OKs welcome.


diff --git Makefile Makefile
index da7935b90e0..3b63b2f4f36 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,6 @@
-VERSION =  4.20.0
+VERSION =  4.20.1
 DISTNAME = samba-${VERSION}
 EPOCH =0
-REVISION = 1
 
 COMMENT-main = SMB and CIFS client and server for UNIX
 COMMENT-docs = additional documentation and examples for Samba
diff --git distinfo distinfo
index a04b322880c..f75d0ea042a 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (samba-4.20.0.tar.gz) = AmclQlEKxuXQyRwMFNkKtObsOXxwnpUsbaOm4LTVpC8=
-SIZE (samba-4.20.0.tar.gz) = 42433302
+SHA256 (samba-4.20.1.tar.gz) = +Tw69SlTQNCBBsfA3PuF5PhQV9/RRYeqiBe+sxr/iPc=
+SIZE (samba-4.20.1.tar.gz) = 42441898
diff --git pkg/PLIST-main pkg/PLIST-main
index f6cf619e1d3..b826066f469 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -1163,6 +1163,10 @@ 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}cl
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}claims.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}downgradedatabase.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}downgradedatabase.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_chunk.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_chunk.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_content.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}http_content.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}mdsearch.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}mdsearch.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/${MODPY_PYCACHE}ndrdump.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
@@ -1199,6 +1203,8 @@ 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/bug13653.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/check_output.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/claims.py
 
lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/downgradedatabase.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/http_chunk.py
+lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/http_content.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/mdsearch.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/ndrdump.py
 lib/python${MODPY_VERSION}/site-packages/samba/tests/blackbox/netads_dns.py

Re: spyder 4 legacy port removals

2024-03-18 Thread Björn Ketelaars

On Mon 18/03/2024 21:32, Daniel Dickman wrote:
> I'd like to remove the following ports that were needed for spyder 4 and 
> are no longer needed now that we have spyder 5 in the tree.
> 
> The ports themselves are dead with spyder having moved to using active 
> forks of each of the below:
> 
> - devel/py-pyls-black
> - devel/py-python-language-server
> - net/py-python-jsonrpc-server
> 
> ok to remove these?
> 

OK bket@

Re: [maintainer update] fdupes 2.2.1 -> 2.3.0

2024-01-30 Thread Björn Ketelaars

On Sun 28/01/2024 07:18, Martin Ziemer wrote:
> This patch updates fdupes from 2.2.1 to 2.3.0.
> 
> Tested on amd64.

This update picks up sqlite3 [0]. If this is intended then you need to
add sqlite3 to WANTLIB and databases/sqlite3 to LIB_DEPENDS.
Alternatively you could set CONFIGURE_ARGS+= --without-sqlite.

[0] 
https://github.com/adrianlopezroche/fdupes/commit/ab5ef95e2b2633d0ca1a5ae0b8ac41abde160100

Re: matplotlib: 3.7.3 -> 3.8.2

2024-01-19 Thread Björn Ketelaars

On Wed 17/01/2024 13:00, Daniel Dickman wrote:
> Now that we have numpy 1.25 in the tree, we can update matplotlib to the 
> latest release.
> 
> ok on the below update?

Run tested on amd64 using work related stuff, works for me.

OK bket@

Re: update jupyter_core to 5.4.0

2023-10-21 Thread Björn Ketelaars

On Sat 21/10/2023 15:31, Daniel Dickman wrote:
> Here's an update of jupyter core to the latest version (5.4.0). This is 
> the start of updating the jupyter stack which is somewhat outdated.
> 
> ok?

Run tested on amd64 current while doing stuff in jupyter-notebook.

OK bket@

Re: matplotlib 3.6.3 -> 3.7.2

2023-08-24 Thread Björn Ketelaars

On Wed 23/08/2023 21:51, Daniel Dickman wrote:
> Here's an update of matplotlib to the latest version.
> 
> All reverse depdendencies still compile.
> 
> ok?

Build- and run-tested on amd64 with several scripts I'm using on a near
daily basis.

OK bket@

Re: [update] samba-4.17.8

2023-07-04 Thread Björn Ketelaars

On Tue 04/07/2023 14:30, Jeremie Courreges-Anglas wrote:
> 
> 
> This diff is intended both for -current and 7.3.  I don't expect any
> regression but I'd rather let people test first.
> 
> Next steps would be moving -current to 4.18.X and possibly adding a dep
> on libarchive for smbclient 
> (https://marc.info/?l=openbsd-ports&m=168840285109456&w=2)
> 
> ok?

Run tested on amd64. OK bket@

Re: UPDATE sysutils/restic-rest-server-0.12.0

2023-05-01 Thread Björn Ketelaars

On Mon 01/05/2023 18:17, Stuart Henderson wrote:
> I think you must have some diff in go.port.mk.

Dammit...you are right. I completely forgot about a local change. Sorry
for this!

Re: UPDATE sysutils/restic-rest-server-0.12.0

2023-05-01 Thread Björn Ketelaars

On Mon 01/05/2023 14:57, Stuart Henderson wrote:
> On 2023/04/25 11:33, Björn Ketelaars wrote:
> > A newer version of restic's rest-server has been released (0.12.0). From
> > https://github.com/restic/rest-server/releases/tag/v0.12.0:
> 
> >  MODULES =  lang/go
> > +WRKDIST =  ${WRKSRC}
> 
> Please remove the above WRKDIST, then it is ok maintainer

Without this I'm seeing:

===>  Extracting for restic-rest-server-0.12.0
===>  Patching for restic-rest-server-0.12.0
===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
WRKDIST=/ports/pobj/restic-rest-server-0.12.0/rest-server-v0.12.0 does not exist

Re: samba share and nobody user (was: Re: [SECURITY UPDATE] samba-4.17.7)

2023-04-25 Thread Björn Ketelaars

On Tue 25/04/2023 09:10, kasak wrote:
> 
> 24.04.2023 21:01, Bjorn Ketelaars пишет:
> > On Mon 24/04/2023 18:27, kasak wrote:
> > > 24.04.2023 16:34, Bjorn Ketelaars пишет:
> > > > On Mon 24/04/2023 10:09, kasak wrote:
> > > > > i'm sorry for the noise, but samba package in openbsd has some bug 
> > > > > since 7.2
> > > > > 
> > > > > It erroneously map "nobody" as a homes share when it should not.
> > > > I remember replying to a mail from you on misc@ a couple of months ago
> > > > on the same (?) topic [0].
> > > You are right, and since then I made some research to prove my point!
> > During your research, did you use the exact same smb.conf on the
> > different samba hosts? And the outcome is that samba on OpenBSD is the
> > odd one out?
> > 
> > Are there details that you can share?
> Yes, i use exactly that config i mentioned earlier (only 5 lines). And yes,
> samba on OpenBSD is the odd one out.
> 
> I even fired up openbsd 7.1 vm to prove myself i'm not crazy:
> 
> obsd71$ uname -mrs
> OpenBSD 7.1 amd64
> obsd71$ cat /etc/samba/smb.conf
> [global]
> map to guest = Bad User
> [homes]
> browseable = no
> writable = yes
> obsd71$ smbclient -L //localhost
> Password for [WORKGROUP\kasak]:
> 
>     Sharename   Type  Comment
>     -     ---
>     IPC$    IPC   IPC Service (Samba 4.15.9)
> SMB1 disabled -- no workgroup available
> 
> > 
> > > > > I have many other samba hosts, and I often use [homes] special share, 
> > > > > but it
> > > > > never map "nobody" as a home share.
> > > > Unfortunately I do not have experience with "other smaba hosts", and
> > > > cannot comment on them. Is it possible that samba on these hosts has
> > > > been compiled using other compile time options than on OpenBSD?
> > > > 
> > > > [0] https://marc.info/?l=openbsd-misc&m=166676711319993&w=2
> > > I can speak for all rpm based distros, for arch and for freebsd, no one of
> > > them maps nobody as a homes share.
> > > 
> > > And i've tried to figure out what's gone wrong and failed :( that's why 
> > > i'm
> > > posting here, searching for help.
> > Did you compare the samba port for, e.g., FreeBSD [0] with that of
> > OpenBSD [1]? Are there options that catch your eye?
> > 
> > [0] https://github.com/freebsd/freebsd-ports/tree/main/net/samba416
> > [1] https://cvsweb.openbsd.org/cgi-bin/cvsweb/ports/net/samba/
> > 
> since i know that odd behavior come from 7.2, i've mostly looked what has
> changed in port from 7.1 to 7.2 but did not find anything suspicious.
> 
> i have very little experience in that things :(

I did some tests using OpenBSD current and linux, both running Samba
4.17.6, and using your simplified smb.conf. Outcome is that I'm able to
reproduce (part) of your observation.

On OpenBSD current:
$ smbclient -N -U test -L 127.0.0.1

Sharename   Type  Comment
-     ---
IPC$IPC   IPC Service (Samba 4.17.6)
nobody  Disk  Home directory of nobody
SMB1 disabled -- no workgroup available

On linux:
$ smbclient -N -U test -L 127.0.0.1

Sharename   Type  Comment
-     ---
IPC$IPC   IPC Service (Samba 4.17.6)
SMB1 disabled -- no workgroup available

To be honest I have no clue where this is coming from, but I will keep
my eyes open. Did you share this observation on the samba mailing list?
Maybe they can be of assistance in understanding this difference in
behaviour.

Re: archives/zstd-1.5.5 on 7.3

2023-04-11 Thread Björn Ketelaars

On Tue 11/04/2023 09:41, Adriano Barbosa wrote:
> Hi!
> zstd-1.5.5 is available in 7.2 (reference below), but the version
> available in 7.3 is 1.5.4p0 because of the freeze on the ports tree
> for the release probably.
> Should 1.5.5 be made available in 7.3?
> 
> Obrigado!
> --
> Adriano
> 
> https://marc.info/?l=openbsd-ports&m=168067387316746&w=2
> 

zstd-1.5.5 has been committed a couple of minutes ago to 7.3-stable.

Re: Remove INSTALL_TARGET from security/lastpass-cli

2022-09-01 Thread Björn Ketelaars

On Thu 01/09/2022 11:04, Rafael Sadowski wrote:
> I would like to modernize cmake.port.mk but first I need to get rid of
> some spooky cmake anti-pattern.
> 
> OK to build install docs by default?

OK bket@

Re: [update] samba-4.15.8

2022-06-30 Thread Björn Ketelaars

On Thu 30/06/2022 01:12, Jeremie Courreges-Anglas wrote:
> 
> Here's an update to the latest samba bugfix release.
> https://www.samba.org/samba/history/samba-4.15.8.html

Builds, and run tested on amd64 at home.

OK bket@

Re: UPDATE: lang/dmd 2.098.0 => 2.099.0

2022-03-20 Thread Björn Ketelaars

On Sat 12/03/2022 16:25, Brian Callahan wrote:
> On 3/9/2022 1:45 PM, Brian Callahan wrote:
> > Hi ports --
> > 
> > DMD 2.099.0 was released earlier today. Here is a diff to update our
> > package. I am happy to report that as of DMD 2.099.0, OpenBSD is at zero
> > diff to upstream DMD.
> > 
> > All my usual suspects pass muster; Dub also builds and tests OK with
> > this update. Included in this update is some build streamlining for me
> > to make future updates little more than crank ${V} and generate a new
> > distinfo.
> > 
> > OK?
> > 
> > ~Brian
> 
> Updated diff for a post-RCS Id world.
> 
> OK?

Diff looks good, and builds/installs on amd64. I was able to build
several examples from dlang.org.

OK bket@

Re: fonts/noto update [Chrome testers wanted]

2022-03-18 Thread Björn Ketelaars

On Fri 18/03/2022 04:04, Anthony J. Bentley wrote:
> Here is an update to the latest version of noto-fonts and noto-emoji,
> a variant of a diff previously sent by Yifei Zhan. I intend to commit
> it, but since Noto is a dependency of Chromium, I would prefer to see
> some test reports first to ensure it doesn't break anyone's rendering.
> 
> The main expected change is broader Unicode support, for emojis in
> particular, and several other Unicode ranges which you can figure
> out by looking at the PLIST portion of the diff. These pages should
> provide a good sample of characters to browse:
> 
> https://en.wikipedia.org/wiki/Emoji
> https://en.wikipedia.org/wiki/List_of_Unicode_characters
> 
> Note: I'm not updating noto-cjk in this diff, as Chrome doesn't depend
> on it.

Tested with sthen@'s packages.

OK bket@

Re: current sabnzbd and sabyenc

2022-03-17 Thread Björn Ketelaars

On Thu 17/03/2022 21:56, Justin Yates Fletcher wrote:
> Hi all,
> 
> Long time user, but first time in ports@ I think.  I've been following
> -current for some months now and all has generally been fine, but I have hit
> a problem that I think might be something to bring up here.
> 
> The news/sabnzbd Makefile lists the version:
> VERSION = 3.5.2
> 
> With a dependency on py-sabyenc:
> news/py-sabyenc${MODPY_FLAVOR}>=5.1.0
> 
> Yet 3.5.2 requires version sabyenc 4.0.0:
> 
> https://github.com/sabnzbd/sabnzbd/blob/3.5.2/sabnzbd/constants.py#L63
> 
> SABYENC_VERSION_REQUIRED = "4.0.0"
> 
> Even the most recent tag sabsnbd tag still requires sabyenc 4.0.0
> 
> https://github.com/sabnzbd/sabnzbd/blob/3.5.3/sabnzbd/constants.py#L63
> 
> SABYENC_VERSION_REQUIRED = "4.0.0"
> 
> It is only the "develop" branch that depends on sabyenc 5.1.0
> 
> https://github.com/sabnzbd/sabnzbd/blob/develop/sabnzbd/constants.py#L63
> 
> SABYENC_VERSION_REQUIRED = "5.1.0"
> 
> Is this just a mismatch that will be sorted out as the ports stabilize for
> the next release?  Or a "bug" where sabyenc needs to be rolled back to
> 4.0.0?  Or..??

My bad, sorry! I just reverted py-sabyenc (and set EPOCH), and updated
sabnzbd.

FIX tests net/synapse

2022-03-01 Thread Björn Ketelaars

Diff below fixes tests.
https://github.com/openbsd/ports/commit/90b405ebad2217bad9b88150eb6f0b50e871860b
renamed `trial-3` to `trial`.

OK?

diff --git Makefile Makefile
index 7ee0dbdad11..f7ebe669688 100644
--- Makefile
+++ Makefile
@@ -66,6 +66,6 @@ TEST_DEPENDS =${RUN_DEPENDS} \
www/py-jwt${MODPY_FLAVOR}
 
 do-test:
-   cd ${WRKSRC} && ${SETENV} PYTHONPATH=. ${LOCALBASE}/bin/trial-3 tests
+   cd ${WRKSRC} && ${SETENV} PYTHONPATH=. ${LOCALBASE}/bin/trial tests
 
 .include

Re: [update] databases/py-influxdb

2022-02-20 Thread Björn Ketelaars

On Sun 20/02/2022 08:04, Lucas Raab wrote:
> Hello,
> 
> The current version in-tree of this library is for influxdb<=1.7.4.
> An entirely new library was written for influxdb>=1.8.0. The initial
> thought is that this would be imported as "new", but effectively
> replace the current package. Thoughts?
> 
> Current package name: py-influxdb
> Upstream is carrying the name: influxdb-client-python (but assuming
> py-influxdb-client is what would be used)
> 
> Attached is the new port, feedback on that one as well?
> 
> I disabled tests since they require py-test>=5.0, but as for using
> the library, I've been using it with InfluxDB Cloud (which is really
> 2.0) so far without issues (only reading/writing data though).
> 
> Thanks,
> Lucas

Is there a reason for killing off databases/influxdb upon importing this
port? If not, there is no need to use EPOCH; this port has a different
name.

Instead of setting both DISTNAME and PKGNAME I would prefer to set only
PKGNAME. Makes Makefile a bit more simpler.

pkg/DESCR points to https://github.com/influxdata/influxdb-python. Why
not point to our port of it? BTW, does this comment add value if the
goal is to replace databases/py-influxdb?

Build tested only, with and without the diff below.


diff --git Makefile Makefile
index 3afb5ecb6b9..e53129038a2 100644
--- Makefile
+++ Makefile
@@ -3,16 +3,14 @@
 COMMENT =  Python client library for InfluxDB 1.8+
 
 MODPY_EGG_VERSION =1.26.0
-DISTNAME = influxdb-client-${MODPY_EGG_VERSION}
-PKGNAME =  py-${DISTNAME}
-EPOCH =0
+GH_ACCOUNT =   influxdata
+GH_PROJECT =   influxdb-client-python
+GH_TAGNAME =   v${MODPY_EGG_VERSION}
+PKGNAME =  py-influxdb-client-${MODPY_EGG_VERSION}
 
 CATEGORIES =   databases
 
 HOMEPAGE = https://github.com/influxdata/influxdb-client-python
-GH_ACCOUNT =   influxdata
-GH_PROJECT =   influxdb-client-python
-GH_TAGNAME =   v${MODPY_EGG_VERSION}
 
 # MIT
 PERMIT_PACKAGE =   Yes
diff --git distinfo distinfo
index f72dd89a4db..b9e9be0d41a 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (influxdb-client-1.26.0.tar.gz) = 
lRpdnfiU0UDMj5hpcpM+cUoArQ+st5Rg1JzP1hIajIE=
-SIZE (influxdb-client-1.26.0.tar.gz) = 1682775
+SHA256 (influxdb-client-python-1.26.0.tar.gz) = 
lRpdnfiU0UDMj5hpcpM+cUoArQ+st5Rg1JzP1hIajIE=
+SIZE (influxdb-client-python-1.26.0.tar.gz) = 1682775
diff --git pkg/DESCR pkg/DESCR
index b29eeb61d3f..0907c4d1c46 100644
--- pkg/DESCR
+++ pkg/DESCR
@@ -1,3 +1,2 @@
 InfluxDB-Python is a client for interacting with InfluxDB 1.8+. If you need a
-version for InfluxDB <=1.7.4, please see
-https://github.com/influxdata/influxdb-python
+version for InfluxDB <=1.7.4, please see databases/py-influxdb.

Re: Update sysutils/kopia to 0.10.0

2022-01-16 Thread Björn Ketelaars

On Fri 14/01/2022 08:32, Denis Fondras wrote:
> Changelog : https://github.com/kopia/kopia/releases/tag/v0.10.0
> 
> OK ?

Diff looks good, and builds on amd64. Lightly run tested.

OK bket@

Re: Update sysutils/bat

2022-01-08 Thread Björn Ketelaars

On Sun 09/01/2022 07:57, Rafael Sadowski wrote:
> Feedback, ok?

Builds and runs on amd64. OK bket@

Re: Update sysutils/broot

2022-01-08 Thread Björn Ketelaars

On Sun 09/01/2022 07:42, Rafael Sadowski wrote:
> Feedback and/or OK?

Diff looks good and builds. Lightly run tested on amd64. OK bket@

Re: UPDATE net/libfilezilla-0.34.1

2021-10-23 Thread Björn Ketelaars

On Sat 23/10/2021 09:09, Stefan Hagen wrote:
> Bjorn Ketelaars wrote:
> > Diff below updates libfilezilla to 0.34.1, which is needed for an update
> > of filezilla. Overview on changes can be found at
> > https://lib.filezilla-project.org/.
> > 
> > A patch has been added to work around getspnam_r() and crypt_r(),
> > which OpenBSD does not have. I would very much appreciate it if people
> > would have a look at this workaround.
> > 
> > Run tested in combination with filezilla.
> > 
> > Comments/ok?
> 
> Do you know if your workaround is used by the filezilla client? I added 
> debug output around it and was not able to make it show up.
> 
> I think it's only used by the filezilla server, which allows remote users
> to log on to the system. I don't think we have (or need) the filezilla
> server.

It is currently not used by filezilla. For now it is only used by
fillezilla-server, which we do not have.

Re: Fluxbox Segfault upon X termination

2021-10-20 Thread Björn Ketelaars

On Wed 20/10/2021 15:32, Matthieu Herrb wrote:
> On Wed, Oct 20, 2021 at 03:04:14PM +0200, Björn Ketelaars wrote:
> > +@@ -95,7 +95,7 @@ void handleSignal(int signum) {
> > + break;
> > + #endif
> > + case SIGSEGV:
> > +-abort();
> > ++exit(0);
> > + break;
> > + case SIGALRM:
> > + // last resort for shutting down fluxbox. the alarm() is set in
> 
> Hi,
> 
> This just hides the issue under the carpet...
> 
> The real issue is that there  is no X I/O errror handler
> installed other than the default one, and the default one seems to
> segfault (SIGSEGV) for a reason (looks like a shared libs destructor
> issue at 1st glance, but I don't care enough to look deeper for now).
> 
> See XSetIOErrorHandler(3) for details.

You are right, it is hiding the real issue and it is not a good
solution.

I'm not a fluxbox user, and not interested in digging deeper.

Re: Fluxbox Segfault upon X termination

2021-10-20 Thread Björn Ketelaars

On Wed 20/10/2021 00:02, Rubén Llorente wrote:
> Hi there,
> 
> This is a bug report against x11/fluxbox
> 
> I have noticed that fluxbox has a tendency to segfault and dump a
> core in my $HOME when the X server is manually turned off.
> 
> If you use xenodm to launch fluxbox and then turn it off (eihter
> by issuing # rcctl stop xenodm or by hitting Ctrl + Alt +
> Backspace) then fluxbox receives a termination signal and 
> segfaults.
> 
> I am not a code guru, but a quick look at the fluxbox code
> shows fluxbox calls a shutdown function upon receiving typical
> signals.
> 
> I have reproduced this bug on multiple installs (7.0 amd64). It
> is not critical by any means (the program crashes on exit) but it
> is ugly as heck. 
> 
> Anybody wants to take this bug?

After building with DEBUG=-g:

(gdb) bt
#0  thrkill () at /tmp/-:3
#1  0x0f57fee6788e in _libc_abort () at /usr/src/lib/libc/stdlib/abort.c:51
#2  0x0f55503a487f in (anonymous namespace)::handleSignal (signum=11) at 
src/main.cc:98
#3  
#4  0x0f55503d6cb2 in std::__1::less::operator() 
(this=, __x=, __y=)
at /usr/include/c++/v1/__functional_base:54
#5  std::__1::__map_value_compare, 
std::__1::less, true>::operator() (
this=, __x=..., __y=) at 
/usr/include/c++/v1/map:518
#6  std::__1::__tree, std::__1::__map_value_compare, 
std::__1::less, true>, 
std::__1::allocator 
> >::__lower_bound (
this=0xf555041e040 , __v=, __root=0xdfdfdfdfdfdfdfdf, __result=0xf5832ca9cc0) at 
/usr/include/c++/v1/__tree:2637
#7  std::__1::__tree, std::__1::__map_value_compare, 
std::__1::less, true>, 
std::__1::allocator 
> >::find (
this=0xf555041e040 , __v=) at /usr/include/c++/v1/__tree:2566
#8  std::__1::__tree, std::__1::__map_value_compare, 
std::__1::less, true>, 
std::__1::allocator 
> >::__erase_unique (
this=0xf555041e040 , __k=) at /usr/include/c++/v1/__tree:2542
#9  std::__1::map, std::__1::allocator > >::erase (this=0xf555041e040 
, __k=) at 
/usr/include/c++/v1/map:1306
#10 FbTk::EventManager::unregisterEventHandler (this=0xf555041e040 
, win=) at 
src/FbTk/EventManager.cc:137
#11 0x0f55503caf24 in Toolbar::~Toolbar (this=0xf577bde5000) at 
src/Toolbar.cc:277
#12 0x0f55503cb51f in Toolbar::~Toolbar (this=0xf577bde5000) at 
src/Toolbar.cc:271
#13 0x0f555036e592 in std::__1::auto_ptr::reset 
(this=0xf5832cd3530, __p=)
at /usr/include/c++/v1/memory:2061
#14 BScreen::~BScreen (this=0xf5832cd3260) at src/Screen.cc:394
#15 0x0f555036f2df in BScreen::~BScreen (this=0xf5832cd3260) at 
src/Screen.cc:389
#16 0x0f555039d71e in 
FbTk::STLUtil::destroyAndClear > > (a=...) at ./src/FbTk/STLUtil.hh:55
#17 Fluxbox::~Fluxbox (this=0xf5782386710) at src/fluxbox.cc:482
#18 0x0f555039da6f in Fluxbox::~Fluxbox (this=0xf5782386710) at 
src/fluxbox.cc:473
#19 0x0f57fee3a213 in _libc___cxa_finalize (dso=) at 
/usr/src/lib/libc/stdlib/atexit.c:177
#20 0x0f57fedd17d1 in _libc_exit (status=1) at 
/usr/src/lib/libc/stdlib/exit.c:54
#21 0x0f555039c941 in (anonymous namespace)::handleXIOErrors (d=) at src/fluxbox.cc:165
#22 0x0f57568ec7ca in _XIOError () from /usr/X11R6/lib/libX11.so.17.1
#23 0x0f57568e9755 in _XEventsQueued () from /usr/X11R6/lib/libX11.so.17.1
#24 0x0f57568d94d9 in XPending () from /usr/X11R6/lib/libX11.so.17.1
#25 0x0f555039dfd8 in Fluxbox::eventLoop (this=0xf5782386710) at 
src/fluxbox.cc:528
#26 0x0f55503a39a6 in main (argc=, argv=0x7f7c56c8) at 
src/main.cc:211
(gdb) f 2
#2  0x0f55503a487f in (anonymous namespace)::handleSignal (signum=11) at 
src/main.cc:98
98  abort();


Look what happens here:

97case SIGSEGV:
98abort();
99break;


>From abort():

The abort() function causes abnormal program termination to occur,
unless the signal SIGABRT is being caught and the signal handler does
not return.


Diff below seems to do the job. Could you check?


diff --git Makefile Makefile
index ddb1a0df8ca..72168cbc2e3 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,7 @@
 COMMENT =  window manager based on the original Blackbox code
 DISTNAME = fluxbox-1.3.7
 CATEGORIES =   x11
-REVISION = 4
+REVISION = 5
 
 HOMEPAGE = http://fluxbox.org/
 
diff --git patches/patch-src_main_cc patches/patch-src_main_cc
new file mode 100644
index 000..fd89475a181
--- /dev/null
+++ patches/patch-src_main_cc
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: src/main.cc
+--- src/main.cc.orig
 src/main.cc
+@@ -95,7 +95,7 @@ void handleSignal(int signum) {
+ break;
+ #endif
+ case SIGSEGV:
+-abort();
++exit(0);
+ break;
+ case SIGALRM:
+ // last resort for shutting down fluxbox. the alarm() is set in

Re: update py-certifi

2021-10-05 Thread Björn Ketelaars

On Tue 05/10/2021 23:38, Daniel Dickman wrote:
> Latest matplotlib needs an updated py-certifi.
> 
> Here's an update to the minimum version that matplotlib needs.
> 
> All direct consumers of this port were built on amd64.
> 
> ok?

Diff looks good, and so far it not break anything.

OK bket@

Re: igmpproxy rc file

2021-07-29 Thread Björn Ketelaars

On Thu 29/07/2021 21:18, Steven Shockley wrote:
> FYI, after upgrading from 6.8 to 6.9 igmpproxy wouldn't start.  It appears
> the patch for pkg/igmpproxy.rc (cvs rev. 1.3) for HEAD also needs to be in
> place for igmpproxy 0.3, to add daemon_flags.

You also can set igmpproxy_flags="/etc/igmpproxy.conf" in rc.conf.local.

Re: UPDATE: syncthing-1.17.0

2021-06-13 Thread Björn Ketelaars

On Fri 11/06/2021 22:14, Edd Barrett wrote:
> Hi,
> 
> Simple update to syncthing's latest.
> 
> Note that the cli binary was merged into the main program. Use it with
> `synchting cli `.
> 
> Tests passing on amd64. I'll be use testing it over the next few days.
> 
> Commments or OKs?

Works here, OK bket@

Re: UPDATE: x11/icewm 2.1.2 => 2.3.4

2021-05-20 Thread Björn Ketelaars

On Thu 20/05/2021 02:46, Brian Callahan wrote:
> Hi ports --
> 
> Attached is a diff to update IceWM to its latest version.
> Here is a link to see all the changes from then to now:
> https://github.com/ice-wm/icewm/releases
> 
> I am running this without issue on arm64.
> 
> OK?

Build and (lightly) run tested on amd64.

OK bket@

Re: make py-cycler py3-only

2021-05-17 Thread Björn Ketelaars

On Mon 17/05/2021 03:26, Daniel Dickman wrote:
> py-cycler can go py3-only. The only consumer is py-matplotlib which is 
> already py3-only.
> 
> ok?

OK bket@

Re: games/openra: update to 20210321

2021-05-04 Thread Björn Ketelaars

On Mon 03/05/2021 15:58, Thomas Frohwein wrote:
> Hi,
> 
> Here is a diff that updates OpenRA to the latest version 20210321. The
> heavy lifting was done by patrick@; I added the nuget dependencies and
> the workaround for the dllmap config files.
> 
> bcallah@: would appreciate if both distfiles could be hosted on the
> nycbug mirror again.
> 
> Unfortunately the msbuild ports don't get nicer, so some dark magic is
> required once again to make it work:
> 
> - nuget-openra-20210321.tar.xz is just an archive of the dependencies
>   fetched by nuget run with a working internet connection. I checked
>   that this builds with network interface down.
> - DLLMAP_FILES doesn't work anymore because the the *.config files with
>   dllmap are built "on the fly" during the install goal. Best option I
>   could come up with (that doesn't hardcode the library versions like
>   the included script configure-system-libraries.sh tries to do) was to
>   copy the correct files from $FILESDIR (they are all trivial and
>   small).
> - The build system (MSBuild or mono) erros with LangVersion 7.3; but
>   lowering it to 7.2 allows it to build without problems.
> 
> Tested in a brief single-player mission with Red Alert, and I checked
> that the multiplayer lobby shows available servers/games.
> 
> ok? comments?

Run tested (mainly openra-ra/openra-ra-server) on amd64 while playing
against two teens who will be in desperate need of a new home IF they
keep on defeating me.

OK bket@

Re: update spyder to 3.3.6

2021-04-28 Thread Björn Ketelaars

On Sun 28/03/2021 06:56, rgc wrote:
> ports@
> 
> to be considered as part 2/2 for an update of spyder3 to 3.3.6
> 
> 3.3.6 is the last version before tons of new modules were added as 
> requirements
> if i get comfortable porting other stuff, i **might** get 4.2.5 in the ports
> 
> actual update to spyder 3.3.6 

Thanks for your diff! I was wondering why you did not add
www/py-qtwebengine as RDEP? It seems that it is needed [0]. I build
spyder using the diff below and have been running with it for the last
couple of days on amd64. So far, no regression found.

Note that you also need a newer version of py-spyder-kernels. I will
send a diff in a separate mail.

Additionally to the above: did you make progress in updating spyder to
an even newer version?

[0] https://github.com/spyder-ide/spyder/pull/8753/files
[1] 
https://github.com/spyder-ide/spyder/commit/aca5a34af021b5c86298c900615abbe6484f41f3


diff --git Makefile Makefile
index 6148fa6d5e4..d734837ddc7 100644
--- Makefile
+++ Makefile
@@ -2,8 +2,7 @@
 
 COMMENT =  Scientific PYthon Development EnviRonment
 
-MODPY_EGG_VERSION =3.3.3
-REVISION = 6
+MODPY_EGG_VERSION =3.3.6
 DISTNAME = spyder-${MODPY_EGG_VERSION}
 PKGNAME =  spyder3-${MODPY_EGG_VERSION}
 
@@ -29,18 +28,19 @@ RUN_DEPENDS +=  databases/py-pickleshare${MODPY_FLAVOR} 
\
devel/py-rope${MODPY_FLAVOR}>=0.10.5 \
devel/pyflakes${MODPY_FLAVOR} \
devel/pylint${MODPY_FLAVOR} \
+   devel/spyder/py-spyder-kernels${MODPY_FLAVOR}<1.0 \
net/py-zmq${MODPY_FLAVOR} \
-   shells/py-qtconsole${MODPY_FLAVOR}>=4.2.0 \
security/py-keyring${MODPY_FLAVOR} \
+   shells/py-qtconsole${MODPY_FLAVOR}>=4.2.0 \
sysutils/py-psutil${MODPY_FLAVOR} \
textproc/py-chardet${MODPY_FLAVOR}>=2.0.0 \
textproc/py-numpydoc${MODPY_FLAVOR} \
textproc/py-pygments${MODPY_FLAVOR}>=2.0 \
textproc/py-sphinx${MODPY_FLAVOR} \
+   www/py-qtwebengine${MODPY_FLAVOR} \
x11/py-qt5${MODPY_FLAVOR} \
-   x11/py-qtpy${MODPY_FLAVOR}>=1.5.0 \
-   x11/py-qtawesome${MODPY_FLAVOR}>=0.4.1 \
-   devel/spyder/py-spyder-kernels${MODPY_FLAVOR}<1.0
+   x11/py-qtawesome${MODPY_FLAVOR}>=0.5.7 \
+   x11/py-qtpy${MODPY_FLAVOR}>=1.5.0
 
 TEST_DEPENDS +=${RUN_DEPENDS}
 
diff --git distinfo distinfo
index 09b790daa9d..82c94cd5637 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (spyder/spyder-3.3.3.tar.gz) = 
7zHeA89vFJB35k7Vc2uHl9vSeOPJJeQ/C/wxu1X25bo=
-SIZE (spyder/spyder-3.3.3.tar.gz) = 2988827
+SHA256 (spyder/spyder-3.3.6.tar.gz) = 
YZczN+HiEMjvTNhRI8EOyD3xDf+5o828CIrBPGDg+Pw=
+SIZE (spyder/spyder-3.3.6.tar.gz) = 2996872
diff --git patches/patch-setup_py patches/patch-setup_py
index 5c4e85ccc25..deefe5bf7f4 100644
--- patches/patch-setup_py
+++ patches/patch-setup_py
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup_py,v 1.2 2019/02/23 17:57:43 mariani Exp $
 Index: setup.py
 --- setup.py.orig
 +++ setup.py
-@@ -27,7 +27,7 @@ import subprocess
+@@ -28,7 +28,7 @@ import subprocess
  import sys
  import shutil
  
@@ -12,7 +12,7 @@ Index: setup.py
  from distutils.command.install_data import install_data
  
  
-@@ -82,7 +82,7 @@ def get_subpackages(name):
+@@ -83,7 +83,7 @@ def get_subpackages(name):
  
  def get_data_files():
  """Return data_files in a platform dependent manner"""
@@ -21,7 +21,7 @@ Index: setup.py
  if PY3:
  data_files = [('share/applications', ['scripts/spyder3.desktop']),
('share/icons', ['img_src/spyder3.png']),
-@@ -132,7 +132,7 @@ CMDCLASS = {'install_data': MyInstallData}
+@@ -133,7 +133,7 @@ CMDCLASS = {'install_data': MyInstallData}
  # NOTE: the '[...]_win_post_install.py' script is installed even on 
non-Windows
  # platforms due to a bug in pip installation process (see Issue 1158)
  SCRIPTS = ['%s_win_post_install.py' % NAME]
@@ -30,12 +30,16 @@ Index: setup.py
  SCRIPTS.append('spyder3')
  else:
  SCRIPTS.append('spyder')
-@@ -244,7 +244,7 @@ install_requires = [
+@@ -238,10 +238,10 @@ install_requires = [
  'keyring;sys_platform!="linux2"',
  # Packages for pyqt5 are only available in
  # Python 3
--'pyqt5<=5.12;python_version>="3"'
-+#'pyqt5<=5.12;python_version>="3"'
+-'pyqt5<5.13;python_version>="3"',
++#'pyqt5<5.13;python_version>="3"',
+ # pyqt5 5.12 split WebEngine into the
+ # pyqtwebengine module
+-'pyqtwebengine<5.13;python_version>="3"'
++#'pyqtwebengine<5.13;python_version>="3"'
  ]
  
  extras_require = {
diff --git patches/patch-spyder_config_utils_py 
patches/patch-spyder_config_utils_py
index 71d8642c81d..0e6b48847a3 100644
--- patches/patch-spyder_config_utils_py
+++ patches/patch-spyder_config_utils_py
@@ -3,15 +3,6 @@ $OpenBSD: patch-spyder_config_utils_py,v 1.2 2019/02

Re: update: matplotlib 3.0.3 -> 3.1.3

2021-02-22 Thread Björn Ketelaars

On Mon 22/02/2021 01:10, Daniel Dickman wrote:
> Here's an update of matplotlib to 3.1.3 for a few new features.
> 
> py-cairo is now preferred over py-cairocffi, and py-six doesn't seem to be 
> needed so adjust RDEPs accordingly.

Diff looks good, and works for me on amd64. One nit:

It seems that ${MODPY_WANTLIB} can be removed as WANTLIB

$ make port-lib-depends-check

py3-matplotlib-3.1.3(graphics/py-matplotlibython3):
Extra:  python3.8.0

Re: update py-tornado

2021-01-18 Thread Björn Ketelaars

On Mon 18/01/2021 02:52, Daniel Dickman wrote:
> Below diff updates py-tornado to the latest version which is now 
> python3-only.
> 
> This update is needed so jupyter-notebook can be updated to the latest 
> version.
> 
> ok?

Diff looks good and works for me in combination with
www/jupyter-notebook and www/py-terminado. I did not test other
consumers.
Consumers are already py3-only, so this should work...

OK bket@

Re: [update] misc/lfm 2.3 -> 3.1 (python 2->3)

2020-12-29 Thread Björn Ketelaars

On Tue 29/12/2020 11:27, Charlene Wendling wrote:
> Hi,
> 
> Here is an update for lfm to version 3.1. It has been rewritten
> almost from scratch, here are the most important changes (see [0]):
> 
> * move from python 2 to python 3
> * pyview has been removed in favour of less(1)
> * many backward incompatible changes, notably ~/.lfmrc has been
>   deprecated in favour of ~/.config/lfmrc/...
> 
> Port-wise, despite the size of the diff, there is not much to say.
> Nonetheless, data files were not installed where they should.
> 
> As such, i've brought back the 2.3 behaviour and chose to install
> everything as data_files, instead of using a post-install hook. We
> would have needed to patch setup.py anyway.
> 
> I met no issues while testing, but given the number of features, i
> indeed did not test all of them.
> 
> I'm not used to deal with python stuff, so feedback is very welcome :)
> 
> Charlène.

Builds and packages ok, however errors out upon starting:

$ lfm
ERROR: Cannot copy default theme or keys file to user configuration folder 
/home/bket/.config/lfm
[Errno 2] No such file or directory: 
'/usr/local/lib/python3.8/site-packages/lfm/etc/lfm-default.theme'
Quitting

I'm guessing that
'/usr/local/lib/python3.8/site-packages/lfm/etc/lfm-default.theme'
should read '/usr/local/share/examples/lfm/lfm-default.theme'.

Re: [update] icewm-2.0.0 (Was: [update] icewm-1.9.3)

2020-12-28 Thread Björn Ketelaars

On Mon 28/12/2020 17:25, Charlene Wendling wrote:
> Ping.
> 
> On Mon, 21 Dec 2020 15:11:54 +0100
> Charlene Wendling wrote:
> 
> > On Sat, 19 Dec 2020 16:09:50 +0200
> > Timo Myyrä wrote:
> > 
> > > Charlene Wendling  [2020-12-12, 13:37 +0100]:
> > > 
> > > > Hi,
> > > >
> > > > On Sat, 05 Dec 2020 09:25:26 +0200
> > > > Timo Myyrä wrote:
> > > >
> > > >> Hi,
> > > >> 
> > > >> This updates icewm to latest release, works for me on amd64.
> > > >> 
> > > >> timo
> > > >
> > > > I've tested it successfully on macppc and amd64. OK cwen@
> > > >
> > 
> > > 
> > > Icewm had new release since, here's updated diff.
> > > This version changes the default image rendering library from
> > > gdb-pixbuf-xlib to Imlib2 so I changed the port as well to use
> > > Imlib2.
> > 
> > I think it's great to do it right now so we won't have any problem
> > later (gdk-pixbuf-xlib has been deprecated and archived by GNOME [0]).
> > 
> > > Works for me on amd64.
> > > 
> > > timo
> > > 
> > 
> > Looks like gdk-pixbuf-xlib used to pull some libraries that are now
> > missing; in an empty chroot i get: 
> > 
> > Missing library for gio-2.0>=0.0
> > Missing library for glib-2.0>=0.0
> > Missing library for gmodule-2.0>=0.0
> > Missing library for gobject-2.0>=0.0
> > Missing library for pcre>=0.0
> > 
> > port-lib-depends-check was not happy and asked for more LIB_DEPENDS
> > as well:
> > 
> > icewm-2.0.0(x11/icewm):
> > Missing lib: cairo.13 (/usr/local/bin/icewmbg) (NOT REACHABLE)
> > Missing lib: gdk_pixbuf-2.0.3200 (/usr/local/bin/icewmbg) (NOT
> > REACHABLE) Missing lib: harfbuzz.15 (/usr/local/bin/icewmbg) (NOT
> > REACHABLE) Missing lib: pango-1.0.3801 (/usr/local/bin/icewmbg) (NOT
> > REACHABLE) Missing lib: pangocairo-1.0.3801 (/usr/local/bin/icewmbg)
> > (NOT REACHABLE) Missing lib: pangoft2-1.0.3801
> > (/usr/local/bin/icewmbg) (NOT REACHABLE) Missing lib: rsvg-2.38
> > (/usr/local/bin/icewmbg) (NOT REACHABLE) Missing lib: xml2.16
> > (/usr/local/bin/icewmbg) (NOT REACHABLE)
> > 
> > I added them all explicitly; we could reduce the number of
> > LIB_DEPENDS lines by playing with implicit dependencies (like
> > gdk_pixbuf-2.0.3200 pulling xml2.16). But as seen by this update, it's
> > a dangerous game to play.
> > 
> > I've modified your diff below.
> > 
> > This builds and works fine on amd64 and macppc, i've tested a number
> > of themes, and met no issues with standard themes. Other themes may
> > have a titlebar buttons issue, with the leftmost icon on the right
> > side being slightly mangled.
> > 
> > Charlène.
> > 
> > 
> > [0] https://gitlab.gnome.org/Archive/gdk-pixbuf-xlib


Build- and (lightly) run-tested on amd64. One (very) minor comment:
patches/patch-lib_Makefile_in and patches/patch-src_icesh_cc should be
updated using 'make update-patches'.

OK bket@

Re: update py-pandas to 1.1.4

2020-11-22 Thread Björn Ketelaars

On Sun 22/11/2020 10:30, Daniel Dickman wrote:
> update to latest version of pandas fixing a few corner cases and 
> regressions.
> 
> ok?

Builds, and runs on amd64. Run tested with some scripts.

OK bket@

Re: retire devel/py-trollius

2020-11-22 Thread Björn Ketelaars

On Sun 22/11/2020 10:25, Daniel Dickman wrote:
> The trollius project has been dead for some time. python3 code should be 
> using asyncio instead.
> 
> ok to retire this python2-only port? There are no remaining consumers in 
> the tree.

Sure

OK bket@

Re: make py-txaio and py-autobahn python3 only

2020-11-21 Thread Björn Ketelaars

On Sun 22/11/2020 00:20, Daniel Dickman wrote:
> By making these two ports python3 only, we are getting rid of the only 
> consumers of the obsolete devel/py-trollius port (which can then be 
> deleted after diff below goes in).
> 
> These ports are only used by devel/py-buildbot which is already 
> python3-only.
> 
> ok?
> 
> (diff shows quirks and top-level makefile diffs for completeness)

Diff looks good, OK bket@

Re: [update] sysutils/restic to 0.11.0

2020-11-16 Thread Björn Ketelaars

On Mon 16/11/2020 16:06, Aaron Bieber wrote:
> Hi,
> 
> Here is an update to restic. Full changelog can be found here:
> https://github.com/restic/restic/releases/tag/v0.11.0
> 
> I have been running without issues! Tests welcome.
> 
> OK?

Lightly run tested on amd64.

OK bket@

Re: UPDATE: syncthing-1.11.1

2020-11-09 Thread Björn Ketelaars

On Sun 08/11/2020 19:26, Edd Barrett wrote:
> Hi,
> 
> Simple update to syncthing.
> 
> Give this a shot.

No failing tests, and works for me on amd64.

OK bket@

Re: convert benchmarks/tsung to python3

2020-10-07 Thread Björn Ketelaars

On Wed 07/10/2020 18:18, Daniel Dickman wrote:
> As pointed by bket@ this port needs to move to python3 before matplotlib 
> can move to python3.
> 
> ok?

Diff looks good, and builds. 'make test' fails 1 test, which is not new.

OK bket@

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 = {

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: 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

UPDATE security/rhash-1.4.0

2020-07-21 Thread Björn Ketelaars

Diff below brings rhash to 1.4.0, which is a bugfix release. Changes:
https://github.com/rhash/RHash/releases/tag/v1.4.0.

Testing:
- 'make test' runs OK on amd64
- build/run tested with its only consumer: cmake


Comments/OK?


Index: Makefile
===
RCS file: /cvs/ports/security/rhash/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile26 Dec 2019 04:02:11 -  1.7
+++ Makefile21 Jul 2020 14:14:03 -
@@ -2,7 +2,7 @@
 
 COMMENT =  utility and library for computing hash sums
 
-DISTNAME = rhash-1.3.9-src
+DISTNAME = rhash-1.4.0-src
 PKGNAME =  ${DISTNAME:S/-src$//}
 
 SHARED_LIBS =  rhash 0.0
Index: distinfo
===
RCS file: /cvs/ports/security/rhash/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo26 Dec 2019 04:02:11 -  1.4
+++ distinfo21 Jul 2020 14:14:03 -
@@ -1,2 +1,2 @@
-SHA256 (rhash-1.3.9-src.tar.gz) = QrEAb5mK2xibHzFr8aYOMXHaBHqFxKre0tDSbBR2yfY=
-SIZE (rhash-1.3.9-src.tar.gz) = 403415
+SHA256 (rhash-1.4.0-src.tar.gz) = LqOVQPXFgNoOZV97SDwZ4NMVBq7UIC2I6EWfp67riGE=
+SIZE (rhash-1.4.0-src.tar.gz) = 406433
Index: patches/patch-configure
===
RCS file: /cvs/ports/security/rhash/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 26 Dec 2019 04:02:11 -  1.2
+++ patches/patch-configure 21 Jul 2020 14:14:03 -
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure,v 1.2 2019/12/
 Index: configure
 --- configure.orig
 +++ configure
-@@ -598,7 +598,7 @@ log_finish
+@@ -599,7 +599,7 @@ log_finish
  # detect proper shared library name
  SHARED_PREFIX="lib"
  STATIC_PREFIX="lib"

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 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 s

Re: Ports still using freedb

2020-06-29 Thread Björn Ketelaars

On Tue 30/06/2020 01:55, Charlene Wendling wrote:
> Hi,
> 
> OK? (diffs below)

Diffs looks good. One small comment:

> Index: patches/patch-lib_CDDB_pm
> ===
> RCS file: patches/patch-lib_CDDB_pm
> diff -N patches/patch-lib_CDDB_pm
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-lib_CDDB_pm 29 Jun 2020 23:43:54 -
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +freedb is dead
> +
> +Index: lib/CDDB.pm
> +--- lib/CDDB.pm.orig
>  lib/CDDB.pm
> +@@ -31,7 +31,7 @@ my $cddbp_host_selector = 0;
> + 
> + my @cddbp_hosts = (
> + [ 'localhost' => 8880 ],
> +-[ 'freedb.freedb.org' => 8880 ],
> ++[ 'gnudb.gnudb.org'   => 8880 ],
> + [ 'us.freedb.org',=> 8880 ],
> + [ 'ca.freedb.org',=> 8880 ],
> + [ 'ca2.freedb.org',   => 8880 ],

All *.freedb.org hosts are unreachable. While here remove them?

Either way, OK bket@

Re: sysutils/py-prometheus_client py3 only

2020-02-25 Thread Björn Ketelaars

On Tue 25/02/2020 18:17, Paco Esteban wrote:
> Hi ports@,
> 
> www/jupyter-notebook is now py3 only.  That's the only consumer for
> sysutils/py-prometheus_client so here's a diff to make it py3 only too.
> 
> Comments and/or ok appreciated.

OK bket@

Re: py3-only ports

2020-02-20 Thread Björn Ketelaars

On Thu 20/02/2020 13:55, Stuart Henderson wrote:
> Quite a few python modules are now py3-only, and more are switching
> over to that. The current ports setup where we use MODPY_VERSION=
> ${MODPY_DEFAULT_VERSION_3} and no FLAVOR isn't really very good,
> especially where dependencies are concerned with the error-prone
> combination of "py2+3 ports using ${MODPY_FLAVOR}" and "py3-only
> ports with just the port path/name".
> 
> Before more are moved across I'd like to settle on a proper method.
> I've been discussing this with jasper@ (with some previous knowledge
> from adding a similar multi-version to pecl-* ports) and propose moving
> to a setup with:
> 
> FLAVOR=   python3
> FLAVORS=  python3
> 
> (and keep the ,python3 flavour in ../Makefile i.e. "SUBDIR += 
> py-Foo,python3").
> This also makes it easier to handle updates as we don't need to mess about
> with @pkgpath markers.

Sounds like a plan...

What about lines in Makefile like the one below. Does it make sense to
keep them around? There is no need to add a suffix to scripts in the
case of py3-only.

  mv ${PREFIX}/bin/$i{,${MODPY_BIN_SUFFIX}}

> Obviously there are currently a number of py3-only ports which should end
> up using the same flavour scheme (and dependency lines to fix), if there are
> not objections I can either review diffs or take care of those myself.

I'm not sure what is needed for ports that already made the jump from
py2/py3 to py3-only (e.g. www/jupyter-notebook). More specific: these
ports already do some funky PLIST and quirks stuff. Do these ports need
special attention?

UPDATE games/freeciv-2.6.2

2020-02-19 Thread Björn Ketelaars

Enclosed diff updates freeciv to 2.6.2, which mainly fixes bugs in the
client. More information can be found at
https://freeciv.fandom.com/wiki/NEWS-2.6.2.

Run tested on amd64.

OK?


diff --git Makefile Makefile
index e4a1cf3c37a..a58453b1108 100644
--- Makefile
+++ Makefile
@@ -4,7 +4,7 @@ COMMENT-main=   Civilization clone for X11; multiplayer; game 
server
 COMMENT-client=Freeciv client
 COMMENT-share= shared data files for Freeciv
 
-VERSION=   2.6.1
+VERSION=   2.6.2
 DISTNAME=  freeciv-${VERSION}
 PKGNAME-main=  freeciv-server-${VERSION}
 PKGNAME-client=freeciv-client-${VERSION}
diff --git distinfo distinfo
index d0d6b4c0e07..848a5abe056 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (freeciv-2.6.1.tar.bz2) = zOaEHaAZQTiq0mnMc1VX20OKRJCddf0D1NtnUHmGueI=
-SIZE (freeciv-2.6.1.tar.bz2) = 51915573
+SHA256 (freeciv-2.6.2.tar.bz2) = YYHvPTx2JkODqrvg6vFVDYplykJjnmwXzCk4Fl4XbI8=
+SIZE (freeciv-2.6.2.tar.bz2) = 52139007
diff --git pkg/PLIST-main pkg/PLIST-main
index 8a96f345e6a..f1087483ca5 100644
--- pkg/PLIST-main
+++ pkg/PLIST-main
@@ -36,6 +36,7 @@ share/doc/freeciv/README.effects
 share/doc/freeciv/README.fcdb
 share/doc/freeciv/README.governor
 share/doc/freeciv/README.graphics
+share/doc/freeciv/README.modpack_installer
 share/doc/freeciv/README.msys2
 share/doc/freeciv/README.nations
 share/doc/freeciv/README.packaging

UPDATE x11/tilda-1.5.0

2020-02-19 Thread Björn Ketelaars

Diff below updates x11/tilda to 1.5.0. Changelog:
https://github.com/lanoxx/tilda/blob/tilda-1.5.0/ChangeLog.

Run tested on amd64.

OK?


diff --git Makefile Makefile
index 37205ca00a4..dd98eed2fce 100644
--- Makefile
+++ Makefile
@@ -4,10 +4,8 @@ COMMENT=   drop-down terminal emulator
 
 GH_ACCOUNT=lanoxx
 GH_PROJECT=tilda
-GH_TAGNAME=tilda-1.3.3
-DISTNAME=  tilda-1.3.3
-
-REVISION=  2
+GH_TAGNAME=tilda-1.5.0
+DISTNAME=  tilda-1.5.0
 
 CATEGORIES=x11
 
diff --git distinfo distinfo
index 889a65edb16..56f62bf3fcf 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (tilda-1.3.3.tar.gz) = cbqlVyxJjls+lPW1foEYwe8P2uommlskJSCOGt7ChLE=
-SIZE (tilda-1.3.3.tar.gz) = 671222
+SHA256 (tilda-1.5.0.tar.gz) = 9mTBfayiopAPSd6etldGztA8hnsCFEFJ7yEmDLzWEDk=
+SIZE (tilda-1.5.0.tar.gz) = 484754
diff --git patches/patch-src-tilda_c patches/patch-src-tilda_c
index f386301cad3..482fb772401 100644
--- patches/patch-src-tilda_c
+++ patches/patch-src-tilda_c
@@ -1,7 +1,8 @@
 $OpenBSD: patch-src-tilda_c,v 1.3 2016/11/06 06:54:54 jca Exp $
 src/tilda.c.orig   Mon Apr 18 14:09:55 2016
-+++ src/tilda.cSun Nov  6 07:43:00 2016
-@@ -12,8 +12,6 @@
+Index: src/tilda.c
+--- src/tilda.c.orig
 src/tilda.c
+@@ -13,8 +13,6 @@
   * You should have received a copy of the GNU Library General Public
   * License along with this library. If not, see 
.
   */
@@ -10,7 +11,7 @@ $OpenBSD: patch-src-tilda_c,v 1.3 2016/11/06 06:54:54 jca Exp 
$
  
  /*
   * This message is shown in a modal dialog when tilda starts and there is a 
problem parsing the configuration file.
-@@ -230,7 +228,7 @@ nomatch:
+@@ -232,7 +230,7 @@ nomatch:
  static GSList *getPids() {
  GSList *pids = NULL;
  FILE *ps_output;
diff --git pkg/PLIST pkg/PLIST
index 6634a4414b8..def38674c15 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,7 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.7 2018/06/27 21:04:23 espie Exp $
 @bin bin/tilda
-share/appdata/
-share/appdata/tilda.appdata.xml
 share/applications/tilda.desktop
 share/doc/tilda/
 share/doc/tilda/README.md
@@ -16,6 +14,7 @@ share/locale/fr/LC_MESSAGES/tilda.mo
 share/locale/hu/LC_MESSAGES/tilda.mo
 share/locale/it/LC_MESSAGES/tilda.mo
 share/locale/lt/LC_MESSAGES/tilda.mo
+share/locale/nb/LC_MESSAGES/tilda.mo
 share/locale/pl/LC_MESSAGES/tilda.mo
 share/locale/pt/LC_MESSAGES/tilda.mo
 share/locale/pt_BR/LC_MESSAGES/tilda.mo
@@ -25,6 +24,9 @@ share/locale/sl/LC_MESSAGES/tilda.mo
 share/locale/sv/LC_MESSAGES/tilda.mo
 share/locale/tr/LC_MESSAGES/tilda.mo
 share/locale/zh_CN/LC_MESSAGES/tilda.mo
+share/locale/zh_TW/LC_MESSAGES/tilda.mo
+share/metainfo/
+share/metainfo/tilda.appdata.xml
 share/pixmaps/
 share/pixmaps/tilda.png
 @tag update-desktop-database

Re: UPDATE www/jupyter-notebook-6.0.3

2020-02-17 Thread Björn Ketelaars

On Wed 12/02/2020 08:01, Björn Ketelaars wrote:
> On Tue 11/02/2020 16:21, Kurt Mosiejczuk wrote:
> > On Fri, Feb 07, 2020 at 09:36:30PM +0100, Björn Ketelaars wrote:
> > > Diff below updates jupyter-notebook to 6.0.3. Changelog can be found at
> > > https://jupyter-notebook.readthedocs.io/en/stable/changelog.html.
> > > Noticeable change is that upstream dropped support for python 2.
> > 
> > > Changes to the port:
> > > - Drop FLAVOR and set MODPY_VERSION
> > > - Update dependencies
> > > - Drop post-install bits as it is no longer necessary to add a suffix to
> > >   jupyter-notebook and its tools
> > > - Set @conflict- and @pkgpath-marker in PLIST
> > 
> > > Testing:
> > > - 'make test' runs successfully
> > > - Run tested on amd64 in an existing jupyter-notebook environment
> > 
> > > Comments/OK?
> > 
> > Patch looks good to me. Will folks notice the python2 version going
> > away? I suppose they might since the files going into bin/ are losing
> > their -3 suffix.
> > 
> > If we don't think that will cause any problems, ok kmos
> 
> Upgrading jupyter-notebook to this newer version is transparent, which
> could cause two problems:
>   - Users of the python2 flavor will be presented with a python3
> environment, which could cause their workbooks to 'fail';
>   - Users of the python3 flavor python will wonder why
> 'jupyter-notebook-3' isn't working any more, and will notice that
> 'jupyter-notebook' does work.
> 
> Although I no not think the latter is bad, we could help users by
> informing them about this update. My proposal would be to add something
> to current.html.
> 
> The first problem is kind of a bad one as some notebooks will need to be
> converted to pyhton3 code. Users will have to invest time and effort to
> update their code. Least thing I should do is inform them of this. Also
> here I propose to inform users via current.html.
> 
> Is this update important enough to possibly break people's work?
> Probably not. Reason for wanting to move forward is that it does not
> make sense to maintain ports of tools that are not fully supported by
> their upstream. In the case of jupyter-notebook support for python2 has
> been dropped.
> Not moving past this small hurdle will, sooner or later, cause an issue
> somewhere (else). My proposal is to do it now.
> 
> Additional comments/OK's to commit this update? Opinions on the above?

I will commit the update of jupyter-notebook tomorrow...unless someone
objects.

To inform users about the changes I will add the snippet below to
current.html:

2020/02/19 - [packages] www/jupyter-notebook updated to 6.0.3
Jupyter-notebook has been updated to 6.0.3, which removes support for
Python 2.x. Existing notebooks should be checked if they work with
Python 3. Please note that tools supplied by this port have been
renamed, e.g. jupyter-notebook-3 has been renamed to jupyter-notebook.

Re: [UPDATE] net/ipcheck (207 -> 222)

2020-02-17 Thread Björn Ketelaars

On Mon 17/02/2020 20:36, Alex Naumov wrote:
> REVISION should be removed as version has been bumped.
> Thank you, Björn.
> 
> 
> 
> On Sun, Feb 16, 2020 at 11:55 PM Alex Naumov 
> wrote:
> 
> > Hi,
> >
> > this is the diff to update ipcheck to the latest release (207 -> 222).

I had another look at ipcheck:

http://ipcheck.sourceforge.net/releases/old.html lists two versions that
are newer than 222, and https://sourceforge.net/projects/ipcheck/files/
hosts an even newer version: 251. The latter btw has been released in
2013.
The homepage of ipcheck was last updated in 2011.

Is there a reason that you want to update this port to 222? Do you know
if there is a changelog of some sort? Is this tool still
useful/relevant?

NEW devel/p5-Conf-Libconfig

2020-02-16 Thread Björn Ketelaars

Attached is a new port, devel/p5-Conf-Libconfig. p5-Conf-Libconfig is a
Perl extension for libconfig. This port is needed as test dep for
net/sslh.

pkg/DESCR:
Perl bindings to the C library libconfig.

'make test' runs successfully. Run tested on amd64 as test dep for
net/sslh.

Comments/OK?


p5-Conf-Libconfig.tgz
Description: application/tar-gz

Re: UPDATE www/bluefish-2.2.11

2020-02-16 Thread Björn Ketelaars

On Sun 16/02/2020 15:18, Antoine Jacoutot wrote:
> On Sun, Feb 16, 2020 at 02:19:22PM +0100, Björn Ketelaars wrote:
> > On Sun 16/02/2020 11:23, Antoine Jacoutot wrote:
> > > On Sun, Feb 16, 2020 at 12:36:29AM +0100, Björn Ketelaars wrote:
> > > > Diff below brings bluefish to 2.2.11, which is a minor maintenance
> > > > release and minor feature release. Although this release supports
> > > > python3 the enclosed plugins only work on python2. As such, do not
> > > > switch to python3...for now.
> > > > 
> > > > Changes to the port:
> > > > - Follow Makefile.template
> > > > - Sync WANTLIB and PLIST
> > > > - Add textproc/libxml as LDEP
> > > > - Bytecompile python plugins in post-install phase
> > > > 
> > > > Run tested on amd64. Everything, including the plugins, seem to work.
> > > > 
> > > > Comments/OK?
> > > > 
> > > > 
> > > > diff --git www/bluefish/Makefile www/bluefish/Makefile
> > > > index 2d6e9ab0570..72c0dec94ac 100644
> > > > --- www/bluefish/Makefile
> > > > +++ www/bluefish/Makefile
> > > > @@ -2,27 +2,27 @@
> > > >  
> > > >  COMMENT=   HTML editor for experienced web designers
> > > >  
> > > > -DISTNAME = bluefish-2.2.10
> > > > +DISTNAME=  bluefish-2.2.11
> > > > +
> > > >  CATEGORIES=www editors
> > > > -HOMEPAGE=  http://bluefish.openoffice.nl/
> > > > -REVISION = 6
> > > >  
> > > > -MASTER_SITES=  http://www.bennewitz.com/bluefish/stable/source/
> > > > +HOMEPAGE=  http://bluefish.openoffice.nl/
> > > >  
> > > >  # GPLv3
> > > >  PERMIT_PACKAGE=Yes
> > > >  
> > > > -WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
> > > > -WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
> > > > -WANTLIB += c cairo cairo-gobject dbus-1 enchant epoxy expat ffi
> > > > -WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> > > > -WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> > > > +WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} X11 Xcomposite Xcursor
> > > > +WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
> > > > +WANTLIB += atk-bridge-2.0 c cairo cairo-gobject enchant epoxy expat ffi
> > > > +WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
> > > > +WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> > > >  WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0
> > > > -WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
> > > > -WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
> > > > -WANTLIB += xcb-shm xml2 z fribidi
> > > > +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png util xcb
> > > > +WANTLIB += xcb-render xcb-shm xml2 z
> > > >  
> > > > -COMPILER = base-clang ports-gcc base-gcc
> > > > +MASTER_SITES=  
> > > > https://www.bennewitz.com/bluefish/stable/source/
> > > > +
> > > > +COMPILER=  base-clang ports-gcc base-gcc
> > > >  
> > > >  MODULES=   lang/python \
> > > > textproc/intltool
> > > > @@ -30,14 +30,13 @@ MODULES=lang/python \
> > > >  RUN_DEPENDS=   devel/desktop-file-utils \
> > > > misc/shared-mime-info \
> > > > x11/gtk+3,-guic
> > > > -
> > > >  LIB_DEPENDS=   textproc/enchant \
> > > > +   textproc/libxml \
> > > > x11/gnome/gucharmap
> > > 
> > > Why this change in LIB_DEPENDS?
> > 
> > From ${WRKSRC}/INSTALL:
> > 
> > 1) Compilation needs the following software packages - usually the headers 
> > and
> >libraries (search for packages with a -dev or -devel suffix and/or prefix
> >lib, e.g. libgtk2.0-dev)
> > 
> >  - Gtk 2 (2.20 or newer) or 3 (3.2.2) or newer
> >  - libxml2
> >  - libenchant (optional for spell checking)
> >  - libgucharmap (optional for character map plugin. Version 2.x is 
> > recommended)
> >  - python-dev (optional)
> 
&

Re: UPDATE www/bluefish-2.2.11

2020-02-16 Thread Björn Ketelaars

On Sun 16/02/2020 11:23, Antoine Jacoutot wrote:
> On Sun, Feb 16, 2020 at 12:36:29AM +0100, Björn Ketelaars wrote:
> > Diff below brings bluefish to 2.2.11, which is a minor maintenance
> > release and minor feature release. Although this release supports
> > python3 the enclosed plugins only work on python2. As such, do not
> > switch to python3...for now.
> > 
> > Changes to the port:
> > - Follow Makefile.template
> > - Sync WANTLIB and PLIST
> > - Add textproc/libxml as LDEP
> > - Bytecompile python plugins in post-install phase
> > 
> > Run tested on amd64. Everything, including the plugins, seem to work.
> > 
> > Comments/OK?
> > 
> > 
> > diff --git www/bluefish/Makefile www/bluefish/Makefile
> > index 2d6e9ab0570..72c0dec94ac 100644
> > --- www/bluefish/Makefile
> > +++ www/bluefish/Makefile
> > @@ -2,27 +2,27 @@
> >  
> >  COMMENT=   HTML editor for experienced web designers
> >  
> > -DISTNAME = bluefish-2.2.10
> > +DISTNAME=  bluefish-2.2.11
> > +
> >  CATEGORIES=www editors
> > -HOMEPAGE=  http://bluefish.openoffice.nl/
> > -REVISION = 6
> >  
> > -MASTER_SITES=  http://www.bennewitz.com/bluefish/stable/source/
> > +HOMEPAGE=  http://bluefish.openoffice.nl/
> >  
> >  # GPLv3
> >  PERMIT_PACKAGE=Yes
> >  
> > -WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
> > -WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
> > -WANTLIB += c cairo cairo-gobject dbus-1 enchant epoxy expat ffi
> > -WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
> > -WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> > +WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} X11 Xcomposite Xcursor
> > +WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
> > +WANTLIB += atk-bridge-2.0 c cairo cairo-gobject enchant epoxy expat ffi
> > +WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
> > +WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
> >  WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0
> > -WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
> > -WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
> > -WANTLIB += xcb-shm xml2 z fribidi
> > +WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png util xcb
> > +WANTLIB += xcb-render xcb-shm xml2 z
> >  
> > -COMPILER = base-clang ports-gcc base-gcc
> > +MASTER_SITES=  
> > https://www.bennewitz.com/bluefish/stable/source/
> > +
> > +COMPILER=  base-clang ports-gcc base-gcc
> >  
> >  MODULES=   lang/python \
> > textproc/intltool
> > @@ -30,14 +30,13 @@ MODULES=lang/python \
> >  RUN_DEPENDS=   devel/desktop-file-utils \
> > misc/shared-mime-info \
> > x11/gtk+3,-guic
> > -
> >  LIB_DEPENDS=   textproc/enchant \
> > +   textproc/libxml \
> > x11/gnome/gucharmap
> 
> Why this change in LIB_DEPENDS?

>From ${WRKSRC}/INSTALL:

1) Compilation needs the following software packages - usually the headers and
   libraries (search for packages with a -dev or -devel suffix and/or prefix
   lib, e.g. libgtk2.0-dev)

 - Gtk 2 (2.20 or newer) or 3 (3.2.2) or newer
 - libxml2
 - libenchant (optional for spell checking)
 - libgucharmap (optional for character map plugin. Version 2.x is 
recommended)
 - python-dev (optional)

UPDATE www/bluefish-2.2.11

2020-02-15 Thread Björn Ketelaars

Diff below brings bluefish to 2.2.11, which is a minor maintenance
release and minor feature release. Although this release supports
python3 the enclosed plugins only work on python2. As such, do not
switch to python3...for now.

Changes to the port:
- Follow Makefile.template
- Sync WANTLIB and PLIST
- Add textproc/libxml as LDEP
- Bytecompile python plugins in post-install phase

Run tested on amd64. Everything, including the plugins, seem to work.

Comments/OK?


diff --git www/bluefish/Makefile www/bluefish/Makefile
index 2d6e9ab0570..72c0dec94ac 100644
--- www/bluefish/Makefile
+++ www/bluefish/Makefile
@@ -2,27 +2,27 @@
 
 COMMENT=   HTML editor for experienced web designers
 
-DISTNAME = bluefish-2.2.10
+DISTNAME=  bluefish-2.2.11
+
 CATEGORIES=www editors
-HOMEPAGE=  http://bluefish.openoffice.nl/
-REVISION = 6
 
-MASTER_SITES=  http://www.bennewitz.com/bluefish/stable/source/
+HOMEPAGE=  http://bluefish.openoffice.nl/
 
 # GPLv3
 PERMIT_PACKAGE=Yes
 
-WANTLIB += ICE SM X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
-WANTLIB += c cairo cairo-gobject dbus-1 enchant epoxy expat ffi
-WANTLIB += fontconfig freetype gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
+WANTLIB += ${COMPILER_LIBCXX} ${MODPY_WANTLIB} X11 Xcomposite Xcursor
+WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0
+WANTLIB += atk-bridge-2.0 c cairo cairo-gobject enchant epoxy expat ffi
+WANTLIB += fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0
+WANTLIB += glib-2.0 gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
 WANTLIB += gucharmap_2_90 harfbuzz iconv intl lzma m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png pthread
-WANTLIB += ${MODPY_WANTLIB} ${COMPILER_LIBCXX} util xcb xcb-render
-WANTLIB += xcb-shm xml2 z fribidi
+WANTLIB += pangocairo-1.0 pangoft2-1.0 pcre pixman-1 png util xcb
+WANTLIB += xcb-render xcb-shm xml2 z
 
-COMPILER = base-clang ports-gcc base-gcc
+MASTER_SITES=  https://www.bennewitz.com/bluefish/stable/source/
+
+COMPILER=  base-clang ports-gcc base-gcc
 
 MODULES=   lang/python \
textproc/intltool
@@ -30,14 +30,13 @@ MODULES=lang/python \
 RUN_DEPENDS=   devel/desktop-file-utils \
misc/shared-mime-info \
x11/gtk+3,-guic
-
 LIB_DEPENDS=   textproc/enchant \
+   textproc/libxml \
x11/gnome/gucharmap
 
 CONFIGURE_STYLE=   gnu
 CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-
 CONFIGURE_ARGS=
--with-freedesktop_org-menu='${PREFIX}/share/applications/' \
--disable-update-databases
 
@@ -45,5 +44,6 @@ USE_GMAKE=Yes
 
 post-install:
rm ${PREFIX}/lib/bluefish/*.{a,la}
+   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py ${PREFIX}/share/bluefish
 
 .include 
diff --git www/bluefish/distinfo www/bluefish/distinfo
index 6f1f81f2b63..7fcabbcfa41 100644
--- www/bluefish/distinfo
+++ www/bluefish/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bluefish-2.2.10.tar.gz) = BAdG2L/ZNz4nHQepaZ1kigLHcJXW7l8xPecuerSChMs=
-SIZE (bluefish-2.2.10.tar.gz) = 5522381
+SHA256 (bluefish-2.2.11.tar.gz) = XUwmNliA3r54csITmnVe5ORa10x6yhfJVUIygtFx8yg=
+SIZE (bluefish-2.2.11.tar.gz) = 5556158
diff --git www/bluefish/pkg/PLIST www/bluefish/pkg/PLIST
index 9c38dcd2382..9a0d4b538f5 100644
--- www/bluefish/pkg/PLIST
+++ www/bluefish/pkg/PLIST
@@ -1,13 +1,13 @@
 @comment $OpenBSD: PLIST,v 1.30 2018/07/01 18:33:38 espie Exp $
 @bin bin/bluefish
 lib/bluefish/
-lib/bluefish/about.so
-lib/bluefish/charmap.so
-lib/bluefish/entities.so
-lib/bluefish/htmlbar.so
-lib/bluefish/infbrowser.so
-lib/bluefish/snippets.so
-lib/bluefish/zencoding.so
+@so lib/bluefish/about.so
+@so lib/bluefish/charmap.so
+@so lib/bluefish/entities.so
+@so lib/bluefish/htmlbar.so
+@so lib/bluefish/infbrowser.so
+@so lib/bluefish/snippets.so
+@so lib/bluefish/zencoding.so
 @man man/man1/bluefish.1
 share/appdata/
 share/appdata/bluefish.appdata.xml
@@ -94,22 +94,33 @@ share/bluefish/colorprofiles/Dark_theme
 share/bluefish/colorprofiles/Light_theme
 share/bluefish/css_decompressor
 share/bluefish/cssmin.py
+share/bluefish/cssmin.pyc
 share/bluefish/default_accelmap
 share/bluefish/encodings
 share/bluefish/jsbeautifier/
 share/bluefish/jsbeautifier/__init__.py
+share/bluefish/jsbeautifier/__init__.pyc
 share/bluefish/jsbeautifier/__version__.py
+share/bluefish/jsbeautifier/__version__.pyc
 share/bluefish/jsbeautifier/unpackers/
 share/bluefish/jsbeautifier/unpackers/__init__.py
+share/bluefish/jsbeautifier/unpackers/__init__.pyc
 share/bluefish/jsbeautifier/unpackers/evalbased.py
+share/bluefish/jsbeautifier/unpackers/evalbased

UPDATE x11/py-qt5-5.9.2

2020-02-12 Thread Björn Ketelaars

Enclosed diff brings py-qt5 to 5.9.2, which is a small step forward.
Moving past the 5.9 branch is an endeavour by itself, and will take a
bit of effort.

Tested on amd64 in combination with an update of py-sip (send in
separate mail):
- Build tested:
  devel/git-cola
  geo/qgis
  math/veusz
  textproc/calibre
  www/weboob
- Run tested:
  devel/git-cola
  devel/spyder/spyder
  geo/qgis
  math/veusz
  shells/py-qtconsole
  textproc/calibre
  www/weboob (weboob-config-qt)

Comments/OK?


diff --git Makefile Makefile
index 376011907ca..325785b9e82 100644
--- Makefile
+++ Makefile
@@ -2,14 +2,13 @@
 
 COMMENT=   python Qt5 bindings
 
-V= 5.9
+V= 5.9.2
 DISTNAME=  PyQt5_gpl-${V}
 PKGNAME=   py-qt5-${V}
-REVISION=  6
 
 CATEGORIES=x11 devel
 
-HOMEPAGE=  http://www.riverbankcomputing.co.uk/software/pyqt/intro
+HOMEPAGE=  https://www.riverbankcomputing.com/software/pyqt/intro
 MAINTAINER=KDE porting team 
 
 # GPLv3 with exceptions for use with certain named open-source licenses
diff --git distinfo distinfo
index 335109979cb..e9a91d11b98 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (PyQt5_gpl-5.9.tar.gz) = qw55mc8gLMcpYseK7+Rh0WSXs8GoKCq5Zq2QtssnEJY=
-SIZE (PyQt5_gpl-5.9.tar.gz) = 3097557
+SHA256 (PyQt5_gpl-5.9.2.tar.gz) = wZDaxZjJewETyl56N8ccYj8C0dcTCIrd+srErPpLg5Q=
+SIZE (PyQt5_gpl-5.9.2.tar.gz) = 3102848
diff --git patches/patch-configure_py patches/patch-configure_py
index 6f98c7b8802..b7896e1298b 100644
--- patches/patch-configure_py
+++ patches/patch-configure_py
@@ -1,7 +1,8 @@
 $OpenBSD: patch-configure_py,v 1.2 2016/08/30 16:02:17 landry Exp $
 configure.py.orig  Mon Jul 25 15:55:28 2016
-+++ configure.py   Tue Aug  9 07:49:53 2016
-@@ -1984,7 +1984,18 @@ def run_command(cmd, verbose):
+Index: configure.py
+--- configure.py.orig
 configure.py
+@@ -1991,7 +1991,18 @@ def run_command(cmd, verbose):
  """ Run a command and display the output if requested.  cmd is the command
  to run.  verbose is set if the output is to be displayed.
  """
@@ -20,7 +21,7 @@ $OpenBSD: patch-configure_py,v 1.2 2016/08/30 16:02:17 landry 
Exp $
  if verbose:
  sys.stdout.write(cmd + "\n")
  
-@@ -2689,7 +2700,7 @@ Type 'no' to decline the terms of the license.
+@@ -2733,7 +2744,7 @@ Type 'no' to decline the terms of the license.
  sys.stdout.flush()
  
  try:
diff --git pkg/PLIST pkg/PLIST
index da52f2ccbd4..d12521fc0f5 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -167,6 +167,10 @@ 
share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/QAxContainermod.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxbase.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxobject.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QAxContainer/qaxwidget.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/QtAndroidExtrasmod.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/qandroidjniobject.sip
+share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtAndroidExtras/qtandroid.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/QtBluetoothmod.sip
 share/sip/PyQt5${MODPY_BIN_SUFFIX}/QtBluetooth/qbluetooth.sip

UPDATE devel/py-sip-4.19.18

2020-02-12 Thread Björn Ketelaars

Enclosed is another attempt to update devel/py-sip, this time to
4.19.18. Previous attempt [0] broke at least py-qt5, and has been
reverted. Updating to a newer version than 4.19.19 is unfortunately not
an option as it breaks all kinds of stuff (py-qt5 for example fails to
build).

Reason for wanting to update py-sip is that git-cola currently segfaults
on exit. This update fixes it.

I tested this update together with an update of py-qt5 (send in a
separate mail):
- Build tested:
devel/tortoisehg
geo/qgis
x11/kde4/py-kde
x11/py-qt4
x11/py-qt5
- Run tested:
devel/git-cola
devel/tortoisehg
geo/qgis

As my track record for this port is poor I think it makes sense to wait
until I have at least 2 OK's, preferably from heavy hitters.

Comments/OK?

[0] https://marc.info/?l=openbsd-ports&m=158093766318588&w=2


diff --git Makefile Makefile
index c9a03b65cf4..eb8b35bca70 100644
--- Makefile
+++ Makefile
@@ -5,13 +5,13 @@ COMMENT=  automatically generate Python bindings for C 
and C++ libs
 # XXX  py-sip updates FREQUENTLY break other ports
 # XXX  BE ESPECIALLY CAREFUL WHEN TESTING UPDATES!
 
-MODPY_EGG_VERSION =4.19.17
+MODPY_EGG_VERSION =4.19.18
 EPOCH= 0
 DISTNAME=  sip-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 CATEGORIES=devel
 
-HOMEPAGE=  https://www.riverbankcomputing.co.uk/software/sip/intro
+HOMEPAGE=  https://www.riverbankcomputing.com/software/sip/intro
 
 # SIP license (Python like)
 PERMIT_PACKAGE=Yes
diff --git distinfo distinfo
index 0a2e060db81..d8c32130f79 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (sip-4.19.17.tar.gz) = ErzY9NX+78EFvAddEsUJDueD9zgHKFY8kbi5XQ7EXfM=
-SIZE (sip-4.19.17.tar.gz) = 1056156
+SHA256 (sip-4.19.18.tar.gz) = wL2GOADtmxXcrUd8QBfNtz+oBcJZCLAkBWSt101pfh4=
+SIZE (sip-4.19.18.tar.gz) = 1056840
diff --git patches/patch-configure_py patches/patch-configure_py
index 283d332e419..d3b91cc951d 100644
--- patches/patch-configure_py
+++ patches/patch-configure_py
@@ -3,7 +3,7 @@ $OpenBSD: patch-configure_py,v 1.3 2020/02/07 22:10:23 bket Exp 
$
 Index: configure.py
 --- configure.py.orig
 +++ configure.py
-@@ -269,7 +269,7 @@ def create_config(module, template, macros):
+@@ -270,7 +270,7 @@ def create_config(module, template, macros):
  "sip_version":  sip_version,
  "sip_version_str":  sip_version_str,
  "platform": build_platform,

Re: UPDATE www/jupyter-notebook-6.0.3

2020-02-11 Thread Björn Ketelaars

On Tue 11/02/2020 16:21, Kurt Mosiejczuk wrote:
> On Fri, Feb 07, 2020 at 09:36:30PM +0100, Björn Ketelaars wrote:
> > Diff below updates jupyter-notebook to 6.0.3. Changelog can be found at
> > https://jupyter-notebook.readthedocs.io/en/stable/changelog.html.
> > Noticeable change is that upstream dropped support for python 2.
> 
> > Changes to the port:
> > - Drop FLAVOR and set MODPY_VERSION
> > - Update dependencies
> > - Drop post-install bits as it is no longer necessary to add a suffix to
> >   jupyter-notebook and its tools
> > - Set @conflict- and @pkgpath-marker in PLIST
> 
> > Testing:
> > - 'make test' runs successfully
> > - Run tested on amd64 in an existing jupyter-notebook environment
> 
> > Comments/OK?
> 
> Patch looks good to me. Will folks notice the python2 version going
> away? I suppose they might since the files going into bin/ are losing
> their -3 suffix.
> 
> If we don't think that will cause any problems, ok kmos

Upgrading jupyter-notebook to this newer version is transparent, which
could cause two problems:
  - Users of the python2 flavor will be presented with a python3
environment, which could cause their workbooks to 'fail';
  - Users of the python3 flavor python will wonder why
'jupyter-notebook-3' isn't working any more, and will notice that
'jupyter-notebook' does work.

Although I no not think the latter is bad, we could help users by
informing them about this update. My proposal would be to add something
to current.html.

The first problem is kind of a bad one as some notebooks will need to be
converted to pyhton3 code. Users will have to invest time and effort to
update their code. Least thing I should do is inform them of this. Also
here I propose to inform users via current.html.

Is this update important enough to possibly break people's work?
Probably not. Reason for wanting to move forward is that it does not
make sense to maintain ports of tools that are not fully supported by
their upstream. In the case of jupyter-notebook support for python2 has
been dropped.
Not moving past this small hurdle will, sooner or later, cause an issue
somewhere (else). My proposal is to do it now.

Additional comments/OK's to commit this update? Opinions on the above?

Re: UPDATE www/e2guardian-5.3.4

2020-02-11 Thread Björn Ketelaars

On Tue 11/02/2020 10:26, Jeremie Courreges-Anglas wrote:
> On Mon, Feb 10 2020, Björn Ketelaars  wrote:
> > Diff below brings e2guardian to 5.3.4, which is a bug fix release. From
> > changelog [0]:
> >   - Fix #565 segfault when no write permission on generated certs
> > directory 
> >   - Fix #493 referexception not working
> >   - Fix #549 - Url in CGI and bypass wrong in MITM 
> >   - Bug fix sigwait code for OpenBSD
> >
> > Changes to the port:
> >   - Upstream has fixed sigwait code, as such remove relevant bits from
> > patch-src_FatController_cpp
> 
> It's sad that upstream has to emulate sigtimedwait using sigwait and
> SIGALRM.  I hope the emulation is as correct as what our patch did.
> 
> > Testing:
> >   - Lightly run tested on amd64. Note that I only played a bit with this
> > port, nothing serious.
> >
> > Comments/OK?
> 
> The new files in PLIST should probably be @sampled.

Yes, you are right, the new lists should be @sampled. New diff:


diff --git Makefile Makefile
index 6ed036472e1..188a525976b 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 GH_ACCOUNT =   e2guardian
 GH_PROJECT =   e2guardian
-GH_TAGNAME =   5.3.3
+GH_TAGNAME =   v5.3.4
 
 COMMENT =  content scanning web filter
 CATEGORIES =   www net
diff --git distinfo distinfo
index b8064b9d2a3..bc0d2e23fad 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (e2guardian-5.3.3.tar.gz) = nYj30sM54BWG0mfyWjAYaC0RW4qq3Bi+2uke+rUchbQ=
-SIZE (e2guardian-5.3.3.tar.gz) = 2009254
+SHA256 (e2guardian-5.3.4.tar.gz) = CaEH/Xkb6S7csIN7j9ytYmkoFi0F4xrlP6j+Ott9VlI=
+SIZE (e2guardian-5.3.4.tar.gz) = 2083057
diff --git patches/patch-configs_e2guardian_conf_in 
patches/patch-configs_e2guardian_conf_in
index f5554370e95..21b191f1cc9 100644
--- patches/patch-configs_e2guardian_conf_in
+++ patches/patch-configs_e2guardian_conf_in
@@ -3,10 +3,10 @@ $OpenBSD: patch-configs_e2guardian_conf_in,v 1.1.1.1 
2019/09/18 16:34:03 sthen E
 Index: configs/e2guardian.conf.in
 --- configs/e2guardian.conf.in.orig
 +++ configs/e2guardian.conf.in
-@@ -568,7 +568,7 @@ logconnectionhandlingerrors = on
- # This figure is the maximum number of concurrent connections.
- # If more connections are made, connections will queue until a worker thread 
is free.
- # On large site you might want to try 5000 (max value 2)
+@@ -577,7 +577,7 @@ logconnectionhandlingerrors = on
+ # On 32-bit systems reduce this to 300 to avoid exceeding the <4GB
+ # virtual memory limit and on Linux decrease the thread stack size from
+ # 10MB to 2MB (ulimit -s 2048)
 -httpworkers = 500 
 +httpworkers = 50
  
diff --git patches/patch-configs_e2guardianf1_conf_in 
patches/patch-configs_e2guardianf1_conf_in
index 2d1623471ba..b68ad4f9c7c 100644
--- patches/patch-configs_e2guardianf1_conf_in
+++ patches/patch-configs_e2guardianf1_conf_in
@@ -3,7 +3,7 @@ $OpenBSD: patch-configs_e2guardianf1_conf_in,v 1.1.1.1 
2019/09/18 16:34:03 sthen
 Index: configs/e2guardianf1.conf.in
 --- configs/e2guardianf1.conf.in.orig
 +++ configs/e2guardianf1.conf.in
-@@ -303,7 +303,7 @@ bypasskey = ''
+@@ -308,7 +308,7 @@ bypasskey = ''
  #cgikey = 'you must change this text in order to be secure'
  
  #  Users will not be able to bypass sites/urls in these lists
diff --git patches/patch-src_FatController_cpp 
patches/patch-src_FatController_cpp
index cbbe878a4e5..8b44d503ef4 100644
--- patches/patch-src_FatController_cpp
+++ patches/patch-src_FatController_cpp
@@ -3,18 +3,7 @@ $OpenBSD: patch-src_FatController_cpp,v 1.1.1.1 2019/09/18 
16:34:03 sthen Exp $
 Index: src/FatController.cpp
 --- src/FatController.cpp.orig
 +++ src/FatController.cpp
-@@ -46,6 +46,10 @@
- #include 
- #endif //__SSLMITM
- 
-+#if defined(__OpenBSD__)
-+#include 
-+#endif
-+
- #include "FatController.hpp"
- #include "ConnectionHandler.hpp"
- #include "DynamicURLList.hpp"
-@@ -194,7 +198,7 @@ void stat_rec::reset()
+@@ -194,7 +194,7 @@ void stat_rec::reset()
fprintf(fs, "%s %d  %d  %d  %d  %ld %ld %ld 
 %ld%d   %d\n", buffer, o.http_workers,
  bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs, mfd, 
LC);
  } else {
@@ -23,15 +12,3 @@ Index: src/FatController.cpp
  bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs, mfd, 
LC);
  }
  
-@@ -1696,7 +1700,11 @@ int fc_controlit()   //
- }
- timeout.tv_sec = 5;
- timeout.tv_nsec = (long) 0;
-+#if defined(__OpenBSD__)
-+rc = syscall(SYS___thrsigdivert, signal_set, NULL, &timeout);
-+#else
- rc = sigtimedwait(&signal_set, NULL, &timeout);
-+#endif
- if (rc < 0) {
- if (errno != EAGAIN) {
- syslog(LOG_INFO, "%sUnexpected error from sigtimedwait() %d 
%s", thread_id.c_str(), errno, strerror(errno

UPDATE www/e2guardian-5.3.4

2020-02-09 Thread Björn Ketelaars

Diff below brings e2guardian to 5.3.4, which is a bug fix release. From
changelog [0]:
  - Fix #565 segfault when no write permission on generated certs
directory 
  - Fix #493 referexception not working
  - Fix #549 - Url in CGI and bypass wrong in MITM 
  - Bug fix sigwait code for OpenBSD

Changes to the port:
  - Upstream has fixed sigwait code, as such remove relevant bits from
patch-src_FatController_cpp

Testing:
  - Lightly run tested on amd64. Note that I only played a bit with this
port, nothing serious.

Comments/OK?

[0] https://github.com/e2guardian/e2guardian/blob/v5.3.4/ChangeLog


diff --git Makefile Makefile
index 6ed036472e1..188a525976b 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 GH_ACCOUNT =   e2guardian
 GH_PROJECT =   e2guardian
-GH_TAGNAME =   5.3.3
+GH_TAGNAME =   v5.3.4
 
 COMMENT =  content scanning web filter
 CATEGORIES =   www net
diff --git distinfo distinfo
index b8064b9d2a3..bc0d2e23fad 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (e2guardian-5.3.3.tar.gz) = nYj30sM54BWG0mfyWjAYaC0RW4qq3Bi+2uke+rUchbQ=
-SIZE (e2guardian-5.3.3.tar.gz) = 2009254
+SHA256 (e2guardian-5.3.4.tar.gz) = CaEH/Xkb6S7csIN7j9ytYmkoFi0F4xrlP6j+Ott9VlI=
+SIZE (e2guardian-5.3.4.tar.gz) = 2083057
diff --git patches/patch-configs_e2guardian_conf_in 
patches/patch-configs_e2guardian_conf_in
index f5554370e95..21b191f1cc9 100644
--- patches/patch-configs_e2guardian_conf_in
+++ patches/patch-configs_e2guardian_conf_in
@@ -3,10 +3,10 @@ $OpenBSD: patch-configs_e2guardian_conf_in,v 1.1.1.1 
2019/09/18 16:34:03 sthen E
 Index: configs/e2guardian.conf.in
 --- configs/e2guardian.conf.in.orig
 +++ configs/e2guardian.conf.in
-@@ -568,7 +568,7 @@ logconnectionhandlingerrors = on
- # This figure is the maximum number of concurrent connections.
- # If more connections are made, connections will queue until a worker thread 
is free.
- # On large site you might want to try 5000 (max value 2)
+@@ -577,7 +577,7 @@ logconnectionhandlingerrors = on
+ # On 32-bit systems reduce this to 300 to avoid exceeding the <4GB
+ # virtual memory limit and on Linux decrease the thread stack size from
+ # 10MB to 2MB (ulimit -s 2048)
 -httpworkers = 500 
 +httpworkers = 50
  
diff --git patches/patch-configs_e2guardianf1_conf_in 
patches/patch-configs_e2guardianf1_conf_in
index 2d1623471ba..b68ad4f9c7c 100644
--- patches/patch-configs_e2guardianf1_conf_in
+++ patches/patch-configs_e2guardianf1_conf_in
@@ -3,7 +3,7 @@ $OpenBSD: patch-configs_e2guardianf1_conf_in,v 1.1.1.1 
2019/09/18 16:34:03 sthen
 Index: configs/e2guardianf1.conf.in
 --- configs/e2guardianf1.conf.in.orig
 +++ configs/e2guardianf1.conf.in
-@@ -303,7 +303,7 @@ bypasskey = ''
+@@ -308,7 +308,7 @@ bypasskey = ''
  #cgikey = 'you must change this text in order to be secure'
  
  #  Users will not be able to bypass sites/urls in these lists
diff --git patches/patch-src_FatController_cpp 
patches/patch-src_FatController_cpp
index cbbe878a4e5..8b44d503ef4 100644
--- patches/patch-src_FatController_cpp
+++ patches/patch-src_FatController_cpp
@@ -3,18 +3,7 @@ $OpenBSD: patch-src_FatController_cpp,v 1.1.1.1 2019/09/18 
16:34:03 sthen Exp $
 Index: src/FatController.cpp
 --- src/FatController.cpp.orig
 +++ src/FatController.cpp
-@@ -46,6 +46,10 @@
- #include 
- #endif //__SSLMITM
- 
-+#if defined(__OpenBSD__)
-+#include 
-+#endif
-+
- #include "FatController.hpp"
- #include "ConnectionHandler.hpp"
- #include "DynamicURLList.hpp"
-@@ -194,7 +198,7 @@ void stat_rec::reset()
+@@ -194,7 +194,7 @@ void stat_rec::reset()
fprintf(fs, "%s %d  %d  %d  %d  %ld %ld %ld 
 %ld%d   %d\n", buffer, o.http_workers,
  bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs, mfd, 
LC);
  } else {
@@ -23,15 +12,3 @@ Index: src/FatController.cpp
  bc, o.http_worker_Q.size(), o.log_Q->size(), cnx, cps, rqx, rqs, mfd, 
LC);
  }
  
-@@ -1696,7 +1700,11 @@ int fc_controlit()   //
- }
- timeout.tv_sec = 5;
- timeout.tv_nsec = (long) 0;
-+#if defined(__OpenBSD__)
-+rc = syscall(SYS___thrsigdivert, signal_set, NULL, &timeout);
-+#else
- rc = sigtimedwait(&signal_set, NULL, &timeout);
-+#endif
- if (rc < 0) {
- if (errno != EAGAIN) {
- syslog(LOG_INFO, "%sUnexpected error from sigtimedwait() %d 
%s", thread_id.c_str(), errno, strerror(errno));
diff --git pkg/PLIST pkg/PLIST
index 969d2736f05..97401f52af8 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -253,6 +253,7 @@ 
share/examples/e2guardian/lists/contentscanners/exceptionvirussitelist
 @sample ${SYSCONFDIR}/e2guardian/lists/contentscanners/exceptionvirussitelist
 share/examples/e2guardian/lists/contentscanners/exceptionvirusurllist
 @sample ${SYSCONFDIR}/e2guardian/lists/contentscanners/exceptionvirusurllist
+share/examples/e2guardian/lists/domainsnobypass
 share/examples/e2guardian/lists/embededreferersiteiplist
 @sample ${SYSCONFDIR}/e2guardian/lists/embededreferersiteiplist
 s

Re: [UPDATE] audio/ncspot to 0.1.2

2020-02-08 Thread Björn Ketelaars

On Sat 08/02/2020 14:52, Henrik Friedrichsen wrote:
> On Sat, Feb 08, 2020 at 07:10:48AM +0100, Sebastien Marie wrote:
> > Henrik, could you try with the following diff ?
> 
> Sure! Attached is a diff with the license bits. Looks better!

> -MODCARGO_CRATES +=   librespot-metadata  0.1.0   # MIT
> -MODCARGO_CRATES +=   librespot-playback  0.1.0   # MIT
> -MODCARGO_CRATES +=   librespot-protocol  0.1.0   # MIT
> +MODCARGO_CRATES +=   libpulse-sys0.0.0   # MODCARGO_CRATES +=
> librespot-audio 0.1.1   # MIT

Line above looks wrong.   ^

UPDATE games/freeciv-2.6.1

2020-02-08 Thread Björn Ketelaars

Diff below brings freeciv to 2.6.1, which is a bugfix release.
https://freeciv.fandom.com/wiki/NEWS-2.6.1 lists the changes since
2.6.0.

(Lightly) run tested on amd64 for the last couple of days.

Comments/OK?


diff --git Makefile Makefile
index 2d8260e17d8..1f8a076b1d8 100644
--- Makefile
+++ Makefile
@@ -4,7 +4,7 @@ COMMENT-main=   Civilization clone for X11; multiplayer; game 
server
 COMMENT-client=Freeciv client
 COMMENT-share= shared data files for Freeciv
 
-VERSION=   2.6.0
+VERSION=   2.6.1
 DISTNAME=  freeciv-${VERSION}
 PKGNAME-main=  freeciv-server-${VERSION}
 PKGNAME-client=freeciv-client-${VERSION}
@@ -23,15 +23,15 @@ EXTRACT_SUFX=   .tar.bz2
 cWANTLIB += bz2 c crypto curl iconv intl lzma m nghttp2 pthread sqlite3 ssl z
 cWANTLIB += ${MODLUA_WANTLIB}
 
-WANTLIB-main += curses readline ${cWANTLIB}
+WANTLIB-main += readline ${cWANTLIB}
 
-WANTLIB-client += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi
-WANTLIB-client += Xinerama Xrandr Xrender atk-1.0 atk-bridge-2.0 atspi
-WANTLIB-client += cairo cairo-gobject dbus-1 epoxy expat ffi fontconfig
-WANTLIB-client += freetype fribidi gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB-client += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
-WANTLIB-client += harfbuzz pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre
-WANTLIB-client += pixman-1 png xcb xcb-render xcb-shm ${cWANTLIB}
+WANTLIB-client += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
+WANTLIB-client += Xrandr Xrender atk-1.0 atk-bridge-2.0 cairo cairo-gobject
+WANTLIB-client += epoxy expat fontconfig freetype fribidi gdk-3 gdk_pixbuf-2.0
+WANTLIB-client += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
+WANTLIB-client += gthread-2.0 gtk-3 harfbuzz pango-1.0 pangocairo-1.0
+WANTLIB-client += pangoft2-1.0 pixman-1 png xcb xcb-render xcb-shm
+WANTLIB-client += ${cWANTLIB}
 
 WANTLIB-share=
 
diff --git distinfo distinfo
index ba22aa32483..d0d6b4c0e07 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (freeciv-2.6.0.tar.bz2) = fCA5kZjWx9hG/tmmmwLgETSuU0Cjrg+Z0eOAY63myZk=
-SIZE (freeciv-2.6.0.tar.bz2) = 51912466
+SHA256 (freeciv-2.6.1.tar.bz2) = zOaEHaAZQTiq0mnMc1VX20OKRJCddf0D1NtnUHmGueI=
+SIZE (freeciv-2.6.1.tar.bz2) = 51915573

Re: [UPDATE] audio/ncspot to 0.1.2

2020-02-07 Thread Björn Ketelaars

On Fri 07/02/2020 20:16, Henrik Friedrichsen wrote:
> Attached diff updates audio/ncspot to 0.1.2.
> 
> OK?

Is there a reason for dropping the license markers after
MODCARGO_CRATES? If I'm not mistaken, these markers should be generated
using 'make modcargo-gen-crates-licenses'.

The update itself works for me (tested on amd64).

Re: UPDATE devel/py-jupyter_core-4.6.1

2020-02-07 Thread Björn Ketelaars

On Fri 07/02/2020 21:28, Björn Ketelaars wrote:
> Diff below brings py-jupyter_core to 4.6.1, which is needed for a
> pending update of www/jupyter-notebook. Changelog can be found at
> https://github.com/jupyter/jupyter_core/blob/4.6.1/docs/changelog.rst
> 
> Changes to the port:
> - Follow Makefile.template
> - Remove ipython as TDEP, which is not needed
> - Add py-nose as TDEP
> 
> Testing:
> - 'make test' runs successfully for both python2 and python3
> - Run tested on amd64 with jupyter-notebook from ports and an update
>   hereof
> 
> Comments/OK?

Oops, forgot to use '--relative' with git, new diff below.


diff --git Makefile Makefile
index 4962a3be9c3..b057b6fe65f 100644
--- Makefile
+++ Makefile
@@ -2,29 +2,26 @@
 
 COMMENT =  Jupyter core package
 
-MODPY_EGG_VERSION =4.4.0
+MODPY_EGG_VERSION =4.6.1
 DISTNAME = jupyter_core-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 1
 
 CATEGORIES =   devel
 
 HOMEPAGE = https://jupyter.org/
 
-RUN_DEPENDS =  devel/py-traitlets${MODPY_FLAVOR}
-TEST_DEPENDS = devel/ipython${MODPY_FLAVOR}>=5.1.0 \
-   devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2
-
 # BSD
 PERMIT_PACKAGE =   Yes
 
 MODULES =  lang/python
-
 MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes
 MODPY_PYTEST = Yes
 MODPY_PYTEST_ARGS =jupyter_core
-PORTHOME = ${WRKDIR}
+
+RUN_DEPENDS =  devel/py-traitlets${MODPY_FLAVOR}
+TEST_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
+   devel/py-nose$(MODPY_FLAVOR)
 
 FLAVORS =  python3
 FLAVOR ?=
@@ -33,6 +30,8 @@ FLAVOR ?=
 TEST_DEPENDS +=devel/py-mock
 .endif
 
+PORTHOME = ${WRKDIR}
+
 post-install:
mv ${PREFIX}/bin/jupyter{,${MODPY_BIN_SUFFIX}}
mv ${PREFIX}/bin/jupyter-migrate{,${MODPY_BIN_SUFFIX}}
diff --git distinfo distinfo
index 534a6e1d7d5..f92949f9480 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (jupyter_core-4.4.0.tar.gz) = 
unB1SqaAMAMGxpl5ASj2+9jDBu5ZJ5dsvkitrPJAwLc=
-SIZE (jupyter_core-4.4.0.tar.gz) = 63613
+SHA256 (jupyter_core-4.6.1.tar.gz) = 
oYPg7C6Pat3fYrCj/GoiN+PgBW04HlNtPnx+zDBn4kQ=
+SIZE (jupyter_core-4.6.1.tar.gz) = 66693
diff --git patches/patch-jupyter_core_command_py 
patches/patch-jupyter_core_command_py
index 4acbeb5f540..ef58670679e 100644
--- patches/patch-jupyter_core_command_py
+++ patches/patch-jupyter_core_command_py
@@ -1,7 +1,8 @@
 $OpenBSD: patch-jupyter_core_command_py,v 1.1 2016/12/13 14:46:43 shadchin Exp 
$
 jupyter_core/command.py.orig   Tue Sep 13 18:22:49 2016
-+++ jupyter_core/command.pyThu Sep 29 17:04:28 2016
-@@ -77,7 +77,13 @@ def list_subcommands():
+Index: jupyter_core/command.py
+--- jupyter_core/command.py.orig
 jupyter_core/command.py
+@@ -84,7 +84,13 @@ def list_subcommands():
  if sys.platform.startswith('win'):
  # remove file-extension on Windows
  name = os.path.splitext(name)[0]
@@ -16,10 +17,11 @@ $OpenBSD: patch-jupyter_core_command_py,v 1.1 2016/12/13 
14:46:43 shadchin Exp $
  # build a set of subcommand strings, excluding subcommands whose parents 
are defined
  subcommands = set()
  # Only include `jupyter-foo-bar` if `jupyter-foo` is not already present
-@@ -182,6 +188,8 @@ def main():
+@@ -245,7 +251,8 @@ def main():
  sys.exit("subcommand is required")
- 
- command = 'jupyter-' + subcommand
+ 
+ command = _jupyter_abspath(subcommand)
+-
 +if sys.version_info.major == 3 and not command.endswith('-3'):
 +command += '-3'
  try:
diff --git patches/patch-jupyter_core_tests_test_command_py 
patches/patch-jupyter_core_tests_test_command_py
index 2e56ec9a998..722657c8cd4 100644
--- patches/patch-jupyter_core_tests_test_command_py
+++ patches/patch-jupyter_core_tests_test_command_py
@@ -2,7 +2,7 @@ $OpenBSD: patch-jupyter_core_tests_test_command_py,v 1.2 
2018/12/29 11:50:35 mar
 Index: jupyter_core/tests/test_command.py
 --- jupyter_core/tests/test_command.py.orig
 +++ jupyter_core/tests/test_command.py
-@@ -98,16 +98,20 @@ def test_subcommand_not_found():
+@@ -99,20 +99,24 @@ def test_subcommand_not_found():
  
  @patch.object(sys, 'argv', [__file__] + sys.argv[1:])
  def test_subcommand_list(tmpdir):
@@ -21,12 +21,17 @@ Index: jupyter_core/tests/test_command.py
  'jupyterstuff',
  'jupyter-yo-eyropa-ganymyde-callysto'):
 -b.join(cmd).write('')
++b.join(cmd + cmd_sufx).write('')
+ c = tmpdir.mkdir("c")
+ for cmd in ('jupyter-baz',
+ 'jupyter-bop'):
+-c.join(cmd).write('')
 +b.join(cmd + cmd_sufx).write('&

UPDATE www/jupyter-notebook-6.0.3

2020-02-07 Thread Björn Ketelaars

Diff below updates jupyter-notebook to 6.0.3. Changelog can be found at
https://jupyter-notebook.readthedocs.io/en/stable/changelog.html.
Noticeable change is that upstream dropped support for python 2.

Changes to the port:
- Drop FLAVOR and set MODPY_VERSION
- Update dependencies
- Drop post-install bits as it is no longer necessary to add a suffix to
  jupyter-notebook and its tools
- Set @conflict- and @pkgpath-marker in PLIST

Testing:
- 'make test' runs successfully
- Run tested on amd64 in an existing jupyter-notebook environment

Comments/OK?


diff --git Makefile Makefile
index ad0314ebf9e..80b5d16b0c7 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,9 @@
 
 COMMENT =  web-based notebook for interactive computing
 
-MODPY_EGG_VERSION =5.7.8
+MODPY_EGG_VERSION =6.0.3
 DISTNAME = notebook-${MODPY_EGG_VERSION}
 PKGNAME =  jupyter-notebook-${MODPY_EGG_VERSION}
-REVISION = 0
 
 CATEGORIES =   www devel
 
@@ -18,14 +17,12 @@ MODULES =   lang/python
 
 MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes
-
-FLAVORS =  python3
-FLAVOR ?=
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
 RUN_DEPENDS =  devel/py-ipykernel${MODPY_FLAVOR} \
devel/py-ipython_genutils${MODPY_FLAVOR} \
-   devel/py-jupyter_client${MODPY_FLAVOR}>=5.2.0 \
-   devel/py-jupyter_core${MODPY_FLAVOR}>=4.4.0 \
+   devel/py-jupyter_client${MODPY_FLAVOR}>=5.3.4 \
+   devel/py-jupyter_core${MODPY_FLAVOR}>=4.6.1 \
devel/py-nbconvert${MODPY_FLAVOR} \
devel/py-nbformat${MODPY_FLAVOR} \
devel/py-send2trash${MODPY_FLAVOR} \
@@ -34,7 +31,7 @@ RUN_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
sysutils/py-prometheus_client${MODPY_FLAVOR} \
www/py-jinja2${MODPY_FLAVOR} \
www/py-terminado${MODPY_FLAVOR}>=0.8.1 \
-   www/py-tornado${MODPY_FLAVOR}>=4.1,<7
+   www/py-tornado${MODPY_FLAVOR}>=5.0
 
 TEST_DEPENDS = devel/py-coverage${MODPY_FLAVOR} \
devel/py-nose${MODPY_FLAVOR} \
@@ -45,20 +42,6 @@ TEST_DEPENDS =   
devel/py-coverage${MODPY_FLAVOR} \
 
 # XXX once we have a port of pandoc, we can make docs.
 
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS += devel/py-futures \
-   net/py-ipaddress
-TEST_DEPENDS +=devel/py-mock
-.else
-PKGNAME =  
jupyter-notebook${MODPY_MAJOR_VERSION}-${MODPY_EGG_VERSION}
-.endif
-
-post-install:
-   mv ${PREFIX}/bin/jupyter-bundlerextension{,${MODPY_BIN_SUFFIX}}
-   mv ${PREFIX}/bin/jupyter-nbextension{,${MODPY_BIN_SUFFIX}}
-   mv ${PREFIX}/bin/jupyter-notebook{,${MODPY_BIN_SUFFIX}}
-   mv ${PREFIX}/bin/jupyter-serverextension{,${MODPY_BIN_SUFFIX}}
-
 # XXX exclude selenium tests as recommended, and exclude tests that use
 # send2trash as they error out with "Trashing on system internal mounts is not
 # supported".
diff --git distinfo distinfo
index bf6347fa525..995e6fb7c94 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (notebook-5.7.8.tar.gz) = Vz4K5lDF12sYtuVkum0hvzIdAIR94dIVtBistk8Fbrg=
-SIZE (notebook-5.7.8.tar.gz) = 13371684
+SHA256 (notebook-6.0.3.tar.gz) = R6kJKXXJ55Za2gC5og8M9jfQAdtg0kHUefU8C+EXrUg=
+SIZE (notebook-6.0.3.tar.gz) = 14048151
diff --git pkg/PLIST pkg/PLIST
index 3cb8f27e809..21cb03ef3e0 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,8 +1,10 @@
 @comment $OpenBSD: PLIST,v 1.6 2019/05/10 11:36:55 bket Exp $
-bin/jupyter-bundlerextension${MODPY_BIN_SUFFIX}
-bin/jupyter-nbextension${MODPY_BIN_SUFFIX}
-bin/jupyter-notebook${MODPY_BIN_SUFFIX}
-bin/jupyter-serverextension${MODPY_BIN_SUFFIX}
+@conflict jupyter-notebook3-*
+@pkgpath www/jupyter-notebook,python3
+bin/jupyter-bundlerextension
+bin/jupyter-nbextension
+bin/jupyter-notebook
+bin/jupyter-serverextension
 lib/python${MODPY_VERSION}/site-packages/notebook/
 
lib/python${MODPY_VERSION}/site-packages/notebook-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/notebook-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -24,7 +26,6 @@ 
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}config_manager
 
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}extensions.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}jstest.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}log.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}metrics.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}nbextensions.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/notebook/${MODPY_PYCACHE}notebookapp.${MODP

UPDATE devel/py-jupyter_client-5.3.4

2020-02-07 Thread Björn Ketelaars

Enclosed diff brings py-jupyer_client to 5.3.4, which is needed for a
pending update of jupyter-notebook. Changelog can be found at
https://github.com/jupyter/jupyter_client/blob/5.3.4/docs/changelog.rst.


Changes to the port:
- Follow Makefile.template
- Update dependencies

Testing:
- 'make test' fails TestKernelManager.test_signal_kernel_subprocesses
  for both python2 and python3. I do not understand why this test fails.
  On python3 all other tests are OK. Python2 fails one other tests
  because of 'too many open files'
- Run tested on amd64 with jupyter-notebook from ports and an update
  hereof

Comments/OK?


diff --git Makefile Makefile
index 824719ebdc3..39baa98de92 100644
--- Makefile
+++ Makefile
@@ -2,10 +2,9 @@
 
 COMMENT =  Jupyter protocol implementation and client libraries
 
-MODPY_EGG_VERSION =5.2.4
+MODPY_EGG_VERSION =5.3.4
 DISTNAME = jupyter_client-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 1
 
 CATEGORIES =   devel
 
@@ -20,24 +19,25 @@ MODPY_PI =  Yes
 MODPY_SETUPTOOLS = Yes
 MODPY_PYTEST = Yes
 MODPY_PYTEST_ARGS =jupyter_client
-PORTHOME = ${WRKDIR}
 
-FLAVORS =  python3
-FLAVOR ?=
-
-RUN_DEPENDS =  devel/py-dateutil${MODPY_FLAVOR} \
-   devel/py-jupyter_core${MODPY_FLAVOR}>=4.3.0 \
+RUN_DEPENDS =  devel/py-dateutil${MODPY_FLAVOR}>=2.1 \
+   devel/py-jupyter_core${MODPY_FLAVOR}>=4.6.0 \
devel/py-traitlets${MODPY_FLAVOR} \
-   net/py-zmq${MODPY_FLAVOR} \
-   www/py-tornado${MODPY_FLAVOR}
-TEST_DEPENDS = devel/ipython${MODPY_FLAVOR}>=5.1.0 \
-   devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2 \
+   net/py-zmq${MODPY_FLAVOR}>=13 \
+   www/py-tornado${MODPY_FLAVOR}>=4.1
+TEST_DEPENDS = devel/ipython${MODPY_FLAVOR} \
+   devel/py-ipykernel${MODPY_FLAVOR} \
shells/bash
 
+FLAVORS =  python3
+FLAVOR ?=
+
 .if !${FLAVOR:Mpython3}
 TEST_DEPENDS +=devel/py-mock
 .endif
 
+PORTHOME = ${WRKDIR}
+
 post-install:
mv ${PREFIX}/bin/jupyter-kernel{,${MODPY_BIN_SUFFIX}}
mv ${PREFIX}/bin/jupyter-kernelspec{,${MODPY_BIN_SUFFIX}}
diff --git distinfo distinfo
index 8763b398bf6..6d67b9dab73 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (jupyter_client-5.2.4.tar.gz) = 
tfnLBhBcHS0wcZ21/7PqZ9pgkZ+2jervpYPezNiBNVE=
-SIZE (jupyter_client-5.2.4.tar.gz) = 273397
+SHA256 (jupyter_client-5.3.4.tar.gz) = 
YOb67BAx1j31fxzGce1nPc7Q7UIPQ3fqM9s3scGIuRA=
+SIZE (jupyter_client-5.3.4.tar.gz) = 275850
diff --git patches/patch-jupyter_client_connect_py 
patches/patch-jupyter_client_connect_py
index 3f522511b9f..84d90a98954 100644
--- patches/patch-jupyter_client_connect_py
+++ patches/patch-jupyter_client_connect_py
@@ -9,10 +9,10 @@ Index: jupyter_client/connect.py
  import warnings
 +import sys
  from getpass import getpass
+ from contextlib import contextmanager
  
- import zmq
-@@ -137,7 +138,7 @@ def write_connection_file(fname=None, shell_port=0, io
- with open(fname, 'w') as f:
+@@ -141,7 +142,7 @@ def write_connection_file(fname=None, shell_port=0, io
+ with secure_write(fname) as f:
  f.write(json.dumps(cfg, indent=2))
  
 -if hasattr(stat, 'S_ISVTX'):

UPDATE devel/py-jupyter_core-4.6.1

2020-02-07 Thread Björn Ketelaars

Diff below brings py-jupyter_core to 4.6.1, which is needed for a
pending update of www/jupyter-notebook. Changelog can be found at
https://github.com/jupyter/jupyter_core/blob/4.6.1/docs/changelog.rst

Changes to the port:
- Follow Makefile.template
- Remove ipython as TDEP, which is not needed
- Add py-nose as TDEP

Testing:
- 'make test' runs successfully for both python2 and python3
- Run tested on amd64 with jupyter-notebook from ports and an update
  hereof

Comments/OK?


diff --git devel/py-jupyter_core/Makefile devel/py-jupyter_core/Makefile
index 4962a3be9c3..b057b6fe65f 100644
--- devel/py-jupyter_core/Makefile
+++ devel/py-jupyter_core/Makefile
@@ -2,29 +2,26 @@
 
 COMMENT =  Jupyter core package
 
-MODPY_EGG_VERSION =4.4.0
+MODPY_EGG_VERSION =4.6.1
 DISTNAME = jupyter_core-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 1
 
 CATEGORIES =   devel
 
 HOMEPAGE = https://jupyter.org/
 
-RUN_DEPENDS =  devel/py-traitlets${MODPY_FLAVOR}
-TEST_DEPENDS = devel/ipython${MODPY_FLAVOR}>=5.1.0 \
-   devel/py-ipykernel${MODPY_FLAVOR}>=4.5.2
-
 # BSD
 PERMIT_PACKAGE =   Yes
 
 MODULES =  lang/python
-
 MODPY_PI = Yes
 MODPY_SETUPTOOLS = Yes
 MODPY_PYTEST = Yes
 MODPY_PYTEST_ARGS =jupyter_core
-PORTHOME = ${WRKDIR}
+
+RUN_DEPENDS =  devel/py-traitlets${MODPY_FLAVOR}
+TEST_DEPENDS = devel/py-ipykernel${MODPY_FLAVOR} \
+   devel/py-nose$(MODPY_FLAVOR)
 
 FLAVORS =  python3
 FLAVOR ?=
@@ -33,6 +30,8 @@ FLAVOR ?=
 TEST_DEPENDS +=devel/py-mock
 .endif
 
+PORTHOME = ${WRKDIR}
+
 post-install:
mv ${PREFIX}/bin/jupyter{,${MODPY_BIN_SUFFIX}}
mv ${PREFIX}/bin/jupyter-migrate{,${MODPY_BIN_SUFFIX}}
diff --git devel/py-jupyter_core/distinfo devel/py-jupyter_core/distinfo
index 534a6e1d7d5..f92949f9480 100644
--- devel/py-jupyter_core/distinfo
+++ devel/py-jupyter_core/distinfo
@@ -1,2 +1,2 @@
-SHA256 (jupyter_core-4.4.0.tar.gz) = 
unB1SqaAMAMGxpl5ASj2+9jDBu5ZJ5dsvkitrPJAwLc=
-SIZE (jupyter_core-4.4.0.tar.gz) = 63613
+SHA256 (jupyter_core-4.6.1.tar.gz) = 
oYPg7C6Pat3fYrCj/GoiN+PgBW04HlNtPnx+zDBn4kQ=
+SIZE (jupyter_core-4.6.1.tar.gz) = 66693
diff --git devel/py-jupyter_core/patches/patch-jupyter_core_command_py 
devel/py-jupyter_core/patches/patch-jupyter_core_command_py
index 4acbeb5f540..ef58670679e 100644
--- devel/py-jupyter_core/patches/patch-jupyter_core_command_py
+++ devel/py-jupyter_core/patches/patch-jupyter_core_command_py
@@ -1,7 +1,8 @@
 $OpenBSD: patch-jupyter_core_command_py,v 1.1 2016/12/13 14:46:43 shadchin Exp 
$
 jupyter_core/command.py.orig   Tue Sep 13 18:22:49 2016
-+++ jupyter_core/command.pyThu Sep 29 17:04:28 2016
-@@ -77,7 +77,13 @@ def list_subcommands():
+Index: jupyter_core/command.py
+--- jupyter_core/command.py.orig
 jupyter_core/command.py
+@@ -84,7 +84,13 @@ def list_subcommands():
  if sys.platform.startswith('win'):
  # remove file-extension on Windows
  name = os.path.splitext(name)[0]
@@ -16,10 +17,11 @@ $OpenBSD: patch-jupyter_core_command_py,v 1.1 2016/12/13 
14:46:43 shadchin Exp $
  # build a set of subcommand strings, excluding subcommands whose parents 
are defined
  subcommands = set()
  # Only include `jupyter-foo-bar` if `jupyter-foo` is not already present
-@@ -182,6 +188,8 @@ def main():
+@@ -245,7 +251,8 @@ def main():
  sys.exit("subcommand is required")
- 
- command = 'jupyter-' + subcommand
+ 
+ command = _jupyter_abspath(subcommand)
+-
 +if sys.version_info.major == 3 and not command.endswith('-3'):
 +command += '-3'
  try:
diff --git 
devel/py-jupyter_core/patches/patch-jupyter_core_tests_test_command_py 
devel/py-jupyter_core/patches/patch-jupyter_core_tests_test_command_py
index 2e56ec9a998..722657c8cd4 100644
--- devel/py-jupyter_core/patches/patch-jupyter_core_tests_test_command_py
+++ devel/py-jupyter_core/patches/patch-jupyter_core_tests_test_command_py
@@ -2,7 +2,7 @@ $OpenBSD: patch-jupyter_core_tests_test_command_py,v 1.2 
2018/12/29 11:50:35 mar
 Index: jupyter_core/tests/test_command.py
 --- jupyter_core/tests/test_command.py.orig
 +++ jupyter_core/tests/test_command.py
-@@ -98,16 +98,20 @@ def test_subcommand_not_found():
+@@ -99,20 +99,24 @@ def test_subcommand_not_found():
  
  @patch.object(sys, 'argv', [__file__] + sys.argv[1:])
  def test_subcommand_list(tmpdir):
@@ -21,12 +21,17 @@ Index: jupyter_core/tests/test_command.py
  'jupyterstuff',
  'jupyter-yo-eyropa-ganymyde-callysto'):
 -b.join(cmd).write('')
++b.join(cmd + cmd_sufx).write('')
+ c = tmpdir.mkdir("c")
+ for cmd in ('jupyter-baz',
+ 'jupyter-bop'):
+-c.join(cmd).write('')
 +b.join(cmd + cmd_sufx).write('')
  
  p

UPDATE devel/py-sip-4.19.21

2020-02-05 Thread Björn Ketelaars

Diff below brings py-sip to 4.19.21, which is a bug fix release. This
update is needed to fix an issue with git-cola [0].

While here change HOMEPAGE to use https.

The API of py-sip is known to break often. Unfortunately, reading
through ${WRKSRC}/Changelog isn't enough to find out if this breakage
also occurs with this update. Testing:
- Build tested its consumers
- Run tested with the current version of git-cola in ports, as well as
  the proposed update [0]

Comments/OK?

[0] https://marc.info/?l=openbsd-ports&m=158093630218110&w=2


diff --git Makefile Makefile
index 58db8466cea..48eae4d07cd 100644
--- Makefile
+++ Makefile
@@ -5,13 +5,12 @@ COMMENT=  automatically generate Python bindings for C 
and C++ libs
 # XXX Be particularly careful when testing updates.
 # API breaks often.
 
-MODPY_EGG_VERSION =4.19.17
+MODPY_EGG_VERSION =4.19.21
 DISTNAME=  sip-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 CATEGORIES=devel
-REVISION=  0
 
-HOMEPAGE=  http://www.riverbankcomputing.co.uk/software/sip/intro
+HOMEPAGE=  https://www.riverbankcomputing.co.uk/software/sip/intro
 
 # SIP license (Python like)
 PERMIT_PACKAGE=Yes
diff --git distinfo distinfo
index 0a2e060db81..911ecd05d42 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (sip-4.19.17.tar.gz) = ErzY9NX+78EFvAddEsUJDueD9zgHKFY8kbi5XQ7EXfM=
-SIZE (sip-4.19.17.tar.gz) = 1056156
+SHA256 (sip-4.19.21.tar.gz) = avmXmrQVkOgxG4zJQ1ZxhCnvlroONZK91jDaASESAK4=
+SIZE (sip-4.19.21.tar.gz) = 1050654
diff --git patches/patch-configure_py patches/patch-configure_py
index 21d95bc5c3d..8d93938016f 100644
--- patches/patch-configure_py
+++ patches/patch-configure_py
@@ -3,12 +3,12 @@ $OpenBSD: patch-configure_py,v 1.1 2017/11/13 19:13:47 landry 
Exp $
 Index: configure.py
 --- configure.py.orig
 +++ configure.py
-@@ -281,7 +281,7 @@ def create_config(module, template, macros):
+@@ -270,7 +270,7 @@ def create_config(module, template, macros):
  "sip_version":  sip_version,
  "sip_version_str":  sip_version_str,
  "platform": build_platform,
 -"sip_bin":  os.path.join(sip_bin_dir, "sip"),
 +"sip_bin":  os.path.join(sip_bin_dir, 
"sip${MODPY_BIN_SUFFIX}"),
  "sip_inc_dir":  sip_inc_dir,
- "sip_mod_dir":  sip_module_dir,
- "default_bin_dir":  plat_bin_dir,
+ "sip_root_dir": sip_root_dir,
+ "sip_module_dir":   sip_module_dir,

Re: switch devel/git-cola to py-qt5 and python3

2020-02-05 Thread Björn Ketelaars

On Wed 05/02/2020 13:40, Landry Breuil wrote:
> On Wed, Feb 05, 2020 at 01:36:02PM +0100, Landry Breuil wrote:
> > On Wed, Feb 05, 2020 at 12:37:56PM +0100, Björn Ketelaars wrote:
> > > Diff below changes our port of git-cola a bit:
> > > - Switch from py-qt4 to py-qt5
> > > - Switch to python3
> > > - Drop dependency on textproc/xxdiff.
> > > 
> > > Rationale for the latter is that git-cola per default uses git.tool from
> > > .gitconfig. A user can easily pkg_add xxdiff, or one of its
> > > alternatives.
> > 
> > i've tried it and in the parameters, the "diff tool" and "merge tool"
> > still default to xxdiff, so if you have no .gitconfig xxdif should be
> > present :) Not sure removing the RDEP is ok unless you patch that and
> > use a contraption to run xterm -e diff... which might not be worth the
> > trouble.
> > 
> > Given that xxdiff can now use Qt5 and works fine, i'd keep the
> > dependency.
> > 
> > That said, ok for the xxdiff update & this git-cola move to py3, both
> > work fine here.
> 
> and git-cola reliably segfaults upon exit deep in py-sip so you might want
> to look into that and see if it's reproducible.. :)
> 
> [Current thread is 1 (process 531978)]
> (gdb) bt
> #0  0x17bfee4018d7 in sipOMFindObject () from 
> /usr/local/lib/python3.7/site-packages/sip.so
> #1  0x17bfcdff3226 in PyQtMonitor::on_destroyed(QObject*) () from 
> /usr/local/lib/python3.7/site-packages/PyQt5/QtCore.so
> #2  0x17bf8259f885 in QMetaObject::activate(QObject*, int, int, void**) 
> () from /usr/local/lib/qt5/libQt5Core.so.2.2
> #3  0x17bf8259ecca in QMetaObject::activate(QObject*, QMetaObject const*, 
> int, void**) () from /usr/local/lib/qt5/libQt5Core.so.2.2
> #4  0x17bf82596a43 in QObject::destroyed(QObject*) () from 
> /usr/local/lib/qt5/libQt5Core.so.2.2
> #5  0x17bf825962a5 in QObject::~QObject() () from 
> /usr/local/lib/qt5/libQt5Core.so.2.2
> #6  0x17bf82234a3d in QThreadPool::~QThreadPool() () from 
> /usr/local/lib/qt5/libQt5Core.so.2.2
> #7  0x17bf822358e6 in ?? () from /usr/local/lib/qt5/libQt5Core.so.2.2
> #8  0x17bfa2289f9d in _libc___cxa_finalize (dso=) at 
> /usr/src/lib/libc/stdlib/atexit.c:177
> #9  0x17bfa22692e1 in _libc_exit (status=0) at 
> /usr/src/lib/libc/stdlib/exit.c:54
> #10 0x17bf32f69932 in Py_Exit () from /usr/local/lib/libpython3.7m.so.0.0
> #11 0x17bf32f73741 in ?? () from /usr/local/lib/libpython3.7m.so.0.0
> #12 0x17bf32f73346 in PyErr_PrintEx () from 
> /usr/local/lib/libpython3.7m.so.0.0
> #13 0x17bf32f72862 in PyRun_SimpleFileExFlags () from 
> /usr/local/lib/libpython3.7m.so.0.0
> #14 0x17bf32f9701e in ?? () from /usr/local/lib/libpython3.7m.so.0.0
> #15 0x17bf32f97913 in _Py_UnixMain () from 
> /usr/local/lib/libpython3.7m.so.0.0

The version in ports as well as the proposed update segfault on exit.
Your analysis was spot on: issue is related to py-sip. Updating the
latter to a newer version (4.19.21) fixes the issue.

I will send an update for py-sip to ports@. In the mean time I propose
to move forward, and commit the changes to git-cola. OK?

Re: Remove: textproc/xxdiff

2020-02-05 Thread Björn Ketelaars

On Wed 05/02/2020 10:52, Landry Breuil wrote:
> On Wed, Feb 05, 2020 at 10:42:50AM +0100, Björn Ketelaars wrote:
> > On Tue 04/02/2020 22:03, Rafael Sadowski wrote:
> > > Read this https://marc.info/?l=openbsd-ports&m=158084331321590&w=2 and
> > > s/beediff/xxdiff.
> > > 
> > > OK to remove xxdiff?
> > 
> > xxdiff is a RDEP of devel/git-cola. It could be that alternative diff
> > tools work as well, but these have not been tested. As such, for now, I
> > would like to propose to NOT remove xxdiff.
> 
> and per https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=875241
> apparently upstream (or a fork) has a QT5 version, archlinux takes it from
> https://bitbucket.org/blais/xxdiff/

Instead of removing xxdiff we could choose to update it to HEAD, which
indeed provides a QT5 version.

Run tested on amd64.

Comments/OK?


diff --git Makefile Makefile
index 3c7df35ce04..8f90da313b1 100644
--- Makefile
+++ Makefile
@@ -2,40 +2,37 @@
 
 COMMENT=   graphical file comparator and merge tool
 
-DISTNAME=  xxdiff-4.0.1
+PKGNAME=   xxdiff-4.0.1.20170623
+DISTNAME=  5e5f885dfc43559549a81c59e9e8c9525306356a
+
 CATEGORIES=textproc x11
-REVISION=  1
 
 HOMEPAGE=  http://furius.ca/xxdiff/
 
 # GPL
 PERMIT_PACKAGE=Yes
 
-WANTLIB += ICE QtGui SM X11 Xext Xi Xinerama Xrender c fontconfig
-WANTLIB += freetype m pthread ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Gui Qt5Widgets c m
 
-COMPILER = base-clang ports-gcc base-gcc
+MASTER_SITES=  https://bitbucket.org/blais/xxdiff/get/
 
-MASTER_SITES=   ${MASTER_SITE_SOURCEFORGE:=xxdiff/}
-EXTRACT_SUFX=  .tar.bz2
+COMPILER=  base-clang ports-gcc base-gcc
 
 MODULES=   devel/qmake \
lang/python \
-   x11/qt4
+   x11/qt5
+
 BUILD_DEPENDS= devel/bison
 
+MAKE_FLAGS=MAKEDIR=${WRKDIST}
+
 SEPARATE_BUILD=No
 
 MODPY_ADJ_FILES= ../bin/termdiff
 
 NO_TEST=   Yes
 
-WRKDIST=   ${WRKDIR}/${DISTNAME}/src
-
-post-extract:
-   @rm ${WRKSRC}/getopt.h
-   @rm ${WRKSRC}/getopt.c
-   @rm ${WRKSRC}/getopt1.c
+WRKDIST=   ${WRKDIR}/blais-xxdiff-${DISTNAME:C/([0-9a-f]{12}).*/\1/}/src
 
 post-configure:
cat ${WRKSRC}/Makefile.extra >>${WRKBUILD}/Makefile
diff --git distinfo distinfo
index 563604a65e8..e6a978a78ed 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (xxdiff-4.0.1.tar.bz2) = v1jd2p16iH9PXK4gBw7V8uDWX1da8ghgc4xuJ0LDoAA=
-SIZE (xxdiff-4.0.1.tar.bz2) = 1981869
+SHA256 (5e5f885dfc43559549a81c59e9e8c9525306356a.tar.gz) = 
hnS2wxB+EIfYMbVwdwv9U35p/h4NDitbrB8/dOlHo0M=
+SIZE (5e5f885dfc43559549a81c59e9e8c9525306356a.tar.gz) = 2044525
diff --git pkg/PLIST pkg/PLIST
index 163f6be89ae..c6f5ccaafcd 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -94,5 +94,5 @@ lib/python${MODPY_VERSION}/site-packages/xxdiff/utils.py
 lib/python${MODPY_VERSION}/site-packages/xxdiff/utils.pyc
 lib/python${MODPY_VERSION}/site-packages/xxdiff/xformloop.py
 lib/python${MODPY_VERSION}/site-packages/xxdiff/xformloop.pyc
-lib/python${MODPY_VERSION}/site-packages/xxdiff_scripts-4.0.1-py${MODPY_VERSION}.egg-info
+lib/python${MODPY_VERSION}/site-packages/xxdiff_scripts-5.0b1-py${MODPY_VERSION}.egg-info
 @man man/man1/xxdiff.1

switch devel/git-cola to py-qt5 and python3

2020-02-05 Thread Björn Ketelaars

Diff below changes our port of git-cola a bit:
- Switch from py-qt4 to py-qt5
- Switch to python3
- Drop dependency on textproc/xxdiff.

Rationale for the latter is that git-cola per default uses git.tool from
.gitconfig. A user can easily pkg_add xxdiff, or one of its
alternatives.

Testing:
- 'make test' passes all tests
- run tested on amd64

Comments/OK?


diff --git Makefile Makefile
index ae56f932813..461839de26e 100644
--- Makefile
+++ Makefile
@@ -3,7 +3,8 @@
 COMMENT =  python powered git gui
 
 MODPY_EGG_VERSION= 3.6
-DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
+REVISION = 0
+DISTNAME = ${GH_PROJECT}-${MODPY_EGG_VERSION}
 
 GH_ACCOUNT =   git-cola
 GH_PROJECT =   git-cola
@@ -16,26 +17,25 @@ HOMEPAGE =  https://git-cola.github.io/
 MAINTAINER =   Bjorn Ketelaars 
 
 # GPLv2 only
-PERMIT_PACKAGE=Yes
+PERMIT_PACKAGE =   Yes
 
 MODULES =  lang/python
 MODPY_PYTEST = Yes
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
 BUILD_DEPENDS =devel/gettext,-tools \
devel/git \
devel/git,-x11 \
-   textproc/xxdiff \
-   x11/py-qt4 \
-   x11/py-qtpy
+   x11/py-qt5${MODPY_FLAVOR} \
+   x11/py-qtpy${MODPY_FLAVOR}
 
 RUN_DEPENDS =  devel/desktop-file-utils \
devel/git \
devel/git,-x11 \
-   textproc/xxdiff \
-   x11/py-qt4 \
-   x11/py-qtpy
+   x11/py-qt5${MODPY_FLAVOR} \
+   x11/py-qtpy${MODPY_FLAVOR}
 
-TEST_DEPENDS = devel/py-mock
+TEST_DEPENDS = devel/py-mock${MODPY_FLAVOR}
 
 USE_GMAKE =Yes
 
diff --git pkg/PLIST pkg/PLIST
index 22432fe9279..851d6eeae89 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -136,179 +136,182 @@ share/git-cola/icons/zoom-out.svg
 share/git-cola/lib/
 share/git-cola/lib/cola/
 share/git-cola/lib/cola/__init__.py
-share/git-cola/lib/cola/__init__.pyc
+${MODPY_COMMENT}share/git-cola/lib/cola/${MODPY_PYCACHE}/
+share/git-cola/lib/cola/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}_version.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}app.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}cmd.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}cmds.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}dag.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}decorators.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}diffparse.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}difftool.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}fsmonitor.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}git.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}gitcfg.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}gitcmds.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}gravatar.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}guicmds.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}hidpi.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}hotkeys.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}i18n.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}icons.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}inotify.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}interaction.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}observable.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}qtcompat.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}qtutils.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}resources.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}settings.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}spellcheck.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}textwrap.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}themes.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+share/git-cola/lib/cola/${MODPY_PYCACHE}version.${MODPY_PYC_MAGIC_TAG}pyc
 share/git-cola/lib/cola/_version.py
-share/git-cola/lib/cola/_version.pyc
 share/git-cola/lib/cola/actions.py
-share/git-cola/lib/cola/actions.pyc
 share/git-cola/lib/cola/app.py
-share/git-cola/lib/cola/app.pyc
 share/git-cola/lib/cola/cmd.py
-share/git-cola/lib/cola/cmd.pyc
 share/git-cola/lib/cola/cmds.py
-share/git-cola/lib/cola/cmds.pyc
 share/git-cola/lib/cola/compat.py
-

Re: Remove: textproc/xxdiff

2020-02-05 Thread Björn Ketelaars

On Tue 04/02/2020 22:03, Rafael Sadowski wrote:
> Read this https://marc.info/?l=openbsd-ports&m=158084331321590&w=2 and
> s/beediff/xxdiff.
> 
> OK to remove xxdiff?

xxdiff is a RDEP of devel/git-cola. It could be that alternative diff
tools work as well, but these have not been tested. As such, for now, I
would like to propose to NOT remove xxdiff.

Re: UPDATE: net/gophernicus to 3.0.1

2020-02-04 Thread Björn Ketelaars

On Tue 04/02/2020 09:37, Edd Barrett wrote:
> Hi,
> 
> Here's an update to gophernicus-3.0.1.
> 
> Notes:
> 
>  - I had to switch to GH_* as the old download URL no longer hosts
>tarballs, and I was unable to get a tarball from github itself.
>However, I'd appreciate it if someone could check the latter.

Some comments:
- DISTNAME can be removed as it is correctly set by GH_*
- Version (V) can be added to GH_TAGNAME, i.e. GH_TAGNAME=v3.0.1
- GH_* should be placed higher up in Makefile. See Makefile.template.

Something like:

diff --git Makefile Makefile
index eb7307ea140..54679849bc5 100644
--- Makefile
+++ Makefile
@@ -1,11 +1,15 @@
 # $OpenBSD: Makefile,v 1.18 2019/07/12 20:48:27 sthen Exp $
 
 COMMENT=   modern gopher server
-DISTNAME=  gophernicus-2.5
+
+GH_ACCOUNT=gophernicus
+GH_PROJECT=gophernicus
+GH_TAGNAME=v3.0.1
+
 CATEGORIES=net
-REVISION=  0
 
 HOMEPAGE=  gopher://gophernicus.org/
+
 MAINTAINER =   Brian Callahan 
 
 # BSD
@@ -13,17 +17,15 @@ PERMIT_PACKAGE= Yes
 
 WANTLIB += c
 
-MASTER_SITES=  http://gophernicus.org/software/gophernicus/
-
 MAKE_FLAGS=CC="${CC}" CFLAGS="${CFLAGS}"
 NO_TEST=   Yes
 
 do-install:
-   ${INSTALL_PROGRAM} ${WRKSRC}/in.gophernicus ${PREFIX}/libexec
+   ${INSTALL_PROGRAM} ${WRKSRC}/gophernicus 
${PREFIX}/libexec/in.gophernicus
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gophernicus
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gophernicus
-   cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README INSTALL \
-   TODO ChangeLog README.Gophermap gophertag \
+   cd ${WRKSRC} && ${INSTALL_DATA} LICENSE README INSTALL.md \
+   TODO README.Gophermap gophertag \
${PREFIX}/share/doc/gophernicus/
cd ${WRKSRC} && ${INSTALL_DATA} gophermap \
${PREFIX}/share/examples/gophernicus/
diff --git distinfo distinfo
index f4c422a822d..24f42e912ce 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (gophernicus-2.5.tar.gz) = ZRu3ZzJhrVUCKAPypMJUiu+ohiojIM301kwyEinl1Zo=
-SIZE (gophernicus-2.5.tar.gz) = 51710
+SHA256 (gophernicus-3.0.1.tar.gz) = 
Fl/SrU+wY430FHFJa7rGgiA6FdBdX3RhiFhYFyE4vJY=
+SIZE (gophernicus-3.0.1.tar.gz) = 52525
diff --git pkg/PLIST pkg/PLIST
index 849fd6008e0..97a3357f436 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -3,8 +3,7 @@
 @newuser _gophernicus:704:704:daemon:Gophernicus Gopher 
Server:/nonexistent:/sbin/nologin
 @bin libexec/in.gophernicus
 share/doc/gophernicus/
-share/doc/gophernicus/ChangeLog
-share/doc/gophernicus/INSTALL
+share/doc/gophernicus/INSTALL.md
 share/doc/gophernicus/LICENSE
 share/doc/gophernicus/README
 share/doc/gophernicus/README.Gophermap

UPDATE audio/mpd-0.21.19

2020-02-03 Thread Björn Ketelaars

Simple diff for bringing mpd to 0.21.19. Changelog can be found at
https://raw.githubusercontent.com/MusicPlayerDaemon/MPD/v0.21.19/NEWS.

Run tested on amd64 together with libmpdclient and ncmpc.

Comments/OK?


diff --git Makefile Makefile
index c9496d284c1..59e049b270d 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 BROKEN-hppa =  no atomic ops
 COMMENT =  Music Player Daemon
-VER =  0.21.18
+VER =  0.21.19
 DISTNAME = mpd-${VER}
 EXTRACT_SUFX = .tar.xz
 CATEGORIES =   audio
diff --git distinfo distinfo
index 63aee9e3cbc..2e5b5b35611 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (mpd-0.21.18.tar.xz) = h4LmbNWv1skoYHJRlrNbbfB9PRJ+9w6QDhRDIwielEI=
-SIZE (mpd-0.21.18.tar.xz) = 676084
+SHA256 (mpd-0.21.19.tar.xz) = 0ydeEdhWN63eJQyt87T1rsIUQijw2AhXZ0k/xGxVsvk=
+SIZE (mpd-0.21.19.tar.xz) = 676020

UPDATE audio/libmpdclient-2.18

2020-02-03 Thread Björn Ketelaars

Diff below brings libmpdclient to 2.18. From
https://raw.githubusercontent.com/MusicPlayerDaemon/libmpdclient/v2.18/NEWS:
* more out-of-memory checks
* partition: add mpd_recv_partition()
* support MPD protocol 0.21
* support MPD protocol 0.22

Minor of libmpdclient has been bumped as symbols have been added.

Testing:
- Build tested all consumers
- Run tested on amd64 in combination with mpd/ncmpc

Comments/OK?


diff --git Makefile Makefile
index 97906e3d68b..643713e4e9b 100644
--- Makefile
+++ Makefile
@@ -2,9 +2,9 @@
 
 COMMENT=   library for interfacing MPD
 
-VER=   2.17
+VER=   2.18
 DISTNAME=  libmpdclient-${VER}
-SHARED_LIBS=   mpdclient 3.2   # 2.17
+SHARED_LIBS=   mpdclient 3.3   # 2.18
 CATEGORIES=audio
 HOMEPAGE=  https://www.musicpd.org/libs/libmpdclient/
 
diff --git distinfo distinfo
index c2598998a54..2394db97125 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (libmpdclient-2.17.tar.xz) = 
7puPHH6VtlyPGKNU2vexa/zUVfxSoPO1q+QCMWvONVk=
-SIZE (libmpdclient-2.17.tar.xz) = 64880
+SHA256 (libmpdclient-2.18.tar.xz) = 
TLAeH1Z+AWmsqUh1+24SAOf1zjW2Ok33aOwVkfsQgfo=
+SIZE (libmpdclient-2.18.tar.xz) = 67236

UPDATE audio/ncmpc-0.37

2020-02-03 Thread Björn Ketelaars

Diff below brings ncmpc to 0.37. From
https://raw.githubusercontent.com/MusicPlayerDaemon/ncmpc/v0.37/NEWS:
* show performer on song page
* show partitions on outputs page (requires libmpdclient 2.18)
* search: add search tag "modified" (requires libmpdclient 2.10)
* fix compatibility with MPD versions older than 0.21
* switch to C++17

Run tested on amd64.

Comments/OK?


diff --git Makefile Makefile
index 2526cdb24a2..536aefd339d 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   curses based frontend for mpd
 
-VER=   0.36
+VER=   0.37
 DISTNAME=  ncmpc-${VER}
 EPOCH= 0
 CATEGORIES=audio
@@ -19,6 +19,7 @@ MASTER_SITES= 
https://www.musicpd.org/download/ncmpc/${VER:R}/
 
 EXTRACT_SUFX=  .tar.xz
 
+# c++17
 COMPILER = base-clang ports-gcc
 
 MODULES=   devel/meson
diff --git distinfo distinfo
index 9ad0fe92fb2..b1f608082df 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (ncmpc-0.36.tar.xz) = RjKHPfyO/mHlAdyRhKW5IbSCvi3b7dPSPQUkHUd6Piw=
-SIZE (ncmpc-0.36.tar.xz) = 237768
+SHA256 (ncmpc-0.37.tar.xz) = fI63J/bhLY+XpTkVsbVjKJi0r7M1oRIcXgHIHfaVYVw=
+SIZE (ncmpc-0.37.tar.xz) = 240740

Re: [update] x11/xdesktopwaves 1.3 -> 1.4

2020-02-02 Thread Björn Ketelaars

On Sun 02/02/2020 18:02, Charlene Wendling wrote:
> Hi,
> 
> Here is an update for xdesktopwaves. 
> 
> What's new upstream (from $WRKSRC/README):
> 
> - Added backdrop failure checking, and because this is not always
>   reliable, also added an (emergency) exit button.
> - Adapted to new KDE versions.
> - Added support for Hygon Dhyana processor (Chinese variant of AMD Epyc)
> - Fixed some minor portability flaws.
> 
> Port-wise it's a simple update, with just some hardcoded paths needing
> to be removed.
> 
> It builds and works fine on powerpc [0] and amd64.
> 
> Comments/feedback are welcome,
> 
> Charlène.

Update works for me, and diff looks good.

OK bket@

Re: UPDATE: archivers/libzip 1.5.2 => 1.6.0

2020-02-01 Thread Björn Ketelaars

On Sat 01/02/2020 12:45, Brian Callahan wrote:
> Hi ports --
> 
> Attached is an update to libzip.
> Changelog is here: https://libzip.org/news/release-1.6.0.html
> 
> All tests pass. I then built everything that depends on libzip and
> everything built OK too.
> 
> OK?

Diff looks good, and run tested with fuse-zip on amd64.

OK bket@

Re: update net/dnscrypt-proxy 2.0.38

2020-01-31 Thread Björn Ketelaars

On Thu 30/01/2020 19:21, Nam Nguyen wrote:
> This is a security fix release that I propose adding to -stable. It
> affects 32-bit arches when dnscrypt-proxy's DNS over HTTPS (DoH) feature
> is used. It was fixed in Go 1.13.7 (now available in ports) and in the
> version of golang.org/x/crypto specified in {WRKSRC}/go.mod.
> 
> From issue:
> "On 32-bit architectures, a malformed input to crypto/x509 or the ASN.1
> parsing functions of golang.org/x/crypto/cryptobyte can lead to a
> panic."
> 
> From Go commit:
> "When int is 32 bits wide (on 32-bit architectures like 386 and arm), an
> overflow could occur, causing a panic, due to malformed ASN.1 being
> passed to any of the ASN1 methods of String."
> 
> From changelog:
> "- Security (affecting DoH): precompiled binaries of dnscrypt-proxy
> 2.0.37 are built using Go 1.13.7 that fixes a TLS certificate parsing
> issue present in previous versions of the compiler"
> 
> Sources:
> CVE-2020-7919
> https://github.com/golang/go/issues/36837
> https://github.com/golang/go/commit/b13ce14c4a6aa59b7b041ad2b6eed2d23e15b574
> https://github.com/golang/crypto/commit/69ecbb4d6d5dab05e49161c6e77ea40a030884e1
> 
> Changelog:
> https://github.com/DNSCrypt/dnscrypt-proxy/blob/2.0.38/ChangeLog
> 
> This is an update for net/dnscrypt-proxy 2.0.38, released on January 30,
> 2020. I tested on amd64 and unit tests pass.

2.0.39 has been released a couple of hours ago, which fixes the firefox
local DOH service: https://github.com/DNSCrypt/dnscrypt-proxy/releases

Re: Missing CVEs in quirks

2020-01-30 Thread Björn Ketelaars

On Fri 31/01/2020 06:27, Rafael Sadowski wrote:
> The diff contains some forgotten CVE entries in quirks. I went through
> all the January commits and looked for CVE in the commit msg.
> 
> I also ran sort over the list.
> 
> OK, opinions?

My opinion is that we either maintain CVE entries in quirks, or remove
it completely. I prefer the first option.

Diff looks good.

OK bket@

UPDATE x11/icewim-1.6.4

2020-01-29 Thread Björn Ketelaars

Enclosed diff brings icewm to 1.6.4. Overview of changes can be found at
https://github.com/ice-wm/icewm/releases/. While here update HOMEPAGE.

(Lightly) run tested on amd64.

Comments/OK?


diff --git Makefile Makefile
index 15af55123f5..9f2b5b35bdd 100644
--- Makefile
+++ Makefile
@@ -3,13 +3,13 @@
 # unconditionally uses machine/apmvar.h and related structures/defines
 ONLY_FOR_ARCHS=${APM_ARCHS}
 
-V= 1.6.2
+V= 1.6.4
 COMMENT=   small and fast window manager
 DISTNAME=  icewm-${V}
 EXTRACT_SUFX=  .tar.lz
 CATEGORIES=x11
 
-HOMEPAGE=  https://www.ice-wm.org/
+HOMEPAGE=  https://ice-wm.org/
 
 # LGPLv2 only
 PERMIT_PACKAGE=Yes
diff --git distinfo distinfo
index b4deafc4663..54fa162eb04 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (icewm-1.6.2.tar.lz) = j/Ca4REHXyINv1zbE0AaLCoFHMq4yBFn0jTW5FDGqiQ=
-SIZE (icewm-1.6.2.tar.lz) = 1673647
+SHA256 (icewm-1.6.4.tar.lz) = c83MIQl7lPPYNSLi5od8up8G6SwYI8oU4KoyowztDKs=
+SIZE (icewm-1.6.4.tar.lz) = 1684348
diff --git patches/patch-man_icewm-preferences_pod 
patches/patch-man_icewm-preferences_pod
index c4422af55a8..b2ba9bdf036 100644
--- patches/patch-man_icewm-preferences_pod
+++ patches/patch-man_icewm-preferences_pod
@@ -3,7 +3,7 @@ $OpenBSD: patch-man_icewm-preferences_pod,v 1.4 2019/11/09 
14:06:33 fcambus Exp
 Index: man/icewm-preferences.pod
 --- man/icewm-preferences.pod.orig
 +++ man/icewm-preferences.pod
-@@ -977,7 +977,7 @@ B to allow B for B to allow B for B /dev/null && watch -t ss -putswl 
|| netstat -c'")
  XSV(const char *, netClassHint, "ss.XTerm")
  #else
diff --git patches/patch-src_icesh_cc patches/patch-src_icesh_cc
index 1d257d81791..af81036cb9c 100644
--- patches/patch-src_icesh_cc
+++ patches/patch-src_icesh_cc
@@ -5,7 +5,7 @@ Don't do this GNU extension stuff.
 Index: src/icesh.cc
 --- src/icesh.cc.orig
 +++ src/icesh.cc
-@@ -1823,6 +1823,8 @@ void IceSh::doSync()
+@@ -1930,6 +1930,8 @@ void IceSh::doSync()
  
  bool IceSh::colormaps()
  {
@@ -14,7 +14,7 @@ Index: src/icesh.cc
  if ( !isAction("colormaps", 0))
  return false;
  
-@@ -1831,7 +1833,7 @@ bool IceSh::colormaps()
+@@ -1938,7 +1940,7 @@ bool IceSh::colormaps()
  
  tlog("colormaps");
  running = true;
@@ -23,7 +23,7 @@ Index: src/icesh.cc
  while (running) {
  int n = 0;
  Colormap* map = XListInstalledColormaps(display, root, &n);
-@@ -1858,11 +1860,13 @@ bool IceSh::colormaps()
+@@ -1965,11 +1967,13 @@ bool IceSh::colormaps()
  
  bool IceSh::guiEvents()
  {
diff --git patches/patch-src_yapp_cc patches/patch-src_yapp_cc
index 934057626d2..36be4293f0d 100644
--- patches/patch-src_yapp_cc
+++ patches/patch-src_yapp_cc
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_yapp_cc,v 1.8 2019/08/26 19:43:45 bcallah 
Exp $
 Index: src/yapp.cc
 --- src/yapp.cc.orig
 +++ src/yapp.cc
-@@ -264,7 +264,7 @@ int YApplication::mainLoop() {
+@@ -272,7 +272,7 @@ int YApplication::mainLoop() {
  // This is irrelevant when using monotonic clocks:
  // if time travel to past, decrease the timeouts
  if (diff < zerotime()) {

Re: Remove: net/qsynergy

2020-01-27 Thread Björn Ketelaars

On Tue 28/01/2020 06:30, Rafael Sadowski wrote:
> Facts: Qt4 synergy application, last update 2010, upstream dead.
> 
> Synergy looks also more or less dead as open-source:
> https://en.wikipedia.org/wiki/Synergy_(software)
> https://synergy-foss.org/
> 
> BTW, Qt4 ports in the category "net" no longer make sense to.
> 
> OK to remove?

OK bket@

Re: Remove: security/kqoauth

2020-01-27 Thread Björn Ketelaars

On Tue 28/01/2020 06:34, Rafael Sadowski wrote:
> Facts: Qt4 OAuth support library with no consumers, last update 2013.
> Need I say more? OK to nuke it?
> 
OK bket@

Re: UPDATE audio/audacious

2020-01-25 Thread Björn Ketelaars

On Sat 25/01/2020 16:21, Charlene Wendling wrote:
> On Wed, 22 Jan 2020 16:19:21 +0100
> Björn Ketelaars wrote:
> 
> > Diff below updates audacious to 3.10.1. Changes between 3.9 and 3.10
> > are explained at [0]. 3.10.1 fixes some additional bugs. Note that
> > this update relies on a newer version of audacious-plugins, which has
> > been send to ports@.
> >
> > Changes to the port:
> > - Switch HOMEPAGE and MASTER_SITES to https
> > - Sync WANTLIB
> > - Bump major of libaudcore as symbols have been removed
> > 
> > Lightly tested on amd64.
> > 
> > Comments/OK?
> 
> It builds and works fine on powerpc. audacious-plugins has "extra"
> WANTLIBs (c.96 dbus-1.11 dbus-glib-1.5), but actually makes use of
> DBus so they seem legit.
> 
> Once it's cleared up by someone who knows better than me, OK cwen@ for
> audacious and audacious-plugins ^^

My bad, I should have removed those extra WANTLIBs.

Only thing that seems to be dbus related is the plugin mpris2, which is
a standard dbus interface aiming to provide a API for controlling
audacious. This plugin depends on gdbus-codegen(1), provided by glib,
which generates some dbus code.

I grepped through the output of ldd(1) of all plugins. There is no
dependency on dbus or dbus-glib.

Enclosed is an updated diff, which additionally removes the extra
WANTLIBs.

OK?


diff --git Makefile Makefile
index 1501a02b0b0..3d31fa025d1 100644
--- Makefile
+++ Makefile
@@ -2,9 +2,8 @@
 
 COMMENT =  input and output plugins for Audacious
 
-V =3.9
+V =3.10.1
 DISTNAME = audacious-plugins-$V
-REVISION = 3
 
 CATEGORIES =   audio multimedia
 
@@ -15,15 +14,15 @@ PERMIT_PACKAGE =Yes
 
 WANTLIB += ${COMPILER_LIBCXX} FLAC GL X11 Xcomposite Xcursor Xdamage
 WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 audgui
-WANTLIB += audtag avcodec avformat avutil c cairo cddb cdio cdio_cdda
-WANTLIB += cue curl dbus-1 dbus-glib-1 faad fontconfig freetype
-WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gtk-x11-2.0 iconv intl m mms modplug mp3lame
-WANTLIB += mpg123 neon notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
-WANTLIB += samplerate sndfile sndio soxr vorbis vorbisenc vorbisfile
-WANTLIB += wavpack xml2 z
-
-MASTER_SITES = http://distfiles.audacious-media-player.org/
+WANTLIB += audtag avcodec avformat avutil cairo cddb cdio cdio_cdda
+WANTLIB += cue curl faad fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
+WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gtk-x11-2.0
+WANTLIB += harfbuzz iconv intl m mms modplug mp3lame mpg123 neon
+WANTLIB += notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 samplerate
+WANTLIB += sndfile sndio soxr vorbis vorbisenc vorbisfile wavpack
+WANTLIB += xml2 z
+
+MASTER_SITES = https://distfiles.audacious-media-player.org/
 
 EXTRACT_SUFX = .tar.bz2
 
diff --git distinfo distinfo
index f261a81d563..b4a3f1061c9 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-3.9.tar.bz2) = 
i/fyEInLNAaWjMnHEwd3Su5xAOxGB/KPY89WkNXJJ7g=
-SIZE (audacious-plugins-3.9.tar.bz2) = 1843084
+SHA256 (audacious-plugins-3.10.1.tar.bz2) = 
7sMXdjH5lym/DpQiO2J0BsxkjHDmZG41YTx7VQQKJkI=
+SIZE (audacious-plugins-3.10.1.tar.bz2) = 1715477
diff --git patches/patch-buildsys_mk_in patches/patch-buildsys_mk_in
index 0b32ca27e8b..59f544b9292 100644
--- patches/patch-buildsys_mk_in
+++ patches/patch-buildsys_mk_in
@@ -1,12 +1,13 @@
 $OpenBSD: patch-buildsys_mk_in,v 1.6 2014/11/03 04:29:05 bcallah Exp $
 buildsys.mk.in.origThu Oct 16 20:01:19 2014
-+++ buildsys.mk.in Sat Nov  1 19:44:28 2014
-@@ -107,7 +107,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
+Index: buildsys.mk.in
+--- buildsys.mk.in.orig
 buildsys.mk.in
+@@ -113,7 +113,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
  
  MO_FILES = ${LOCALES:.po=.mo}
  
 -.SILENT:
 +#.SILENT:
  .SUFFIXES:
- .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o 
.java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
- .PHONY: all subdirs pre-depend depend install install-extra uninstall 
uninstall-extra clean distclean locales ${SUBDIRS}
+ .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o 
.java .mo .m .m.dep .mm .mm.dep .moslib.o .o .plugin.o .po .py .pyc .rc .S 
.S.dep .xpm
+ .PHONY: all subdirs subdirs-after pre-depend depend install install-includes 
install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} 
${SUBDIRS_AFTER}
diff --git patches/patch-configure patches/patch-configure
index 051879f438f..f66a9125a79 100644
--- patches/patch-configure
+++ patches/patch-configure
@@ -7,7 +7,7 @@ polluted very early on, breaking most of the checks using 
AC_CHECK_LIB.
 Index: configure
 --- configure.orig
 +++ configure
-@@ -9675,8 +9675,6 @@ $as_e

UPDATE graphics/py-seaborn-0.10.0

2020-01-24 Thread Björn Ketelaars

Diff below brings py-seaborn to 0.10.0, which is a major update. Notable
change is that this update is strictly compatible with Python 3.6+.

There are no consumers of this port.

Changes to the port:
- set MODPY_VERSION in Makefile
- set pkgpath marker in PLIST
- update the list of RDEPs

Testing:
- one failing test: TestAxesStyle.test_reset_orig needs GTK3Agg as
  backend. This is also the case with the version in ports
- run tested on amd64 with some work related tools

Comments/OK?


diff --git Makefile Makefile
index f7aa3ae7e7a..8cc83ca3433 100644
--- Makefile
+++ Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  statistical data visualization
 
-MODPY_EGG_VERSION =0.9.0
+MODPY_EGG_VERSION =0.10.0
 DISTNAME = seaborn-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
 
@@ -20,18 +20,16 @@ MODPY_PI =  Yes
 MODPY_SETUPTOOLS = Yes
 MODPY_PYTEST = Yes
 MODPY_PYTEST_ARGS =seaborn
+MODPY_VERSION =${MODPY_DEFAULT_VERSION_3}
 
-RUN_DEPENDS =  graphics/py-matplotlib${MODPY_FLAVOR}>=1.4.3 \
-   math/py-numpy${MODPY_FLAVOR}>=1.9.3 \
-   math/py-pandas${MODPY_FLAVOR}>=0.15.2 \
-   math/py-scipy${MODPY_FLAVOR}>=0.14.0
+RUN_DEPENDS =  graphics/py-matplotlib${MODPY_FLAVOR}>=2.1.2 \
+   math/py-numpy${MODPY_FLAVOR}>=1.13.3 \
+   math/py-pandas${MODPY_FLAVOR}>=0.22.0 \
+   math/py-scipy${MODPY_FLAVOR}>=1.0.1
 
 TEST_DEPENDS = ${RUN_DEPENDS} \
devel/py-nose${MODPY_FLAVOR}
 
-FLAVORS =  python3
-FLAVOR ?=
-
 # TestAxesStyle.test_reset_orig is the only test that fails as it needs
 # 'GTK3Agg' as backend.
 TEST_ENV = MPLBACKEND=AGG
diff --git distinfo distinfo
index 310a58cf74e..4b14f8003c4 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (seaborn-0.9.0.tar.gz) = dsg/eUyjIPtrI6fGGS1eGFpfz0dYlmoMClS67kbUHi8=
-SIZE (seaborn-0.9.0.tar.gz) = 198184
+SHA256 (seaborn-0.10.0.tar.gz) = Wf5BThONfV6giw/rAbhsr0aC42+nSOOYdzBSOomuy7k=
+SIZE (seaborn-0.10.0.tar.gz) = 194113
diff --git pkg/PLIST pkg/PLIST
index cf7619ca2f7..8649aafb36f 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -1,4 +1,5 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2019/08/10 03:48:32 bket Exp $
+@pkgpath graphics/py-seaborn,python3
 lib/python${MODPY_VERSION}/site-packages/seaborn/
 
lib/python${MODPY_VERSION}/site-packages/seaborn-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/seaborn-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
@@ -10,24 +11,20 @@ lib/python${MODPY_VERSION}/site-packages/seaborn/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}algorithms.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}apionly.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}axisgrid.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}categorical.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}cm.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}conftest.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}distributions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}linearmodels.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}matrix.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}miscplot.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}palettes.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}rcmod.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}regression.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}relational.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}timeseries.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/seaborn/${MODPY_PYCACHE}widgets.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/seaborn/algorithms.py
-lib/python${MODPY_VERSION}/site-packages/seaborn/apionly.py
 lib/python${MODPY_VERSION}/site-packages/seaborn/axisgrid.py
 lib/python${MODPY_VERSION}/site-packages/seaborn/categorical.py
 lib/python${MODPY_VERSION}/site-packages/seaborn/cm.py
@@ -46,10 +43,7 @@ 
lib/python${MODPY_VERSION}/site-packages/

UPDATE audio/audacious

2020-01-22 Thread Björn Ketelaars

Diff below updates audacious to 3.10.1. Changes between 3.9 and 3.10 are
explained at [0]. 3.10.1 fixes some additional bugs. Note that this
update relies on a newer version of audacious-plugins, which has been
send to ports@.

Changes to the port:
- Switch HOMEPAGE and MASTER_SITES to https
- Sync WANTLIB
- Bump major of libaudcore as symbols have been removed

Lightly tested on amd64.

Comments/OK?

[0] https://audacious-media-player.org/news/43-audacious-3-10-released


diff --git Makefile Makefile
index cc130f2b4fb..42b1adf225a 100644
--- Makefile
+++ Makefile
@@ -5,16 +5,15 @@ BROKEN-alpha =tinylock.c:58: internal compiler error: 
in extract_insn, at recog
 
 COMMENT =  graphical audio player which supports lots of formats
 
-DISTNAME = audacious-3.9
-REVISION = 2
+DISTNAME = audacious-3.10.1
 
-SHARED_LIBS += audcore 4.0 # 5.0
+SHARED_LIBS += audcore 5.0 # 5.1
 SHARED_LIBS += audgui  4.0 # 5.0
 SHARED_LIBS += audtag  3.0 # 3.0
 
 CATEGORIES =   audio multimedia
 
-HOMEPAGE = http://audacious-media-player.org/
+HOMEPAGE = https://audacious-media-player.org/
 
 # BSD
 PERMIT_PACKAGE =   Yes
@@ -22,10 +21,10 @@ PERMIT_PACKAGE =Yes
 WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
 WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 c cairo fontconfig
 WANTLIB += freetype gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0
-WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 iconv intl m pango-1.0
-WANTLIB += pangocairo-1.0 pangoft2-1.0 z
+WANTLIB += gmodule-2.0 gobject-2.0 gtk-x11-2.0 harfbuzz iconv
+WANTLIB += intl m pango-1.0 pangocairo-1.0 pangoft2-1.0 z
 
-MASTER_SITES = http://distfiles.audacious-media-player.org/
+MASTER_SITES = https://distfiles.audacious-media-player.org/
 
 EXTRACT_SUFX = .tar.bz2
 
diff --git distinfo distinfo
index 7dfae153553..65a2003c36a 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-3.9.tar.bz2) = LYBEZzrHhtcbCABPGQu8o2gli/YOZgL/wNliKDXMsF4=
-SIZE (audacious-3.9.tar.bz2) = 599488
+SHA256 (audacious-3.10.1.tar.bz2) = 
g2boQLs8lEjCzwz5oIABVbC9fMISooukSZDD0iica5M=
+SIZE (audacious-3.10.1.tar.bz2) = 564481
diff --git patches/patch-buildsys_mk_in patches/patch-buildsys_mk_in
index a94f8f206f4..2a349cb9230 100644
--- patches/patch-buildsys_mk_in
+++ patches/patch-buildsys_mk_in
@@ -1,12 +1,13 @@
 $OpenBSD: patch-buildsys_mk_in,v 1.7 2014/11/03 04:28:11 bcallah Exp $
 buildsys.mk.in.origThu Oct 16 20:00:28 2014
-+++ buildsys.mk.in Sat Nov  1 19:11:40 2014
-@@ -107,7 +107,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
+Index: buildsys.mk.in
+--- buildsys.mk.in.orig
 buildsys.mk.in
+@@ -113,7 +113,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
  
  MO_FILES = ${LOCALES:.po=.mo}
  
 -.SILENT:
 +#.SILENT:
  .SUFFIXES:
- .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o 
.java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
- .PHONY: all subdirs pre-depend depend install install-extra uninstall 
uninstall-extra clean distclean locales ${SUBDIRS}
+ .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o 
.java .mo .m .m.dep .mm .mm.dep .moslib.o .o .plugin.o .po .py .pyc .rc .S 
.S.dep .xpm
+ .PHONY: all subdirs subdirs-after pre-depend depend install install-includes 
install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} 
${SUBDIRS_AFTER}
diff --git patches/patch-src_libaudcore_Makefile 
patches/patch-src_libaudcore_Makefile
index d0c0dbb7e45..ebe69ad1409 100644
--- patches/patch-src_libaudcore_Makefile
+++ patches/patch-src_libaudcore_Makefile
@@ -6,5 +6,5 @@ Index: src/libaudcore/Makefile
 -SHARED_LIB = ${LIB_PREFIX}audcore${LIB_SUFFIX}
 +SHARED_LIB = ${LIB_PREFIX}audcore.so.${LIBaudcore_VERSION}
  LIB_MAJOR = 5
- LIB_MINOR = 0
+ LIB_MINOR = 1
  
diff --git pkg/PLIST pkg/PLIST
index cba79e04c41..e1ea6e88af0 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -46,20 +46,9 @@ share/applications/audacious.desktop
 share/audacious/
 share/audacious/AUTHORS
 share/audacious/COPYING
-share/audacious/images/
-share/audacious/images/about-logo.png
-share/audacious/images/about-logo.svg
-share/audacious/images/album.png
-share/audacious/images/appearance.png
-share/audacious/images/audio.png
-share/audacious/images/connectivity.png
-share/audacious/images/info.png
-share/audacious/images/playlist.png
-share/audacious/images/plugins.png
 share/icons/hicolor/48x48/apps/audacious.png
 share/icons/hicolor/scalable/apps/audacious.svg
 share/locale/ar/LC_MESSAGES/audacious.mo
-share/locale/ast/LC_MESSAGES/audacious.mo
 share/locale/be/LC_MESSAGES/audacious.mo
 share/locale/bg/LC_MESSAGES/audacious.mo
 share/locale/ca/LC_MESSAGES/audacious.mo
@@ -71,7 +60,6 @@ share/locale/da/LC_MESSAGES/audacious.mo
 share/locale/de/LC_MESSAGES/audacious.mo
 share/locale/el/LC_MESSAGES/audacious.mo
 share/locale/e

UPDATE audio/audacious-plugins

2020-01-22 Thread Björn Ketelaars

Diff below brings audacious-plugins to 3.10.1. This update is needed for
bringing audio/audacious up to date. A diff for the latter has been send
to ports@.

Changes to the port:
- Sync WANTLIB
- Switch MASTER_SITES to https

Lightly run tested on amd64.

Comments/OK?


diff --git Makefile Makefile
index 1501a02b0b0..3d99084988d 100644
--- Makefile
+++ Makefile
@@ -2,9 +2,8 @@
 
 COMMENT =  input and output plugins for Audacious
 
-V =3.9
+V =3.10.1
 DISTNAME = audacious-plugins-$V
-REVISION = 3
 
 CATEGORIES =   audio multimedia
 
@@ -18,12 +17,12 @@ WANTLIB += Xext Xfixes Xi Xinerama Xrandr Xrender atk-1.0 
audgui
 WANTLIB += audtag avcodec avformat avutil c cairo cddb cdio cdio_cdda
 WANTLIB += cue curl dbus-1 dbus-glib-1 faad fontconfig freetype
 WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0
-WANTLIB += gobject-2.0 gtk-x11-2.0 iconv intl m mms modplug mp3lame
+WANTLIB += gobject-2.0 gtk-x11-2.0 harfbuzz iconv intl m mms modplug mp3lame
 WANTLIB += mpg123 neon notify ogg pango-1.0 pangocairo-1.0 pangoft2-1.0
 WANTLIB += samplerate sndfile sndio soxr vorbis vorbisenc vorbisfile
 WANTLIB += wavpack xml2 z
 
-MASTER_SITES = http://distfiles.audacious-media-player.org/
+MASTER_SITES = https://distfiles.audacious-media-player.org/
 
 EXTRACT_SUFX = .tar.bz2
 
diff --git distinfo distinfo
index f261a81d563..b4a3f1061c9 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacious-plugins-3.9.tar.bz2) = 
i/fyEInLNAaWjMnHEwd3Su5xAOxGB/KPY89WkNXJJ7g=
-SIZE (audacious-plugins-3.9.tar.bz2) = 1843084
+SHA256 (audacious-plugins-3.10.1.tar.bz2) = 
7sMXdjH5lym/DpQiO2J0BsxkjHDmZG41YTx7VQQKJkI=
+SIZE (audacious-plugins-3.10.1.tar.bz2) = 1715477
diff --git patches/patch-buildsys_mk_in patches/patch-buildsys_mk_in
index 0b32ca27e8b..59f544b9292 100644
--- patches/patch-buildsys_mk_in
+++ patches/patch-buildsys_mk_in
@@ -1,12 +1,13 @@
 $OpenBSD: patch-buildsys_mk_in,v 1.6 2014/11/03 04:29:05 bcallah Exp $
 buildsys.mk.in.origThu Oct 16 20:01:19 2014
-+++ buildsys.mk.in Sat Nov  1 19:44:28 2014
-@@ -107,7 +107,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
+Index: buildsys.mk.in
+--- buildsys.mk.in.orig
 buildsys.mk.in
+@@ -113,7 +113,7 @@ PLUGIN_OBJS = ${OBJS:.o=.plugin.o}
  
  MO_FILES = ${LOCALES:.po=.mo}
  
 -.SILENT:
 +#.SILENT:
  .SUFFIXES:
- .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o 
.java .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .rc .S .S.dep .xpm
- .PHONY: all subdirs pre-depend depend install install-extra uninstall 
uninstall-extra clean distclean locales ${SUBDIRS}
+ .SUFFIXES: .beam .c .c.dep .cc .cc.dep .class .cxx .cxx.dep .d .erl .lib.o 
.java .mo .m .m.dep .mm .mm.dep .moslib.o .o .plugin.o .po .py .pyc .rc .S 
.S.dep .xpm
+ .PHONY: all subdirs subdirs-after pre-depend depend install install-includes 
install-extra uninstall uninstall-extra clean distclean locales ${SUBDIRS} 
${SUBDIRS_AFTER}
diff --git patches/patch-configure patches/patch-configure
index 051879f438f..f66a9125a79 100644
--- patches/patch-configure
+++ patches/patch-configure
@@ -7,7 +7,7 @@ polluted very early on, breaking most of the checks using 
AC_CHECK_LIB.
 Index: configure
 --- configure.orig
 +++ configure
-@@ -9675,8 +9675,6 @@ $as_echo "yes" >&6; }
+@@ -9702,8 +9702,6 @@ $as_echo "yes" >&6; }
  
  fi
  
@@ -16,7 +16,7 @@ Index: configure
  
  
  if test $HAVE_DARWIN = yes ; then
-@@ -14657,6 +14655,8 @@ as_fn_error ()
+@@ -14701,6 +14699,8 @@ as_fn_error ()
as_fn_exit $as_status
  } # as_fn_error
  
diff --git pkg/PLIST pkg/PLIST
index f25ab5d6cae..021807726dc 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -2,72 +2,70 @@
 @pkgpath audio/audacious-plugins,-main
 lib/audacious/
 lib/audacious/Container/
-lib/audacious/Container/asx.so
-lib/audacious/Container/asx3.so
-lib/audacious/Container/audpl.so
-lib/audacious/Container/cue.so
-lib/audacious/Container/m3u.so
-lib/audacious/Container/pls.so
-lib/audacious/Container/xspf.so
+@so lib/audacious/Container/asx.so
+@so lib/audacious/Container/asx3.so
+@so lib/audacious/Container/audpl.so
+@so lib/audacious/Container/cue.so
+@so lib/audacious/Container/m3u.so
+@so lib/audacious/Container/pls.so
+@so lib/audacious/Container/xspf.so
 lib/audacious/Effect/
-lib/audacious/Effect/compressor.so
-lib/audacious/Effect/crossfade.so
-lib/audacious/Effect/crystalizer.so
-lib/audacious/Effect/echo.so
-lib/audacious/Effect/ladspa.so
-lib/audacious/Effect/mixer.so
-lib/audacious/Effect/resample.so
-lib/audacious/Effect/silence-removal.so
-lib/audacious/Effect/sox-resampler.so
-lib/audacious/Effect/speed-pitch.so
-lib/audacious/Effect/stereo.so
-lib/audacious/Effect/voice_removal.so
+@so lib/audacious/Effect/compressor.so
+@so lib/audacious/Effect/crossfade.so
+@so lib/audacious/Effect/crystalizer.so
+@so lib/audacious/Effect/echo.so
+@so lib/audacious/Effect/ladspa.so
+@so lib/audacious/Effect/mixer.so
+@so lib/aud

UPDATE audia/audacity

2020-01-22 Thread Björn Ketelaars

Enclosed diff brings audacity to 2.3.3, which focuses on bug fixes and
code restructuring. Additional information on this release can be found
in the release announcement [0].

Run tested on amd64. More precise, I have been using this update for a
couple of days. So far, no regression.

Comments/OK?


[0] https://github.com/audacity/audacity/releases/tag/Audacity-2.3.3


diff --git Makefile Makefile
index e396d07d11c..51dad91c94c 100644
--- Makefile
+++ Makefile
@@ -6,9 +6,8 @@ COMMENT=free audio editor
 # so can't be fetched automatically
 GH_ACCOUNT=audacity
 GH_PROJECT=audacity
-GH_TAGNAME=Audacity-2.3.2
+GH_TAGNAME=Audacity-2.3.3
 DISTNAME=  ${GH_TAGNAME:L}
-REVISION=  1
 CATEGORIES=audio
 
 HOMEPAGE=  https://www.audacityteam.org/
diff --git distinfo distinfo
index 31e7b242cb0..67bf53ba677 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (audacity-2.3.2.tar.gz) = zEd6cf9Vcccoh6ehVTZbB6GlC86hq/SQpN57iEN2xzE=
-SIZE (audacity-2.3.2.tar.gz) = 61972597
+SHA256 (audacity-2.3.3.tar.gz) = QE5sSWk97clCEvxVJZdAWNhIU2Al4Z2jE1muArq+i9c=
+SIZE (audacity-2.3.3.tar.gz) = 62073352
diff --git patches/patch-configure_ac patches/patch-configure_ac
index d4356305ae5..c466434334a 100644
--- patches/patch-configure_ac
+++ patches/patch-configure_ac
@@ -6,7 +6,7 @@ $OpenBSD: patch-configure_ac,v 1.3 2019/06/12 20:28:36 rapha 
Exp $
 Index: configure.ac
 --- configure.ac.orig
 +++ configure.ac
-@@ -204,12 +204,16 @@ if test x$enable_universal_binary = xyes; then
+@@ -200,12 +200,16 @@ if test x$enable_universal_binary = xyes; then
 esac
  fi
  
@@ -29,7 +29,7 @@ Index: configure.ac
  fi
  
  if test x$enable_sse = xyes; then
-@@ -650,10 +654,6 @@ case "${host_os}" in
+@@ -646,10 +650,6 @@ case "${host_os}" in
AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
if [[ $have_alsa = "yes" ]] ; then
   LIBS="$LIBS -lasound"
diff --git patches/patch-lib-src_FileDialog_Makefile_am 
patches/patch-lib-src_FileDialog_Makefile_am
index 1df0fbbc809..ec192221959 100644
--- patches/patch-lib-src_FileDialog_Makefile_am
+++ patches/patch-lib-src_FileDialog_Makefile_am
@@ -5,7 +5,8 @@ $OpenBSD: patch-lib-src_FileDialog_Makefile_am,v 1.1 2019/03/26 
18:26:45 rapha E
 Index: lib-src/FileDialog/Makefile.am
 --- lib-src/FileDialog/Makefile.am.orig
 +++ lib-src/FileDialog/Makefile.am
-@@ -1,6 +1,6 @@
+@@ -1,7 +1,7 @@
+ AM_LIBTOOLFLAGS = --tag CC
  ACLOCAL_AMFLAGS = -I m4
  
 -lib_LTLIBRARIES = libFileDialog.la
diff --git patches/patch-src_AudacityApp_cpp patches/patch-src_AudacityApp_cpp
index 4e61dcf65f6..5f5328b6605 100644
--- patches/patch-src_AudacityApp_cpp
+++ patches/patch-src_AudacityApp_cpp
@@ -5,7 +5,7 @@ Don't hardcode shared libraries version number.
 Index: src/AudacityApp.cpp
 --- src/AudacityApp.cpp.orig
 +++ src/AudacityApp.cpp
-@@ -540,12 +540,12 @@ class GnomeShutdown
+@@ -642,12 +642,12 @@ class GnomeShutdown
 {
mArgv[0].reset(strdup("Audacity"));
  
diff --git patches/patch-src_AudioIO_cpp patches/patch-src_AudioIO_cpp
index 5d078224adc..85a534c1f28 100644
--- patches/patch-src_AudioIO_cpp
+++ patches/patch-src_AudioIO_cpp
@@ -6,7 +6,7 @@ $OpenBSD: patch-src_AudioIO_cpp,v 1.10 2019/09/26 13:54:54 
sthen Exp $
 Index: src/AudioIO.cpp
 --- src/AudioIO.cpp.orig
 +++ src/AudioIO.cpp
-@@ -802,18 +802,15 @@ static double streamStartTime = 0; // bias system time
+@@ -797,18 +797,15 @@ static double streamStartTime = 0; // bias system time
  static double SystemTime(bool usingAlsa)
  {
  #ifdef __WXGTK__
@@ -27,12 +27,12 @@ Index: src/AudioIO.cpp
  }
  #endif
  
-@@ -4738,7 +4735,7 @@ void AudioIoCallback::ComputeMidiTimings(
+@@ -3606,7 +3603,7 @@ void AudioIoCallback::ComputeMidiTimings(
 }
  
 /* GSW: Save timeInfo in case MidiPlayback needs it */
 -   mAudioCallbackClockTime = PaUtil_GetTime();
-+   mAudioCallbackClockTime = SystemTime(gAudioIO->mUsingAlsa);
++   mAudioCallbackClockTime = SystemTime(mUsingAlsa);
  
 /* for Linux, estimate a smooth audio time as a slowly-changing
offset from system time */
diff --git patches/patch-src_MemoryX_h patches/patch-src_MemoryX_h
deleted file mode 100644
index 7fbd8a0874c..000
--- patches/patch-src_MemoryX_h
+++ /dev/null
@@ -1,13 +0,0 @@
-$OpenBSD: patch-src_MemoryX_h,v 1.4 2019/09/26 13:54:54 sthen Exp $
-
-Index: src/MemoryX.h
 src/MemoryX.h.orig
-+++ src/MemoryX.h
-@@ -641,7 +641,6 @@ make_iterator_range( const Container &container )
- // For using std::unordered_map on wxString
- namespace std
- {
--   template struct hash;
-template<> struct hash< wxString > {
-   size_t operator () (const wxString &str) const // noexcept
-   {
diff --git pkg/PLIST pkg/PLIST
index 6978510d226..82298e79ae8 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -88,7 +88,6 @@ share/audacity/plug-ins/sample-data-export.ny
 share/audacity/plug-ins/sample-data-import.ny
 share/audacity/plug-ins/tremolo.ny
 share/audacity/plug-ins/vocalrediso.ny
-share/audacity/plug-ins/vocalremove

Re: [update] nnn 2.8.1 > v2.9

2020-01-21 Thread Björn Ketelaars

On Tue 21/01/2020 11:55, Dnsgate wrote:
> The last sent diff had weird encoding for spaces.
> Here is a good one:

Diff looks good, however did you see https://github.com/jarun/nnn/pull/441?
Maybe this is something you could discuss with MAINTAINER?

Re: UPDATE security/scrypt

2020-01-12 Thread Björn Ketelaars

On Sun 12/01/2020 15:38, Björn Ketelaars wrote:
> On Thu 02/01/2020 06:27, Björn Ketelaars wrote:
> > On Wed 01/01/2020 23:03, Ted Unangst wrote:
> > > Björn Ketelaars wrote:
> > > > - When estimating the amount of available RAM, scrypt ignores
> > > >   RLIMIT_DATA on systems which have mmap.
> > > 
> > > This is wrong on OpenBSD. I sent an email to Colin, but the update should
> > > patch this out in the meantime.
> > 
> > Although I'm not doubting that you are right, I fail to understand why
> > ignoring RLIMIT_DATA on OpenBSD is bad. Could you explain why?
> > 
> > I prepared a patch, which:
> > - addresses ignoring RLIMIT DATA, reverting
> >   
> > https://github.com/Tarsnap/scrypt/commit/2b478e7ce590a6564d89417ddad4f3dd4bbdcaf6
> > - fixes compiling on base-gcc archs (found by kmos@)
> > 
> > OK?
> 
> Ping...

Oops, forgot to mention the following:

Following https://github.com/Tarsnap/scrypt/issues/226:

Without patch:

$ ulimit -d 123456
$ scrypt enc -v Makefile Makefile.enc   
 
Please enter passphrase: 
Please confirm passphrase: 
Parameters used: N = 262144; r = 8; p = 1;
This requires at least 268 MB bytes of memory (995 MB available),
and will take approximately 0.4 seconds (limit: 5.0 seconds).
scrypt: Error computing derived key: Cannot allocate memory

With patch:

$ ulimit -d 123456
$ scrypt enc -v Makefile Makefile.enc 
Please enter passphrase: 
Please confirm passphrase: 
Parameters used: N = 8192; r = 8; p = 48;
This requires at least 8.3 MB bytes of memory (15 MB available),
and will take approximately 0.6 seconds (limit: 5.0 seconds).

Re: UPDATE security/scrypt

2020-01-12 Thread Björn Ketelaars

On Thu 02/01/2020 06:27, Björn Ketelaars wrote:
> On Wed 01/01/2020 23:03, Ted Unangst wrote:
> > Björn Ketelaars wrote:
> > > - When estimating the amount of available RAM, scrypt ignores
> > >   RLIMIT_DATA on systems which have mmap.
> > 
> > This is wrong on OpenBSD. I sent an email to Colin, but the update should
> > patch this out in the meantime.
> 
> Although I'm not doubting that you are right, I fail to understand why
> ignoring RLIMIT_DATA on OpenBSD is bad. Could you explain why?
> 
> I prepared a patch, which:
> - addresses ignoring RLIMIT DATA, reverting
>   
> https://github.com/Tarsnap/scrypt/commit/2b478e7ce590a6564d89417ddad4f3dd4bbdcaf6
> - fixes compiling on base-gcc archs (found by kmos@)
> 
> OK?

Ping...

Diff below for your convenience.

diff --git Makefile Makefile
index 31dc84c3443..04b73ef02b3 100644
--- Makefile
+++ Makefile
@@ -3,6 +3,7 @@
 COMMENT =  command-line encryption using scrypt key derivation function
 
 DISTNAME = scrypt-1.3.0
+REVISION = 0
 
 SHARED_LIBS += scrypt-kdf0.0 # 1.0
 
@@ -18,6 +19,9 @@ WANTLIB = c crypto
 MASTER_SITES = ${HOMEPAGE}
 EXTRACT_SUFX = .tgz
 
+COMPILER = base-clang ports-gcc
+COMPILER_LANGS =   C
+
 CONFIGURE_STYLE =  gnu
 CONFIGURE_ARGS =   --enable-libscrypt-kdf
 
diff --git patches/patch-lib_util_memlimit_c patches/patch-lib_util_memlimit_c
new file mode 100644
index 000..788724aa76e
--- /dev/null
+++ patches/patch-lib_util_memlimit_c
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Do not ignore RLIMIT_DATA on OpenBSD. Revert
+https://github.com/Tarsnap/scrypt/commit/2b478e7ce590a6564d89417ddad4f3dd4bbdcaf6
+
+Index: lib/util/memlimit.c
+--- lib/util/memlimit.c.orig
 lib/util/memlimit.c
+@@ -167,14 +167,12 @@ memlimit_rlimit(size_t * memlimit)
+   memrlimit = (uint64_t)rl.rlim_cur;
+ #endif
+ 
+-#ifndef HAVE_MMAP
+-  /* ... RLIMIT_DATA (if we're not using mmap)... */
++  /* ... RLIMIT_DATA... */
+   if (getrlimit(RLIMIT_DATA, &rl))
+   return (1);
+   if ((rl.rlim_cur != RLIM_INFINITY) &&
+   ((uint64_t)rl.rlim_cur < memrlimit))
+   memrlimit = (uint64_t)rl.rlim_cur;
+-#endif
+ 
+   /* ... and RLIMIT_RSS. */
+ #ifdef RLIMIT_RSS

UPDATE net/hexchat-2.14.3

2020-01-01 Thread Björn Ketelaars

Enclosed diff brings hexchat to 2.14.3, which is a maintenance release.
Changelog: https://hexchat.readthedocs.io/en/latest/changelog.html

Changes to port:
- Drop patch which has been addressed upstream
- sync PLIST

Lightly tested on amd64

Comments/OK?


diff --git Makefile Makefile
index 8f77d857e50..8e065b8e8ce 100644
--- Makefile
+++ Makefile
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.27 2019/10/23 05:06:11 bket Exp $
 
 COMMENT =  GTK+2 IRC Client
-DISTNAME = hexchat-2.14.2
+DISTNAME = hexchat-2.14.3
 EXTRACT_SUFX = .tar.xz
 CATEGORIES =   net x11
 
diff --git distinfo distinfo
index 88f02c3cc50..9dcbf475ec2 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (hexchat-2.14.2.tar.xz) = d5K55SVg+9PhDXW/tdE4ogkTqHdx1nbSllR/G0rAlhg=
-SIZE (hexchat-2.14.2.tar.xz) = 1288732
+SHA256 (hexchat-2.14.3.tar.xz) = kBqdE9taTaabgn9gkzBrvRaGPcSQFvdmi9PkUGUS6II=
+SIZE (hexchat-2.14.3.tar.xz) = 1292072
diff --git patches/patch-src_common_meson_build 
patches/patch-src_common_meson_build
deleted file mode 100644
index 86c20ee93e5..000
--- patches/patch-src_common_meson_build
+++ /dev/null
@@ -1,16 +0,0 @@
-$OpenBSD: patch-src_common_meson_build,v 1.1 2019/10/23 05:06:11 bket Exp $
-
-Ensure that generated headers are built before anything else, from:
-https://github.com/hexchat/hexchat/commit/92014628d1cc06334a9ca8c91a7184d50f5ab9a0
-
-Index: src/common/meson.build
 src/common/meson.build.orig
-+++ src/common/meson.build
-@@ -109,6 +109,7 @@ hexchat_common = static_library('hexchatcommon',
- )
- 
- hexchat_common_dep = declare_dependency(
-+  sources: [textevents] + marshal,
-   link_with: hexchat_common,
-   include_directories: common_includes,
-   compile_args: common_cflags,
diff --git pkg/PLIST pkg/PLIST
index ff1668bb67c..66e66606572 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -4,15 +4,15 @@ include/hexchat-plugin.h
 lib/hexchat/
 lib/hexchat/plugins/
 @comment lib/hexchat/plugins/checksum.la
-lib/hexchat/plugins/checksum.so
+@so lib/hexchat/plugins/checksum.so
 @comment lib/hexchat/plugins/fishlim.la
-lib/hexchat/plugins/fishlim.so
+@so lib/hexchat/plugins/fishlim.so
 @comment lib/hexchat/plugins/lua.la
-lib/hexchat/plugins/lua.so
+@so lib/hexchat/plugins/lua.so
 @comment lib/hexchat/plugins/perl.la
-lib/hexchat/plugins/perl.so
+@so lib/hexchat/plugins/perl.so
 @comment lib/hexchat/plugins/python.la
-lib/hexchat/plugins/python.so
+@so lib/hexchat/plugins/python.so
 lib/pkgconfig/hexchat-plugin.pc
 @man man/man1/hexchat.1
 share/applications/io.github.Hexchat.desktop

1 2 3 4 5 6 >

1 - 100 of 532 matches

Mail list logo