Re: cmake does not use -O2 for Release builds

2020-10-09 Thread Rafael Sadowski
On Thu Oct 08, 2020 at 10:18:44AM +0100, Stuart Henderson wrote:
> moved to ports@
> 
> In gmane.os.openbsd.misc, you wrote:
> > On Tue, 6 Oct 2020 13:29:56 - (UTC)
> > Stuart Henderson  wrote:
> >
> >> On 2020-10-05, Julian Smith  wrote:
> >> > It looks like OpenBSD's cmake port patches cmake to remove the use
> >> > of -O2 in Release and RelWithDebInfo builds -
> >> > /usr/ports/devel/cmake/patches/patch-Modules_Compiler_GNU_cmake has:
> >> >
> >> > -  string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -Os
> >> > -DNDEBUG")
> >> > -  string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -O3 -DNDEBUG")
> >> > -  string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -O2 -g
> >> > -DNDEBUG")
> >> > +  string(APPEND CMAKE_${lang}_FLAGS_MINSIZEREL_INIT " -DNDEBUG")
> >> > +  string(APPEND CMAKE_${lang}_FLAGS_RELEASE_INIT " -DNDEBUG")
> >> > +  string(APPEND CMAKE_${lang}_FLAGS_RELWITHDEBINFO_INIT " -g
> >> > -DNDEBUG")
> >> >
> >> > Does anyone know why things are patched in this way?
> >> >
> >> >
> >> > [I think one can force optimisation with (for example):
> >> >
> >> > cmake -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O2 -g -DNDEBUG"  ...
> >> > ]
> >> >
> >> >
> >> > Thanks,
> >> >
> >> > - Jules
> >> >  
> >> 
> >> It's setup to work with builds done from ports, which should not
> >> override whatever optimization level is set by either the user or the
> >> build infrastructure.
> >> 
> >> The downside is that you need to add this yourself for builds from
> >> outside ports.
> >
> > Thanks for the explanation.
> >
> > Would it be worth documenting this in the cmake(1) manpage? If so, i'll
> > submit a patch.
> >
> > It's quite confusing to have cmake not optimise by default for Release
> > or RelWithDeb builds - i built OpenSceneGraph-3.6 while working on
> > Flightgear and it took a rather long time to figure out why i was
> > getting such a reduced frame rate.
> 
> I seriously doubt anyone will see it in the manpage. Might be better if
> things are rearranged so these are only stripped for ports builds, maybe by
> having ports infrastructure set a flag (either as a cmake variable or
> passed via the environment) and detecting that.
> 
> Generally you are better off working within the ports infrastructure rather
> than outside it if you're updating things already in ports, or working on
> something destined to be a port, But I do think it's still best if cmake
> works as expected for non-ports builds too.
> 

Thanks Stuart for forwarding to ports@. To be honest devel/cmake is very
strongly modified to be used in our ports/bulk universe.

I would like to patch it all out and make it optional by cmake.port.mk.
For example like this

One for all ...

CONFIGURE_ARGS += -DOPENBSD_BUILD=ON or an env var.

or a single option for the respective openbsd bulk hack.

It is on my list unless someone wants to support me.

Rafael



ibus-hangul

2020-10-09 Thread ngc891
Hi,

Here is patch to add the ibus-hangul input method to the port tree.
It is based mostly on ibus-anthy.
There is a test infra but 1 of the 2 tests requires running X and I
don't know how to manage this and even if it's possible with the build
system.

Tested under Gnome, on OpenBSD amd64 current.

This is my very first submission to ports, so please do not shoot :-)

Best regards,
diff --git a/inputmethods/Makefile b/inputmethods/Makefile
index fc9852e8ae6..56dcce82e85 100644
--- a/inputmethods/Makefile
+++ b/inputmethods/Makefile
@@ -13,6 +13,7 @@
  SUBDIR += fcitx-tables
  SUBDIR += ibus
  SUBDIR += ibus-anthy
+ SUBDIR += ibus-hangul
  SUBDIR += ibus-skk
  SUBDIR += libskk
  SUBDIR += libtomoe-gtk
diff --git a/inputmethods/ibus-hangul/Makefile b/inputmethods/ibus-hangul/Makefile
new file mode 100644
index 000..bc4196346af
--- /dev/null
+++ b/inputmethods/ibus-hangul/Makefile
@@ -0,0 +1,40 @@
+
+COMMENT =		hangul input engine for ibus
+
+GH_ACCOUNT =		libhangul
+GH_PROJECT =		ibus-hangul
+GH_TAGNAME =		1.5.4
+
+CATEGORIES =		inputmethods korean
+
+HOMEPAGE =		https://github.com/libhangul/ibus-hangul/wiki
+
+# GPLv2
+PERMIT_PACKAGE =	Yes
+
+WANTLIB += hangul ffi glib-2.0 gobject-2.0 iconv intl
+WANTLIB += c gio-2.0 gmodule-2.0 ibus-1.0 z
+WANTLIB += pcre pthread
+
+MODULES =   devel/dconf \
+lang/python
+
+MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
+
+BUILD_DEPENDS =		devel/gettext,-tools \
+			inputmethods/ibus
+
+RUN_DEPENDS =		devel/desktop-file-utils \
+			inputmethods/ibus \
+			x11/gtk+3,-guic
+
+LIB_DEPENDS =		korean/libhangul
+
+USE_GMAKE =		Yes
+
+AUTOCONF_VERSION =	2.69
+AUTOMAKE_VERSION =	1.16
+
+CONFIGURE_STYLE =	autoreconf
+
+.include 
diff --git a/inputmethods/ibus-hangul/distinfo b/inputmethods/ibus-hangul/distinfo
new file mode 100644
index 000..4c41bd5f953
--- /dev/null
+++ b/inputmethods/ibus-hangul/distinfo
@@ -0,0 +1,2 @@
+SHA256 (ibus-hangul-1.5.4.tar.gz) = PhQ4uV4dshyY3dy8kxIIGckZICyE9quYCiK6wIlrABg=
+SIZE (ibus-hangul-1.5.4.tar.gz) = 69641
diff --git a/inputmethods/ibus-hangul/pkg/DESCR b/inputmethods/ibus-hangul/pkg/DESCR
new file mode 100644
index 000..a0112996f1c
--- /dev/null
+++ b/inputmethods/ibus-hangul/pkg/DESCR
@@ -0,0 +1,2 @@
+The Hangul engine for IBus platform. It provides Korean input
+method from libhangul.
diff --git a/inputmethods/ibus-hangul/pkg/PLIST b/inputmethods/ibus-hangul/pkg/PLIST
new file mode 100644
index 000..da2fab1707a
--- /dev/null
+++ b/inputmethods/ibus-hangul/pkg/PLIST
@@ -0,0 +1,36 @@
+@comment $OpenBSD: PLIST,v$
+bin/ibus-setup-hangul
+@bin libexec/ibus-engine-hangul
+libexec/ibus-setup-hangul
+share/applications/ibus-setup-hangul.desktop
+share/glib-2.0/schemas/org.freedesktop.ibus.engine.hangul.gschema.xml
+share/ibus-hangul/
+share/ibus-hangul/data/
+share/ibus-hangul/data/symbol.txt
+share/ibus-hangul/icons/
+share/ibus-hangul/icons/ibus-hangul.png
+share/ibus-hangul/icons/ibus-hangul.svg
+share/ibus-hangul/setup/
+${MODPY_COMMENT}share/ibus-hangul/setup/${MODPY_PYCACHE}/
+share/ibus-hangul/setup/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+share/ibus-hangul/setup/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
+share/ibus-hangul/setup/${MODPY_PYCACHE}keycapturedialog.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+share/ibus-hangul/setup/${MODPY_PYCACHE}keycapturedialog.${MODPY_PYC_MAGIC_TAG}pyc
+share/ibus-hangul/setup/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
+share/ibus-hangul/setup/${MODPY_PYCACHE}main.${MODPY_PYC_MAGIC_TAG}pyc
+share/ibus-hangul/setup/config.py
+share/ibus-hangul/setup/keycapturedialog.py
+share/ibus-hangul/setup/main.py
+share/ibus-hangul/setup/setup.ui
+share/ibus/component/hangul.xml
+share/icons/hicolor/64x64/apps/ibus-hangul.png
+share/icons/hicolor/64x64/apps/ibus-setup-hangul.png
+share/icons/hicolor/scalable/apps/ibus-hangul.svg
+share/icons/hicolor/scalable/apps/ibus-setup-hangul.svg
+share/locale/ko/LC_MESSAGES/ibus-hangul.mo
+share/locale/zh_CN/LC_MESSAGES/ibus-hangul.mo
+share/metainfo/
+share/metainfo/org.freedesktop.ibus.engine.hangul.metainfo.xml
+@tag glib-compile-schemas
+@tag update-desktop-database
+@tag gtk-update-icon-cache %D/share/icons/hicolor


回复: [Update] databases/p5-DBIx-Class : Update to 0.082842

2020-10-09 Thread wen heping
ping ...

发件人: Andrew Hewus Fresh 
发送时间: 2020年8月17日 8:37
收件人: wen heping 
抄送: ports@openbsd.org 
主题: Re: [Update] databases/p5-DBIx-Class : Update to 0.082842

On Mon, Jul 27, 2020 at 07:57:08AM +, wen heping wrote:
> Hi, all:
>
> Here is a patch for databases/p5-DBIx-Class to update 0.082842.
> It build well and run well. 2 tests failed in total of 314 tests.(while 
> currently
> there are 7 tests failed in total 308 tests)
> There are 16 ports depends on databases/p5-DBIx-Class, 2 of them build but
> failed tests, others build well and pass all tests :
> 1) audio/squeezecenter: Actually I did not test it, because in my memory,
> the version of squeezecenter is too old and there are many tests failed.
> 2) security/p5-Catalyst-Plugin-Authentication-Store-DBIC: also its test 
> failure
> is caused by the deprecation version of Catalyst. And this port could be 
> removed
> after we update Catalyst.
>
> One new port should be added before this patch: 
> databases/p5-SQL-Abstract-Classic,
> which I submitted yesterday.
>
> Cheers !
> wen

I reworked this a bit, for one the patches need to be removed now and
I updated the DEPENDS (as well as moving some MODULES += down by the
setup for them so they are easier to comment out).  Removing the mysql
and Pg tests by commenting out the setup for those modules and not
running the "live" tests does avoid the failures.

I have asked on IRC for some help with figuring out the failing tests,
but note that I see the same failures in 0.082820.

This does, as was said above, require the new port of
p5-SQL-Abstract-Classic that was submitted previously and I am waiting
for another OK to import.

Comments? OK pending the other import?

Index: Makefile
===
RCS file: /cvs/ports/databases/p5-DBIx-Class/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile3 Jul 2020 21:44:36 -   1.25
+++ Makefile17 Aug 2020 00:27:53 -
@@ -2,22 +2,20 @@

 COMMENT =   extensible and flexible object relational mapper

-MODULES =  cpan databases/postgresql databases/mariadb
+MODULES =  cpan
 PKG_ARCH =  *
-DISTNAME = DBIx-Class-0.082820
+DISTNAME = DBIx-Class-0.082842
 CATEGORIES =databases devel
-REVISION = 2

 MAINTAINER =Andrew Fresh 

-# Artistic
+# Perl
 PERMIT_PACKAGE =Yes

 CONFIGURE_ARGS =--skipdeps

 RUN_DEPENDS =   databases/p5-DBI>=1.57 \
-   databases/p5-Data-Page>=2.00 \
-   databases/p5-SQL-Abstract>=1.81 \
+   databases/p5-SQL-Abstract-Classic>=1.91 \
 devel/p5-Class-Accessor-Grouped>=0.10012 \
 devel/p5-Class-C3-Componentised>=1.0009 \
 devel/p5-Class-Inspector>=1.24 \
@@ -28,13 +26,14 @@ RUN_DEPENDS =   databases/p5-DBI>=1.57 \
 devel/p5-Hash-Merge>=0.12 \
 devel/p5-MRO-Compat>=0.12 \
 devel/p5-Module-Find>=0.07 \
-   devel/p5-Moo>=2.000 \
+   devel/p5-Moo>=2.0 \
 devel/p5-Path-Class>=0.18 \
 devel/p5-Scope-Guard>=0.03 \
 devel/p5-Sub-Name>=0.04 \
 devel/p5-Try-Tiny>=0.07 \
 devel/p5-namespace-clean>=0.24

