CVS: cvs.openbsd.org: ports

[Sebastien Marie]

CVSROOT:/cvs
Module name:ports
Changes by: sema...@cvs.openbsd.org 2020/03/20 23:30:59

Modified files:
security/sn0int: Makefile distinfo 
Removed files:
security/sn0int/patches: 
 
patch-modcargo-crates_rustyline-4_0_0_src_history_rs 
 
patch-modcargo-crates_rustyline-4_0_0_src_lib_rs 

Log message:
update security/sn0int to 0.18.0

from kpcyrd at rxv cc

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2020/03/20 23:28:52

Modified files:
misc/remind: Makefile distinfo 

Log message:
Update to remind-3.3.1

Changes: https://dianne.skoll.ca/pipermail/remind-fans/2020/003699.html

>From Martin Ziemer  (MAINTAINER). Thank You!

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2020/03/20 23:28:26

Modified files:
net/ocserv : Makefile distinfo 

Log message:
Update to ocserv-1.0.0

Changes: https://gitlab.com/openconnect/ocserv/-/blob/master/NEWS

CVS: cvs.openbsd.org: ports

[Sebastien Marie]

CVSROOT:/cvs
Module name:ports
Changes by: sema...@cvs.openbsd.org 2020/03/20 23:23:59

Modified files:
lang/rust  : Makefile distinfo 
lang/rust/patches: patch-src_bootstrap_bin_rustc_rs 
   patch-src_bootstrap_bootstrap_py 
   patch-src_bootstrap_lib_rs 
   patch-src_bootstrap_test_rs 
   patch-src_librustc_session_filesearch_rs 
   patch-src_libstd_sys_unix_os_rs 
   
patch-src_tools_cargo_src_cargo_core_compiler_context_compilation_files_rs 
   patch-vendor_libgit2-sys_lib_rs 
lang/rust/pkg  : PLIST-main 

Log message:
update lang/rust to 1.42.0

Announce: https://blog.rust-lang.org/2020/03/12/Rust-1.42.html
ChangeLog: 
https://github.com/rust-lang/rust/blob/master/RELEASES.md#version-1420-2020-03-12

Re: package-specs(7) and alpha releases

[Theo Buehler]

On Sat, Mar 21, 2020 at 02:57:39AM +0100, Jeremie Courreges-Anglas wrote:
> On Fri, Mar 20 2020, Marc Espie  wrote:
> > On Fri, Mar 20, 2020 at 05:16:12PM +, Stuart Henderson wrote:
> >> On 2020/03/20 17:41, Jeremie Courreges-Anglas wrote:
> >> > >> only rc[N], beta[N], pre[N], and pl[N]. Would it makes sense to add a
> >> > >> alpha[N]? We could of course also use EPOCH here.
> >> > >
> >> > > adding support for alpha[N] would be in suffix_compare in 
> >> > > PackageName.pm
> >> > > (and from_string), but that would only work (afaik) if the suffix was
> >> > > directly near the version, ie 5.13.2alpha3 (not 5.13.2-alpha3).
> >> > 
> >> > I suspect that the lack of support for alpha[N] is intentional, as in
> >> > "You should not put alpha-quality software in the ports tree."
> >> 
> >> Yes, I think so too.
> >> 
> >> > The current situation is that we have ports using alpha releases in the
> >> > tree, and I see no reason to arbitrarily draw a line between alpha and
> >> > beta releases.
> >> > Diff below, not tested much yet.  Thoughts?
> >> 
> >> I agree with adding it.
> >> 
> >> It wants to go in /usr/src/regress/usr.sbin/pkg_add/check-name and
> >> packages-specs(7) too,
> 
> Bah, I should have mentioned that the diff was not intended as complete.
> Thanks for the pointers, I did not find other places to tweak.
> 
> www/faq/ports/guide.html says:
> 
>   "* Do not use alpha or beta code when preparing a port. Use the latest
>   regular or patch release."
> 
> but I don't think it needs changing.
> 
> >> and I think anything currently using "alpha" will
> >> need an EPOCH bump.
> 
> Hmm this indeed raises a point...  I'm not sure why they would need an
> EPOCH bump.  The packages contents won't change, only the way the
> pkg_* tools handle them, right?
> 
> There are three affected ports:
> 
> ritchie ~$ sqlite3 /usr/local/share/sqlports 'select fullpkgpath, fullpkgname 
> from ports  where fullpkgname like "%alpha%";'
> archivers/libmspack|libmspack-0.10.1alphav1
> lang/squeak/funsqueak|squeak-funsqueak-3.10alpha7
> net/py-tlslite-ng,python3|py3-tlslite-ng-0.8.0alpha37p1
> 
> - the version of funsqueak hasn't changed since import
> - net/py-tlslite-ng has been imported weeks ago and has had no version
>   bump
> - the last update of archivers/libmspack came with an EPOCH bump so
>   I don't see how its version could be considered lower than any
>   previous version available in the tree
> 
> Even though I can't find a reason for adding/bumping EPOCH in those
> ports, I'll do it anyway to resolve any concern, unless I hear
> objections.
> 
> > Definitely wants tests.
> 
> The diff below:
> - implements the changes as pointed by landry@
> - documents "alpha" in packages-specs(7)
> - adds "alpha" to the tests in regress/usr.sbin/pkg_add/check-name, as
>   suggested by sthen@; ''make pkgnames'' still succeeds
> 
> ok?

Thank you. I am in favor of this change. I had to look in PackageName.pm
when I was trying to figure out how to deal with tlslite-ng's alpha
version. The diff reads fine, but I don't feel qualified okaying it. I'm
of course fine with bumping EPOCH in tlslite-ng if people think it's
needed.

