CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2021/02/26 00:54:11

Modified files:
infrastructure/lib/DPB: State.pm Reporter.pm 

Log message:
use the new cleaner interface of pkg_add's state that decouples
continue and window size change for readability

Re: cmark (py3-commonmark-0.9.1 and cmark-0.29.0)

[Daniel Dickman]

> On Feb 26, 2021, at 1:16 AM, Rafael Sadowski  wrote:
> 
> There is an conflict with textproc/py-commonmark and textproc/cmark.
> 
> Looks like bin/cmark was added by the last py-commonmark update.
> 
> Collision in cmark-0.29.0: the following files already exist
>/usr/local/bin/cmark (py3-commonmark-0.9.1 and cmark-0.29.0)
> Couldn't install cmark-0.29.0


My mistake. I restored the fix that sthen made in 2018 in rev 1.2.

Thanks for reporting it.

CVS: cvs.openbsd.org: ports

[Eric Faurot]

CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2021/02/26 00:11:45

Modified files:
audio/pulseaudio: Makefile 
audio/pulseaudio/files: module-sndio.c 

Log message:
update and fix sndio module

ok espie aja

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/26 00:09:55

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

Log message:
repair conflict accidentally introduced in the recent update

reported by rsadowski@

Re: Fix or remove wmmand? (-fno-common)

[Greg Steuck]

Theo Buehler  writes:

> On Thu, Feb 25, 2021 at 07:53:36PM -0800, Greg Steuck wrote:
>> Theo Buehler  writes:
>> 
>> > The diff below fixes the build of this port.
>> >
>> > However, it only partly works for me. It draws a nice albeit minuscule
>> > Mandelbrot set. As soon as I hover with the mouse over the window, it
>> > exits with this error:
>> >
>> > X Error of failed request:  BadMatch (invalid parameter attributes)
>> >   Major opcode of failed request:  42 (X_SetInputFocus)
>> >   Serial number of failed request:  384
>> >   Current serial number in output stream:  384
>> 
>> If you want to go to sourceforge for an upgrade/fix, there's a teenage
>> version from 14 years ago: https://sourceforge.net/p/wmmand/news/
>
> Thanks. This version has that bug fixed and works perfectly fine for me.
> It now uses ImageMagick's display command instead of xv.

OK gnezdo

>
> Index: Makefile
> ===
> RCS file: /cvs/ports/misc/wmmand/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- Makefile  12 Jul 2019 20:47:55 -  1.19
> +++ Makefile  26 Feb 2021 06:04:53 -
> @@ -2,27 +2,29 @@
>  
>  COMMENT= wm-dockapp; mandelbrot explorer
>  
> -DISTNAME=wmMand-1.0
> +DISTNAME=wmMand-1.3.2
>  PKGNAME= ${DISTNAME:L}
> -REVISION=2
>  CATEGORIES=  misc x11 x11/windowmaker
>  
> -HOMEPAGE=http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
> +HOMEPAGE=https://sourceforge.net/p/wmmand/news/
>  
>  # GPL
>  PERMIT_PACKAGE=  Yes
>  
> -WANTLIB= X11 Xext Xpm c xcb
> +WANTLIB= X11 Xext Xpm c
>  
> -MASTER_SITES=http://nis-www.lanl.gov/~mgh/WindowMaker/
> -
> -RUN_DEPENDS= graphics/xv
> +MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=wmmand/}
> +EXTRACT_SUFX=.tar.bz2
>  
> +RUN_DEPENDS= graphics/ImageMagick
>  
>  NO_TEST= Yes
>  
>  WRKSRC=  ${WRKDIST}/wmMand
>  
>  ALL_TARGET=  clean all
> +
> +post-extract:
> + @cd ${WRKSRC} && gunzip wmMand.6.gz
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/misc/wmmand/distinfo,v
> retrieving revision 1.4
> diff -u -p -r1.4 distinfo
> --- distinfo  18 Jan 2015 03:14:33 -  1.4
> +++ distinfo  26 Feb 2021 05:25:32 -
> @@ -1,2 +1,2 @@
> -SHA256 (wmMand-1.0.tar.gz) = SiPMZvEZCA0dYkDpn4eCLYLTd38bDvCoG05aBlsAeis=
> -SIZE (wmMand-1.0.tar.gz) = 66466
> +SHA256 (wmMand-1.3.2.tar.bz2) = wSEn6LwLDXDD+6q68dbiMixnOp4AGrREiATnoNObz+o=
> +SIZE (wmMand-1.3.2.tar.bz2) = 41268
> Index: patches/patch-wmMand_Makefile
> ===
> RCS file: /cvs/ports/misc/wmmand/patches/patch-wmMand_Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-wmMand_Makefile
> --- patches/patch-wmMand_Makefile 30 Mar 2001 15:17:51 -  1.1.1.1
> +++ patches/patch-wmMand_Makefile 26 Feb 2021 05:54:06 -
> @@ -1,21 +1,22 @@
>  $OpenBSD: patch-wmMand_Makefile,v 1.1.1.1 2001/03/30 15:17:51 wilfried Exp $
>  wmMand/Makefile.orig Mon Feb 15 17:43:51 1999
> -+++ wmMand/Makefile  Fri Mar 30 16:17:59 2001
> +Index: wmMand/Makefile
> +--- wmMand/Makefile.orig
>  wmMand/Makefile
>  @@ -1,8 +1,8 @@
>  -CC = gcc
>  -CFLAGS = -O2 -Wall
>  -INCDIR = -I/usr/X11R6/include/X11
> --DESTDIR= /usr/X11R6
> +-DESTDIR= /usr/local
>  -LIBDIR = -L/usr/X11R6/lib
>  +#CC = gcc
>  +#CFLAGS = -O2 -Wall
>  +INCDIR = -I${X11BASE}/include
> -+#DESTDIR= /usr/X11R6
> ++#DESTDIR= /usr/local
>  +LIBDIR = -L${X11BASE}/lib
>   # for linux
>   LIBS   = -lXpm -lX11 -lXext
>   # for Solaris
> -@@ -12,14 +12,14 @@ OBJS   = wmMand.o \
> +@@ -12,7 +12,7 @@ OBJS   = wmMand.o \
>   
>   
>   .c.o:
> @@ -24,20 +25,15 @@ $OpenBSD: patch-wmMand_Makefile,v 1.1.1.
>   
>   
>   all:wmMand.o wmMand
> - 
> - wmMand.o: wmMand_master.xpm wmMand_mask.xbm
> - wmMand: $(OBJS) 
> --$(CC) $(CFLAGS) $(SYSTEM) -o wmMand $^ $(INCDIR) $(LIBDIR) $(LIBS)
> -+$(CC) $(CFLAGS) $(SYSTEM) -o wmMand $(OBJS) $(LIBDIR) $(LIBS)
> - 
> - clean:
> - for i in $(OBJS) ; do \
> -@@ -28,6 +28,6 @@ clean:
> +@@ -28,9 +28,5 @@ clean:
>   rm -f wmMand
>   
>   install:: wmMand
> +-install -d $(DESTDIR)
> +-install -d $(DESTDIR)/man/man6
> +-install -d $(DESTDIR)/share/pixmaps
>  -install -s -m 0755 wmMand $(DESTDIR)/bin
> --install-m 0644 wmMand.1 $(DESTDIR)/man/man1 
> +-install-m 0644 wmMand.6.gz $(DESTDIR)/man/man6
> +-install-m 0644 wmMand.png $(DESTDIR)/share/pixmaps
>  +${BSD_INSTALL_PROGRAM} wmMand $(PREFIX)/bin
> -+${BSD_INSTALL_MAN} wmMand.1 $(PREFIX)/man/man1 
> - 
> ++${BSD_INSTALL_MAN} wmMand.6 $(PREFIX)/man/man6
> Index: patches/patch-wmMand_wmMand_c
> 

cmark (py3-commonmark-0.9.1 and cmark-0.29.0)

[Rafael Sadowski]

There is an conflict with textproc/py-commonmark and textproc/cmark.

Looks like bin/cmark was added by the last py-commonmark update.

Collision in cmark-0.29.0: the following files already exist
/usr/local/bin/cmark (py3-commonmark-0.9.1 and cmark-0.29.0)
Couldn't install cmark-0.29.0

Re: Fix or remove wmmand? (-fno-common)

[Theo Buehler]

On Thu, Feb 25, 2021 at 07:53:36PM -0800, Greg Steuck wrote:
> Theo Buehler  writes:
> 
> > The diff below fixes the build of this port.
> >
> > However, it only partly works for me. It draws a nice albeit minuscule
> > Mandelbrot set. As soon as I hover with the mouse over the window, it
> > exits with this error:
> >
> > X Error of failed request:  BadMatch (invalid parameter attributes)
> >   Major opcode of failed request:  42 (X_SetInputFocus)
> >   Serial number of failed request:  384
> >   Current serial number in output stream:  384
> 
> If you want to go to sourceforge for an upgrade/fix, there's a teenage
> version from 14 years ago: https://sourceforge.net/p/wmmand/news/

Thanks. This version has that bug fixed and works perfectly fine for me.
It now uses ImageMagick's display command instead of xv.

Index: Makefile
===
RCS file: /cvs/ports/misc/wmmand/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile12 Jul 2019 20:47:55 -  1.19
+++ Makefile26 Feb 2021 06:04:53 -
@@ -2,27 +2,29 @@
 
 COMMENT=   wm-dockapp; mandelbrot explorer
 
-DISTNAME=  wmMand-1.0
+DISTNAME=  wmMand-1.3.2
 PKGNAME=   ${DISTNAME:L}
-REVISION=  2
 CATEGORIES=misc x11 x11/windowmaker
 
-HOMEPAGE=  http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
+HOMEPAGE=  https://sourceforge.net/p/wmmand/news/
 
 # GPL
 PERMIT_PACKAGE=Yes
 
-WANTLIB=   X11 Xext Xpm c xcb
+WANTLIB=   X11 Xext Xpm c
 
-MASTER_SITES=  http://nis-www.lanl.gov/~mgh/WindowMaker/
-
-RUN_DEPENDS=   graphics/xv
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=wmmand/}
+EXTRACT_SUFX=  .tar.bz2
 
+RUN_DEPENDS=   graphics/ImageMagick
 
 NO_TEST=   Yes
 
 WRKSRC=${WRKDIST}/wmMand
 
 ALL_TARGET=clean all
+
+post-extract:
+   @cd ${WRKSRC} && gunzip wmMand.6.gz
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/misc/wmmand/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo18 Jan 2015 03:14:33 -  1.4
+++ distinfo26 Feb 2021 05:25:32 -
@@ -1,2 +1,2 @@
-SHA256 (wmMand-1.0.tar.gz) = SiPMZvEZCA0dYkDpn4eCLYLTd38bDvCoG05aBlsAeis=
-SIZE (wmMand-1.0.tar.gz) = 66466
+SHA256 (wmMand-1.3.2.tar.bz2) = wSEn6LwLDXDD+6q68dbiMixnOp4AGrREiATnoNObz+o=
+SIZE (wmMand-1.3.2.tar.bz2) = 41268
Index: patches/patch-wmMand_Makefile
===
RCS file: /cvs/ports/misc/wmmand/patches/patch-wmMand_Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-wmMand_Makefile
--- patches/patch-wmMand_Makefile   30 Mar 2001 15:17:51 -  1.1.1.1
+++ patches/patch-wmMand_Makefile   26 Feb 2021 05:54:06 -
@@ -1,21 +1,22 @@
 $OpenBSD: patch-wmMand_Makefile,v 1.1.1.1 2001/03/30 15:17:51 wilfried Exp $
 wmMand/Makefile.orig   Mon Feb 15 17:43:51 1999
-+++ wmMand/MakefileFri Mar 30 16:17:59 2001
+Index: wmMand/Makefile
+--- wmMand/Makefile.orig
 wmMand/Makefile
 @@ -1,8 +1,8 @@
 -CC = gcc
 -CFLAGS = -O2 -Wall
 -INCDIR = -I/usr/X11R6/include/X11
--DESTDIR= /usr/X11R6
+-DESTDIR= /usr/local
 -LIBDIR = -L/usr/X11R6/lib
 +#CC = gcc
 +#CFLAGS = -O2 -Wall
 +INCDIR = -I${X11BASE}/include
-+#DESTDIR= /usr/X11R6
++#DESTDIR= /usr/local
 +LIBDIR = -L${X11BASE}/lib
  # for linux
  LIBS   = -lXpm -lX11 -lXext
  # for Solaris
-@@ -12,14 +12,14 @@ OBJS   = wmMand.o \
+@@ -12,7 +12,7 @@ OBJS   = wmMand.o \
  
  
  .c.o:
@@ -24,20 +25,15 @@ $OpenBSD: patch-wmMand_Makefile,v 1.1.1.
  
  
  all:  wmMand.o wmMand
- 
- wmMand.o: wmMand_master.xpm wmMand_mask.xbm
- wmMand:   $(OBJS) 
--  $(CC) $(CFLAGS) $(SYSTEM) -o wmMand $^ $(INCDIR) $(LIBDIR) $(LIBS)
-+  $(CC) $(CFLAGS) $(SYSTEM) -o wmMand $(OBJS) $(LIBDIR) $(LIBS)
- 
- clean:
-   for i in $(OBJS) ; do \
-@@ -28,6 +28,6 @@ clean:
+@@ -28,9 +28,5 @@ clean:
rm -f wmMand
  
  install:: wmMand
+-  install -d $(DESTDIR)
+-  install -d $(DESTDIR)/man/man6
+-  install -d $(DESTDIR)/share/pixmaps
 -  install -s -m 0755 wmMand $(DESTDIR)/bin
--  install-m 0644 wmMand.1 $(DESTDIR)/man/man1 
+-  install-m 0644 wmMand.6.gz $(DESTDIR)/man/man6
+-  install-m 0644 wmMand.png $(DESTDIR)/share/pixmaps
 +  ${BSD_INSTALL_PROGRAM} wmMand $(PREFIX)/bin
-+  ${BSD_INSTALL_MAN} wmMand.1 $(PREFIX)/man/man1 
- 
++  ${BSD_INSTALL_MAN} wmMand.6 $(PREFIX)/man/man6
Index: patches/patch-wmMand_wmMand_c
===
RCS file: /cvs/ports/misc/wmmand/patches/patch-wmMand_wmMand_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-wmMand_wmMand_c
--- patches/patch-wmMand_wmMand_c   30 Mar 2001 15:17:51 -  1.1.1.1
+++ 

Re: NEW: meta/kde

[Rafael Sadowski]

On Thu Feb 25, 2021 at 12:01:32PM +0300, Vadim Zhukov wrote:
> Some ideas:
> 
> -sdk and -akonadi are useless, IMO. Why anyone would install akonadi
> separately? And for the -sdk, maybe it probably better being merged with
> -development?

Okay, I merged -sdk in -development and akonadi in -main.

> 
> What are the plans for KDE6? If it's gotta be built together with KDE5,
> then those meta packages likely want to have PKGSPEC already.
> 

Let's wait and see, what (version) strategy KDE will follow.


meta_kdep0.tar.gz
Description: Binary data

[PATCH 7/7] Use devel/cabal module for devel/hasktags and upgrade to 0.71.2

[Greg Steuck]

>From c5b94770c3e210140379051116d1761fac993468 Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sun, 6 Sep 2020 12:16:13 -0700
Subject: [PATCH 7/7] Use devel/cabal module for devel/hasktags and upgrade
 to 0.71.2

---
 devel/hasktags/Makefile  | 27 ++
 devel/hasktags/distinfo  | 50 ++--
 devel/hasktags/pkg/PLIST |  6 ++---
 3 files changed, 74 insertions(+), 9 deletions(-)

diff --git a/devel/hasktags/Makefile b/devel/hasktags/Makefile
index 7493179eb0d..ae9b32f04e0 100644
--- a/devel/hasktags/Makefile
+++ b/devel/hasktags/Makefile
@@ -2,8 +2,8 @@
 
 COMMENT =  ctags-like tool for Haskell sources
 
-DISTNAME = hasktags-0.68.2
-REVISION = 2
+MODCABAL_STEM =hasktags
+MODCABAL_VERSION = 0.71.2
 CATEGORIES =   devel
 
 MAINTAINER =   Matthias Kilian 
@@ -13,8 +13,27 @@ PERMIT_PACKAGE = Yes
 
 WANTLIB =  c charset ffi gmp iconv m pthread util
 
-MODULES =  lang/ghc
-MODGHC_BUILD =  cabal hackage nort
+MODULES =  devel/cabal
+MODCABAL_REVISION =2
+MODCABAL_MANIFEST = \
+   ansi-terminal   0.110   \
+   ansi-wl-pprint  0.6.9   2   \
+   colour  2.3.5   0   \
+   hashable1.3.0.0 1   \
+   json0.101   \
+   microlens   0.4.11.20   \
+   microlens-ghc   0.4.12  0   \
+   microlens-mtl   0.2.0.1 0   \
+   microlens-platform  0.4.1   0   \
+   microlens-th0.4.3.5 0   \
+   optparse-applicative0.16.0.00   \
+   primitive   0.7.1.0 0   \
+   syb 0.7.1   0   \
+   th-abstraction  0.3.2.0 0   \
+   transformers-compat 0.6.5   0   \
+   unordered-containers0.2.12.00   \
+   utf8-string 1.0.1.1 3   \
+   vector  0.12.1.20   \
 
 LIB_DEPENDS =  converters/libiconv \