+# Listed as BUILD_DEPENDS, but are actually TEST_DEPENDS
 TEST_DEPENDS =  databases/p5-DBD-SQLite>=1.29 \
 devel/p5-Package-Stash>=0.28 \
 devel/p5-Test-Deep>=0.101 \
@@ -42,42 +41,46 @@ TEST_DEPENDS =  databases/p5-DBD-SQLite>=
 devel/p5-Test-Warn>=0.21

 # Optional depends to avoid skipping tests
-TEST_DEPENDS +=converters/p5-JSON-Any \
-   devel/p5-Getopt-Long-Descriptive \
-   devel/p5-Module-Pluggable \
-   devel/p5-Sys-SigAction \
-   math/p5-Math-Base36 \
-   textproc/p5-Text-CSV \
+TEST_DEPENDS +=\
+   converters/p5-Cpanel-JSON-XS \
+   converters/p5-JSON \
+   converters/p5-JSON-Any>=1.31 \
+   converters/p5-JSON-DWIW \
+   converters/p5-JSON-XS \
 databases/p5-Class-DBI \
-   databases/p5-SQL-Translator>=0.11018
-
-TEST_DEPENDS +=devel/p5-DateTime-Format-MySQL \
-   devel/p5-DateTime-Format-Pg \
+   databases/p5-SQL-Translator>=0.11018 \
+   devel/p5-DateTime>=0.55 \
+   devel/p5-DateTime-Format-MySQL \
+   devel/p5-DateTime-Format-Pg>=0.16004 \
 devel/p5-DateTime-Format-SQLite \
-   devel/p5-DateTime-Format-Strptime \
-   devel/p5-Time-Piece-MySQL
-
-TEST_DEPENDS +=devel/p5-Moose \
-   devel/p5-MooseX-Types \
-   devel/p5-MooseX-Types-LoadableClass \
-   devel/p5-MooseX-Types-Path-Class
+   devel/p5-DateTime-Format-Strptime>=1.2 \
+   

CVS: cvs.openbsd.org: ports

2020-10-09 Thread Brian Callahan
CVSROOT:/cvs
Module name:ports
Changes by: bcal...@cvs.openbsd.org 2020/10/09 20:01:49

Modified files:
sysutils/ugrep : Makefile distinfo 
sysutils/ugrep/patches: patch-configure 

Log message:
Update to ugrep-3.0.1
Changelog: https://github.com/Genivia/ugrep/releases/tag/v3.0.1



Re: A bundle of patches to update p5-Catalyst ports

2020-10-09 Thread Andrew Hewus Fresh
On Fri, Oct 09, 2020 at 11:57:23AM +0200, Charlene Wendling wrote:
> On Thu, 8 Oct 2020 21:15:27 -0700
> Andrew Hewus Fresh wrote:
> 
> > I also committed the update to p5-Catalyst-Plugin-Session, although I
> > didn't see it mentioned in this email.
> > 
> > I didn't import devel/p5-Data-Clone as cwen@ created it, but
> > OK afresh1@
> > 
> > I did not import or commit these, as they need cwen's p5-Data-Clone,
> > but all of cwen's tweaks are OK afresh1@
> >
> > - www/p5-HTML-FormHandler
> > This seemed to work with devel/p5-YAML-XS not Syck
> > - www/p5-CatalystX-SimpleLogin
> > - www/p5-Catalyst-Authentication-Credential-HTTP
> > - devel/catalyst
> > 
> > I'm happy to import or commit if cwen commits (or give me the
> > go-ahead) on p5-Data-Clone.
> 
> Thanks a lot!
> 
> You've everything ready to import/commit and i have not, so OK cwen@
> to import devel/p5-Data-Clone.

Imported, thanks!

> 
> > On Sat, Aug 29, 2020 at 02:42:40AM +0200, Charlene Wendling wrote:
> > > On Mon, 24 Aug 2020 08:00:55 + wen heping wrote:

> > > > www/p5-Catalyst-Authentication-Credential-HTTP
> > >   OK cwen@ with devel/p5-Test-WWW-Mechanize-Catalyst>=0.51 as a
> > >   TEST_DEPENDS
> > > 

Imported with updated TEST_DEPENDS


> > > > www/p5-HTML-FormHandler
> > >   This misses a devel/p5-Data-Clone port as hinted by the cpan/ one
> > >   found in the port Makefile. I created one with portgen, but then
> > >   i've found out that i needed the following to complete the tests:
> > >   TEST_DEPENDS += converters/p5-JSON \
> > >   devel/p5-Config-Any \
> > >   devel/p5-Type-Tiny \
> > >   devel/p5-YAML-Syck \
> > >   textproc/p5-Catalyst-View-TT
> > > 

Imported with updated TEST_DEPENDS

> > > 
> > > > www/p5-CatalystX-SimpleLogin
> > >   OK cwen@; There is one skipped test but i'm fine with it because
> > > it would require even more new ports and dependencies 
> > > 

Imported


> > > > devel/catalyst
> > >   - www/p5-Catalyst-Manual should be devel/p5-Catalyst-Manual
> > >   - www/p5-Catalyst-Plugin-StackTrace should be
> > > devel/p5-Catalyst-Plugin-StackTrace
> > >   - www/p5-Catalyst-View-TT should be textproc/p5-Catalyst-View-TT
> > > 

Committed with fixed DEPENDS

-- 
andrew - http://afresh1.com

I think I understand, but my stubborn brain refuses to admit it
until I beat it into submission by proof upon proof.
  -- Michael Shiloh 



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Andrew Fresh
CVSROOT:/cvs
Module name:ports
Changes by: afre...@cvs.openbsd.org 2020/10/09 19:53:15

Modified files:
devel/catalyst : Makefile distinfo 
devel/catalyst/pkg: PLIST 
Removed files:
devel/catalyst/patches: patch-Makefile_PL 

Log message:
Update devel/catalyst to 4.02

>From wen heping 
OK with tweaks cwen@



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Andrew Fresh
CVSROOT:/cvs
Module name:ports
Changes by: afre...@cvs.openbsd.org 2020/10/09 19:51:26

Modified files:
www: Makefile 

Log message:
+p5-HTML-FormHandler
+p5-CatalystX-SimpleLogin
+p5-Catalyst-Authentication-Credential-HTTP



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Andrew Fresh
CVSROOT:/cvs
Module name:ports
Changes by: afre...@cvs.openbsd.org 2020/10/09 19:50:43

Log message:
Import www/p5-Catalyst-Authentication-Credential-HTTP

HTTP Basic and Digest authentication for Catalyst.

From wen heping 
OK with tweaks cwen@

Status:

Vendor Tag: afresh1
Release Tags:   afresh1_20201009

N ports/www/p5-Catalyst-Authentication-Credential-HTTP/Makefile
N ports/www/p5-Catalyst-Authentication-Credential-HTTP/distinfo
N ports/www/p5-Catalyst-Authentication-Credential-HTTP/pkg/DESCR
N ports/www/p5-Catalyst-Authentication-Credential-HTTP/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Andrew Fresh
CVSROOT:/cvs
Module name:ports
Changes by: afre...@cvs.openbsd.org 2020/10/09 19:49:24

Log message:
Import www/p5-CatalystX-SimpleLogin

CatalystX::SimpleLogin is an application class Moose::Role which will
inject a Catalyst::Controller which is an instance of
CatalystX::SimpleLogin::Controller::Login into your application. This
provides a simple login and logout page with the addition of only one
line of code and one template to your application.

From wen heping 
OK cwen@

Status:

Vendor Tag: afresh1
Release Tags:   afresh1_20201009

N ports/www/p5-CatalystX-SimpleLogin/Makefile
N ports/www/p5-CatalystX-SimpleLogin/distinfo
N ports/www/p5-CatalystX-SimpleLogin/pkg/DESCR
N ports/www/p5-CatalystX-SimpleLogin/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Andrew Fresh
CVSROOT:/cvs
Module name:ports
Changes by: afre...@cvs.openbsd.org 2020/10/09 19:47:57

Log message:
Import www/p5-HTML-FormHandler

HTML::FormHandler allows you to define HTML form fields and validators.
It can be used for both database and non-database forms, and will
automatically update or create rows in a database. It can also be used
to process structured data that doesn't come from an HTML form.

From wen heping 
OK with tweaks cwen@

Status:

Vendor Tag: afresh1
Release Tags:   afresh1_20201009

N ports/www/p5-HTML-FormHandler/Makefile
N ports/www/p5-HTML-FormHandler/distinfo
N ports/www/p5-HTML-FormHandler/pkg/DESCR
N ports/www/p5-HTML-FormHandler/pkg/PLIST

No conflicts created by this import



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Andrew Fresh
CVSROOT:/cvs
Module name:ports
Changes by: afre...@cvs.openbsd.org 2020/10/09 19:41:26

Modified files:
devel  : Makefile 

Log message:
+p5-Data-Clone



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Andrew Fresh
CVSROOT:/cvs
Module name:ports
Changes by: afre...@cvs.openbsd.org 2020/10/09 19:41:05

Log message:
Import devel/p5-Data-Clone

Data::Clone does data cloning, i.e. copies things recursively. This
is smart so that it works with not only non-blessed references, but
also with blessed references (i.e. objects). When clone() finds an
object, it calls a clone method of the object if the object has a
clone, otherwise it makes a surface copy of the object. That is,
this module does polymorphic data cloning.

Although there are several modules on CPAN which can clone data,
this module has a different cloning policy from almost all of them.

From cwen@ with OK to import

Status:

Vendor Tag: afresh1
Release Tags:   afresh1_20201009

N ports/devel/p5-Data-Clone/Makefile
N ports/devel/p5-Data-Clone/distinfo
N ports/devel/p5-Data-Clone/pkg/DESCR
N ports/devel/p5-Data-Clone/pkg/PLIST

No conflicts created by this import



[Update] security/p5-Crypt-OpenSSL-Random : Update to 0.15

2020-10-09 Thread wen heping
Hi, ports@:

Here is a patch for security/p5-Crypt-OpenSSL-Random:
i) Update to 0.15
ii) Move up the CPAN_AUTHOR line
iii) Add TEST_POD to MAKE_ENV

It build well and pass all tests on amd64-current system.
One port depends on it: security/p5-Crypt-OpenSSL-RSA, it
build and pass all tests with this patch.


Cheers !
wen
Index: Makefile
===
RCS file: /cvs/ports/security/p5-Crypt-OpenSSL-Random/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile3 Jul 2020 21:45:41 -   1.21
+++ Makefile10 Oct 2020 01:25:49 -
@@ -3,15 +3,15 @@
 COMMENT=   routines for accessing the OpenSSL prng
 
 MODULES=   cpan
-DISTNAME=  Crypt-OpenSSL-Random-0.11
+DISTNAME=  Crypt-OpenSSL-Random-0.15
 CATEGORIES=security
-REVISION=  0
+CPAN_AUTHOR=   RURBAN
 
 # perl
 PERMIT_PACKAGE=Yes
 
-WANTLIB += c crypto perl ssl
+WANTLIB += c crypto perl ssl
 
-CPAN_AUTHOR=   RURBAN
+MAKE_ENV +=TEST_POD=Yes
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/security/p5-Crypt-OpenSSL-Random/distinfo,v
retrieving revision 1.7
diff -u -p -r1.7 distinfo
--- distinfo17 Jan 2016 23:02:25 -  1.7
+++ distinfo10 Oct 2020 01:25:49 -
@@ -1,2 +1,2 @@
-SHA256 (Crypt-OpenSSL-Random-0.11.tar.gz) = 
u4yBxqObmxOiLYGO6adGJC8Tbw+tzra5d2rmFedSTHo=
-SIZE (Crypt-OpenSSL-Random-0.11.tar.gz) = 15161
+SHA256 (Crypt-OpenSSL-Random-0.15.tar.gz) = 
8IdvqhujER45uGqnMMYDIR7/KQXkYMcqV7YejPR1zvQ=
+SIZE (Crypt-OpenSSL-Random-0.15.tar.gz) = 15506


make py-construct, py-sane, py-zmq python3 only

2020-10-09 Thread Daniel Dickman
Diff below makes these 3 FLAVOR'ed ports python3-only:

py-construct
py-sane
py-zmq

This is needed since numpy >= 1.17.0 is now python3 only and these ports 
all depend on numpy.

py-sane and py-zmq have no consumers.

All the consumers of py-construct are already python3-only.