> 
> 
> Index: usr.sbin/pkg_add/OpenBSD/PackageName.pm
> ===
> RCS file: /d/cvs/src/usr.sbin/pkg_add/OpenBSD/PackageName.pm,v
> retrieving revision 1.53
> diff -u -p -r1.53 PackageName.pm
> --- usr.sbin/pkg_add/OpenBSD/PackageName.pm   7 Nov 2019 15:35:23 -   
> 1.53
> +++ usr.sbin/pkg_add/OpenBSD/PackageName.pm   21 Mar 2020 01:47:15 -
> @@ -153,7 +153,7 @@ sub from_string
>   my ($class, $string) = @_;
>   my $o = bless { deweys => [ split(/\./o, $string) ],
>   suffix => '', suffix_value => 0}, $class;
> - if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|beta|pre|pl)(\d*)$/) {
> + if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|alpha|beta|pre|pl)(\d*)$/) {
>   $o->{deweys}->[-1] = $1;
>   $o->{suffix} = $2;
>   $o->{suffix_value} = $3;
> @@ -193,10 +193,13 @@ sub suffix_compare
>   if ($a->{suffix} gt $b->{suffix}) {
>   return -suffix_compare($b, $a);
>   }
> - # order is '', beta, pre, rc
> + # order is '', alpha, beta, pre, rc
>   # we know that a < b,
>   if ($a->{suffix} eq '') {
>   return 1;
> + }
> + if ($a->{suffix} eq 'alpha') {
> + return -1;
>   }
>   if ($a->{suffix} eq 'beta') {
>   return -1;
> Index: regress/usr.sbin/pkg_add/check-name
> ===
> RCS file: /d/cvs/src/regress/usr.sbin/pkg_add/check-name,v
> retrieving revision 1.11
> diff -u -p -r1.11 check-name
> --- regress/usr.sbin/pkg_add/check-name   27 Jan 2010 15:41:58 -  
> 1.11
> +++ regress/usr.sbin/pkg_add/check-name   21 Mar 2020 01:47:15 -
> @@ -119,5 +119,5 @@ ok(check_list(["correct order is pNvM"],
>   "mixed up vp");
>  

Re: package-specs(7) and alpha releases

[Jeremie Courreges-Anglas]

On Fri, Mar 20 2020, Marc Espie  wrote:
> On Fri, Mar 20, 2020 at 05:16:12PM +, Stuart Henderson wrote:
>> On 2020/03/20 17:41, Jeremie Courreges-Anglas wrote:
>> > >> only rc[N], beta[N], pre[N], and pl[N]. Would it makes sense to add a
>> > >> alpha[N]? We could of course also use EPOCH here.
>> > >
>> > > adding support for alpha[N] would be in suffix_compare in PackageName.pm
>> > > (and from_string), but that would only work (afaik) if the suffix was
>> > > directly near the version, ie 5.13.2alpha3 (not 5.13.2-alpha3).
>> > 
>> > I suspect that the lack of support for alpha[N] is intentional, as in
>> > "You should not put alpha-quality software in the ports tree."
>> 
>> Yes, I think so too.
>> 
>> > The current situation is that we have ports using alpha releases in the
>> > tree, and I see no reason to arbitrarily draw a line between alpha and
>> > beta releases.
>> > Diff below, not tested much yet.  Thoughts?
>> 
>> I agree with adding it.
>> 
>> It wants to go in /usr/src/regress/usr.sbin/pkg_add/check-name and
>> packages-specs(7) too,

Bah, I should have mentioned that the diff was not intended as complete.
Thanks for the pointers, I did not find other places to tweak.

www/faq/ports/guide.html says:

  "* Do not use alpha or beta code when preparing a port. Use the latest
  regular or patch release."

but I don't think it needs changing.

>> and I think anything currently using "alpha" will
>> need an EPOCH bump.

Hmm this indeed raises a point...  I'm not sure why they would need an
EPOCH bump.  The packages contents won't change, only the way the
pkg_* tools handle them, right?

There are three affected ports:

ritchie ~$ sqlite3 /usr/local/share/sqlports 'select fullpkgpath, fullpkgname 
from ports  where fullpkgname like "%alpha%";'
archivers/libmspack|libmspack-0.10.1alphav1
lang/squeak/funsqueak|squeak-funsqueak-3.10alpha7
net/py-tlslite-ng,python3|py3-tlslite-ng-0.8.0alpha37p1

- the version of funsqueak hasn't changed since import
- net/py-tlslite-ng has been imported weeks ago and has had no version
  bump
- the last update of archivers/libmspack came with an EPOCH bump so
  I don't see how its version could be considered lower than any
  previous version available in the tree

Even though I can't find a reason for adding/bumping EPOCH in those
ports, I'll do it anyway to resolve any concern, unless I hear
objections.

> Definitely wants tests.

The diff below:
- implements the changes as pointed by landry@
- documents "alpha" in packages-specs(7)
- adds "alpha" to the tests in regress/usr.sbin/pkg_add/check-name, as
  suggested by sthen@; ''make pkgnames'' still succeeds

ok?


Index: usr.sbin/pkg_add/OpenBSD/PackageName.pm
===
RCS file: /d/cvs/src/usr.sbin/pkg_add/OpenBSD/PackageName.pm,v
retrieving revision 1.53
diff -u -p -r1.53 PackageName.pm
--- usr.sbin/pkg_add/OpenBSD/PackageName.pm 7 Nov 2019 15:35:23 -   
1.53
+++ usr.sbin/pkg_add/OpenBSD/PackageName.pm 21 Mar 2020 01:47:15 -
@@ -153,7 +153,7 @@ sub from_string
my ($class, $string) = @_;
my $o = bless { deweys => [ split(/\./o, $string) ],
suffix => '', suffix_value => 0}, $class;
-   if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|beta|pre|pl)(\d*)$/) {
+   if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|alpha|beta|pre|pl)(\d*)$/) {
$o->{deweys}->[-1] = $1;
$o->{suffix} = $2;
$o->{suffix_value} = $3;
@@ -193,10 +193,13 @@ sub suffix_compare
if ($a->{suffix} gt $b->{suffix}) {
return -suffix_compare($b, $a);
}
-   # order is '', beta, pre, rc
+   # order is '', alpha, beta, pre, rc
# we know that a < b,
if ($a->{suffix} eq '') {
return 1;
+   }
+   if ($a->{suffix} eq 'alpha') {
+   return -1;
}
if ($a->{suffix} eq 'beta') {
return -1;
Index: regress/usr.sbin/pkg_add/check-name
===
RCS file: /d/cvs/src/regress/usr.sbin/pkg_add/check-name,v
retrieving revision 1.11
diff -u -p -r1.11 check-name
--- regress/usr.sbin/pkg_add/check-name 27 Jan 2010 15:41:58 -  1.11
+++ regress/usr.sbin/pkg_add/check-name 21 Mar 2020 01:47:15 -
@@ -119,5 +119,5 @@ ok(check_list(["correct order is pNvM"],
"mixed up vp");
 ok(check_list([], check_name("pkgname-1.0p0v0")), "correct name");
 
-ok(check_order(qw(speex-1.2beta3 speex-1.2rc1 speex-1.2 speex-1.2pl1 
-speex-1.3beta1)), 'check order');
+ok(check_order(qw(speex-1.2alpha3 speex-1.2beta3 speex-1.2rc1 speex-1.2
+speex-1.2pl1 speex-1.3beta1)), 'check order');
Index: share/man/man7/packages-specs.7
===
RCS file: /d/cvs/src/share/man/man7/packages-specs.7,v
retrieving revision 1.25
diff -u -p -r1.25 packages-specs.7
--- share/man/man7/packages-specs.7 27 Oct 2014 

Maintainer update & move py-twitter to py3

[Daniel Winters]

Dear all,

the diff below updates py-twitter to the latest version and moves it
to py3-only. Tested on amd64.

This is mostly interesting for the commandline tools and is has no
consumers. I commented out the IRC functionality as the py-irclib
library that is imported does not support python3 and has not been
updated in more than 10 years. I doubt the IRC functionality will be
missed.

This will need a quirks entry which is not in the patch yet.

Any comment or feedback is very welcome!

Daniel


Index: Makefile
===
RCS file: /cvs/ports/net/py-twitter/Makefile,v
retrieving revision 1.14
diff -u -p -u -r1.14 Makefile
--- Makefile12 Jul 2019 20:48:46 -  1.14
+++ Makefile20 Mar 2020 22:46:26 -
@@ -2,10 +2,9 @@
 
 COMMENT=   twitter python module
 
-MODPY_EGG_VERSION= 1.17.1
+MODPY_EGG_VERSION= 1.18.0
 DISTNAME=  twitter-${MODPY_EGG_VERSION}
 PKGNAME=   py-twitter-${MODPY_EGG_VERSION}
-REVISION=  0
 
 CATEGORIES=net www
 
@@ -15,13 +14,14 @@ MAINTAINER= Daniel Winters 

Re: NEW: sysutils/mdprint (now with tarball attached)

[Jeremie Courreges-Anglas]

On Fri, Mar 20 2020, Klemens Nanni  wrote:
> Using converters/rpm2cpio;  I know the tool but it didn't occur to me
> that we'd have it packaged (so I didn't even look) - thanks jca for the
> hint :)
>
>   Information for inst:mdprint-1.3
>
>   Comment:
>   print sun4v machine descriptions
>
>   Description:
>   mdprint prints the contents of the provided binary sun4v MD file.
>
>   If no file is provided, the "guest MD" is read from the device file 
> "/dev/mdesc"
>   which is expected to be present on all sun4v guest domains.
>
>   If no file is provided and the -P/--PRI option is used, the PRI
>   (physical resource inventory) MD is read from the device file
>   "/devices/pseudo/ds_pri@0:ds_pri" (Solaris only).
>
>   The complete PRI is only available on the "primary" domain.
>
>   Maintainer: Klemens Nanni 
>
> OK?

ok jca@

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

editors/libreoffice and poppler-0.86

[Matthias Kilian]

Hi,

whatever I do about the type insanities in poppler-glib pointed out
by Greg, this one will be required to build libreoffice against
poppler-0.86.x in any case.

ok?

Ciao,
Kili

Index: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
===
RCS file: patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
diff -N patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-sdext_source_pdfimport_xpdfwrapper_pdfioutdev_gpl_cxx 20 Mar 
2020 22:55:12 -
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Fix with poppler-0.86.x.
+
+Index: sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+--- sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx.orig
 sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
+@@ -563,7 +563,9 @@ void PDFOutDev::processLink(Link* link, Catalog*)
+ if (!(pAction && pAction->getKind() == actionURI))
+ return;
+ 
+-#if POPPLER_CHECK_VERSION(0, 72, 0)
++#if POPPLER_CHECK_VERSION(0, 86, 0)
++const char* pURI = static_cast(pAction)->getURI().c_str();
++#elif POPPLER_CHECK_VERSION(0, 72, 0)
+ const char* pURI = static_cast(pAction)->getURI()->c_str();
+ #else
+ const char* pURI = static_cast(pAction)->getURI()->getCString();

[update patch] remind 3.3.0 -> 3.3.1

[Martin Ziemer]

This patch updates remind from 3.3.0 to 3.3.1.

Tested the new version on three amd64 systems.
(One cli only, so only two tkremind tests)

Index: Makefile
===
RCS file: /cvs/ports/misc/remind/Makefile,v
retrieving revision 1.39
diff -u -p -r1.39 Makefile
--- Makefile1 Mar 2020 06:48:54 -   1.39
+++ Makefile20 Mar 2020 19:33:30 -
@@ -2,8 +2,8 @@
 
 COMMENT=   scripting language for reminders, with a Tk front end
 
-DISTNAME=  remind-03.03.00
-PKGNAME=   remind-3.3.0
+DISTNAME=  remind-03.03.01
+PKGNAME=   remind-3.3.1
 
 CATEGORIES=misc
 
Index: distinfo
===
RCS file: /cvs/ports/misc/remind/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo1 Mar 2020 06:48:54 -   1.12
+++ distinfo20 Mar 2020 19:33:30 -
@@ -1,2 +1,2 @@
-SHA256 (remind-03.03.00.tar.gz) = lolbmBrlnDuhNsWa1UvMqk+5WRl/Nxr/TrFuyoGztho=
-SIZE (remind-03.03.00.tar.gz) = 390762
+SHA256 (remind-03.03.01.tar.gz) = 0aFk0cLR6WPV8fJRRXqAZcrhLzbjkUysHlQnUYBJlHg=
+SIZE (remind-03.03.01.tar.gz) = 395920

CVS: cvs.openbsd.org: ports

[Juan Francisco Cantero Hurtado]

CVSROOT:/cvs
Module name:ports
Changes by: juan...@cvs.openbsd.org 2020/03/20 14:22:45

Modified files:
devel/mercurial: Makefile 
devel/mercurial/pkg: PLIST-main PLIST-x11 

Log message:
Move mercurial to python3.

It passes the tests on amd64 (except the usual suspects).
"hg clone" tested on sparc64 and OK by kn@.

Re: NEW: sysutils/mdprint (now with tarball attached)

[Klemens Nanni]

Using converters/rpm2cpio;  I know the tool but it didn't occur to me
that we'd have it packaged (so I didn't even look) - thanks jca for the
hint :)

Information for inst:mdprint-1.3

Comment:
print sun4v machine descriptions

Description:
mdprint prints the contents of the provided binary sun4v MD file.

If no file is provided, the "guest MD" is read from the device file 
"/dev/mdesc"
which is expected to be present on all sun4v guest domains.

If no file is provided and the -P/--PRI option is used, the PRI
(physical resource inventory) MD is read from the device file
"/devices/pseudo/ds_pri@0:ds_pri" (Solaris only).

The complete PRI is only available on the "primary" domain.

Maintainer: Klemens Nanni 

OK?


mdprint.tgz
Description: Binary data

NEW: devel/dwz

[Brian Callahan]

Hello ports --

It was hinted at recently that a port of dwz might be desirable. Here is 
one.


---
pkg/DESCR:
dwz is a program that attempts to optimize DWARF debugging information
contained in ELF shared libraries and ELF executables for size, by
replacing DWARF information representation with equivalent smaller
representation where possible and by reducing the amount of duplication
using techniques from DWARF standard appendix E - creating
DW_TAG_partial_unit compilation units (CUs) for duplicated information
and using DW_TAG_imported_unit to import it into each CU that needs it.
---