devel/gmp \
diff --git a/devel/hasktags/distinfo b/devel/hasktags/distinfo
index ebf5b5866f9..77568d644e6 100644
--- a/devel/hasktags/distinfo
+++ b/devel/hasktags/distinfo
@@ -1,2 +1,48 @@
-SHA256 (ghc/hasktags-0.68.2.tar.gz) = 
Wl9fzR0KR/0/kwowbw7kPoQB5Hry8mMHn1rBiuRGYlE=
-SIZE (ghc/hasktags-0.68.2.tar.gz) = 9542
+SHA256 (hackage/ansi-terminal-0.11.tar.gz) = 
xmEbnlGt1B2z956sMAZsBrM6bKKgnlhrSzYdf5gwN5M=
+SHA256 (hackage/ansi-wl-pprint-0.6.9.tar.gz) = 
p7Lo580/AvKVTosX3GCgzNiJ9J4gaOuxWr+h1C96Tqw=
+SHA256 (hackage/ansi-wl-pprint-0.6.9_2.cabal) = 
INMGdPE31DqgJ5wsLMXkWl8cPFfjAYUklJBhWLYxO/c=
+SHA256 (hackage/colour-2.3.5.tar.gz) = 
O41HGXlhfc58GTUjdDyXgt9jQz2Oh+PvbZeSLg2hBOc=
+SHA256 (hackage/hashable-1.3.0.0.tar.gz) = 
gi5UE/vMymrohNOrpAZkIsi11Y0j0Yuey1wDJzuxmrQ=
+SHA256 (hackage/hashable-1.3.0.0_1.cabal) = 
THDxQHiBBZ6TVQ03QhkSVClrJze3k6dCvZATSPs+H7E=
+SHA256 (hackage/hasktags-0.71.2.tar.gz) = 
LED9y4NOisHViNrw6KzltYx3bL3i1WiSp1EG/zJOU+g=
+SHA256 (hackage/hasktags-0.71.2_2.cabal) = 
QzKtvh+BI3YF+vELGFTA0uvr5WmaX2VWV/ESWevaLUo=
+SHA256 (hackage/json-0.10.tar.gz) = 
DARqPAPJMygW08nlAxmx0es8LBuroRI6dlDQR7JoVro=
+SHA256 (hackage/json-0.10_1.cabal) = 
2fxrB86SuIlIJaF9LPFHmYVnZ+swyL9VliuqV5IH15k=
+SHA256 (hackage/microlens-0.4.11.2.tar.gz) = 
TkhNSnPHxRdsz9rMKa7HOZNSysHH6JJNUSOFfPNt3/w=
+SHA256 (hackage/microlens-ghc-0.4.12.tar.gz) = 
K0QbEs4RCOWVk6XPwsyY2lSfH6oTID4o+RKATZUxEB8=
+SHA256 (hackage/microlens-mtl-0.2.0.1.tar.gz) = 
153osihjFSXaPBeZnTuTbrj5GfIwM0gVG2zR0nw/XkY=
+SHA256 (hackage/microlens-platform-0.4.1.tar.gz) = 
A9i+19VLZOqmRTyJBlzThia5qTQfg3JsCe6nFQ2XkX4=
+SHA256 (hackage/microlens-th-0.4.3.5.tar.gz) = 
0D2Z1R6XMDUKxADtxE6W+Q9+StWJdd0gOxrCzFHkZX4=
+SHA256 (hackage/optparse-applicative-0.16.0.0.tar.gz) = 
CcU8M5xBFncBNDr67M1Zk8a9gnKQorMAU/KnN1VVyys=
+SHA256 (hackage/primitive-0.7.1.0.tar.gz) = 
a+vs/fKld4fZ/VIxv9YStlqS7dezOpc7Kg8RMSuJo/A=
+SHA256 (hackage/syb-0.7.1.tar.gz) = 
4EqceuSNn+Jem3oGT3Ei05xxB1NURRHhXfem6H/f5wA=
+SHA256 (hackage/th-abstraction-0.3.2.0.tar.gz) = 
Nv7zOtDzS5uPtVUv5hh1eaANX5DZOOm8JNOCqZGf63k=
+SHA256 (hackage/transformers-compat-0.6.5.tar.gz) = 
2mfPEVFdp1GzKozm6WVJ9yaPfENXaa0Z3Jdmtpd0Ygs=
+SHA256 (hackage/unordered-containers-0.2.12.0.tar.gz) = 
SB2rTqWfEP6qfWXsuK5dE20TC9us8jVtQUs5JtY4vSA=
+SHA256 (hackage/utf8-string-1.0.1.1.tar.gz) = 
+wueOsvgYFvNHGPlHykKe7vmYo36MpT/RT5CNfuu8UA=
+SHA256 (hackage/utf8-string-1.0.1.1_3.cabal) = 
aMxs9mXnISM0pRtj1pNtrqygI7LP6GN9EwrP6V+RcAs=
+SHA256 (hackage/vector-0.12.1.2.tar.gz) = 
O24naD9vILN7ijXQ+rnjS1fa1yrGTLFvQocmeA1AEb0=
+SIZE (hackage/ansi-terminal-0.11.tar.gz) = 36074
+SIZE (hackage/ansi-wl-pprint-0.6.9.tar.gz) = 16723
+SIZE (hackage/ansi-wl-pprint-0.6.9_2.cabal) = 2388
+SIZE (hackage/colour-2.3.5.tar.gz) = 20485
+SIZE (hackage/hashable-1.3.0.0.tar.gz) = 29835
+SIZE (hackage/hashable-1.3.0.0_1.cabal) = 5206
+SIZE (hackage/hasktags-0.71.2.tar.gz) = 58919
+SIZE (hackage/hasktags-0.71.2_2.cabal) = 2864
+SIZE (hackage/json-0.10.tar.gz) = 22622
+SIZE (hackage/json-0.10_1.cabal) = 3210
+SIZE 

[PATCH 6/7] Use devel/cabal module for x11/xmobar and upgrade to 0.37

[Greg Steuck]

>From 67d83df86e902a5f6a042102160d9b2aba20abbd Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Tue, 25 Aug 2020 22:47:41 -0700
Subject: [PATCH 6/7] Use devel/cabal module for x11/xmobar and upgrade to 0.37

Local APM patches still work after minor massaging.
---
 x11/xmobar/Makefile   | 150 --
 x11/xmobar/distinfo   | 260 +-
 x11/xmobar/files/Batt.hs  |   6 +-
 x11/xmobar/files/Binding.hsc  |   2 +-
 x11/xmobar/files/cabal.project|  11 +
 ...ar_config => patch-examples_xmobar_config} |   4 +-
 .../patches/patch-src_Plugins_Monitors_hs | 172 
 x11/xmobar/patches/patch-src_Window_hs|  19 --
 .../patch-src_Xmobar_Plugins_Monitors_hs  |  32 +++
 x11/xmobar/patches/patch-src_Xmobar_hs|  21 --
 x11/xmobar/patches/patch-xmobar_cabal |  67 +
 x11/xmobar/pkg/DESCR  |   6 +-
 x11/xmobar/pkg/PLIST  |  10 +-
 13 files changed, 453 insertions(+), 307 deletions(-)
 create mode 100644 x11/xmobar/files/cabal.project
 rename x11/xmobar/patches/{patch-samples_xmobar_config => 
patch-examples_xmobar_config} (93%)
 delete mode 100644 x11/xmobar/patches/patch-src_Plugins_Monitors_hs
 delete mode 100644 x11/xmobar/patches/patch-src_Window_hs
 create mode 100644 x11/xmobar/patches/patch-src_Xmobar_Plugins_Monitors_hs
 delete mode 100644 x11/xmobar/patches/patch-src_Xmobar_hs

diff --git a/x11/xmobar/Makefile b/x11/xmobar/Makefile
index 0a2ebbd7b8d..cc1f825c4e5 100644
--- a/x11/xmobar/Makefile
+++ b/x11/xmobar/Makefile
@@ -2,10 +2,10 @@
 
 COMMENT =  minimalistic text based status bar
 
-DISTNAME = xmobar-0.24.3
-REVISION = 5
+MODCABAL_STEM =xmobar
+MODCABAL_VERSION = 0.37
 CATEGORIES =   x11
-HOMEPAGE = http://projects.haskell.org/xmobar
+HOMEPAGE = http://xmobar.org
 
 # BSD3
 PERMIT_PACKAGE =   Yes
@@ -14,20 +14,122 @@ WANTLIB =  X11 Xext Xft Xinerama Xrandr Xrender \
Xss c charset ffi gmp iconv \
lib/inotify/inotify m pthread util xml2
 
-MODULES =  lang/ghc
-
-MODGHC_BUILD = cabal hackage nort
-MODGHC_SETUP_CONF_ARGS = --flags="with_xft with_mpd with_mpris with_inotify"
-MODGHC_SETUP_CONF_ARGS += --extra-lib-dirs=${LOCALBASE}/lib/inotify/
-
-
-BUILD_DEPENDS =devel/hs-hinotify>=0.3 \
-   devel/hs-regex-compat \
-   net/hs-HTTP>=4000.2.4 \
-   x11/hs-X11>=1.6.1 \
-   x11/hs-X11-xft>=0.2,<0.4 \
-   x11/hs-dbus>=0.10 \
-   audio/hs-libmpd>=0.9,<0.10
+MODULES =  devel/cabal
+MODCABAL_FLAGS =   with_xft with_mpd with_mpris with_inotify
+
+# % cabal get xmobar-0.37
+# % cd ./xmobar-0.37
+# % cabal v2-configure --flags="with_xft with_mpd with_mpris with_inotify"
+# % cabal-bundler --openbsd xmobar -p ./dist-newstyle/cache/plan.json
+
+MODCABAL_MANIFEST = \
+   StateVar1.2.1   0   \
+   X11 1.9.2   0   \
+   X11-xft 0.3.1   0   \
+   adjunctions 4.4 2   \
+   aeson   1.5.6.0 0   \
+   asn1-encoding   0.9.6   2   \
+   asn1-parse  0.9.5   0   \
+   asn1-types  0.3.4   0   \
+   assoc   1.0.2   1   \
+   async   2.2.3   0   \
+   attoparsec  0.13.2.50   \
+   base-compat 0.11.2  0   \
+   base-compat-batteries   0.11.2  0   \
+   base-orphans0.8.4   0   \
+   base64-bytestring   1.2.0.1 0   \
+   basement0.0.11  2   \
+   bifunctors  5.5.10  0   \
+   blaze-builder   0.4.2.1 0   \
+   blaze-html  0.9.1.2 0   \
+   blaze-markup0.8.2.7 0   \
+   call-stack  0.3.0   0   \
+   case-insensitive1.2.1.0 0   \
+   cereal  0.5.8.1 0   \
+   comonad 5.0.8   0   \
+   conduit 1.3.4   0   \
+   conduit-extra   1.3.5   0   \
+   connection  0.3.1   1   \
+   contravariant   1.5.3   0   \
+   cookie  0.4.5   0   \
+   cryptonite  0.280   \
+   data-default0.7.1.1 0   \
+   data-default-class  0.1.2.0 0   \
+   data-default-instances-containers   0.0.1   0   \
+   data-default-instances-dlist0.0.1   0   \
+   data-default-instances-old-locale   0.0.1   0   \
+   data-fix0.3.1   0   \
+   dbus1.2.19  0   \
+   distributive0.6.2.1 0   \
+   dlist   1.0 0   \
+   exceptions  0.10.4  1   \
+   extensible-exceptions   0.1.1.4 0   \
+   free5.1.6   0   \
+   hashable1.3.1.0 0   \
+   hinotify0.4.1   0   \
+   hourglass   

[PATCH 5/7] Use devel/cabal module for devel/darcs and upgrade to 2.16.3

[Greg Steuck]

>From 3d80a96ac1803a72ea1fe7ab6ac28b5f79aad684 Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Mon, 24 Aug 2020 19:23:42 -0700
Subject: [PATCH 5/7] Use devel/cabal module for devel/darcs and upgrade to
 2.16.3

---
 devel/darcs/Makefile  | 156 +++-
 devel/darcs/distinfo  | 230 +-
 devel/darcs/patches/patch-darcs_cabal |  38 ++-
 ...tch-tests_issue1857-pristine-conversion_sh |  12 -
 ...ch-tests_issue1875-honor-no-set-default_sh |  15 --
 devel/darcs/pkg/PLIST |   4 +-
 6 files changed, 356 insertions(+), 99 deletions(-)
 delete mode 100644 
devel/darcs/patches/patch-tests_issue1857-pristine-conversion_sh
 delete mode 100644 
devel/darcs/patches/patch-tests_issue1875-honor-no-set-default_sh

diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
index 977cc186963..fe1f69a8c15 100644
--- a/devel/darcs/Makefile
+++ b/devel/darcs/Makefile
@@ -1,77 +1,117 @@
 # $OpenBSD: Makefile,v 1.71 2019/09/30 11:54:43 kili Exp $
 
-USE_WXNEEDED = Yes
-
 COMMENT =  advanced revision control system written in Haskell
 
-DISTNAME = darcs-2.14.2
+MODCABAL_STEM =darcs
+MODCABAL_VERSION = 2.16.3
 CATEGORIES =   devel
 HOMEPAGE = http://www.darcs.net/
 
 WANTLIB =  c charset curl>=2 curses ffi gmp iconv m \
pthread util z
-MODULES =  lang/ghc
-MODGHC_BUILD = cabal hackage nort
-MODGHC_SETUP_CONF_ARGS =-f 'curl -library' --enable-tests
+
+MODULES =  devel/cabal
+MODCABAL_FLAGS =   curl -library
+MODCABAL_MANIFEST =\
+   aeson   1.5.6.0 0   \
+   asn1-encoding   0.9.6   2   \
+   asn1-parse  0.9.5   0   \
+   asn1-types  0.3.4   0   \
+   assoc   1.0.2   1   \
+   async   2.2.3   0   \
+   attoparsec  0.13.2.50   \
+   base-compat 0.11.2  0   \
+   base-compat-batteries   0.11.2  0   \
+   base-orphans0.8.4   0   \
+   base16-bytestring   1.0.1.0 0   \
+   base64-bytestring   1.2.0.1 0   \
+   basement0.0.11  2   \
+   bifunctors  5.5.10  0   \
+   blaze-builder   0.4.2.1 0   \
+   case-insensitive1.2.1.0 0   \
+   cereal  0.5.8.1 0   \
+   comonad 5.0.8   0   \
+   conduit 1.3.4   0   \
+   conduit-extra   1.3.5   0   \
+   connection  0.3.1   1   \
+   constraints 0.120   \
+   cookie  0.4.5   0   \
+   cryptonite  0.270   \
+   data-default-class  0.1.2.0 0   \
+   data-fix0.3.1   0   \
+   data-ordlist0.4.7.0 0   \
+   digest  0.0.1.2 0   \
+   distributive0.6.2.1 0   \
+   dlist   1.0 0   \
+   exceptions  0.10.4  1   \
+   fgl 5.7.0.3 0   \
+   filtrable   0.1.6.0 0   \
+   hashable1.3.1.0 0   \
+   hourglass   0.2.12  0   \
+   hsc2hs  0.68.7  1   \
+   html1.0.1.2 0   \
+   http-client 0.7.6   0   \
+   http-client-tls 0.3.5.3 1   \
+   http-conduit2.3.8   0   \
+   http-types  0.12.3  0   \
+   indexed-traversable 0.1.1   0   \
+   integer-logarithms  1.0.3.1 0   \
+   memory  0.15.0  1   \
+   mime-types  0.1.0.9 0   \
+   mmap0.5.9   0   \
+   mono-traversable1.0.15.10   \
+   network 3.1.2.1 1   \
+   network-uri 2.6.4.1 0   \
+   old-locale  1.0.0.7 2   \
+   old-time1.1.0.3 2   \
+   pem 0.2.4   0   \
+   primitive   0.7.1.0 2   \
+   random  1.2.0   5   \
+   regex-applicative   0.3.4   0   \
+   regex-base  0.94.0.10   \
+   regex-compat-tdfa   0.95.1.40   \
+   regex-tdfa  1.3.1.0 2   \
+   resourcet   1.2.4.2 0   \
+   scientific  0.3.6.2 0   \
+   semigroups  0.19.1  0   \
+   socks   0.6.1   0   \
+   split   0.2.3.4 0   \
+   splitmix0.1.0.3 0   \
+   streaming-commons   0.2.2.1 0   \
+   strict  0.4.0.1 0   \
+   tagged  0.8.6.1 0   \
+   tar 0.5.1.1 3   \
+   temporary   1.3 0   \
+   th-abstraction  0.4.2.0 0   \
+   th-compat   0.1.1   0   \
+   these   1.1.1.1 1   \
+   time-compat 1.9.5   1   \
+   tls 1.5.5   0   \
+   transformers-compat 0.6.6   0   \
+   type-equality   1   2   \
+   typed-process   0.2.6.0 0   \
+   unix-compat 0.5.3   0   \
+   unliftio-core   0.2.0.1 1   \
+   unordered-containers0.2.13.00   \
+   

[PATCH 4/7] Use devel/cabal module for x11/xmonad (still the latest release)

[Greg Steuck]

>From da5de704008e179e32eb582796f751e820b92efb Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Mon, 24 Aug 2020 19:20:59 -0700
Subject: [PATCH 4/7] Use devel/cabal module for x11/xmonad (still the latest
 release)

---
 x11/xmonad/Makefile  | 67 +---
 x11/xmonad/distinfo  | 28 -
 x11/xmonad/files/build   | 13 
 x11/xmonad/files/xmonad-config.cabal | 13 
 x11/xmonad/pkg/{DESCR-main => DESCR} |  0
 x11/xmonad/pkg/DESCR-lib |  2 -
 x11/xmonad/pkg/MESSAGE   |  6 ++
 x11/xmonad/pkg/MESSAGE-main  |  4 --
 x11/xmonad/pkg/PLIST |  9 +++
 x11/xmonad/pkg/PLIST-lib | 91 
 x11/xmonad/pkg/PLIST-main|  4 --
 11 files changed, 96 insertions(+), 141 deletions(-)
 create mode 100644 x11/xmonad/files/build
 create mode 100644 x11/xmonad/files/xmonad-config.cabal
 rename x11/xmonad/pkg/{DESCR-main => DESCR} (100%)
 delete mode 100644 x11/xmonad/pkg/DESCR-lib
 create mode 100644 x11/xmonad/pkg/MESSAGE
 delete mode 100644 x11/xmonad/pkg/MESSAGE-main
 create mode 100644 x11/xmonad/pkg/PLIST
 delete mode 100644 x11/xmonad/pkg/PLIST-lib
 delete mode 100644 x11/xmonad/pkg/PLIST-main

diff --git a/x11/xmonad/Makefile b/x11/xmonad/Makefile
index 32408e28c60..e46d0e4e303 100644
--- a/x11/xmonad/Makefile
+++ b/x11/xmonad/Makefile
@@ -1,59 +1,50 @@
 # $OpenBSD: Makefile,v 1.58 2019/09/30 12:41:12 kili Exp $
 
-COMMENT-main = tiling window manager
-COMMENT-lib =  libraries for runtime configuration
+COMMENT =  tiling window manager
 
-DISTNAME = xmonad-0.15
+MODCABAL_STEM =xmonad
+MODCABAL_VERSION = 0.15
+REVISION = 0
 
-PKGNAME-main = ${DISTNAME}
-PKGNAME-lib =  ${DISTNAME:S,-,-lib-,}
+PKGNAME =  ${DISTNAME}
 CATEGORIES =   x11
 HOMEPAGE = http://www.xmonad.org/
 