Diff below includes top-level Makefile and quirks bits for completeness.

ok?

Index: devel/Makefile
===
RCS file: /cvs/ports/devel/Makefile,v
retrieving revision 1.2021
diff -u -p -u -r1.2021 Makefile
--- devel/Makefile  9 Oct 2020 02:02:36 -   1.2021
+++ devel/Makefile  9 Oct 2020 23:44:00 -
@@ -1404,7 +1404,6 @@
  SUBDIR += py-configparser
  SUBDIR += py-constantly
  SUBDIR += py-constantly,python3
- SUBDIR += py-construct
  SUBDIR += py-construct,python3
  SUBDIR += py-contextlib2
  SUBDIR += py-contextlib2,python3
Index: graphics/Makefile
===
RCS file: /cvs/ports/graphics/Makefile,v
retrieving revision 1.522
diff -u -p -u -r1.522 Makefile
--- graphics/Makefile   8 Oct 2020 12:03:49 -   1.522
+++ graphics/Makefile   9 Oct 2020 23:44:00 -
@@ -258,7 +258,6 @@
  SUBDIR += py-pyx
  SUBDIR += py-qrcode
  SUBDIR += py-qrcode,python3
- SUBDIR += py-sane
  SUBDIR += py-sane,python3
  SUBDIR += py-seaborn,python3
  SUBDIR += pycha
Index: net/Makefile
===
RCS file: /cvs/ports/net/Makefile,v
retrieving revision 1.1222
diff -u -p -u -r1.1222 Makefile
--- net/Makefile12 Sep 2020 15:33:31 -  1.1222
+++ net/Makefile9 Oct 2020 23:44:00 -
@@ -635,7 +635,6 @@
  SUBDIR += py-websocket-client,python3
  SUBDIR += py-xmpppy
  SUBDIR += py-zeroconf,python3
- SUBDIR += py-zmq
  SUBDIR += py-zmq,python3
  SUBDIR += py-zsi
  SUBDIR += qbittorrent
Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1058
diff -u -p -u -r1.1058 Makefile
--- devel/quirks/Makefile   8 Oct 2020 23:12:03 -   1.1058
+++ devel/quirks/Makefile   9 Oct 2020 23:44:00 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-3.450
+PKGNAME =  quirks-3.451
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1076
diff -u -p -u -r1.1076 Quirks.pm
--- devel/quirks/files/Quirks.pm8 Oct 2020 23:12:03 -   1.1076
+++ devel/quirks/files/Quirks.pm9 Oct 2020 23:44:00 -
@@ -488,6 +488,9 @@ my $stem_extensions = {
'py-patsy' => 'py3-patsy',
'py-scs' => 'py3-scs',
'py-augeas' => 'py3-augeas',
+   'py-construct' => 'py3-construct',
+   'py-sane' => 'py3-sane',
+   'py-zmq' => 'py3-zmq',
 };
 
 my $obsolete_reason = {
Index: devel/py-construct/Makefile
===
RCS file: /cvs/ports/devel/py-construct/Makefile,v
retrieving revision 1.7
diff -u -p -u -r1.7 Makefile
--- devel/py-construct/Makefile 3 Jul 2020 21:12:42 -   1.7
+++ devel/py-construct/Makefile 9 Oct 2020 23:44:00 -
@@ -7,7 +7,7 @@ EPOCH = 0
 MODPY_EGG_VERSION = 2.5.3
 DISTNAME = construct-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 1
+REVISION = 2
 
 CATEGORIES =   devel
 
@@ -23,7 +23,7 @@ MODPY_PYTEST =Yes
 MODPY_PI = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 TEST_DEPENDS = math/py-numpy${MODPY_FLAVOR}
 
Index: devel/py-construct/pkg/PLIST
===
RCS file: /cvs/ports/devel/py-construct/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -u -r1.2 PLIST
--- devel/py-construct/pkg/PLIST23 Feb 2017 13:11:21 -  1.2
+++ devel/py-construct/pkg/PLIST9 Oct 2020 23:44:00 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.2 2017/02/23 13:11:21 rpointel Exp $
+@conflict py-construct-*
+@pkgpath devel/py-construct
 lib/python${MODPY_VERSION}/site-packages/construct/
 
lib/python${MODPY_VERSION}/site-packages/construct-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/construct-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
Index: graphics/py-sane/Makefile
===
RCS file: /cvs/ports/graphics/py-sane/Makefile,v
retrieving revision 1.8
diff -u -p -u -r1.8 Makefile
--- graphics/py-sane/Makefile   3 Jul 2020 21:12:56 -   1.8
+++ graphics/py-sane/Makefile   9 Oct 2020 23:44:00 -
@@ -7,7 +7,7 @@ DISTNAME=   

[sparc64/base-gcc] Fix build of graphics/fna3d

2020-10-09 Thread Kurt Mosiejczuk
graphics/fna3d needs to be told to use ports-gcc on base-gcc arches in
order to build successfully.

ok?

cc maintainer

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/graphics/fna3d/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile5 Oct 2020 16:05:26 -   1.1.1.1
+++ Makefile9 Oct 2020 22:42:05 -
@@ -20,6 +20,9 @@ WANTLIB +=SDL2 mojoshader
 MASTER_SITES = https://github.com/FNA-XNA/FNA/releases/download/${V}/
 EXTRACT_SUFX = .zip
 
+COMPILER = base-clang ports-gcc
+COMPILER_LANGS =   c
+
 MODULES =  devel/cmake
 
 LIB_DEPENDS =  devel/sdl2 \



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Jeremie Courreges-Anglas
CVSROOT:/cvs
Module name:ports
Changes by: j...@cvs.openbsd.org2020/10/09 16:17:15

Modified files:
graphics/gimp/stable: Makefile 
graphics/gimp/stable/pkg: PLIST 

Log message:
Drop py-gtk2 support

py-gtk2 is obsolete, ajacoutot@ wants to take it behind the barn.  This
diff drops support for python plugins and the Python-fu submenu.
ok ajacoutot@



Re: [Update] databases/p5-DBI-Shell : Update to 11.97

2020-10-09 Thread Charlene Wendling
On Fri, 9 Oct 2020 01:21:02 +
wen heping wrote:

> Hi, ports@:
> 
>Here is a patch to for databases/p5-DBI-Shell:
>i) Update to 11.97
>ii) Add some missing DEPENDS
>It build well and pass all tests on amd64-current system,
> no other ports depends on it.
> 
> 
> Cheers !
> wen

(note to reviewers, this require the new devel/p5-IO-Interactive
proposed just before this one)

OK cwen@, i tweaked the diff so the run depends are properly ordered.


Index: Makefile
===
RCS file: /cvs/ports/databases/p5-DBI-Shell/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile6 Jul 2020 11:15:18 -   1.11
+++ Makefile9 Oct 2020 21:53:57 -
@@ -4,14 +4,17 @@ COMMENT=  interactive command shell for t
 
 MODULES=   cpan
 PKG_ARCH=  *
-DISTNAME=  DBI-Shell-11.96
+DISTNAME=  DBI-Shell-11.97
 CATEGORIES=databases
 
 # perl
 PERMIT_PACKAGE=Yes
 
 RUN_DEPENDS=   databases/p5-DBI \
+   devel/p5-File-HomeDir \
+   devel/p5-IO-Interactive \
devel/p5-IO-Tee \
+   textproc/p5-Text-CSV_XS \
textproc/p5-Text-Reform
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/databases/p5-DBI-Shell/distinfo,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 distinfo
--- distinfo6 Jul 2020 11:15:18 -   1.4
+++ distinfo9 Oct 2020 21:53:57 -
@@ -1,2 +1,2 @@
-SHA256 (DBI-Shell-11.96.tar.gz) = Q3LG1gLFc3emnoKnL1NYK8b4k89Xg18jYZCg4xpNM14=
-SIZE (DBI-Shell-11.96.tar.gz) = 55409
+SHA256 (DBI-Shell-11.97.tar.gz) = 6f7OS2kbuNCWpcvrP3DHLfOucJmRJcpR+wkXUJXl5o0=
+SIZE (DBI-Shell-11.97.tar.gz) = 57123



Re: [NEW] devel/p5-IO-Interactive

2020-10-09 Thread Charlene Wendling
Hi,

On Fri, 9 Oct 2020 01:18:29 +
wen heping wrote:

> Hi, ports@:
> 
> Here is a patch to create new port devel/p5-IO-Interactive, which
> is required by the update of databases/p5-DBI-Shell.
> It build well and pass all tests on amd64-current system.
> 
> 
> Cheers !
> wen

OK cwen@, but i would change DESCR to the more descriptive:

« This module provides utility subroutines that make it easier to
develop interactive applications. »

I'm attaching a new tarball with that change for convenience. 


p5-IO-Interactive.tar.gz
Description: Binary data


update cython to 0.29.21

2020-10-09 Thread Daniel Dickman
Patch below updates cython from 0.29.19 to 0.29.21.

A cython update is needed for pandas to be updated to the latest bug fix 
release which requires cython 0.29.21 or later to build.

The following users of cython were packaged successfully on amd64. python3 
FLAVORs were built too where they existed.

devel/libplist
devel/py-gevent
devel/reposurgeon
games/pygame_sdl2
games/renpy
geo/py-fiona
geo/py-proj
geo/py-shapely
math/mlpack
math/py-PyWavelets
math/py-cftime
math/py-cvxpy
math/py-h5py
math/py-netcdf4
math/py-pandas
math/py-scikit-image
math/py-scikit-learn
math/py-tables
net/poezio
print/printrun
sysutils/py-statgrab
textproc/py-stemmer

ok?


Index: Makefile
===
RCS file: /cvs/ports/lang/cython/Makefile,v
retrieving revision 1.44
diff -u -p -u -r1.44 Makefile
--- Makefile3 Jul 2020 21:12:56 -   1.44
+++ Makefile9 Oct 2020 21:08:52 -
@@ -2,11 +2,10 @@
 
 COMMENT =  optimising static compiler for Python and Cython
 
-MODPY_EGG_VERSION =0.29.19
+MODPY_EGG_VERSION =0.29.21
 DISTNAME = Cython-${MODPY_EGG_VERSION}
 PKGNAME =  py-cython-${MODPY_EGG_VERSION}
 CATEGORIES =   lang
-REVISION = 0
 
 HOMEPAGE = https://cython.org/
 
Index: distinfo
===
RCS file: /cvs/ports/lang/cython/distinfo,v
retrieving revision 1.29
diff -u -p -u -r1.29 distinfo
--- distinfo1 Jun 2020 17:01:07 -   1.29
+++ distinfo9 Oct 2020 21:08:52 -
@@ -1,2 +1,2 @@
-SHA256 (Cython-0.29.19.tar.gz) = l/mKfcDVjqgz3B+Pizzget9MDwMNGIbFOZohNe1BUlg=
-SIZE (Cython-0.29.19.tar.gz) = 2062542
+SHA256 (Cython-0.29.21.tar.gz) = 5XrLib1VlDyNi/gTdj0guQmcxxZcDxa3B2MadlS+nK0=
+SIZE (Cython-0.29.21.tar.gz) = 2067355
Index: pkg/PLIST
===
RCS file: /cvs/ports/lang/cython/pkg/PLIST,v
retrieving revision 1.15
diff -u -p -u -r1.15 PLIST
--- pkg/PLIST   1 Jun 2020 17:01:07 -   1.15
+++ pkg/PLIST   9 Oct 2020 21:08:52 -
@@ -88,6 +88,7 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestMemView.py
 
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestParseTreeTransforms.py
 
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestSignatureMatching.py
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestStringEncoding.py
 
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestTreeFragment.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestTreePath.py
 lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/TestTypes.py
@@ -102,6 +103,7 @@ lib/python${MODPY_VERSION}/site-packages
 
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestMemView.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestParseTreeTransforms.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestSignatureMatching.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestStringEncoding.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestTreeFragment.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestTreePath.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/Cython/Compiler/Tests/${MODPY_PYCACHE}TestTypes.${MODPY_PYC_MAGIC_TAG}pyc



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Daniel Dickman
CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2020/10/09 15:21:48

Added files:
lang/ocaml-camlp5/patches: patch-Makefile 

Log message:
Missed patch; found by naddy@.



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2020/10/09 15:14:28

Modified files:
geo/osm2pgrouting: Makefile 