Can verify that it does in fact do something with some test binaries on 
amd64 (diffing the output of `objdump -g' from a newer binutils does 
show substantial differences), but I don't know enough about DWARF 
symbols to authoritatively say anything more than that. Testing on other 
archs would be greatly appreciated.


OK?

~Brian



dwz.tgz
Description: application/compressed-tar

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 12:42:33

Modified files:
net/bitcoin: Makefile 

Log message:
Unbreak no_x11, missing archivers/zstd dependency, spotted by espie, thanks

Re: The great find(1) cleanup

[Christian Weisgerber]

Tim Kuijsten:

> > Missing type checks should be easily added to every incovation lacking
> > them, they're clearer to read and might even speed things up by
> > preventing direcctory names to be matched against "*.orig" for example.
> 
> I've always thought *not* using -type and matching purely on -name
> is faster because the name is in the directory entry while the type
> is stored in an inode which needs to be be fetched separately...

If you look at the getdents(2) man page, you see that the file type
is part of the directory entry, no additional stat(2) necessary.
I assume that -type is essentially free.  Still, ...

> of course the performance of string comparison depends on the actual
> name you're looking for and the file hierachy.

... I very much doubt that it's worth optimizing this.

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

CVS: cvs.openbsd.org: ports

[Bjorn Ketelaars]

CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2020/03/20 11:52:30

Modified files:
audio/mpd  : Makefile distinfo 

Log message:
Update to mpd-0.21.21

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

OK landry@, kn@

Re: package-specs(7) and alpha releases (was: Re: UPDATE: x11/qt5/qtwebkit)

[Marc Espie]

On Fri, Mar 20, 2020 at 05:16:12PM +, Stuart Henderson wrote:
> On 2020/03/20 17:41, Jeremie Courreges-Anglas wrote:
> > >> only rc[N], beta[N], pre[N], and pl[N]. Would it makes sense to add a
> > >> alpha[N]? We could of course also use EPOCH here.
> > >
> > > adding support for alpha[N] would be in suffix_compare in PackageName.pm
> > > (and from_string), but that would only work (afaik) if the suffix was
> > > directly near the version, ie 5.13.2alpha3 (not 5.13.2-alpha3).
> > 
> > I suspect that the lack of support for alpha[N] is intentional, as in
> > "You should not put alpha-quality software in the ports tree."
> 
> Yes, I think so too.
> 
> > The current situation is that we have ports using alpha releases in the
> > tree, and I see no reason to arbitrarily draw a line between alpha and
> > beta releases.
> > Diff below, not tested much yet.  Thoughts?
> 
> I agree with adding it.
> 
> It wants to go in /usr/src/regress/usr.sbin/pkg_add/check-name and
> packages-specs(7) too, and I think anything currently using "alpha" will
> need an EPOCH bump.
> 
Definitely wants tests.

> 
> > cc'ing espie
> > 
> > 
> > Index: OpenBSD/PackageName.pm
> > ===
> > RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PackageName.pm,v
> > retrieving revision 1.53
> > diff -u -p -r1.53 PackageName.pm
> > --- OpenBSD/PackageName.pm  7 Nov 2019 15:35:23 -   1.53
> > +++ OpenBSD/PackageName.pm  20 Mar 2020 14:48:00 -
> > @@ -153,7 +153,7 @@ sub from_string
> > my ($class, $string) = @_;
> > my $o = bless { deweys => [ split(/\./o, $string) ],
> > suffix => '', suffix_value => 0}, $class;
> > -   if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|beta|pre|pl)(\d*)$/) {
> > +   if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|alpha|beta|pre|pl)(\d*)$/) {
> > $o->{deweys}->[-1] = $1;
> > $o->{suffix} = $2;
> > $o->{suffix_value} = $3;
> > @@ -193,10 +193,13 @@ sub suffix_compare
> > if ($a->{suffix} gt $b->{suffix}) {
> > return -suffix_compare($b, $a);
> > }
> > -   # order is '', beta, pre, rc
> > +   # order is '', alpha, beta, pre, rc
> > # we know that a < b,
> > if ($a->{suffix} eq '') {
> > return 1;
> > +   }
> > +   if ($a->{suffix} eq 'alpha') {
> > +   return -1;
> > }
> > if ($a->{suffix} eq 'beta') {
> > return -1;
> > 
> > 
> > 
> > -- 
> > jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> > 
> 

Re: package-specs(7) and alpha releases (was: Re: UPDATE: x11/qt5/qtwebkit)

[Stuart Henderson]

On 2020/03/20 17:41, Jeremie Courreges-Anglas wrote:
> >> only rc[N], beta[N], pre[N], and pl[N]. Would it makes sense to add a
> >> alpha[N]? We could of course also use EPOCH here.
> >
> > adding support for alpha[N] would be in suffix_compare in PackageName.pm
> > (and from_string), but that would only work (afaik) if the suffix was
> > directly near the version, ie 5.13.2alpha3 (not 5.13.2-alpha3).
> 
> I suspect that the lack of support for alpha[N] is intentional, as in
> "You should not put alpha-quality software in the ports tree."

Yes, I think so too.

> The current situation is that we have ports using alpha releases in the
> tree, and I see no reason to arbitrarily draw a line between alpha and
> beta releases.
> Diff below, not tested much yet.  Thoughts?

I agree with adding it.

It wants to go in /usr/src/regress/usr.sbin/pkg_add/check-name and
packages-specs(7) too, and I think anything currently using "alpha" will
need an EPOCH bump.



> cc'ing espie
> 
> 
> Index: OpenBSD/PackageName.pm
> ===
> RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PackageName.pm,v
> retrieving revision 1.53
> diff -u -p -r1.53 PackageName.pm
> --- OpenBSD/PackageName.pm7 Nov 2019 15:35:23 -   1.53
> +++ OpenBSD/PackageName.pm20 Mar 2020 14:48:00 -
> @@ -153,7 +153,7 @@ sub from_string
>   my ($class, $string) = @_;
>   my $o = bless { deweys => [ split(/\./o, $string) ],
>   suffix => '', suffix_value => 0}, $class;
> - if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|beta|pre|pl)(\d*)$/) {
> + if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|alpha|beta|pre|pl)(\d*)$/) {
>   $o->{deweys}->[-1] = $1;
>   $o->{suffix} = $2;
>   $o->{suffix_value} = $3;
> @@ -193,10 +193,13 @@ sub suffix_compare
>   if ($a->{suffix} gt $b->{suffix}) {
>   return -suffix_compare($b, $a);
>   }
> - # order is '', beta, pre, rc
> + # order is '', alpha, beta, pre, rc
>   # we know that a < b,
>   if ($a->{suffix} eq '') {
>   return 1;
> + }
> + if ($a->{suffix} eq 'alpha') {
> + return -1;
>   }
>   if ($a->{suffix} eq 'beta') {
>   return -1;
> 
> 
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> 

Re: UPDATE: x11/qt5/qtwebkit

[Stuart Henderson]

On 2020/03/20 17:37, Jeremie Courreges-Anglas wrote:
> +-- The following OPTIONAL packages have not been found:

I'd prefer to disable these when noticed in case the relevant port is added 
later..

> + * Dwz (required version >= 0.13)
> +
> We have no dwz package so this looks rather safe.  Your choice.  ;)

If anyone feels like porting this, it looks like it might be quite useful!

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:54:06

Removed files:
x11/kde4/print-manager: Makefile distinfo 
x11/kde4/print-manager/patches: patch-CMakeLists_txt 
patch-libkcups_KCupsConnection_h 
x11/kde4/print-manager/pkg: DESCR PLIST 

Log message:
Remove print-manager, long unhooked

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:53:10

Removed files:
x11/kde4/ktimer: Makefile distinfo 
x11/kde4/ktimer/pkg: DESCR PLIST 

Log message:
Remove ktimer, long unhooked

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:44:31

Removed files:
x11/kde4/poxml : Makefile distinfo 
x11/kde4/poxml/patches: patch-tests_CMakeLists_txt 
x11/kde4/poxml/pkg: DESCR PLIST 

Log message:
Remove poxml, long unhooked

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2020/03/20 10:44:29

Modified files:
audio/exaile   : Makefile 
audio/libgpod  : Makefile 
audio/squeezecenter: Makefile 
books/JVMS : Makefile 
comms/minicom  : Makefile 
converters/lastools: Makefile 
databases/influxdb: Makefile 
databases/mysql-zrm: Makefile 
databases/openldap23: Makefile 
databases/p5-Rose-DB: Makefile 
databases/percona-toolkit: Makefile 
databases/pgfouine: Makefile 
databases/ruby-redis: Makefile 
databases/skytools: Makefile 
devel/arduino  : Makefile 
devel/arduino-makefile: Makefile 
devel/avr/gcc  : Makefile 
devel/cmake: Makefile 
devel/jdk/1.8  : Makefile 
devel/jdk/11   : Makefile 
devel/maven: Makefile 
devel/mingw: Makefile 
devel/ois  : Makefile 
devel/p5-OLE-Storage_Lite: Makefile 
devel/py-bytecodeassembler: Makefile 
devel/py-decoratortools: Makefile 
devel/py-symboltype: Makefile 
devel/ruby-highline: Makefile 
devel/subversion: Makefile 
editors/TeXmacs: Makefile 
emulators/dynagen: Makefile 
emulators/pcsxr: Makefile 
games/bzflag   : Makefile 
games/dungeon  : Makefile 
games/gcompris : Makefile 
games/jag  : Makefile 
games/moonlander: Makefile 
games/neverball: Makefile 
games/openarena: Makefile 
games/pokerth  : Makefile 
games/rocksndiamonds: Makefile 
games/vegastrike/data: Makefile 
games/zangband : Makefile 
geo/qlandkartegt: Makefile 
graphics/GraphicsMagick: Makefile 
graphics/openimageio: Makefile 
graphics/p5-Image-MetaData-JPEG: Makefile 
graphics/povray: Makefile 
graphics/py-matplotlib: Makefile 
graphics/sane-backends: Makefile 
graphics/scratch: Makefile 
japanese/Wnn   : Makefile 
lang/fpc   : Makefile 
lang/jruby : Makefile 
lang/kawa  : Makefile 
lang/racket-minimal: Makefile 
lang/ruby  : Makefile.inc ruby.port.mk 
mail/alpine: Makefile 
mail/dovecot   : Makefile 
mail/dovecot-pigeonhole: Makefile 
mail/exmh2 : Makefile 
mail/kopano/core: Makefile 
mail/mailscanner: Makefile 
mail/sendmail  : Makefile 
mail/z-push: Makefile 
math/freemat   : Makefile 
math/prover9/p9m4: Makefile 
misc/mc: Makefile 
multimedia/libquicktime: Makefile 
multimedia/lives: Makefile 
multimedia/sfml: Makefile 
multimedia/xine-lib: Makefile 
net/apache-activemq: Makefile 
net/argus  : Makefile 
net/argus-clients: Makefile 
net/bitlbee: Makefile 
net/epic4  : Makefile 
net/icinga/web : Makefile 
net/icinga/web2: Makefile 
net/ircd-ratbox: Makefile 
net/librenms   : Makefile 
net/libtorrent : Makefile 
net/maradns: Makefile 
net/mfi: Makefile 
net/netatalk   : Makefile 
net/nfsen  : Makefile 
net/ntp: Makefile 
net/p5-NetPacket: Makefile 
net/php-weathermap: Makefile 
net/pidgin : Makefile 
net/py-zsi : Makefile 
net/rtorrent   : Makefile 
net/samba  : Makefile 
news/trn   : Makefile 
plan9/plan9port: Makefile 
print/foomatic-db: Makefile 
print/ghostscript/gnu: Makefile 
print/hplip: Makefile 
print/lyx  : Makefile 
print/openclipart: Makefile 
print/scribus  : Makefile 
productivity/gbirthday: Makefile 
security/hatchet: Makefile 
sysutils/logstash: Makefile 
sysutils/resmon: Makefile 
textproc/calibre: Makefile 
textproc/groff : Makefile 
textproc/icu4c : Makefile 
www/blogsum: Makefile 
www/kibana : Makefile 
www/larbin : Makefile 
www/moinmoin   : Makefile 
www/p5-HTTP-Message: Makefile 
www/pear   : Makefile 
www/phpldapadmin: Makefile 
www/phpmyadmin : Makefile 
www/py-webob   : Makefile 
www/ruby-passenger: Makefile 
www/sope   : Makefile 
www/syweb  : Makefile 
www/wwwcount   : Makefile 
x11/faba-icon-theme: Makefile 
x11/gammapage  : Makefile 
x11/gnustep/fisicalab: Makefile 
x11/gnustep/neos-theme: Makefile 
x11/gtk2-aurora-engine: Makefile 
x11/gtk2-equinox-engine: Makefile 
x11/kde: kde.port.mk 
x11/kde/base3  : Makefile 
x11/kde4/runtime: Makefile 
x11/py-gtk2: Makefile 
x11/qt3

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:43:41

Removed files:
x11/kde4/lokalize: Makefile distinfo 
x11/kde4/lokalize/pkg: DESCR PLIST 

Log message:
Remove lokalize, long unhooked

package-specs(7) and alpha releases (was: Re: UPDATE: x11/qt5/qtwebkit)

[Jeremie Courreges-Anglas]

On Fri, Mar 20 2020, Landry Breuil  wrote:
> On Fri, Mar 20, 2020 at 07:31:52AM +0100, Rafael Sadowski wrote:
>> On Mon Mar 16, 2020 at 06:17:38AM +0100, Rafael Sadowski wrote:
>> > Simple update qtwebkit to the latest version 5.212.0 Alpha 4:
>> > 
>> > Release log:
>> > - https://github.com/qtwebkit/qtwebkit/releases/tag/qtwebkit-5.212.0-alpha4
>> > 
>> > Port changes:
>> > - Add missing python model after reading release notes "QtWebKit does
>> >   not require Python 2 anymore for building and can use Python 3
>> >   instead"
>> > - removed icu patched, it has been merged upstream.
>> > 
>> > Tested with otter-browser on amd64.
>> > 
>> 
>> I would like to see this in the next release.
>> 
>> > OK?
>> > 
>> > Index: Makefile
>> > ===
>> > RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
>> > retrieving revision 1.19
>> > diff -u -p -u -p -r1.19 Makefile
>> > --- Makefile   25 Feb 2020 14:03:00 -  1.19
>> > +++ Makefile   16 Mar 2020 05:05:27 -
>> > @@ -9,15 +9,15 @@ CATEGORIES = www
>> >  DPB_PROPERTIES =  parallel
>> >  
>> >  VERSION = ${QT5_WEBKIT_VERSION}
>> > -DISTNAME =qtwebkit-${QT5_WEBKIT_VERSION}-alpha3
>> > +DISTNAME =qtwebkit-${QT5_WEBKIT_VERSION}-alpha4
>> >  PKGNAME = qtwebkit-${QT5_WEBKIT_VERSION}
>> > -REVISION =0
>> > +REVISION =1
>> 
>> Any concept howto handle the version bump -alpha3 to -alpha4? We have
>> only rc[N], beta[N], pre[N], and pl[N]. Would it makes sense to add a
>> alpha[N]? We could of course also use EPOCH here.
>
> adding support for alpha[N] would be in suffix_compare in PackageName.pm
> (and from_string), but that would only work (afaik) if the suffix was
> directly near the version, ie 5.13.2alpha3 (not 5.13.2-alpha3).

I suspect that the lack of support for alpha[N] is intentional, as in
"You should not put alpha-quality software in the ports tree."

The current situation is that we have ports using alpha releases in the
tree, and I see no reason to arbitrarily draw a line between alpha and
beta releases.

Diff below, not tested much yet.  Thoughts?
cc'ing espie


Index: OpenBSD/PackageName.pm
===
RCS file: /cvs/src/usr.sbin/pkg_add/OpenBSD/PackageName.pm,v
retrieving revision 1.53
diff -u -p -r1.53 PackageName.pm
--- OpenBSD/PackageName.pm  7 Nov 2019 15:35:23 -   1.53
+++ OpenBSD/PackageName.pm  20 Mar 2020 14:48:00 -
@@ -153,7 +153,7 @@ sub from_string
my ($class, $string) = @_;
my $o = bless { deweys => [ split(/\./o, $string) ],
suffix => '', suffix_value => 0}, $class;
-   if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|beta|pre|pl)(\d*)$/) {
+   if ($o->{deweys}->[-1] =~ m/^(\d+)(rc|alpha|beta|pre|pl)(\d*)$/) {
$o->{deweys}->[-1] = $1;
$o->{suffix} = $2;
$o->{suffix_value} = $3;
@@ -193,10 +193,13 @@ sub suffix_compare
if ($a->{suffix} gt $b->{suffix}) {
return -suffix_compare($b, $a);
}
-   # order is '', beta, pre, rc
+   # order is '', alpha, beta, pre, rc
# we know that a < b,
if ($a->{suffix} eq '') {
return 1;
+   }
+   if ($a->{suffix} eq 'alpha') {
+   return -1;
}
if ($a->{suffix} eq 'beta') {
return -1;



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

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:42:53

Removed files:
x11/kde4/kteatime: Makefile distinfo 
x11/kde4/kteatime/pkg: DESCR PLIST 

Log message:
Remove kteatime, long unhooked

Re: UPDATE: x11/qt5/qtwebkit

[Jeremie Courreges-Anglas]

On Fri, Mar 20 2020, Rafael Sadowski  wrote:
> On Mon Mar 16, 2020 at 06:17:38AM +0100, Rafael Sadowski wrote:
>> Simple update qtwebkit to the latest version 5.212.0 Alpha 4:
>> 
>> Release log:
>> - https://github.com/qtwebkit/qtwebkit/releases/tag/qtwebkit-5.212.0-alpha4
>> 
>> Port changes:
>> - Add missing python model after reading release notes "QtWebKit does
>>   not require Python 2 anymore for building and can use Python 3
>>   instead"
>> - removed icu patched, it has been merged upstream.
>> 
>> Tested with otter-browser on amd64.
>> 
>
> I would like to see this in the next release.

make configure difference:

--8<--

[...]

 -- The C compiler identification is Clang 8.0.1
 -- The CXX compiler identification is Clang 8.0.1
 -- Check for working C compiler: /usr/ports/pobj/qtwebkit-5.212.0/bin/cc
@@ -45,12 +423,15 @@
 -- Found ICU libraries: /usr/local/lib/libicuuc.so.17.0
 -- Found LibXml2: /usr/local/lib/libxml2.so.16.1 (found suitable version 
"2.9.10", minimum required is "2.8.0") 
 -- Found LibXslt: /usr/local/lib/libxslt.so.4.0 (found suitable version 
"1.1.34", minimum required is "1.1.7") 
+-- Could NOT find Dwz (missing: DWZ_EXECUTABLE) (Required is at least version 
"0.13")
 -- Found WebP: /usr/local/include  
 -- Qt OpenGL implementation: GL
 -- Qt OpenGL libraries: Qt5::Gui_GL
 -- Qt EGL libraries: Qt5::Gui_EGL
 -- Performing Test Qt5Gui_PRIVATE_HEADER_FOUND
 -- Performing Test Qt5Gui_PRIVATE_HEADER_FOUND - Success
+-- Performing Test Qt5Network_PRIVATE_HEADER_FOUND
+-- Performing Test Qt5Network_PRIVATE_HEADER_FOUND - Success
 -- Performing Test Qt5Quick_PRIVATE_HEADER_FOUND
 -- Performing Test Qt5Quick_PRIVATE_HEADER_FOUND - Success
 -- Found X11: /usr/X11R6/include   
@@ -127,29 +508,33 @@
  * GStreamer (required version >= 1.0.3)
  * Hyphen
 
+-- The following OPTIONAL packages have not been found:
+
+ * Dwz (required version >= 0.13)
+

[...]

-->8--

We have no dwz package so this looks rather safe.  Your choice.  ;)

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

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:16:01

Removed files:
x11/kde4/dev-scripts: Makefile distinfo 
x11/kde4/dev-scripts/patches: patch-create_makefile 
  patch-create_svnignore 
  patch-doc_man-reportview_1_docbook 
  patch-draw_lib_dependencies 
  patch-kdemangen_pl patch-makeobj 
x11/kde4/dev-scripts/pkg: DESCR PLIST 
x11/kde4/dev-utils: Makefile distinfo 
x11/kde4/dev-utils/patches: patch-kstartperf_CMakeLists_txt 
x11/kde4/dev-utils/pkg: DESCR PLIST 

Log message:
Remove KDE4 dev-*, long unhooked

pkg/PLIST automation

[Martin]

Any automation suggestions for pkg/PLIST create for a new port?

Martin

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:14:05

Removed files:
x11/kde4/krdc  : Makefile distinfo 
x11/kde4/krdc/pkg: DESCR PLIST 
x11/kde4/krfb  : Makefile distinfo 
x11/kde4/krfb/pkg: DESCR PLIST 

Log message:
Remove krdc and krfb, long unhooked

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:12:07

Removed files:
x11/kde4/sdk-thumbnailers: Makefile distinfo 
x11/kde4/sdk-thumbnailers/patches: 
   patch-po_thumbnailer_CMakeLists_txt 
x11/kde4/sdk-thumbnailers/pkg: DESCR PLIST 

Log message:
rm sdk-thumbnailers, long unhooked

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:11:03

Removed files:
x11/kde4/sdk-kioslaves: Makefile distinfo 
x11/kde4/sdk-kioslaves/patches: 
patch-svn_svnhelper_CMakeLists_txt 
x11/kde4/sdk-kioslaves/pkg: DESCR PLIST 

Log message:
Remove sdk-kioslaves, long unhooked

Re: pkg/PLIST automation

[Jeremie Courreges-Anglas]

On Fri, Mar 20 2020, Martin  wrote:
> Any automation suggestions for pkg/PLIST create for a new port?

make plist

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

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:10:09

Removed files:
x11/kde4/kapptemplate: Makefile distinfo 
x11/kde4/kapptemplate/patches: patch-CMakeLists_txt 
   
patch-cmake_modules_KAppTemplateMacro_cmake 
   patch-kapptemplate_desktop 
x11/kde4/kapptemplate/pkg: DESCR PLIST 

Log message:
Remove kapptemplate, long unhooked

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:09:00

Removed files:
x11/kde4/kcachegrind: Makefile distinfo 
x11/kde4/kcachegrind/patches: patch-converters_pprof2calltree 
  patch-libcore_tracedata_cpp 
x11/kde4/kcachegrind/pkg: DESCR PLIST 

Log message:
Remove kcachegrind, long unhooked

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:07:46

Removed files:
x11/kde4/kcharselect: Makefile distinfo 
x11/kde4/kcharselect/pkg: DESCR PLIST 

Log message:
Remove kcharselect, long unhooked

Re: pkg/PLIST automation

[Ingo Schwarze]

Hi Martin,

Martin wrote on Fri, Mar 20, 2020 at 03:59:42PM +:

> Any automation suggestions for pkg/PLIST create for a new port?

Read all of:

  https://www.openbsd.org/faq/ports/guide.html#PortsChecklist 

In this case, the answer to your question is in step 22.

  make update-plist

Yours,
  Ingo

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:06:12

Removed files:
x11/kde4/kdf   : Makefile distinfo 
x11/kde4/kdf/pkg: DESCR PLIST 

Log message:
Remove kdf, long unhooked

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:05:20

Removed files:
x11/kde4/kfloppy: Makefile distinfo 
x11/kde4/kfloppy/patches: patch-floppy_cpp patch-format_cpp 
  patch-format_h 
x11/kde4/kfloppy/pkg: DESCR PLIST 

Log message:
Remove kfloppy, long unhooked

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 10:04:26

Removed files:
x11/kde4/kmix  : Makefile distinfo 
x11/kde4/kmix/patches: patch-CMakeLists_txt 
   patch-apps_kmixremote 
   patch-backends_kmix-backends_cpp 
x11/kde4/kmix/pkg: DESCR PLIST 

Log message:
remove kmix, long unhooked

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/03/20 09:55:56

Modified files:
databases/pecl-redis: Makefile distinfo 
databases/pecl-redis/patches: patch-library_c 

Log message:
update to pecl-redis-5.2.1

Re: UPDATE: KDE Frameworks 5.68.0 and KDE5 19.12 and friends

[Rafael Sadowski]

On Fri Mar 20, 2020 at 03:10:18PM +0100, Landry Breuil wrote:
> On Fri, Mar 20, 2020 at 01:47:48PM +0100, Rafael Sadowski wrote:
> > Hi ports@
> > 
> > After that we reached a stable level with Qt5 5.13.2. We can update our
> > KDE5 universe to the latest stable version. The update diff is pretty
> > simple. Removed some workarounds like Qt5 5.13.2 and so one.
> > 
> > It is still huge and this has the following reasons:
> > 
> > - KF5Auth split into KF5Auth and KF5AuthCore, which ends in a lot of new
> >   WANTLIBs
> > - Upstream changes the xdg path from share/examples/***/xdg/ to
> >   share/qlogging-categories5/, which ends in a lot of PLIST chages.
> 
> another note on this, some dbus-1 files were also previously @sampled
> and its not the case anymore, dunno if that's expected.
> 
> -share/examples/ktexteditor/
> -share/examples/ktexteditor/dbus-1/
>  @sample ${SYSCONFDIR}/xdg/dbus-1/
> -share/examples/ktexteditor/dbus-1/system.d/
>  @sample ${SYSCONFDIR}/xdg/dbus-1/system.d/
> -share/examples/ktexteditor/dbus-1/system.d/org.kde.ktexteditor.katetextbuffer.conf
> -@sample 
> ${SYSCONFDIR}/xdg/dbus-1/system.d/org.kde.ktexteditor.katetextbuffer.conf
> -share/examples/ktexteditor/xdg/
> -share/examples/ktexteditor/xdg/ktexteditor.categories
> -@sample ${SYSCONFDIR}/xdg/ktexteditor.categories
> +share/dbus-1/system.d/org.kde.ktexteditor.katetextbuffer.conf
> 
> missing @sample 
> ${SYSCONFDIR}/xdg/dbus-1/system.d/org.kde.ktexteditor.katetextbuffer.conf 
> here ?

No this is wrong. BTW nice catch! I will go through all @sample changes.

> 
> i note that adding DEBUG_PACKAGES is nice, but how much size penalty does this
> bring to mirrors ? are those debug pkgs useful ? iirc so far cmake failed to
> provide useful debugging syms, so i dont see the point ofadding DEBUG_PACKAGES
> if they're not helpful.

The cmake issues is new for me. Let's remove DEBUG_PACKAGES and enable
it if we need special ports to debug.

> 
> (note: the diff is huge because a large chunk of it is PLIST churn for an 
> icons package)
> 
> Landry
> 

Yeah I know but it's not possible to do it in a nicer way. Thanks for
the review.

Re: UPDATE: KDE Frameworks 5.68.0 and KDE5 19.12 and friends

[Rafael Sadowski]

On Fri Mar 20, 2020 at 03:00:18PM +0100, Landry Breuil wrote:
> On Fri, Mar 20, 2020 at 01:47:48PM +0100, Rafael Sadowski wrote:
> > Hi ports@
> > 
> > After that we reached a stable level with Qt5 5.13.2. We can update our
> > KDE5 universe to the latest stable version. The update diff is pretty
> > simple. Removed some workarounds like Qt5 5.13.2 and so one.
> > 
> > It is still huge and this has the following reasons:
> > 
> > - KF5Auth split into KF5Auth and KF5AuthCore, which ends in a lot of new
> >   WANTLIBs
> > - Upstream changes the xdg path from share/examples/***/xdg/ to
> >   share/qlogging-categories5/, which ends in a lot of PLIST chages.
> 
> previously, those files were @sampled into ${SYSCONFDIR}/xdg, it isnt
> needed anymore ?

ArchLinux don't do this anymore, so I've decided not to do that anymore.

> 
> can you keep the @tag lines at the bottom of the PLIST for consistency ?
> everywhere make update-plist was run, the share/qlogging-categories5/
> lines were added after @tag... or fix make update-plist to properly sort
> its output ?

We have to fix "make update-plist" to do it so.

CVS: cvs.openbsd.org: ports

[Elias M . Mariani]

CVSROOT:/cvs
Module name:ports
Changes by: mari...@cvs.openbsd.org 2020/03/20 08:48:15

Modified files:
textproc   : Makefile 

Log message:
Unhook py-xlrd from Makefile.

CVS: cvs.openbsd.org: ports

[Elias M . Mariani]

CVSROOT:/cvs
Module name:ports
Changes by: mari...@cvs.openbsd.org 2020/03/20 08:48:44

Modified files:
textproc/py-xlrd: Makefile 
textproc/py-xlrd/pkg: PLIST 

Log message:
+ py3-pandas is the only consumer, so removed py2, py3 only port.
+ Taking MAINTAINER (again).

CVS: cvs.openbsd.org: ports

[Elias M . Mariani]

CVSROOT:/cvs
Module name:ports
Changes by: mari...@cvs.openbsd.org 2020/03/20 08:46:47

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

Log message:
Add quirk for py-xlrd.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/03/20 08:30:21

Modified files:
mail/neomutt   : Makefile distinfo 

Log message:
update to neomutt-20200320

Re: UPDATE: KDE Frameworks 5.68.0 and KDE5 19.12 and friends

[Landry Breuil]

On Fri, Mar 20, 2020 at 01:47:48PM +0100, Rafael Sadowski wrote:
> Hi ports@
> 
> After that we reached a stable level with Qt5 5.13.2. We can update our
> KDE5 universe to the latest stable version. The update diff is pretty
> simple. Removed some workarounds like Qt5 5.13.2 and so one.
> 
> It is still huge and this has the following reasons:
> 
> - KF5Auth split into KF5Auth and KF5AuthCore, which ends in a lot of new
>   WANTLIBs
> - Upstream changes the xdg path from share/examples/***/xdg/ to
>   share/qlogging-categories5/, which ends in a lot of PLIST chages.

another note on this, some dbus-1 files were also previously @sampled
and its not the case anymore, dunno if that's expected.

-share/examples/ktexteditor/
-share/examples/ktexteditor/dbus-1/
 @sample ${SYSCONFDIR}/xdg/dbus-1/
-share/examples/ktexteditor/dbus-1/system.d/
 @sample ${SYSCONFDIR}/xdg/dbus-1/system.d/
-share/examples/ktexteditor/dbus-1/system.d/org.kde.ktexteditor.katetextbuffer.conf
-@sample 
${SYSCONFDIR}/xdg/dbus-1/system.d/org.kde.ktexteditor.katetextbuffer.conf
-share/examples/ktexteditor/xdg/
-share/examples/ktexteditor/xdg/ktexteditor.categories
-@sample ${SYSCONFDIR}/xdg/ktexteditor.categories
+share/dbus-1/system.d/org.kde.ktexteditor.katetextbuffer.conf

missing @sample 
${SYSCONFDIR}/xdg/dbus-1/system.d/org.kde.ktexteditor.katetextbuffer.conf here ?

i note that adding DEBUG_PACKAGES is nice, but how much size penalty does this
bring to mirrors ? are those debug pkgs useful ? iirc so far cmake failed to
provide useful debugging syms, so i dont see the point ofadding DEBUG_PACKAGES
if they're not helpful.

(note: the diff is huge because a large chunk of it is PLIST churn for an icons 
package)

Landry

Re: UPDATE: KDE Frameworks 5.68.0 and KDE5 19.12 and friends

[Landry Breuil]

On Fri, Mar 20, 2020 at 01:47:48PM +0100, Rafael Sadowski wrote:
> Hi ports@
> 
> After that we reached a stable level with Qt5 5.13.2. We can update our
> KDE5 universe to the latest stable version. The update diff is pretty
> simple. Removed some workarounds like Qt5 5.13.2 and so one.
> 
> It is still huge and this has the following reasons:
> 
> - KF5Auth split into KF5Auth and KF5AuthCore, which ends in a lot of new
>   WANTLIBs
> - Upstream changes the xdg path from share/examples/***/xdg/ to
>   share/qlogging-categories5/, which ends in a lot of PLIST chages.

previously, those files were @sampled into ${SYSCONFDIR}/xdg, it isnt
needed anymore ?

can you keep the @tag lines at the bottom of the PLIST for consistency ?
everywhere make update-plist was run, the share/qlogging-categories5/
lines were added after @tag... or fix make update-plist to properly sort
its output ?

Re: Update: xtensa-lx106-elf

[Tracey Emery]

On Fri, Mar 20, 2020 at 01:16:17PM +0100, Klemens Nanni wrote:
> On Thu, Mar 19, 2020 at 03:02:26PM -0600, Tracey Emery wrote:
> > Was I right to bump the REVISION on the two subs?
> Bumping gcc is obvoiusly correct because you patched and therefore
> changed the package;  I'm not sure about gdb:  does it's package change
> as well because requires gcc sources at build time?
> 
> If in doubt, bump - it's cheap and avoids problems.
> 

I bumped this because CONFIGURE_ARGS were tweaked to go with the
BUILD_DEPENDS change. It seemed cheap and is a change in flags, which
build flags are mentioned in the porting guide.

> > I built this on amd64, sparc64 (generously borrowed from stsp and setup
> > by jca ... thank you), and i386 platforms.
> OK kn
>  
> > @@ -0,0 +1,17 @@
> > +$OpenBSD$
> > +
> > +Index: gcc/cp/cfns.h
> Please add a comment describing *why* you do this;  *what* often fails
> to add value, but having a reason for patches in the description is
> always helpful and also nice to see during `make patch' output.

Added and mentally noted for future obscure or not obvious patches.

Thanks!

-- 

Tracey Emery

Re: update print/poppler (annoying as always)

[Matthias Kilian]

Hi,

On Sat, Mar 14, 2020 at 04:54:55PM -0700, Greg Steuck wrote:
> 
> > #0  build_goto_dest (document=, action=, 
> > link=0x0) at \
> > /home/ports/pobj/p2/poppler-0.86.1/poppler-0.86.1/glib/poppler-action.cc:348
> >  348  \
> > if (! link->isOk ()) { [Current thread is 1 (process 435846)]
> > (gdb) print link
> > $1 = (const LinkGoTo *) 0x0
> > (gdb) up
> > #1  _poppler_action_new (document=0x280b77b5c00, link=0x2812b023d40, 
> > title= > out>) at 
> > /home/ports/pobj/p2/poppler-0.86.1/poppler-0.86.1/glib/poppler-action.cc:630
> >  \
> > 630 build_goto_dest (document, action, dynamic_cast 
> >  > LinkGoTo *> (link)); (gdb) print link
> > $2 = (const LinkAction *) 0x2812b023d40
> > (gdb)
> 
> > I'm not a C++ magician, especially if it comes to things like that
> > dynamic_cast, but it really looks odd to me that this pointer is
> > NULL in the callee while it's not NULL in the caller.
> 
> I hope I'm not belaboring the obvious here. This condition seems a
> fairly direct result of an unchecked dynamic_cast.  Per C++
> dynamic_cast description:
> 
> "If the cast fails and new-type is a pointer type, it returns a null
> pointer of that type."
> https://en.cppreference.com/w/cpp/language/dynamic_cast
> 
> This just means that the downcast was a mistake, LinkAction* is NOT a
> LinkGoTo*, but some other subclass of LinkAction of which there is a
> bunch:
[...]