-MULTI_PACKAGES =   -main -lib
-
 # BSD3
 PERMIT_PACKAGE =   Yes
 
-WANTLIB-main = X11 Xext Xinerama Xrandr Xss c charset ffi gmp \
+WANTLIB =  X11 Xext Xinerama Xrandr Xss c charset ffi gmp \
m iconv pthread util
-WANTLIB-lib =
-
-MODULES =  lang/ghc
-MODGHC_BUILD = cabal hackage haddock register nort
-
-MODGHC_PACKAGE_KEY =   9L0IDbyIoHf7Mpz81NeFlT
 
-# Required because of the nort tag in MODGHC_BUILD
-SUBST_VARS +=  MODGHC_PACKAGE_KEY
-
-BUILD_DEPENDS =${RUN_DEPENDS-lib}
-RUN_DEPENDS-lib =  devel/hs-data-default \
-   devel/hs-extensible-exceptions \
-   devel/hs-utf8-string>=0.3,<1.1 \
-   x11/hs-X11>=1.8,<1.9
-LIB_DEPENDS-main = converters/libiconv \
+MODULES =  devel/cabal
+MODCABAL_MANIFEST = \
+   X11 1.9.2   0   \
+   data-default0.7.1.1 0   \
+   data-default-class  0.1.2.0 0   \
+   data-default-instances-containers   0.0.1   0   \
+   data-default-instances-dlist0.0.1   0   \
+   data-default-instances-old-locale   0.0.1   0   \
+   dlist   1.0 0   \
+   extensible-exceptions   0.1.1.4 0   \
+   old-locale  1.0.0.7 2   \
+   utf8-string 1.0.1.1 3   \
+
+LIB_DEPENDS =  converters/libiconv \
devel/gmp \
devel/libffi
 
-# MODGHC_BUILD contains 'nort', an explicity dependency is needed for
-# the -lib subpackage (plus the tweaks to MODGHC_SETUP_CONF_ARGS below).
-RUN_DEPENDS-lib += lang/ghc=${MODGHC_VER}
-
 post-install:
-   @${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${PREFIX}/man/man1
-   @${INSTALL_DATA} ${WRKSRC}/CONFIG ${PREFIX}/share/doc/hs-${DISTNAME}
-   @${INSTALL_DATA} ${WRKSRC}/man/xmonad.hs 
${PREFIX}/share/doc/hs-${DISTNAME}/xmonad.hs
-   @# Don't know why, but it installs the xmonad.hs into that directory:
-   @rm -rf ${PREFIX}/share/${DISTNAME}
+   ${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${PREFIX}/man/man1
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${DISTNAME}
+   ${INSTALL_DATA} ${WRKSRC}/{CONFIG,man/xmonad.hs} \
+   ${PREFIX}/share/doc/${DISTNAME}
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${DISTNAME}
+   ${INSTALL_DATA} ${FILESDIR}/xmonad-config.cabal \
+   ${PREFIX}/share/examples/${DISTNAME}
+   ${INSTALL_SCRIPT} ${FILESDIR}/build \
+   ${PREFIX}/share/examples/${DISTNAME}
 
 # Needs to be built with different configuration.
 NO_TEST =  Yes
 
 .include 
-
-# Override the 'nort' settings from ghc.port.mk, to get the correct
-# flags and directories for the -lib subpackage.
-MODGHC_SETUP_CONF_ARGS +=  --enable-library-profiling
-MODGHC_SETUP_CONF_ARGS +=  --docdir=\$$datadir/doc/hs-\$$pkgid
-MODGHC_SETUP_CONF_ARGS +=  --libsubdir=ghc/\$$pkgid
diff --git a/x11/xmonad/distinfo b/x11/xmonad/distinfo
index 

[PATCH 3/7] Use devel/cabal module for devel/shellcheck and upgrade to 0.7.1

[Greg Steuck]

>From 8e6e461ff776f5cda40cd249c87bc0d3dd20122f Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sun, 23 Aug 2020 15:42:41 -0700
Subject: [PATCH 3/7] Use devel/cabal module for devel/shellcheck and upgrade
 to 0.7.1

TODO: add a quirk since shellcheck-main is replaced by
shellcheck. Otherwise pkg_add reports:
Can't install shellcheck-0.7.1 because of conflicts (shellcheck-0.4.7p1)
---
 devel/shellcheck/Makefile |  70 +++
 devel/shellcheck/distinfo |  86 -
 .../patches/patch-ShellCheck_AnalyzerLib_hs   |  44 ---
 .../shellcheck/patches/patch-ShellCheck_cabal |  54 
 devel/shellcheck/patches/patch-shellcheck_hs  |  21 
 devel/shellcheck/pkg/{DESCR-main => DESCR}|   0
 devel/shellcheck/pkg/DESCR-lib|   1 -
 devel/shellcheck/pkg/PLIST|   4 +
 devel/shellcheck/pkg/PLIST-lib| 119 --
 devel/shellcheck/pkg/PLIST-main   |   3 -
 10 files changed, 134 insertions(+), 268 deletions(-)
 delete mode 100644 devel/shellcheck/patches/patch-ShellCheck_AnalyzerLib_hs
 delete mode 100644 devel/shellcheck/patches/patch-ShellCheck_cabal
 delete mode 100644 devel/shellcheck/patches/patch-shellcheck_hs
 rename devel/shellcheck/pkg/{DESCR-main => DESCR} (100%)
 delete mode 100644 devel/shellcheck/pkg/DESCR-lib
 create mode 100644 devel/shellcheck/pkg/PLIST
 delete mode 100644 devel/shellcheck/pkg/PLIST-lib
 delete mode 100644 devel/shellcheck/pkg/PLIST-main

diff --git a/devel/shellcheck/Makefile b/devel/shellcheck/Makefile
index 94f583b6c70..a85d837cb10 100644
--- a/devel/shellcheck/Makefile
+++ b/devel/shellcheck/Makefile
@@ -1,14 +1,11 @@
 # $OpenBSD: Makefile,v 1.6 2019/09/30 12:50:08 kili Exp $
 
-COMMENT-main = shell script analysis tool
-COMMENT-lib =  ShellCheck library
-
-V =0.4.7
-DISTNAME = ShellCheck-${V}
-REVISION-main =1
-REVISION-lib = 3
-PKGNAME-main = shellcheck-${V}
-PKGNAME-lib =  hs-shellcheck-${V}
+COMMENT =  shell script analysis tool
+
+MODCABAL_STEM =ShellCheck
+MODCABAL_VERSION = 0.7.1
+MODCABAL_EXECUTABLES = shellcheck
+PKGNAME =  ${DISTNAME:L}
 CATEGORIES =   devel
 HOMEPAGE = https://www.shellcheck.net/
 
@@ -17,29 +14,54 @@ MAINTAINER =Caspar Schutijser 

 # GPLv3
 PERMIT_PACKAGE =   Yes
 
-MULTI_PACKAGES =   -main -lib
-WANTLIB-main = c charset ffi gmp iconv m pthread util
-WANTLIB-lib =
-
-MODULES =  lang/ghc
-
-MODGHC_BUILD = cabal hackage haddock register
+WANTLIB =  c charset ffi gmp iconv m pthread util
 
-MODGHC_PACKAGE_KEY =   1v0sx5oDTF9BoGzz61tUYo
+MODULES =  devel/cabal
+MODCABAL_MANIFEST = \
+   Diff0.4.00 \
+   QuickCheck  2.14.1   0 \
+   aeson   1.5.3.0  0 \
+   assoc   1.0.20 \
+   attoparsec  0.13.2.4 0 \
+   base-compat 0.11.1   0 \
+   base-compat-batteries   0.11.1   0 \
+   base-orphans0.8.20 \
+   bifunctors  5.5.71 \
+   cabal-doctest   1.0.82 \
+   comonad 5.0.61 \
+   data-fix0.3.00 \
+   distributive0.6.22 \
+   dlist   1.0  0 \
+   hashable1.3.0.0  1 \
+   integer-logarithms  1.0.32 \
+   primitive   0.7.1.0  0 \
+   random  1.2.00 \
+   regex-base  0.94.0.0 1 \
+   regex-tdfa  1.3.1.0  1 \
+   scientific  0.3.6.2  0 \
+   splitmix0.1.0.1  0 \
+   strict  0.4  0 \
+   tagged  0.8.62 \
+   th-abstraction  0.3.2.0  0 \
+   these   1.1.1.1  0 \
+   time-compat 1.9.30 \
+   transformers-compat 0.6.50 \
+   unordered-containers0.2.12.0 0 \
+   uuid-types  1.0.33 \
+   vector  0.12.1.2 0 \
 
-BUILD_DEPENDS =${RUN_DEPENDS-lib}
-RUN_DEPENDS-lib =  devel/hs-QuickCheck>=2.7.4 \
-   devel/hs-regex-tdfa \
-   lang/ghc=${MODGHC_VER} \
-   textproc/hs-json
-LIB_DEPENDS-main = converters/libiconv \
+LIB_DEPENDS =  converters/libiconv \
devel/gmp \
devel/libffi
 RUN_DEPENDS-main =
 
 NO_TEST =  Yes
 
+# TODO(gnezdo): find a lighter-weight option than pandoc 

[PATCH 2/7] Use devel/cabal module for devel/cpphs and upgrade to 1.20.9.1

[Greg Steuck]

>From db60b5c7569737d58724c0999ac90c11514962dc Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sun, 23 Aug 2020 11:37:32 -0700
Subject: [PATCH 2/7] Use devel/cabal module for devel/cpphs and upgrade to
 1.20.9.1

Removed do-test, it was pre-broken in the previous update as upstream
stopped shipping the tests.

TODO: since -lib port is getting removed, a quirk is probably required
to get rid of hs-cpphs packages
---
 devel/cpphs/Makefile  | 40 --
 devel/cpphs/distinfo  |  8 +++-
 devel/cpphs/pkg/{DESCR-main => DESCR} |  0
 devel/cpphs/pkg/DESCR-lib |  1 -
 devel/cpphs/pkg/PLIST |  4 ++
 devel/cpphs/pkg/PLIST-lib | 59 ---
 devel/cpphs/pkg/PLIST-main|  4 --
 7 files changed, 19 insertions(+), 97 deletions(-)
 rename devel/cpphs/pkg/{DESCR-main => DESCR} (100%)
 delete mode 100644 devel/cpphs/pkg/DESCR-lib
 create mode 100644 devel/cpphs/pkg/PLIST
 delete mode 100644 devel/cpphs/pkg/PLIST-lib
 delete mode 100644 devel/cpphs/pkg/PLIST-main

diff --git a/devel/cpphs/Makefile b/devel/cpphs/Makefile
index fdef2f9052a..6d0b8dd992d 100644
--- a/devel/cpphs/Makefile
+++ b/devel/cpphs/Makefile
@@ -1,47 +1,25 @@
 # $OpenBSD: Makefile,v 1.48 2019/09/30 12:51:25 kili Exp $
 
-COMMENT-main = liberalised reimplementation of cpp in Haskell
-COMMENT-lib =  cpphs library
+COMMENT =  liberalised reimplementation of cpp in Haskell
 
-DISTNAME = cpphs-1.19.3
-PKGNAME-main = ${DISTNAME}
-REVISION-main =0
-PKGNAME-lib =  hs-${DISTNAME}
-REVISION-lib = 7
-CATEGORIES =   devel
-MAINTAINER =   Matthias Kilian 
+MODCABAL_STEM =cpphs
+MODCABAL_VERSION = 1.20.9.1
+MODCABAL_MANIFEST =polyparse 1.13 1
+CATEGORIES =   devel
+MAINTAINER =   Matthias Kilian 
 
 # LGPL2.1
 PERMIT_PACKAGE =   Yes
 
-MULTI_PACKAGES =   -main -lib
+MODULES =  devel/cabal
 
-SUBST_VARS +=  DISTNAME
+WANTLIB =  c charset ffi gmp m iconv pthread util
 
-MODULES =  lang/ghc
-LIB_DEPENDS += converters/libiconv
-
-WANTLIB-main = c charset ffi gmp m iconv pthread util
-
-MODGHC_BUILD = hackage cabal haddock register
-MODGHC_PACKAGE_KEY =   3CUnFHz9uegIX6e6hlBlNd
-LIB_DEPENDS-main = ${LIB_DEPENDS} \
+LIB_DEPENDS =  converters/libiconv \
devel/gmp \
devel/libffi
-RUN_DEPENDS-main =
-LIB_DEPENDS-lib =
-RUN_DEPENDS-lib =  devel/hs-old-locale \
-   devel/hs-old-time \
-   lang/ghc=${MODGHC_VER} \
-   textproc/hs-polyparse>=1.9
-BUILD_DEPENDS +=   ${RUN_DEPENDS-lib}
-WANTLIB-lib =
-DIST_SUBDIR =
 
 post-install:
${INSTALL_MAN} ${WRKSRC}/docs/cpphs.1 ${PREFIX}/man/man1
 
-do-test:
-   cd ${WRKSRC}/tests && /bin/sh ./runtests
-
 .include 
diff --git a/devel/cpphs/distinfo b/devel/cpphs/distinfo
index a69a8dd8800..4c9aab52ea9 100644
--- a/devel/cpphs/distinfo
+++ b/devel/cpphs/distinfo
@@ -1,2 +1,6 @@
-SHA256 (cpphs-1.19.3.tar.gz) = 4lRqo4LpwilCxcKEljHtxrHYy+osUHYvZrdAdV+vV9o=
-SIZE (cpphs-1.19.3.tar.gz) = 44306
+SHA256 (hackage/cpphs-1.20.9.1.tar.gz) = 
f1mxC8M3QATO48BPpO5KG5DQ3KhKPQ5DbVhhoao7kZ8=
+SHA256 (hackage/polyparse-1.13.tar.gz) = 
HExymA4eWk8H/qZcoIsjmVgdKmqiHrEHj3rShsJ5cHs=
+SHA256 (hackage/polyparse-1.13_1.cabal) = 
aLk8AwrruIqr71sNyhlaHTW1DPL59U2HlZMOf42wTCY=
+SIZE (hackage/cpphs-1.20.9.1.tar.gz) = 45496
+SIZE (hackage/polyparse-1.13.tar.gz) = 33144
+SIZE (hackage/polyparse-1.13_1.cabal) = 2726
diff --git a/devel/cpphs/pkg/DESCR-main b/devel/cpphs/pkg/DESCR
similarity index 100%
rename from devel/cpphs/pkg/DESCR-main
rename to devel/cpphs/pkg/DESCR
diff --git a/devel/cpphs/pkg/DESCR-lib b/devel/cpphs/pkg/DESCR-lib
deleted file mode 100644
index c7a2a6defcd..000
--- a/devel/cpphs/pkg/DESCR-lib
+++ /dev/null
@@ -1 +0,0 @@
-This library provides the functioninality of cpphs to other programs.
diff --git a/devel/cpphs/pkg/PLIST b/devel/cpphs/pkg/PLIST
new file mode 100644
index 000..4cf55032ce5
--- /dev/null
+++ b/devel/cpphs/pkg/PLIST
@@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST,v$
+@pkgpath devel/${MODCABAL_STEM}
+@bin bin/${MODCABAL_STEM}
+@man man/man1/${MODCABAL_STEM}.1
diff --git a/devel/cpphs/pkg/PLIST-lib b/devel/cpphs/pkg/PLIST-lib
deleted file mode 100644
index bf816c6c64d..000
--- a/devel/cpphs/pkg/PLIST-lib
+++ /dev/null
@@ -1,59 +0,0 @@
-@comment $OpenBSD: PLIST-lib,v 1.11 2019/09/30 12:51:25 kili Exp $
-@tag ghc-pkg-recache
-lib/ghc/${DISTNAME}/
-lib/ghc/${DISTNAME}/Language/
-lib/ghc/${DISTNAME}/Language/Preprocessor/
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs.dyn_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs.hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs.p_hi
-lib/ghc/${DISTNAME}/Language/Preprocessor/Cpphs/CppIfdef.dyn_hi

[PATCH 1/7] Use devel/cabal module for devel/alex and upgrade to 3.2.5

[Greg Steuck]

>From ab38b32929931de0fe91185dcd84155bb8cc7123 Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sat, 22 Aug 2020 15:27:27 -0700
Subject: [PATCH 1/7] Use devel/cabal module for devel/alex and upgrade to
 3.2.5

---
 devel/alex/Makefile  | 22 ++---
 devel/alex/distinfo  |  4 +--
 devel/alex/pkg/PLIST | 77 +++-
 3 files changed, 52 insertions(+), 51 deletions(-)

diff --git a/devel/alex/Makefile b/devel/alex/Makefile
index 7b8b5d667a3..e19050f77f0 100644
--- a/devel/alex/Makefile
+++ b/devel/alex/Makefile
@@ -2,13 +2,10 @@
 
 COMMENT =  lexical analyser generator for Haskell
 
-# Dependency of meta/haskell-platform.
-# Please do *not* update without thinking.
-PORTROACH =ignore:1
-
-DISTNAME = alex-3.1.7
+MODCABAL_STEM  = alex
+MODCABAL_VERSION   = 3.2.5
+MODCABAL_DATA_DIR  = data
 CATEGORIES =   devel
-REVISION = 0
 
 HOMEPAGE = http://www.haskell.org/alex/
 
@@ -17,8 +14,7 @@ PERMIT_PACKAGE =  Yes
 
 WANTLIB =  c charset ffi gmp iconv m pthread util
 
-MODULES =  lang/ghc
-MODGHC_BUILD =  cabal hackage nort
+MODULES =  devel/cabal
 
 LIB_DEPENDS =  converters/libiconv \
devel/gmp \
@@ -31,8 +27,7 @@ AUTOCONF_VERSION =2.61
 AUTOCONF_DIR = ${WRKSRC}/doc
 WRKCONF =  ${AUTOCONF_DIR}
 
-BUILD_DEPENDS +=   devel/hs-QuickCheck>=2 \
-   textproc/docbook-xsl
+BUILD_DEPENDS +=   textproc/docbook-xsl
 
 post-build:
@cd ${WRKBUILD}/doc && exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} html
@@ -42,7 +37,10 @@ post-install:
cd ${WRKBUILD}/doc && umask 022 && pax -rw alex ${PREFIX}/share/doc
 
 do-test:
-   cd ${WRKBUILD}/tests && exec ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
-   all
+   cd ${WRKBUILD}/tests && exec ${SETENV} ${MAKE_ENV} \
+   ${MAKE_PROGRAM} ALEX=${MODCABAL_BUILT_EXECUTABLE_alex} \
+   TEST_ALEX_OPTS=--template=../data \
+   -j ${MAKE_JOBS} all
+
 
 .include 
diff --git a/devel/alex/distinfo b/devel/alex/distinfo
index d3ce2e457cf..0dbe0647154 100644
--- a/devel/alex/distinfo
+++ b/devel/alex/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ghc/alex-3.1.7.tar.gz) = iaGhPabMvrAGSI2VdDguiRz3wFZ3UrMwzIYW10i/KNE=
-SIZE (ghc/alex-3.1.7.tar.gz) = 103624
+SHA256 (hackage/alex-3.2.5.tar.gz) = 
t3yKEnB2fGTirbIabpHufNkEuhftrhe8IP0D2lJW4OM=
+SIZE (hackage/alex-3.2.5.tar.gz) = 108531
diff --git a/devel/alex/pkg/PLIST b/devel/alex/pkg/PLIST
index 2e8e08fd666..3339a386db7 100644
--- a/devel/alex/pkg/PLIST
+++ b/devel/alex/pkg/PLIST
@@ -1,38 +1,41 @@
 @comment $OpenBSD: PLIST,v 1.6 2013/07/18 21:58:00 kili Exp $
