CVS: cvs.openbsd.org: ports

[Ingo Feinerer]

CVSROOT:/cvs
Module name:ports
Changes by: feine...@cvs.openbsd.org2020/04/10 22:44:38

Modified files:
print/gl2ps: Makefile distinfo 

Log message:
Update to GL2PS 1.4.2

Re: update opensonic 0.1.4

[Nam Nguyen]

Landry Breuil writes:

> no sound issue after some playing, with ogg123 also playing a stream at
> the same time via sndio. looks good to me - and i also support the
> removal of audio/dumb and graphics/allegropng.

Paul Velencia (reivyr) said that audio/dumb is needed for a WIP-port of
Adventure Game Studio. Keep audio/dumb and remove graphics/allegropng
because no potential or current consumers will use allegropng. Although,
allegropng does seem like a lighter alternative to loadpng.

allegropng
==
http://alpng.sourceforge.net/

"It's completely standalone, it doesn't require libpng nor zlib (however
it can use zlib if installed)."

loadpng
===
https://tjaden.strangesoft.net/loadpng/

This is a new library supplied by the proposed allegro update.

"Note: If you have libpng installed you can try to use loadpng library
instead of alpng. loadpng is faster and supports some additional
features like gama. It also exists for longer time so it's more tested."

update sysutils/dtb to linux 5.6

[Jonathan Gray]

Update dtb to the latest linux release now we can handle newer omap
dtbs.

Index: Makefile
===
RCS file: /cvs/ports/sysutils/dtb/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile30 Sep 2019 15:14:50 -  1.21
+++ Makefile1 Apr 2020 05:10:31 -
@@ -3,8 +3,7 @@
 ONLY_FOR_ARCHS=${GCC4_ARCHS} ${CLANG_ARCHS}
 
 COMMENT=   Device Tree Blobs
-VERSION=   4.20
-REVISION=  0
+VERSION=   5.6
 DISTNAME=  linux-${VERSION}
 PKGNAME=   dtb-${VERSION:S/-//}
 CATEGORIES=sysutils
@@ -14,7 +13,7 @@ MAINTAINER=   Jonathan Gray https://cdn.kernel.org/pub/linux/kernel/v4.x/
+MASTER_SITES=  https://cdn.kernel.org/pub/linux/kernel/v5.x/
 EXTRACT_SUFX=  .tar.xz
 #MASTER_SITES= https://git.kernel.org/torvalds/t/
 PKG_ARCH=  *
Index: distinfo
===
RCS file: /cvs/ports/sysutils/dtb/distinfo,v
retrieving revision 1.18
diff -u -p -r1.18 distinfo
--- distinfo24 Dec 2018 08:55:20 -  1.18
+++ distinfo1 Apr 2020 05:10:47 -
@@ -1,2 +1,2 @@
-SHA256 (linux-4.20.tar.xz) = rQgjGDUi50OXI4LfCqCPta4wd/ZisSXx5ZmwsqqhJDg=
-SIZE (linux-4.20.tar.xz) = 104257836
+SHA256 (linux-5.6.tar.xz) = 40KwSiqmOAjqDvG6qyj8UgvQMe+M+T2e5KMdQFj8tiI=
+SIZE (linux-5.6.tar.xz) = 111785252
Index: patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts
===
RCS file: patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts
diff -N patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts
--- patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts 30 Sep 
2019 15:14:50 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,14 +0,0 @@
-$OpenBSD: patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dts,v 1.1 
2019/09/30 15:14:50 kurt Exp $
-
-Index: arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts.orig
-+++ arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts
-@@ -15,7 +15,7 @@
-   compatible = "pine64,rockpro64", "rockchip,rk3399";
- 
-   chosen {
--  stdout-path = "serial2:150n8";
-+  stdout-path = "serial2:115200n8";
-   };
- 
-   clkin_gmac: external-gmac-clock {
Index: patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dtsi
===
RCS file: patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dtsi
diff -N patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dtsi
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-arch_arm64_boot_dts_rockchip_rk3399-rockpro64_dtsi1 Apr 
2020 05:20:41 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
+--- arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi.orig
 arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi
+@@ -11,7 +11,7 @@
+ 
+ / {
+   chosen {
+-  stdout-path = "serial2:150n8";
++  stdout-path = "serial2:115200n8";
+   };
+ 
+   clkin_gmac: external-gmac-clock {
Index: patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts
===
RCS file: 
/cvs/ports/sysutils/dtb/patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts,v
retrieving revision 1.2
diff -u -p -r1.2 patch-arch_arm_boot_dts_imx6q-cm-fx6_dts
--- patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts31 Jul 2018 10:10:37 
-  1.2
+++ patches/patch-arch_arm_boot_dts_imx6q-cm-fx6_dts1 Apr 2020 05:20:31 
-
@@ -2,7 +2,7 @@ $OpenBSD: patch-arch_arm_boot_dts_imx6q-
 Index: arch/arm/boot/dts/imx6q-cm-fx6.dts
 --- arch/arm/boot/dts/imx6q-cm-fx6.dts.orig
 +++ arch/arm/boot/dts/imx6q-cm-fx6.dts
-@@ -54,6 +54,10 @@
+@@ -55,6 +55,10 @@
reg = <0x1000 0x8000>;
};
  
Index: patches/patch-arch_arm_boot_dts_omap3-beagle-xm_dts
===
RCS file: 
/cvs/ports/sysutils/dtb/patches/patch-arch_arm_boot_dts_omap3-beagle-xm_dts,v
retrieving revision 1.1
diff -u -p -r1.1 patch-arch_arm_boot_dts_omap3-beagle-xm_dts
--- patches/patch-arch_arm_boot_dts_omap3-beagle-xm_dts 17 Jul 2016 15:09:39 
-  1.1
+++ patches/patch-arch_arm_boot_dts_omap3-beagle-xm_dts 1 Apr 2020 05:20:33 
-
@@ -1,7 +1,8 @@
 $OpenBSD: patch-arch_arm_boot_dts_omap3-beagle-xm_dts,v 1.1 2016/07/17 
15:09:39 jsg Exp $
 arch/arm/boot/dts/omap3-beagle-xm.dts.orig Sun Jul 17 00:58:31 2016
-+++ arch/arm/boot/dts/omap3-beagle-xm.dts  Sun Jul 17 00:59:41 2016
-@@ -24,6 +24,10 @@
+Index: arch/arm/boot/dts/omap3-beagle-xm.dts
+--- arch/arm/boot/dts/omap3-beagle-xm.dts.orig
 arch/arm/boot/dts/omap3-beagle-xm.dts
+@@ -21,6 +21,10 @@
reg = <0x8000 0x2000>; /* 512 MB */
};
  
Index: patches/patch-arch_arm_boot_dts_omap3-beagle_dts

Re: [Update] www/p5-Dancer2 : Update to 0.300002

[Andrew Hewus Fresh]

On Wed, Apr 08, 2020 at 09:17:15AM +, wen heping wrote:
> Hi, ports@:
> 
>   Here is a patch for www/p5-Dancer2:
>i) Update to 0.32
>ii) Add devel/p5-Test-CPAN-Meta to TEST_DEPENDS
> 
> 
>   It build well and run well and pass all tests on amd64-current system.
> 
>   4 ports depends on it, all build well and pass all tests.
>   www/p5-Dancer2-Plugin-Ajax
>   www/p5-Dancer2-Plugin-Database
>  www/p5-Dancer2-Plugin-DBIC
>  www/p5-Dancer2-Plugin-Auth-Tiny
> 
> wen

OK afresh1@

> Index: Makefile
> ===
> RCS file: /cvs/ports/www/p5-Dancer2/Makefile,v
> retrieving revision 1.9
> diff -u -p -r1.9 Makefile
> --- Makefile  30 Jan 2020 03:45:45 -  1.9
> +++ Makefile  8 Apr 2020 09:10:55 -
> @@ -4,7 +4,7 @@ COMMENT = lightweight yet powerful web 
>  
>  MODULES =cpan
>  PKG_ARCH =   *
> -DISTNAME =   Dancer2-0.30
> +DISTNAME =   Dancer2-0.32
>  CATEGORIES = www
>  
>  # Perl
> @@ -41,6 +41,7 @@ RUN_DEPENDS =   devel/p5-App-Cmd \
>   devel/p5-YAML
>  
>  TEST_DEPENDS =   devel/p5-AnyEvent \
> + devel/p5-Test-CPAN-Meta \
>   devel/p5-Test-EOL \
>   devel/p5-Test-Fatal \
>   devel/p5-Test-Memory-Cycle>=1.04 \
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/p5-Dancer2/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo  30 Jan 2020 03:45:45 -  1.5
> +++ distinfo  8 Apr 2020 09:10:55 -
> @@ -1,2 +1,2 @@
> -SHA256 (Dancer2-0.30.tar.gz) = 
> bxnl7AieSdpgVGPDEpqMRQmUj2EIIebQNBYpdRlMWu8=
> -SIZE (Dancer2-0.30.tar.gz) = 384007
> +SHA256 (Dancer2-0.32.tar.gz) = 
> T4RVNOuDxbDRot3/gggzHMTLJOTjfg/LVOtxLRLNkgo=
> +SIZE (Dancer2-0.32.tar.gz) = 392689


-- 
andrew - http://afresh1.com

"Programming today is a race between software engineers striving to
build bigger and better idiot-proof programs, and the Universe
trying to produce bigger and better idiots. So far, the Universe is
winning." -- Rich Cook

Re: [UPDATE] mail/opensmtpd-filters/rspamd

[Aisha Tammy]

w, thanks a lot giles :D
I can't wait to try this out.


On 4/10/20 6:10 PM, gil...@poolp.org wrote:
> Hello,
> 
> The following diff updates filter-rspamd from 0.1.5 to 0.1.6
> 
> - adds pledge & unveil to filter
> - fixes a bug in the processing of mail addresses
> - better handles greylisting action from Rspamd
> - support both current and upcoming version of the filter protocol
> 
> ok ?
> 
> Gilles
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/Makefile,v
> retrieving revision 1.5
> diff -u -p -r1.5 Makefile
> --- Makefile  9 Dec 2019 20:23:29 -   1.5
> +++ Makefile  10 Apr 2020 22:02:20 -
> @@ -2,7 +2,7 @@
>  
>  COMMENT =rspamd integration to the OpenSMTPD daemon
>  
> -V =  0.1.5
> +V =  0.1.6
>  FILTER_NAME =rspamd
>  DISTNAME =   filter-rspamd-${V}
>  
> @@ -21,5 +21,7 @@ MODULES =   lang/go
>  NO_TEST =Yes
>  
>  ALL_TARGET = filter-rspamd
> +
> +BUILD_DEPENDS = devel/go-sys
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/distinfo,v
> retrieving revision 1.5
> diff -u -p -r1.5 distinfo
> --- distinfo  9 Dec 2019 20:23:29 -   1.5
> +++ distinfo  10 Apr 2020 22:02:20 -
> @@ -1,2 +1,2 @@
> -SHA256 (filter-rspamd-0.1.5.tar.gz) = 
> RFhwbhDNPrRxbsAim/45BlTpQmHax/JlC+1GhXCAayY=
> -SIZE (filter-rspamd-0.1.5.tar.gz) = 4829
> +SHA256 (filter-rspamd-0.1.6.tar.gz) = 
> Yhi0ozuIo9omQrn/kfM8z5p7WuAZEHrtUgujMuuvs4E=
> +SIZE (filter-rspamd-0.1.6.tar.gz) = 5096
> 

[UPDATE] mail/opensmtpd-filters/rspamd

[gilles]

Hello,

The following diff updates filter-rspamd from 0.1.5 to 0.1.6

- adds pledge & unveil to filter
- fixes a bug in the processing of mail addresses
- better handles greylisting action from Rspamd
- support both current and upcoming version of the filter protocol

ok ?

Gilles


Index: Makefile
===
RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- Makefile9 Dec 2019 20:23:29 -   1.5
+++ Makefile10 Apr 2020 22:02:20 -
@@ -2,7 +2,7 @@
 
 COMMENT =  rspamd integration to the OpenSMTPD daemon
 
-V =0.1.5
+V =0.1.6
 FILTER_NAME =  rspamd
 DISTNAME = filter-rspamd-${V}
 
@@ -21,5 +21,7 @@ MODULES = lang/go
 NO_TEST =  Yes
 
 ALL_TARGET =   filter-rspamd
+
+BUILD_DEPENDS = devel/go-sys
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/mail/opensmtpd-filters/rspamd/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo9 Dec 2019 20:23:29 -   1.5
+++ distinfo10 Apr 2020 22:02:20 -
@@ -1,2 +1,2 @@
-SHA256 (filter-rspamd-0.1.5.tar.gz) = 
RFhwbhDNPrRxbsAim/45BlTpQmHax/JlC+1GhXCAayY=
-SIZE (filter-rspamd-0.1.5.tar.gz) = 4829
+SHA256 (filter-rspamd-0.1.6.tar.gz) = 
Yhi0ozuIo9omQrn/kfM8z5p7WuAZEHrtUgujMuuvs4E=
+SIZE (filter-rspamd-0.1.6.tar.gz) = 5096

Re: [UPDATE] lang/nim-1.2.0

[j]

The patch doesn't apply:


Hmm...  The next patch looks like a unified diff to me...
The text leading up to this was:
--
|Index: patches/patch-config_nim_cfg
|===
|RCS file: /cvs/ports/lang/nim/patches/patch-config_nim_cfg,v
|retrieving revision 1.3
|diff -u -p -r1.3 patch-config_nim_cfg
|--- patches/patch-config_nim_cfg   9 Jan 2017 10:32:33 -   
1.3

|+++ patches/patch-config_nim_cfg   9 Apr 2020 18:28:53 -
--
Patching file patches/patch-config_nim_cfg using Plan A...
patch:  malformed patch at line 217: -


Please resubmit; btw your posted email doesn't work.


John

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2020/04/10 15:32:29

Modified files:
sysutils/reposync: Makefile distinfo 

Log message:
update to reposync-20200410

Re: CVS: cvs.openbsd.org: ports

[Stuart Henderson]

On 2020/03/28 01:24, Robert Nagy wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   rob...@cvs.openbsd.org  2020/03/28 01:24:37
> 
> Modified files:
>   x11/remmina: Makefile distinfo 
>   x11/remmina/patches: patch-CMakeLists_txt 
>patch-plugins_rdp_rdp_plugin_c 
>   x11/remmina/pkg: PLIST 
> Added files:
>   x11/remmina/patches: patch-plugins_vnc_vnc_plugin_c 
> Removed files:
>   x11/remmina/patches: patch-cmake_FindGTK3_cmake 
>patch-cmake_FindLIBSSH_cmake 
>patch-src_CMakeLists_txt 
> 
> Log message:
> update to 1.3.6 and fix the vnc plugin which was broken due to a double-free
> and a wrong mutex lock
> 
> ok aja@
> 

packaging failed,

Error: 
/pobj/remmina-1.3.6/fake-i386/usr/local/lib/remmina/plugins/remmina-plugin-spice.so
 does not exist

not sure why though, spice was detected..


>>> Building on i386-3 under x11/remmina
 BDEPENDS = 
[devel/spice-protocol;x11/gnome/libsecret;devel/libsoup;x11/spice-gtk;devel/cmake;security/libsodium;security/libssh;devel/gettext,-runtime;net/avahi,,-gtk3;devel/gettext,-tools;devel/vte3;devel/json-glib;devel/ninja;net/libvncserver;x11/freerdp]
 DIST = [x11/remmina:Remmina-1.3.6.tar.gz]
 FULLPKGNAME = remmina-1.3.6
 RDEPENDS = 
[x11/gtk+3,-guic;x11/freerdp;net/libvncserver;devel/json-glib;devel/vte3;net/avahi,,-gtk3;devel/desktop-file-utils;devel/gettext,-runtime;security/libssh;misc/shared-mime-info;security/libsodium;x11/spice-gtk;devel/libsoup;x11/gnome/libsecret]
(Junk lock obtained for i386-3 at 1586549775.05)
>>> Running depends in x11/remmina at 1586549775.09
   last junk was in cad/pcb
/usr/sbin/pkg_add -aI -Drepair avahi-gtk3-0.8 cmake-3.16.2p1v0 
freerdp-2.0.0rc1p4 gettext-runtime-0.20.1p1 gettext-tools-0.20.1p3 
json-glib-1.4.4 libsecret-0.20.2 libsodium-1.0.18 libsoup-2.68.4 libssh-0.9.3 
libvncserver-0.9.12p0 ninja-1.10.0 spice-gtk-0.38 spice-protocol-0.14.1 
vte3-0.58.3p0
was: /usr/sbin/pkg_add -aI -Drepair avahi-gtk3-0.8 cmake-3.16.2p1v0 
freerdp-2.0.0rc1p4 gettext-runtime-0.20.1p1 gettext-tools-0.20.1p3 
json-glib-1.4.4 libsecret-0.20.2 libsodium-1.0.18 libsoup-2.68.4 libssh-0.9.3 
libvncserver-0.9.12p0 ninja-1.10.0 spice-gtk-0.38 spice-protocol-0.14.1 
vte3-0.58.3p0
/usr/sbin/pkg_add -aI -Drepair avahi-gtk3-0.8 cmake-3.16.2p1v0 
freerdp-2.0.0rc1p4 gettext-runtime-0.20.1p1 gettext-tools-0.20.1p3 
json-glib-1.4.4 libsecret-0.20.2 libsodium-1.0.18 libsoup-2.68.4 libssh-0.9.3 
libvncserver-0.9.12p0 ninja-1.10.0 spice-gtk-0.38 spice-protocol-0.14.1 
vte3-0.58.3p0
New and changed readme(s):
/usr/local/share/doc/pkg-readmes/ffmpeg
/usr/local/share/doc/pkg-readmes/gnupg
/usr/local/share/doc/pkg-readmes/sdl2
>>> Running show-prepare-results in x11/remmina at 1586549789.15
===> x11/remmina
===> remmina-1.3.6 depends on: gettext-tools-* -> gettext-tools-0.20.1p3
===> remmina-1.3.6 depends on: spice-protocol-* -> spice-protocol-0.14.1
===> remmina-1.3.6 depends on: cmake-* -> cmake-3.16.2p1v0
===> remmina-1.3.6 depends on: ninja->=1.5.1 -> ninja-1.10.0
===> remmina-1.3.6 depends on: gettext-runtime-* -> gettext-runtime-0.20.1p1
===> remmina-1.3.6 depends on: libsoup-* -> libsoup-2.68.4
===> remmina-1.3.6 depends on: json-glib-* -> json-glib-1.4.4
===> remmina-1.3.6 depends on: vte3-* -> vte3-0.58.3p0
===> remmina-1.3.6 depends on: avahi-gtk3-* -> avahi-gtk3-0.8
===> remmina-1.3.6 depends on: libvncserver-* -> libvncserver-0.9.12p0
===> remmina-1.3.6 depends on: libsodium-* -> libsodium-1.0.18
===> remmina-1.3.6 depends on: libssh-* -> libssh-0.9.3
===> remmina-1.3.6 depends on: freerdp-* -> freerdp-2.0.0rc1p4
===> remmina-1.3.6 depends on: spice-gtk-* -> spice-gtk-0.38
===> remmina-1.3.6 depends on: libsecret-* -> libsecret-0.20.2
===>  Verifying specs:  ICE SM X11 Xext atk-1.0 avahi-client avahi-common 
avahi-ui-gtk3 c cairo cairo-gobject crypto freerdp-client2 freerdp2 gcrypt 
gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 gtk-3 
harfbuzz intl json-glib-1.0 pango-1.0 pangocairo-1.0 pthread secret-1 soup-2.4 
spice-client-glib-2.0 spice-client-gtk-3.0 ssh ssl vncclient vte-2.91 winpr2 
xkbfile sodium
===>  found ICE.11.0 SM.9.0 X11.17.0 Xext.13.0 atk-1.0.21809.3 avahi-client.0.2 
avahi-common.0.2 avahi-ui-gtk3.0.2 c.96.0 cairo.13.0 cairo-gobject.2.0 
crypto.46.1 freerdp-client2.0.0 freerdp2.0.0 gcrypt.19.5 gdk-3.2201.1 
gdk_pixbuf-2.0.3200.2 gio-2.0.4200.10 glib-2.0.4201.3 gmodule-2.0.4200.10 
gobject-2.0.4200.10 gthread-2.0.4200.10 gtk-3.2201.0 harfbuzz.15.1 intl.6.0 
json-glib-1.0.6.0 pango-1.0.3801.0 pangocairo-1.0.3801.0 pthread.26.1 
secret-1.2.1 soup-2.4.10.4 spice-client-glib-2.0.6.1 spice-client-gtk-3.0.4.1 
ssh.4.1 ssl.48.1 vncclient.1.0 vte-2.91.2.4 winpr2.0.0 xkbfile.6.0 sodium.10.0
avahi-gtk3-0.8
cmake-3.16.2p1v0
freerdp-2.0.0rc1p4
gettext-runtime-0.20.1p1
gettext-tools-0.20.1p3
json-glib-1.4.4
libsecret-0.20.2
libsodium-1.0.18
libsoup-2.68.4

Re: graphics/gimp crashes when opening a file dialog

[Solene Rapenne]

On Wed, Feb 12, 2020 at 04:44:36PM +0100, Solene Rapenne wrote:
> on -current amd64 (gimp-2.10.14p1) the program crashes when I open a file
> dialog to open or save a file.
> 
> 
> On crash, Gimp opens a dialog to tell about the crashes, here is the output

I still have some _rare_ crash when I want to open a file but it kinda
works now. I'm quite sure I didn't change anything in my dot folders.

Re: wip: mail/notmuch

[Stuart Henderson]

On 2020/04/10 20:21, Olivier Taïbi wrote:
> Here is further progress on this port, following versions by Enric
> Morales and Stuart Henderson.  I hope that this does not duplicate your
> efforts.
> 
> There were three zlib-related bugs in notmuch:
> 1) second argument () of gzerror() cannot be NULL, as gzerror()
> will write to this address.  This was causing SIGSEGV.
> 2) gzerror() cannot be called after gzclose() (use after free).  This
> was causing SIGBUS.
> Patching these two got rid of all the SIGSEGV and SIGBUS in tests.

great, that's a big improvement :)

> 3) these two errors were not spotted before because no one was reaching
> them with a recent zlib (they are bugs both for the latest zlib and
> OpenBSD's zlib though).  It seems that gzerror() in OpenBSD's older zlib
> will return (or rather set errnum to) Z_STREAM_END when reaching EOF,
> and this was handled as an error in notmuch's gz_getline(), when in fact
> it seems to be equivalent to Z_OK plus the indication that we reached
> EOF.  Unfortunately the manual of zlib does not say much about the
> meaning of Z_* error codes, but that's the most obvious meaning (to me
> at least).
> 
> I reported these bugs on the notmuch mailing list, but at least one
> issue remains.  OpenBSD's zlib does not have a relatively recent feature
> of zlib: the ability to write uncompressed files, or "T" (for
> "transparent") mode.  The result is equivalent to "--gzip" being the
> default (and the only choice!) for notmuch dump.  To run the tests I
> patched them by adding "| zcat" after each notmuch dump which is not
> followed by --gzip, and a gunzip [...] line after each notmuch dump
> --output.  I also replaced gpg by gpg2 in the tests, and imposed the
> python3 FLAVOR because it is necessary for a few tests (I may have done
> this the wrong way).  There are still 9 tests that fail, but I am not