Log message:
typo in variable name



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Charlene Wendling
CVSROOT:/cvs
Module name:ports
Changes by: c...@cvs.openbsd.org2020/10/09 15:08:05

Modified files:
mail/neomutt   : Makefile 

Log message:
neomutt: enable kyotocabinet header cache backend on powerpc

OK sthen@ (maintainer)



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Charlene Wendling
CVSROOT:/cvs
Module name:ports
Changes by: c...@cvs.openbsd.org2020/10/09 15:04:54

Modified files:
databases/kyotocabinet: Makefile 

Log message:
kyotocabinet: remove BROKEN-powerpc.

Linking errors due to the usage of 64-bit __sync* operators are fixed since
gkoehler@ has set the llvm max atomic size on powerpc.



NEW: multimedia/kid3

2020-10-09 Thread Vadim Zhukov
Hello all.

Here is a port of the Kid3, a nicely done multimedia tags editor. For
those who missed TagScanner on OpenBSD for last 15 years — this tool
might fill your needs, as it did for me.

The utility supports editing multiple MP3, Ogg/Vorbis, FLAC, MPC, MP4/AAC, MP2,
Opus, Speex, TrueAudio, WavPack, WMA, WAV and AIFF files at once,
having full control over ID3v1 & v2 tags. There are both GUI and
interactive CLI; I didn't try to use CLI, though, only started it.

Runs fine here on amd64, tests pass 100%.

The port installs two "private" shared libraries under lib/kid3/, I
preferred to ignore them. The {port-,}lib-depends-check will complain,
though, not seeing the RUNPATH.

A review/okay/hate/love will be appreciated. :)
-- 
  WBR,
  Vadim Zhukov


kid3_port.tar.gz
Description: application/gzip


CVS: cvs.openbsd.org: ports

2020-10-09 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/10/09 13:42:09

Modified files:
net/libmesode  : Makefile distinfo 
net/libmesode/pkg: PLIST 
Removed files:
net/libmesode/patches: patch-configure_ac 

Log message:
Update libmesode to 0.10.0



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/10/09 13:40:13

Modified files:
sysutils/grive2: Makefile distinfo 
sysutils/grive2/patches: patch-grive_CMakeLists_txt 
 patch-libgrive_CMakeLists_txt 
 patch-libgrive_src_util_File_cc 
sysutils/grive2/pkg: PLIST 
Added files:
sysutils/grive2/patches: patch-CMakeLists_txt 
 patch-libgrive_src_util_OS_hh 

Log message:
Update grive2 to 0.5.1

Remove me as maintainer



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Mark Kettenis
CVSROOT:/cvs
Module name:ports
Changes by: kette...@cvs.openbsd.org2020/10/09 13:22:42

Modified files:
devel/gdb/patches: patch-gdb_configure_host 
   patch-gdb_configure_tgt 
Added files:
devel/gdb/patches: patch-gdb_config_powerpc_obsd64_mh 
   patch-gdb_ppc64obsd-nat_c 
   patch-gdb_ppc64obsd-tdep_c 
   patch-gdb_ppc64obsd-tdep_h 

Log message:
Add minimal OpenBSD/powerpc64 support.  Should allow inspection of core
dumps, but not much more.

ok jasper@



update-plist not picking the longest replacement

2020-10-09 Thread Greg Steuck
I am running with my cabal.port.mk[1] patches which include this
SUBST_VARS +=   DISTNAME MODCABAL_STEM MODCABAL_VERSION PKGNAME

I try to regenerate x11/xmonad/pkg/PLIST[2] with `make update-plist` and
the result comes out with ${MODCABAL_STEM}-${MODCABAL_VERSION} contrary
to my expectation of it using ${DISTNAME}.

The relevant variables seem to suggest my expectation is in line with
update-plist(1):

> Most SUBST_VARS variables will be back-substituted into the regenerated
> packing-lists, starting from the longest variable values.  

$ make show="MODCABAL_STEM MODCABAL_VERSION DISTNAME SUBST_VARS"
xmonad
0.15
xmonad-0.15
DISTNAME MODCABAL_STEM MODCABAL_VERSION PKGNAME ARCH BASE_PKGPATH FLAVOR_EXT 
FULLPKGNAME HOMEPAGE  LOCALBASE LOCALSTATEDIR MACHINE_ARCH MAINTAINER  PREFIX 
RCDIR SYSCONFDIR TRUEPREFIX X11BASE PKGSTEM

If I manually replace ${MODCABAL_STEM}-${MODCABAL_VERSION} with
${DISTNAME}, update-plist leaves it alone.

Thanks
Greg

1. 
https://github.com/blackgnezdo/ports/blob/54db9ab4253ed2ba0f294bb4e0695e2da50175aa/devel/cabal/cabal.port.mk
2. 
https://github.com/blackgnezdo/ports/blob/54db9ab4253ed2ba0f294bb4e0695e2da50175aa/x11/xmonad/pkg/PLIST



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/10/09 13:12:01

Modified files:
devel/codeblocks: Makefile 
devel/kf5/sonnet: Makefile 
editors/featherpad: Makefile 
editors/focuswriter: Makefile 
editors/ghostwriter: Makefile 
editors/libreoffice: Makefile 
editors/sigil  : Makefile 
editors/teaqt  : Makefile 
editors/texmaker: Makefile 
editors/texworks: Makefile 
net/psi: Makefile 
print/lyx  : Makefile 
print/scribus  : Makefile 
textproc/enchant: Makefile 
textproc/enchant2: Makefile 
textproc/link-grammar: Makefile 
www/mozilla: mozilla.port.mk 
x11/qt5/qtvirtualkeyboard: Makefile 

Log message:
Bump after hunspell update

The library name has changed from hunspell-1.6 to hunspell-1.7.



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/10/09 13:11:35

Modified files:
www/otter-browser: Makefile 
Added files:
www/otter-browser/patches: patch-cmake_FindHunspell_cmake 

Log message:
Unbreak with hunspell 1.7



Re: cmake.port.mk: LDFLAGS in MODCMAKE_configure?

2020-10-09 Thread Caspar Schutijser
On Fri, Oct 09, 2020 at 12:16:31PM +0100, Stuart Henderson wrote:
> On 2020/10/09 12:53, Caspar Schutijser wrote:
> > Hi,
> > 
> > Would it make sense to pass LDFLAGS="${LDFLAGS}" to cmake, similar to
> > what already happens with CC, CFLAGS, CXX, and CXXFLAGS? Proposal below.
> 
> This is a bit of a departure from how it's done for other build
> systems; LDFLAGS it not passed automatically to autoconf, etc.

That's something I did not consider. Good point.

> If this is done for cmake then I think it would be better to use something
> like MODCMAKE_LDFLAGS to reduce risk of inadvertent side-effects that
> you might get with LDFLAGS.
> 
> Any reason not to just set it in CONFIGURE_ENV like other ports do though?

No, not really. I think I'll go with either this suggestion or your
pkg-config suggestion. Thank you.

> > The reason I ran into this is because I'm working on a proposal/diff
> > (see the attachment for the WIP diff). In order for that patched port
> > to build, I need to set LDFLAGS but without this cmake.port.mk diff it
> > does not get passed to cmake.
> 
> The better fix for mosquitto would be to patch it to find libwebsockets
> via pkg-config files if available.



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/10/09 13:11:32

Modified files:
textproc/hunspell: Makefile distinfo 
textproc/hunspell/patches: patch-src_tools_hunspell_cxx 
   patch-tests_test_sh 
textproc/hunspell/pkg: PLIST 

Log message:
Update hunspell to 1.7

Test and feedback from some maintainers. Thanks!
Feedback form sthen and landry@. Thanks!

Has been through bulk build on amd64



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/10/09 13:04:34

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

Log message:
update to libunbound-1.12.0



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/10/09 12:50:41

Modified files:
devel/cmake: Makefile 
devel/cmake/patches: patch-Source_cmGeneratorTarget_cxx 

Log message:
Fix cmGeneratorTarget_cxx in devel/cmake

There is a mistake in the cmGeneratorTarget_cxx patch.  This creates a wrong
scope. "this->IsFrameworkOnApple()" is present twice and the first one adds a
wrong bracket which creates a scope to the end of the whole function.

Has been through bulk build on amd64, ok naddy@



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/10/09 12:48:05

Modified files:
devel/ninja: Makefile distinfo 

Log message:
Update ninja to 1.10.1

Change log:
https://groups.google.com/g/ninja-build/c/QQM54eAhrjU/m/q5zn_zTlAQAJ?pli=1

Has been through bulk build on amd64



Re: Review for cabal.port.mk

2020-10-09 Thread Greg Steuck
Greg Steuck  writes:

> Marc Espie  writes:
>
>> I would prefer that you would reconstitute DISTNAME from MODCABAL variables
>> exactly like stuff is done for github.
>
> Does the diff below look like what you had in mind? I like it as the
> data becomes more structured (parsing is almost never the best choice).
> I can imagine adding some error checks to help the users.

The new version is below and at
https://github.com/blackgnezdo/ports/blob/54db9ab4253ed2ba0f294bb4e0695e2da50175aa/devel/cabal/cabal.port.mk

Another look?

# $OpenBSD$

# Module for building Haskell programs with cabal-install.
# Inspired by FreeBSD cabal.mk by Gleb Popov.

# Input variables:
#
#  MODCABAL_STEM - the name of the package on hackage.
#  MODCABAL_VERSION  - the version of the package.
#  MODCABAL_MANIFEST - hackage dependencies required by this package, tripples
#of space separate   . Typically generated
#with cabal-bundler program from cabal-extras. The patch pending review
#https://github.com/phadej/cabal-extras/pull/32
#  MODCABAL_DATA_DIR - data-dir from .cabal file (if the port needs the data)
#
https://cabal.readthedocs.io/en/latest/cabal-package.html#pkg-field-data-dir
#  MODCABAL_REVISION - Numeric revision of .cabal file on hackage if one is
#needed on top of .cabal file contained in the .tar.gz file.
#  MODCABAL_BUILD_ARGS - passed to cabal v2-build, e.g. make 
MODCABAL_BUILD_ARGS=-v
#is a nice debugging aid.
#  MODCABAL_FLAGS - passed to --flags= of cabal v2-build. Seemingly superflous 
given
#MODCABAL_BUILD_ARGS, but it is useful to keep this value separate as it
#is used to generate the build plan and will be available without parsing.
#  MODCABAL_EXECUTABLES - Executable target in .cabal file, by default uses
#the hackage package name.
#https://cabal.readthedocs.io/en/latest/cabal-package.html#executables
#
# Available output variables:
#
#  MODCABAL_BUILT_EXECUTABLE_${_exe} is built for each of MODCABAL_EXECUTABLES.
#These are available for `make test` after `make build` phase.
#
# Special files:
#   files/cabal.project is used automatically.

ONLY_FOR_ARCHS =i386 amd64

BUILD_DEPENDS +=devel/cabal \
lang/ghc

# Takes over :9 site for hackage. The day when we have a port using
# both Go/Rust and Hackage we'll have to resolve their common
# insistance on grabbing :9.
MASTER_SITES9 = https://hackage.haskell.org/package/

DIST_SUBDIR ?=  hackage

# The .cabal files are explicitly copied over the ones extracted from
# archives by the normal extraction rules.
EXTRACT_CASES += *.cabal) ;;

DISTNAME ?= ${MODCABAL_STEM}-${MODCABAL_VERSION}
HOMEPAGE ?= ${MASTER_SITES9}${MODCABAL_STEM}
MASTER_SITES ?= ${MASTER_SITES9}${DISTNAME}/
DISTFILES ?=${DISTNAME}.tar.gz
SUBST_VARS +=   DISTNAME MODCABAL_STEM MODCABAL_VERSION PKGNAME

# Oftentime our port name and the executable name coincide.
MODCABAL_EXECUTABLES ?= ${MODCABAL_STEM}

# Cabal won't download anything from hackage if config file exists.
MODCABAL_post-extract = \
mkdir -p ${WRKDIR}/.cabal \
&& touch ${WRKDIR}/.cabal/config

# Some packages need an updated .cabal file from hackage to overwrite
# the one in the tar ball.
.if defined(MODCABAL_REVISION)
DISTFILES += 
${DISTNAME}_${MODCABAL_REVISION}{revision/${MODCABAL_REVISION}}.cabal
MODCABAL_post-extract += \
&& cp ${FULLDISTDIR}/${DISTNAME}_${MODCABAL_REVISION}.cabal \
${WRKSRC}/${MODCABAL_STEM}.cabal
.endif