There's a commit upstream that just changes all those dynamic_casts to
static_casts (see complete new diff below). Allthough this looks even
more wrong, it doesn't cause a segmentation fault any longer (but maybe
some completely garbaged object?).

[...]

> Out of curiosity, is MALLOC_OPTIONS any help? If repro is easy, maybe
> rebuild on an OS with ASan support and see what you get from that?

No, MALLOC_OPTIONS=S didn't change anyting for me.

So, new diff with that dynamic_cast -> static_cast commit
(68b6dd2ecd868c1a757cb8b9273e2e26687e5229) included, but I'm unsure
what to do. It probably will be in the next release of poppler.

Ciao,
Kili


Index: Makefile
===
RCS file: /cvs/ports/print/poppler/Makefile,v
retrieving revision 1.154
diff -u -p -r1.154 Makefile
--- Makefile22 Feb 2020 18:55:24 -  1.154
+++ Makefile20 Mar 2020 13:08:24 -
@@ -4,7 +4,7 @@ COMMENT-main=   PDF rendering library
 COMMENT-qt5=   Qt5 interface to PDF rendering library
 COMMENT-utils= PDF conversion tools and utilities
 
-V= 0.85.0
+V= 0.86.1
 DISTNAME=  poppler-$V
 CATEGORIES=print
 PKGNAME-main=  poppler-$V