for a standalone port, use "MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}",
the FLAVOR setup is for python modules (py-* ports).

> sure that all of them are real failures.  That's not counting the tests
> that Stuart Henderson forced to skip (I haven't looked at them yet) and
> the tests requiring large files (databases to be downloaded from
> notmuch's website).
> 
> I see 3 ways to solve this outstanding problem:
> 1) add the "T" mode to OpenBSD's zlib, for example by merging with a
> more recent zlib from upstream.  Unfortunately this seems to be
> a lot of work: see
> https://marc.info/?l=openbsd-tech=141936824422127=2

The update of the main copy in src/lib/libz has been done at least twice
(though I don't think it happened for the other copies in sys/lib/libz and
src/gnu/usr.bin/cvs - amusingly the fourth copy, in perl, is already at
1.2.11) - but not made it into the tree. The thing I remember putting
some people off was the "new" z_off64_t (10 years old today in the
public api).

But updating it is the only option that fixes the various pain / patching
/ workarounds / using bundled copies in various things in ports that
has been a problem at least going back to 2012.

> One could also just add the "T" mode.

It does help notmuch but not most other ports where we ran into
problems with old zlib (gzoffset was one of the more common ones iirc).

> 2) just accept that notmuch dump will only output gzipped data, i.e.
> only patch the man page to indicate that --gzip is the one and only
> choice.  Not very nice...

Not a fan of this.

> 3) patch notmuch to remove the compression feature (--gzip), essentially
> replacing zlib by stdio.  I like that because the gzip feature is not
> really useful anyway (a pipe to any compression program is simpler and
> more flexible), but that will mean merging work for each port update.
> Perhaps this could be suggested upstream?

That does sound like a good idea (and probably more acceptable to
upstream than having separate code for gzopen/gzFile/gzprintf vs
fopen/FILE */fprintf just to cope with OS with old zlib..)

It's probably not _too_ much of a maintenance burden in ports either,
certainly less of a burden than patching the tests to use zcat/gunzip.

Re: Tor Browser font fingerprinting defense

[Stuart Henderson]

On 2020/04/10 21:24, Caspar Schutijser wrote:
> Ports-wise, it looks a bit silly. And also, since this extra distfile
> does not end up in WRKSRC, it is not straightforward to patch
> fonts.conf, which we need to do (for now I use sed -i in the
> post-install target).
> 
> ports@, do you have any suggestions on how to improve this?

mv it in post-extract.

Re: [UPDATE] lang/nim-1.2.0

[Denis Fondras]

On Fri, Apr 10, 2020 at 09:41:53PM +0200, Denis Fondras wrote:
> On Fri, Apr 10, 2020 at 12:12:58AM +0530, putridsou...@gmail.com wrote:
> > Latest Update for nim-1.2.0
> > Builds successfully on amd64
> > 
> > 1 new patch added -> patch-install_sh
> > 4 patches removed -> patch-koch_nim, patch-lib_pure_endians_nim, 
> >  patch-compiler_extccomp_nim, 
> >  patch-tests_testament_tester_nim  
> > 
> > Someone should test this.
> > 
> 
> It does not work here unless I copy /etc/nim* to /usr/local/etc/nim/
> 

More precisely, nimble does not work. This is a different problem.

> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/lang/nim/Makefile,v
> > retrieving revision 1.10
> > diff -u -p -r1.10 Makefile
> > --- Makefile31 Aug 2019 15:36:56 -  1.10
> > +++ Makefile9 Apr 2020 18:28:53 -
> > @@ -6,7 +6,7 @@ BROKEN-i386 = hardcodes gcc; see config/
> >  
> >  COMMENT =  statically typed, imperative programming language
> >  
> > -VERSION =  0.16.0
> > +VERSION =  1.2.0
> >  DISTNAME = nim-${VERSION}
> >  EXTRACT_SUFX = .tar.xz
> >  REVISION = 0
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/lang/nim/distinfo,v
> > retrieving revision 1.4
> > diff -u -p -r1.4 distinfo
> > --- distinfo9 Jan 2017 10:32:33 -   1.4
> > +++ distinfo9 Apr 2020 18:28:53 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (nim-0.16.0.tar.xz) = nhmYI75Hy6VeYt1pgvAs8KrXMvNpeZ/sQqTYwiZcUWc=
> > -SIZE (nim-0.16.0.tar.xz) = 2907076
> > +SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=
> > +SIZE (nim-1.2.0.tar.xz) = 5869428
> > Index: patches/patch-build_sh
> > ===
> > RCS file: /cvs/ports/lang/nim/patches/patch-build_sh,v
> > retrieving revision 1.2
> > diff -u -p -r1.2 patch-build_sh
> > --- patches/patch-build_sh  15 Jun 2016 00:19:59 -  1.2
> > +++ patches/patch-build_sh  9 Apr 2020 18:28:53 -
> > @@ -1,16 +1,15 @@
> >  $OpenBSD: patch-build_sh,v 1.2 2016/06/15 00:19:59 juanfra Exp $
> >  --- build.sh.orig  Tue Jun  7 00:38:53 2016
> >  +++ build.sh   Thu Jun  9 19:43:03 2016
> > -@@ -26,9 +26,9 @@ do
> > -   esac
> > - done
> > - 
> > --CC="gcc"
> > --LINKER="gcc"
> > --COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -O3 
> > -fno-strict-aliasing$extraBuildArgs"
> > -+#CC="gcc"
> > -+#LINKER="gcc"
> > -+COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w 
> > -fno-strict-aliasing$extraBuildArgs"
> > - LINK_FLAGS="${LDFLAGS:-} "
> > - PS4=""
> > - # platform detection
> > +@@ -89,6 +89,11 @@
> > + ;;
> > +   *openbsd* )
> > + myos="openbsd"
> > ++if [ "$ucpu" = "powerpc" ] ; then
> > ++  CC="gcc"
> > ++   else
> > ++  CC="clang"
> > ++fi
> > + LINK_FLAGS="$LINK_FLAGS -lm"
> > + ;;
> > +   *netbsd* )
> > Index: patches/patch-compiler_extccomp_nim
> > ===
> > RCS file: patches/patch-compiler_extccomp_nim
> > diff -N patches/patch-compiler_extccomp_nim
> > --- patches/patch-compiler_extccomp_nim 9 Jan 2017 10:32:33 -   
> > 1.3
> > +++ /dev/null   1 Jan 1970 00:00:00 -
> > @@ -1,47 +0,0 @@
> > -$OpenBSD: patch-compiler_extccomp_nim,v 1.3 2017/01/09 10:32:33 juanfra 
> > Exp $
> >  compiler/extccomp.nim.orig Sun Jan  8 21:33:43 2017
> > -+++ compiler/extccomp.nim  Mon Jan  9 02:22:00 2017
> > -@@ -21,7 +21,7 @@ import
> > - type
> > -   TSystemCC* = enum
> > - ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc,
> > --ccTcc, ccPcc, ccUcc, ccIcl, asmFasm
> > -+ccTcc, ccPcc, ccUcc, ccIcl, asmFasm, ccEGcc
> > -   TInfoCCProp* = enum # properties of the C compiler:
> > - hasSwitchRange,   # CC allows ranges in switch statements 
> > (GNU C)
> > - hasComputedGoto,  # CC has computed goto (GNU C extension)
> > -@@ -69,8 +69,8 @@ compiler gcc:
> > -   result = (
> > - name: "gcc",
> > - objExt: "o",
> > --optSpeed: " -O3 -ffast-math ",
> > --optSize: " -Os -ffast-math ",
> > -+optSpeed: " -O2 ",
> > -+optSize: " -Os ",
> > - compilerExe: "gcc",
> > - cppCompiler: "g++",
> > - compileTmpl: "-c $options $include -o $objfile $file",
> > -@@ -90,6 +90,13 @@ compiler gcc:
> > - props: {hasSwitchRange, hasComputedGoto, hasCpp, hasGcGuard, 
> > hasGnuAsm,
> > - hasAttribute})
> > - 
> > -+compiler egcc:
> > -+result = gcc()
> > -+
> > -+result.name = "egcc"
> > -+result.compilerExe = "egcc"
> > -+result.cppCompiler = "eg++"
> > -+
> > - # LLVM Frontend for GCC/G++
> > - compiler llvmGcc:
> > -   result = gcc() # Uses settings from GCC
> > -@@ -359,7 +366,8 @@ const
> > - pcc(),
> > - ucc(),
> > - icl(),
> > --fasm()]
> > -+fasm(),
> > -+  

Re: [UPDATE] lang/nim-1.2.0

[Denis Fondras]

On Fri, Apr 10, 2020 at 12:12:58AM +0530, putridsou...@gmail.com wrote:
> Latest Update for nim-1.2.0
> Builds successfully on amd64
> 
> 1 new patch added -> patch-install_sh
> 4 patches removed -> patch-koch_nim, patch-lib_pure_endians_nim, 
>  patch-compiler_extccomp_nim, 
>  patch-tests_testament_tester_nim  
> 
> Someone should test this.
> 

It does not work here unless I copy /etc/nim* to /usr/local/etc/nim/

> Index: Makefile
> ===
> RCS file: /cvs/ports/lang/nim/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- Makefile  31 Aug 2019 15:36:56 -  1.10
> +++ Makefile  9 Apr 2020 18:28:53 -
> @@ -6,7 +6,7 @@ BROKEN-i386 = hardcodes gcc; see config/
>  
>  COMMENT =statically typed, imperative programming language
>  
> -VERSION =0.16.0
> +VERSION =1.2.0
>  DISTNAME =   nim-${VERSION}
>  EXTRACT_SUFX =   .tar.xz
>  REVISION =   0
> Index: distinfo
> ===
> RCS file: /cvs/ports/lang/nim/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo  9 Jan 2017 10:32:33 -   1.4
> +++ distinfo  9 Apr 2020 18:28:53 -
> @@ -1,2 +1,2 @@
> -SHA256 (nim-0.16.0.tar.xz) = nhmYI75Hy6VeYt1pgvAs8KrXMvNpeZ/sQqTYwiZcUWc=
> -SIZE (nim-0.16.0.tar.xz) = 2907076
> +SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=
> +SIZE (nim-1.2.0.tar.xz) = 5869428
> Index: patches/patch-build_sh
> ===
> RCS file: /cvs/ports/lang/nim/patches/patch-build_sh,v
> retrieving revision 1.2
> diff -u -p -r1.2 patch-build_sh
> --- patches/patch-build_sh15 Jun 2016 00:19:59 -  1.2
> +++ patches/patch-build_sh9 Apr 2020 18:28:53 -
> @@ -1,16 +1,15 @@
>  $OpenBSD: patch-build_sh,v 1.2 2016/06/15 00:19:59 juanfra Exp $
>  --- build.sh.origTue Jun  7 00:38:53 2016
>  +++ build.sh Thu Jun  9 19:43:03 2016
> -@@ -26,9 +26,9 @@ do
> -   esac
> - done
> - 
> --CC="gcc"
> --LINKER="gcc"
> --COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -O3 
> -fno-strict-aliasing$extraBuildArgs"
> -+#CC="gcc"
> -+#LINKER="gcc"
> -+COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w 
> -fno-strict-aliasing$extraBuildArgs"
> - LINK_FLAGS="${LDFLAGS:-} "
> - PS4=""
> - # platform detection
> +@@ -89,6 +89,11 @@
> + ;;
> +   *openbsd* )
> + myos="openbsd"
> ++if [ "$ucpu" = "powerpc" ] ; then
> ++  CC="gcc"
> ++   else
> ++  CC="clang"
> ++fi
> + LINK_FLAGS="$LINK_FLAGS -lm"
> + ;;
> +   *netbsd* )
> Index: patches/patch-compiler_extccomp_nim
> ===
> RCS file: patches/patch-compiler_extccomp_nim
> diff -N patches/patch-compiler_extccomp_nim
> --- patches/patch-compiler_extccomp_nim   9 Jan 2017 10:32:33 -   
> 1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,47 +0,0 @@
> -$OpenBSD: patch-compiler_extccomp_nim,v 1.3 2017/01/09 10:32:33 juanfra Exp $
>  compiler/extccomp.nim.orig   Sun Jan  8 21:33:43 2017
> -+++ compiler/extccomp.nimMon Jan  9 02:22:00 2017
> -@@ -21,7 +21,7 @@ import
> - type
> -   TSystemCC* = enum
> - ccNone, ccGcc, ccLLVM_Gcc, ccCLang, ccLcc, ccBcc, ccDmc, ccWcc, ccVcc,
> --ccTcc, ccPcc, ccUcc, ccIcl, asmFasm
> -+ccTcc, ccPcc, ccUcc, ccIcl, asmFasm, ccEGcc
> -   TInfoCCProp* = enum # properties of the C compiler:
> - hasSwitchRange,   # CC allows ranges in switch statements (GNU 
> C)
> - hasComputedGoto,  # CC has computed goto (GNU C extension)
> -@@ -69,8 +69,8 @@ compiler gcc:
> -   result = (
> - name: "gcc",
> - objExt: "o",
> --optSpeed: " -O3 -ffast-math ",
> --optSize: " -Os -ffast-math ",
> -+optSpeed: " -O2 ",
> -+optSize: " -Os ",
> - compilerExe: "gcc",
> - cppCompiler: "g++",
> - compileTmpl: "-c $options $include -o $objfile $file",
> -@@ -90,6 +90,13 @@ compiler gcc:
> - props: {hasSwitchRange, hasComputedGoto, hasCpp, hasGcGuard, hasGnuAsm,
> - hasAttribute})
> - 
> -+compiler egcc:
> -+result = gcc()
> -+
> -+result.name = "egcc"
> -+result.compilerExe = "egcc"
> -+result.cppCompiler = "eg++"
> -+
> - # LLVM Frontend for GCC/G++
> - compiler llvmGcc:
> -   result = gcc() # Uses settings from GCC
> -@@ -359,7 +366,8 @@ const
> - pcc(),
> - ucc(),
> - icl(),
> --fasm()]
> -+fasm(),
> -+egcc()]
> - 
> -   hExt* = ".h"
> - 
> Index: patches/patch-config_nim_cfg
> ===
> RCS file: /cvs/ports/lang/nim/patches/patch-config_nim_cfg,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-config_nim_cfg
> --- patches/patch-config_nim_cfg  9 Jan 2017 10:32:33 -   1.3
> +++ patches/patch-config_nim_cfg  9 Apr 2020 18:28:53 -
> 

wip: mail/notmuch

[Olivier Taïbi]

Here is further progress on this port, following versions by Enric
Morales and Stuart Henderson.  I hope that this does not duplicate your
efforts.

There were three zlib-related bugs in notmuch:
1) second argument () of gzerror() cannot be NULL, as gzerror()
will write to this address.  This was causing SIGSEGV.
2) gzerror() cannot be called after gzclose() (use after free).  This
was causing SIGBUS.
Patching these two got rid of all the SIGSEGV and SIGBUS in tests.
3) these two errors were not spotted before because no one was reaching
them with a recent zlib (they are bugs both for the latest zlib and
OpenBSD's zlib though).  It seems that gzerror() in OpenBSD's older zlib
will return (or rather set errnum to) Z_STREAM_END when reaching EOF,
and this was handled as an error in notmuch's gz_getline(), when in fact
it seems to be equivalent to Z_OK plus the indication that we reached
EOF.  Unfortunately the manual of zlib does not say much about the
meaning of Z_* error codes, but that's the most obvious meaning (to me
at least).

I reported these bugs on the notmuch mailing list, but at least one
issue remains.  OpenBSD's zlib does not have a relatively recent feature
of zlib: the ability to write uncompressed files, or "T" (for
"transparent") mode.  The result is equivalent to "--gzip" being the
default (and the only choice!) for notmuch dump.  To run the tests I
patched them by adding "| zcat" after each notmuch dump which is not
followed by --gzip, and a gunzip [...] line after each notmuch dump
--output.  I also replaced gpg by gpg2 in the tests, and imposed the
python3 FLAVOR because it is necessary for a few tests (I may have done
this the wrong way).  There are still 9 tests that fail, but I am not
sure that all of them are real failures.  That's not counting the tests
that Stuart Henderson forced to skip (I haven't looked at them yet) and
the tests requiring large files (databases to be downloaded from
notmuch's website).

I see 3 ways to solve this outstanding problem:
1) add the "T" mode to OpenBSD's zlib, for example by merging with a
more recent zlib from upstream.  Unfortunately this seems to be
a lot of work: see
https://marc.info/?l=openbsd-tech=141936824422127=2
One could also just add the "T" mode.
2) just accept that notmuch dump will only output gzipped data, i.e.
only patch the man page to indicate that --gzip is the one and only
choice.  Not very nice...
3) patch notmuch to remove the compression feature (--gzip), essentially
replacing zlib by stdio.  I like that because the gzip feature is not
really useful anyway (a pipe to any compression program is simpler and
more flexible), but that will mean merging work for each port update.
Perhaps this could be suggested upstream?

On Sun, Dec 22, 2019 at 12:35:34AM +, Stuart Henderson wrote:
> Enric Morales has sent a newer version to ports@, but there are still
> some problems - some segfaults and hangs connected with the notmuch
> code using zlib (which has been patched to work with OpenBSD's rather
> old version of zlib - I don't trust these patches, in particular the
> one relating to gzclose_w). There are some other problems which might
> also be connected with zlib but might be something else.
> 
> It builds and packages and some things work, but I don't think it's
> ready for import until these problems are figured out. (I'm not
> expecting a fully clear "make test" run, but the tests which currently
> fail point at some problems that really want fixing first).
> 
> Here's a version I've worked on a bit. Compared to the last one that
> was sent to ports@, it's a newer version, simplifies some patching,
> and gets more of the tests running correctly.
> 




notmuch.tgz
Description: Binary data

Re: Tor Browser font fingerprinting defense

[Theo de Raadt]

Caspar Schutijser  wrote:

> p.s. This makes me wonder whether there are other features that don't
> work on OpenBSD.. I'm planning to look into that at some point. In the
> meantime, should we warn users about this?

Warn the software comes without a warranty?  Or any actual claim that it
actually does what they think it does?

Tor Browser font fingerprinting defense

[Caspar Schutijser]

Hi,