-@bin bin/alex
-share/${DISTNAME}/
-share/${DISTNAME}/AlexTemplate
-share/${DISTNAME}/AlexTemplate-debug
-share/${DISTNAME}/AlexTemplate-ghc
-share/${DISTNAME}/AlexTemplate-ghc-debug
-share/${DISTNAME}/AlexTemplate-ghc-nopred
-share/${DISTNAME}/AlexWrapper-basic
-share/${DISTNAME}/AlexWrapper-basic-bytestring
-share/${DISTNAME}/AlexWrapper-gscan
-share/${DISTNAME}/AlexWrapper-monad
-share/${DISTNAME}/AlexWrapper-monad-bytestring
-share/${DISTNAME}/AlexWrapper-monadUserState
-share/${DISTNAME}/AlexWrapper-monadUserState-bytestring
-share/${DISTNAME}/AlexWrapper-posn
-share/${DISTNAME}/AlexWrapper-posn-bytestring
-share/${DISTNAME}/AlexWrapper-strict-bytestring
-share/doc/alex/
-@comment share/doc/${DISTNAME}/
-@comment share/doc/${DISTNAME}/LICENSE
-share/doc/alex/about.html
-share/doc/alex/alex-files.html
-share/doc/alex/api.html
-share/doc/alex/basic-api.html
-share/doc/alex/bug-reports.html
-share/doc/alex/charsets.html
-share/doc/alex/fptools.css
-share/doc/alex/index.html
-share/doc/alex/introduction.html
-share/doc/alex/invoking.html
-share/doc/alex/license.html
-share/doc/alex/regexps.html
-share/doc/alex/relnotes-20.html
-share/doc/alex/relnotes-210.html
-share/doc/alex/relnotes-22.html
-share/doc/alex/syntax.html
-share/doc/alex/wrappers.html
+bin/${MODCABAL_STEM}
+libexec/cabal/
+@bin libexec/cabal/${MODCABAL_STEM}
+share/${PKGNAME}/
+share/${PKGNAME}/AlexTemplate
+share/${PKGNAME}/AlexTemplate-debug
+share/${PKGNAME}/AlexTemplate-ghc
+share/${PKGNAME}/AlexTemplate-ghc-debug
+share/${PKGNAME}/AlexTemplate-ghc-nopred
+share/${PKGNAME}/AlexWrapper-basic
+share/${PKGNAME}/AlexWrapper-basic-bytestring
+share/${PKGNAME}/AlexWrapper-gscan
+share/${PKGNAME}/AlexWrapper-monad
+share/${PKGNAME}/AlexWrapper-monad-bytestring
+share/${PKGNAME}/AlexWrapper-monadUserState
+share/${PKGNAME}/AlexWrapper-monadUserState-bytestring
+share/${PKGNAME}/AlexWrapper-posn
+share/${PKGNAME}/AlexWrapper-posn-bytestring
+share/${PKGNAME}/AlexWrapper-strict-bytestring
+share/doc/${MODCABAL_STEM}/
+@comment share/doc/${PKGNAME}/
+@comment share/doc/${PKGNAME}/LICENSE
+share/doc/${MODCABAL_STEM}/about.html
+share/doc/${MODCABAL_STEM}/${MODCABAL_STEM}-files.html
+share/doc/${MODCABAL_STEM}/api.html
+share/doc/${MODCABAL_STEM}/basic-api.html

The rest of the haskell binary upgrades

[Greg Steuck]

Hi Matthias,

Now that we have the framework in place we can upgrade the rest of the
haskell binary packages. I'll send them as distinct patches as they are
independent and can be submitted in any order. I annotated the ports
where I expect quirks to be required, please let me know if I missed
any. I'll also start removing hs-* ports as they become unreferenced.

If we move fast we have a chance of shipping all of these ports upgraded
to modern versions for 6.9. If not, no biggie, the changes are staged
such that we can do an arbitrary subset and pause.

Here's the full list:

 * Use devel/cabal module for devel/alex and upgrade to 3.2.5
 * Use devel/cabal module for devel/hasktags and upgrade 0.71.2
 * Use devel/cabal module for x11/xmobar and upgrade to 0.37
 * Use devel/cabal module for devel/darcs and upgrade to 2.16.3
 * Use devel/cabal module for x11/xmonad (still the latest release)
 * Use devel/cabal module for devel/shellcheck and upgrade to 0.7.1
 * Use devel/cabal module for devel/cpphs and upgrade to 1.20.9.1

Thanks
Greg

CVS: cvs.openbsd.org: ports

[Anthony J . Bentley]

CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2021/02/25 21:12:34

Modified files:
games/vms-empire: Makefile distinfo 

Log message:
Update to vms-empire-1.16.

The only change in this release is an upstream refactor to fix -fno-common.

Re: Fix or remove wmmand? (-fno-common)

[Greg Steuck]

Theo Buehler  writes:

> The diff below fixes the build of this port.
>
> However, it only partly works for me. It draws a nice albeit minuscule
> Mandelbrot set. As soon as I hover with the mouse over the window, it
> exits with this error:
>
> X Error of failed request:  BadMatch (invalid parameter attributes)
>   Major opcode of failed request:  42 (X_SetInputFocus)
>   Serial number of failed request:  384
>   Current serial number in output stream:  384

If you want to go to sourceforge for an upgrade/fix, there's a teenage
version from 14 years ago: https://sourceforge.net/p/wmmand/news/

OK gnezdo to remove

CVS: cvs.openbsd.org: ports

[Greg Steuck]

CVSROOT:/cvs
Module name:ports
Changes by: gne...@cvs.openbsd.org  2021/02/25 20:31:14

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

Log message:
Use devel/cabal module for devel/happy and upgrade to 1.20

Passes `make test` and produces a package good enough for ghc build.

This is the first package to rely on cabal.port.mk module.

ok kili

CVS: cvs.openbsd.org: ports

[Greg Steuck]

CVSROOT:/cvs
Module name:ports
Changes by: gne...@cvs.openbsd.org  2021/02/25 20:30:53

Added files:
devel/cabal: cabal.port.mk 

Log message:
Add cabal.port.mk to more easily build haskell ports

Corrections by James Cook 

ok kili, reviews by espie and sthen before

CVS: cvs.openbsd.org: ports

[Greg Steuck]

CVSROOT:/cvs
Module name:ports
Changes by: gne...@cvs.openbsd.org  2021/02/25 20:30:37

ports/devel/cabal

Update of /cvs/ports/devel/cabal
In directory cvs.openbsd.org:/cvs.d/hack/gnezdo/ports/devel/cabal

Log Message:
Directory /cvs/ports/devel/cabal added to the repository

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/25 20:15:31

Modified files:
textproc/py-unpaddedbase64: Makefile 

Log message:
"None" is not a valid url; reported by repology

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/25 20:03:53

Modified files:
emulators/gxemul: Makefile distinfo 
emulators/gxemul/patches: patch-configure 
emulators/gxemul/pkg: PLIST 

Log message:
update to gxemul 0.6.3.1 for additional luna88k improvements

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2021/02/25 19:59:02

Modified files:
www/py-requests: Makefile 

Log message:
disable python2 tests for py-requests so py-flask can move to python3

ok danj@ (MAINTAINER), sthen@

Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1

[Dimitri Karamazov]

On Thu, Feb 25, 2021 at 01:08:22PM +, Stuart Henderson wrote:
> On 2021/02/24 12:07, Dimitri Karamazov wrote:
> > On Wed, Feb 24, 2021 at 11:23:47AM +, Stuart Henderson wrote:
> > > On 2021/02/22 15:32, Dimitri Karamazov wrote:
> > > > On Mon, Feb 22, 2021 at 01:28:26AM -0500, Daniel Dickman wrote:
> > > > > 
> > > > > 
> > > > > On Mon, 22 Feb 2021, Rafael Sadowski wrote:
> > > > > 
> > > > > > > 
> > > > > > > Bump for a new release.
> > > > > > 
> > > > > > Still OK for me but we need to import robin-map first. A second OK 
> > > > > > is
> > > > > > needed.
> > > > > > 
> > > > > 
> > > > > Where is the port for robin-map? Can someone resend it?
> > > > 
> > > > Avoid the previous diff as there is a mistake and the robin-map
> > > > port has been attached at the very end.
> > > 
> > > robin-map wants "ONLY_FOR_ARCHS= ${CXX11_ARCHS}". I would drop the
> > > NO_BUILD as well it is really just for cases where things fail if you
> > > try to do "build". Otherwise OK for that.
> > > 
> > Done.
> > 
> > > > --- pkg/PLIST   5 Jan 2021 20:53:18 -   1.11
> > > > +++ pkg/PLIST   22 Feb 2021 15:29:57 -
> > > > @@ -1,5 +1,4 @@
> > > > -@comment $OpenBSD: PLIST,v 1.11 2021/01/05 20:53:18 jca Exp $
> > > > -@conflict idiff-*
> > > > +@comment $OpenBSD: PLIST,v$
> > > 
> > > The conflict should stay.
> > > 
> > This conflict is not being detected by pkglocatedb.
> > I wonder why?
> 
> $ pkglocate bin/idiff
> idiff-1.1:textproc/idiff:/usr/local/bin/idiff
> openimageio-2.2.10.0p0:graphics/openimageio:/usr/local/bin/idiff
> plan9port-20210129:plan9/plan9port:/usr/local/plan9/bin/idiff
> 
> If you mean the automatic check, that has been changed to only check
> new files, otherwise everybody working on ports with thousands of PLIST
> entries has to disable checking completely otherwise it's too slow..
> 
> > The suggested changes have been applied to the attachments.
> 
> This is OK with me. (Or I can commit if I get an OK for robin-map).
> 
I think Mr Sadowski has already provided on OK, check above.

> > > > > On Mon, 22 Feb 2021, Rafael Sadowski wrote:
> > > > > 
> > > > > > > 
> > > > > > > Bump for a new release.
> > > > > > 
> > > > > > Still OK for me but we need to import robin-map first. A second OK 
> > > > > > is
> > > > > > needed.
> > > > > > 

sparc64 bulk build report

[kmos]

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

Started : Tue Feb 23 10:01:32 MST 2021
Finished: Thu Feb 25 19:38:11 MST 2021
Duration: 2 Days 9 hours 37 minutes

Built using OpenBSD 6.9-beta (GENERIC.MP) #703: Tue Feb 23 04:03:09 MST 2021

Built 9339 packages

Number of packages built each day:
Feb 23: 7234
Feb 24: 1681
Feb 25: 424



Critical path missing pkgs:
http://build-failures.rhaalovely.net/sparc64/2021-02-23/summary.log

Build failures: 22
http://build-failures.rhaalovely.net/sparc64/2021-02-23/audio/ncmpcpp.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/comms/syncterm.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/devel/glog.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/devel/keystone/python,python3.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/devel/spidermonkey78.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/emulators/emulationstation.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/games/frotz.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/games/odamex.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/games/openxcom.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/geo/spatialite/gui.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/graphics/asymptote.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/graphics/exiv2.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/math/mlpack,-main.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/multimedia/gstreamer-0.10/plugins-bad,-main.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/net/barrier.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/net/pmacct,postgresql.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/print/cups-bjnp.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/print/gutenprint.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/productivity/gnucash.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/sysutils/libvirt.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/x11/qt5/docs,-html.log
http://build-failures.rhaalovely.net/sparc64/2021-02-23/x11/roxterm.log

Recurrent failures:
 failures/audio/ncmpcpp.log
 failures/comms/syncterm.log
 failures/devel/glog.log
 failures/devel/keystone/python,python3.log
 failures/devel/spidermonkey78.log
 failures/games/frotz.log
 failures/games/odamex.log
 failures/games/openxcom.log
 failures/geo/spatialite/gui.log
 failures/graphics/asymptote.log
 failures/graphics/exiv2.log
 failures/math/mlpack,-main.log
 failures/multimedia/gstreamer-0.10/plugins-bad,-main.log
 failures/net/barrier.log
 failures/net/pmacct,postgresql.log
 failures/print/cups-bjnp.log
 failures/print/gutenprint.log
 failures/productivity/gnucash.log
 failures/sysutils/libvirt.log
 failures/x11/roxterm.log

New failures:
+failures/x11/qt5/docs,-html.log

Resolved failures:
-failures/audio/audacious/player.log
-failures/databases/leveldb.log
-failures/databases/sqlports,-list.log
-failures/games/renpy.log
-failures/graphics/kdiagram.log
-failures/net/kdsoap.log
-failures/security/flasm.log
-failures/www/ap2-mod_perl.log

Packages newly built:
+audio/audacious/player
+audio/audacious/player,qt5
+audio/audacious/plugins
+audio/audacious/plugins,qt5
+databases/leveldb
+databases/pkglocatedb
+databases/ports-readmes
+databases/ports-readmes-dancer
+databases/sqlports
+databases/sqlports,-list
+databases/sqlports,-main
+games/renpy
+graphics/kdiagram
+meta/audacious
+meta/audacious,qt5
+misc/portroach
+net/kdsoap
+security/hatchet
+sysutils/pkg_mgr
+sysutils/upt/upt-openbsd
+textproc/p5-Syntax-Highlight-Mason
+textproc/py-precis_i18n,python3
+textproc/py-sphinxcontrib/applehelp,python3
+textproc/py-sphinxcontrib/devhelp,python3
+textproc/py-sphinxcontrib/htmlhelp,python3
+textproc/py-sphinxcontrib/jsmath,python3
+textproc/py-sphinxcontrib/qthelp,python3
+textproc/py-sphinxcontrib/serializinghtml,python3
+textproc/py-sphinxcontrib/websupport,python3
+www/ap2-mod_perl
+www/blogsum
+www/p5-Apache-DB
+www/p5-Apache-DBI
+www/p5-Apache-Gallery
+www/p5-Apache-MP3
+www/p5-Catalyst-Engine-Apache
+www/p5-Catalyst-View-Mason
+www/p5-HTML-Mason
+www/p5-HTML-Mason-PSGIHandler
+www/p5-HTTP-Server-Simple-Mason
+www/p5-MasonX-Interp-WithCallbacks
+www/p5-Maypole
+www/p5-Maypole-Authentication-UserSessionCookie
+www/p5-libapreq2
+www/py-flask-principal,python3
+www/py-html5-parser
+www/rt

Packages not built this time:
-devel/mk
-editors/tea
-mail/avenger
-mail/avenger,sasl2
-net/nslint,static
-security/tempwatch
-www/py-flask-principal
-x11/qt5/docs
-x11/qt5/docs,-html
-x11/qt5/docs,-qch

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2021/02/25 16:26:30

Modified files:
databases/sqlports: Makefile 
databases/sqlports/files: Info.pm Var.pm 
databases/sqlports/files/man: sqlports.5 

Log message:
add FIX_CRLF_FILES to secondary tables

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2021/02/25 16:19:51

Modified files:
infrastructure/mk: bsd.port.mk 

Log message:
FIX_CRLF_FILES obviously belongs in dump-vars

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 16:04:54

Modified files:
infrastructure/mk: bsd.port.mk 
graphics/posterazor: Makefile 
telephony/fobbit: Makefile 

Log message:
FIX_CRLF_FILES should root files in WRKDIST, not WRKSRC.
pointed out by espie@

Re: [NEW PORT] math/mpdecimal

[Stuart Henderson]

On 2021/02/25 22:49, Stefan Krah wrote:
> On Thu, Feb 25, 2021 at 09:33:39PM +, Stuart Henderson wrote:
> > > it would be nice to add math/mpdecimal.  If the port is accepted, Python
> > 
> > Please send as an attachment
> 
> Ok, here it is.


thanks - some quick comments,

the Makefile should look more like other Makefiles in ports, you are at
least missing a license marker, and the order is a bit different to the
standard (it's not absolutely cast in stone but generally lines should
be in the same order as in ports/infrastructure/Makefile.template)

library versioning doesn't follow openbsd standards.
libraries need to be listed in SHARED_LIBS and that needs to control
the version number in the produced libraries (change SHARED_LIBS ->
library changes in the build). openbsd uses .so.X.Y and doesn't use
use .so / .so.X symlinks, ports should start with .so.0.0 irrespective
of what upstream uses. there's some more info in
https://www.openbsd.org/faq/ports/specialtopics.html#SharedLibs

missing WANTLIB, see "make port-lib-depends-check"

C++ ports always need a COMPILER line, usually

COMPILER=   base-clang ports-gcc

the WWW link (HOMEPAGE) is added automatically, don't set it yourself
in DESCR otherwise it is duplicated

portcheck(1) may spot other things

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2021/02/25 15:30:29

Modified files:
x11/wminfo : Makefile 
Added files:
x11/wminfo/patches: patch-wmgeneral_wmgeneral_c 
patch-wmgeneral_wmgeneral_h 

Log message:
x11/wminfo: fix build with -fno-common

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 15:26:03