@@ -16,10 +16,10 @@ REVISION-qt5=   0
 
 EXTRACT_SUFX=  .tar.xz
 
-SHARED_LIBS += poppler  60.0 # 95.0
+SHARED_LIBS += poppler  61.0 # 97.0
 SHARED_LIBS += poppler-glib 19.4 # 8.15
-SHARED_LIBS += poppler-qt5  8.1  # 1.22
-SHARED_LIBS += poppler-cpp  15.0 # 0.7
+SHARED_LIBS += poppler-qt5  8.2  # 1.22
+SHARED_LIBS += poppler-cpp  16.0 # 0.7
 
 HOMEPAGE=  https://poppler.freedesktop.org/
 
Index: distinfo
===
RCS file: /cvs/ports/print/poppler/distinfo,v
retrieving revision 1.80
diff -u -p -r1.80 distinfo
--- distinfo17 Feb 2020 20:33:00 -  1.80
+++ distinfo20 Mar 2020 13:08:24 -
@@ -1,2 +1,2 @@
-SHA256 (poppler-0.85.0.tar.xz) = K8h16zIwAq5rKH4JmARzUY4rLta1t9LhCJ42ps0A2Us=
-SIZE (poppler-0.85.0.tar.xz) = 1588616
+SHA256 (poppler-0.86.1.tar.xz) = r2MKJ3yOGUwxM5xURiQYNK7W7T1LTccIAxHlHGYlf2w=
+SIZE (poppler-0.86.1.tar.xz) = 1593856
Index: patches/patch-glib_poppler-action_cc
===
RCS file: patches/patch-glib_poppler-action_cc
diff -N patches/patch-glib_poppler-action_cc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-glib_poppler-action_cc20 Mar 2020 13:08:24 -
@@ -0,0 +1,58 @@
+$OpenBSD$
+
+Upstream commit 68b6dd2ecd868c1a757cb8b9273e2e26687e5229:
+Replace dynamic_cast by static_cast where we already perform the
+type checks explicitly before downcasting.
+
+Index: glib/poppler-action.cc
+--- glib/poppler-action.cc.orig
 glib/poppler-action.cc