On Sat, Mar 14, 2020 at 11:45:13AM -, Bronze Alibi wrote:
> (tested on current with the provided package and nothing else installed)  
> 
> It looks like the  Font
> fingerprinting defenses from upstream don't work in the OpenBSD port.  
> 
> When checking for the fingerprint on one of the websites that do such a thing,
> it seems like the installed fonts property is not uniform with tor browser on
> other platforms, but instead unique to OpenBSD and this port. It lists some
> specific proprietary font names (including Helvetica, which I would assume we
> don't ship in base, but some free replacement) and therefore makes users of
> the OpenBSD tor browser distinct from every other tor browser user.  
> 
> This is a bug.  

Below is a WIP diff that makes font fingerprinting defense work in
our port of Tor Browser.

Bronze Alibi, can you test this to see if it does what you expect?


Tor Browser achieves fingerprinting prevention by shipping its own set
of fonts and then configuring fontconfig to use only those fonts. The
selection of fonts is not shipped in some "normal" distfile, however.
One way to stay in sync anyway is to take the packaged Linux version
of Tor Browser and use the fonts and fonts.conf that are shipped there.
That's what I did with this diff.

Ports-wise, it looks a bit silly. And also, since this extra distfile
does not end up in WRKSRC, it is not straightforward to patch
fonts.conf, which we need to do (for now I use sed -i in the
post-install target).

ports@, do you have any suggestions on how to improve this? One
solution I could think of is to make a separate port, for example
www/tor-browser/fonts, which takes care of shipping the fonts and
fonts.conf. But not sure whether that's the best way to go.

Thanks,
Caspar Schutijser

p.s. This makes me wonder whether there are other features that don't
work on OpenBSD.. I'm planning to look into that at some point. In the
meantime, should we warn users about this?


Index: browser/Makefile
===
RCS file: /cvs/ports/www/tor-browser/browser/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- browser/Makefile9 Apr 2020 21:15:29 -   1.43
+++ browser/Makefile10 Apr 2020 19:23:00 -
@@ -16,9 +16,12 @@ PATCHORIG =  .pat.orig
 
 PKGNAME =  ${TB_PREFIX}-browser-${TB_VERSION}
 DISTNAME = src-firefox-tor-browser-68.7.0esr-9.0-2-build1
+REVISION = 0
 
+FIX_EXTRACT_PERMISSIONS= Yes
 DISTFILES +=   ${DISTNAME}.tar.xz \
-   src-tor-launcher-${TL_VERSION}.tar.xz
+   src-tor-launcher-${TL_VERSION}.tar.xz \
+   tor-browser-linux64-${TB_VERSION}_en-US.tar.xz
 
 SO_VERSION =   5.0
 MOZILLA_LIBS = xul clearkey lgpllibs mozavcodec mozavutil mozgtk
@@ -114,9 +117,12 @@ post-patch:
${WRKSRC}/third_party/rust/bindgen/.cargo-checksum.json
 
 BROWSER_DIR = ${PREFIX}/lib/${BROWSER_NAME}
+TRUEBROWSER_DIR = ${TRUEPREFIX}/lib/${BROWSER_NAME}
 BROWSER_CFG = ${BROWSER_DIR}/${BROWSER_NAME}.cfg
 BROWSER_INI = ${BROWSER_DIR}/distribution/distribution.ini
 
+SUBST_VARS +=  TRUEBROWSER_DIR
+
 post-install:
# install prefs, bookmarks, app config file for Tor browser
${INSTALL_DATA_DIR} ${BROWSER_DIR}/browser/defaults/preferences
@@ -150,5 +156,23 @@ post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/${BROWSER_NAME}
${SUBST_DATA} ${FILESDIR}/torrc-defaults \
${PREFIX}/share/${BROWSER_NAME}/torrc-defaults
+
+   # install fonts and fonts.conf
+   ${INSTALL_DATA_DIR} ${BROWSER_DIR}/browser/fontconfig
+   ${INSTALL_DATA} \
+   
${WRKDIR}/tor-browser_en-US/Browser/TorBrowser/Data/fontconfig/fonts.conf \
+   ${BROWSER_DIR}/browser/fontconfig/fonts.conf
+   # XXX We should patch the path to the fonts directory instead of
+   # substituting it like this. But the file is not in WRKSRC so
+   # make update-patches does not pick up any patches there. What to do?
+   sed -i "s,fonts,${BROWSER_DIR}/browser/fonts," \
+   ${BROWSER_DIR}/browser/fontconfig/fonts.conf
+   ${INSTALL_DATA_DIR} ${BROWSER_DIR}/browser/fonts
+   cp ${WRKDIR}/tor-browser_en-US/Browser/fonts/* 
${BROWSER_DIR}/browser/fonts
+
+   # install wrapper script (remove symlink first)
+   rm ${PREFIX}/bin/${BROWSER_NAME}
+   ${SUBST_PROGRAM} ${FILESDIR}/${BROWSER_NAME} \
+   ${PREFIX}/bin/${BROWSER_NAME}
 
 .include 
Index: browser/distinfo
===
RCS file: /cvs/ports/www/tor-browser/browser/distinfo,v
retrieving revision 1.22
diff -u -p -r1.22 distinfo
--- browser/distinfo9 Apr 2020 21:15:29 -   1.22
+++ browser/distinfo10 Apr 2020 19:23:00 -
@@ -1,4 +1,6 @@
 SHA256 

CVS: cvs.openbsd.org: ports

[Paco Esteban]

CVSROOT:/cvs
Module name:ports
Changes by: p...@cvs.openbsd.org2020/04/10 13:08:39

Modified files:
www/hugo   : Makefile distinfo 

Log message:
update www/hugo to bugfix release 0.69.0

* Extend Jsonify to support options map
* Extend Jsonify to support optional indent parameter
* Regen docs helper
* Collect HTML elements during the build to use in PurgeCSS etc.
* Update to latest emoji package
* Update hosting-on-aws-amplify.md
* Add basic "post resource publish support"
* Typo correction [commit 7eba37ae]
* Use semver for min_version per recommendations
* Updateto gitmap v1.1.2
* Add data context to the key in ExecuteAsTemplate"
* Fix hugo mod vendor for regular file mounts
* Revert "Revert "common/herrors: Fix typos in comments""
* Fix typos in comments" [commit 4437e918]
* Fix typos in comments [commi t1123711b]
* Fix TrimShortHTML
* Fix IsDescendant/IsAncestor for overlapping section names
* fix typo in getting started
* Fix _build.list.local logic
* Fix cache reset for a page's collections on server live reload

ok jca@

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2020/04/10 12:51:32

Modified files:
www/chromium   : Makefile distinfo 
www/chromium/files: hid_service_fido.cc hid_service_fido.h 
www/chromium/patches: patch-BUILD_gn 
  patch-ash_display_mirror_window_controller_cc 
  patch-base_BUILD_gn 
  patch-base_i18n_icu_util_cc 
  
patch-base_memory_madv_free_discardable_memory_posix_cc 
  patch-base_process_memory_cc 
  patch-base_rand_util_posix_cc 
  patch-base_system_sys_info_h 
  patch-base_test_launcher_test_launcher_cc 
  patch-base_third_party_symbolize_symbolize_cc 
  patch-base_trace_event_malloc_dump_provider_cc 
  patch-build_config_compiler_BUILD_gn 
  patch-build_toolchain_gcc_toolchain_gni 
  patch-cc_BUILD_gn 
  patch-chrome_app_chrome_main_delegate_cc 
  patch-chrome_app_chromium_strings_grd 
  patch-chrome_app_generated_resources_grd 
  patch-chrome_app_google_chrome_strings_grd 
  patch-chrome_app_settings_strings_grdp 
  patch-chrome_browser_about_flags_cc 
  patch-chrome_browser_after_startup_task_utils_cc 
  patch-chrome_browser_browser_process_impl_cc 
  patch-chrome_browser_browser_resources_grd 
  patch-chrome_browser_chrome_browser_main_cc 
  
patch-chrome_browser_chrome_content_browser_client_cc 
  
patch-chrome_browser_chrome_content_browser_client_h 
  
patch-chrome_browser_download_chrome_download_manager_delegate_cc 
  patch-chrome_browser_download_download_commands_h 
  
patch-chrome_browser_download_download_item_model_cc 
  
patch-chrome_browser_download_download_shelf_context_menu_cc 
  patch-chrome_browser_extensions_BUILD_gn 
  
patch-chrome_browser_extensions_api_settings_private_prefs_util_cc 
  
patch-chrome_browser_extensions_external_provider_impl_cc 
  patch-chrome_browser_flag_descriptions_cc 
  patch-chrome_browser_flag_descriptions_h 
  
patch-chrome_browser_media_webrtc_webrtc_logging_controller_cc 
  
patch-chrome_browser_metrics_chrome_metrics_service_client_cc 
  
patch-chrome_browser_native_file_system_chrome_native_file_system_permission_context_cc
 
  
patch-chrome_browser_net_system_network_context_manager_cc 
  
patch-chrome_browser_notifications_notification_display_service_impl_cc 
  
patch-chrome_browser_policy_configuration_policy_handler_list_factory_cc 
  patch-chrome_browser_prefs_browser_prefs_cc 
  
patch-chrome_browser_profiles_chrome_browser_main_extra_parts_profiles_cc 
  
patch-chrome_browser_profiles_profile_attributes_entry_cc 
  patch-chrome_browser_profiles_profile_impl_cc 
  patch-chrome_browser_renderer_preferences_util_cc 
  
patch-chrome_browser_resources_plugin_metadata_plugins_linux_json 
  
patch-chrome_browser_resources_settings_appearance_page_appearance_page_html 
  
patch-chrome_browser_resources_settings_appearance_page_appearance_page_js 
  
patch-chrome_browser_safe_browsing_incident_reporting_incident_reporting_service_cc
 
  
patch-chrome_browser_sharing_sharing_handler_registry_impl_cc 
  
patch-chrome_browser_ssl_ssl_error_controller_client_cc 
  patch-chrome_browser_sync_chrome_sync_client_cc 
  
patch-chrome_browser_task_manager_sampling_task_group_sampler_cc 
  
patch-chrome_browser_themes_theme_service_factory_cc 
  
patch-chrome_browser_tracing_crash_service_uploader_cc 
  
patch-chrome_browser_ui_browser_command_controller_cc 
  patch-chrome_browser_ui_sad_tab_cc 
  

Re: update to libvips 8.9.0

[Denis Fondras]

Hi,

Can we get this in for 6.7 ?

On Sun, Feb 09, 2020 at 10:31:14AM +0100, Stephane Guedon wrote:
> Le samedi 1 février 2020, 15:43:59 CET Stuart Henderson a écrit :
> > On 2020/02/01 10:06, Stephane Guedon wrote:
> > > Le mercredi 29 janvier 2020, 22:20:25 CET Stuart Henderson a écrit :
> > > > - either use the directory "vips", or name the package "libvips",
> > > > just pick one or the other. "PKGNAME= lib${DISTNAME}" will do if
> > > > you
> > > > want libvips.
> > > > 
> > > > (if it's better known as a library then prefer "libvips", if it's
> > > > better known for the tools then prefer just "vips").
> > > > 
> > > > - seems more like a port that should be in "graphics" rather than
> > > > multimedia?
> > > > 
> > > > - the comment "# Dependencies" doesn't add anything that
> > > > LIB_DEPENDS
> > > > doesn't already say, please zap
> > > > 
> > > > - plist was generated on stable or old current, it should be
> > > > udpated
> > > > on -current (some of the files will get "@static-lib" markers)
> > > > 
> > > > - there are a number of unlisted dependencies that are picked up
> > > > by configure if present at build time. these must either be
> > > > disabled,
> > > > or explicit dependencies added. at least one of these adds extra
> > > > PLIST files (gir) and I get about 50 lines of output from "make
> > > > port-lib-depends-check" for things which are either "NOT
> > > > REACHABLE"
> > > > (no LIB_DEPENDS to pull in the library) or just "Missing:" (where
> > > > there is a dependency path but no WANTLIB entry for them).
> > > > 
> > > > libvips-8.9.0(graphics/libvips):
> > > > Missing lib: Half-2_4.0 (/usr/local/lib/libvips.so.0.0) (NOT
> > > > REACHABLE) Missing: ICE.11 (/usr/local/lib/libvips.so.0.0) (system
> > > > lib) Missing lib: Iex-2_4.0 (/usr/local/lib/libvips.so.0.0) (NOT
> > > > REACHABLE) Missing lib: IexMath-2_4.0
> > > > (/usr/local/lib/libvips.so.0.0)
> > > > (NOT REACHABLE) Missing lib: IlmImf-2_4.0
> > > > (/usr/local/lib/libvips.so.0.0) (NOT REACHABLE) Missing lib:
> > > > IlmThread-2_4.0 (/usr/local/lib/libvips.so.0.0) (NOT REACHABLE)
> > > > Missing lib: Imath-2_4.0 (/usr/local/lib/libvips.so.0.0) (NOT
> > > > REACHABLE) Missing lib: MagickCore-6.Q16.7
> > > > (/usr/local/lib/libvips.so.0.0) (NOT REACHABLE) Missing: SM.9
> > > > (/usr/local/lib/libvips.so.0.0) (system lib)
> > > > Missing: X11.17 (/usr/local/lib/libvips.so.0.0) (system lib)
> > > > Missing: Xext.13 (/usr/local/lib/libvips.so.0.0) (system lib)
> > > > Missing: Xrender.6 (/usr/local/lib/libvips.so.0.0) (system lib)
> > > > Missing: Xt.11 (/usr/local/lib/libvips.so.0.0) (system lib)
> > > > Missing: bz2.10 from bzip2-1.0.8 (/usr/local/lib/libvips.so.0.0)
> > > > Missing lib: cairo-gobject.2 (/usr/local/lib/libvips.so.0.0) (NOT
> > > > REACHABLE) Missing lib: cairo.13 (/usr/local/lib/libvips.so.0.0)
> > > > (NOT
> > > > REACHABLE) Missing lib: djvulibre.26
> > > > (/usr/local/lib/libvips.so.0.0)
> > > > (NOT REACHABLE) <..snip..>
> > > > 
> > > > and an excerpt from the configure check showing the sort of things
> > > > you're looking for in there, all various things where there's a
> > > > check
> > > > which doesn't find the relevant dependency, decide whether you
> > > > want
> > > > to list the dependency or add the relevant CONFIGURE_ARGS line to
> > > > disable it.
> > > > 
> > > > checking for IceConnectionNumber in -lICE... (cached) yes
> > > > checking for NIFTI... libraries (none), headers (none)
> > > > checking for HEIF... no
> > > > configure: WARNING: libheif not found; disabling HEIF support
> > > > checking for PDFIUM... libraries (none), headers (none)
> > > > checking for POPPLER... yes
> > > > checking for RSVG... yes
> > > > checking for ZLIB... yes
> > > > checking for OPENSLIDE... no
> > > > configure: OpenSlide >= 3.4.0 not found; checking for >= 3.3.0
> > > > checking for OPENSLIDE... no
> > > > configure: WARNING: OpenSlide >= 3.3.0 not found; disabling
> > > > virtual
> > > > slide support checking for MATIO... no
> > > > configure: WARNING: matio not found; disabling matio support
> > > > checking for CFITSIO... no
> > > > configure: WARNING: cfitsio not found; disabling cfitsio support
> > > > checking for LIBWEBP... yes
> > > > checking for PANGOFT2... yes
> > > > checking for TIFF... yes
> > > > checking whether COMPRESSION_WEBP is declared... no
> > > > checking for giflib... libraries -L/usr/local/lib -lgif, headers
> > > > -I/usr/local/include checking for PNG... yes
> > > > checking for png_set_chunk_malloc_max... yes
> > > > checking for IMAGEQUANT... no
> > > > configure: WARNING: libimagequant not found; disabling 8bpp PNG
> > > > support checking for JPEG... yes
> > > > checking for jpeg_c_bool_param_supported... no
> > > > checking for EXIF... yes
> > > > checking exif-data.h usability... yes
> > > > checking exif-data.h presence... yes
> > > > checking for exif-data.h... yes
> > > > 
> > > > Tip: if you're doing various rebuilds while working on disabling
> > > > things 

Re: [NEW] games/wrath

[Paul Valencia]

On Fri, Apr 10, 2020 at 01:44:54PM +0200, Solene Rapenne wrote:
> On Fri, Apr 10, 2020 at 02:40:22AM -0500, Paul Valencia wrote:
> > Hi,
> > 
> > Here is a new port for the wrath-darkplaces engine [1]
> > which is used in the game WRATH: Aeon of Ruin.
> > 
> > Some notes about this:
> > 
> > - There is no release, so I used GH_COMMIT
> > 
> > - Pass port-lib-depends-check and portcheck
> > 
> > - I used games/xonotic as a reference for this port
> > since it is related to the darkplaces engine.
> > 
> > - I renamed the binary to wrath as a recommendation
> > here [2]
> > 
> > - I tested the three levels of the game on amd64
> > 
> > - In the game, I found an issue with the mouse when
> > you have different artifacts(3+) in your inventory
> > that only allows you to select the extreme left/right
> > artifact.
> > 
> > OK's? Comments?
> > 
> > [1] https://github.com/KillPixelGames/wrath-darkplaces
> > [2] https://github.com/KillPixelGames/wrath-darkplaces#running
> 
> the port looks fine to me (and works well) altough
> 
> - README should explain that you need to run wrath binary in a directory
>   where the folder kp1 is available, or that you can use some args for
>   that (at least the game tell you to use -basedir to find the assets)
> - version maybe be 20200228 instead of adding 0.0.0 as a prefix to
>   commit date?

Here is the port with the README change. I use the prefix 0.0.0
for the version because there may be an official release in the
future (e.g. 1.X.X) and to avoid EPOCH if that happens.

Thanks for your input.


wrath.tgz
Description: application/tar-gz

Re: CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

On Fri, Apr 10, 2020 at 05:15:03AM -0600, Thomas Frohwein wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   t...@cvs.openbsd.org2020/04/10 05:15:03
> 
> Log message:
> import gogrepo, a CLI downloader for GOG.com games
> ok solene@

Does not build because you set:
NO_BUILD = Yes

>>> Building on exopi-9 under games/gogrepo
 DIST = [games/gogrepo:gogrepo-0.3apl20190727-2cd3ac4a.tar.gz]
 FULLPKGNAME = gogrepo-0.3apl20190727
 RDEPENDS = [lang/python/3.7;devel/py-html5lib,python3]
distfiles size=15067
>>> Running patch in games/gogrepo at 1586534312.74
===> games/gogrepo
===>  Checking files for gogrepo-0.3apl20190727
`/exopi-cvs/ports/distfiles/gogrepo-0.3apl20190727-2cd3ac4a.tar.gz' is up to 
date.
>> (SHA256) gogrepo-0.3apl20190727-2cd3ac4a.tar.gz: OK
===>  Extracting for gogrepo-0.3apl20190727
===>  Patching for gogrepo-0.3apl20190727
===>  Compiler link: clang -> /usr/bin/clang
===>  Compiler link: clang++ -> /usr/bin/clang++
===>  Compiler link: cc -> /usr/bin/cc
===>  Compiler link: c++ -> /usr/bin/c++
>>> Running configure in games/gogrepo at 1586534314.09
===> games/gogrepo
===>  Generating configure for gogrepo-0.3apl20190727
===>  Configuring for gogrepo-0.3apl20190727
>>> Running build in games/gogrepo at 1586534315.71
===> games/gogrepo
>>> Running fake in games/gogrepo at 1586534316.17
===> games/gogrepo
===>  Faking installation for gogrepo-0.3apl20190727
/exopi-obj/pobj/gogrepo-0.3apl20190727/bin/install -d -m 755  
/exopi-obj/pobj/gogrepo-0.3apl20190727/fake-amd64/usr/local/lib/python3.7/site-packages/gogrepo
/exopi-obj/pobj/gogrepo-0.3apl20190727/bin/install -c -m 644 
/exopi-obj/pobj/gogrepo-0.3apl20190727/gogrepo-2cd3ac4a77d3e5104662fcfb4d96e7129a758bfe/*
  
/exopi-obj/pobj/gogrepo-0.3apl20190727/fake-amd64/usr/local/lib/python3.7/site-packages/gogrepo/
/usr/bin/perl /exopi-cvs/ports/infrastructure/bin/pkg_subst 
-DMODPY_PYCACHE=\"__pycache__/\" -DMODPY_COMMENT= -DMODPY_ABI3SO=\".abi3\" 
-DMODPY_PYC_MAGIC_TAG=\"cpython-37.\" -DMODPY_BIN=/usr/local/bin/python3.7 
-DMODPY_EGG_VERSION=0.3apl20190727 -DMODPY_VERSION=3.7 -DMODPY_BIN_SUFFIX=-3 
-DMODPY_PY_PREFIX=py3- -DMODPY_PYOEXTENSION=opt-1.pyc -DARCH=amd64 
-DBASE_PKGPATH=games/gogrepo -DFLAVOR_EXT= -DFULLPKGNAME=gogrepo-0.3apl20190727 
-DHOMEPAGE=https://github.com/eddie3/gogrepo -DLOCALBASE=/usr/local 
-DLOCALSTATEDIR=/var -DMACHINE_ARCH=amd64 -DMAINTAINER=Thomas\ Frohwein\ 
\ 
-DPREFIX=/exopi-obj/pobj/gogrepo-0.3apl20190727/fake-amd64/usr/local 
-DRCDIR=/etc/rc.d -DSYSCONFDIR=/etc -DTRUEPREFIX=/usr/local 
-DX11BASE=/usr/X11R6 -DPKGSTEM=gogrepo -i -B 
/exopi-obj/pobj/gogrepo-0.3apl20190727 -c -m 755 
/exopi-cvs/ports/games/gogrepo/files/gogrepo  
/exopi-obj/pobj/gogrepo-0.3apl20190727/fake-amd64/usr/local/bin/gogrepo
/usr/local/bin/python3.7 /usr/local/lib/python3.7/compileall.py  
/exopi-obj/pobj/gogrepo-0.3apl20190727/fake-amd64/usr/local/lib/python3.7/site-packages/gogrepo
/usr/local/bin/python3.7: not found
*** Error 1 in games/gogrepo (Makefile:35 'do-install')
*** Error 2 in games/gogrepo 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2986 
'/exopi-obj/pobj/gogrepo-0.3apl20190727/fake-amd64/.fake_done')
===> Exiting games/gogrepo with an error
*** Error 2 in games/gogrepo 
(/exopi-cvs/ports/infrastructure/mk/bsd.port.mk:2573 'fake': 
@lock=gogrepo-0.3apl20190727;  export _LOCKS_HELD=...)
*** Error 1 in /exopi-cvs/ports (infrastructure/mk/bsd.port.subdir.mk:137 
'fake': @: ${echo_msg:=echo};  : ${target:=fake};  for i in ; do  ...)
>>> Ended at 1586534316.76
Error: job failed with 512 on exopi-9 at 1586534316

-- 
Antoine

sysutils/xstatbar: use sndio instead of the raw /dev/mixer device

[Alexandre Ratchov]

This just replaces kernel mixer(4) ioctls with appropriate
sioctl_open(3) calls.

OK?

Index: Makefile
===
RCS file: /cvs/ports/sysutils/xstatbar/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- Makefile12 Jul 2019 20:49:55 -  1.21
+++ Makefile10 Apr 2020 15:32:32 -
@@ -5,7 +5,7 @@ ONLY_FOR_ARCHS= ${APM_ARCHS}
 COMMENT=   simple system monitor bar
 
 DISTNAME=  xstatbar-0.5
-REVISION=  10
+REVISION=  11
 FIX_EXTRACT_PERMISSIONS=Yes
 
 CATEGORIES=sysutils x11
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/sysutils/xstatbar/patches/patch-Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 patch-Makefile
--- patches/patch-Makefile  1 Jun 2018 14:16:46 -   1.5
+++ patches/patch-Makefile  10 Apr 2020 15:32:32 -
@@ -2,15 +2,17 @@ $OpenBSD: patch-Makefile,v 1.5 2018/06/0
 Index: Makefile
 --- Makefile.orig
 +++ Makefile
-@@ -4,7 +4,7 @@ MANDIR=/usr/local/man/man1
+@@ -4,8 +4,8 @@ MANDIR=/usr/local/man/man1
  
  # build flags
  CC?=/usr/bin/cc
 -CFLAGS+=-c -std=c89 -Wall -O2 -I/usr/X11R6/include
+-LDFLAGS+=-L/usr/X11R6/lib -lX11 -lXext -lXrender -lXau -lXdmcp -lm
 +CFLAGS+=-c -std=c89 -Wall -I/usr/X11R6/include
- LDFLAGS+=-L/usr/X11R6/lib -lX11 -lXext -lXrender -lXau -lXdmcp -lm
++LDFLAGS+=-L/usr/X11R6/lib -lX11 -lXext -lXrender -lXau -lXdmcp -lm -lsndio
  
  OBJS=xstatbar.o stats.o
+ 
 @@ -16,8 +16,8 @@ xstatbar: $(OBJS)
$(CC) $(CFLAGS) $<
  
Index: patches/patch-stats_c
===
RCS file: /cvs/ports/sysutils/xstatbar/patches/patch-stats_c,v
retrieving revision 1.10
diff -u -p -r1.10 patch-stats_c
--- patches/patch-stats_c   24 Feb 2019 15:02:19 -  1.10
+++ patches/patch-stats_c   10 Apr 2020 15:32:32 -
@@ -6,19 +6,208 @@ progress and loop forever. Fix it by try
 Index: stats.c
 --- stats.c.orig
 +++ stats.c
-@@ -101,8 +101,10 @@ volume_init()
-devinfo.index = 0;
-while (ioctl(volume.dev_fd, AUDIO_MIXER_DEVINFO, ) >= 0) {
+@@ -61,118 +61,101 @@ fmtmem(int m)
+  * volume stuff
+  /
+ 
+-int
+-volume_check_dev(int fd, int class, char *name)
++/*
++ * new control
++ */
++void
++volume_ondesc(void *unused, struct sioctl_desc *d, int val)
+ {
+-   mixer_devinfo_t devinfo;
++   if (d == NULL)
++  return;
+ 
+-   if (class < 0 || name == NULL)
+-  return (-1);
++   if (d->addr == volume.left_addr)
++  volume.left_addr = -1;
++   if (d->addr == volume.right_addr)
++  volume.right_addr = -1;
+ 
+-   devinfo.index = 0;
+-   while (ioctl(fd, AUDIO_MIXER_DEVINFO, ) >= 0) {
+-  if ((devinfo.type == AUDIO_MIXER_VALUE)
+-  &&  (devinfo.mixer_class == class)
+-  &&  (strncmp(devinfo.label.name, name, MAX_AUDIO_DEV_LEN) == 0))
+- return (devinfo.index);
++   if (d->type == SIOCTL_NUM &&
++  strcmp(d->group, "") == 0 &&
++  strcmp(d->node0.name, "output") == 0 &&
++  strcmp(d->func, "level") == 0) {
+ 
+-  devinfo.index++;
++  switch (d->node0.unit) {
++  case -1:/* mono */
++  case 0: /* left */
++ volume.left_addr = d->addr;
++ volume.left_max = d->maxval;
++ break;
++  case 1: /* right */
++ volume.right_addr = d->addr;
++ volume.right_max = d->maxval;
++  }
+}
++}
+ 
+-   return (-1);
++/*
++ * control value changed
++ */
++void
++volume_onval(void *unused, unsigned int addr, unsigned int value)
++{
++   if (addr == volume.left_addr)
++  volume.left = value;
++   if (addr == volume.right_addr)
++  volume.right = value;
+ }
+ 
+ void
+ volume_init()
+ {
+-   mixer_devinfo_t devinfo;
+-   int oclass_idx, iclass_idx;
+-
+volume.is_setup = false;
  
+-   /* open mixer */
+-   if ((volume.dev_fd = open("/dev/mixer", O_RDWR)) < 0) {
+-  warn("volume: failed to open /dev/mixer");
++   if ((volume.hdl = sioctl_open(SIO_DEVANY, SIOCTL_READ, 0)) == NULL) {
++  warn("volume: failed to open default device");
+   return;
+}
+ 
+-   /* find the outputs and inputs classes */
+-   oclass_idx = iclass_idx = -1;
+-   devinfo.index = 0;
+-   while (ioctl(volume.dev_fd, AUDIO_MIXER_DEVINFO, ) >= 0) {
+-
 -  if (devinfo.type != AUDIO_MIXER_CLASS)
-+  if (devinfo.type != AUDIO_MIXER_CLASS) {
-+ devinfo.index++;
-  continue;
-+  }
+- continue;
+-
+-  if (strncmp(devinfo.label.name, AudioCoutputs, MAX_AUDIO_DEV_LEN) == 0)
+- oclass_idx = devinfo.index;
+-  if (strncmp(devinfo.label.name, AudioCinputs, MAX_AUDIO_DEV_LEN) == 0)
+- iclass_idx = devinfo.index;
+-
+-  if (oclass_idx != -1 && iclass_idx != -1)
+- break;
+-
+-  devinfo.index++;
++   volume.pfds = calloc(sioctl_nfds(volume.hdl), sizeof(struct pollfd));
++   if (volume.pfds == NULL) {
++

CVS: cvs.openbsd.org: ports

[Sebastien Marie]

CVSROOT:/cvs
Module name:ports
Changes by: sema...@cvs.openbsd.org 2020/04/10 09:22:51

Modified files:
productivity/tryton/5.2/account: Makefile distinfo 
productivity/tryton/5.2/account_asset: Makefile distinfo 
productivity/tryton/5.2/account_be: Makefile distinfo 
productivity/tryton/5.2/account_be/pkg: PLIST 
productivity/tryton/5.2/account_credit_limit: Makefile distinfo 
productivity/tryton/5.2/account_credit_limit/pkg: PLIST 
productivity/tryton/5.2/account_de_skr03: Makefile distinfo 
productivity/tryton/5.2/account_de_skr03/pkg: PLIST 
productivity/tryton/5.2/account_deposit: Makefile distinfo 
productivity/tryton/5.2/account_dunning: Makefile distinfo 
productivity/tryton/5.2/account_dunning/pkg: PLIST 
productivity/tryton/5.2/account_dunning_email: Makefile distinfo 
productivity/tryton/5.2/account_dunning_email/pkg: PLIST 
productivity/tryton/5.2/account_dunning_fee: Makefile distinfo 
productivity/tryton/5.2/account_dunning_fee/pkg: PLIST 
productivity/tryton/5.2/account_dunning_letter: Makefile 
distinfo 
productivity/tryton/5.2/account_dunning_letter/pkg: PLIST 
productivity/tryton/5.2/account_es: Makefile distinfo 
productivity/tryton/5.2/account_eu: Makefile distinfo 
productivity/tryton/5.2/account_eu/pkg: PLIST 
productivity/tryton/5.2/account_fr: Makefile distinfo 
productivity/tryton/5.2/account_fr/pkg: PLIST 
productivity/tryton/5.2/account_invoice: Makefile distinfo 
productivity/tryton/5.2/account_invoice_correction: Makefile 
distinfo 
productivity/tryton/5.2/account_invoice_correction/pkg: PLIST 
productivity/tryton/5.2/account_invoice_history: Makefile 
 distinfo 
productivity/tryton/5.2/account_invoice_stock: Makefile distinfo 
productivity/tryton/5.2/account_invoice_stock/pkg: PLIST 
productivity/tryton/5.2/account_payment: Makefile distinfo 
productivity/tryton/5.2/account_payment_clearing: Makefile 
  distinfo 
productivity/tryton/5.2/account_payment_sepa_cfonb: Makefile 
distinfo 
productivity/tryton/5.2/account_payment_sepa_cfonb/pkg: PLIST 
productivity/tryton/5.2/account_product: Makefile distinfo 
productivity/tryton/5.2/account_statement: Makefile distinfo 
productivity/tryton/5.2/account_statement_ofx: Makefile distinfo 
productivity/tryton/5.2/account_statement_rule: Makefile 
distinfo 
productivity/tryton/5.2/account_stock_anglo_saxon: Makefile 
   distinfo 
productivity/tryton/5.2/account_stock_anglo_saxon/pkg: PLIST 
productivity/tryton/5.2/account_stock_continental: Makefile 
   distinfo 
productivity/tryton/5.2/account_stock_continental/pkg: PLIST 
productivity/tryton/5.2/account_stock_landed_cost: Makefile 
   distinfo 
productivity/tryton/5.2/account_stock_landed_cost/pkg: PLIST 
productivity/tryton/5.2/account_stock_landed_cost_weight: 
  Makefile 
  distinfo 
productivity/tryton/5.2/account_stock_landed_cost_weight/pkg: 
  PLIST 
productivity/tryton/5.2/analytic_account: Makefile distinfo 
productivity/tryton/5.2/analytic_account/pkg: PLIST 
productivity/tryton/5.2/analytic_invoice: Makefile distinfo 
productivity/tryton/5.2/analytic_invoice/pkg: PLIST 
productivity/tryton/5.2/analytic_purchase: Makefile distinfo 
productivity/tryton/5.2/analytic_purchase/pkg: PLIST 
productivity/tryton/5.2/analytic_sale: Makefile distinfo 
productivity/tryton/5.2/analytic_sale/pkg: PLIST 
productivity/tryton/5.2/authentication_sms: Makefile distinfo 
productivity/tryton/5.2/authentication_sms/pkg: PLIST 
productivity/tryton/5.2/bank: Makefile distinfo 
productivity/tryton/5.2/bank/pkg: PLIST 
productivity/tryton/5.2/carrier: Makefile distinfo 
productivity/tryton/5.2/carrier_percentage: Makefile distinfo 
productivity/tryton/5.2/carrier_percentage/pkg: PLIST 
productivity/tryton/5.2/carrier_weight: Makefile distinfo 
productivity/tryton/5.2/commission: Makefile distinfo 

CVS: cvs.openbsd.org: ports

[Sebastien Marie]

CVSROOT:/cvs
Module name:ports
Changes by: sema...@cvs.openbsd.org 2020/04/10 09:21:16

Modified files:
productivity/tryton/5.0/account: Makefile distinfo 
productivity/tryton/5.0/account_asset: Makefile distinfo 
productivity/tryton/5.0/account_be: Makefile distinfo 
productivity/tryton/5.0/account_be/pkg: PLIST 
productivity/tryton/5.0/account_credit_limit: Makefile distinfo 
productivity/tryton/5.0/account_credit_limit/pkg: PLIST 
productivity/tryton/5.0/account_de_skr03: Makefile distinfo 
productivity/tryton/5.0/account_de_skr03/pkg: PLIST 
productivity/tryton/5.0/account_deposit: Makefile distinfo 
productivity/tryton/5.0/account_deposit/pkg: PLIST 
productivity/tryton/5.0/account_dunning: Makefile distinfo 
productivity/tryton/5.0/account_dunning/pkg: PLIST 
productivity/tryton/5.0/account_dunning_email: Makefile distinfo 
productivity/tryton/5.0/account_dunning_email/pkg: PLIST 
productivity/tryton/5.0/account_dunning_fee: Makefile distinfo 
productivity/tryton/5.0/account_dunning_fee/pkg: PLIST 
productivity/tryton/5.0/account_dunning_letter: Makefile 
distinfo 
productivity/tryton/5.0/account_dunning_letter/pkg: PLIST 
productivity/tryton/5.0/account_es: Makefile distinfo 
productivity/tryton/5.0/account_eu: Makefile distinfo 
productivity/tryton/5.0/account_eu/pkg: PLIST 
productivity/tryton/5.0/account_fr: Makefile distinfo 
productivity/tryton/5.0/account_fr_chorus: Makefile distinfo 
productivity/tryton/5.0/account_invoice: Makefile distinfo 
productivity/tryton/5.0/account_invoice_correction: Makefile 
distinfo 
productivity/tryton/5.0/account_invoice_correction/pkg: PLIST 
productivity/tryton/5.0/account_invoice_history: Makefile 
 distinfo 
productivity/tryton/5.0/account_invoice_line_standalone: 
 Makefile 
 distinfo 
productivity/tryton/5.0/account_invoice_line_standalone/pkg: 
 PLIST 
productivity/tryton/5.0/account_invoice_stock: Makefile distinfo 
productivity/tryton/5.0/account_invoice_stock/pkg: PLIST 
productivity/tryton/5.0/account_payment: Makefile distinfo 
productivity/tryton/5.0/account_payment_clearing: Makefile 
  distinfo 
productivity/tryton/5.0/account_payment_sepa_cfonb: Makefile 
distinfo 
productivity/tryton/5.0/account_product: Makefile distinfo 
productivity/tryton/5.0/account_statement: Makefile distinfo 
productivity/tryton/5.0/account_statement_ofx: Makefile distinfo 
productivity/tryton/5.0/account_stock_anglo_saxon: Makefile 
   distinfo 
productivity/tryton/5.0/account_stock_anglo_saxon/pkg: PLIST 
productivity/tryton/5.0/account_stock_continental: Makefile 
   distinfo 
productivity/tryton/5.0/account_stock_continental/pkg: PLIST 
productivity/tryton/5.0/account_stock_landed_cost: Makefile 
   distinfo 
productivity/tryton/5.0/account_stock_landed_cost/pkg: PLIST 
productivity/tryton/5.0/account_stock_landed_cost_weight: 
  Makefile 
  distinfo 
productivity/tryton/5.0/account_stock_landed_cost_weight/pkg: 
  PLIST 
productivity/tryton/5.0/analytic_account: Makefile distinfo 
productivity/tryton/5.0/analytic_account/pkg: PLIST 
productivity/tryton/5.0/analytic_invoice: Makefile distinfo 
productivity/tryton/5.0/analytic_invoice/pkg: PLIST 
productivity/tryton/5.0/analytic_purchase: Makefile distinfo 
productivity/tryton/5.0/analytic_purchase/pkg: PLIST 
productivity/tryton/5.0/analytic_sale: Makefile distinfo 
productivity/tryton/5.0/analytic_sale/pkg: PLIST 
productivity/tryton/5.0/authentication_sms: Makefile distinfo 
productivity/tryton/5.0/authentication_sms/pkg: PLIST 
productivity/tryton/5.0/bank: Makefile distinfo 
productivity/tryton/5.0/bank/pkg: PLIST 
productivity/tryton/5.0/carrier: Makefile distinfo 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/04/10 09:02:59

Modified files:
sysutils/terragrunt: Makefile 

Log message:
Fix path to terraform dependency.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/04/10 09:02:26

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

Log message:
Register terraform providers removal.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/04/10 09:01:52

Modified files:
sysutils/terraform: Makefile 
sysutils/terraform/pkg: DESCR PLIST 
Added files:
sysutils/terraform: distinfo 
Removed files:
sysutils/terraform: Makefile.inc 
sysutils/terraform/provider-alicloud: Makefile distinfo 
sysutils/terraform/provider-archive: Makefile distinfo 
sysutils/terraform/provider-arukas: Makefile distinfo 
sysutils/terraform/provider-atlas: Makefile distinfo 
sysutils/terraform/provider-aws: Makefile distinfo 
sysutils/terraform/provider-azure: Makefile distinfo 
sysutils/terraform/provider-azurerm: Makefile distinfo 
sysutils/terraform/provider-bitbucket: Makefile distinfo 
sysutils/terraform/provider-chef: Makefile distinfo 
sysutils/terraform/provider-circonus: Makefile distinfo 
sysutils/terraform/provider-clc: Makefile distinfo 
sysutils/terraform/provider-cloudflare: Makefile distinfo 
sysutils/terraform/provider-cloudstack: Makefile distinfo 
sysutils/terraform/provider-cobbler: Makefile distinfo 
sysutils/terraform/provider-consul: Makefile distinfo 
sysutils/terraform/provider-datadog: Makefile distinfo 
sysutils/terraform/provider-digitalocean: Makefile distinfo 
sysutils/terraform/provider-dme: Makefile distinfo 
sysutils/terraform/provider-dns: Makefile distinfo 
sysutils/terraform/provider-dnsimple: Makefile distinfo 
sysutils/terraform/provider-docker: Makefile distinfo 
sysutils/terraform/provider-dyn: Makefile distinfo 
sysutils/terraform/provider-exoscale: Makefile distinfo 
sysutils/terraform/provider-external: Makefile distinfo 
sysutils/terraform/provider-fastly: Makefile distinfo 
sysutils/terraform/provider-github: Makefile distinfo 
sysutils/terraform/provider-gitlab: Makefile distinfo 
sysutils/terraform/provider-google: Makefile distinfo 
sysutils/terraform/provider-grafana: Makefile distinfo 
sysutils/terraform/provider-heroku: Makefile distinfo 
sysutils/terraform/provider-http: Makefile distinfo 
sysutils/terraform/provider-icinga2: Makefile distinfo 
sysutils/terraform/provider-ignition: Makefile distinfo 
sysutils/terraform/provider-influxdb: Makefile distinfo 
sysutils/terraform/provider-kubernetes: Makefile distinfo 
sysutils/terraform/provider-librato: Makefile distinfo 
sysutils/terraform/provider-local: Makefile distinfo 
sysutils/terraform/provider-logentries: Makefile distinfo 
sysutils/terraform/provider-mailgun: Makefile distinfo 
sysutils/terraform/provider-mysql: Makefile distinfo 
sysutils/terraform/provider-newrelic: Makefile distinfo 
sysutils/terraform/provider-nomad: Makefile distinfo 
sysutils/terraform/provider-ns1: Makefile distinfo 
sysutils/terraform/provider-null: Makefile distinfo 
sysutils/terraform/provider-oneandone: Makefile distinfo 
sysutils/terraform/provider-opc: Makefile distinfo 
sysutils/terraform/provider-openstack: Makefile distinfo 
sysutils/terraform/provider-opsgenie: Makefile distinfo 
sysutils/terraform/provider-ovh: Makefile distinfo 
sysutils/terraform/provider-packet: Makefile distinfo 
sysutils/terraform/provider-pagerduty: Makefile distinfo 
sysutils/terraform/provider-postgresql: Makefile distinfo 
sysutils/terraform/provider-powerdns: Makefile distinfo 
sysutils/terraform/provider-profitbricks: Makefile distinfo 
sysutils/terraform/provider-rabbitmq: Makefile distinfo 
sysutils/terraform/provider-rancher: Makefile distinfo 
sysutils/terraform/provider-random: Makefile distinfo 
sysutils/terraform/provider-rundeck: Makefile distinfo 
sysutils/terraform/provider-scaleway: Makefile distinfo 
sysutils/terraform/provider-spotinst: Makefile distinfo 
sysutils/terraform/provider-statuscake: Makefile distinfo 
sysutils/terraform/provider-template: Makefile distinfo 
sysutils/terraform/provider-tls: Makefile distinfo 
sysutils/terraform/provider-triton: Makefile distinfo 
sysutils/terraform/provider-ultradns: Makefile distinfo 
sysutils/terraform/provider-vault: Makefile distinfo 
sysutils/terraform/provider-vcd: Makefile distinfo 
sysutils/terraform/provider-vsphere: Makefile distinfo 
sysutils/terraform/terraform: Makefile distinfo 
sysutils/terraform/terraform/pkg: DESCR PLIST 

Log message:
Remove terraform providers.
It's impossible to keep up-to-date and we usually want the latest release.
Terraform will download them automatically as requested; not ideal but
well...

Discussed with many weeks ago.
No 

CVS: cvs.openbsd.org: ports

[Charlene Wendling]

CVSROOT:/cvs
Module name:ports
Changes by: c...@cvs.openbsd.org2020/04/10 09:00:56

Modified files:
net/bro: Makefile 

Log message:
bro: don't require `-latomic' anymore on powerpc, since
this arch has been switched to clang

OK aja@ (maintainer)

CVS: cvs.openbsd.org: ports

[Charlene Wendling]

CVSROOT:/cvs
Module name:ports
Changes by: c...@cvs.openbsd.org2020/04/10 08:59:48

Modified files:
games/eduke32  : Makefile 

Log message:
eduke32: don't require `-latomic' anymore on powerpc, since
this arch has been switched to clang

OK Ryan Freeman (maintainer)

CVS: cvs.openbsd.org: ports

[Kurt Miller]

CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2020/04/10 08:45:43

Modified files:
sysutils/firmware/bwfm: Makefile distinfo 
sysutils/firmware/bwfm/pkg: PLIST 

Log message:
- Update to latest linux-firmware version 20200316
- Install board specific .txt files
- Install a supplemental distfile that adds Pinebook Pro and
Rock960 board specific firmware and NVRAM config.
Okay patrick@ sthen@

HEADS UP: Slowing down for release; request for testing

[Christian Weisgerber]

We are approaching the 6.7 release.  The ports tree is not locked
yet, but it's time to slowly take the foot off the pedal and to
refrain from far-reaching changes.

I'd love if the fallout from switching powerpc to clang could be
cleaned up in time for the release.  Using clang is intended to
make things better, not worse.

sparc64 will NOT switch to clang for this release.

If you don't want to be surprised by your favorite application being
broken on 6.7, you need to install -current and test snapshot packages
NOW, while there is still time to fix problems.

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

Re: UPDATE audio/audacious-4.0.1

[Christian Weisgerber]

On 2020-04-08, Bjorn Ketelaars  wrote:

> Diff below brings audacious to 4.0.1. Changes:
> https://audacious-media-player.org/news/45-audacious-4-0-released
> https://audacious-media-player.org/news/46-audacious-4-0-1-released
>
> Upstream has switched to Qt5 by default but still offers GTK2 support.
> For now I prefer to use the latter.

Also note: "Users of the Winamp-like UI may want to continue using
GTK2 for now."
I don't know about other people, but personally I use exclusively
the Winamp interface.

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

Re: New: zsh-syntax-highlighting

[Matthew Martin]

On Fri, Apr 10, 2020 at 09:13:43AM +0200, Rafael Sadowski wrote:
> On Thu Apr 09, 2020 at 09:43:36PM -0500, Matthew Martin wrote:
> > Small port for zsh-syntax-highlighting. Currently have it in shells, but
> > more than happy to move it if someone has a better suggestion. To test
> > source 
> > /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
> > after installing.
> > 
> > DESCR:
> > This package provides syntax highlighting for the shell zsh. It enables
> > highlighting of commands whilst they are typed at a zsh prompt into an
> > interactive terminal. This helps in reviewing commands before running them,
> > particularly in catching syntax errors.
> 
> Looks good and works here but do we need the following files to install?
> share/zsh-syntax-highlighting/.revision-hash
> share/zsh-syntax-highlighting/.version

.version is used to populate $ZSH_HIGHLIGHT_VERSION and .revision-hash
for $ZSH_HIGHLIGHT_REVISION. I'll upstream a commit to skip
.revision-hash for releases, but I'd prefer to avoid local patches.

CVS: cvs.openbsd.org: ports

[Frederic Cambus]

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2020/04/10 08:07:14

Modified files:
lang/mruby : Makefile 

Log message:
Mention that mruby should be kept in sync with the version bundled in
www/h2o.

Re: [UPDATE]: games/freeorion 0.49

[Elias M. Mariani]

Hi Tom,
- You should remove REVISION.
- The patch has an offset:
Patching file CMakeLists.txt using Plan A...
Hunk #1 succeeded at 459 (offset 65 lines).

A make update-patches should fix it.

OK mariani@ with those changes.
I take your word on compiling and running. :)

Cheers.
Elias.


On Fri, Apr 10, 2020 at 7:29 AM Tom Murphy  wrote:
>
> Hi,
>
>   Attached is a diff to bring games/freeorion to 0.4.9.
>   I removed boost_signals-mt from WANTLIB since it was
>   being listed as an extra lib.
>
>   Compiles fine and runs for me.
>
>   OK?
>
>   Thanks,
>   Tom
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/freeorion/Makefile,v
> retrieving revision 1.5
> diff -u -p -u -p -r1.5 Makefile
> --- Makefile23 Nov 2019 22:08:42 -  1.5
> +++ Makefile10 Apr 2020 08:55:18 -
> @@ -1,8 +1,8 @@
>  # $OpenBSD: Makefile,v 1.5 2019/11/23 22:08:42 cwen Exp $
>
> -V =0.4.8
> +V =0.4.9
>  COMMENT =  turn-based space empire and galactic conquest computer game
> -DISTNAME = FreeOrion_v${V}_2018-08-23.26f16b0_Source
> +DISTNAME = FreeOrion_v${V}_2020-02-02.db53471_Source
>  PKGNAME =  freeorion-${V}
>  CATEGORIES =   games
>  REVISION = 1
> @@ -18,7 +18,7 @@ WANTLIB += ${COMPILER_LIBCXX} GL GLEW GL
>  WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
>  WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt
>  WANTLIB += boost_python-mt boost_regex-mt boost_serialization-mt
> -WANTLIB += boost_signals-mt boost_system-mt boost_thread-mt c
> +WANTLIB += boost_system-mt boost_thread-mt c
>  WANTLIB += freetype m ogg openal png ${MODPY_WANTLIB} vorbis vorbisenc
>  WANTLIB += vorbisfile z
>
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/freeorion/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 distinfo
> --- distinfo3 Oct 2018 11:43:46 -   1.1.1.1
> +++ distinfo10 Apr 2020 08:55:18 -
> @@ -1,2 +1,2 @@
> -SHA256 (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = 
> 1AXb60Ovt/p2k3zxXNsQsV6BjaFx7B6wPkocPsu6Rvc=
> -SIZE (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = 106254059
> +SHA256 (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 
> Vomzpsq55s+8g9joLvMlu54AcRJi0msEbwg+pf3E1uE=
> +SIZE (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 124662273
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/games/freeorion/pkg/PLIST,v
> retrieving revision 1.1.1.1
> diff -u -p -u -p -r1.1.1.1 PLIST
> --- pkg/PLIST   3 Oct 2018 11:43:48 -   1.1.1.1
> +++ pkg/PLIST   10 Apr 2020 08:55:18 -
> @@ -3,10 +3,10 @@
>  @bin bin/freeorionca
>  @bin bin/freeoriond
>  lib/freeorion/
> -lib/freeorion/libGiGi.so
> -lib/freeorion/libGiGiSDL.so
> -lib/freeorion/libfreeorioncommon.so
> -lib/freeorion/libfreeorionparse.so
> +@so lib/freeorion/libGiGi.so
> +@so lib/freeorion/libGiGiSDL.so
> +@so lib/freeorion/libfreeorioncommon.so
> +@so lib/freeorion/libfreeorionparse.so
>  share/applications/freeorion.desktop
>  share/freeorion/
>  share/freeorion/default/
> @@ -48,7 +48,11 @@ share/freeorion/default/data/art/encyclo
>  
> share/freeorion/default/data/art/encyclopedia/planet_environments/pt_toxic02.png
>  
> share/freeorion/default/data/art/encyclopedia/planet_environments/pt_tundra.png
>  share/freeorion/default/data/art/fields/
> -share/freeorion/default/data/art/fields/rainbow_storm.png
> +share/freeorion/default/data/art/fields/accretion_disc.png
> +share/freeorion/default/data/art/fields/ion_storm.png
> +share/freeorion/default/data/art/fields/molecular_cloud.png
> +share/freeorion/default/data/art/fields/star_forming_nebula_1.png
> +share/freeorion/default/data/art/fields/star_forming_nebula_2.png
>  share/freeorion/default/data/art/galaxy_decoration/
>  share/freeorion/default/data/art/galaxy_decoration/blue_set/
>  share/freeorion/default/data/art/galaxy_decoration/blue_set/gaseous01.png
> @@ -527,6 +531,11 @@ share/freeorion/default/data/art/icons/p
>  share/freeorion/default/data/art/icons/planet/tiny.png
>  share/freeorion/default/data/art/icons/planet/toxic.png
>  share/freeorion/default/data/art/icons/planet/tundra.png
> +share/freeorion/default/data/art/icons/planet_status_attacked.png
> +share/freeorion/default/data/art/icons/planet_status_conquered.png
> +share/freeorion/default/data/art/icons/planet_status_supply.png
> +share/freeorion/default/data/art/icons/planet_status_unhappy.png
> +share/freeorion/default/data/art/icons/planet_status_warning.png
>  share/freeorion/default/data/art/icons/ready.png
>  share/freeorion/default/data/art/icons/ship_hulls/
>  
> share/freeorion/default/data/art/icons/ship_hulls/agregate_asteroid_hull_small.png
> @@ -700,6 +709,7 @@ share/freeorion/default/data/art/icons/s
>  share/freeorion/default/data/art/icons/sitrep/tech_researched.png
>  

CVS: cvs.openbsd.org: ports

[Frederic Cambus]

CVSROOT:/cvs
Module name:ports
Changes by: fcam...@cvs.openbsd.org 2020/04/10 08:03:38

Modified files:
devel/tig  : Makefile distinfo 

Log message:
Update tig to 2.5.1.

Re: UPDATE: net/prosody 0.11.5

[Lucas]

Lucas  wrote:
> Bump. Patch reattached as previous one included a leftover from cvs add
> for patches/patch-util-src_pposix_c, merged when update for 0.11.4 got
> commited. I'm still grasping CVS. ^^
> 
> -Lucas

Weekly bump.

-Lucas


Index: Makefile
===
RCS file: /home/cvs/ports/net/prosody/Makefile,v
retrieving revision 1.56
diff -u -p -r1.56 Makefile
--- Makefile15 Mar 2020 19:04:25 -  1.56
+++ Makefile24 Mar 2020 23:34:18 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.56 2020/03/15 19:04:25 solene Exp $
 
 COMMENT=   communications server for Jabber/XMPP written in Lua
-DISTNAME=  prosody-0.11.4
+DISTNAME=  prosody-0.11.5
 CATEGORIES=net
 MASTER_SITES=  https://prosody.im/downloads/source/
 
Index: distinfo
===
RCS file: /home/cvs/ports/net/prosody/distinfo,v
retrieving revision 1.17
diff -u -p -r1.17 distinfo
--- distinfo15 Mar 2020 19:04:25 -  1.17
+++ distinfo24 Mar 2020 23:34:35 -
@@ -1,2 +1,2 @@
-SHA256 (prosody-0.11.4.tar.gz) = tfJvo0PH8y9iQnIdaZHLNfXSoo0r9Z0rwympQFI3BP0=
-SIZE (prosody-0.11.4.tar.gz) = 423518
+SHA256 (prosody-0.11.5.tar.gz) = Vfi9ZdXSr2HMc5vWFk5CBwEeDS0mDN5YMHHJDY2FQIs=
+SIZE (prosody-0.11.5.tar.gz) = 425122
Index: patches/patch-prosody_cfg_lua_dist
===
RCS file: /home/cvs/ports/net/prosody/patches/patch-prosody_cfg_lua_dist,v
retrieving revision 1.8
diff -u -p -r1.8 patch-prosody_cfg_lua_dist
--- patches/patch-prosody_cfg_lua_dist  7 Feb 2019 19:23:39 -   1.8
+++ patches/patch-prosody_cfg_lua_dist  25 Mar 2020 12:06:54 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-prosody_cfg_lua_dist,v 1
 Index: prosody.cfg.lua.dist
 --- prosody.cfg.lua.dist.orig
 +++ prosody.cfg.lua.dist
-@@ -23,6 +23,14 @@
+@@ -23,6 +23,13 @@
  -- Example: admins = { "us...@example.com", "us...@example.net" }
  admins = { }
  
@@ -11,13 +11,12 @@ Index: prosody.cfg.lua.dist
 +prosody_group = "_prosody"
 +
 +-- Enable POSIX-only options
-+daemonize = true
 +pidfile = "/var/prosody/prosody.pid"
 +
  -- Enable use of libevent for better performance under high load
  -- For more information see: https://prosody.im/doc/libevent
  --use_libevent = true
-@@ -153,8 +161,8 @@ archive_expires_after = "1w" -- Remove archived messag
+@@ -153,8 +160,8 @@ archive_expires_after = "1w" -- Remove archived messag
  -- Logging configuration
  -- For advanced logging see https://prosody.im/doc/logging
  log = {
Index: pkg/prosody.rc
===
RCS file: /home/cvs/ports/net/prosody/pkg/prosody.rc,v
retrieving revision 1.4
diff -u -p -r1.4 prosody.rc
--- pkg/prosody.rc  11 Jan 2018 19:27:07 -  1.4
+++ pkg/prosody.rc  26 Mar 2020 02:49:42 -
@@ -2,22 +2,19 @@
 #
 # $OpenBSD: prosody.rc,v 1.4 2018/01/11 19:27:07 rpe Exp $
 
-daemon="${TRUEPREFIX}/sbin/prosodyctl"
-daemon_flags="start"
+daemon="${TRUEPREFIX}/sbin/prosody"
+daemon_flags="-D"
 daemon_user="_prosody"
 
 . /etc/rc.d/rc.subr
 
-rc_reload=NO
+pexp="$(eval echo ${MODLUA_BIN} ${daemon}${daemon_flags:+ ${daemon_flags}})"
+
 rc_usercheck=NO
 
 rc_check() {
# return 1 is needed: prosodyctl returns a higher error code on failure
${TRUEPREFIX}/sbin/prosodyctl status || return 1
-}
-
-rc_stop() {
-   ${TRUEPREFIX}/sbin/prosodyctl stop
 }
 
 rc_cmd $1

Re: update jailkit to 2.21 and move to python3

[Aisha Tammy]

Hi Stuart,
  Dope comments, thanks a lot! 
The plist was the sickest, it even did the __pycache__ :O
I totally did not expect so much complexity from just plist, I did read it
but like thought it was just going to do what I did, like, just add and 
subtract 1 or 2 lines. 
Next time I'm just gonna keep running all possible commands.

I am in totally love with make clean patch/build/fake, repeat. Its a hugely 
productive pipeline, makes life so much simpler.
I wish gentoo was as simple, but emerge is also super dope. I really like how 
their stuff is so similar to ports :D :D

I should stop rambling, I have a habit of just going on and on and on.

I have handled all of the comments, hopefully not adding any more mistakes.
Lemme know if I need to make more changes, this process of porting is super fun.
jailkit is dank, I'm doing all my cancerous nodejs and django self hosting in 
chroots now.
I'm also writing up common inits on github, maybe I can also add that to the 
pkg-readme if I get time.
Maybe someday we can have actualy jails, but till then i can get my daily fix 
from this :D

Cheers,
Aisha

Index: Makefile
===
RCS file: /cvs/ports/security/jailkit/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile12 Jul 2019 20:49:03 -  1.15
+++ Makefile10 Apr 2020 13:10:05 -
@@ -2,18 +2,21 @@
 
 COMMENT=   utilities for jailing a user or process
 
-DISTNAME=  jailkit-2.19
+DISTNAME=  jailkit-2.21
 CATEGORIES=security sysutils
 
-HOMEPAGE=  http://olivier.sessink.nl/jailkit/
+HOMEPAGE=  https://olivier.sessink.nl/jailkit/
 
-MASTER_SITES=  http://olivier.sessink.nl/jailkit/
+MASTER_SITES=  https://olivier.sessink.nl/jailkit/
 
 # BSD - LGPLv2
-PERMIT_PACKAGE=Yes
+PERMIT_PACKAGE=Yes
 
 MODULES=   lang/python
-WANTLIB += c pthread
+
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
+
+WANTLIB+=  c pthread
 
 NO_TEST=   Yes
 
@@ -34,9 +37,8 @@ pre-configure:
${SUBST_CMD} ${WRKSRC}/man/$${i}; done
 
 post-install:
-   # recreate the .pyc file, otherwise it would change
-   # after installation
-   rm ${PREFIX}/share/jailkit/jk_lib.pyc
+   # compile the jailkit python files so that they
+   # are removed correctly when uninstalling
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
${PREFIX}/share/jailkit
 
Index: distinfo
===
RCS file: /cvs/ports/security/jailkit/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo20 Dec 2015 15:43:46 -  1.8
+++ distinfo10 Apr 2020 13:10:05 -
@@ -1,2 +1,2 @@
-SHA256 (jailkit-2.19.tar.gz) = /ZYS3Vf0o5q/zeZHxCBhbFyjf1mCuMB6j7XLNSSU/Ig=
-SIZE (jailkit-2.19.tar.gz) = 142280
+SHA256 (jailkit-2.21.tar.gz) = egIOB635OGDFOPDZgZauoz1GG6vbqLs+3fcIHleinBQ=
+SIZE (jailkit-2.21.tar.gz) = 141341
Index: patches/patch-ini_jk_init_ini
===
RCS file: /cvs/ports/security/jailkit/patches/patch-ini_jk_init_ini,v
retrieving revision 1.3
diff -u -p -r1.3 patch-ini_jk_init_ini
--- patches/patch-ini_jk_init_ini   26 Mar 2014 17:38:27 -  1.3
+++ patches/patch-ini_jk_init_ini   10 Apr 2020 13:10:05 -
@@ -1,32 +1,10 @@
-$OpenBSD: patch-ini_jk_init_ini,v 1.3 2014/03/26 17:38:27 gonzalo Exp $
+$OpenBSD: patch-ini_jk_init_ini,v 1.4 2020/04/08 18:43:53 aisha Exp $
 
-fix some default paths in the jail creation configuration file
+fix installation directories and default paths in the jail creation 
configuration file
 
 ini/jk_init.ini.orig   Mon Dec 23 06:02:42 2013
-+++ ini/jk_init.iniWed Dec 25 16:04:26 2013
-@@ -2,18 +2,18 @@
- # this section probably needs adjustment on 64bit systems
- # or non-Linux systems
- comment = common files for all jails that need user/group information
--paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, 
/lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1, 
/lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1, 
/lib/x86_64-linux-gnu/libnss*.so.2, /etc/nsswitch.conf, /etc/ld.so.conf
-+paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, 
/lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1, 
/lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1, 
/lib/x86_64-linux-gnu/libnss*.so.2, ${SYSCONFDIR}/nsswitch.conf, 
${SYSCONFDIR}/ld.so.conf
- # Solaris needs 
--# paths = /etc/default/nss, /lib/libnsl.so.1, /usr/lib/nss_*.so.1, 
/etc/nsswitch.conf
-+# paths = ${SYSCONFDIR}/default/nss, /lib/libnsl.so.1, /usr/lib/nss_*.so.1, 
${SYSCONFDIR}/nsswitch.conf
- 
- [netbasics]
- comment = common files for all jails that need any internet connectivity
--paths = /lib/libnss_dns.so.2, /lib64/libnss_dns.so.2, /etc/resolv.conf, 
/etc/host.conf, 

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2020/04/10 07:10:00

Modified files:
graphics/unwebp: Makefile distinfo 

Log message:
new version fixes a bug and adds support for offset files

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

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

Modified files:
devel/pycharm  : Makefile distinfo 
devel/pycharm/pkg: PLIST 

Log message:
Update pycharm to 2020.1

Diff from maintainer Lucas Raab, thanks

Re: update jailkit to 2.21 and move to python3

[Stuart Henderson]

On 2020/04/10 07:21, Aisha Tammy wrote:
> Dammit I totally missed that.
> Seems like my thunderbird mail has default wrapping on.
> I've disabled it and have copied the diff, hopefully correctly this time.
> 
> Thanks a lot.

Thanks, that applies now.

>  HOMEPAGE=http://olivier.sessink.nl/jailkit/
> @@ -13,6 +13,9 @@ MASTER_SITES=   http://olivier.sessink.nl

These can use https now.

>  post-install:
> - # recreate the .pyc file, otherwise it would change
> - # after installation
> + # remove the .pyc file, as we are in python 3

this comment doesn't make much sense to me..

>   rm ${PREFIX}/share/jailkit/jk_lib.pyc
> + # now compile the new file so that it is added
>   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
>   ${PREFIX}/share/jailkit
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/jailkit/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo  20 Dec 2015 15:43:46 -  1.8
> +++ distinfo  10 Apr 2020 11:14:57 -
> @@ -1,2 +1,2 @@
> -SHA256 (jailkit-2.19.tar.gz) = /ZYS3Vf0o5q/zeZHxCBhbFyjf1mCuMB6j7XLNSSU/Ig=
> -SIZE (jailkit-2.19.tar.gz) = 142280
> +SHA256 (jailkit-2.21.tar.gz) = egIOB635OGDFOPDZgZauoz1GG6vbqLs+3fcIHleinBQ=
> +SIZE (jailkit-2.21.tar.gz) = 141341
> Index: patches/patch-ini_jk_init_ini
> ===
> RCS file: /cvs/ports/security/jailkit/patches/patch-ini_jk_init_ini,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-ini_jk_init_ini
> --- patches/patch-ini_jk_init_ini 26 Mar 2014 17:38:27 -  1.3
> +++ patches/patch-ini_jk_init_ini 10 Apr 2020 11:14:57 -
> @@ -1,32 +1,10 @@
> -$OpenBSD: patch-ini_jk_init_ini,v 1.3 2014/03/26 17:38:27 gonzalo Exp $
> +$OpenBSD: patch-ini_jk_init_ini,v 1.4 2020/04/08 18:43:53 aisha Exp $

doesn't matter now, but please leave the $OpenBSD$ lines alone, they are 
handled by cvs.

>  
> -fix some default paths in the jail creation configuration file
> +A lot of additions to fixing installation directories and fixing line numbers

The comments in the patches should describe the patch, not what has been changed
since the last version of the patch. Old comment makes sense here.

>  
>  ini/jk_init.ini.orig Mon Dec 23 06:02:42 2013
> -+++ ini/jk_init.ini  Wed Dec 25 16:04:26 2013
> -@@ -2,18 +2,18 @@
> - # this section probably needs adjustment on 64bit systems
> - # or non-Linux systems
> - comment = common files for all jails that need user/group information
> --paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, 
> /lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1, 
> /lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1, 
> /lib/x86_64-linux-gnu/libnss*.so.2, /etc/nsswitch.conf, /etc/ld.so.conf
> -+paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, 
> /lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1, 
> /lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1, 
> /lib/x86_64-linux-gnu/libnss*.so.2, ${SYSCONFDIR}/nsswitch.conf, 
> ${SYSCONFDIR}/ld.so.conf
> - # Solaris needs 
> --# paths = /etc/default/nss, /lib/libnsl.so.1, /usr/lib/nss_*.so.1, 
> /etc/nsswitch.conf
> -+# paths = ${SYSCONFDIR}/default/nss, /lib/libnsl.so.1, /usr/lib/nss_*.so.1, 
> ${SYSCONFDIR}/nsswitch.conf
> - 
> - [netbasics]
> - comment = common files for all jails that need any internet connectivity
> --paths = /lib/libnss_dns.so.2, /lib64/libnss_dns.so.2, /etc/resolv.conf, 
> /etc/host.conf, /etc/hosts, /etc/protocols, /etc/services
> -+paths = /lib/libnss_dns.so.2, /lib64/libnss_dns.so.2, 
> ${SYSCONFDIR}/resolv.conf, ${SYSCONFDIR}/host.conf, ${SYSCONFDIR}/hosts, 
> ${SYSCONFDIR}/protocols, ${SYSCONFDIR}/services
> - # on Solaris devices /dev/udp and /dev/tcp might be needed too, not sure
> - 
> - [logbasics]
> - comment = timezone information and log sockets
> --paths = /etc/localtime
> -+paths = ${SYSCONFDIR}/localtime
> - need_logsocket = 1
> - # Solaris does not need logsocket
> - # but needs 
> +Index: ini/jk_init.ini
> +--- ini/jk_init.ini.orig
>  ini/jk_init.ini
>  @@ -21,7 +21,7 @@ need_logsocket = 1
>   
>   [jk_lsh]
> @@ -68,7 +46,7 @@ fix some default paths in the jail creat
>   
>   [netutils]
>   comment = several internet utilities like wget, ftp, rsync, scp, ssh
> -@@ -110,7 +110,7 @@ includesections = extendedshell, netutils, apacheutils
> +@@ -110,17 +110,16 @@ includesections = extendedshell, netutils, apacheutils
>   
>   [openvpn]
>   comment = jail for the openvpn daemon
> @@ -76,8 +54,10 @@ fix some default paths in the jail creat
>  +paths = ${LOCALBASE}/sbin/openvpn
>   users = root,nobody
>   groups = root,nogroup
> - includesections = netbasics
> -@@ -120,7 +120,7 @@ need_logsocket = 1
> +-includesections = netbasics
> + devices = /dev/urandom, /dev/random, /dev/net/tun
> + includesections = netbasics, uidbasics
> + need_logsocket = 1
>   
> 

CVS: cvs.openbsd.org: ports

[Jasper Lievisse Adriaanse]

CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2020/04/10 06:12:58

Modified files:
devel/py-r2pipe: Makefile 

Log message:
update HOMEPAGE

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/04/10 06:01:41

Modified files:
print/qpdf : Makefile distinfo 

Log message:
Update to qpdf-10.0.1.

[update] devel/pycharm to 2020.1

[Lucas Raab]

Hello,

Nothing fundamentally new here, just a lot of churn from new jar
versions. It doesn't seem to express the same issue I had with intellij
so maybe I just had some funky non-sense there. Everything seems to be
fine here.

Anyone see something different?

Thanks,
Lucas
Index: Makefile
===
RCS file: /cvs/ports/devel/pycharm/Makefile,v
retrieving revision 1.25
diff -u -p -r1.25 Makefile
--- Makefile29 Mar 2020 07:52:02 -  1.25
+++ Makefile10 Apr 2020 11:51:12 -
@@ -2,7 +2,7 @@
 
 COMMENT=   Python IDE based on IntelliJ IDEA
 
-V= 2019.3.4
+V= 2020.1
 DISTNAME=  pycharm-community-${V}
 PKGNAME=   pycharm-${V}
 CATEGORIES=devel
Index: distinfo
===
RCS file: /cvs/ports/devel/pycharm/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo29 Mar 2020 07:52:02 -  1.20
+++ distinfo10 Apr 2020 11:51:12 -
@@ -1,2 +1,2 @@
-SHA256 (pycharm-community-2019.3.4.tar.gz) = 
mZsPvFEADEjNIGiEBvIWcfs289EOxO1ltQ6JFqI+IU0=
-SIZE (pycharm-community-2019.3.4.tar.gz) = 391698063
+SHA256 (pycharm-community-2020.1.tar.gz) = 
GqSf0B7JAgwoilg6yQ53ffOuXF389Mxz2TrHvhKEqdE=
+SIZE (pycharm-community-2020.1.tar.gz) = 382333125
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/pycharm/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -r1.18 PLIST
--- pkg/PLIST   19 Feb 2020 06:18:48 -  1.18
+++ pkg/PLIST   10 Apr 2020 11:51:13 -
@@ -51,10 +51,10 @@ pycharm/index/Python/sdk-stubs.names_i.l
 pycharm/index/Python/sdk-stubs.version
 pycharm/lib/
 pycharm/lib/FastInfoset-1.2.15.jar
-pycharm/lib/annotations-17.0.0.jar
+pycharm/lib/MultithreadedTC-1.01.jar
+pycharm/lib/annotations-19.0.0.jar
 pycharm/lib/annotations-java5.jar
 pycharm/lib/asm-all-7.0.1.jar
-pycharm/lib/assertj-core-3.13.2.jar
 pycharm/lib/automaton-1.12-1.jar
 pycharm/lib/batik-anim-1.12.0-8.jar
 pycharm/lib/batik-awt-util-1.12.0-8.jar
@@ -75,19 +75,24 @@ pycharm/lib/bcpkix-jdk15on-1.64.jar
 pycharm/lib/bcprov-jdk15on-1.64.jar
 pycharm/lib/bootstrap.jar
 pycharm/lib/built-in-server.jar
+pycharm/lib/byte-buddy-agent-1.10.1.jar
+pycharm/lib/cds/
+pycharm/lib/cds/classesLogAgent.jar
 pycharm/lib/cglib-nodep-3.2.4.jar
 pycharm/lib/cli-parser-1.1.5.jar
 pycharm/lib/common-image-3.4.1.jar
 pycharm/lib/common-io-3.4.1.jar
 pycharm/lib/common-lang-3.4.1.jar
-pycharm/lib/commons-codec-1.13.jar
+pycharm/lib/commons-codec-1.14.jar
 pycharm/lib/commons-collections-3.2.2.jar
-pycharm/lib/commons-compress-1.18.jar
+pycharm/lib/commons-compress-1.20.jar
 pycharm/lib/commons-httpclient-3.1-patched.jar
 pycharm/lib/commons-imaging-1.0-RC-1.jar
 pycharm/lib/commons-lang-2.4.jar
+pycharm/lib/commons-lang3-3.9.jar
 pycharm/lib/commons-logging-1.2.jar
 pycharm/lib/configuration-store-impl.jar
+pycharm/lib/coverage-common.jar
 pycharm/lib/credential-store.jar
 pycharm/lib/dbus-java-3.0.2.jar
 pycharm/lib/delight-rhino-sandbox-0.0.11.jar
@@ -96,21 +101,24 @@ pycharm/lib/error_prone_annotations-2.3.
 pycharm/lib/extensions.jar
 pycharm/lib/external-system-rt.jar
 pycharm/lib/failureaccess-1.0.1.jar
-pycharm/lib/fluent-hc-4.5.10.jar
+pycharm/lib/fest-assert-1.5.0-SNAPSHOT.jar
+pycharm/lib/fest-reflect-2.0-SNAPSHOT.jar
+pycharm/lib/fest-swing-1.4.6.jar
+pycharm/lib/fest-util-1.3.0-SNAPSHOT.jar
+pycharm/lib/fluent-hc-4.5.12.jar
 pycharm/lib/forms-1.1-preview.jar
 pycharm/lib/forms_rt.jar
 pycharm/lib/groovy-all-2.4.17.jar
-pycharm/lib/gson-2.8.5.jar
-pycharm/lib/guava-27.1-jre.jar
+pycharm/lib/gson-2.8.6.jar
+pycharm/lib/guava-28.2-jre.jar
 pycharm/lib/hamcrest-core-1.3.jar
-pycharm/lib/httpclient-4.5.10.jar
-pycharm/lib/httpcore-4.4.12.jar
-pycharm/lib/httpmime-4.5.10.jar
+pycharm/lib/httpclient-4.5.12.jar
+pycharm/lib/httpcore-4.4.13.jar
+pycharm/lib/httpmime-4.5.12.jar
 pycharm/lib/icons.jar
 pycharm/lib/imageio-core-3.4.1.jar
 pycharm/lib/imageio-metadata-3.4.1.jar
 pycharm/lib/imageio-tiff-3.4.1.jar
-pycharm/lib/images.jar
 pycharm/lib/imgscalr-lib-4.2.jar
 pycharm/lib/ini4j-0.5.5-2.jar
 pycharm/lib/intellij-coverage-agent-1.0.508.jar
@@ -120,11 +128,11 @@ pycharm/lib/intellij-xml.jar
 pycharm/lib/ion-java-1.5.2-2.jar
 pycharm/lib/isorelax-20030108.jar
 pycharm/lib/istack-commons-runtime-3.0.7.jar
-pycharm/lib/j2objc-annotations-1.1.jar
-pycharm/lib/jackson-annotations-2.10.0.jar
-pycharm/lib/jackson-core-2.10.0.jar
-pycharm/lib/jackson-databind-2.10.0.jar
-pycharm/lib/jackson-module-kotlin-2.9.10.jar
+pycharm/lib/j2objc-annotations-1.3.jar
+pycharm/lib/jackson-annotations-2.10.2.jar
+pycharm/lib/jackson-core-2.10.2.jar
+pycharm/lib/jackson-databind-2.10.2.jar
+pycharm/lib/jackson-module-kotlin-2.10.2.jar
 pycharm/lib/java-compatibility-1.0.1.jar
 pycharm/lib/java-utils-1.0.5.jar
 pycharm/lib/javassist-3.22.0-GA.jar
@@ -134,8 +142,9 @@ 

Re: update opensonic 0.1.4

[Landry Breuil]

On Thu, Apr 09, 2020 at 10:11:06PM -0700, Nam Nguyen wrote:
> 
> ping. Attached diff because the old CMakeLists patch contains ^M but the
> latest CMakeLists does not.

I havent really looked at the details, but fwiw i've tested this update
along allegro update, and it works fine here.

two minor annoyances (but iirc they were present before):
- selecting fullscreen messes up dual-screen setups
- selecting 'smooth gfx' triggers a segfault

no sound issue after some playing, with ogg123 also playing a stream at
the same time via sndio. looks good to me - and i also support the
removal of audio/dumb and graphics/allegropng.

thanks !

Landry

Re: [NEW] games/wrath

[Solene Rapenne]

On Fri, Apr 10, 2020 at 02:40:22AM -0500, Paul Valencia wrote:
> Hi,
> 
> Here is a new port for the wrath-darkplaces engine [1]
> which is used in the game WRATH: Aeon of Ruin.
> 
> Some notes about this:
> 
> - There is no release, so I used GH_COMMIT
> 
> - Pass port-lib-depends-check and portcheck
> 
> - I used games/xonotic as a reference for this port
> since it is related to the darkplaces engine.
> 
> - I renamed the binary to wrath as a recommendation
> here [2]
> 
> - I tested the three levels of the game on amd64
> 
> - In the game, I found an issue with the mouse when
> you have different artifacts(3+) in your inventory
> that only allows you to select the extreme left/right
> artifact.
> 
> OK's? Comments?
> 
> [1] https://github.com/KillPixelGames/wrath-darkplaces
> [2] https://github.com/KillPixelGames/wrath-darkplaces#running

the port looks fine to me (and works well) altough

- README should explain that you need to run wrath binary in a directory
  where the folder kp1 is available, or that you can use some args for
  that (at least the game tell you to use -basedir to find the assets)
- version maybe be 20200228 instead of adding 0.0.0 as a prefix to
  commit date?

Re: update: gnupg2 -> 2.2.20

[Aisha Tammy]

readding the diff, because my thunderbird was wrapping messages by default.

thanks again.

Index: Makefile
===
RCS file: /cvs/ports/security/gnupg2/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- Makefile12 Jul 2019 21:15:35 -  1.66
+++ Makefile10 Apr 2020 11:22:22 -
@@ -2,7 +2,7 @@
 
 COMMENT =  GNU privacy guard - a free PGP replacement
 
-DISTNAME = gnupg-2.2.12
+DISTNAME = gnupg-2.2.20
 CATEGORIES =   security
 REVISION = 0
 
@@ -55,6 +55,7 @@ CONFIGURE_STYLE = gnu
 CONFIGURE_ENV =CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS +=  docdir=${LOCALBASE}/share/doc/gnupg2 \
+   --with-mailprog="/usr/sbin/sendmail" \
--enable-gpgtar \
--enable-wks-tools \
--enable-gpg-is-gpg2
Index: distinfo
===
RCS file: /cvs/ports/security/gnupg2/distinfo,v
retrieving revision 1.31
diff -u -p -r1.31 distinfo
--- distinfo22 Dec 2018 17:49:21 -  1.31
+++ distinfo10 Apr 2020 11:22:22 -
@@ -1,2 +1,2 @@
-SHA256 (gnupg-2.2.12.tar.bz2) = 2wMPi0yYZA6RMA021Rbx9Pj+CVFKlOqfx0Ee4aNAgss=
-SIZE (gnupg-2.2.12.tar.bz2) = 6682303
+SHA256 (gnupg-2.2.20.tar.bz2) = BKfJ1It0w5kWjugnDlSFiN2+UiGMM3cD1/Bjc9MmyjA=
+SIZE (gnupg-2.2.20.tar.bz2) = 6786913
Index: patches/patch-doc_Makefile_in
===
RCS file: /cvs/ports/security/gnupg2/patches/patch-doc_Makefile_in,v
retrieving revision 1.2
diff -u -p -r1.2 patch-doc_Makefile_in
--- patches/patch-doc_Makefile_in   20 Aug 2017 11:52:38 -  1.2
+++ patches/patch-doc_Makefile_in   10 Apr 2020 11:22:22 -
@@ -2,7 +2,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.2 20
 Index: doc/Makefile.in
 --- doc/Makefile.in.orig
 +++ doc/Makefile.in
-@@ -462,14 +462,6 @@ libcommontls = ../common/libcommontls.a
+@@ -474,14 +474,6 @@ libcommontls = ../common/libcommontls.a
  libcommontlsnpth = ../common/libcommontlsnpth.a
  examples = examples/README examples/scd-event examples/trustlist.txt  \
   examples/vsnfd.prf examples/debug.prf\
Index: patches/patch-tools_send-mail_c
===
RCS file: patches/patch-tools_send-mail_c
diff -N patches/patch-tools_send-mail_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-tools_send-mail_c 10 Apr 2020 11:22:22 -
@@ -0,0 +1,16 @@
+$OpenBSD: patch-doc_Makefile_in,v 1.2 2020/04/09 13:40:29 aisha Exp $
+
+use the sendmail option from the command line
+
+Index: tools/send-mail.c
+--- tools/send-mail.c.orig
 tools/send-mail.c
+@@ -33,7 +33,7 @@ static gpg_error_t
+ run_sendmail (estream_t data)
+ {
+   gpg_error_t err;
+-  const char pgmname[] = "/usr/lib/sendmail";
++  const char pgmname[] = "/usr/sbin/sendmail";
+   const char *argv[3];
+ 
+   argv[0] = "-oi";

Re: update jailkit to 2.21 and move to python3

[Aisha Tammy]

Dammit I totally missed that.
Seems like my thunderbird mail has default wrapping on.
I've disabled it and have copied the diff, hopefully correctly this time.

Thanks a lot.


Index: Makefile
===
RCS file: /cvs/ports/security/jailkit/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- Makefile12 Jul 2019 20:49:03 -  1.15
+++ Makefile10 Apr 2020 11:14:57 -
@@ -2,7 +2,7 @@
 
 COMMENT=   utilities for jailing a user or process
 
-DISTNAME=  jailkit-2.19
+DISTNAME=  jailkit-2.21
 CATEGORIES=security sysutils
 
 HOMEPAGE=  http://olivier.sessink.nl/jailkit/
@@ -13,6 +13,9 @@ MASTER_SITES= http://olivier.sessink.nl
 PERMIT_PACKAGE=Yes
 
 MODULES=   lang/python
+
+MODPY_VERSION= ${MODPY_DEFAULT_VERSION_3}
+
 WANTLIB += c pthread
 
 NO_TEST=   Yes
@@ -34,9 +37,9 @@ pre-configure:
${SUBST_CMD} ${WRKSRC}/man/$${i}; done
 
 post-install:
-   # recreate the .pyc file, otherwise it would change
-   # after installation
+   # remove the .pyc file, as we are in python 3
rm ${PREFIX}/share/jailkit/jk_lib.pyc
+   # now compile the new file so that it is added
${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
${PREFIX}/share/jailkit
 
Index: distinfo
===
RCS file: /cvs/ports/security/jailkit/distinfo,v
retrieving revision 1.8
diff -u -p -r1.8 distinfo
--- distinfo20 Dec 2015 15:43:46 -  1.8
+++ distinfo10 Apr 2020 11:14:57 -
@@ -1,2 +1,2 @@
-SHA256 (jailkit-2.19.tar.gz) = /ZYS3Vf0o5q/zeZHxCBhbFyjf1mCuMB6j7XLNSSU/Ig=
-SIZE (jailkit-2.19.tar.gz) = 142280
+SHA256 (jailkit-2.21.tar.gz) = egIOB635OGDFOPDZgZauoz1GG6vbqLs+3fcIHleinBQ=
+SIZE (jailkit-2.21.tar.gz) = 141341
Index: patches/patch-ini_jk_init_ini
===
RCS file: /cvs/ports/security/jailkit/patches/patch-ini_jk_init_ini,v
retrieving revision 1.3
diff -u -p -r1.3 patch-ini_jk_init_ini
--- patches/patch-ini_jk_init_ini   26 Mar 2014 17:38:27 -  1.3
+++ patches/patch-ini_jk_init_ini   10 Apr 2020 11:14:57 -
@@ -1,32 +1,10 @@
-$OpenBSD: patch-ini_jk_init_ini,v 1.3 2014/03/26 17:38:27 gonzalo Exp $
+$OpenBSD: patch-ini_jk_init_ini,v 1.4 2020/04/08 18:43:53 aisha Exp $
 
-fix some default paths in the jail creation configuration file
+A lot of additions to fixing installation directories and fixing line numbers
 
 ini/jk_init.ini.orig   Mon Dec 23 06:02:42 2013
-+++ ini/jk_init.iniWed Dec 25 16:04:26 2013
-@@ -2,18 +2,18 @@
- # this section probably needs adjustment on 64bit systems
- # or non-Linux systems
- comment = common files for all jails that need user/group information
--paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, 
/lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1, 
/lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1, 
/lib/x86_64-linux-gnu/libnss*.so.2, /etc/nsswitch.conf, /etc/ld.so.conf
-+paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2, 
/lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1, 
/lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1, 
/lib/x86_64-linux-gnu/libnss*.so.2, ${SYSCONFDIR}/nsswitch.conf, 
${SYSCONFDIR}/ld.so.conf
- # Solaris needs 
--# paths = /etc/default/nss, /lib/libnsl.so.1, /usr/lib/nss_*.so.1, 
/etc/nsswitch.conf
-+# paths = ${SYSCONFDIR}/default/nss, /lib/libnsl.so.1, /usr/lib/nss_*.so.1, 
${SYSCONFDIR}/nsswitch.conf
- 
- [netbasics]
- comment = common files for all jails that need any internet connectivity
--paths = /lib/libnss_dns.so.2, /lib64/libnss_dns.so.2, /etc/resolv.conf, 
/etc/host.conf, /etc/hosts, /etc/protocols, /etc/services
-+paths = /lib/libnss_dns.so.2, /lib64/libnss_dns.so.2, 
${SYSCONFDIR}/resolv.conf, ${SYSCONFDIR}/host.conf, ${SYSCONFDIR}/hosts, 
${SYSCONFDIR}/protocols, ${SYSCONFDIR}/services
- # on Solaris devices /dev/udp and /dev/tcp might be needed too, not sure
- 
- [logbasics]
- comment = timezone information and log sockets
--paths = /etc/localtime
-+paths = ${SYSCONFDIR}/localtime
- need_logsocket = 1
- # Solaris does not need logsocket
- # but needs 
+Index: ini/jk_init.ini
+--- ini/jk_init.ini.orig
 ini/jk_init.ini
 @@ -21,7 +21,7 @@ need_logsocket = 1
  
  [jk_lsh]
@@ -68,7 +46,7 @@ fix some default paths in the jail creat
  
  [netutils]
  comment = several internet utilities like wget, ftp, rsync, scp, ssh
-@@ -110,7 +110,7 @@ includesections = extendedshell, netutils, apacheutils
+@@ -110,17 +110,16 @@ includesections = extendedshell, netutils, apacheutils
  
  [openvpn]
  comment = jail for the openvpn daemon
@@ -76,8 +54,10 @@ fix some default paths in the jail creat
 +paths = ${LOCALBASE}/sbin/openvpn
  users = root,nobody
  groups = root,nogroup
- includesections = netbasics
-@@ -120,7 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/04/10 05:33:06

Modified files:
security/vault : Makefile distinfo 

Log message:
Update to vault-1.4.0.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/04/10 05:32:50

Modified files:
sysutils/nomad : Makefile distinfo 
Removed files:
sysutils/nomad/patches: 

patch-vendor_github_com_shirou_gopsutil_cpu_cpu_openbsd_go 

Log message:
Update to nomad-0.11.0.

[UPDATE] audio/ncspot to 0.13

[Henrik Friedrichsen]

Maintenance update:
- Added configuration option for initial shuffle, repeat, volume
- Start with a random track if not selecting track directly
- Make `TAB` or `ESC` toggle between search input
- Push help view to stack instead of making it a separate screen
- Only stop playback if the last item was deleted AND playing
- Use cached credentials from librespot
- Add new themable color for selected + playing track
- Add support for `HOME` and `END` keys

OK?
Index: Makefile
===
RCS file: /cvs/ports/audio/ncspot/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile8 Feb 2020 22:29:45 -   1.4
+++ Makefile10 Apr 2020 10:42:52 -
@@ -6,7 +6,7 @@ COMMENT =   ncurses Spotify client
 
 GH_ACCOUNT =   hrkfdn
 GH_PROJECT =   ncspot
-GH_TAGNAME =   v0.1.2
+GH_TAGNAME =   v0.1.3
 
 CATEGORIES =   audio
 
@@ -33,26 +33,25 @@ MODCARGO_CRATES +=  aes-ctr 0.3.0   # MIT O
 MODCARGO_CRATES += aes-soft0.3.3   # MIT OR Apache-2.0
 MODCARGO_CRATES += aesni   0.6.0   # MIT OR Apache-2.0
 MODCARGO_CRATES += ahash   0.2.18  # MIT OR Apache-2.0
-MODCARGO_CRATES += aho-corasick0.7.8   # Unlicense/MIT
-MODCARGO_CRATES += alga0.9.2   # Apache-2.0
+MODCARGO_CRATES += aho-corasick0.7.10  # Unlicense/MIT
+MODCARGO_CRATES += alga0.9.3   # Apache-2.0
 MODCARGO_CRATES += alsa0.2.2   # Apache-2.0/MIT
 MODCARGO_CRATES += alsa-sys0.1.2   # MIT
 MODCARGO_CRATES += ansi_term   0.11.0  # MIT
-MODCARGO_CRATES += anyhow  1.0.26  # MIT OR Apache-2.0
 MODCARGO_CRATES += approx  0.3.2   # Apache-2.0
-MODCARGO_CRATES += arc-swap0.4.4   # Apache-2.0/MIT
+MODCARGO_CRATES += arc-swap0.4.5   # Apache-2.0/MIT
 MODCARGO_CRATES += array-macro 1.0.4   # MIT/Apache-2.0
 MODCARGO_CRATES += arrayref0.3.6   # BSD-2-Clause
 MODCARGO_CRATES += arrayvec0.5.1   # MIT/Apache-2.0
 MODCARGO_CRATES += atty0.2.14  # MIT
 MODCARGO_CRATES += autocfg 0.1.7   # Apache-2.0/MIT
 MODCARGO_CRATES += autocfg 1.0.0   # Apache-2.0 OR MIT
-MODCARGO_CRATES += backtrace   0.3.43  # MIT/Apache-2.0
-MODCARGO_CRATES += backtrace-sys   0.1.32  # MIT/Apache-2.0
+MODCARGO_CRATES += backtrace   0.3.46  # MIT/Apache-2.0
+MODCARGO_CRATES += backtrace-sys   0.1.35  # MIT/Apache-2.0
+MODCARGO_CRATES += base64  0.9.3   # MIT/Apache-2.0
 MODCARGO_CRATES += base64  0.10.1  # MIT/Apache-2.0
 MODCARGO_CRATES += base64  0.11.0  # MIT/Apache-2.0
-MODCARGO_CRATES += base64  0.9.3   # MIT/Apache-2.0
-MODCARGO_CRATES += bindgen 0.51.1  # BSD-3-Clause
+MODCARGO_CRATES += bindgen 0.53.2  # BSD-3-Clause
 MODCARGO_CRATES += bit-set 0.5.1   # MIT/Apache-2.0
 MODCARGO_CRATES += bit-vec 0.5.1   # MIT/Apache-2.0
 MODCARGO_CRATES += bitflags0.3.3   # MIT/Apache-2.0
@@ -63,17 +62,16 @@ MODCARGO_CRATES +=  block   0.1.6   # MIT
 MODCARGO_CRATES += block-buffer0.7.3   # MIT OR Apache-2.0
 MODCARGO_CRATES += block-cipher-trait  0.6.2   # MIT OR Apache-2.0
 MODCARGO_CRATES += block-padding   0.1.5   # MIT OR Apache-2.0
-MODCARGO_CRATES += bumpalo 3.1.2   # MIT/Apache-2.0
+MODCARGO_CRATES += bumpalo 3.2.1   # MIT/Apache-2.0
 MODCARGO_CRATES += byte-tools  0.3.1   # MIT OR Apache-2.0
-MODCARGO_CRATES += byteorder   1.3.2   # Unlicense OR MIT
+MODCARGO_CRATES += byteorder   1.3.4   # Unlicense OR MIT
 MODCARGO_CRATES += bytes   0.4.12  # MIT
 MODCARGO_CRATES += bytes   0.5.4   # MIT
-MODCARGO_CRATES += c2-chacha   0.2.3   # MIT/Apache-2.0
 MODCARGO_CRATES += cc  1.0.50  # MIT/Apache-2.0
-MODCARGO_CRATES += cexpr   0.3.6   # Apache-2.0/MIT
+MODCARGO_CRATES += cexpr   0.4.0   # Apache-2.0/MIT
 MODCARGO_CRATES += cfg-if  0.1.10  # MIT/Apache-2.0
-MODCARGO_CRATES += chrono  0.4.10  # MIT/Apache-2.0
-MODCARGO_CRATES += clang-sys   0.28.1  # Apache-2.0
+MODCARGO_CRATES += chrono  0.4.11  # MIT/Apache-2.0
+MODCARGO_CRATES += clang-sys   0.29.2  # Apache-2.0
 MODCARGO_CRATES += clap2.33.0  # MIT
 MODCARGO_CRATES += clipboard   0.5.0   # MIT / Apache-2.0
 MODCARGO_CRATES += clipboard-win   2.2.0   # MIT
@@ -83,29 +81,28 @@ MODCARGO_CRATES +=  const-random-macro  0.
 MODCARGO_CRATES += constant_time_eq0.1.5   # CC0-1.0
 MODCARGO_CRATES += cookie  0.12.0  # MIT/Apache-2.0
 MODCARGO_CRATES += cookie_store0.7.0   # MIT/Apache-2.0
-MODCARGO_CRATES += core-foundation 0.6.4   # MIT / Apache-2.0
+MODCARGO_CRATES += core-foundation 0.7.0   # MIT / Apache-2.0
 MODCARGO_CRATES += core-foundation-sys 0.5.1   # MIT / Apache-2.0
-MODCARGO_CRATES += core-foundation-sys 0.6.2   # MIT / Apache-2.0
+MODCARGO_CRATES += core-foundation-sys 0.7.0   # MIT / Apache-2.0
 MODCARGO_CRATES +=   

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/04/10 05:24:30

Modified files:
sysutils/amazon-ssm-agent: Makefile distinfo 

Log message:
Update to amazon-ssm-agent-2.3.978.0.

CVS: cvs.openbsd.org: ports

[Thomas Frohwein]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2020/04/10 05:16:58

Modified files:
games  : Makefile 

Log message:
+gogrepo

CVS: cvs.openbsd.org: ports

[Thomas Frohwein]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2020/04/10 05:15:03

Log message:
import gogrepo, a CLI downloader for GOG.com games
ok solene@

DESCR:
Python-based tool for downloading your GOG.com game collections and extras 
to
your local computer for full offline enjoyment.

By default, game folders are saved in the same location that the script is 
run
in. You can also specify another directory. Run gogrepo.py -h to see help or
read more below. Each game has its own directories with all game/bonus files
saved within.

Features:

* Ability to choose which games to download based on combinations of OS
(windows, linux, mac) and language (en, fr, de, etc...)

* Saves a !info.txt in each game folder with information about each 
game/extra
item.

* Creates a !serial.txt if the game has a special serial/cdkey (I know, not 
100%
DRM-free, is it?). Sometimes coupon codes are hidden here!

* Verify your downloaded collection with full MD5, zip integrity, and 
expected
file size checking.

* Auto retrying of failed fetch/downloads. Sometime GOG servers report 
temporary
errors.

* Ability to import your already existing local collection.

* Easy to throw into a daily cronjob to get all the latest updates and newly
added content!

* Clear logging prints showing update/download progress and HTTP errors. 
Easy to
pipe or tee to create a log file.

Status:

Vendor Tag: thfr
Release Tags:   thfr_20200410

N ports/games/gogrepo/Makefile
N ports/games/gogrepo/distinfo
N ports/games/gogrepo/pkg/DESCR
N ports/games/gogrepo/pkg/PLIST
N ports/games/gogrepo/files/gogrepo

No conflicts created by this import

Re: update jailkit to 2.21 and move to python3

[Stuart Henderson]

Your diff is unusable, it is word-wrapped.

On 2020/04/09 23:38, Aisha Tammy wrote:
> a much larger diff for correcting upstream errors
> I have contacted the dev, but it might be a while and this will only
> come in the next release
> 
> comments? ok?
> 
> aisha
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/security/jailkit/Makefile,v
> retrieving revision 1.15
> diff -u -p -r1.15 Makefile
> --- Makefile  12 Jul 2019 20:49:03 -  1.15
> +++ Makefile  10 Apr 2020 03:35:29 -
> @@ -2,7 +2,7 @@
> 
>  COMMENT= utilities for jailing a user or process
> 
> -DISTNAME=jailkit-2.19
> +DISTNAME=jailkit-2.21
>  CATEGORIES=  security sysutils
> 
>  HOMEPAGE=http://olivier.sessink.nl/jailkit/
> @@ -13,6 +13,9 @@ MASTER_SITES=   http://olivier.sessink.nl
>  PERMIT_PACKAGE=  Yes
> 
>  MODULES= lang/python
> +
> +MODPY_VERSION=   ${MODPY_DEFAULT_VERSION_3}
> +
>  WANTLIB += c pthread
> 
>  NO_TEST= Yes
> @@ -34,9 +37,9 @@ pre-configure:
>   ${SUBST_CMD} ${WRKSRC}/man/$${i}; done
> 
>  post-install:
> - # recreate the .pyc file, otherwise it would change
> - # after installation
> + # remove the .pyc file, as we are in python 3
>   rm ${PREFIX}/share/jailkit/jk_lib.pyc
> + # now compile the new file so that it is added
>   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
>   ${PREFIX}/share/jailkit
> 
> Index: distinfo
> ===
> RCS file: /cvs/ports/security/jailkit/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo  20 Dec 2015 15:43:46 -  1.8
> +++ distinfo  10 Apr 2020 03:35:29 -
> @@ -1,2 +1,2 @@
> -SHA256 (jailkit-2.19.tar.gz) = /ZYS3Vf0o5q/zeZHxCBhbFyjf1mCuMB6j7XLNSSU/Ig=
> -SIZE (jailkit-2.19.tar.gz) = 142280
> +SHA256 (jailkit-2.21.tar.gz) = egIOB635OGDFOPDZgZauoz1GG6vbqLs+3fcIHleinBQ=
> +SIZE (jailkit-2.21.tar.gz) = 141341
> Index: patches/patch-ini_jk_init_ini
> ===
> RCS file: /cvs/ports/security/jailkit/patches/patch-ini_jk_init_ini,v
> retrieving revision 1.3
> diff -u -p -r1.3 patch-ini_jk_init_ini
> --- patches/patch-ini_jk_init_ini 26 Mar 2014 17:38:27 -  1.3
> +++ patches/patch-ini_jk_init_ini 10 Apr 2020 03:35:29 -
> @@ -1,32 +1,10 @@
> -$OpenBSD: patch-ini_jk_init_ini,v 1.3 2014/03/26 17:38:27 gonzalo Exp $
> +$OpenBSD: patch-ini_jk_init_ini,v 1.4 2020/04/08 18:43:53 aisha Exp $
> 
> -fix some default paths in the jail creation configuration file
> +A lot of additions to fixing installation directories and fixing line
> numbers
> 
>  ini/jk_init.ini.orig Mon Dec 23 06:02:42 2013
> -+++ ini/jk_init.ini  Wed Dec 25 16:04:26 2013
> -@@ -2,18 +2,18 @@
> - # this section probably needs adjustment on 64bit systems
> - # or non-Linux systems
> - comment = common files for all jails that need user/group information
> --paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2,
> /lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1,
> /lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1,
> /lib/x86_64-linux-gnu/libnss*.so.2, /etc/nsswitch.conf, /etc/ld.so.conf
> -+paths = /lib/libnsl.so.1, /lib64/libnsl.so.1, /lib/libnss*.so.2,
> /lib64/libnss*.so.2, /lib/i386-linux-gnu/libnsl.so.1,
> /lib/i386-linux-gnu/libnss*.so.2, /lib/x86_64-linux-gnu/libnsl.so.1,
> /lib/x86_64-linux-gnu/libnss*.so.2, ${SYSCONFDIR}/nsswitch.conf,
> ${SYSCONFDIR}/ld.so.conf
> - # Solaris needs
> --# paths = /etc/default/nss, /lib/libnsl.so.1, /usr/lib/nss_*.so.1,
> /etc/nsswitch.conf
> -+# paths = ${SYSCONFDIR}/default/nss, /lib/libnsl.so.1,
> /usr/lib/nss_*.so.1, ${SYSCONFDIR}/nsswitch.conf
> -
> - [netbasics]
> - comment = common files for all jails that need any internet connectivity
> --paths = /lib/libnss_dns.so.2, /lib64/libnss_dns.so.2,
> /etc/resolv.conf, /etc/host.conf, /etc/hosts, /etc/protocols, /etc/services
> -+paths = /lib/libnss_dns.so.2, /lib64/libnss_dns.so.2,
> ${SYSCONFDIR}/resolv.conf, ${SYSCONFDIR}/host.conf, ${SYSCONFDIR}/hosts,
> ${SYSCONFDIR}/protocols, ${SYSCONFDIR}/services
> - # on Solaris devices /dev/udp and /dev/tcp might be needed too, not sure
> -
> - [logbasics]
> - comment = timezone information and log sockets
> --paths = /etc/localtime
> -+paths = ${SYSCONFDIR}/localtime
> - need_logsocket = 1
> - # Solaris does not need logsocket
> - # but needs
> +Index: ini/jk_init.ini
> +--- ini/jk_init.ini.orig
>  ini/jk_init.ini
>  @@ -21,7 +21,7 @@ need_logsocket = 1
> 
>   [jk_lsh]
> @@ -68,7 +46,7 @@ fix some default paths in the jail creat
> 
>   [netutils]
>   comment = several internet utilities like wget, ftp, rsync, scp, ssh
> -@@ -110,7 +110,7 @@ includesections = extendedshell, netutils, apacheutils
> +@@ -110,17 +110,16 @@ includesections = extendedshell, 

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/04/10 04:57:36

Modified files:
print/psutils  : Makefile distinfo 
print/psutils/patches: patch-PSUtils_pm 

Log message:
Update to psutils-2.02.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/04/10 04:55:33

Modified files:
print/cups-filters: Makefile distinfo 

Log message:
Update to cups-filters-1.27.4.

aarch64 bulk build report

[phessler]

bulk build on arm64.ports.openbsd.org
started on  Mon Apr 6 13:59:51 MDT 2020
finished at Fri Apr 10 04:49:36 MDT 2020
lasted 3D14h49m
done with kern.version=OpenBSD 6.7-beta (GENERIC.MP) #546: Mon Apr  6 12:39:22 
MDT 2020

built packages:10939
Apr 6:3456
Apr 7:1321
Apr 8:1112
Apr 9:5048
Apr 10:1


critical path missing pkgs:  
http://build-failures.rhaalovely.net/aarch64/2020-04-06/summary.log

build failures: 26
http://build-failures.rhaalovely.net/aarch64/2020-04-06/databases/sqlite3-odbc.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/devel/glog.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/devel/sqlc.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/editors/xwpe.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/graphics/vulkan-loader.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/lang/pfe.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/lang/pypy.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/net/dino.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/net/filezilla.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/net/gnugk.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/net/inetsim.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/net/minio/client.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/security/age.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/security/sn0int.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/shells/elvish.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/sysutils/amazon-ecs-cli.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/sysutils/node_exporter.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/sysutils/nomad.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/sysutils/restic.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/sysutils/serf.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/sysutils/telegraf.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/sysutils/terraform/provider-dns.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/sysutils/terragrunt.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/www/zola.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/x11/e17/elementary.log
http://build-failures.rhaalovely.net/aarch64/2020-04-06/x11/remmina.log

recurrent failures
 failures/devel/sqlc.log
 failures/editors/xwpe.log
 failures/graphics/vulkan-loader.log
 failures/lang/pfe.log
 failures/lang/pypy.log
 failures/net/filezilla.log
 failures/net/minio/client.log
 failures/security/age.log
 failures/security/sn0int.log
 failures/shells/elvish.log
 failures/sysutils/amazon-ecs-cli.log
 failures/sysutils/node_exporter.log
 failures/sysutils/nomad.log
 failures/sysutils/restic.log
new failures
+++ ls-failures Fri Apr 10 04:49:45 2020
+failures/databases/sqlite3-odbc.log
+failures/devel/glog.log
+failures/net/dino.log
+failures/net/gnugk.log
+failures/net/inetsim.log
resolved failures
--- ../old/aarch64/last//ls-failuresSun Apr  5 22:47:03 2020
-failures/devel/xtensa-lx106-elf/gcc.log
-failures/sysutils/beats/heartbeat.log
-failures/sysutils/beats/metricbeat.log
-failures/sysutils/beats/packetbeat.log

[UPDATE]: games/freeorion 0.49

[Tom Murphy]

Hi,

  Attached is a diff to bring games/freeorion to 0.4.9.
  I removed boost_signals-mt from WANTLIB since it was
  being listed as an extra lib.

  Compiles fine and runs for me.

  OK?

  Thanks,
  Tom

Index: Makefile
===
RCS file: /cvs/ports/games/freeorion/Makefile,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 Makefile
--- Makefile23 Nov 2019 22:08:42 -  1.5
+++ Makefile10 Apr 2020 08:55:18 -
@@ -1,8 +1,8 @@
 # $OpenBSD: Makefile,v 1.5 2019/11/23 22:08:42 cwen Exp $
 
-V =0.4.8
+V =0.4.9
 COMMENT =  turn-based space empire and galactic conquest computer game
-DISTNAME = FreeOrion_v${V}_2018-08-23.26f16b0_Source
+DISTNAME = FreeOrion_v${V}_2020-02-02.db53471_Source
 PKGNAME =  freeorion-${V}
 CATEGORIES =   games
 REVISION = 1
@@ -18,7 +18,7 @@ WANTLIB += ${COMPILER_LIBCXX} GL GLEW GL
 WANTLIB += boost_chrono-mt boost_date_time-mt boost_filesystem-mt
 WANTLIB += boost_iostreams-mt boost_locale-mt boost_log-mt boost_log_setup-mt
 WANTLIB += boost_python-mt boost_regex-mt boost_serialization-mt
-WANTLIB += boost_signals-mt boost_system-mt boost_thread-mt c
+WANTLIB += boost_system-mt boost_thread-mt c
 WANTLIB += freetype m ogg openal png ${MODPY_WANTLIB} vorbis vorbisenc
 WANTLIB += vorbisfile z
 
Index: distinfo
===
RCS file: /cvs/ports/games/freeorion/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 distinfo
--- distinfo3 Oct 2018 11:43:46 -   1.1.1.1
+++ distinfo10 Apr 2020 08:55:18 -
@@ -1,2 +1,2 @@
-SHA256 (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = 
1AXb60Ovt/p2k3zxXNsQsV6BjaFx7B6wPkocPsu6Rvc=
-SIZE (FreeOrion_v0.4.8_2018-08-23.26f16b0_Source.tar.gz) = 106254059
+SHA256 (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 
Vomzpsq55s+8g9joLvMlu54AcRJi0msEbwg+pf3E1uE=
+SIZE (FreeOrion_v0.4.9_2020-02-02.db53471_Source.tar.gz) = 124662273
Index: pkg/PLIST
===
RCS file: /cvs/ports/games/freeorion/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   3 Oct 2018 11:43:48 -   1.1.1.1
+++ pkg/PLIST   10 Apr 2020 08:55:18 -
@@ -3,10 +3,10 @@
 @bin bin/freeorionca
 @bin bin/freeoriond
 lib/freeorion/
-lib/freeorion/libGiGi.so
-lib/freeorion/libGiGiSDL.so
-lib/freeorion/libfreeorioncommon.so
-lib/freeorion/libfreeorionparse.so
+@so lib/freeorion/libGiGi.so
+@so lib/freeorion/libGiGiSDL.so
+@so lib/freeorion/libfreeorioncommon.so
+@so lib/freeorion/libfreeorionparse.so
 share/applications/freeorion.desktop
 share/freeorion/
 share/freeorion/default/
@@ -48,7 +48,11 @@ share/freeorion/default/data/art/encyclo
 
share/freeorion/default/data/art/encyclopedia/planet_environments/pt_toxic02.png
 share/freeorion/default/data/art/encyclopedia/planet_environments/pt_tundra.png
 share/freeorion/default/data/art/fields/
-share/freeorion/default/data/art/fields/rainbow_storm.png
+share/freeorion/default/data/art/fields/accretion_disc.png
+share/freeorion/default/data/art/fields/ion_storm.png
+share/freeorion/default/data/art/fields/molecular_cloud.png
+share/freeorion/default/data/art/fields/star_forming_nebula_1.png
+share/freeorion/default/data/art/fields/star_forming_nebula_2.png
 share/freeorion/default/data/art/galaxy_decoration/
 share/freeorion/default/data/art/galaxy_decoration/blue_set/
 share/freeorion/default/data/art/galaxy_decoration/blue_set/gaseous01.png
@@ -527,6 +531,11 @@ share/freeorion/default/data/art/icons/p
 share/freeorion/default/data/art/icons/planet/tiny.png
 share/freeorion/default/data/art/icons/planet/toxic.png
 share/freeorion/default/data/art/icons/planet/tundra.png
+share/freeorion/default/data/art/icons/planet_status_attacked.png
+share/freeorion/default/data/art/icons/planet_status_conquered.png
+share/freeorion/default/data/art/icons/planet_status_supply.png
+share/freeorion/default/data/art/icons/planet_status_unhappy.png
+share/freeorion/default/data/art/icons/planet_status_warning.png
 share/freeorion/default/data/art/icons/ready.png
 share/freeorion/default/data/art/icons/ship_hulls/
 
share/freeorion/default/data/art/icons/ship_hulls/agregate_asteroid_hull_small.png
@@ -700,6 +709,7 @@ share/freeorion/default/data/art/icons/s
 share/freeorion/default/data/art/icons/sitrep/tech_researched.png
 share/freeorion/default/data/art/icons/sitrep/tech_unlocked.png
 share/freeorion/default/data/art/icons/sitrep/victory.png
+share/freeorion/default/data/art/icons/sitrep/weapon_upgrade.png
 share/freeorion/default/data/art/icons/specials_huge/
 share/freeorion/default/data/art/icons/specials_huge/abandoned-colony.png
 share/freeorion/default/data/art/icons/specials_huge/ancient_ruins.png
@@ -1990,6 +2000,34 @@ share/freeorion/default/data/art/planets
 share/freeorion/default/data/art/planets/rings/rings05.png
 

Re: NEW: gogrepo, a downloader for games from GOG.com

[Solene Rapenne]

On Fri, Apr 10, 2020 at 03:11:36AM -0600, Thomas Frohwein wrote:
> On Fri, Apr 10, 2020 at 10:45:26AM +0200, Antoine Jacoutot wrote:
> [...]
> > > seconded, it looks like a leaf port to me, so i dont really think it
> > > needs the py2 flavor, juste default to FLAVOR=python3 like other ports.
> > 
> > I think you want to do this instead:
> > MODPY_VERSION=${MODPY_DEFAULT_VERSION_3}
> 
> I agree, this simplifies things a lot.
> 
> New tarball attached that is python3 only with MODPY_DEFAULT_VERSION_3.
> Launch script now without the MODPY prefix, PLIST and do-install updated
> accordingly.
> 
> Tested quickly again with '$ gogrepo login' and still works.
> 
> ok?


ok solene@

Re: [update] devel/intellij to 2020.1

[Rafael Sadowski]

On Thu Apr 09, 2020 at 08:13:41PM -0500, Lucas Raab wrote:
> Hello,
> 
> Version bump to 2020.1 for devel/intellij. The only issue of note is 
> what I have in the updated README. This has happened on both my laptop
> and workstations, difficult to say if it'll happen for others, and the
> fix is adapted from JetBrains' help page for the error
> 
> Better ways to handle that advisory?
> 
> Thanks,
> Lucas
> 
> Index: pkg/README
> ===
> RCS file: /cvs/ports/devel/intellij/pkg/README,v
> retrieving revision 1.3
> diff -u -p -r1.3 README
> --- pkg/README4 Sep 2018 12:53:16 -   1.3
> +++ pkg/README10 Apr 2020 01:10:37 -
> @@ -14,3 +14,16 @@ window manager (e.g. cwm).
>  Native Libraries
>  
>  Functionality depending on native libraries is not likely to work.
> +
> +Errors After Upgrading
> +==
> +If you receive errors starting after an upgrade, try the following:
> +
> +1. Remove the ${HOME}/.IdeaIC.Y/config/plugins directory
> +2. Remove the following directories
> +  a. ${HOME}/.local/share/JetBrains
> +  b. ${HOME}/.cache/JetBrains
> +  c. ${HOME}/.config/JetBrains
> +3. Relaunch intellij
> +4. Reinstall the removed plugins
> +
> 

Update works here. Any opinions about README?

arm bulk build report

[phessler]

bulk build on armv7.ports.openbsd.org
started on  Sat Mar 14 09:24:29 MDT 2020
finished at Fri Apr 10 03:10:42 MDT 2020
lasted 26D17h46m
done with kern.version=OpenBSD 6.6-current (GENERIC) #274: Fri Mar 13 05:45:31 
MDT 2020

built packages:9141
Mar 14:461
Mar 15:283
Mar 16:246
Mar 17:166
Mar 18:157
Mar 19:299
Mar 20:160
Mar 21:180
Mar 22:134
Mar 23:235
Mar 24:380
Mar 25:93
Mar 26:73
Mar 27:127
Mar 28:152
Mar 29:167
Mar 30:362
Mar 31:242
Apr 1:887
Apr 2:368
Apr 3:297
Apr 4:392
Apr 5:399
Apr 6:483
Apr 7:263
Apr 8:174
Apr 9:1960
Apr 10:598


critical path missing pkgs:  
http://build-failures.rhaalovely.net/arm/2020-03-14/summary.log

build failures: 65
http://build-failures.rhaalovely.net/arm/2020-03-14/audio/calf.log
http://build-failures.rhaalovely.net/arm/2020-03-14/audio/multimux.log
http://build-failures.rhaalovely.net/arm/2020-03-14/audio/pithos.log
http://build-failures.rhaalovely.net/arm/2020-03-14/audio/rgain.log
http://build-failures.rhaalovely.net/arm/2020-03-14/audio/solfege.log
http://build-failures.rhaalovely.net/arm/2020-03-14/cad/yosys.log
http://build-failures.rhaalovely.net/arm/2020-03-14/chinese/libpinyin.log
http://build-failures.rhaalovely.net/arm/2020-03-14/devel/arm-none-eabi/gcc-linaro,aarch64.log
http://build-failures.rhaalovely.net/arm/2020-03-14/devel/llvm,,-main.log
http://build-failures.rhaalovely.net/arm/2020-03-14/devel/py-cflow2dot.log
http://build-failures.rhaalovely.net/arm/2020-03-14/devel/srecord.log
http://build-failures.rhaalovely.net/arm/2020-03-14/devel/xtensa-lx106-elf/gdb.log
http://build-failures.rhaalovely.net/arm/2020-03-14/emulators/dgen-sdl,debugger.log
http://build-failures.rhaalovely.net/arm/2020-03-14/emulators/ppsspp.log
http://build-failures.rhaalovely.net/arm/2020-03-14/games/barony.log
http://build-failures.rhaalovely.net/arm/2020-03-14/games/fifengine.log
http://build-failures.rhaalovely.net/arm/2020-03-14/games/solarus/roth.log
http://build-failures.rhaalovely.net/arm/2020-03-14/games/stone-soup,no_x11.log
http://build-failures.rhaalovely.net/arm/2020-03-14/geo/geos.log
http://build-failures.rhaalovely.net/arm/2020-03-14/graphics/gprof2dot.log
http://build-failures.rhaalovely.net/arm/2020-03-14/graphics/libmpeg2.log
http://build-failures.rhaalovely.net/arm/2020-03-14/graphics/opencv.log
http://build-failures.rhaalovely.net/arm/2020-03-14/graphics/py-dot,python3.log
http://build-failures.rhaalovely.net/arm/2020-03-14/graphics/xdot.log
http://build-failures.rhaalovely.net/arm/2020-03-14/graphics/xfig.log
http://build-failures.rhaalovely.net/arm/2020-03-14/inputmethods/ibus-skk.log
http://build-failures.rhaalovely.net/arm/2020-03-14/lang/STk.log
http://build-failures.rhaalovely.net/arm/2020-03-14/lang/erlang/21.log
http://build-failures.rhaalovely.net/arm/2020-03-14/lang/hashlink.log
http://build-failures.rhaalovely.net/arm/2020-03-14/lang/janet.log
http://build-failures.rhaalovely.net/arm/2020-03-14/lang/parrot.log
http://build-failures.rhaalovely.net/arm/2020-03-14/lang/pfe.log
http://build-failures.rhaalovely.net/arm/2020-03-14/lang/racket-minimal,no_jit.log
http://build-failures.rhaalovely.net/arm/2020-03-14/lang/swi-prolog.log
http://build-failures.rhaalovely.net/arm/2020-03-14/mail/bogofilter,db4.log
http://build-failures.rhaalovely.net/arm/2020-03-14/mail/courier-unicode.log
http://build-failures.rhaalovely.net/arm/2020-03-14/math/dieharder.log
http://build-failures.rhaalovely.net/arm/2020-03-14/math/mathomatic.log
http://build-failures.rhaalovely.net/arm/2020-03-14/math/mlpack,-main.log
http://build-failures.rhaalovely.net/arm/2020-03-14/multimedia/gstreamer-0.10/plugins-ffmpeg.log
http://build-failures.rhaalovely.net/arm/2020-03-14/net/honeyd.log
http://build-failures.rhaalovely.net/arm/2020-03-14/net/utox.log
http://build-failures.rhaalovely.net/arm/2020-03-14/print/foo2zjs.log
http://build-failures.rhaalovely.net/arm/2020-03-14/print/pdfshuffler.log
http://build-failures.rhaalovely.net/arm/2020-03-14/shells/py-qtconsole,python3.log
http://build-failures.rhaalovely.net/arm/2020-03-14/sysutils/nomad.log
http://build-failures.rhaalovely.net/arm/2020-03-14/sysutils/rclone.log
http://build-failures.rhaalovely.net/arm/2020-03-14/sysutils/telegraf.log
http://build-failures.rhaalovely.net/arm/2020-03-14/sysutils/terraform/provider-alicloud.log
http://build-failures.rhaalovely.net/arm/2020-03-14/sysutils/terraform/provider-aws.log
http://build-failures.rhaalovely.net/arm/2020-03-14/sysutils/terraform/provider-azurerm.log
http://build-failures.rhaalovely.net/arm/2020-03-14/sysutils/terragrunt.log
http://build-failures.rhaalovely.net/arm/2020-03-14/sysutils/u-boot.log
http://build-failures.rhaalovely.net/arm/2020-03-14/sysutils/virt-manager.log
http://build-failures.rhaalovely.net/arm/2020-03-14/textproc/podofo.log
http://build-failures.rhaalovely.net/arm/2020-03-14/www/webkitgtk4.log
http://build-failures.rhaalovely.net/arm/2020-03-14/x11/gnome/eog.log
http://build-failures.rhaalovely.net/arm/2020-03-14/x11/gnome/getting-started-docs.log

Re: NEW: gogrepo, a downloader for games from GOG.com

[Thomas Frohwein]

On Fri, Apr 10, 2020 at 10:45:26AM +0200, Antoine Jacoutot wrote:
[...]
> > seconded, it looks like a leaf port to me, so i dont really think it
> > needs the py2 flavor, juste default to FLAVOR=python3 like other ports.
> 
> I think you want to do this instead:
> MODPY_VERSION=${MODPY_DEFAULT_VERSION_3}

I agree, this simplifies things a lot.

New tarball attached that is python3 only with MODPY_DEFAULT_VERSION_3.
Launch script now without the MODPY prefix, PLIST and do-install updated
accordingly.

Tested quickly again with '$ gogrepo login' and still works.

ok?


gogrepo-py3-only.tgz
Description: Binary data

Re: update for ports-fvwm to 2.6.9

[Rafael Sadowski]

On Fri Apr 10, 2020 at 12:18:48AM -0600, Thomas Frohwein wrote:
> Hi,
> 
> I had this locally and have been running this updated fvwm2 for a bit
> without any issues.
> 
> A few modules have been removed or wrapped into others, so would
> recommend to double-check .fvwm2rc. As before, there is
> fvwm-convert-2.6 to help with converting old configs (I haven't tested
> it).
> 
> A few more points about this update:
> 
> - passes make port-lib-depends-check and portcheck without issues
> - upstream has moved distfiles to github
> - couldn't find a new source for fvicons; use the one from 2.6.5
> - upstream distfiles for fvicons are gone and can't find replacement.
>   Therefore, MASTER_SITES0 set to
>   https://ftp.openbsd.org/pub/OpenBSD/distfiles/. Or rather remove?

I would remove the icons if there are gone upstream but this is my
personal opinion.

> - looks like this is probably the last release for fvwm version 2
> 
> comments, ok?
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/fvwm2/Makefile,v
> retrieving revision 1.67
> diff -u -p -r1.67 Makefile
> --- Makefile  12 Jul 2019 20:51:11 -  1.67
> +++ Makefile  10 Apr 2020 05:55:13 -
> @@ -4,18 +4,19 @@ COMMENT-main=   multiple virtual desktop w
>  COMMENT-fvicons=multiple virtual desktop window manager icons
>  COMMENT-fvwm2=   multiple virtual desktop window manager, without icons
>  
> -VERSION= 2.6.5
> +VERSION= 2.6.9
>  DISTNAME=fvwm-${VERSION}
>  PKGNAME-main=fvwm2+fvicons-${VERSION}
>  FULLPKGNAME-fvicons=fvicons-${VERSION}
>  PKGNAME-fvwm2=   fvwm2-${VERSION}
> -REVISION=6
>  
>  CATEGORIES= x11
>  
> -DISTFILES=   ${DISTNAME}${EXTRACT_SUFX} fvwm_icons-20070101.tar.gz
> +DISTFILES=   ${DISTNAME}${EXTRACT_SUFX} \
> + fvwm_icons-20070101.tar.gz:0
>  
>  HOMEPAGE=http://www.fvwm.org/
> +MAINTAINER=  Thomas Frohwein 
>  
>  # GPL/BSD-like (badly worded)
>  PERMIT_PACKAGE=  Yes
> @@ -25,7 +26,8 @@ WANTLIB += c cairo curses fontconfig fre
>  WANTLIB += gio-2.0 glib-2.0 gobject-2.0 iconv intl m png
>  WANTLIB += readline rsvg-2 z
>  
> -MASTER_SITES=ftp://ftp.fvwm.org/pub/fvwm/version-2/
> +MASTER_SITES=
> https://github.com/fvwmorg/fvwm/releases/download/${VERSION}/
> +MASTER_SITES0 =  https://ftp.openbsd.org/pub/OpenBSD/distfiles/
>  
>  LIB_DEPENDS+=graphics/png \
>   x11/gnome/librsvg
> @@ -52,6 +54,7 @@ SEPARATE_BUILD= Yes
>  CONFIGURE_STYLE= gnu
>  CONFIGURE_ARGS +=--disable-bidi \
>   --disable-gtk \
> + --enable-mandoc \
>   --without-gnome \
>   --without-rplay-library \
>   --without-stroke-library
> @@ -60,7 +63,8 @@ CONFIGURE_ENV +=CPPFLAGS="${CPPFLAGS} -
>  
>  post-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/fvwm
> - ${INSTALL_DATA} ${WRKDIR}/fvwm_icons-20070101/*.xpm 
> ${PREFIX}/share/pixmaps/fvwm/
> - ${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc 
> ${PREFIX}/share/fvwm
> + ${INSTALL_DATA} ${WRKDIR}/fvwm_icons-20070101/*.xpm \
> + ${PREFIX}/share/pixmaps/fvwm/
> + ${INSTALL_DATA} ${WRKSRC}/default-config/config ${PREFIX}/share/fvwm
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/fvwm2/distinfo,v
> retrieving revision 1.14
> diff -u -p -r1.14 distinfo
> --- distinfo  18 Jan 2015 03:15:53 -  1.14
> +++ distinfo  10 Apr 2020 05:55:13 -
> @@ -1,4 +1,4 @@
> -SHA256 (fvwm-2.6.5.tar.gz) = 8B+dqAdoUvjbEU+Q8rB1jCHSZeKVj84EKJ5Be866EtE=
> +SHA256 (fvwm-2.6.9.tar.gz) = G8ZM88zQBzAIdYFoMnqCZbgFne+bI5tFHWufqyzDka4=
>  SHA256 (fvwm_icons-20070101.tar.gz) = 
> oL5qSSCzjVj/7+QwdYvB2QEtfHSrZWDL1udYpb3q6yw=
> -SIZE (fvwm-2.6.5.tar.gz) = 3449177
> +SIZE (fvwm-2.6.9.tar.gz) = 3942859
>  SIZE (fvwm_icons-20070101.tar.gz) = 363286
> Index: patches/patch-bin_Makefile_in
> ===
> RCS file: /cvs/ports/x11/fvwm2/patches/patch-bin_Makefile_in,v
> retrieving revision 1.1
> diff -u -p -r1.1 patch-bin_Makefile_in
> --- patches/patch-bin_Makefile_in 26 Apr 2011 18:50:46 -  1.1
> +++ patches/patch-bin_Makefile_in 10 Apr 2020 05:55:13 -
> @@ -1,11 +1,12 @@
>  $OpenBSD: patch-bin_Makefile_in,v 1.1 2011/04/26 18:50:46 shadchin Exp $
>  bin/Makefile.in.orig Fri Mar  4 08:47:50 2011
> -+++ bin/Makefile.in  Fri Mar  4 08:48:13 2011
> -@@ -710,14 +710,13 @@ info: info-am
> +Index: bin/Makefile.in
> +--- bin/Makefile.in.orig
>  bin/Makefile.in
> +@@ -835,14 +835,13 @@ info: info-am
>   
>   info-am:
>   
> --install-data-am: install-data-local install-man
> +-install-data-am: install-configDATA install-data-local install-man
>  +install-data-am: install-man
>   
>   install-dvi: install-dvi-am
> Index: patches/patch-config_h_in
> 

UPDATE security/easy-rsa-3.0.7

[Bjorn Ketelaars]

Diff below brings easy-rsa to 3.0.7. Changelog:
https://github.com/OpenVPN/easy-rsa/blob/v3.0.7/ChangeLog

(Lightly) run tested on amd64 by creating a CA and some client
certificates.

Comments/OK?


diff --git Makefile Makefile
index 22057c7dd02..69485902fce 100644
--- Makefile
+++ Makefile
@@ -2,9 +2,9 @@
 
 COMMENT =  small RSA key management package
 
-V =3.0.6
+V =3.0.7
 PKGNAME =  easy-rsa-$V
-DISTNAME = EasyRSA-unix-v$V
+DISTNAME = EasyRSA-$V
 EXTRACT_SUFX = .tgz
 CATEGORIES =   security
 
@@ -18,8 +18,6 @@ MASTER_SITES =
https://github.com/OpenVPN/easy-rsa/releases/download/v$V/
 NO_BUILD = Yes
 NO_TEST =  Yes
 
-WRKDIST =  ${WRKDIR}/${DISTNAME:S/unix-//}
-
 I =${PREFIX}/share/easy-rsa
 
 do-install:
diff --git distinfo distinfo
index 85b374f752a..d83a2369fb0 100644
--- distinfo
+++ distinfo
@@ -1,2 +1,2 @@
-SHA256 (EasyRSA-unix-v3.0.6.tgz) = yymu0tJ4JOWduq1UfxHcqzgKU8n+BWgSSegEr0NvE5Y=
-SIZE (EasyRSA-unix-v3.0.6.tgz) = 40840
+SHA256 (EasyRSA-3.0.7.tgz) = FX0ujBFcOtBwwbJkGkyRkeBqMqjlCXGEenGCUe61EKg=
+SIZE (EasyRSA-3.0.7.tgz) = 48215
diff --git pkg/PLIST pkg/PLIST
index 8741e6138e8..c8d8c707f26 100644
--- pkg/PLIST
+++ pkg/PLIST
@@ -22,5 +22,7 @@ share/easy-rsa/x509-types/COMMON
 share/easy-rsa/x509-types/ca
 share/easy-rsa/x509-types/client
 share/easy-rsa/x509-types/code-signing
+share/easy-rsa/x509-types/email
+share/easy-rsa/x509-types/kdc
 share/easy-rsa/x509-types/server
 share/easy-rsa/x509-types/serverClient

Re: NEW: gogrepo, a downloader for games from GOG.com

[Antoine Jacoutot]

On Fri, Apr 10, 2020 at 09:26:37AM +0200, Landry Breuil wrote:
> On Thu, Apr 09, 2020 at 08:43:05PM -0400, George Koehler wrote:
> > On Wed, 8 Apr 2020 12:16:38 -0600
> > Thomas Frohwein  wrote:
> > 
> > > New port for downloading GOG.com games via the command line. Useful
> > > especially for a potential future game library management system...
> > 
> > py3-gogrepo works for me.  I logged into my GOG, downloaded a game,
> > and verified it.  (My other games were "missing" during verify.)
> > 
> > I want someone who knows python to look at this port.  I only tried
> > the python3 FLAVOR.  If you can drop flavors and always use python3
> > (like devel/mercurial), then you might rename the command from
> > "py3-gogrepo" to just "gogrepo".
> 
> seconded, it looks like a leaf port to me, so i dont really think it
> needs the py2 flavor, juste default to FLAVOR=python3 like other ports.

I think you want to do this instead:
MODPY_VERSION=${MODPY_DEFAULT_VERSION_3}

-- 
Antoine

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/04/10 02:11:30

Modified files:
net/py-smbc: Makefile distinfo 

Log message:
Update to py3-smbc-1.0.21.

Re: FIX_EXTRACT_PERMISSIONS and XS depends for devel/p5-Class-Load

[Marc Espie]

On Thu, Apr 09, 2020 at 08:47:04PM -0700, Andrew Hewus Fresh wrote:
> On Thu, Apr 09, 2020 at 08:39:55PM -0700, Andrew Hewus Fresh wrote:
> > On Thu, Apr 09, 2020 at 08:31:41PM -0700, Andrew Hewus Fresh wrote:
> > > Does a FIX_EXTRACT_PERMISSIONS need a REVISION bump?
> > > 
> > > Otherwise, OK?
> > 
> > 
> > Looking at this, I guess, I prefer this option so things just get
> > faster.  Comments?  OK?
> 
> Sigh, I see that's a circular dependency, so nevermind that part.  Just
> the FIX_EXTRACT_PERMISSIONS.

Well, it wouldn't need a REVISION, considering it won't change the package
itself, unless it used to have restricted files, which would be fairly
hard to achieve without @mode annotations in the PLIST :)

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/04/10 02:02:31

Modified files:
multimedia/py-chromecast: Makefile distinfo 
multimedia/py-chromecast/pkg: PLIST 

Log message:
Update to py3-chromecast-4.2.3.

Re: CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

On Fri, Apr 10, 2020 at 01:54:12AM -0600, Antoine Jacoutot wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   ajacou...@cvs.openbsd.org   2020/04/10 01:54:12
> 
> Modified files:
>   devel/libdsm   : Makefile distinfo 
> 
> Log message:
> Update to libdsm-0.3.2.

>From Brad (maintainer)

-- 
Antoine

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/04/10 01:55:00

Modified files:
x11/gtk+3  : Makefile distinfo 
x11/gtk+3/pkg  : PLIST-main 

Log message:
Update to gtk+3-3.24.18.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/04/10 01:54:12

Modified files:
devel/libdsm   : Makefile distinfo 

Log message:
Update to libdsm-0.3.2.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2020/04/10 01:53:16

Modified files:
x11/vlc: Makefile distinfo 
x11/vlc/patches: patch-configure_ac 
Removed files:
x11/vlc/patches: patch-modules_access_Makefile_am 
 patch-modules_access_smb2_c 
 patch-modules_video_output_opengl_fragment_shaders_c 
 patch-modules_video_output_opengl_vout_helper_c 
 patch-modules_video_output_opengl_vout_helper_h 

Log message:
Update to vlc-3.0.9.2.

from Brad (maintainer)

[NEW] games/wrath

[Paul Valencia]

Hi,

Here is a new port for the wrath-darkplaces engine [1]
which is used in the game WRATH: Aeon of Ruin.

Some notes about this:

- There is no release, so I used GH_COMMIT

- Pass port-lib-depends-check and portcheck

- I used games/xonotic as a reference for this port
since it is related to the darkplaces engine.

- I renamed the binary to wrath as a recommendation
here [2]

- I tested the three levels of the game on amd64

- In the game, I found an issue with the mouse when
you have different artifacts(3+) in your inventory
that only allows you to select the extreme left/right
artifact.

OK's? Comments?

[1] https://github.com/KillPixelGames/wrath-darkplaces
[2] https://github.com/KillPixelGames/wrath-darkplaces#running


wrath.tgz
Description: application/tar-gz

Re: NEW: gogrepo, a downloader for games from GOG.com

[Landry Breuil]

On Thu, Apr 09, 2020 at 08:43:05PM -0400, George Koehler wrote:
> On Wed, 8 Apr 2020 12:16:38 -0600
> Thomas Frohwein  wrote:
> 
> > New port for downloading GOG.com games via the command line. Useful
> > especially for a potential future game library management system...
> 
> py3-gogrepo works for me.  I logged into my GOG, downloaded a game,
> and verified it.  (My other games were "missing" during verify.)
> 
> I want someone who knows python to look at this port.  I only tried
> the python3 FLAVOR.  If you can drop flavors and always use python3
> (like devel/mercurial), then you might rename the command from
> "py3-gogrepo" to just "gogrepo".

seconded, it looks like a leaf port to me, so i dont really think it
needs the py2 flavor, juste default to FLAVOR=python3 like other ports.

Landry

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2020/04/10 01:25:02

Modified files:
security/keepassxc: Makefile distinfo 

Log message:
Bugfix update keepassxc-2.5.4

Fixed, https://github.com/keepassxreboot/keepassxc/releases/tag/2.5.4
- Return keyboard focus after saving database edits [#4287]
- Windows: Use bare minimum settings in portable version [#4131]
- Windows: Use SHA256 code signing [#4129]
- macOS: Fix code signing incompatibility in latest macOS release [#4564]

CVS: cvs.openbsd.org: ports

[Landry Breuil]

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

Modified files:
geo/py-rio-cogeo: Makefile distinfo 
geo/py-rio-cogeo/pkg: PLIST 

Log message:
Update to py-rio-cogeo 1.1.10.

Possible since we now have py-numpy >= 1.15 and
py-mercantile+py-supermercado.

ok martin@

Re: New: zsh-syntax-highlighting

[Rafael Sadowski]

On Thu Apr 09, 2020 at 09:43:36PM -0500, Matthew Martin wrote:
> Small port for zsh-syntax-highlighting. Currently have it in shells, but
> more than happy to move it if someone has a better suggestion. To test
> source 
> /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
> after installing.
> 
> DESCR:
> This package provides syntax highlighting for the shell zsh. It enables
> highlighting of commands whilst they are typed at a zsh prompt into an
> interactive terminal. This helps in reviewing commands before running them,
> particularly in catching syntax errors.

Looks good and works here but do we need the following files to install?
share/zsh-syntax-highlighting/.revision-hash
share/zsh-syntax-highlighting/.version

CVS: cvs.openbsd.org: ports

[Martin Reindl]

CVSROOT:/cvs
Module name:ports
Changes by: mar...@cvs.openbsd.org  2020/04/10 00:26:42

Modified files:
geo: Makefile 

Log message:
+py-mercantile
+py-supermercado

CVS: cvs.openbsd.org: ports

[Martin Reindl]

CVSROOT:/cvs
Module name:ports
Changes by: mar...@cvs.openbsd.org  2020/04/10 00:23:46

Log message:
Import py-supermercado 0.0.5.

OK landry@

py-supermercado extends the functionality of py-mercantile with additional
commands

Status:

Vendor Tag: martin
Release Tags:   martin_20200410

N ports/geo/py-supermercado/Makefile
N ports/geo/py-supermercado/distinfo
N ports/geo/py-supermercado/pkg/DESCR
N ports/geo/py-supermercado/pkg/PLIST

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Martin Reindl]

CVSROOT:/cvs
Module name:ports
Changes by: mar...@cvs.openbsd.org  2020/04/10 00:20:17

Log message:
Import py-mercantile 1.1.2.

OK landry@

py-mercantile provides spherical mercator coordinate and tile utilities

Status:

Vendor Tag: martin
Release Tags:   martin_20200410

N ports/geo/py-mercantile/Makefile
N ports/geo/py-mercantile/distinfo
N ports/geo/py-mercantile/pkg/DESCR
N ports/geo/py-mercantile/pkg/PLIST

No conflicts created by this import

update for ports-fvwm to 2.6.9

[Thomas Frohwein]

Hi,

I had this locally and have been running this updated fvwm2 for a bit
without any issues.

A few modules have been removed or wrapped into others, so would
recommend to double-check .fvwm2rc. As before, there is
fvwm-convert-2.6 to help with converting old configs (I haven't tested
it).

A few more points about this update:

- passes make port-lib-depends-check and portcheck without issues
- upstream has moved distfiles to github
- couldn't find a new source for fvicons; use the one from 2.6.5
- upstream distfiles for fvicons are gone and can't find replacement.
  Therefore, MASTER_SITES0 set to
  https://ftp.openbsd.org/pub/OpenBSD/distfiles/. Or rather remove?
- looks like this is probably the last release for fvwm version 2

comments, ok?

Index: Makefile
===
RCS file: /cvs/ports/x11/fvwm2/Makefile,v
retrieving revision 1.67
diff -u -p -r1.67 Makefile
--- Makefile12 Jul 2019 20:51:11 -  1.67
+++ Makefile10 Apr 2020 05:55:13 -
@@ -4,18 +4,19 @@ COMMENT-main= multiple virtual desktop w
 COMMENT-fvicons=multiple virtual desktop window manager icons
 COMMENT-fvwm2= multiple virtual desktop window manager, without icons
 
-VERSION=   2.6.5
+VERSION=   2.6.9
 DISTNAME=  fvwm-${VERSION}
 PKGNAME-main=  fvwm2+fvicons-${VERSION}
 FULLPKGNAME-fvicons=fvicons-${VERSION}
 PKGNAME-fvwm2= fvwm2-${VERSION}
-REVISION=  6
 
 CATEGORIES= x11
 
-DISTFILES= ${DISTNAME}${EXTRACT_SUFX} fvwm_icons-20070101.tar.gz
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
+   fvwm_icons-20070101.tar.gz:0
 
 HOMEPAGE=  http://www.fvwm.org/
+MAINTAINER=Thomas Frohwein 
 
 # GPL/BSD-like (badly worded)
 PERMIT_PACKAGE=Yes
@@ -25,7 +26,8 @@ WANTLIB += c cairo curses fontconfig fre
 WANTLIB += gio-2.0 glib-2.0 gobject-2.0 iconv intl m png
 WANTLIB += readline rsvg-2 z
 
-MASTER_SITES=  ftp://ftp.fvwm.org/pub/fvwm/version-2/
+MASTER_SITES=  https://github.com/fvwmorg/fvwm/releases/download/${VERSION}/
+MASTER_SITES0 =https://ftp.openbsd.org/pub/OpenBSD/distfiles/
 
 LIB_DEPENDS+=  graphics/png \
x11/gnome/librsvg
@@ -52,6 +54,7 @@ SEPARATE_BUILD= Yes
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS +=  --disable-bidi \
--disable-gtk \
+   --enable-mandoc \
--without-gnome \
--without-rplay-library \
--without-stroke-library
@@ -60,7 +63,8 @@ CONFIGURE_ENV +=  CPPFLAGS="${CPPFLAGS} -
 
 post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps/fvwm
-   ${INSTALL_DATA} ${WRKDIR}/fvwm_icons-20070101/*.xpm 
${PREFIX}/share/pixmaps/fvwm/
-   ${INSTALL_DATA} ${WRKSRC}/sample.fvwmrc/system.fvwm2rc 
${PREFIX}/share/fvwm
+   ${INSTALL_DATA} ${WRKDIR}/fvwm_icons-20070101/*.xpm \
+   ${PREFIX}/share/pixmaps/fvwm/
+   ${INSTALL_DATA} ${WRKSRC}/default-config/config ${PREFIX}/share/fvwm
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/x11/fvwm2/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo18 Jan 2015 03:15:53 -  1.14
+++ distinfo10 Apr 2020 05:55:13 -
@@ -1,4 +1,4 @@
-SHA256 (fvwm-2.6.5.tar.gz) = 8B+dqAdoUvjbEU+Q8rB1jCHSZeKVj84EKJ5Be866EtE=
+SHA256 (fvwm-2.6.9.tar.gz) = G8ZM88zQBzAIdYFoMnqCZbgFne+bI5tFHWufqyzDka4=
 SHA256 (fvwm_icons-20070101.tar.gz) = 
oL5qSSCzjVj/7+QwdYvB2QEtfHSrZWDL1udYpb3q6yw=
-SIZE (fvwm-2.6.5.tar.gz) = 3449177
+SIZE (fvwm-2.6.9.tar.gz) = 3942859
 SIZE (fvwm_icons-20070101.tar.gz) = 363286
Index: patches/patch-bin_Makefile_in
===
RCS file: /cvs/ports/x11/fvwm2/patches/patch-bin_Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-bin_Makefile_in
--- patches/patch-bin_Makefile_in   26 Apr 2011 18:50:46 -  1.1
+++ patches/patch-bin_Makefile_in   10 Apr 2020 05:55:13 -
@@ -1,11 +1,12 @@
 $OpenBSD: patch-bin_Makefile_in,v 1.1 2011/04/26 18:50:46 shadchin Exp $
 bin/Makefile.in.orig   Fri Mar  4 08:47:50 2011
-+++ bin/Makefile.inFri Mar  4 08:48:13 2011
-@@ -710,14 +710,13 @@ info: info-am
+Index: bin/Makefile.in
+--- bin/Makefile.in.orig
 bin/Makefile.in
+@@ -835,14 +835,13 @@ info: info-am
  
  info-am:
  
--install-data-am: install-data-local install-man
+-install-data-am: install-configDATA install-data-local install-man
 +install-data-am: install-man
  
  install-dvi: install-dvi-am
Index: patches/patch-config_h_in
===
RCS file: patches/patch-config_h_in
diff -N patches/patch-config_h_in
--- patches/patch-config_h_in   26 Apr 2011 18:50:46 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,13 +0,0 @@
-$OpenBSD: patch-config_h_in,v 1.2 2011/04/26 18:50:46 shadchin Exp $
 config.h.in.orig   Mon Aug  9 18:30:50 2010
-+++