Modified files:
audio/soundtouch: Makefile 
cad/qucs-s : Makefile 
devel/lpc21isp : Makefile 
devel/premake4 : Makefile 
emulators/desmume: Makefile 
emulators/mame : Makefile 
games/devilutionx: Makefile 
games/fs2open  : Makefile 
games/gargoyle : Makefile 
games/hex-a-hop: Makefile 
games/hypatia  : Makefile 
games/libgdx   : Makefile 
games/love : Makefile 
games/mnemosyne: Makefile 
games/odamex   : Makefile 
games/stepmania: Makefile 
games/supertux : Makefile 
graphics/autopano-sift-c: Makefile 
graphics/exiv2 : Makefile 
graphics/libpano13: Makefile 
graphics/p5-GD-Graph3d: Makefile 
graphics/posterazor: Makefile 
lang/hashlink  : Makefile 
mail/p5-Mail-Sender: Makefile 
misc/ietf-cli  : Makefile 
misc/tkman : Makefile 
net/dhcdrop: Makefile 
net/nagios/nsca: Makefile 
net/transmission: Makefile 
net/utox   : Makefile 
print/epson-inkjet-printer-escpr: Makefile 
security/p5-Digest-MD5-M4p: Makefile 
security/pcsc-cyberjack: Makefile 
telephony/asterisk: Makefile 
telephony/fobbit: Makefile 
textproc/tinyxml2: Makefile 
x11/wxWidgets  : Makefile 

Log message:
use FIX_CRLF_FILES, this is so much neater I can't believe we didn't
do it before!

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 15:22:43

Modified files:
lang/squeak/vm : Makefile 

Log message:
add a comment for a line-ending fix that isn't quite the same as
FIX_CRLF_FILES (s,\\r,\\n,g)

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2021/02/25 15:21:56

Modified files:
sysutils/wmwlmon: Makefile 
sysutils/wmwlmon/pkg: PLIST 
Added files:
sysutils/wmwlmon/patches: patch-xutils_c patch-xutils_h 

Log message:
sysutils/wmwlmon: Fix build with -fno-common

ok mglocker

Fix or remove wmmand? (-fno-common)

[Theo Buehler]

The diff below fixes the build of this port.

However, it only partly works for me. It draws a nice albeit minuscule
Mandelbrot set. As soon as I hover with the mouse over the window, it
exits with this error:

X Error of failed request:  BadMatch (invalid parameter attributes)
  Major opcode of failed request:  42 (X_SetInputFocus)
  Serial number of failed request:  384
  Current serial number in output stream:  384

Index: Makefile
===
RCS file: /cvs/ports/misc/wmmand/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile12 Jul 2019 20:47:55 -  1.19
+++ Makefile25 Feb 2021 22:15:19 -
@@ -4,7 +4,7 @@ COMMENT=wm-dockapp; mandelbrot explore
 
 DISTNAME=  wmMand-1.0
 PKGNAME=   ${DISTNAME:L}
-REVISION=  2
+REVISION=  3
 CATEGORIES=misc x11 x11/windowmaker
 
 HOMEPAGE=  http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
Index: patches/patch-wmMand_wmMand_c
===
RCS file: /cvs/ports/misc/wmmand/patches/patch-wmMand_wmMand_c,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-wmMand_wmMand_c
--- patches/patch-wmMand_wmMand_c   30 Mar 2001 15:17:51 -  1.1.1.1
+++ patches/patch-wmMand_wmMand_c   25 Feb 2021 22:08:52 -
@@ -1,7 +1,9 @@
 $OpenBSD: patch-wmMand_wmMand_c,v 1.1.1.1 2001/03/30 15:17:51 wilfried Exp $
 wmMand/wmMand.c.orig   Mon Feb 15 17:30:27 1999