# The dependent sources get downloaded from hackage.
.for _package _version _revision in ${MODCABAL_MANIFEST}
DISTFILES += {${_package}-${_version}/}${_package}-${_version}.tar.gz:9
.  if ${_revision} > 0
DISTFILES += 
${_package}-${_version}_${_revision}{${_package}-${_version}/revision/${_revision}}.cabal:9
MODCABAL_post-extract += \
&& cp ${FULLDISTDIR}/${_package}-${_version}_${_revision}.cabal \
${WRKDIR}/${_package}-${_version}/${_package}.cabal
.  endif
# References all the locally available dependencies.  Ideally these
# should be command line options, tracking issue:
# https://github.com/haskell/cabal/issues/3585
MODCABAL_post-extract += \
&& echo "packages: ${WRKDIR}/${_package}-${_version}/${_package}.cabal" 
>> ${WRKSRC}/cabal.project.local
.endfor  # MODCABAL_MANIFEST

# Automatically copies the cabal.project file if any.
MODCABAL_post-extract += \
&& (test -f ${FILESDIR}/cabal.project \
&& cp -v ${FILESDIR}/cabal.project ${WRKSRC}; true)

# Invokes cabal with HOME set up to use .cabal directory created in
# post-extract.
_MODCABAL_CABAL = ${SETENV} ${MAKE_ENV} HOME=${WRKDIR} ${LOCALBASE}/bin/cabal

# Building a cabal package is merely an invocation of cabal v2-build.
_MODCABAL_BUILD_TARGET = \
cd ${WRKBUILD} \
&& ${_MODCABAL_CABAL} v2-build --offline --disable-benchmarks 
--disable-tests \
-j${MAKE_JOBS} \

CVS: cvs.openbsd.org: ports

2020-10-09 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/10/09 12:37:29

Modified files:
net/bro: Makefile 
net/bro/pkg: README 

Log message:
fix typo in README; ok aja@



Re: lang/ghc, some failure on i386

2020-10-09 Thread Greg Steuck
Matthias Kilian  writes:

>> I guess it will probably build on a retry, but I just ran into this:
> [...]
>> "utils/ghc-cabal/dist-install/build/tmp/ghc-cabal-bindist" register
>> libraries/parsec dist-install
>> "/pobj/ghc-8.6.4/bootstrap/lib/ghc/bin/ghc"
>> "/pobj/ghc-8.6.4/bootstrap/lib/ghc/bin/ghc-pkg"
>> "/pobj/ghc-8.6.4/bootstrap/lib/ghc" '' '/pobj/ghc-8.6.4/bootstrap'
>> '/pobj/ghc-8.6.4/bootstrap/lib/ghc'
>> '/pobj/ghc-8.6.4/bootstrap/share/doc/ghc/html/libraries' NO
>> ghc-cabal: '/pobj/ghc-8.6.4/bootstrap/lib/ghc/bin/ghc' exited with an error:
>
> During my last builds on i386 (last one two days ago, with a system
> from september, 30th), everything went fine, so I din't have an
> idea why it failed for you.
>
> If it continues to fail, please let me know.

This is in the bootstrap install phase, we didn't change it since
20200921. I also haven't seen this issue. If there's any chance this can
be reproduced we should try to ktrace what's going on.

THanks
Greg



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/10/09 11:26:13

Modified files:
sysutils/google-cloud-sdk: Makefile distinfo 

Log message:
Update to google-cloud-sdk-313.0.1.



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2020/10/09 11:23:51

Modified files:
geo/osm2pgrouting: Makefile distinfo 
geo/osm2pgrouting/pkg: PLIST 

Log message:
Update to osm2pgrouting 2.3.6.



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/10/09 10:47:11

Modified files:
sysutils/exoscale-cli: Makefile distinfo 

Log message:
Update to exoscale-cli-1.19.0.



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2020/10/09 10:25:21

Modified files:
geo/py-shapely : Makefile distinfo 
geo/py-shapely/patches: patch-setup_py 
geo/py-shapely/pkg: PLIST 

Log message:
Update to py3-shapely 1.7.1



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Solene Rapenne
CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2020/10/09 10:18:16

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

Log message:
Update to shapezio-1.2.0

Saved games with previous versions can't
be used with a newer version.



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/10/09 09:47:44

Modified files:
x11/gnome/shell: Makefile distinfo 

Log message:
update to gnome-shell-3.36.7



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/10/09 09:47:45

Modified files:
x11/gnome/shell-extensions: Makefile distinfo 

Log message:
update to gnome-shell-extensions-3.36.7



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/10/09 09:47:44

Modified files:
x11/gnome/mutter: Makefile distinfo 

Log message:
update to mutter-3.36.7



CVS: cvs.openbsd.org: ports

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

Modified files:
www/minitube   : Makefile distinfo 
www/minitube/pkg: PLIST 

Log message:
update to minitube-3.6.2



[new] net/dendrite v0.1.0 matrix.org homeserver written in go

2020-10-09 Thread Aaron Bieber
Hi,

Attached is a port of Dendrite:
  https://github.com/matrix-org/dendrite

Dendrite is an alternative homeserver to synapse and is nearing being feature
complete with it!

This is, however, still considered beta by upstream.

Here is information on its release:
  https://matrix.org/blog/2020/10/08/dendrite-is-entering-beta

I am currently running it with a postgresql background - seems to be working
pretty well!

OK to import?

Cheers,
Aaron


dendrite.tgz
Description: Binary data


CVS: cvs.openbsd.org: ports

2020-10-09 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/10/09 07:30:54

Modified files:
net/pear-Net-DNS2: Makefile distinfo 
net/pear-Net-DNS2/pkg: PLIST 

Log message:
update to pear-Net_DNS2-1.5.0



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Paco Esteban
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/10/09 07:23:51

Modified files:
lang/go: go.port.mk 
Added files:
infrastructure/bin: modgo-gen-modules-helper 

Log message:
new target modgo-gen-modules for lang/go

It generates the lists for MODGO_MODULES and MODGO_MODFILES
Useful to update go ports.

ok abieber@



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/10/09 07:19:41

Modified files:
security/py-passlib: Makefile distinfo 

Log message:
update to py-passlib-1.7.4



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/10/09 07:13:28

Modified files:
x11/gnome/maps : Makefile distinfo 

Log message:
Update to gnome-maps-3.36.4.1.



Re: lang/ghc, some failure on i386

2020-10-09 Thread Matthias Kilian
Hi,

On Fri, Oct 09, 2020 at 01:11:44PM +0100, Stuart Henderson wrote:
> I guess it will probably build on a retry, but I just ran into this:
[...]
> "utils/ghc-cabal/dist-install/build/tmp/ghc-cabal-bindist" register 
> libraries/parsec dist-install "/pobj/ghc-8.6.4/bootstrap/lib/ghc/bin/ghc" 
> "/pobj/ghc-8.6.4/bootstrap/lib/ghc/bin/ghc-pkg" 
> "/pobj/ghc-8.6.4/bootstrap/lib/ghc" '' '/pobj/ghc-8.6.4/bootstrap' 
> '/pobj/ghc-8.6.4/bootstrap/lib/ghc' 
> '/pobj/ghc-8.6.4/bootstrap/share/doc/ghc/html/libraries' NO  
> ghc-cabal: '/pobj/ghc-8.6.4/bootstrap/lib/ghc/bin/ghc' exited with an error:

During my last builds on i386 (last one two days ago, with a system
from september, 30th), everything went fine, so I din't have an
idea why it failed for you.

If it continues to fail, please let me know.

Ciao,
Kili



[wip] devel/proj 7.1.1 update

2020-10-09 Thread Landry Breuil
Hi,

here's an update to devel/proj to the 7 branch, which finally removes
APIs deprecated in 6. The datum grids were moved to a CDN, added a
README to explain a bit the situation, cf
https://proj.org/usage/network.html &
https://proj.org/resource_files.html#transformation-grids

i will fix the remaining breakage as tickets have been filed in the
various consumers that still use the removed API (merkaartor, xastir,
libosmium, etc..)

but at least the diff is out for others to try it :)

Landry
? notes.txt
? proj-4.9.2-libproj.so.7.1
? proj-4.9.3-libproj.so.7.1
? proj-5.0.0-libproj.so.8.0
? proj-5.0.1-libproj.so.8.0
? proj-5.1.0-libproj.so.9.0
? proj-6.0.0-libproj.so.10.0
? proj-6.0.0-libproj.so.9.1
? proj-6.1.0-libproj.so.10.0
? proj-6.1.1-libproj.so.11.0
? proj-6.2.0-libproj.so.12.0
? proj-6.2.1-libproj.so.12.0
? proj-6.3.0-libproj.so.13.0
? proj-6.3.1-libproj.so.13.0
? pkg/README
Index: Makefile
===
RCS file: /cvs/ports/devel/proj/Makefile,v
retrieving revision 1.31
diff -u -r1.31 Makefile
--- Makefile14 May 2020 11:23:17 -  1.31
+++ Makefile9 Oct 2020 12:34:11 -
@@ -2,13 +2,13 @@
 
 COMMENT=   cartographic projection utilities
 
-PORTROACH +=   limit:6.*
-DISTNAME=  proj-6.3.2
+DISTNAME=  proj-7.1.1
 CATEGORIES=devel geo
-SHARED_LIBS=   proj 13.0 # 18.0
+SHARED_LIBS=   proj 14.0 # 20.1
 
 DISTFILES =${DISTNAME}${EXTRACT_SUFX} \
proj-datumgrid-1.8${EXTRACT_SUFX}
+# 500Mbproj-data-1.0${EXTRACT_SUFX}
 
 HOMEPAGE=  http://proj4.org
 
@@ -22,9 +22,12 @@
 # c++11
 COMPILER=  base-clang ports-gcc
 CONFIGURE_STYLE=   gnu
-LIB_DEPENDS =  databases/sqlite3
+LIB_DEPENDS =  databases/sqlite3 \
+   net/curl \
+   graphics/tiff
 BUILD_DEPENDS =devel/gtest
 WANTLIB=   c m pthread ${COMPILER_LIBCXX} sqlite3 z
+WANTLIB+=  crypto curl jpeg lzma nghttp2 ssl tiff zstd
 CONFIGURE_ENV= LDFLAGS='-pthread' \
GTEST_CFLAGS=-I${LOCALBASE}/include \
GTEST_LIBS="-L${LOCALBASE}/lib -lgtest"
Index: distinfo
===
RCS file: /cvs/ports/devel/proj/distinfo,v
retrieving revision 1.19
diff -u -r1.19 distinfo
--- distinfo14 May 2020 11:23:17 -  1.19
+++ distinfo9 Oct 2020 12:34:11 -
@@ -1,4 +1,4 @@
-SHA256 (proj-6.3.2.tar.gz) = y3dqcPQMNVea5LoE+0o4jB0c4CWh32FxNQ3BnyW4AxE=
+SHA256 (proj-7.1.1.tar.gz) = Mk56u1Vp+194fa3x1EdHZpFcSFoYjPSM8HFTuZFWtfk=
 SHA256 (proj-datumgrid-1.8.tar.gz) = 
P/ZhigrMnwubT2pi5/8Pe/U4+0903ketBNoTF0CPzBU=
-SIZE (proj-6.3.2.tar.gz) = 2827685
+SIZE (proj-7.1.1.tar.gz) = 5509592
 SIZE (proj-datumgrid-1.8.tar.gz) = 6604329
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/proj/pkg/PLIST,v
retrieving revision 1.10
diff -u -r1.10 PLIST
--- pkg/PLIST   2 Jan 2020 14:53:48 -   1.10
+++ pkg/PLIST   9 Oct 2020 12:34:11 -
@@ -7,8 +7,8 @@
 bin/invproj
 @bin bin/proj
 @bin bin/projinfo
+@bin bin/projsync
 include/geodesic.h
-include/org_proj4_PJ.h
 include/proj/
 include/proj.h
 include/proj/common.hpp
@@ -34,8 +34,8 @@
 @man man/man1/gie.1
 @man man/man1/proj.1
 @man man/man1/projinfo.1
-@man man/man3/geodesic.3
-@man man/man3/pj_init.3
+@man man/man1/projsync.1
+share/doc/pkg-readmes/${PKGSTEM}
 share/proj/
 share/proj/BETA2007.gsb
 share/proj/CH