+@@ -627,39 +627,39 @@ _poppler_action_new (PopplerDocument *document,
+   switch (link->getKind ()) {
+   case actionGoTo:
+   action->type = POPPLER_ACTION_GOTO_DEST;
+-  build_goto_dest (document, action, dynamic_cast  (link));
++  build_goto_dest (document, action, static_cast  (link));
+   break;
+   case actionGoToR:
+   action->type = POPPLER_ACTION_GOTO_REMOTE;
+-  build_goto_remote (action, dynamic_cast  
(link));
++  build_goto_remote (action, static_cast  
(link));
+   break;
+   case actionLaunch:
+   action->type = POPPLER_ACTION_LAUNCH;
+-  build_launch (action, 

Re: UPDATE audio/mpd-0.21.21

[Klemens Nanni]

OK kn

Re: sparc64 bulk build report

[Jeremie Courreges-Anglas]

On Fri, Mar 20 2020, Stuart Henderson  wrote:
> On 2020/03/20 01:55, k...@openbsd.org wrote:
>> http://build-failures.rhaalovely.net/sparc64/2020-03-17/telephony/iaxclient.log
>
> Build fails on sparc64, but in such a way that makes me think it's not going 
> to
> be working properly on other arches too. sebastia@ (or anyone else), can you
> confirm if this still runs OK (actual use, not just startup) on amd64 etc?
>
> From the log
>
> : .libs/libiaxclient.so.0.0: undefined reference to `avcodec_encode_video'
> : .libs/libiaxclient.so.0.0: undefined reference to `avcodec_alloc_frame'
> : collect2: error: ld returned 1 exit status
> : Error while executing cc -o
> .libs/testcall -pthread -O2 -pipe -I/usr/local/include -DALLOW_SMP_DANGERS
> testcall.o -L.libs -lossaudio -liaxclient -lportaudio -lsndio -lm -lpthread 
> -lspeex -lspeexdsp -lvidcap -lgsm -logg -ltheora -lavcodec -ltheoradec 
> -lvorbis -Wl,-rpath-link,/usr/local/lib
>
> I think that this would have been broken by an ffmpeg update at some
> point and that it will likely be broken at runtime when trying to call
> those functions on amd64 too (of course the build fails if you use
> USE_LLD=No on amd64).

Yes.  Looks like this would need a move to av_frame_alloc (one call site
is already patched) and avcodec_encode_video2 (needs some thoughts).

I last touched this port because the iaxcomm subpackage didn't build
with wxWidgets 3 any more, back then I already wondered whether it made
sense to keep it on life support.  After all, this is beta software from
2008, that needs frequent patching for ffmpeg updates.

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

Re: aircrack-ng-1.5.2p2 free(): chunk canary corrupted 0x11a3c50e6c00 0x2ac@0x2ac

[Klemens Nanni]

On Fri, Mar 20, 2020 at 10:33:51AM +, Martin wrote:
> Tried with GDB from ports, no debugging symbols found.
There is no debug-aircrack-ng package yet;  you could work on that or
simply rebuild the port with DEBUG='-g' to get an executable with
symbols you can load from egdb using `symbol-file FILE'.

> On Tuesday, March 10, 2020 2:16 PM, Martin  wrote:
> 
> > It seems malloc problem. aircrack-ng from packages.
> >
> > 6.6-current amd64 setting is:
> >
> > /etc/sysctl.conf
> > vm.malloc_conf=CF
> >
> > Should I set different malloc rule or is it a bug?
>From malloc(3):

 If a program changes behavior if any of these options (except X) are
 used, it is buggy.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/03/20 06:19:42

Modified files:
graphics/libexif: Makefile distinfo 
graphics/libexif/pkg: PLIST 

Log message:
update graphics/libexif: it has been a long time since the last
release, various security bugs fixed, upstream know they need to make
a release, but it now seems mostly blocked by wanting CVE numbers
(https://github.com/libexif/libexif/issues/12, sigh...) so let's
just move to a git checkout for now.

Re: Update: xtensa-lx106-elf

[Klemens Nanni]

On Thu, Mar 19, 2020 at 03:02:26PM -0600, Tracey Emery wrote:
> Was I right to bump the REVISION on the two subs?
Bumping gcc is obvoiusly correct because you patched and therefore
changed the package;  I'm not sure about gdb:  does it's package change
as well because requires gcc sources at build time?

If in doubt, bump - it's cheap and avoids problems.

> I built this on amd64, sparc64 (generously borrowed from stsp and setup
> by jca ... thank you), and i386 platforms.
OK kn
 
> @@ -0,0 +1,17 @@
> +$OpenBSD$
> +
> +Index: gcc/cp/cfns.h
Please add a comment describing *why* you do this;  *what* often fails
to add value, but having a reason for patches in the description is
always helpful and also nice to see during `make patch' output.

CVS: cvs.openbsd.org: ports

[Klemens Nanni]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/03/20 06:09:52

Modified files:
x11/kde4   : kde4.port.mk 

Log message:
Default SEPARATE_BUILD to "Yes" not "flavored"

bsd.port.mk(5) checks for "Yes" and "No" only.

OK rsadowski

Re: The great find(1) cleanup

[Tim Kuijsten]

> Missing type checks should be easily added to every incovation lacking
> them, they're clearer to read and might even speed things up by
> preventing direcctory names to be matched against "*.orig" for example.
> 
> When both primaries are present, `-type' should occur first for similar
> reasons: if you're looking for files with specific names, you don't want
> to string compare names first only to discard the file later on because
> it is a directory or symbolic link;  some invocations do `-name' before
> `-type' and I'd argue that swapping their order is both safe to do and
> actually a bit faster (for big file trees (with slow I/O)).

I've always thought *not* using -type and matching purely on -name
is faster because the name is in the directory entry while the type
is stored in an inode which needs to be be fetched separately...
of course the performance of string comparison depends on the actual
name you're looking for and the file hierachy.

Re: UPDATE: devel/py-rope 0.12.0 to 0.16.0

[Elias M. Mariani]

Uff...
You are right...
The worst thing is that I had already done this for py-wurlitzer with
those tweaks...
My bad, thanks for checking.

Committed.
Cheers.
Elias.

On Fri, Mar 20, 2020 at 2:02 AM Bjorn Ketelaars  wrote:
>
> On Thu 19/03/2020 21:27, Elias M. Mariani wrote:
> > + Mostly bugfixes.
> > + GPLv2 to LGPLv3+.
> > + spyder3 is the only consumer, so removed py2, py3 only port. (I will
> > unhook py2 from devel/Makefile later).
> > + spyder3 tested, no problems found.
> > + Taking MAINTAINER (again).
> >
> > - Some test failing, the same as in 0.12.0, probably related to docs:
> > FAILED (failures=8, skipped=14)
> > I will check them out when I have more time.
> >
> > OK?
> >
> > Cheers.
> > Elias mariani@
>
> Two comments:
>
> - FLAVOR?=python3 in MAKEFILE should be FLAVOR=python3
> - missing @pkgpath- and @conflict- marker in PLIST
>
> See diff below.
>
> With these OK bket@
>
> Please, do not forget to do a quirks for it.
>
>
> diff --git Makefile Makefile
> index bab36f915c8..ca6967d946d 100644
> --- Makefile
> +++ Makefile
> @@ -2,16 +2,17 @@
>
>  COMMENT =  refactoring library
>
> -MODPY_EGG_VERSION =0.12.0
> +MODPY_EGG_VERSION =0.16.0
>  DISTNAME = rope-${MODPY_EGG_VERSION}
>  PKGNAME =  py-${DISTNAME}
> -REVISION = 1
>
>  CATEGORIES =   devel
>
>  HOMEPAGE = https://github.com/python-rope/rope
>
> -# GPLv2
> +MAINTAINER =   Elias M. Mariani 
> +
> +# LGPLv3+
>  PERMIT_PACKAGE =   Yes
>
>  MODULES =  lang/python
> @@ -19,10 +20,6 @@ MODPY_PI =   Yes
>  MODPY_SETUPTOOLS = Yes
>
>  FLAVORS =  python3
> -FLAVOR ?=
> -
> -.if !${FLAVOR:Mpython3}
> -TEST_DEPENDS +=devel/py-unittest2
> -.endif
> +FLAVOR =   python3
>
>  .include 
> diff --git distinfo distinfo
> index 62c530b498f..abe4fb5f41c 100644
> --- distinfo
> +++ distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (rope-0.12.0.tar.gz) = Ax61Sz7uyJ9DBO3oFple0rk6Ieb7oWvQKv8QoNbCV7c=
> -SIZE (rope-0.12.0.tar.gz) = 246543
> +SHA256 (rope-0.16.0.tar.gz) = 0oMBQsLgRvX8JqAi/mgGdbb0j4HH/B8DqVBwbnRunf4=
> +SIZE (rope-0.16.0.tar.gz) = 243304
> diff --git pkg/PLIST pkg/PLIST
> index 3adfac9f7bc..f442dfe6f44 100644
> --- pkg/PLIST
> +++ pkg/PLIST
> @@ -1,9 +1,12 @@
>  @comment $OpenBSD: PLIST,v 1.3 2018/04/26 20:29:26 danj Exp $
> +@conflict py-rope-*
> +@pkgpath devel/py-rope
>  lib/python${MODPY_VERSION}/site-packages/rope/
>  
> lib/python${MODPY_VERSION}/site-packages/rope-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
>  
> lib/python${MODPY_VERSION}/site-packages/rope-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
>  
> lib/python${MODPY_VERSION}/site-packages/rope-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
>  
> lib/python${MODPY_VERSION}/site-packages/rope-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
> +lib/python${MODPY_VERSION}/site-packages/rope-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt
>  
> lib/python${MODPY_VERSION}/site-packages/rope-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
>  lib/python${MODPY_VERSION}/site-packages/rope/__init__.py
>  
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/rope/${MODPY_PYCACHE}/

Re: CVS: cvs.openbsd.org: ports

[Elias M. Mariani]

Wrong mail picking...
THIS should be:
Unhook py-rope from Makefile.

On Fri, Mar 20, 2020 at 8:40 AM Elias M. Mariani  wrote:
>
> CVSROOT:/cvs
> Module name:ports
> Changes by: mari...@cvs.openbsd.org 2020/03/20 05:39:36
>
> Modified files:
> devel  : Makefile
>
> Log message:
> Add quirk for py-rope.
>

Re: CVS: cvs.openbsd.org: ports

[Elias M. Mariani]

This should be:
Unhook py-rope from Makefile.

On Sat, Mar 7, 2020 at 10:32 PM Elias M. Mariani  wrote:
>
> CVSROOT:/cvs
> Module name:ports
> Changes by: mari...@cvs.openbsd.org 2020/03/07 18:32:16
>
> Modified files:
> devel  : Makefile
>
> Log message:
> Unhook py-wurlitzer from Makefile.
>

CVS: cvs.openbsd.org: ports

[Elias M . Mariani]

CVSROOT:/cvs
Module name:ports
Changes by: mari...@cvs.openbsd.org 2020/03/20 05:46:06

Modified files:
devel/py-rope  : Makefile distinfo 
devel/py-rope/pkg: PLIST 

Log message:
UPDATE: devel/py-rope 0.12.0 to 0.16.0

+ Mostly bugfixes.
+ GPLv2 to LGPLv3+.
+ spyder3 is the only consumer, so removed py2, py3 only port.
+ spyder3 tested, no problems found.
+ Taking MAINTAINER (again).

OK bket@ with modifications.

CVS: cvs.openbsd.org: ports

[Elias M . Mariani]

CVSROOT:/cvs
Module name:ports
Changes by: mari...@cvs.openbsd.org 2020/03/20 05:39:36

Modified files:
devel  : Makefile 

Log message:
Add quirk for py-rope.

CVS: cvs.openbsd.org: ports

[Elias M . Mariani]

CVSROOT:/cvs
Module name:ports
Changes by: mari...@cvs.openbsd.org 2020/03/20 05:37:20

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

Log message:
Add quirk for py-rope.

Re: aircrack-ng-1.5.2p2 free(): chunk canary corrupted 0x11a3c50e6c00 0x2ac@0x2ac

[Martin]

Tried with GDB from ports, no debugging symbols found.

GNU gdb (GDB) 7.12.1
Copyright (C) 2017 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later 
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.  Type "show copying"
and "show warranty" for details.
This GDB was configured as "x86_64-unknown-openbsd6.6".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
.
Find the GDB manual and other documentation resources online at:
.
For help, type "help".
Type "apropos word" to search for commands related to "word"...
Reading symbols from /usr/local/sbin/airodump-ng...(no debugging symbols 
found)...done.
[New process 607568]
Core was generated by `airodump-ng'.
Program terminated with signal SIGABRT, Aborted.
#0  thrkill () at -:3
(gdb) quit

‐‐‐ Original Message ‐‐‐
On Tuesday, March 10, 2020 2:16 PM, Martin  wrote:

> It seems malloc problem. aircrack-ng from packages.
>
> 6.6-current amd64 setting is:
>
> /etc/sysctl.conf
> vm.malloc_conf=CF
>
> Should I set different malloc rule or is it a bug?
>
> Martin

CVS: cvs.openbsd.org: ports

[Joel Sing]

CVSROOT:/cvs
Module name:ports
Changes by: js...@cvs.openbsd.org   2020/03/20 05:23:08

Modified files:
lang/go: Makefile distinfo 

Log message:
Update lang/go binary bootstrap to a version that contains no ops following
swi instructions on openbsd/arm.

Re: sparc64 bulk build report

[Stuart Henderson]

On 2020/03/20 01:55, k...@openbsd.org wrote:
> http://build-failures.rhaalovely.net/sparc64/2020-03-17/telephony/iaxclient.log

Build fails on sparc64, but in such a way that makes me think it's not going to
be working properly on other arches too. sebastia@ (or anyone else), can you
confirm if this still runs OK (actual use, not just startup) on amd64 etc?

>From the log

: .libs/libiaxclient.so.0.0: undefined reference to `avcodec_encode_video'
: .libs/libiaxclient.so.0.0: undefined reference to `avcodec_alloc_frame'
: collect2: error: ld returned 1 exit status
: Error while executing cc -o .libs/testcall -pthread -O2 -pipe 
-I/usr/local/include -DALLOW_SMP_DANGERS testcall.o -L.libs -lossaudio 
-liaxclient -lportaudio -lsndio -lm -lpthread -lspeex -lspeexdsp -lvidcap -lgsm 
-logg -ltheora -lavcodec -ltheoradec -lvorbis -Wl,-rpath-link,/usr/local/lib

I think that this would have been broken by an ffmpeg update at some
point and that it will likely be broken at runtime when trying to call
those functions on amd64 too (of course the build fails if you use
USE_LLD=No on amd64).

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/03/20 04:51:21

Modified files:
telephony/astmanproxy: Makefile distinfo 
telephony/astmanproxy/patches: patch-Makefile 
   patch-configs_astmanproxy_conf 
   patch-configs_ssl_conf 
   patch-src_astmanproxy_c 
   patch-src_include_endian_h 
telephony/astmanproxy/pkg: PLIST 

Log message:
astmanproxy: update to a very slightly newer version, switch from self-rolled 
tarball
to GH_*, tidy makefile and patches. (there's a slightly more active fork that 
fixes a
few things but needs fixing to not use gnu extensions :/)

CVS: cvs.openbsd.org: ports

[Joel Sing]

CVSROOT:/cvs
Module name:ports
Changes by: js...@cvs.openbsd.org   2020/03/20 03:04:07

Modified files:
lang/go: Makefile distinfo 
lang/go/pkg: PLIST 

Log message:
Update lang/go to 1.13.9.

Re: The great find(1) cleanup

[Marc Espie]

On Thu, Mar 19, 2020 at 10:38:30PM +0100, Christian Weisgerber wrote:
> Make use of "find -exec {} +" (which is POSIX) and "find -delete"
> (which is not) throughout the ports Makefiles.
> 
> Specifically:
> 
> * Replace find|xargs with find -exec {} +
>   find|xargs is an outdated construct.  The -exec {} + invocation
>   automatically avoids a number of corner cases (see xargs -0, -r).
>   Also, since the exit status of the left-hand side of a pipe is
>   ignored, find|xargs hides some problem.
> 
> * Replace -exec {} \; with -exec {} + if applicable.
>   Calling a command a few times with many arguments is simply more
>   efficient than calling it many times with a single argument.
> 
> * Use the -delete operator to remove files and empty directories.
>   I'm ambivalent about this since it isn't POSIX, but people seem
>   to like it.
> 
> I also combined and tweaked some find(1) invocations while there.
> 
> The patch touches 136 files, so it's possible a mistake has slipped
> in, but it successfully passed an amd64 bulk build.
> 
> x11/qt5/Makefile.inc runs find(1) on directories that don't exist
> in all qt5/* ports.  Previously the find|xargs construct accidentally
> hid the find errors.  I went with -find here, i.e., use make's "-"
> to ignore any non-zero exit status.
> 
> OK?

Yes.

I'm definitely responsible for some of the old cruft.

To my defense, it probably predates -exec {} + (2012) and -delete (2017) :)

CVS: cvs.openbsd.org: ports

[Joel Sing]

CVSROOT:/cvs
Module name:ports
Changes by: js...@cvs.openbsd.org   2020/03/20 02:02:29

Modified files:
lang/go: Makefile 
Added files:
lang/go/patches: patch-src_runtime_sys_openbsd_arm_s 
 patch-src_syscall_asm_openbsd_arm_s 

Log message:
Add two no op instructions following swi for Go on openbsd/arm.

arm processors have the same speculative execution flaw that occurs across
a syscall boundary, which was previously addressed in the arm64 port.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2020/03/20 02:01:47

Modified files:
x11/retrosmart-icon-theme: Makefile 
Added files:
x11/retrosmart-icon-theme/patches: patch-configure 

Log message:
Remove dependency on bash by applying a patch from
https://github.com/mdomlop/retrosmart-icon-theme/commit/e811b96c3235685a13af9de9b971ab0e98f0530e

allows to remove handrolled do-configure, and drop MAKE_FILE while here.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/03/20 01:59:02

Modified files:
sysutils/terraform/provider-alicloud: Makefile distinfo 
sysutils/terraform/provider-digitalocean: Makefile distinfo 
sysutils/terraform/provider-ns1: Makefile distinfo 
sysutils/terraform/provider-pagerduty: Makefile distinfo 

Log message:
Update terraform provider.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/03/20 01:58:05

Modified files:
sysutils/terragrunt: Makefile distinfo 

Log message:
Update to terragrunt-0.23.2.

sparc64 bulk build report

[kmos]

Bulk build on sparc64-0.ports.openbsd.org

Started : Tue Mar 17 10:54:38 MDT 2020
Finished: Fri Mar 20 00:04:39 MDT 2020
Duration: 2 Days 13 hours 10 minutes

Built using OpenBSD 6.6-current (GENERIC.MP) #246: Sun Mar 15 20:03:10 MDT 2020

Built 10031 packages

Number of packages built each day:
Mar 17: 7178
Mar 18: 2105
Mar 19: 747
Mar 20: 1



Critical path missing pkgs:
http://build-failures.rhaalovely.net/sparc64/2020-03-17/summary.log

Build failures: 21
http://build-failures.rhaalovely.net/sparc64/2020-03-17/cad/qucs.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/devel/xtensa-esp32-elf/gcc-bootstrap.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/devel/xtensa-lx106-elf/gcc.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/emulators/BasiliskII.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/games/xevil.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/geo/qgis.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/graphics/colord-gtk.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/mail/kopano/core.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/math/py-scikit-learn.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/misc/dtcltiny.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/net/dleyna/renderer.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/net/dleyna/server.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/net/telegram-purple.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/productivity/gnucash.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/telephony/iaxclient.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/x11/gnome/builder.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/x11/gnome/mutter.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/x11/gtk+4,-cloudprint.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/x11/libdbus-c++.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/x11/libhandy.log
http://build-failures.rhaalovely.net/sparc64/2020-03-17/x11/tigervnc.log

Recurrent failures:
 failures/cad/qucs.log
 failures/devel/xtensa-esp32-elf/gcc-bootstrap.log
 failures/devel/xtensa-lx106-elf/gcc.log
 failures/games/xevil.log
 failures/math/py-scikit-learn.log
 failures/x11/libdbus-c++.log
 failures/x11/tigervnc.log

New failures:
+failures/emulators/BasiliskII.log
+failures/geo/qgis.log
+failures/graphics/colord-gtk.log
+failures/mail/kopano/core.log
+failures/misc/dtcltiny.log
+failures/net/dleyna/renderer.log
+failures/net/dleyna/server.log
+failures/net/telegram-purple.log
+failures/productivity/gnucash.log
+failures/telephony/iaxclient.log
+failures/x11/gnome/builder.log
+failures/x11/gnome/mutter.log
+failures/x11/gtk+4,-cloudprint.log
+failures/x11/libhandy.log

Resolved failures:
-failures/lang/rust.log
-failures/net/wiresep.log
-failures/print/texlive/texmf,-buildset.log

Packages newly built:
+archivers/pecl-lzf,php72
+archivers/pecl-lzf,php73
+archivers/pecl-rar,php72
+archivers/quazip
+astro/celestia
+astro/kstars
+astro/stellarium
+audio/ario
+audio/audacious
+audio/audacious-plugins
+audio/audacity
+audio/calf
+audio/cantata
+audio/clementine
+audio/deadbeef
+audio/disc-cover
+audio/easytag
+audio/exaile
+audio/gimmix
+audio/gmpc
+audio/gmpc-plugins
+audio/gqmpeg
+audio/gradio
+audio/grip
+audio/gsound
+audio/gtkpod
+audio/hydrogen
+audio/libcanberra
+audio/libcanberra,-gtk
+audio/libcanberra,-gtk3
+audio/libcanberra,-main
+audio/liblastfm
+audio/lmms
+audio/mp3cddb
+audio/mp3info
+audio/mp3splt-gtk
+audio/mscore
+audio/mumble
+audio/musique
+audio/ncspot
+audio/p5-gnupod
+audio/parlatype
+audio/pavucontrol
+audio/pithos
+audio/potamus
+audio/puddletag
+audio/pykaraoke
+audio/pympd
+audio/qsynth
+audio/quodlibet
+audio/radiotray
+audio/rgain
+audio/solfege
+audio/sonata
+audio/soundtracker
+audio/tagtool
+audio/timidity,gtk2
+audio/xhippo
+benchmarks/netperf-wrapper
+benchmarks/netperf-wrapper,-main
+benchmarks/tsung
+biology/bioperl
+biology/p5-Bio-ASN1-EntrezGene
+books/tex-by-topic
+cad/fritzing
+cad/geda-gaf
+cad/gerbv
+cad/gtkwave
+cad/librecad
+cad/opensta
+cad/pcb
+cad/qcad
+cad/qelectrotech
+cad/qucs-s
+cad/xnecview
+cad/yosys
+chinese/libchewing
+comms/amtterm
+comms/amtterm,-main
+comms/amtterm,-term
+comms/chirp
+comms/gammu
+comms/gmfsk
+comms/gnuradio
+comms/gpsk31
+comms/jpilot
+comms/pterm
+comms/py-gammu
+comms/sigrok/libsigrok
+comms/sigrok/pulseview
+comms/sigrok/sigrok-cli
+comms/wammu
+comms/xdx
+comms/xlog
+converters/libpst
+converters/libpst,-main
+converters/libpst,-python
+converters/wv
+databases/evolution-data-server
+databases/freetds
+databases/gq
+databases/iodbc
+databases/iodbc,-admin
+databases/iodbc,-main
+databases/kdb
+databases/kexi
+databases/libdbi-drivers
+databases/libdbi-drivers,-freetds
+databases/libdbi-drivers,-main
+databases/libdbi-drivers,-pgsql
+databases/libdbi-drivers,-sqlite
+databases/libdbi-drivers,-sqlite3
+databases/mdbtools

CVS: cvs.openbsd.org: ports

[Remi Pointel]

CVSROOT:/cvs
Module name:ports
Changes by: rpoin...@cvs.openbsd.org2020/03/20 01:47:24

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

Log message:
+   'py-bencode' => 'py3-bencode',
+   'py-dfwinreg' => 'py3-dfwinreg',
+   'py-dfvfs' => 'py3-dfvfs',
+   'py-dfdatetime' => 'py3-dfdatetime',
+   'py-artifacts' => 'py3-artifacts',

ok landry@.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/03/20 01:38:57

Modified files:
sysutils/consul: Makefile distinfo 

Log message:
Update to consul-1.7.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/03/20 01:39:08

Modified files:
sysutils/terraform/provider-aws: Makefile distinfo 

Log message:
Update to terraform-provider-aws-2.54.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/03/20 01:29:56

Modified files:
sysutils/terraform/terraform: Makefile distinfo 

Log message:
Update to terraform-0.12.24.

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2020/03/20 01:20:57

Modified files:
x11: Makefile 

Log message:
+retrosmart-icon-theme, even if there will be no pkgs on the mirrors..

CVS: cvs.openbsd.org: ports

[Landry Breuil]

CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2020/03/20 01:10:29

Log message:
Import retrosmart-icon-theme

Retrosmart icon theme is a set of icons mainly based on the Haiku OS look.
Mainly the icons were taked from that project (with MIT license, and 
therefore
GPL compatible), some others were created from scratch or crafted from 
*other
forgotten sources* in the internet (with unknown licenses).

thus, set PERMIT_PACKAGE=Unsure .. discussed with sthen@
ok solene@

Status:

Vendor Tag: landry
Release Tags:   landry_20200320

N ports/x11/retrosmart-icon-theme/Makefile
N ports/x11/retrosmart-icon-theme/distinfo
N ports/x11/retrosmart-icon-theme/pkg/DESCR
N ports/x11/retrosmart-icon-theme/pkg/PLIST
N ports/x11/retrosmart-icon-theme/patches/patch-makefile_mk
N 
ports/x11/retrosmart-icon-theme/patches/patch-src_applications-development_links

No conflicts created by this import

Re: UPDATE: x11/qt5/qtwebkit

[Landry Breuil]

On Fri, Mar 20, 2020 at 07:31:52AM +0100, Rafael Sadowski wrote:
> On Mon Mar 16, 2020 at 06:17:38AM +0100, Rafael Sadowski wrote:
> > Simple update qtwebkit to the latest version 5.212.0 Alpha 4:
> > 
> > Release log:
> > - https://github.com/qtwebkit/qtwebkit/releases/tag/qtwebkit-5.212.0-alpha4
> > 
> > Port changes:
> > - Add missing python model after reading release notes "QtWebKit does
> >   not require Python 2 anymore for building and can use Python 3
> >   instead"
> > - removed icu patched, it has been merged upstream.
> > 
> > Tested with otter-browser on amd64.
> > 
> 
> I would like to see this in the next release.
> 
> > OK?
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
> > retrieving revision 1.19
> > diff -u -p -u -p -r1.19 Makefile
> > --- Makefile25 Feb 2020 14:03:00 -  1.19
> > +++ Makefile16 Mar 2020 05:05:27 -
> > @@ -9,15 +9,15 @@ CATEGORIES =  www
> >  DPB_PROPERTIES =   parallel
> >  
> >  VERSION =  ${QT5_WEBKIT_VERSION}
> > -DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha3
> > +DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha4
> >  PKGNAME =  qtwebkit-${QT5_WEBKIT_VERSION}
> > -REVISION = 0
> > +REVISION = 1
> 
> Any concept howto handle the version bump -alpha3 to -alpha4? We have
> only rc[N], beta[N], pre[N], and pl[N]. Would it makes sense to add a
> alpha[N]? We could of course also use EPOCH here.

adding support for alpha[N] would be in suffix_compare in PackageName.pm
(and from_string), but that would only work (afaik) if the suffix was
directly near the version, ie 5.13.2alpha3 (not 5.13.2-alpha3).

Re: The great find(1) cleanup

[Rafael Sadowski]

On Thu Mar 19, 2020 at 10:38:30PM +0100, Christian Weisgerber wrote:
> Make use of "find -exec {} +" (which is POSIX) and "find -delete"
> (which is not) throughout the ports Makefiles.
> 
> Specifically:
> 
> * Replace find|xargs with find -exec {} +
>   find|xargs is an outdated construct.  The -exec {} + invocation
>   automatically avoids a number of corner cases (see xargs -0, -r).
>   Also, since the exit status of the left-hand side of a pipe is
>   ignored, find|xargs hides some problem.
> 
> * Replace -exec {} \; with -exec {} + if applicable.
>   Calling a command a few times with many arguments is simply more
>   efficient than calling it many times with a single argument.
> 
> * Use the -delete operator to remove files and empty directories.
>   I'm ambivalent about this since it isn't POSIX, but people seem
>   to like it.
> 
> I also combined and tweaked some find(1) invocations while there.
> 
> The patch touches 136 files, so it's possible a mistake has slipped
> in, but it successfully passed an amd64 bulk build.
> 
> x11/qt5/Makefile.inc runs find(1) on directories that don't exist
> in all qt5/* ports.  Previously the find|xargs construct accidentally
> hid the find errors.  I went with -find here, i.e., use make's "-"
> to ignore any non-zero exit status.
> 
> OK?
> 

I like it and reads fine. OK rsadowski@

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 00:35:34

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

Log message:
Update picard to 2.3.1

Re: kde4.port.mk: Set SEPARATE_BUILD to Yes not flavored

[Rafael Sadowski]

On Thu Mar 19, 2020 at 10:17:32PM +0100, Klemens Nanni wrote:
> 
> It's either "Yes" or "No" these days and I fail to spot ports
> infrastructure code that still expects anything else.
> 
> Feedback? OK?
> 

Make sense, ok rsadowski@

> 
> 
> Index: kde4.port.mk
> ===
> RCS file: /cvs/ports/x11/kde4/kde4.port.mk,v
> retrieving revision 1.40
> diff -u -p -r1.40 kde4.port.mk
> --- kde4.port.mk  12 May 2018 12:07:07 -  1.40
> +++ kde4.port.mk  19 Mar 2020 21:15:28 -
> @@ -70,7 +70,7 @@ CONFIGURE_STYLE =   cmake
>  
>  .   if ${CONFIGURE_STYLE:Mcmake}
>  MODULES +=   devel/cmake
> -SEPARATE_BUILD ?=flavored
> +SEPARATE_BUILD ?=Yes
>  .   endif
>  .endif
>  
> 

Re: UPDATE: x11/qt5/qtwebkit

[Rafael Sadowski]

On Mon Mar 16, 2020 at 06:17:38AM +0100, Rafael Sadowski wrote:
> Simple update qtwebkit to the latest version 5.212.0 Alpha 4:
> 
> Release log:
> - https://github.com/qtwebkit/qtwebkit/releases/tag/qtwebkit-5.212.0-alpha4
> 
> Port changes:
> - Add missing python model after reading release notes "QtWebKit does
>   not require Python 2 anymore for building and can use Python 3
>   instead"
> - removed icu patched, it has been merged upstream.
> 
> Tested with otter-browser on amd64.
> 

I would like to see this in the next release.

> OK?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
> retrieving revision 1.19
> diff -u -p -u -p -r1.19 Makefile
> --- Makefile  25 Feb 2020 14:03:00 -  1.19
> +++ Makefile  16 Mar 2020 05:05:27 -
> @@ -9,15 +9,15 @@ CATEGORIES =www
>  DPB_PROPERTIES = parallel
>  
>  VERSION =${QT5_WEBKIT_VERSION}
> -DISTNAME =   qtwebkit-${QT5_WEBKIT_VERSION}-alpha3
> +DISTNAME =   qtwebkit-${QT5_WEBKIT_VERSION}-alpha4
>  PKGNAME =qtwebkit-${QT5_WEBKIT_VERSION}
> -REVISION =   0
> +REVISION =   1

Any concept howto handle the version bump -alpha3 to -alpha4? We have
only rc[N], beta[N], pre[N], and pl[N]. Would it makes sense to add a
alpha[N]? We could of course also use EPOCH here.

Any opinions?

>  
> -SHARED_LIBS +=  Qt5WebKit   3.0 # 5.9
> -SHARED_LIBS +=  Qt5WebKitWidgets3.0 # 5.9
> +SHARED_LIBS +=  Qt5WebKit   3.1 # 5.9
> +SHARED_LIBS +=  Qt5WebKitWidgets3.1 # 5.9
>  SHARED_LIBS +=  JavaScriptCore  0.0 # 5.212.9
> -SHARED_LIBS +=  WebCore 0.0 # 5.212.9
> -SHARED_LIBS +=  WebKit2 0.0 # 5.212.9
> +SHARED_LIBS +=  WebCore 1.0 # 5.212.9
> +SHARED_LIBS +=  WebKit2 0.1 # 5.212.9
>  SHARED_LIBS +=  WTF 0.0 # 5.212.9
>  
>  # Mostly LGPLv2.1 or LGPLv3 for code; FDLv1.3 for documentation.
> @@ -37,6 +37,7 @@ WANTLIB += hyphen icui18n icuuc jpeg m p
>  MASTER_SITES =   
> https://github.com/annulen/webkit/releases/download/${DISTNAME}/
>  
>  MODULES =devel/cmake \
> + lang/python \
>   lang/ruby \
>   x11/qt5
>  
> @@ -46,6 +47,7 @@ CONFIGURE_STYLE =   cmake
>  # Remove default "first" target and build all
>  ALL_TARGET = 
>  
> +MODPY_VERSION =  ${MODPY_DEFAULT_VERSION_3}
>  MODPY_RUNDEP =   No
>  MODRUBY_RUNDEP = No
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/qt5/qtwebkit/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- distinfo  19 Feb 2020 16:08:53 -  1.3
> +++ distinfo  16 Mar 2020 05:05:27 -
> @@ -1,2 +1,2 @@
> -SHA256 (qt/qtwebkit-5.212.0-alpha3.tar.xz) = 
> NX7uWCRFV0Ry5BDr7OYy0G+g7JQ1j8Q0XypxOSLfXhc=
> -SIZE (qt/qtwebkit-5.212.0-alpha3.tar.xz) = 12457896
> +SHA256 (qt/qtwebkit-5.212.0-alpha4.tar.xz) = 
> nKEm2pJzZk3SOjzNDJvrzre7U0vd10PbMcr2pabUqeY=
> +SIZE (qt/qtwebkit-5.212.0-alpha4.tar.xz) = 12528508
> Index: patches/patch-Source_JavaScriptCore_CMakeLists_txt
> ===
> RCS file: 
> /cvs/ports/x11/qt5/qtwebkit/patches/patch-Source_JavaScriptCore_CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-Source_JavaScriptCore_CMakeLists_txt
> --- patches/patch-Source_JavaScriptCore_CMakeLists_txt19 Feb 2020 
> 16:08:53 -  1.1
> +++ patches/patch-Source_JavaScriptCore_CMakeLists_txt16 Mar 2020 
> 05:05:27 -
> @@ -3,7 +3,7 @@ $OpenBSD: patch-Source_JavaScriptCore_CM
>  Index: Source/JavaScriptCore/CMakeLists.txt
>  --- Source/JavaScriptCore/CMakeLists.txt.orig
>  +++ Source/JavaScriptCore/CMakeLists.txt
> -@@ -1286,6 +1286,7 @@ elseif (WTF_CPU_S390)
> +@@ -1287,6 +1287,7 @@ elseif (WTF_CPU_S390)
>   elseif (WTF_CPU_S390X)
>   elseif (WTF_CPU_MIPS)
>   elseif (WTF_CPU_SH4)
> Index: patches/patch-Source_WebCore_dom_Document_cpp
> ===
> RCS file: patches/patch-Source_WebCore_dom_Document_cpp
> diff -N patches/patch-Source_WebCore_dom_Document_cpp
> --- patches/patch-Source_WebCore_dom_Document_cpp 19 Feb 2020 16:08:53 
> -  1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,31 +0,0 @@
> -$OpenBSD: patch-Source_WebCore_dom_Document_cpp,v 1.2 2020/02/19 16:08:53 
> rsadowski Exp $
> -
> -Fix build with icu4c >=65
> -
> -Index: Source/WebCore/dom/Document.cpp
>  Source/WebCore/dom/Document.cpp.orig
> -+++ Source/WebCore/dom/Document.cpp
> -@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar* 
> character
> - unsigned i = 0;
> - 
> - UChar32 c;
> --U16_NEXT(characters, i, length, c)
> -+U16_NEXT(characters, i, length, c);
> - if 

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/03/20 00:24:00

Modified files:
net/bitcoin: Makefile distinfo 

Log message:
Update bitcoin to 0.19.1