-+++ wmMand/wmMand.cFri Mar 30 16:38:00 2001
-@@ -504,11 +504,16 @@ void ButtonPressEvent(XButtonEvent *xev,
+
+Index: wmMand/wmMand.c
+--- wmMand/wmMand.c.orig
 wmMand/wmMand.c
+@@ -504,11 +504,16 @@ void ButtonPressEvent(XButtonEvent *xev, DisplayInfo *
  
} else if ((xev->x >= 50)&&(xev->x <= 58)){
  
Index: patches/patch-wmMand_xvgifwr_c
===
RCS file: patches/patch-wmMand_xvgifwr_c
diff -N patches/patch-wmMand_xvgifwr_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-wmMand_xvgifwr_c  25 Feb 2021 22:11:05 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: wmMand/xvgifwr.c
+--- wmMand/xvgifwr.c.orig
 wmMand/xvgifwr.c
+@@ -38,6 +38,7 @@
+ 
+ #include 
+ #include 
++#include 
+ #include 
+ #include 
+ #define PARM(a) a
Index: patches/patch-wmgeneral_wmgeneral_c
===
RCS file: patches/patch-wmgeneral_wmgeneral_c
diff -N patches/patch-wmgeneral_wmgeneral_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_wmgeneral_c 25 Feb 2021 22:14:15 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+Index: wmgeneral/wmgeneral.c
+--- wmgeneral/wmgeneral.c.orig
 wmgeneral/wmgeneral.c
+@@ -34,6 +34,17 @@
+ 
+ #include "wmgeneral.h"
+ 
++  //
++ /* Global Variables */
++//
++
++Display   *display;
++WindowRoot;
++int   d_depth;
++GCNormalGC;
++XpmIcon   wmgen;
++Windowiconwin, win;
++
+   /*/
+  /* X11 Variables */
+ /*/
Index: patches/patch-wmgeneral_wmgeneral_h
===
RCS file: patches/patch-wmgeneral_wmgeneral_h
diff -N patches/patch-wmgeneral_wmgeneral_h
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-wmgeneral_wmgeneral_h 25 Feb 2021 22:14:15 -
@@ -0,0 +1,24 @@
+$OpenBSD$
+
+Index: wmgeneral/wmgeneral.h
+--- wmgeneral/wmgeneral.h.orig
 wmgeneral/wmgeneral.h
+@@ -28,12 +28,12 @@ typedef struct {
+  /* Global variable */
+ /***/
+ 
+-Display   *display;
+-Window  Root;
+-int   d_depth;
+-GC  NormalGC;
+-XpmIcon wmgen;
+-Windowiconwin, win;
++extern Display*display;
++extern Window Root;
++extern intd_depth;
++extern GC NormalGC;
++extern XpmIconwmgen;
++extern Window iconwin, win;
+ 
+ 
+   /***/
Index: pkg/PLIST
===
RCS file: /cvs/ports/misc/wmmand/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST   15 Sep 2004 17:54:17 -  1.2
+++ pkg/PLIST   25 Feb 2021 22:16:18 -
@@ -1,3 +1,3 @@
 @comment $OpenBSD: PLIST,v 1.2 2004/09/15 17:54:17 espie Exp $
-bin/wmMand
+@bin bin/wmMand
 @man man/man1/wmMand.1

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 14:59:27

Modified files:
infrastructure/templates: Makefile.template 

Log message:
add FIX_CRLF_FILES, from tb@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 14:56:09

Modified files:
lang/parrot: Makefile 

Log message:
depend on textproc/p5-Pod-Parser

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2021/02/25 14:55:55

Modified files:
x11/gnustep/corebase: Makefile 
Added files:
x11/gnustep/corebase/patches: 
  patch-Headers_CoreFoundation_CFError_h 

Log message:
x11/gnustep/corebase: fix build with -fno-common

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 14:54:23

Modified files:
x11/p5-Gtk2-Ex-PodViewer: Makefile 

Log message:
depend on textproc/p5-Pod-Parser

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 14:53:23

Modified files:
textproc   : Makefile 

Log message:
+p5-Pod-Parser

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 14:52:51

Log message:
import textproc/p5-Pod-Parser, ok afresh1@ (plus I added his patches from
the version in base). (also uses the shiny new FIX_CRLF_FILES). This is
currently in perl in base but will be removed in 5.32.


Pod::Parser is a base class for creating POD filters and translators.  It
handles most of the effort involved with parsing the POD sections from an
input stream, leaving subclasses free to be concerned only with performing
the actual translation of text.

NOTE: This module is considered legacy. Pod-Simple is the usual module for
all things POD.


Status:

Vendor Tag: sthen
Release Tags:   sthen_20210225

N ports/textproc/p5-Pod-Parser/Makefile
N ports/textproc/p5-Pod-Parser/distinfo
N ports/textproc/p5-Pod-Parser/pkg/DESCR
N ports/textproc/p5-Pod-Parser/pkg/PLIST
N ports/textproc/p5-Pod-Parser/patches/patch-Makefile_PL
N ports/textproc/p5-Pod-Parser/patches/patch-lib_Pod_PlainText_pm
N ports/textproc/p5-Pod-Parser/patches/patch-t_unbalanced_t

No conflicts created by this import

Re: [NEW PORT] math/mpdecimal

[Stefan Krah]

On Thu, Feb 25, 2021 at 09:33:39PM +, Stuart Henderson wrote:
> > it would be nice to add math/mpdecimal.  If the port is accepted, Python
> 
> Please send as an attachment

Ok, here it is.


mpdecimal-openbsd-port.tar.gz
Description: application/gzip

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 14:46:05

Modified files:
infrastructure/mk: bsd.port.mk 

Log message:
add FIX_CRLF_FILES. currently we use ad-hoc make targets to convert line
endings in extracted distfiles; it's common enough that it makes sense to
provide a nicer way of doing this. some changes suggested by espie@ tb@ kn@

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2021/02/25 14:39:54

ports/sysutils/wmwlmon/patches

Update of /cvs/ports/sysutils/wmwlmon/patches
In directory cvs.openbsd.org:/tmp/cvs-serv53252/patches

Log Message:
Directory /cvs/ports/sysutils/wmwlmon/patches added to the repository

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2021/02/25 14:38:20

Modified files:
x11/gnustep/terminal: Makefile 
Added files:
x11/gnustep/terminal/patches: patch-TerminalWindow_h 

Log message:
x11/gnustep/terminal: fix build with -fno-common

Re: [NEW PORT] math/mpdecimal

[Stuart Henderson]

On 2021/02/25 19:58, Stefan Krah wrote:
> 
> Hello,
> 
> it would be nice to add math/mpdecimal.  If the port is accepted, Python
> could be build --with-system-libmpdec.  Here's the archive:
> 
>https://www.bytereef.org/contrib/mpdecimal-openbsd-port.tar.gz
> 
> 
> Stefan Krah
> 
> 

Please send as an attachment

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2021/02/25 14:31:28

Modified files:
net/argus-clients: Makefile 
net/argus-clients/patches: patch-common_argus_util_c 

Log message:
net/argus-clients: fix build with -fno-common; ok gnezdo@

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2021/02/25 14:30:28

Modified files:
net/argus  : Makefile 
Added files:
net/argus/patches: patch-argus_ArgusUdt_c 

Log message:
net/argus: fix the build with -fno-common; ok gnezdo@

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2021/02/25 14:23:57

Modified files:
x11/gnustep/gworkspace: Makefile 
Added files:
x11/gnustep/gworkspace/patches: 

patch-Inspector_ContentViewers_ImageViewer_Resizer_h 

patch-Inspector_ContentViewers_ImageViewer_Resizer_m 

Log message:
x11/gnustep/gworkspace: fix build with -fno-common; from Debian

Upstream has fixed this differently as part of a larger change.

Re: NEW: textproc/p5-Pod-Parser

[Andrew Hewus Fresh]

On Thu, Feb 25, 2021 at 08:46:24PM +, Stuart Henderson wrote:
> Removed from core in 5.32 but at least x11/p5-Gtk2-Ex-PodViewer still
> needs it. OK to import? Or alternatively if nothing else more
> interesting shows up (my build isn't quite down but not far off)
> we could remove p5-Gtk2-Ex-PodViewer instead.
 

We did have some local patches to Pod::Parser that I thought I submitted
upstream someplace, but don't see that now, but they are in my git
history.

https://github.com/afresh1/OpenBSD-perl/commit/e33f8b67fa0ce53e83d6314ff16b3911936a6bbb


I haven't ever tried that PodViewer, so can't comment on it's utility
and I didn't try out the port but looked at the contents and it looks OK
to me.

l8rZ
-- 
andrew - http://afresh1.com

Mountain Dew and doughnuts...
 because breakfast is the most important meal of the day.

Re: bsd.port.mk addition, FIX_CRLF_FILES

[Klemens Nanni]

On Thu, Feb 25, 2021 at 09:11:55PM +, Stuart Henderson wrote:
> Oh that makes sense yes. (Some example use of this crept into my
> p5-Pod-Parser port, that still had post-extract so that it worked on
> a current tree too).
The mk bits read OK to me.

> @@ -2688,6 +2689,9 @@ _post-extract-finalize:
>  .endfor
>  .if ${FIX_EXTRACT_PERMISSIONS:L} == "yes"
>   @chmod -R a+rX ${WRKDIR}
> +.endif
> +.if !empty(FIX_CRLF_FILES)
> + @cd ${WRKSRC} && perl -i -pe 's/\r$$//' ${FIX_CRLF_FILES}
`--' between perl options and file names never hurt here, that's what at
least EXTRACT_CASES and MODPY_BIN_ADJ do already.

>  .endif
>  
>  # run as _pbuild

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2021/02/25 14:17:08

Modified files:
devel  : Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
Removed files:
devel/mingw: Makefile distinfo 
devel/mingw/files: specs.diff 
devel/mingw/patches: patch-x86-mingw32-build_sh 
 patch-x86-mingw32-build_sh_conf 
 patch-x86-mingw32-build_sh_functions 
 patch_binutils-2.20.1-configure 
 patch_gcc-g++-3.4.5-20060117-2-gcc_configure 
devel/mingw/pkg: DESCR PLIST README 

Log message:
Remove devel/mingw.

"This port combines gcc 3.4.5 from 2005 with a mingw runtime from
2009 or 2010 to target Microsoft Windows."  It is woefully obsolete.
If somebody wants to cross-compile from OpenBSD to Microsoft Windows,
they should import a new toolchain.

Noticed because it failed to build with -fno-common.

ok gkoehler@ kn@

Re: bsd.port.mk addition, FIX_CRLF_FILES

[Stuart Henderson]

On 2021/02/25 22:02, Marc Espie wrote:
> On Thu, Feb 25, 2021 at 08:25:55PM +, Stuart Henderson wrote:
> > This comes up often enough that I think it's worth adding to bsd.port.mk
> > rather than handling with custom commands. ok?
> 
> I love the idea.
> I would prefer an if !empty() rather than defined and have it always defined.
> 
> It will also need a bit of love in sqlports, though there is already some
> list of files for Makefiles (I can do that once it's commited)

Oh that makes sense yes. (Some example use of this crept into my
p5-Pod-Parser port, that still had post-extract so that it worked on
a current tree too).

Index: bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1549
diff -u -p -r1.1549 bsd.port.mk
--- bsd.port.mk 20 Feb 2021 18:05:04 -  1.1549
+++ bsd.port.mk 25 Feb 2021 21:10:19 -
@@ -169,6 +169,7 @@ PACKAGE_REPOSITORY ?= ${PORTSDIR}/packag
 
 FIX_EXTRACT_PERMISSIONS ?= No
 FIX_CLEANUP_PERMISSIONS ?= No
+FIX_CRLF_FILES ?=
 
 .if !exists(${X11BASE}/man/mandoc.db)
 .  if exists(${X11BASE}/man/whatis.db)
@@ -2688,6 +2689,9 @@ _post-extract-finalize:
 .endfor
 .if ${FIX_EXTRACT_PERMISSIONS:L} == "yes"
@chmod -R a+rX ${WRKDIR}
+.endif
+.if !empty(FIX_CRLF_FILES)
+   @cd ${WRKSRC} && perl -i -pe 's/\r$$//' ${FIX_CRLF_FILES}
 .endif
 
 # run as _pbuild



> > Index: ports/infrastructure/mk/bsd.port.mk
> > ===
> > RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> > retrieving revision 1.1549
> > diff -u -p -r1.1549 bsd.port.mk
> > --- ports/infrastructure/mk/bsd.port.mk 20 Feb 2021 18:05:04 -  
> > 1.1549
> > +++ ports/infrastructure/mk/bsd.port.mk 25 Feb 2021 20:23:27 -
> > @@ -2688,6 +2688,9 @@ _post-extract-finalize:
> >  .endfor
> >  .if ${FIX_EXTRACT_PERMISSIONS:L} == "yes"
> > @chmod -R a+rX ${WRKDIR}
> > +.endif
> > +.if defined(FIX_CRLF_FILES)
> > +   @cd ${WRKSRC} && perl -i -pe 's/\r$$//' ${FIX_CRLF_FILES}
> >  .endif
> >  
> >  # run as _pbuild
> > Index: src/share/man//man5/bsd.port.mk.5
> > ===
> > RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
> > retrieving revision 1.537
> > diff -u -p -r1.537 bsd.port.mk.5
> > --- src/share/man//man5/bsd.port.mk.5   4 Feb 2021 22:12:03 -   
> > 1.537
> > +++ src/share/man//man5/bsd.port.mk.5   25 Feb 2021 20:23:06 -
> > @@ -1842,6 +1842,11 @@ to world-readable at the end of
> >  Used for some distfile contents which have paranoid permissions for no 
> > reason.
> >  Defaults to
> >  .Sq \ .
> > +.It Ev FIX_CRLF_FILES
> > +Names of files with line endings that need to be corrected after 
> > extraction.
> > +Sometimes a port will include files with MS-DOS line endings,
> > +to avoid problems with patches (especially when sent by email)
> > +these should be corrected.
> >  .It Ev FLAVOR
> >  The port's current options.
> >  Set by the user, and tested by the port to activate wanted functionalities.
> > 
> > 
> Somewhat incomplete... it needs to be referenced in 
> extract like FIX_EXTRACT_PERMISSIONS is.
> 
> And the wording is not clear "at the end of extract" is also 
> what FIX_EXTRACT_PEMISSIONS says.  And it's way cleared than "after 
> extraction"

Re: bsd.port.mk addition, FIX_CRLF_FILES

[Marc Espie]

On Thu, Feb 25, 2021 at 08:25:55PM +, Stuart Henderson wrote:
> This comes up often enough that I think it's worth adding to bsd.port.mk
> rather than handling with custom commands. ok?

I love the idea.
I would prefer an if !empty() rather than defined and have it always defined.

It will also need a bit of love in sqlports, though there is already some
list of files for Makefiles (I can do that once it's commited)
> Index: ports/infrastructure/mk/bsd.port.mk
> ===
> RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
> retrieving revision 1.1549
> diff -u -p -r1.1549 bsd.port.mk
> --- ports/infrastructure/mk/bsd.port.mk   20 Feb 2021 18:05:04 -  
> 1.1549
> +++ ports/infrastructure/mk/bsd.port.mk   25 Feb 2021 20:23:27 -
> @@ -2688,6 +2688,9 @@ _post-extract-finalize:
>  .endfor
>  .if ${FIX_EXTRACT_PERMISSIONS:L} == "yes"
>   @chmod -R a+rX ${WRKDIR}
> +.endif
> +.if defined(FIX_CRLF_FILES)
> + @cd ${WRKSRC} && perl -i -pe 's/\r$$//' ${FIX_CRLF_FILES}
>  .endif
>  
>  # run as _pbuild
> Index: src/share/man//man5/bsd.port.mk.5
> ===
> RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
> retrieving revision 1.537
> diff -u -p -r1.537 bsd.port.mk.5
> --- src/share/man//man5/bsd.port.mk.5 4 Feb 2021 22:12:03 -   1.537
> +++ src/share/man//man5/bsd.port.mk.5 25 Feb 2021 20:23:06 -
> @@ -1842,6 +1842,11 @@ to world-readable at the end of
>  Used for some distfile contents which have paranoid permissions for no 
> reason.
>  Defaults to
>  .Sq \ .
> +.It Ev FIX_CRLF_FILES
> +Names of files with line endings that need to be corrected after extraction.
> +Sometimes a port will include files with MS-DOS line endings,
> +to avoid problems with patches (especially when sent by email)
> +these should be corrected.
>  .It Ev FLAVOR
>  The port's current options.
>  Set by the user, and tested by the port to activate wanted functionalities.
> 
> 
Somewhat incomplete... it needs to be referenced in 
extract like FIX_EXTRACT_PERMISSIONS is.

And the wording is not clear "at the end of extract" is also 
what FIX_EXTRACT_PEMISSIONS says.  And it's way cleared than "after extraction"

CVS: cvs.openbsd.org: ports

[Rafael Sadowski]

CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2021/02/25 13:59:42

Removed files:
devel/kf5/kcompletion/patches: patch-src_klineedit_cpp 

Log message:
Remove outdated patch.

This was a fix for <5.79.0. I thought it was deleted.

Re: cabal.port.mk + devel/happy using it

[Marc Espie]

On Thu, Feb 25, 2021 at 01:26:39PM +, Stuart Henderson wrote:
> On 2021/02/25 14:13, Matthias Kilian wrote:
> > Hi Greg,
> > 
> > On Mon, Feb 22, 2021 at 08:26:43PM -0800, Greg Steuck wrote:
> > > Happily I can gradually work haskell ports over to the new infra without
> > > upgrading lang/ghc and then destroying and recreating the world.  Maybe
> > > it would've been less work total to do a big bang, but hopefully this is
> > > easier to swallow in little bits. Any rollback is less of a pain should
> > > it have to happen.
> > > 
> > > As a reminder, the eventual goal is to move every haskell binary port
> > > over to cabal.port.mk and thus deconstrain future upgrades of the ports
> > > and lang/ghc.
> > 
> > This looks good, at the moment I'm test-building happy (will take
> > some hours, because some dependency of ghc had been updated, so my
> > machine is rebuilding it, too).
> > 
> > 
> > However, I'm not sure wether devel/cabal is the right place for
> > cabal.port.mk. Shouldn't modules-only files to be put into
> > infrastructure/mk?
> > 
> > What do other ports people think?
> 
> We have the same for devel/cargo, lang/go, lang/python and others.
> For gcc the main module is in lang/gcc/8 but there's a helper in
> infrastructure/mk because it (sometimes) needs to select between
> different gcc versions.
> 
> I'm fairly happy having it in the main ports tree, but if it is
> placed elsewhere then the others should probably move there too.

Most modules should be scattered in the ports tree with corresponding
names.

The oldest modules are in mk/ mostly for historic reasons.

If I did the gcc stuff today, the module would probably be called
lang/gcc ;)

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 13:53:58

Modified files:
lang/lucee : Makefile distinfo 

Log message:
update to lucee-5.3.7.48

Re: quirks botched commit

[Marc Espie]

On Thu, Feb 25, 2021 at 08:15:46AM -0600, Matthew Martin wrote:
> On Thu, Feb 25, 2021 at 10:16:03AM +, Mikolaj Kucharski wrote:
> > On Thu, Feb 25, 2021 at 11:04:06AM +0100, Marc Espie wrote:
> > > On Thu, Feb 25, 2021 at 09:53:04AM +0100, Marc Espie wrote:
> > > > next time, please remember to build it.
> > > > there's a reason do-build checks the syntax of those perl files.
> > > 
> > > morning brainfart, of course it built. Which begs the question how come 
> > > the
> > > syntax check didn't get it
> > > 
> > 
> > $ find files/ -type f -name \*.pm -print -exec /usr/bin/false \;
> > files/Quirks.pm
> > files/Quirks/ghc.pm
> > 
> > $ echo $?
> > 0
> 
> A non-zero exit for -exec ...\; is not propagated to find's exit status
> as it's just a filter. A non-zero exit for -exec ...+ is however.
> Since perl -c doesn't seem to support checking multiple files at once,
> a simple s/\\;/+/ doesn't work, but this does.
> 
> 
> diff --git Makefile Makefile
> index 02d43cc077f..d4ef43c0b39 100644
> --- Makefile
> +++ Makefile
> @@ -15,7 +15,7 @@ PERMIT_PACKAGE =Yes
>  PERLDIR =${PREFIX}/libdata/perl5/site_perl
>  
>  do-build:
> - @find ${FILESDIR} -type f -name \*.pm -exec perl -c {} \;
> + @find ${FILESDIR} -type f -name \*.pm ! -exec perl -c {} \; -exec false 
> {} +
>  
>  do-install:
>   ${INSTALL_DATA_DIR} ${PERLDIR}/OpenBSD/Quirks
> 
> 
Yeah, well, sthen@ fixed it in between, in a way among several possible fixes.

[NEW PORT] math/mpdecimal

[Stefan Krah]

Hello,

it would be nice to add math/mpdecimal.  If the port is accepted, Python
could be build --with-system-libmpdec.  Here's the archive:

   https://www.bytereef.org/contrib/mpdecimal-openbsd-port.tar.gz


Stefan Krah

NEW: textproc/p5-Pod-Parser

[Stuart Henderson]

Removed from core in 5.32 but at least x11/p5-Gtk2-Ex-PodViewer still
needs it. OK to import? Or alternatively if nothing else more
interesting shows up (my build isn't quite down but not far off)
we could remove p5-Gtk2-Ex-PodViewer instead.



p5-Pod-Parser.tgz
Description: application/tar-gz

bsd.port.mk addition, FIX_CRLF_FILES

[Stuart Henderson]

This comes up often enough that I think it's worth adding to bsd.port.mk
rather than handling with custom commands. ok?

Index: ports/infrastructure/mk/bsd.port.mk
===
RCS file: /cvs/ports/infrastructure/mk/bsd.port.mk,v
retrieving revision 1.1549
diff -u -p -r1.1549 bsd.port.mk
--- ports/infrastructure/mk/bsd.port.mk 20 Feb 2021 18:05:04 -  1.1549
+++ ports/infrastructure/mk/bsd.port.mk 25 Feb 2021 20:23:27 -
@@ -2688,6 +2688,9 @@ _post-extract-finalize:
 .endfor
 .if ${FIX_EXTRACT_PERMISSIONS:L} == "yes"
@chmod -R a+rX ${WRKDIR}
+.endif
+.if defined(FIX_CRLF_FILES)
+   @cd ${WRKSRC} && perl -i -pe 's/\r$$//' ${FIX_CRLF_FILES}
 .endif
 
 # run as _pbuild
Index: src/share/man//man5/bsd.port.mk.5
===
RCS file: /cvs/src/share/man/man5/bsd.port.mk.5,v
retrieving revision 1.537
diff -u -p -r1.537 bsd.port.mk.5
--- src/share/man//man5/bsd.port.mk.5   4 Feb 2021 22:12:03 -   1.537
+++ src/share/man//man5/bsd.port.mk.5   25 Feb 2021 20:23:06 -
@@ -1842,6 +1842,11 @@ to world-readable at the end of
 Used for some distfile contents which have paranoid permissions for no reason.
 Defaults to
 .Sq \ .
+.It Ev FIX_CRLF_FILES
+Names of files with line endings that need to be corrected after extraction.
+Sometimes a port will include files with MS-DOS line endings,
+to avoid problems with patches (especially when sent by email)
+these should be corrected.
 .It Ev FLAVOR
 The port's current options.
 Set by the user, and tested by the port to activate wanted functionalities.

CVS: cvs.openbsd.org: ports

[Solene Rapenne]

CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2021/02/25 12:40:07

Modified files:
games  : Makefile 

Log message:
+ moonlight-qt

CVS: cvs.openbsd.org: ports

[Solene Rapenne]

CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2021/02/25 12:39:19

Log message:
Import moonlight-qt-3.0.0

Moonlight (formerly Limelight) is an open source implementation of
NVIDIA's GameStream protocol. With Moonlight, You can stream your
collection of PC games from your GameStream-compatible PC to any
supported device and play them remotely.

ok rsadowski@

port done by Muhammad Kaisar Arkhan  who
is also the maintainer

Status:

Vendor Tag: solene
Release Tags:   solene_20210225

N ports/games/moonlight-qt/Makefile
N ports/games/moonlight-qt/distinfo
N ports/games/moonlight-qt/pkg/DESCR
N ports/games/moonlight-qt/pkg/PLIST

No conflicts created by this import

Re: cabal.port.mk + devel/happy using it

[Matthias Kilian]

Hi,

On Thu, Feb 25, 2021 at 07:37:41AM -0800, Greg Steuck wrote:
> >> However, I'm not sure wether devel/cabal is the right place for
> >> cabal.port.mk. Shouldn't modules-only files to be put into
> >> infrastructure/mk?
> >> 
> >> What do other ports people think?
> >
> > We have the same for devel/cargo, lang/go, lang/python and others.
> > For gcc the main module is in lang/gcc/8 but there's a helper in
> > infrastructure/mk because it (sometimes) needs to select between
> > different gcc versions.
> >
> > I'm fairly happy having it in the main ports tree, but if it is
> > placed elsewhere then the others should probably move there too.
> 
> FWIW, I chose this placement after lang/ghc/ghc.port.mk. We could
> bikeshed devel/cabal{-install}/cabal{-install}.port.mk aspect of it :)

No. If Stuart is happy with it, just commit it as
devel/cabal/cabal.port.mk.

The devel/happy update is ok for me, too.

Ciao,
Kili

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 09:37:39

Modified files:
net/isc-bind   : Tag: OPENBSD_6_8 Makefile 
Added files:
net/isc-bind/patches: Tag: OPENBSD_6_8 
  patch-bin_named_include_named_zoneconf_h 
  patch-bin_named_server_c 
  patch-bin_named_zoneconf_c 
  patch-lib_isccfg_aclconf_c 

Log message:
isc-bind: backport https://gitlab.isc.org/isc-projects/bind9/-/issues/2413 fix
found the hard way by Christian Gut, thanks for tracking this down.

https://gitlab.isc.org/isc-projects/bind9/-/commit/12c5b2a1b83376f420ecb112f1d5b10f06e18416.patch

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 09:37:22

Modified files:
net/isc-bind   : Makefile 
Added files:
net/isc-bind/patches: patch-bin_named_include_named_zoneconf_h 
  patch-bin_named_server_c 
  patch-bin_named_zoneconf_c 
  patch-lib_isccfg_aclconf_c 

Log message:
isc-bind: backport https://gitlab.isc.org/isc-projects/bind9/-/issues/2413 fix
found the hard way by Christian Gut, thanks for tracking this down.

https://gitlab.isc.org/isc-projects/bind9/-/commit/12c5b2a1b83376f420ecb112f1d5b10f06e18416.patch

Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1

[Dimitri Karamazov]

On Wed, Feb 24, 2021 at 11:23:47AM +, Stuart Henderson wrote:
> On 2021/02/22 15:32, Dimitri Karamazov wrote:
> > On Mon, Feb 22, 2021 at 01:28:26AM -0500, Daniel Dickman wrote:
> > > 
> > > 
> > > On Mon, 22 Feb 2021, Rafael Sadowski wrote:
> > > 
> > > > > 
> > > > > Bump for a new release.
> > > > 
> > > > Still OK for me but we need to import robin-map first. A second OK is
> > > > needed.
> > > > 
> > > 
> > > Where is the port for robin-map? Can someone resend it?
> > 
> > Avoid the previous diff as there is a mistake and the robin-map
> > port has been attached at the very end.
> 
> robin-map wants "ONLY_FOR_ARCHS= ${CXX11_ARCHS}". I would drop the
> NO_BUILD as well it is really just for cases where things fail if you
> try to do "build". Otherwise OK for that.
> 
Done.

> > --- pkg/PLIST   5 Jan 2021 20:53:18 -   1.11
> > +++ pkg/PLIST   22 Feb 2021 15:29:57 -
> > @@ -1,5 +1,4 @@
> > -@comment $OpenBSD: PLIST,v 1.11 2021/01/05 20:53:18 jca Exp $
> > -@conflict idiff-*
> > +@comment $OpenBSD: PLIST,v$
> 
> The conflict should stay.
> 
This conflict is not being detected by pkglocatedb.
I wonder why?

The suggested changes have been applied to the attachments.

regards,
  Dimitri

Index: Makefile
===
RCS file: /cvs/ports/graphics/openimageio/Makefile,v
retrieving revision 1.50
diff -u -p -r1.50 Makefile
--- Makefile23 Jan 2021 12:46:26 -  1.50
+++ Makefile24 Feb 2021 11:45:36 -
@@ -8,13 +8,11 @@ COMMENT = library for reading and writi
 GH_ACCOUNT =   OpenImageIO
 GH_PROJECT =   oiio
 GH_TAGNAME =   Release-$V
-V =2.2.10.0
-ROBIN_VER =0.6.2
+V =2.2.11.1
 DISTNAME = openimageio-${V}
-REVISION = 0
 
-SHARED_LIBS += OpenImageIO 8.0 # 2.2.10
-SHARED_LIBS += OpenImageIO_Util4.0 # 2.2.10
+SHARED_LIBS += OpenImageIO 9.0 # 2.2.11
+SHARED_LIBS += OpenImageIO_Util5.0 # 2.2.11
 
 CATEGORIES =   graphics devel
 
@@ -34,11 +32,6 @@ WANTLIB += boost_filesystem-mt boost_sys
 WANTLIB += bz2 c freetype gif intl jpeg m openjp2 png pugixml
 WANTLIB += raw_r swscale tiff util webp webpdemux z
 
-MASTER_SITES0 =https://github.com/Tessil/robin-map/
-
-DISTFILES =${DISTNAME}.tar.gz \
-   robin-map-{archive/v}${ROBIN_VER}.tar.gz:0
-
 MODULES =  devel/cmake \
lang/python \
x11/qt5
@@ -48,8 +41,9 @@ MODPY_VERSION =   ${MODPY_DEFAULT_VERSION
 COMPILER = base-clang ports-gcc
 
 BUILD_DEPENDS =devel/fmt \
-   textproc/txt2man \
-   devel/py-pybind11${MODPY_FLAVOR}
+   devel/py-pybind11${MODPY_FLAVOR} \
+   devel/robin-map \
+   textproc/txt2man
 
 LIB_DEPENDS =  devel/boost \
graphics/ffmpeg \
@@ -64,11 +58,13 @@ LIB_DEPENDS =   devel/boost \
textproc/pugixml
 
 CONFIGURE_ARGS +=  -DCMAKE_INSTALL_MANDIR="man/man1" \
+   
-DCMAKE_LIBRARY_PATH="${WRKBUILD}/lib:${CMAKE_LIBRARY_PATH}" \
-DSTOP_ON_WARNING=OFF \
-DUSE_CCACHE=OFF \
-   -DUSE_DICOM=OFF \
+   -DDCMTK_FOUND=OFF \
-DUSE_EXTERNAL_PUGIXML=ON \
-DUSE_OPENCV=OFF \
+   -DUSE_OPENVDB=OFF \
-DUSE_HDF5=OFF \
-DUSE_LIBHEIF=OFF \

-Dpybind11_DIR=${MODPY_SITEPKG}/pybind11/share/cmake/pybind11/
@@ -78,10 +74,6 @@ CONFIGURE_ARGS +=-DCMAKE_INSTALL_MANDIR
 CONFIGURE_ENV +=   LDFLAGS="${LDFLAGS} -latomic"
 WANTLIB += atomic
 .endif
-
-post-extract:
-   mkdir ${WRKSRC}/ext
-   cp -r ${WRKDIR}/robin-map-${ROBIN_VER} ${WRKSRC}/ext/robin-map
 
 post-install:
find ${PREFIX} -name '*.orig' -delete
Index: distinfo
===
RCS file: /cvs/ports/graphics/openimageio/distinfo,v
retrieving revision 1.10
diff -u -p -r1.10 distinfo
--- distinfo5 Jan 2021 20:53:18 -   1.10
+++ distinfo24 Feb 2021 11:45:36 -
@@ -1,4 +1,2 @@
-SHA256 (openimageio-2.2.10.0.tar.gz) = 
28Dj6XGEl9n3HqAfsd6Lh0SXda2dvOpNJTjZxSu+HVo=
-SHA256 (robin-map-0.6.2.tar.gz) = wI7Esb8chesNZDIkSmqJhiIp2hy4NPP5D7qNw12MjvE=
-SIZE (openimageio-2.2.10.0.tar.gz) = 29215970
-SIZE (robin-map-0.6.2.tar.gz) = 63782
+SHA256 (openimageio-2.2.11.1.tar.gz) = 
EgFw6FF9iRH1Kw+1bxTrVqrYjt1yzJ5LLjXHQCUpO30=
+SIZE (openimageio-2.2.11.1.tar.gz) = 29250377
Index: pkg/PLIST
===
RCS file: /cvs/ports/graphics/openimageio/pkg/PLIST,v

Re: net/isc-bind segfaults after updating to 9.16.11 on 6.8

[Stuart Henderson]

great, thanks for tracking that down Christian.

I'm going to backport the commit that fixed that to 9.16.11, things
have been a real mess with the last couple of releases. Annoyingly
there have been security fixes mixed in with a stack of other changes
that I am quite surprised have been made on what's meant to be a
stable rather than development branch of key software like this.


On 2021/02/25 17:15, Christian Gut wrote:
> 
> 
> On 24. Feb 2021, at 22:41, Stuart Henderson  wrote:
> 
> On 2021/02/24 15:29, Christian Gut wrote:
> 
> 
> Hi Ports,
> 
> I am using OpenBSD 6.8. I just updated bind from isc-bind-9.16.9v0 to
> isc-bind-9.16.11v0. This was the corresponding change in CVS: 
> https://marc.info/?l=
> openbsd-ports-cvs=161383675808055=2 
>  161383675808055=2>
> 
> After that update, bind segfaults right on startup. Here is the log 
> when started
> interactively. It dies silently when started via /etc/rc.d/isc_bind 
> start. After
> downgrading to ics-bind-9.16.9v0 it has no problem.
> 
> 
> The amd64 -stable package of isc-bind-9.16.11v0 works for me.
> 
> Please update to 9.16.11v0 again and "pkg_add debug-isc-bind gdb" then
> run "egdb named" as root and type "run -g -t /var/named -u _bind -U 4",
> I assume it will crash again and leave you at a gdb prompt, then please
> do "bt full" and send the result.
> 
> 
> Thanks for those instructions. It gave me this:
> 
> Thread 2 received signal SIGSEGV, Segmentation fault.
> [Switching to thread 181353]
> convert_named_acl (nameobj=0xab5e2fc9000, cctx=0xab5e2fbda40, 
> lctx=0xab5a447f000, ctx=0x0, mctx
> =0xab5a09d4e00, 
> nest_level=0, target=0xab59c93b2c0) at aclconf.c:128
> 128 aclconf.c: No such file or directory.
> 
> 
> This lead me to nail the problem down to this configuration part (stripped 
> down to bare
> minimum):
> 
> acl asdf {
> };
> 
> zone "dynamic.example.org" {
>   type master;
>allow-transfer { secondaries; };
> allow-update { asdf; };
>   file "/master/dynamic.example.org";
>   };
> 
> With that in mind I searched the release notes and found this in the Release 
> Notes to 9.6.12
> (next version):
> 
> • named failed to start when its configuration included a zone with a
> non-builtin allow-updateACL attached. [GL #2413]
> 
> Source: 
> https://ftp.ripe.net/mirrors/sites/ftp.isc.org/isc/bind/cur/9.16/doc/arm/html/
> notes.html#bug-fixes
> See: https://gitlab.isc.org/isc-projects/bind9/-/issues/2413
> 
> Any chance to get 9.16.11 into -STABLE?
> Can I provide further details to help?
> 
> Kind Regards,
> Christian
> 

[MAINTAINER UPDATE] graphics/opensubdiv -> 3.4.4

[Dimitri Karamazov]

Update graphics/opensubdiv to 3.4.4

Build & Run tested with Blender on amd64

Index: Makefile
===
RCS file: /cvs/ports/graphics/opensubdiv/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile26 Jan 2021 13:16:46 -  1.1.1.1
+++ Makefile23 Feb 2021 17:37:41 -
@@ -2,14 +2,14 @@
 
 COMMENT=   open-source subdivision surface library
 
-V= 3.4.3
+V= 3.4.4
 GH_ACCOUNT=PixarAnimationStudios
 GH_PROJECT=OpenSubdiv
 GH_TAGNAME=v${V:S/./_/g}
 DISTNAME=  ${GH_PROJECT:L}-${V}
 
-SHARED_LIBS += osdCPU  0.0 # 3.4.3
-SHARED_LIBS += osdGPU  0.0 # 3.4.3
+SHARED_LIBS += osdCPU  1.0 # 3.4.4
+SHARED_LIBS += osdGPU  1.0 # 3.4.4
 
 CATEGORIES=graphics
 
Index: distinfo
===
RCS file: /cvs/ports/graphics/opensubdiv/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo26 Jan 2021 13:16:46 -  1.1.1.1
+++ distinfo23 Feb 2021 17:37:41 -
@@ -1,2 +1,2 @@
-SHA256 (opensubdiv-3.4.3.tar.gz) = eyLrJ9Y2qwweA3Iselpb1PEWZO5lybSPNBptDOfzZ0U=
-SIZE (opensubdiv-3.4.3.tar.gz) = 39225589
+SHA256 (opensubdiv-3.4.4.tar.gz) = INSfgKK3eK1NAfCRrYjYwvkc9sc2OUDGITJBzm8QSPs=
+SIZE (opensubdiv-3.4.4.tar.gz) = 39228037

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 09:31:15

Modified files:
devel/libuv: Makefile 

Log message:
libuv: tidy up sphinx bits

Re: net/isc-bind segfaults after updating to 9.16.11 on 6.8

[Christian Gut]

> On 24. Feb 2021, at 22:41, Stuart Henderson  wrote:
> 
> On 2021/02/24 15:29, Christian Gut wrote:
>> 
>> Hi Ports,
>> 
>> I am using OpenBSD 6.8. I just updated bind from isc-bind-9.16.9v0 to 
>> isc-bind-9.16.11v0. This was the corresponding change in CVS: 
>> https://marc.info/?l=openbsd-ports-cvs=161383675808055=2 
>> 
>> 
>> After that update, bind segfaults right on startup. Here is the log when 
>> started interactively. It dies silently when started via /etc/rc.d/isc_bind 
>> start. After downgrading to ics-bind-9.16.9v0 it has no problem.
> 
> The amd64 -stable package of isc-bind-9.16.11v0 works for me.
> 
> Please update to 9.16.11v0 again and "pkg_add debug-isc-bind gdb" then
> run "egdb named" as root and type "run -g -t /var/named -u _bind -U 4",
> I assume it will crash again and leave you at a gdb prompt, then please
> do "bt full" and send the result.

Thanks for those instructions. It gave me this:

Thread 2 received signal SIGSEGV, Segmentation fault.
[Switching to thread 181353]
convert_named_acl (nameobj=0xab5e2fc9000, cctx=0xab5e2fbda40, 
lctx=0xab5a447f000, ctx=0x0, mctx=0xab5a09d4e00, 
nest_level=0, target=0xab59c93b2c0) at aclconf.c:128
128 aclconf.c: No such file or directory.


This lead me to nail the problem down to this configuration part (stripped down 
to bare minimum):

acl asdf {
};

zone "dynamic.example.org" {
  type master;
   allow-transfer { secondaries; };
allow-update { asdf; };
  file "/master/dynamic.example.org";
  };

With that in mind I searched the release notes and found this in the Release 
Notes to 9.6.12 (next version):

• named failed to start when its configuration included a zone with a 
non-builtin allow-updateACL attached. [GL #2413]

Source: 
https://ftp.ripe.net/mirrors/sites/ftp.isc.org/isc/bind/cur/9.16/doc/arm/html/notes.html#bug-fixes
 

See: https://gitlab.isc.org/isc-projects/bind9/-/issues/2413 


Any chance to get 9.16.11 into -STABLE?
Can I provide further details to help?

Kind Regards,
Christian

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 08:41:04

Modified files:
mail/postfix/stable: Makefile distinfo 

Log message:
update postfix-stable to 3.5.9, from Brad

Re: cabal.port.mk + devel/happy using it

[Greg Steuck]

Stuart Henderson  writes:

> On 2021/02/25 14:13, Matthias Kilian wrote:
>> However, I'm not sure wether devel/cabal is the right place for
>> cabal.port.mk. Shouldn't modules-only files to be put into
>> infrastructure/mk?
>> 
>> What do other ports people think?
>
> We have the same for devel/cargo, lang/go, lang/python and others.
> For gcc the main module is in lang/gcc/8 but there's a helper in
> infrastructure/mk because it (sometimes) needs to select between
> different gcc versions.
>
> I'm fairly happy having it in the main ports tree, but if it is
> placed elsewhere then the others should probably move there too.

FWIW, I chose this placement after lang/ghc/ghc.port.mk. We could
bikeshed devel/cabal{-install}/cabal{-install}.port.mk aspect of it :)

Thanks
Gretg

CVS: cvs.openbsd.org: ports

[Greg Steuck]

CVSROOT:/cvs
Module name:ports
Changes by: gne...@cvs.openbsd.org  2021/02/25 08:09:09

Modified files:
devel/remake   : Makefile distinfo 
Added files:
devel/remake/patches: patch-src_debugger_file2line_c 
  patch-src_debugger_file2line_h 
  patch-src_dep_h patch-src_globals_h 
  patch-src_main_c patch-src_main_h 
  patch-src_make_h patch-src_print_h 
  patch-src_variable_c patch-src_variable_h 
Removed files:
devel/remake/patches: patch-glob_glob_h patch-src_dbg_cmd_c 
  patch-tests_scripts_debugger_trace 

Log message:
Updated devel/remake to remake-4.3+dbg-1.5 [-fno-common]

Slightly massaged patches from:
https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d3f45f6f1ac0dbe8d987af727a0f7445cd30048

Passes all tests:
653 Tests in 124 Categories Complete ... No Failures :-)

ok sthen

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2021/02/25 08:07:50

Modified files:
databases/redis: Tag: OPENBSD_6_8 Makefile distinfo 
databases/redis/patches: Tag: OPENBSD_6_8 patch-redis_conf 
 patch-src_Makefile 
 patch-src_networking_c 
 patch-src_zmalloc_c 

Log message:
Update to Redis 6.0.11, ok sthen

Fixes an integer overflow issue on ILP32 arches (CVE-2021-21309)
among many other things.

https://github.com/redis/redis/blob/6.0/00-RELEASENOTES

CVS: cvs.openbsd.org: ports

[Theo Buehler]

CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2021/02/25 08:05:23

Modified files:
databases/redis: Makefile distinfo 
databases/redis/patches: patch-deps_Makefile 
 patch-deps_hiredis_Makefile 
 patch-redis_conf patch-sentinel_conf 
 patch-src_Makefile patch-src_debug_c 
 patch-src_networking_c 
 patch-src_server_h 
 patch-tests_test_helper_tcl 
 patch-utils_gen-test-certs_sh 
databases/redis/pkg: PLIST redis.rc 
Added files:
databases/redis/patches: patch-src_zmalloc_c 
Removed files:
databases/redis/patches: patch-deps_lua_src_lua_bit_c 
 patch-deps_lua_src_lua_cjson_c 
 patch-deps_lua_src_lua_cmsgpack_c 
 patch-deps_lua_src_lua_struct_c 

Log message:
Update to Redis 6.2.0, ok danj sthen

Redis 6.2 includes many new commands and improvements, but no big features. It
mainly makes Redis more complete and addresses issues that have been requested
by many users frequently or for a long time.

https://github.com/redis/redis/blob/6.2/00-RELEASENOTES

This version includes a security fix for ILP32 arches (CVE-2021-21309)

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2021/02/25 08:05:06

Modified files:
inputmethods/cellwriter: Makefile 
Added files:
inputmethods/cellwriter/patches: patch-src_options_c 
 patch-src_recognize_c 

Log message:
inputmethods/cellwriter: fix build with -fno-common

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2021/02/25 08:03:42

ports/inputmethods/cellwriter/patches

Update of /cvs/ports/inputmethods/cellwriter/patches
In directory cvs.openbsd.org:/tmp/cvs-serv88801/patches

Log Message:
Directory /cvs/ports/inputmethods/cellwriter/patches added to the repository

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 07:35:39

ports/net/ipcheck/patches

Update of /cvs/ports/net/ipcheck/patches
In directory cvs.openbsd.org:/tmp/cvs-serv34918/patches

Log Message:
Directory /cvs/ports/net/ipcheck/patches added to the repository

Re: quirks botched commit

[Matthew Martin]

On Thu, Feb 25, 2021 at 10:16:03AM +, Mikolaj Kucharski wrote:
> On Thu, Feb 25, 2021 at 11:04:06AM +0100, Marc Espie wrote:
> > On Thu, Feb 25, 2021 at 09:53:04AM +0100, Marc Espie wrote:
> > > next time, please remember to build it.
> > > there's a reason do-build checks the syntax of those perl files.
> > 
> > morning brainfart, of course it built. Which begs the question how come the
> > syntax check didn't get it
> > 
> 
> $ find files/ -type f -name \*.pm -print -exec /usr/bin/false \;
> files/Quirks.pm
> files/Quirks/ghc.pm
> 
> $ echo $?
> 0

A non-zero exit for -exec ...\; is not propagated to find's exit status
as it's just a filter. A non-zero exit for -exec ...+ is however.
Since perl -c doesn't seem to support checking multiple files at once,
a simple s/\\;/+/ doesn't work, but this does.


diff --git Makefile Makefile
index 02d43cc077f..d4ef43c0b39 100644
--- Makefile
+++ Makefile
@@ -15,7 +15,7 @@ PERMIT_PACKAGE =  Yes
 PERLDIR =  ${PREFIX}/libdata/perl5/site_perl
 
 do-build:
-   @find ${FILESDIR} -type f -name \*.pm -exec perl -c {} \;
+   @find ${FILESDIR} -type f -name \*.pm ! -exec perl -c {} \; -exec false 
{} +
 
 do-install:
${INSTALL_DATA_DIR} ${PERLDIR}/OpenBSD/Quirks

Re: [UPDATE] x11/polybar 3.5.4

[Stuart Henderson]

On 2021/02/25 13:27, Stuart Henderson wrote:
> On 2021/02/25 11:05, Guy Godfroy wrote:
> > Friendly ping.
> > 
> > I wish that update to be approved before any other commit will break it.
> > 
> > Le 24/02/2021 à 10:52, Guy Godfroy a écrit :
> > > Le 23/02/2021 à 13:14, Stuart Henderson a écrit :> Diff doesn't apply
> > > directly against -current.
> > > 
> > > Here is the new diff, should work now.
> > > 
> > >> it's customary to CC the maintainer in case they aren't watching ports@.
> > > 
> > > Done.
> > > 
> > >> This patch needs updating for the new version rather than deleting.
> > > 
> > > You're right, I don't know how I ended up just deleting it. I fixed that.
> > > 
> > 
> 
> 1 day is way too send to be prodding on ports submissions.
> 

typo: s/send/soon

Re: [UPDATE] x11/polybar 3.5.4

[Stuart Henderson]

On 2021/02/25 11:05, Guy Godfroy wrote:
> Friendly ping.
> 
> I wish that update to be approved before any other commit will break it.
> 
> Le 24/02/2021 à 10:52, Guy Godfroy a écrit :
> > Le 23/02/2021 à 13:14, Stuart Henderson a écrit :> Diff doesn't apply
> > directly against -current.
> > 
> > Here is the new diff, should work now.
> > 
> >> it's customary to CC the maintainer in case they aren't watching ports@.
> > 
> > Done.
> > 
> >> This patch needs updating for the new version rather than deleting.
> > 
> > You're right, I don't know how I ended up just deleting it. I fixed that.
> > 
> 

1 day is way too send to be prodding on ports submissions.

Re: cabal.port.mk + devel/happy using it

[Stuart Henderson]

On 2021/02/25 14:13, Matthias Kilian wrote:
> Hi Greg,
> 
> On Mon, Feb 22, 2021 at 08:26:43PM -0800, Greg Steuck wrote:
> > Happily I can gradually work haskell ports over to the new infra without
> > upgrading lang/ghc and then destroying and recreating the world.  Maybe
> > it would've been less work total to do a big bang, but hopefully this is
> > easier to swallow in little bits. Any rollback is less of a pain should
> > it have to happen.
> > 
> > As a reminder, the eventual goal is to move every haskell binary port
> > over to cabal.port.mk and thus deconstrain future upgrades of the ports
> > and lang/ghc.
> 
> This looks good, at the moment I'm test-building happy (will take
> some hours, because some dependency of ghc had been updated, so my
> machine is rebuilding it, too).
> 
> 
> However, I'm not sure wether devel/cabal is the right place for
> cabal.port.mk. Shouldn't modules-only files to be put into
> infrastructure/mk?
> 
> What do other ports people think?

We have the same for devel/cargo, lang/go, lang/python and others.
For gcc the main module is in lang/gcc/8 but there's a helper in
infrastructure/mk because it (sometimes) needs to select between
different gcc versions.

I'm fairly happy having it in the main ports tree, but if it is
placed elsewhere then the others should probably move there too.

Re: cabal.port.mk + devel/happy using it

[Matthias Kilian]

Hi Greg,

On Mon, Feb 22, 2021 at 08:26:43PM -0800, Greg Steuck wrote:
> Happily I can gradually work haskell ports over to the new infra without
> upgrading lang/ghc and then destroying and recreating the world.  Maybe
> it would've been less work total to do a big bang, but hopefully this is
> easier to swallow in little bits. Any rollback is less of a pain should
> it have to happen.
> 
> As a reminder, the eventual goal is to move every haskell binary port
> over to cabal.port.mk and thus deconstrain future upgrades of the ports
> and lang/ghc.

This looks good, at the moment I'm test-building happy (will take
some hours, because some dependency of ghc had been updated, so my
machine is rebuilding it, too).


However, I'm not sure wether devel/cabal is the right place for
cabal.port.mk. Shouldn't modules-only files to be put into
infrastructure/mk?

What do other ports people think?

Ciao,
Kili

> >From 79f9ac90d524e4df33191fd73e09487cb7711a96 Mon Sep 17 00:00:00 2001
> From: Greg Steuck 
> Date: Sun, 13 Sep 2020 17:04:03 -0700
> Subject: [PATCH 1/2] Add cabal.port.mk to more easily build haskell ports
> 
> Corrections by James Cook 
> ---
>  devel/cabal/cabal.port.mk | 155 ++
>  1 file changed, 155 insertions(+)
>  create mode 100644 devel/cabal/cabal.port.mk
> 
> diff --git a/devel/cabal/cabal.port.mk b/devel/cabal/cabal.port.mk
> new file mode 100644
> index 000..7def1866116
> --- /dev/null
> +++ b/devel/cabal/cabal.port.mk
> @@ -0,0 +1,155 @@
> +# $OpenBSD$
> +
> +# Module for building Haskell programs with cabal-install.
> +# Inspired by FreeBSD cabal.mk by Gleb Popov.
> +
> +# Input variables:
> +#
> +#  MODCABAL_STEM - the name of the package on hackage.
> +#  MODCABAL_VERSION  - the version of the package.
> +#  MODCABAL_MANIFEST - hackage dependencies required by this package, triples
> +#of space separate   . Typically generated
> +#with cabal-bundler program from cabal-extras, e.g.
> +#cabal-bundler --openbsd darcs-2.16.2
> +#  MODCABAL_DATA_DIR - data-dir from .cabal file (if the port needs the data)
> +#
> https://cabal.readthedocs.io/en/latest/cabal-package.html#pkg-field-data-dir
> +#  MODCABAL_REVISION - Numeric revision of .cabal file on hackage if one is
> +#needed on top of .cabal file contained in the .tar.gz file.
> +#  MODCABAL_BUILD_ARGS - passed to cabal v2-build, e.g. make 
> MODCABAL_BUILD_ARGS=-v
> +#is a nice debugging aid.
> +#  MODCABAL_FLAGS - passed to --flags= of cabal v2-build. Seemingly 
> superfluous given
> +#MODCABAL_BUILD_ARGS, but it is useful to keep this value separate as it
> +#is used to generate the build plan and will be available without 
> parsing.
> +#  MODCABAL_EXECUTABLES - Executable target in .cabal file, by default uses
> +#the hackage package name.
> +#https://cabal.readthedocs.io/en/latest/cabal-package.html#executables
> +#
> +# Available output variables:
> +#
> +#  MODCABAL_BUILT_EXECUTABLE_${_exe} is built for each of 
> MODCABAL_EXECUTABLES.
> +#These are available for `make test` after `make build` phase.
> +#
> +# Special files:
> +#   files/cabal.project is used automatically.
> +
> +ONLY_FOR_ARCHS = i386 amd64
> +
> +BUILD_DEPENDS += devel/cabal-install>=3.4.0.0 \
> + lang/ghc>=8.6.4
> +
> +# Takes over :9 site for hackage. The day when we have a port using
> +# both Go/Rust and Hackage we'll have to resolve their common
> +# insistance on grabbing :9.
> +MASTER_SITES9 =  https://hackage.haskell.org/package/
> +
> +DIST_SUBDIR ?=   hackage
> +
> +# The .cabal files are explicitly copied over the ones extracted from
> +# archives by the normal extraction rules.
> +EXTRACT_CASES += *.cabal) ;;
> +
> +DISTNAME ?=  ${MODCABAL_STEM}-${MODCABAL_VERSION}
> +HOMEPAGE ?=  ${MASTER_SITES9}${MODCABAL_STEM}
> +MASTER_SITES ?=  ${MASTER_SITES9}${DISTNAME}/
> +DISTFILES ?= ${DISTNAME}.tar.gz
> +SUBST_VARS +=MODCABAL_STEM MODCABAL_VERSION PKGNAME
> +
> +# Oftentime our port name and the executable name coincide.
> +MODCABAL_EXECUTABLES ?=  ${MODCABAL_STEM}
> +
> +# Cabal won't download anything from hackage if config file exists.
> +MODCABAL_post-extract = \
> + mkdir -p ${WRKDIR}/.cabal \
> + && touch ${WRKDIR}/.cabal/config
> +
> +# Some packages need an updated .cabal file from hackage to overwrite
> +# the one in the tar ball.
> +.if defined(MODCABAL_REVISION)
> +DISTFILES += 
> ${DISTNAME}_${MODCABAL_REVISION}{revision/${MODCABAL_REVISION}}.cabal
> +MODCABAL_post-extract += \
> + && cp ${FULLDISTDIR}/${DISTNAME}_${MODCABAL_REVISION}.cabal \
> + ${WRKSRC}/${MODCABAL_STEM}.cabal
> +.endif
> +
> +# The dependent sources get downloaded from hackage.
> +.for _package _version _revision in ${MODCABAL_MANIFEST}
> +DISTFILES += {${_package}-${_version}/}${_package}-${_version}.tar.gz:9
> +.  if ${_revision} > 0
> +DISTFILES += 
> 

Re: [MAINTAINER UPDATE] graphics/openimageio -> 2.2.11.1

[Stuart Henderson]

On 2021/02/24 12:07, Dimitri Karamazov wrote:
> On Wed, Feb 24, 2021 at 11:23:47AM +, Stuart Henderson wrote:
> > On 2021/02/22 15:32, Dimitri Karamazov wrote:
> > > On Mon, Feb 22, 2021 at 01:28:26AM -0500, Daniel Dickman wrote:
> > > > 
> > > > 
> > > > On Mon, 22 Feb 2021, Rafael Sadowski wrote:
> > > > 
> > > > > > 
> > > > > > Bump for a new release.
> > > > > 
> > > > > Still OK for me but we need to import robin-map first. A second OK is
> > > > > needed.
> > > > > 
> > > > 
> > > > Where is the port for robin-map? Can someone resend it?
> > > 
> > > Avoid the previous diff as there is a mistake and the robin-map
> > > port has been attached at the very end.
> > 
> > robin-map wants "ONLY_FOR_ARCHS= ${CXX11_ARCHS}". I would drop the
> > NO_BUILD as well it is really just for cases where things fail if you
> > try to do "build". Otherwise OK for that.
> > 
> Done.
> 
> > > --- pkg/PLIST 5 Jan 2021 20:53:18 -   1.11
> > > +++ pkg/PLIST 22 Feb 2021 15:29:57 -
> > > @@ -1,5 +1,4 @@
> > > -@comment $OpenBSD: PLIST,v 1.11 2021/01/05 20:53:18 jca Exp $
> > > -@conflict idiff-*
> > > +@comment $OpenBSD: PLIST,v$
> > 
> > The conflict should stay.
> > 
> This conflict is not being detected by pkglocatedb.
> I wonder why?

$ pkglocate bin/idiff
idiff-1.1:textproc/idiff:/usr/local/bin/idiff
openimageio-2.2.10.0p0:graphics/openimageio:/usr/local/bin/idiff
plan9port-20210129:plan9/plan9port:/usr/local/plan9/bin/idiff

If you mean the automatic check, that has been changed to only check
new files, otherwise everybody working on ports with thousands of PLIST
entries has to disable checking completely otherwise it's too slow..

> The suggested changes have been applied to the attachments.

This is OK with me. (Or I can commit if I get an OK for robin-map).

Re: turn off python2 tests for py-requests

[Daniel Jakots]

On Wed, 24 Feb 2021 23:17:30 -0500 (EST), Daniel Dickman
 wrote:

> Diff below turns off python2 tests for py-requests.
> 
> This is needed so py-flask can move to python3.
> 
> The DEP chain is:
> - py-requests has a TDEP on py-test-httpbin
> - py-test-httpbin has an RDEP on py-httpbin
> - py-httpbin has an RDEP on py-flask
> 
> ok?

sure

aarch64 bulk build report

[phessler]

bulk build on arm64.ports.openbsd.org
started on  Mon Feb 22 08:41:27 MST 2021
finished at Thu Feb 25 04:11:13 MST 2021
lasted 2D19h29m
done with kern.version=OpenBSD 6.9-beta (GENERIC.MP) #1035: Mon Feb 22 04:55:37 
MST 2021

built packagesls: /usr/ports/packages/aarch64/all: No such file or directory


mv: /usr/ports/packages/aarch64: No such file or directory

critical path missing pkgs:  
http://build-failures.rhaalovely.net/aarch64/2021-02-22/summary.log

build failures: 72
http://build-failures.rhaalovely.net/aarch64/2021-02-22/audio/gtkpod.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/audio/nspmod.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/audio/wmtune.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/comms/birda.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/comms/efax.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/comms/gnuradio.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/comms/scmxx.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/comms/seyon.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/comms/xdx.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/converters/wv2.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/devel/glog.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/devel/mingw.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/devel/remake.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/editors/calligra.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/editors/micro.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/editors/tea.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/editors/xwpe.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/education/drgeo-doc.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/emulators/libretro-genesis-plus-gx.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/emulators/pcsxr.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/emulators/vice.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/games/corewars.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/games/egoboo.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/games/freedroidrpg.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/games/lwjgl3.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/games/mirrormagic.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/games/sdlpop.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/games/shockolate.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/games/vms-empire.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/graphics/dpic.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/graphics/gimp/liquid-rescale.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/inputmethods/cellwriter.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/lang/moarvm.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/mail/sma.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/mail/wmmultipop3.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/mail/wmpop3.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/misc/logjam.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/misc/wmmand.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/multimedia/audiopreview.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/multimedia/lives.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/net/angst.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/net/argus.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/net/argus-clients.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/net/dico.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/net/ekg.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/net/ettercap,no_x11.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/net/ipv6-toolkit.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/net/nagios/nagios.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/net/tcpreplay.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/net/weex.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/net/yersinia.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/security/age.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/security/bsd-airtools.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/security/foremost.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/security/gringotts.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/security/ossec-hids.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/security/tempwatch.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/sysutils/nomad.log
http://build-failures.rhaalovely.net/aarch64/2021-02-22/sysutils/radmind.log

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 04:44:45

Modified files:
www: Makefile 
www/pecl-pecl_http: Makefile 

Log message:
disable php80 on BROKEN port pecl-pecl_http

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 04:42:33

Modified files:
lang/php/7.2   : Makefile 
lang/php/7.2/patches: patch-php_ini-production 
lang/php/7.3   : Makefile 
lang/php/7.3/patches: patch-php_ini-production 
lang/php/7.4   : Makefile 
lang/php/7.4/patches: patch-php_ini-production 
lang/php/8.0   : Makefile 
lang/php/8.0/patches: patch-php_ini-production 

Log message:
tweak sample php configs, expose_php off by default

CVS: cvs.openbsd.org: ports

[Marc Espie]

CVSROOT:/cvs
Module name:ports
Changes by: es...@cvs.openbsd.org   2021/02/25 04:18:47

Modified files:
graphics/libwebp: Makefile 

Log message:
add DEBUG_PACKAGES
explain precisely what's going on with SDL
okay sthen@

CVS: cvs.openbsd.org: ports

[Robert Nagy]

CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2021/02/25 04:09:17

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

Log message:
update to 5.0.1

Re: quirks botched commit

[Mikolaj Kucharski]

On Thu, Feb 25, 2021 at 10:16:03AM +, Mikolaj Kucharski wrote:
> On Thu, Feb 25, 2021 at 11:04:06AM +0100, Marc Espie wrote:
> > On Thu, Feb 25, 2021 at 09:53:04AM +0100, Marc Espie wrote:
> > > next time, please remember to build it.
> > > there's a reason do-build checks the syntax of those perl files.
> > 
> > morning brainfart, of course it built. Which begs the question how come the
> > syntax check didn't get it
> > 
> 
> $ find files/ -type f -name \*.pm -print -exec /usr/bin/false \;
> files/Quirks.pm
> files/Quirks/ghc.pm
> 
> $ echo $?
> 0
> 

Below gives expected result of failure.

$ find files/ -type f -name \*.pm -print0 | xargs -r0t -I% perl -c %
perl -c files/Quirks/ghc.pm
files/Quirks/ghc.pm syntax OK
perl -c files/Quirks.pm
String found where operator expected at files/Quirks.pm line 2196, near 
""Upstrem moved to unversioned tarballs, use the plan9port (same upstream) 
package instead""
(Missing semicolon on previous line?)
syntax error at files/Quirks.pm line 2196, near ""Upstrem moved to unversioned 
tarballs, use the plan9port (same upstream) package instead""
files/Quirks.pm had compilation errors.
xargs: perl exited with status 255

$ echo $?
124

-- 
Regards,
 Mikolaj

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 03:39:24

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

Log message:
fix spelling of driftnet (in the commit which originally introduced
the missing comma, before another line was added that made it a syntax
error some commits later)

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/02/25 03:36:35

Modified files:
devel/quirks   : Makefile 

Log message:
avoid using find -exec, it does nothing useful with failure exit xodes.
just use the output of find in a for loop.

Re: quirks botched commit

[Mikolaj Kucharski]

On Thu, Feb 25, 2021 at 11:04:06AM +0100, Marc Espie wrote:
> On Thu, Feb 25, 2021 at 09:53:04AM +0100, Marc Espie wrote:
> > next time, please remember to build it.
> > there's a reason do-build checks the syntax of those perl files.
> 
> morning brainfart, of course it built. Which begs the question how come the
> syntax check didn't get it
> 

$ find files/ -type f -name \*.pm -print -exec /usr/bin/false \;
files/Quirks.pm
files/Quirks/ghc.pm

$ echo $?
0

-- 
Regards,
 Mikolaj

Re: [UPDATE] x11/polybar 3.5.4

[Guy Godfroy]

Friendly ping.

I wish that update to be approved before any other commit will break it.

Le 24/02/2021 à 10:52, Guy Godfroy a écrit :
> Le 23/02/2021 à 13:14, Stuart Henderson a écrit :> Diff doesn't apply
> directly against -current.
> 
> Here is the new diff, should work now.
> 
>> it's customary to CC the maintainer in case they aren't watching ports@.
> 
> Done.
> 
>> This patch needs updating for the new version rather than deleting.
> 
> You're right, I don't know how I ended up just deleting it. I fixed that.
> 

Re: quirks botched commit

[Marc Espie]

On Thu, Feb 25, 2021 at 09:53:04AM +0100, Marc Espie wrote:
> next time, please remember to build it.
> there's a reason do-build checks the syntax of those perl files.

morning brainfart, of course it built. Which begs the question how come the
syntax check didn't get it

Re: NEW: meta/kde

[Vadim Zhukov]

Some ideas:

-sdk and -akonadi are useless, IMO. Why anyone would install akonadi
separately? And for the -sdk, maybe it probably better being merged with
-development?

What are the plans for KDE6? If it's gotta be built together with KDE5,
then those meta packages likely want to have PKGSPEC already.

чт, 25 февр. 2021 г., 08:48 Rafael Sadowski :

> On Sat Feb 20, 2021 at 07:23:10AM +0100, Rafael Sadowski wrote:
> > I would like to bring back a meta package for KDE. This is more or less
> > a straightforward package which categorized the KDE applications in:
> >
> > COMMENT-accessibility =   KDE accessibility applications
> > COMMENT-admin =   KDE system administrator tools
> > COMMENT-akonadi = KDE Akonadi cross-desktop storage service
> > COMMENT-education =   KDE education applications
> > COMMENT-games =   KDE games
> > COMMENT-graphics =KDE graphics applications
> > COMMENT-main =KDE meta-package (full installation)
> > COMMENT-multimedia =  KDE multimedia applications
> > COMMENT-network = KDE network applications
> > COMMENT-pim = KDE PIM personal information managemen applications
> > COMMENT-sdk = KDE software development kit (SDK)
> > COMMENT-development = KDE development applications
> > COMMENT-utils =   KDE utilities
> >
> > For this package we need to share the KDE version. So I would like to
> > bring back the kde-application module.
> >
> > A short review and an OK for the plan would be great.
>
> Is anyone willing to OK to this?
>
> >
> > Rafael
> >
> >
> > Index: Makefile.inc
> > ===
> > RCS file: /cvs/ports/x11/kde-applications/Makefile.inc,v
> > retrieving revision 1.14
> > diff -u -p -r1.14 Makefile.inc
> > --- Makefile.inc  8 Feb 2021 20:00:39 -   1.14
> > +++ Makefile.inc  20 Feb 2021 06:18:16 -
> > @@ -9,10 +9,6 @@ CATEGORIES +=x11/kde-applications
> >
> >  MAINTAINER ?=Rafael Sadowski 
> >
> > -# usual KDE rules:
> > -# LGPLv2.1+, GPLv2+, GPLv3
> > -PERMIT_PACKAGE ?=Yes
> > -
> >  # Do not rely on devel/cmake here: additional modules that are
> >  # set up in ports may have, say, lang/python before devel/cmake,
> >  # thus making lang/python evaluating first. And when lang/python
> > @@ -20,32 +16,17 @@ PERMIT_PACKAGE ?= Yes
> >  # module port, and breaks build.
> >  CONFIGURE_STYLE =cmake
> >
> > -MODULES :=   devel/kf5 ${MODULES}
> > -
> > -VERSION ?=   20.12.2
> > -
> > -MASTER_SITES ?=
> ${MASTER_SITE_KDE:=stable/release-service/${VERSION}/src/}
> > -
> > -# Set to 'yes' if there are .desktop files under share/release-service/.
> > -.if defined(MODKDE5_DESKTOP_FILE) && ${MODKDE5_DESKTOP_FILE:L} == "yes"
> > -MODKDE5_RUN_DEPENDS +=   devel/desktop-file-utils
> > -.endif
> > +MODULES :=   x11/kde-applications \
> > + devel/kf5 \
> > + ${MODULES}
> >
> > -# Set to 'yes' if there are icon files under share/icons/.
> > -.if defined(MODKDE5_ICON_CACHE) && ${MODKDE5_ICON_CACHE:L} == "yes"
> > -MODKDE5_RUN_DEPENDS +=   x11/gtk+3,-guic
> > -.endif
> > +# usual KDE rules:
> > +# LGPLv2.1+, GPLv2+, GPLv3
> > +PERMIT_PACKAGE ?=Yes
> >
> > -# Set to 'yes' if there are icon files under share/locale/.
> > -.if defined(MODKDE5_TRANSLATIONS) && ${MODKDE5_TRANSLATIONS:L} == "yes"
> > -MODKDE5_BUILD_DEPENDS += devel/gettext,-tools
> > -.endif
> > +VERSION ?=   ${MODKDE_VERSION}
> >
> > -# Set to 'yes' if there are icon files under share/doc/.
> > -.if defined(MODKDE5_DOCS) && ${MODKDE5_DOCS:L} == "yes"
> > -MODKDE5_BUILD_DEPENDS += devel/kf5/kdoctools
> > -MODKDE5_RUN_DEPENDS +=   devel/kf5/kdoctools
> > -.endif
> > +MASTER_SITES ?=
> ${MASTER_SITE_KDE:=stable/release-service/${VERSION}/src/}
> >
> >  RUN_DEPENDS +=   ${MODKDE5_RUN_DEPENDS}
> >  BUILD_DEPENDS += ${MODKDE5_BUILD_DEPENDS}
> > Index: kde-applications.port.mk
> > ===
> > RCS file: kde-applications.port.mk
> > diff -N kde-applications.port.mk
> > --- /dev/null 1 Jan 1970 00:00:00 -
> > +++ kde-applications.port.mk  20 Feb 2021 06:18:16 -
> > @@ -0,0 +1,24 @@
> > +# $OpenBSD: Makefile.inc,v 1.14 2021/02/08 20:00:39 rsadowski Exp $
> > +
> > +MODKDE_VERSION ?=20.12.2
> > +
> > +# Set to 'yes' if there are .desktop files under share/release-service/.
> > +.if defined(MODKDE5_DESKTOP_FILE) && ${MODKDE5_DESKTOP_FILE:L} == "yes"
> > +MODKDE5_RUN_DEPENDS +=   devel/desktop-file-utils
> > +.endif
> > +
> > +# Set to 'yes' if there are icon files under share/icons/.
> > +.if defined(MODKDE5_ICON_CACHE) && ${MODKDE5_ICON_CACHE:L} == "yes"
> > +MODKDE5_RUN_DEPENDS +=   x11/gtk+3,-guic
> > +.endif
> > +
> > +# Set to 'yes' if there are icon files under share/locale/.
> > +.if 

quirks botched commit

[Marc Espie]

next time, please remember to build it.
there's a reason do-build checks the syntax of those perl files.