@@ -50,6 +50,7 @@
 share/proj/WO
 share/proj/alaska
 share/proj/conus
+share/proj/deformation_model.schema.json
 share/proj/egm96_15.gtx
 share/proj/hawaii
 share/proj/nad.lst
@@ -61,6 +62,7 @@
 share/proj/nzgd2kgrid0005.gsb
 share/proj/other.extra
 share/proj/proj.db
+share/proj/proj.ini
 share/proj/projjson.schema.json
 share/proj/prvi
 share/proj/stgeorge


lang/ghc, some failure on i386

2020-10-09 Thread Stuart Henderson
I guess it will probably build on a retry, but I just ran into this:

>>> Building on i386-1 under lang/ghc
 BDEPENDS = 
[textproc/groff;devel/libffi;archivers/xz;textproc/py-sphinx,python3;devel/metaauto;devel/gmp;devel/autoconf/2.69;converters/libiconv;archivers/bzip2;archivers/gtar;devel/gmake]
 DIST = 
[lang/ghc:ghc/ghc-8.6.4.20200921-i386-unknown-openbsd.tar.xz;lang/ghc:ghc/ghc-8.6.4-testsuite.tar.xz;lang/ghc:ghc/ghc-8.6.4.20200921-shlibs-i386.tar.gz;lang/ghc:ghc/ghc-8.6.4-src.tar.xz]
 FULLPKGNAME = ghc-8.6.4p6
 RDEPENDS = [converters/libiconv;devel/gmp;devel/libffi]
(Junk lock obtained for i386-1 at 1602198299.73)
>>> Running depends in lang/ghc at 1602198299.76
   last junk was in databases/py-redis,python3
/usr/sbin/pkg_add -aI -Drepair gmp-6.2.0 groff-1.22.4p3 libffi-3.3 
py3-sphinx-1.4.8p4
was: /usr/sbin/pkg_add -aI -Drepair autoconf-2.69p3 bzip2-1.0.8 gmake-4.3 
gmp-6.2.0 groff-1.22.4p3 gtar-1.32p1 libffi-3.3 libiconv-1.16p0 metaauto-1.0p4 
py3-sphinx-1.4.8p4 xz-5.2.5
/usr/sbin/pkg_add -aI -Drepair gmp-6.2.0 groff-1.22.4p3 libffi-3.3 
py3-sphinx-1.4.8p4
New and changed readme(s):
/usr/local/share/doc/pkg-readmes/groff
>>> Running show-prepare-results in lang/ghc at 1602198305.66
===> lang/ghc
===> ghc-8.6.4p6 depends on: bzip2-* -> bzip2-1.0.8
===> ghc-8.6.4p6 depends on: gtar-* -> gtar-1.32p1
===> ghc-8.6.4p6 depends on: py3-sphinx-* -> py3-sphinx-1.4.8p4
===> ghc-8.6.4p6 depends on: metaauto-* -> metaauto-1.0p4
===> ghc-8.6.4p6 depends on: autoconf-2.69 -> autoconf-2.69p3
===> ghc-8.6.4p6 depends on: gmake-* -> gmake-4.3
===> ghc-8.6.4p6 depends on: groff->=1.21 -> groff-1.22.4p3
===> ghc-8.6.4p6 depends on: xz-* -> xz-5.2.5
===> ghc-8.6.4p6 depends on: libiconv-* -> libiconv-1.16p0
===> ghc-8.6.4p6 depends on: gmp-* -> gmp-6.2.0
===> ghc-8.6.4p6 depends on: libffi-* -> libffi-3.3
===>  Verifying specs:  c curses ffi gmp iconv m pthread util
===>  found c.96.0 curses.14.0 ffi.1.2 gmp.11.0 iconv.7.0 m.10.1 pthread.26.1 
util.15.0
autoconf-2.69p3
bzip2-1.0.8
gmake-4.3
gmp-6.2.0
groff-1.22.4p3
gtar-1.32p1
libffi-3.3
libiconv-1.16p0
metaauto-1.0p4
py3-sphinx-1.4.8p4
xz-5.2.5
(Junk lock released for i386-1 at 1602198306.76)
distfiles size=77226138
>>> Running patch in lang/ghc at 1602198306.79
===> lang/ghc
===>  Checking files for ghc-8.6.4p6
`/mnt/distfiles/ghc/ghc-8.6.4-src.tar.xz' is up to date.
`/mnt/distfiles/ghc/ghc-8.6.4-testsuite.tar.xz' is up to date.
`/mnt/distfiles/ghc/ghc-8.6.4.20200921-i386-unknown-openbsd.tar.xz' is up to 
date.
`/mnt/distfiles/ghc/ghc-8.6.4.20200921-shlibs-i386.tar.gz' is up to date.
>> (SHA256) ghc/ghc-8.6.4-src.tar.xz: OK
>> (SHA256) ghc/ghc-8.6.4-testsuite.tar.xz: OK
>> (SHA256) ghc/ghc-8.6.4.20200921-i386-unknown-openbsd.tar.xz: OK
>> (SHA256) ghc/ghc-8.6.4.20200921-shlibs-i386.tar.gz: OK
===>  Extracting for ghc-8.6.4p6
cd /pobj/ghc-8.6.4/ghc-8.6.4/libraries/unix &&  mkdir -p System/OpenBSD &&  
install -m 644 /usr/ports/lang/ghc/files/Process.hsc System/OpenBSD
===>  Patching for ghc-8.6.4p6
===>   Applying OpenBSD patch patch-aclocal_m4
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-aclocal_m4,v 1.3 2020/05/31 19:25:48 kili Exp $
|
|Index: aclocal.m4
|--- aclocal.m4.orig
|+++ aclocal.m4
--
Patching file aclocal.m4 using Plan A...
Hunk #1 succeeded at 691.
done
===>   Applying OpenBSD patch patch-configure_ac
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-configure_ac,v 1.3 2020/05/31 19:25:48 kili Exp $
|
|Index: configure.ac
|--- configure.ac.orig
|+++ configure.ac
--
Patching file configure.ac using Plan A...
Hunk #1 succeeded at 678.
done
===>   Applying OpenBSD patch patch-ghc_mk
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-ghc_mk,v 1.14 2019/09/30 11:44:18 kili Exp $
|
|Fix the bindist-list (for building the bootstrapper); without this,
|gtar creates an archive which our tar can't extract.
|
|Index: ghc.mk
|--- ghc.mk.orig
|+++ ghc.mk
--
Patching file ghc.mk using Plan A...
Hunk #1 succeeded at 1102.
done
===>   Applying OpenBSD patch 
patch-libraries_Cabal_Cabal_Distribution_Simple_Program_Strip_hs
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--
|$OpenBSD: patch-libraries_Cabal_Cabal_Distribution_Simple_Program_Strip_hs,v 
1.3 2018/01/22 00:42:30 kili Exp $
|
|Work around unresolved symbols when linking against hs packages
|that use FFI and contain some code compiled from C sources.
|
|Index: libraries/Cabal/Cabal/Distribution/Simple/Program/Strip.hs
|--- libraries/Cabal/Cabal/Distribution/Simple/Program/Strip.hs.orig
|+++ libraries/Cabal/Cabal/Distribution/Simple/Program/Strip.hs
--
Patching file 

Re: cmake.port.mk: LDFLAGS in MODCMAKE_configure?

2020-10-09 Thread Stuart Henderson
On 2020/10/09 12:53, Caspar Schutijser wrote:
> Hi,
> 
> Would it make sense to pass LDFLAGS="${LDFLAGS}" to cmake, similar to
> what already happens with CC, CFLAGS, CXX, and CXXFLAGS? Proposal below.

This is a bit of a departure from how it's done for other build
systems; LDFLAGS it not passed automatically to autoconf, etc.

If this is done for cmake then I think it would be better to use something
like MODCMAKE_LDFLAGS to reduce risk of inadvertent side-effects that
you might get with LDFLAGS.

Any reason not to just set it in CONFIGURE_ENV like other ports do though?

> The reason I ran into this is because I'm working on a proposal/diff
> (see the attachment for the WIP diff). In order for that patched port
> to build, I need to set LDFLAGS but without this cmake.port.mk diff it
> does not get passed to cmake.

The better fix for mosquitto would be to patch it to find libwebsockets
via pkg-config files if available.



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/10/09 05:03:45

Modified files:
comms/chirp: Makefile distinfo 

Log message:
update to chirp-20201008



cmake.port.mk: LDFLAGS in MODCMAKE_configure?

2020-10-09 Thread Caspar Schutijser
Hi,

Would it make sense to pass LDFLAGS="${LDFLAGS}" to cmake, similar to
what already happens with CC, CFLAGS, CXX, and CXXFLAGS? Proposal below.

The reason I ran into this is because I'm working on a proposal/diff
(see the attachment for the WIP diff). In order for that patched port
to build, I need to set LDFLAGS but without this cmake.port.mk diff it
does not get passed to cmake.

Given that this possibly affects a lot of ports, it probably makes sense
to verify whether all cmake ports still build properly. That hasn't
happened yet; first I'd like to check if you think this makes sense.

Thanks,
Caspar Schutijser


Index: cmake.port.mk
===
RCS file: /cvs/ports/devel/cmake/cmake.port.mk,v
retrieving revision 1.66
diff -u -p -r1.66 cmake.port.mk
--- cmake.port.mk   25 May 2020 05:12:00 -  1.66
+++ cmake.port.mk   9 Oct 2020 09:58:28 -
@@ -94,6 +94,7 @@ CONFIGURE_STYLE=  cmake
 MODCMAKE_configure=cd ${WRKBUILD} && ${SETENV} \
CC="${CC}" CFLAGS="${CFLAGS}" \
CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" \
+   LDFLAGS="${LDFLAGS}" \
${CONFIGURE_ENV} ${LOCALBASE}/bin/cmake \
-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON \
-G ${_MODCMAKE_GEN} ${CONFIGURE_ARGS} ${WRKSRC}
Index: Makefile
===
RCS file: /cvs/ports/net/mosquitto/Makefile,v
retrieving revision 1.33
diff -u -p -r1.33 Makefile
--- Makefile22 Aug 2020 13:55:07 -  1.33
+++ Makefile9 Oct 2020 10:39:16 -
@@ -3,6 +3,7 @@
 COMMENT =  opensource MQTT broker
 
 DISTNAME = mosquitto-1.6.12
+REVISION = 0
 
 SHARED_LIBS +=  mosquitto 1.0 # 1.5
 SHARED_LIBS +=  mosquittopp   1.0 # 1.5
@@ -15,7 +16,7 @@ MAINTAINER =  Jasper Lievisse Adriaanse 
 # EPL/EDL
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += c crypto m pthread ssl ${COMPILER_LIBCXX}
+WANTLIB += c crypto m pthread ssl websockets ${COMPILER_LIBCXX}
 
 MASTER_SITES = https://mosquitto.org/files/source/
 
@@ -30,13 +31,17 @@ MODPY_VERSION=  ${MODPY_DEFAULT_VERSION_
 
 BUILD_DEPENDS =devel/uthash
 
+LIB_DEPENDS =  www/libwebsockets
+
 DEBUG_PACKAGES =   ${BUILD_PACKAGES}
 
 CONFIGURE_ARGS=-DWITH_SRV=no
 # Pre-shared key support was intentionally removed from libressl
 CONFIGURE_ARGS +=  -DWITH_TLS_PSK=no
+CONFIGURE_ARGS +=  -DWITH_WEBSOCKETS=yes
 
 CFLAGS +=  -I${LOCALBASE}/include
+LDFLAGS += -L${LOCALBASE}/lib
 
 TEST_DEPENDS=  ${MODPY_RUN_DEPENDS} \
devel/cunit \


CVS: cvs.openbsd.org: ports

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

Modified files:
print/cups-filters: Makefile distinfo 

Log message:
Update to cups-filters-1.28.4.



Re: A bundle of patches to update p5-Catalyst ports

2020-10-09 Thread Charlene Wendling
On Thu, 8 Oct 2020 21:15:27 -0700
Andrew Hewus Fresh wrote:

> I also committed the update to p5-Catalyst-Plugin-Session, although I
> didn't see it mentioned in this email.
> 
> I didn't import devel/p5-Data-Clone as cwen@ created it, but
> OK afresh1@
> 
> I did not import or commit these, as they need cwen's p5-Data-Clone,
> but all of cwen's tweaks are OK afresh1@
>
> - www/p5-HTML-FormHandler
> This seemed to work with devel/p5-YAML-XS not Syck
> - www/p5-CatalystX-SimpleLogin
> - www/p5-Catalyst-Authentication-Credential-HTTP
> - devel/catalyst
> 
> I'm happy to import or commit if cwen commits (or give me the
> go-ahead) on p5-Data-Clone.

Thanks a lot!

You've everything ready to import/commit and i have not, so OK cwen@
to import devel/p5-Data-Clone.

> On Sat, Aug 29, 2020 at 02:42:40AM +0200, Charlene Wendling wrote:
> > Hi,
> > 
> > Here is a review of all submitted updates and new ports. Given the
> > amount of ports involved, i'm assuming i have missed some things;
> > more eyes will be needed :)
> > 
> > On Mon, 24 Aug 2020 08:00:55 +
> > wen heping wrote:
> > 
> > > Hi, ports@:
> > > 
> > > Here is a bundle of patches to update p5-Catalyst ports.
> > > I include all these patches into 2 file.
> > > 
> > > 1)new-ports-for-catalyst.tar.gz
> > > This file include 22 new ports which required by the update of
> > > Catalyst: 
> > 
> > > www/p5-Catalyst-ActionRole-ACL
> >   OK cwen@
> 
> Imported
> 
> > 
> > > www/p5-Catalyst-Controller-ActionRole
> >   OK cwen@
> 
> Imported
> 
> > 
> > > www/p5-Catalyst-Authentication-Credential-HTTP
> >   OK cwen@ with devel/p5-Test-WWW-Mechanize-Catalyst>=0.51 as a
> >   TEST_DEPENDS
> > 
> > > www/p5-Catalyst-Model-Adaptor
> >   OK cwen@ with devel/p5-Test-WWW-Mechanize-Catalyst as a
> >   TEST_DEPENDS
> 
> Imported with additional TEST_DEPENDS
> 
> > 
> > > www/p5-Catalyst-Plugin-Session-Store-DBIC
> >   OK cwen@ but it needs:
> >   TEST_DEPENDS =databases/p5-Catalyst-Model-DBIC-Schema \
> > databases/p5-DBD-SQLite \
> > devel/p5-Test-WWW-Mechanize-Catalyst \
> > www/p5-Catalyst-Plugin-Session-State-Cookie
> 
> Imported with additional TEST_DEPENDS
> 
> > 
> > > www/p5-Catalyst-Plugin-Session-Store-Delegate
> >   OK cwen@ with devel/p5-Class-Accessor added to TEST_DEPENDS
> 
> Imported with additional TEST_DEPENDS
> 
> > 
> > > mail/p5-Catalyst-View-Email
> >   OK cwen@ with www/p5-Catalyst-View-Mason added to TEST_DEPENDS
> 
> Imported with additional TEST_DEPENDS
> 
> > 
> > > www/p5-CatalystX-LeakChecker
> >   OK cwen@
> 
> Imported
> 
> > 
> > > www/p5-CatalystX-InjectComponent
> >   OK cwen@
> 
> Imported
> 
> > 
> > > www/p5-CatalystX-Profile
> >   OK cwen@
> 
> Imported
> 
> > 
> > > www/p5-CatalystX-REPL
> >   OK cwen@ with devel/p5-Test-Expect added to TEST_DEPENDS
> 
> Imported with additional TEST_DEPENDS
> 
> > 
> > > devel/p5-Devel-LexAlias
> >   OK cwen@ with 'c' added to WANTLIB 
> 
> Imported with 'c' in WANTLIB
> 
> 
> > > devel/p5-Devel-REPL
> >   OK cwen@ with devel/p5-Data-Dumper-Concise, textproc/p5-PPI and
> >   devel/p5-B-Keywords added to RUN_DEPENDS
> 
> Imported with these RUN_DEPENDS additions
> 
> > 
> > > devel/p5-MooseX-Object-Pluggable
> >   OK cwen@
> 
> Imported
> 
> > 
> > > devel/p5-Lexical-Persistence
> >   OK cwen@; we could add "MAKE_ENV += TEST_POD=Yes"
> 
> Imported with TEST_POD addition
> 
> 
> > 
> > > devel/p5-Devel-StackTrace-WithLexicals
> >   OK cwen@ with different DESCR because the current one is IMO too
> >   concise: 
> >   "
> >   The Devel::StackTrace module contains two classes,
> > Devel::StackTrace and Devel::StackTrace::Frame. These objects
> > encapsulate the information that can retrieved via Perl's caller
> > function, as well as providing a simple interface to this data.
> >   "
> 
> Imported with this DESCR
> 
> > 
> > > devel/p5-Carp-REPL
> >   OK cwen@
> 
> Imported
> 
> > 
> > > www/p5-HTML-FormHandler
> >   This misses a devel/p5-Data-Clone port as hinted by the cpan/ one
> >   found in the port Makefile. I created one with portgen, but then
> >   i've found out that i needed the following to complete the tests:
> >   TEST_DEPENDS += converters/p5-JSON \
> >   devel/p5-Config-Any \
> >   devel/p5-Type-Tiny \
> >   devel/p5-YAML-Syck \
> >   textproc/p5-Catalyst-View-TT
> > 
> > 
> > > www/p5-CatalystX-SimpleLogin
> >   OK cwen@; There is one skipped test but i'm fine with it because
> > it would require even more new ports and dependencies 
> > 
> > > devel/p5-MooseX-RelatedClassRoles
> >   OK cwen@
> 
> Imported
> 
>  
> > > www/p5-HTML-FormFu-MultiForm
> >   OK cwen@ with devel/p5-YAML-XS and not textproc/p5-YAML-LibYAML
> >   as a TEST_DEPENDS.
> 
> Imported with the adjusted TEST_DEPENDS
> 
> > 
> > > textproc/p5-YAML-LibYAML
> >   There are conflicts with p5-YAML-XS. In all that Catalyst update,
> 

Re: [update] spatialite 5.0.0

2020-10-09 Thread Landry Breuil
On Tue, Oct 06, 2020 at 10:09:54AM +0200, Landry Breuil wrote:
> hi,
> 
> after years of being moribund and not seeing much development,
> spatialite gained some traction again and got new releases this summer.
> Upstream umbrella (https://www.gaia-gis.it/gaia-sins/index.html)
> provides several projects, some have been discontinued.
> 
> The below diff unlinks
> - geo/spatialite/librewms (superseded by spatialite-gui)
> - geo/spatialite/gis (superseded by spatialite-gui)
> - geo/spatialite/librasterlite (superseded by librasterlite2, only used
>   by spatialite-gis))
> - geo/spatialite/libgaiagraphics (superseded by librasterite2, unused)
> 
> and adds geo/spatialite/virtualpg, which is a new dependency for
> spatialite-gui. Spatialite-GUI can also support libxlsxwriter
> (https://libxlsxwriter.github.io/) to access xls/csv datasets
> but we dont have a port for it (yet?), so some patches from an upstream
> ticket are added to fix the build.
> 
> spatialite update itself depends on the new ports for minizip &
> librttopo that i've recently posted, and the consumers of spatialite
> (postgis, qgis, gdal) will probably need some WANTLIB tweaks.
> 
> Looking for oks to import virtualpg, but they're welcome for the
> complete diff too :)

New diff, as solene@ noticed that spatialite_gui & librasterlite2
tarballs were rerolled upstream - patches for spatialite_gui are
removed, since upstream fixed the issues they were patching..

oh, and virtualpg goes into geo/spatialite, so inherits Makefile.inc

Landry
Index: Makefile
===
RCS file: /cvs/ports/geo/spatialite/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile2 Sep 2014 09:26:12 -   1.2
+++ Makefile9 Oct 2020 09:44:43 -
@@ -2,14 +2,11 @@
 
  SUBDIR =
  SUBDIR += freexl
- SUBDIR += gis
  SUBDIR += gui
- SUBDIR += libgaiagraphics
- SUBDIR += librasterlite
  SUBDIR += librasterlite2
- SUBDIR += librewms
  SUBDIR += libspatialite
  SUBDIR += readosm
  SUBDIR += tools
+ SUBDIR += virtualpg
 
 .include 
Index: Makefile.inc
===
RCS file: /cvs/ports/geo/spatialite/Makefile.inc,v
retrieving revision 1.6
diff -u -r1.6 Makefile.inc
--- Makefile.inc13 Jul 2019 10:59:26 -  1.6
+++ Makefile.inc9 Oct 2020 09:44:43 -
@@ -10,10 +10,9 @@
 
 CONFIGURE_STYLE ?= gnu
 
-# libpng header needed by gaiagraphics & librasterlite
 # lt_cv_dlopen_libs= needed by libspatialite
 # https://www.gaia-gis.it/fossil/libspatialite/info/6eabdf0e6d3520a7 for proj 
6.0.0
-CONFIGURE_ENV ?=   CPPFLAGS="-I${LOCALBASE}/include 
-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H=1" \
+CONFIGURE_ENV ?=   CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" lt_cv_dlopen_libs=
 
 LIBTOOL_FLAGS ?=   --tag=disable-static
Index: gui/Makefile
===
RCS file: /cvs/ports/geo/spatialite/gui/Makefile,v
retrieving revision 1.16
diff -u -r1.16 Makefile
--- gui/Makefile17 May 2019 16:45:26 -  1.16
+++ gui/Makefile9 Oct 2020 09:44:43 -
@@ -1,21 +1,24 @@
 # $OpenBSD: Makefile,v 1.16 2019/05/17 16:45:26 sthen Exp $
 
 COMMENT =  GUI for spatialite
-DISTNAME = spatialite_gui-1.7.1
+DISTNAME = spatialite_gui-2.1.0-beta1
+PKGNAME =  spatialite_gui-2.1.0beta1
 PROJECT =  spatialite_gui
-REVISION = 9
+MASTER_SITES = http://www.gaia-gis.it/gaia-sins/spatialite-gui-sources/
 
 LIB_DEPENDS += x11/wxWidgets>=3.0.4 \
databases/sqlite3 \
-   geo/spatialite/libspatialite \
-   geo/spatialite/libgaiagraphics
-RUN_DEPENDS += devel/desktop-file-utils
+   geo/spatialite/libspatialite>=5.0.0rc1 \
+   geo/spatialite/librasterlite2>=1.1.0beta1 \
+   geo/spatialite/virtualpg
+RUN_DEPENDS += devel/desktop-file-utils \
+   x11/gtk+3,-guic
 
 WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
 WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
-WANTLIB += atk-1.0 atk-bridge-2.0 atspi c cairo cairo-gobject
-WANTLIB += dbus-1 epoxy expat ffi fontconfig freetype freexl fribidi
-WANTLIB += gaiagraphics gdk-3 gdk_pixbuf-2.0 geos geos_c geotiff
+WANTLIB += atk-1.0 atk-bridge-2.0 c cairo cairo-gobject
+WANTLIB += epoxy expat ffi fontconfig freetype freexl fribidi
+WANTLIB += gdk-3 gdk_pixbuf-2.0 geos geos_c geotiff
 WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 graphite2
 WANTLIB += gthread-2.0 gtk-3 harfbuzz iconv intl jpeg lzma m mspack
 WANTLIB += notify pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
@@ -24,13 +27,16 @@
 WANTLIB += wx_gtk3u_adv-3.0 wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0
 WANTLIB += wx_gtk3u_html-3.0 wx_gtk3u_qa-3.0 wx_gtk3u_xrc-3.0
 WANTLIB += xcb xcb-render xcb-shm xml2 z
+WANTLIB += Xss bz2 charset crypto curl gif lz4 

UPDATE: Suricata-6.0.0

2020-10-09 Thread Gonzalo L. Rodriguez
Hola,

Update for Suricata to 6.0.0:

https://github.com/OISF/suricata/releases/tag/suricata-6.0.0

OK? Comments?

Cheers.-

-- 

- gonzalo
Index: Makefile
===
RCS file: /cvs/ports/security/suricata/Makefile,v
retrieving revision 1.32
diff -u -p -r1.32 Makefile
--- Makefile3 Jul 2020 21:13:08 -   1.32
+++ Makefile9 Oct 2020 09:19:42 -
@@ -2,13 +2,12 @@
 
 COMMENT =  high performance network IDS, IPS and security monitoring
 
-SURICATA_V =   5.0.3
-SUPDATE_V =1.1.2
+SURICATA_V =   6.0.0
+SUPDATE_V =1.2.0
 
 DISTNAME = suricata-${SURICATA_V}
 CATEGORIES =   security
 SHARED_LIBS += htp   0.0 # 2.0
-REVISION = 0
 
 HOMEPAGE = https://suricata-ids.org/
 
Index: distinfo
===
RCS file: /cvs/ports/security/suricata/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo15 May 2020 09:17:39 -  1.10
+++ distinfo9 Oct 2020 09:19:42 -
@@ -1,2 +1,2 @@
-SHA256 (suricata-5.0.3.tar.gz) = NEE+za0v8kUlJtvNIvEnmv0JNRUZFsD/nPrOSwtWZds=
-SIZE (suricata-5.0.3.tar.gz) = 23744731
+SHA256 (suricata-6.0.0.tar.gz) = PBdabe6QcRQTkfZIKFAs+25I3Boggz4UEftFvlNokjs=
+SIZE (suricata-6.0.0.tar.gz) = 30832555
Index: patches/patch-configure
===
RCS file: /cvs/ports/security/suricata/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- patches/patch-configure 16 Dec 2019 15:33:27 -  1.2
+++ patches/patch-configure 9 Oct 2020 09:19:42 -
@@ -5,7 +5,7 @@ Fix path to sphinx-build
 Index: configure
 --- configure.orig
 +++ configure
-@@ -26794,7 +26794,7 @@ $as_echo "#define CLS 64" >>confdefs.h
+@@ -28599,7 +28599,7 @@ $as_echo "#define CLS 64" >>confdefs.h
  
  # sphinx for documentation
  # Extract the first word of "sphinx-build", so it can be a program name 
with args.
Index: patches/patch-doc_userguide_Makefile_in
===
RCS file: /cvs/ports/security/suricata/patches/patch-doc_userguide_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_userguide_Makefile_in
--- patches/patch-doc_userguide_Makefile_in 26 Nov 2019 10:44:34 -  
1.1
+++ patches/patch-doc_userguide_Makefile_in 9 Oct 2020 09:19:42 -
@@ -5,10 +5,10 @@ Fix path to sphinx-build
 Index: doc/userguide/Makefile.in
 --- doc/userguide/Makefile.in.orig
 +++ doc/userguide/Makefile.in
-@@ -364,7 +364,7 @@ EXTRA_DIST = _static 3rd-party-integration acknowledge
+@@ -373,7 +373,7 @@ EXTRA_DIST = _static 3rd-party-integration acknowledge
what-is-suricata.rst $(am__append_1)
- @HAVE_SPHINXBUILD_TRUE@man1_MANS = suricata.1
- @HAVE_SURICATA_MAN_TRUE@man1_MANS = suricata.1
+ @HAVE_SPHINXBUILD_TRUE@dist_man1_MANS = suricata.1
+ @HAVE_SURICATA_MAN_TRUE@dist_man1_MANS = suricata.1
 -@HAVE_SPHINXBUILD_TRUE@SPHINX_BUILD = sphinx-build -q
 +@HAVE_SPHINXBUILD_TRUE@SPHINX_BUILD = sphinx-build${MODPY_BIN_SUFFIX} -q
  all: all-am
Index: patches/patch-suricata_yaml_in
===
RCS file: /cvs/ports/security/suricata/patches/patch-suricata_yaml_in,v
retrieving revision 1.7
diff -u -p -r1.7 patch-suricata_yaml_in
--- patches/patch-suricata_yaml_in  30 Oct 2019 12:41:46 -  1.7
+++ patches/patch-suricata_yaml_in  9 Oct 2020 09:19:42 -
@@ -8,7 +8,7 @@ Remove rules files not present by defaul
 Index: suricata.yaml.in
 --- suricata.yaml.in.orig
 +++ suricata.yaml.in
-@@ -75,6 +75,7 @@ outputs:
+@@ -77,6 +77,7 @@ outputs:
- fast:
enabled: yes
filename: fast.log
@@ -16,23 +16,23 @@ Index: suricata.yaml.in
append: yes
#filetype: regular # 'regular', 'unix_stream' or 'unix_dgram'
  
-@@ -83,6 +84,7 @@ outputs:
+@@ -85,6 +86,7 @@ outputs:
enabled: @e_enable_evelog@
filetype: regular #regular|syslog|unix_dgram|unix_stream|redis
filename: eve.json
 +  filemode: 664
-   #prefix: "@cee: " # prefix to prepend to each log entry
-   # the following are valid when type: syslog above
-   #identity: "suricata"
-@@ -297,6 +299,7 @@ outputs:
+   # Enable for multi-threaded eve.json output; output files are amended 
with
+   # with an identifier, e.g., eve.9.json
+   #threaded: false
+@@ -304,6 +306,7 @@ outputs:
- http-log:
enabled: no
filename: http.log
 +  filemode: 664
append: yes
#extended: yes # enable this for extended logging information
-   #custom: yes   # enabled the custom logging format (defined by 
customformat)
-@@ -307,6 +310,7 @@ outputs:
+   #custom: yes   # enable the custom logging format (defined by 
customformat)
+@@ -314,6 +317,7 @@ outputs:
- tls-log:
enabled: no  # Log TLS connections.
filename: tls.log 

CVS: cvs.openbsd.org: ports

2020-10-09 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/10/09 02:47:58

Modified files:
mail/cyrus-imapd: Makefile distinfo 
mail/cyrus-imapd/patches: patch-imtest_imtest_c 
mail/cyrus-imapd/pkg: PLIST 

Log message:
Update to cyrus-imapd-3.2.4.



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Pavel Korovin
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/10/09 01:47:07

Modified files:
security/opendnssec: Makefile distinfo 

Log message:
Update opendnssec 2.1.6 -> 2.1.7
Announcement: https://www.opendnssec.org/2020/10/opendnssec-2-1-7



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Pavel Korovin
CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/10/09 01:18:47

Modified files:
sysutils/ansible: Makefile distinfo 
sysutils/ansible/patches: patch-docs_docsite_rst_conf_py 
sysutils/ansible/pkg: PLIST-main 

Log message:
Update ansible 2.9.13 -> 2.9.14
Changelog: 
https://github.com/ansible/ansible/blob/stable-2.9/changelogs/CHANGELOG-v2.9.rst#v2-9-14



Re: pidgin 2.14 update ?

2020-10-09 Thread Theo Buehler
On Fri, Oct 09, 2020 at 09:10:40AM +0200, Landry Breuil wrote:
> On Fri, Oct 09, 2020 at 08:52:37AM +0200, Theo Buehler wrote:
> > On Mon, Jul 06, 2020 at 03:31:23PM +0200, Landry Breuil wrote:
> > > On Thu, Jun 18, 2020 at 09:57:35PM -0400, Brad Smith wrote:
> > > > On 6/17/2020 7:18 AM, Landry Breuil wrote:
> > > > > Hi,
> > > > > 
> > > > > after 2 years without releases, seems pidgin got a new upstream
> > > > > maintainer who recently did
> > > > > https://pidgin.im/posts/2020-06-2.14.0-released/ (and
> > > > > https://pidgin.im/posts/2020-06-2.14.1-released/ next)
> > > > > 
> > > > > noteworthy in this update.. the python bits relying on py2/pygtk were
> > > > > updated for py3, per
> > > > > https://bitbucket.org/pidgin/main/src/release-2.x.y/ChangeLog and
> > > > > https://bitbucket.org/pidgin/main/commits/38a40ddbb9b76ac8918c5743eebee51e811b43ce
> > > > >  - which is
> > > > > good, as less ports depending on pygtk is wanted.
> > > > > 
> > > > > and the curses toolkit used for finch was split in its own repo/lib
> > > > > which requires a new port: https://bitbucket.org/pidgin/libgnt
> > > > > 
> > > > > brad, as the port maintainer, are you working on updating our port ?
> > > > > or eventually backporting the python bits so that we can remove the
> > > > > dependency on pygtk ?
> > > > > 
> > > > > Landry
> > > > I don't have anything at the moment but I'll take a look.
> > > 
> > > Did you make some progress on this ? On some of my machines pidgin is
> > > the last port depending on py-gtk2.
> > 
> > Why does it actually need py-gtk2? Isn't this a leftover from the past?
> > 
> > I've dropped the RDEP a while back and it works fine for me.
> > 
> > I can only find one mention in a comment of the purple-notifications-example
> > script which isn't even packaged.
> 
> iirc some plugins do 'import pygtk'.

Only pietray which isn't packaged.
> 
> Landry



Re: pidgin 2.14 update ?

2020-10-09 Thread Landry Breuil
On Fri, Oct 09, 2020 at 08:52:37AM +0200, Theo Buehler wrote:
> On Mon, Jul 06, 2020 at 03:31:23PM +0200, Landry Breuil wrote:
> > On Thu, Jun 18, 2020 at 09:57:35PM -0400, Brad Smith wrote:
> > > On 6/17/2020 7:18 AM, Landry Breuil wrote:
> > > > Hi,
> > > > 
> > > > after 2 years without releases, seems pidgin got a new upstream
> > > > maintainer who recently did
> > > > https://pidgin.im/posts/2020-06-2.14.0-released/ (and
> > > > https://pidgin.im/posts/2020-06-2.14.1-released/ next)
> > > > 
> > > > noteworthy in this update.. the python bits relying on py2/pygtk were
> > > > updated for py3, per
> > > > https://bitbucket.org/pidgin/main/src/release-2.x.y/ChangeLog and
> > > > https://bitbucket.org/pidgin/main/commits/38a40ddbb9b76ac8918c5743eebee51e811b43ce
> > > >  - which is
> > > > good, as less ports depending on pygtk is wanted.
> > > > 
> > > > and the curses toolkit used for finch was split in its own repo/lib
> > > > which requires a new port: https://bitbucket.org/pidgin/libgnt
> > > > 
> > > > brad, as the port maintainer, are you working on updating our port ?
> > > > or eventually backporting the python bits so that we can remove the
> > > > dependency on pygtk ?
> > > > 
> > > > Landry
> > > I don't have anything at the moment but I'll take a look.
> > 
> > Did you make some progress on this ? On some of my machines pidgin is
> > the last port depending on py-gtk2.
> 
> Why does it actually need py-gtk2? Isn't this a leftover from the past?
> 
> I've dropped the RDEP a while back and it works fine for me.
> 
> I can only find one mention in a comment of the purple-notifications-example
> script which isn't even packaged.

iirc some plugins do 'import pygtk'.

Landry



CVS: cvs.openbsd.org: ports

2020-10-09 Thread Frederic Cambus
CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2020/10/09 01:04:17

Modified files:
converters/bdf2sfd: Makefile distinfo 

Log message:
Update bdf2sfd to 1.1.4.



Re: pidgin 2.14 update ?

2020-10-09 Thread Theo Buehler
On Mon, Jul 06, 2020 at 03:31:23PM +0200, Landry Breuil wrote:
> On Thu, Jun 18, 2020 at 09:57:35PM -0400, Brad Smith wrote:
> > On 6/17/2020 7:18 AM, Landry Breuil wrote:
> > > Hi,
> > > 
> > > after 2 years without releases, seems pidgin got a new upstream
> > > maintainer who recently did
> > > https://pidgin.im/posts/2020-06-2.14.0-released/ (and
> > > https://pidgin.im/posts/2020-06-2.14.1-released/ next)
> > > 
> > > noteworthy in this update.. the python bits relying on py2/pygtk were
> > > updated for py3, per
> > > https://bitbucket.org/pidgin/main/src/release-2.x.y/ChangeLog and
> > > https://bitbucket.org/pidgin/main/commits/38a40ddbb9b76ac8918c5743eebee51e811b43ce
> > >  - which is
> > > good, as less ports depending on pygtk is wanted.
> > > 
> > > and the curses toolkit used for finch was split in its own repo/lib
> > > which requires a new port: https://bitbucket.org/pidgin/libgnt
> > > 
> > > brad, as the port maintainer, are you working on updating our port ?
> > > or eventually backporting the python bits so that we can remove the
> > > dependency on pygtk ?
> > > 
> > > Landry
> > I don't have anything at the moment but I'll take a look.
> 
> Did you make some progress on this ? On some of my machines pidgin is
> the last port depending on py-gtk2.

Why does it actually need py-gtk2? Isn't this a leftover from the past?

I've dropped the RDEP a while back and it works fine for me.

I can only find one mention in a comment of the purple-notifications-example
script which isn't even packaged.

> 
> Landry
>