date:20211017

New: textproc/csvquote

2021-10-17 Thread Allan Streib

This is a little utility that I have found useful when processing CSV
files that may contain delimeters or newlines within data fields.

https://github.com/dbro/csvquote

The project provides no release/tags or man page.

I offer the attached port for comments/testing.

I have tested only on amd64.

Allan




csvquote.tar.gz
Description: application/gzip

[PATCH 9/9] Upgrade devel/darcs 2.16.3->2.16.4

2021-10-17 Thread Greg Steuck

I see --help still works. Does anybody even use darcs? Please test if so...

OK?

>From d26ac0f26c6c3c710a2e370679c4132b7cda7fe0 Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sun, 17 Oct 2021 19:50:16 -0700
Subject: [PATCH 9/9] Upgrade devel/darcs 2.16.3->2.16.4

---
 devel/darcs/Makefile | 101 --
 devel/darcs/distinfo | 202 +--
 2 files changed, 174 insertions(+), 129 deletions(-)

diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
index b892cd74b18..c954e3927a3 100644
--- a/devel/darcs/Makefile
+++ b/devel/darcs/Makefile
@@ -3,8 +3,7 @@
 COMMENT =  advanced revision control system written in Haskell
 
 MODCABAL_STEM =darcs
-MODCABAL_VERSION = 2.16.3
-REVISION = 0
+MODCABAL_VERSION = 2.16.4
 CATEGORIES =   devel
 HOMEPAGE = http://www.darcs.net/
 
@@ -14,96 +13,104 @@ WANTLIB =  c charset curl>=2 curses ffi gmp iconv 
m \
 MODULES =  devel/cabal
 MODCABAL_FLAGS =   curl -library
 MODCABAL_MANIFEST =\
-   aeson   1.5.6.0 0   \
+   StateVar1.2.2   0   \
+   aeson   2.0.1.0 0   \
+   appar   0.1.8   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   \
+   async   2.2.4   0   \
attoparsec  0.13.2.51   \
-   base-compat 0.11.2  0   \
-   base-compat-batteries   0.11.2  0   \
-   base-orphans0.8.4   0   \
+   base-compat 0.12.0  0   \
+   base-compat-batteries   0.12.0  1   \
+   base-orphans0.8.5   0   \
base16-bytestring   1.0.1.0 0   \
-   base64-bytestring   1.2.0.1 0   \
-   basement0.0.11  2   \
-   bifunctors  5.5.10  0   \
+   base64-bytestring   1.2.1.0 0   \
+   basement0.0.12  1   \
+   bifunctors  5.5.11  1   \
blaze-builder   0.4.2.1 0   \
+   byteorder   1.0.4   0   \
case-insensitive1.2.1.0 0   \
-   cereal  0.5.8.1 0   \
-   comonad 5.0.8   0   \
-   conduit 1.3.4.1 0   \
+   cereal  0.5.8.1 1   \
+   comonad 5.0.8   1   \
+   conduit 1.3.4.2 0   \
conduit-extra   1.3.5   0   \
connection  0.3.1   1   \
-   constraints 0.120   \
+   constraints 0.121   \
+   contravariant   1.5.5   0   \
cookie  0.4.5   0   \
-   cryptonite  0.270   \
+   cryptonite  0.271   \
data-default-class  0.1.2.0 0   \
-   data-fix0.3.1   0   \
+   data-fix0.3.2   0   \
data-ordlist0.4.7.0 0   \
-   digest  0.0.1.2 0   \
-   distributive0.6.2.1 0   \
+   digest  0.0.1.3 0   \
+   distributive0.6.2.1 1   \
dlist   1.0 0   \
fgl 5.7.0.3 0   \
filtrable   0.1.6.0 0   \
-   hashable1.3.1.0 0   \
+   hashable1.3.4.1 0   \
hourglass   0.2.12  0   \
hsc2hs  0.68.7  1   \
html1.0.1.2 0   \
-   http-client 0.7.6   0   \
+   http-client 0.7.9   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   \
+   indexed-traversable 0.1.1   1   \
+   indexed-traversable-instances   0.1 0   \
integer-logarithms  1.0.3.1 0   \
-   memory  0.15.0  1   \
+   iproute 1.7.11  0   \
+   memory  0.15.0  2   \
mime-types  0.1.0.9 0   \
mmap0.5.9   0   \
-   mono-traversable1.0.15.10   \
-   network 3.1.2.1 1   \
+   mono-traversable1.0.15.30   \
+   network 3.1.2.5 0   \
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   \
+   primitive   0.7.2.0 0   \
+   random  1.2.1   0   \
regex-applicative   0.3.4   0   \
-   regex-base  0.94.0.10   \
+   regex-base  0.94.0.11   \
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   \
+   regex-tdfa  1.3.1.1 1   \
+   resourcet   1.2.4.3 0   \
+   scientific  0.3.7.0 0   \
+   semialign

[PATCH 8/9] Nudge devel/cpphs to use a more permissive version of polyparse

2021-10-17 Thread Greg Steuck

Confirmed in spits something when fed /usr/include/stdio.h.

OK?

>From 014efc65019e293418c3b06e0fbc33e448ed5b1a Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sun, 17 Oct 2021 19:48:58 -0700
Subject: [PATCH 8/9] Nudge devel/cpphs to use a more permissive version of
 polyparse

This should make upgrading to ghc-9 less of an event.
---
 devel/cpphs/Makefile | 3 ++-
 devel/cpphs/distinfo | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/devel/cpphs/Makefile b/devel/cpphs/Makefile
index 5f599de8d04..29afbfd4dc6 100644
--- a/devel/cpphs/Makefile
+++ b/devel/cpphs/Makefile
@@ -4,7 +4,8 @@ COMMENT =   liberalised reimplementation of cpp in Haskell
 
 MODCABAL_STEM =cpphs
 MODCABAL_VERSION = 1.20.9.1
-MODCABAL_MANIFEST =polyparse 1.13 1
+MODCABAL_MANIFEST =polyparse 1.13 2
+REVISION = 0
 CATEGORIES =   devel
 MAINTAINER =   Matthias Kilian 
 
diff --git a/devel/cpphs/distinfo b/devel/cpphs/distinfo
index 4c9aab52ea9..5ae19190090 100644
--- a/devel/cpphs/distinfo
+++ b/devel/cpphs/distinfo
@@ -1,6 +1,6 @@
 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=
+SHA256 (hackage/polyparse-1.13_2.cabal) = 
1D3CCb6Gy8frXLmM2ArTbIsDU5fp3SAPZpsZ0g83uNg=
 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
+SIZE (hackage/polyparse-1.13_2.cabal) = 2740
-- 
2.33.1

[PATCH 7/9] Upgrade devel/git-annex 8.20210223->8.20211011

2021-10-17 Thread Greg Steuck

I only built this and confirmed the executable is doesn't die right
away. Somebody who cares should test.

OK?

>From c2133d7a21cb70b49be3097de46613c96d5a4898 Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sun, 17 Oct 2021 19:47:46 -0700
Subject: [PATCH 7/9] Upgrade devel/git-annex 8.20210223->8.20211011

---
 devel/git-annex/Makefile | 202 ++--
 devel/git-annex/distinfo | 400 +--
 2 files changed, 311 insertions(+), 291 deletions(-)

diff --git a/devel/git-annex/Makefile b/devel/git-annex/Makefile
index 26ba0f0ff28..3123a15e5d8 100644
--- a/devel/git-annex/Makefile
+++ b/devel/git-annex/Makefile
@@ -27,8 +27,7 @@ MODULES = devel/cabal
 MAKE_ENV = LC_ALL=en_US.UTF-8
 
 MODCABAL_STEM =git-annex
-MODCABAL_VERSION = 8.20210223
-REVISION = 1
+MODCABAL_VERSION = 8.20211011
 
 MAN1_STAGING_DIR = ${WRKBUILD}/man1_staging
 
@@ -48,22 +47,19 @@ post-install:
${INSTALL_MAN_DIR} ${PREFIX}/man/man1
${INSTALL_MAN} ${MAN1_STAGING_DIR}/*.1 ${PREFIX}/man/man1
 
-# Produced by:
-# $ cabal-bundler --openbsd git-annex-8.20210223
-# Then manually remove:git-annex   8.20210223  0
 MODCABAL_MANIFEST = \
DAV 1.3.4   0   \
-   Glob0.10.1  0   \
+   Glob0.10.1  1   \
HUnit   1.6.2.0 0   \
IfElse  0.850   \
Only0.1 1   \
QuickCheck  2.14.2  0   \
SafeSemaphore   0.10.1  1   \
-   StateVar1.2.1   0   \
+   StateVar1.2.2   0   \
abstract-deque  0.3 0   \
abstract-par0.3.3   0   \
adjunctions 4.4 2   \
-   aeson   1.5.6.0 0   \
+   aeson   1.5.6.0 2   \
alex3.2.6   0   \
ansi-terminal   0.110   \
ansi-wl-pprint  0.6.9   2   \
@@ -72,53 +68,53 @@ MODCABAL_MANIFEST = \
asn1-parse  0.9.5   0   \
asn1-types  0.3.4   0   \
assoc   1.0.2   1   \
-   async   2.2.3   0   \
+   async   2.2.4   0   \
attoparsec  0.13.2.51   \
-   attoparsec-iso8601  1.0.2.0 0   \
+   attoparsec-iso8601  1.0.2.0 2   \
auto-update 0.1.6   0   \
-   aws 0.220   \
-   base-compat 0.11.2  0   \
-   base-compat-batteries   0.11.2  0   \
-   base-orphans0.8.4   0   \
+   aws 0.221   \
+   base-compat 0.12.0  0   \
+   base-compat-batteries   0.12.0  1   \
+   base-orphans0.8.5   0   \
base16-bytestring   0.1.1.7 3   \
-   base64-bytestring   1.0.0.3 0   \
-   basement0.0.11  2   \
+   base64-bytestring   1.0.0.3 1   \
+   basement0.0.12  1   \
bencode 0.6.1.1 0   \
-   bifunctors  5.5.10  0   \
+   bifunctors  5.5.11  1   \
binary-orphans  1.0.1   5   \
blaze-builder   0.4.2.1 0   \
-   blaze-html  0.9.1.2 0   \
+   blaze-html  0.9.1.2 1   \
blaze-markup0.8.2.8 0   \
bloomfilter 2.0.1.0 0   \
bsb-http-chunked0.0.0.4 3   \
byteable0.1.1   0   \
byteorder   1.0.4   0   \
cabal-doctest   1.0.8   2   \
-   call-stack  0.3.0   0   \
+   call-stack  0.4.0   0   \
case-insensitive1.2.1.0 0   \
-   cassava 0.5.2.0 3   \
-   cereal  0.5.8.1 0   \
+   cassava 0.5.2.0 4   \
+   cereal  0.5.8.1 1   \
cipher-aes  0.2.11  0   \
clientsession   0.9.1.2 0   \
clock   0.8.2   0   \
code-page   0.2.1   0   \
-   colour  2.3.5   0   \
-   comonad 5.0.8   0   \
+   colour  2.3.6   0   \
+   comonad 5.0.8   1   \
concurrent-output   1.10.12 0   \
-   conduit 1.3.4.1 0   \
+   conduit 1.3.4.2 0   \
conduit-extra   1.3.5   0   \
connection  0.3.1   1   \
-   contravariant   1.5.3   0   \
+   contravariant   1.5.5   0   \
cookie  0.4.5   0   \
cprng-aes   0.6.1   0   \
-   criterion   1.5.9.0 1   \
-   criterion-measurement   0.1.2.0 0   \
+   criterion   1.5.11.00   \
+   criterion-measurement   0.1.3.0 0   \
crypto-api  0.13.3  1   \
crypto-cipher-types 0.0.9   0   \
crypto-random   0.0.9   1   \
-   cryptohash-md5  0.11.100.1  5   \
-   cryptohash-sha1 0.11.100.1  5   \
-   cryptonite  0.280   \
+   cryptohash-md5  0.11.100.1  6   \
+   cryptohash-sha1 0.11.100.1  6   \
+   cryptonite  0.290

[PATCH 5/9] Upgrade textproc/pandoc 2.12->2.14.2

2021-10-17 Thread Greg Steuck

Confirmed that it can do a trivial .html->.md conversion. I don't really
use pandoc, so people who care should test.

OK?

>From 71b0de43626dbd9427957ccea6153c4558f2fb56 Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sun, 17 Oct 2021 19:26:02 -0700
Subject: [PATCH 5/9] Upgrade textproc/pandoc 2.12->2.14.2

---
 textproc/pandoc/Makefile | 137 ++--
 textproc/pandoc/distinfo | 274 ++-
 2 files changed, 223 insertions(+), 188 deletions(-)

diff --git a/textproc/pandoc/Makefile b/textproc/pandoc/Makefile
index c5c948477aa..fc8b8e35e28 100644
--- a/textproc/pandoc/Makefile
+++ b/textproc/pandoc/Makefile
@@ -24,7 +24,7 @@ NO_TEST = Yes
 MODULES =  devel/cabal
 MODCABAL_FLAGS =   embed_data_files
 MODCABAL_STEM =pandoc
-MODCABAL_VERSION = 2.12
+MODCABAL_VERSION = 2.14.2
 
 # Avoids cloning from github
 post-extract:
@@ -34,124 +34,129 @@ post-install:
${INSTALL_MAN} ${WRKSRC}/man/pandoc.1 ${PREFIX}/man/man1
 
 MODCABAL_MANIFEST = \
-   Glob0.10.1  0   \
-   HTTP4000.3.15   2   \
+   Glob0.10.1  1   \
HsYAML  0.2.1.0 2   \
-   JuicyPixels 3.3.5   0   \
+   JuicyPixels 3.3.6   0   \
QuickCheck  2.14.2  0   \
SHA 1.6.4.4 0   \
-   aeson   1.5.6.0 0   \
-   aeson-pretty0.8.8   0   \
+   aeson   1.5.6.0 2   \
+   aeson-pretty0.8.8   1   \
ansi-terminal   0.110   \
+   appar   0.1.8   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.51   \
-   base-compat 0.11.2  0   \
-   base-compat-batteries   0.11.2  0   \
-   base-orphans0.8.4   0   \
+   async   2.2.4   0   \
+   attoparsec  0.14.1  0   \
+   base-compat 0.12.0  0   \
+   base-compat-batteries   0.12.0  1   \
+   base-orphans0.8.5   0   \
base16-bytestring   1.0.1.0 0   \
-   base64-bytestring   1.2.0.1 0   \
-   basement0.0.11  3   \
-   bifunctors  5.5.10  0   \
+   base64-bytestring   1.2.1.0 0   \
+   basement0.0.12  1   \
+   bifunctors  5.5.11  1   \
blaze-builder   0.4.2.1 0   \
blaze-html  0.9.1.2 1   \
blaze-markup0.8.2.8 0   \
+   byteorder   1.0.4   0   \
cabal-doctest   1.0.8   2   \
case-insensitive1.2.1.0 0   \
-   cereal  0.5.8.1 0   \
-   citeproc0.3.0.9 0   \
-   colour  2.3.5   0   \
-   commonmark  0.1.1.4 0   \
-   commonmark-extensions   0.2.0.4 0   \
-   commonmark-pandoc   0.2.0.1 0   \
-   comonad 5.0.8   0   \
-   conduit 1.3.4.1 0   \
+   cereal  0.5.8.1 1   \
+   citeproc0.5 0   \
+   colour  2.3.6   0   \
+   commonmark  0.2.1   0   \
+   commonmark-extensions   0.2.1.2 0   \
+   commonmark-pandoc   0.2.1.1 0   \
+   comonad 5.0.8   1   \
+   conduit 1.3.4.2 0   \
conduit-extra   1.3.5   0   \
connection  0.3.1   1   \
cookie  0.4.5   0   \
-   cryptonite  0.280   \
+   cryptonite  0.290   \
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   \
-   digest  0.0.1.2 0   \
-   distributive0.6.2.1 0   \
+   data-fix0.3.2   0   \
+   digest  0.0.1.3 0   \
+   distributive0.6.2.1 1   \
dlist   1.0 0   \
-   doclayout   0.3 0   \
-   doctemplates0.9 0   \
-   emojis  0.1 0   \
-   errors  2.3.0   0   \
-   file-embed  0.0.13.00   \
-   haddock-library 1.9.0   0   \
-   hashable1.3.1.0 0   \
+   doclayout   0.3.1.1 0   \
+   doctemplates0.10.0.10   \
+   emojis  0.1.2   0   \
+   errors  2.3.0   1   \
+   file-embed  0.0.15.00   \
+   haddock-library 1.10.0  1   \
+   hashable1.3.4.1 0   \
hourglass   0.2.12  0   \
hsc2hs  0.68.7  1   \
-   hslua   1.3.0.1 0   \
+   hslua   1.3.0.2 0   \
hslua-module-path   0.1.0.1 0   \
hslua-module-system 0.2.2.1 0   \
-   hslua-module-text

[PATCH 6/9] Upgrade devel/hasktags 0.71.2->0.72

2021-10-17 Thread Greg Steuck

I ran this against its own sources and got a tags file with binary stuff.

OK?

>From 1efb8062571482e705a7b4087ae58086710b31f1 Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sun, 17 Oct 2021 19:36:06 -0700
Subject: [PATCH 6/9] Upgrade devel/hasktags 0.71.2->0.72

---
 devel/hasktags/Makefile | 32 +--
 devel/hasktags/distinfo | 70 -
 2 files changed, 50 insertions(+), 52 deletions(-)

diff --git a/devel/hasktags/Makefile b/devel/hasktags/Makefile
index baedaf8d45f..4df132deaf7 100644
--- a/devel/hasktags/Makefile
+++ b/devel/hasktags/Makefile
@@ -3,7 +3,7 @@
 COMMENT =  ctags-like tool for Haskell sources
 
 MODCABAL_STEM =hasktags
-MODCABAL_VERSION = 0.71.2
+MODCABAL_VERSION = 0.72.0
 CATEGORIES =   devel
 
 MAINTAINER =   Matthias Kilian 
@@ -14,26 +14,26 @@ PERMIT_PACKAGE =Yes
 WANTLIB =  c charset ffi gmp iconv m pthread util
 
 MODULES =  devel/cabal
-MODCABAL_REVISION =2
+MODCABAL_REVISION =1
 MODCABAL_MANIFEST = \
ansi-terminal   0.110   \
ansi-wl-pprint  0.6.9   2   \
-   colour  2.3.5   0   \
-   hashable1.3.0.0 1   \
+   colour  2.3.6   0   \
+   hashable1.3.4.1 0   \
json0.101   \
-   microlens   0.4.11.20   \
-   microlens-ghc   0.4.12  0   \
+   microlens   0.4.12.00   \
+   microlens-ghc   0.4.13  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   \
+   microlens-platform  0.4.2   0   \
+   microlens-th0.4.3.100   \
+   optparse-applicative0.16.1.01   \
+   primitive   0.7.2.0 0   \
+   syb 0.7.2.1 0   \
+   th-abstraction  0.4.3.0 0   \
+   transformers-compat 0.7 0   \
+   unordered-containers0.2.14.00   \
+   utf8-string 1.0.2   0   \
+   vector  0.12.3.10   \
 
 LIB_DEPENDS =  converters/libiconv \
devel/gmp \
diff --git a/devel/hasktags/distinfo b/devel/hasktags/distinfo
index 77568d644e6..5a7528a92e1 100644
--- a/devel/hasktags/distinfo
+++ b/devel/hasktags/distinfo
@@ -1,48 +1,46 @@
 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/colour-2.3.6.tar.gz) = 
LNNdzWlEpavJ8Qil617lZLax+pip7HnO/MILWImR+HE=
+SHA256 (hackage/hashable-1.3.4.1.tar.gz) = 
LKX98DpUcY0C8CycmrYZzPEPqLzzsP8Vsn7cJgGaMZY=
+SHA256 (hackage/hasktags-0.72.0.tar.gz) = 
ra21gAqymW8BmKb8avlZ3ubWkznCBMyXifg+ZwJP5yY=
+SHA256 (hackage/hasktags-0.72.0_1.cabal) = 
tCIa1ES9ppEVBpH+UfqOjYw4St4yO5Ekroya+prWaWA=
 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-0.4.12.0.tar.gz) = 
tUJzg8P+JN43iwe1CwvuPQLnDoy/t65RsZRt5RN9B4M=
+SHA256 (hackage/microlens-ghc-0.4.13.tar.gz) = 
RiQJ2Fmw5xFrcJRp9X9q29UCvQ2zNiD1zMmNvBA63eQ=
 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) = 
Nv7zOtDzS5u

[PATCH 4/9] Regenerate devel/shellcheck with newer dependency libs

2021-10-17 Thread Greg Steuck

Confirmed that it complains bitterly about /etc/rc :)

OK?

>From 448d9e9f423d5bbe61d33af958c94e02a5c84a9c Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sun, 17 Oct 2021 19:08:37 -0700
Subject: [PATCH 4/9] Regenerate devel/shellcheck with newer dependency libs

---
 devel/shellcheck/Makefile |  55 ++
 devel/shellcheck/distinfo | 118 ++
 2 files changed, 101 insertions(+), 72 deletions(-)

diff --git a/devel/shellcheck/Makefile b/devel/shellcheck/Makefile
index 03285f80dea..fdeb16d4c2d 100644
--- a/devel/shellcheck/Makefile
+++ b/devel/shellcheck/Makefile
@@ -17,39 +17,46 @@ PERMIT_PACKAGE =Yes
 
 WANTLIB =  c charset ffi gmp iconv m pthread util
 
+# cabal-bundler --openbsd ShellCheck-0.7.2 --executable shellcheck
 MODULES =  devel/cabal
 MODCABAL_MANIFEST   = \
 Diff0.4.0   0   \
 QuickCheck  2.14.2  0   \
-aeson   1.5.6.0 1   \
+StateVar1.2.2   0   \
+aeson   2.0.1.0 0   \
 assoc   1.0.2   1   \
 attoparsec  0.14.1  0   \
-base-compat 0.11.2  0   \
-base-compat-batteries   0.11.2  0   \
-base-orphans0.8.4   0   \
-bifunctors  5.5.10  0   \
-comonad 5.0.8   0   \
-data-fix0.3.1   0   \
-distributive0.6.2.1 0   \
+base-compat 0.12.0  0   \
+base-compat-batteries   0.12.0  1   \
+base-orphans0.8.5   0   \
+bifunctors  5.5.11  1   \
+comonad 5.0.8   1   \
+contravariant   1.5.5   0   \
+data-fix0.3.2   0   \
+distributive0.6.2.1 1   \
 dlist   1.0 0   \
-hashable1.3.1.0 0   \
-indexed-traversable 0.1.1   0   \
+hashable1.3.4.1 0   \
+indexed-traversable 0.1.1   1   \
+indexed-traversable-instances   0.1 0   \
 integer-logarithms  1.0.3.1 0   \
-primitive   0.7.1.0 2   \
-random  1.2.0   5   \
-regex-base  0.94.0.10   \
-regex-tdfa  1.3.1.0 2   \
-scientific  0.3.6.2 0   \
+primitive   0.7.2.0 0   \
+random  1.2.1   0   \
+regex-base  0.94.0.11   \
+regex-tdfa  1.3.1.1 1   \
+scientific  0.3.7.0 0   \
+semialign   1.2 1   \
+semigroupoids   5.3.6   1   \
 splitmix0.1.0.3 0   \
-strict  0.4.0.1 0   \
-tagged  0.8.6.1 1   \
-th-abstraction  0.4.2.0 0   \
-these   1.1.1.1 1   \
-time-compat 1.9.5   1   \
-transformers-compat 0.6.6   0   \
-unordered-containers0.2.13.00   \
-uuid-types  1.0.4   0   \
-vector  0.12.3.00
+strict  0.4.0.1 1   \
+tagged  0.8.6.1 2   \
+th-abstraction  0.4.3.0 0   \
+these   1.1.1.1 2   \
+time-compat 1.9.6.1 0   \
+transformers-compat 0.7 0   \
+unordered-containers0.2.14.00   \
+uuid-types  1.0.5   0   \
+vector  0.12.3.10   \
+witherable  0.4.2   0   \
 
 LIB_DEPENDS =  converters/libiconv \
devel/gmp \
diff --git a/devel/shellcheck/distinfo b/devel/shellcheck/distinfo
index 1f47f949ae4..f23666ec28b 100644
--- a/devel/shellcheck/distinfo
+++ b/devel/shellcheck/distinfo
@@ -1,80 +1,102 @@
 SHA256 (hackage/Diff-0.4.0.tar.gz) = 
cpCsCYrYtHSLnBDklMyFulSvaIImrmmkZap7THPxScc=
 SHA256 (hackage/QuickCheck-2.14.2.tar.gz) = 
2HtshWlrYBF1J0Nh+mIheJRAHkAeFQw8XUATrFPNNvM=
 SHA256 (hackage/ShellCheck-0.7.2.tar.gz) = 
/3U02Aw9yIF8B5Snb0MpeafVwuU37lp8GbQkrKQdhHI=
-SHA256 (hackage/aeson-1.5.6.0.tar.gz) = 
A2HDS+PS7JRSAfAlAWk0NvvaENzFSUaUgaCEst4iv+g=
-SHA256 (hackage/aeson-1.5.6.0_1.cabal) = 
0+docvhjTJzTPrEo1sTdG/DMjXHR8yBV13RJDV9t7fg=
+SHA256 (hackage/StateVar-1.2.2.tar.gz) = 
Xks52jlWVqWYJ7AoBQiq/ccDNXmLUOXW/VJZYCYlGCU=
+SHA256 (hackage/aeson-2.0.1.0.tar.gz) = 
OlCH4r/H/ZQbQXgnORvbpj2Xvb9mprgzuZ+Frd+kl34=
 SHA256 (hackage/assoc-1.0.2.tar.gz) = 
2JiNxuhxjHo0VlFbdpyTNq7uxzDPhvxRdSR5af+PFE8=
 SHA256 (hackage/assoc-1.0.2_1.cabal) = 
qCTk9hVGmietlJ2/SQe6JYvWtFne6+wAUkx7yz9lzJ8=
 SHA256 (hackage/attoparsec-0.14.1.tar.gz) = 
hw+PgdkMKPl3wC44P8p4YX7jtboxvwtnGGrdSzatKbM=
-SHA256 (hackage/base-compat-0.11.2.tar.gz) = 
U6a1FFRC+6WkutbbK83t4X8WRkK0i8OblQFUIqOa29s=
-SHA256 (hackage/base-compat-batteries-0.11.2.tar.gz) = 
MeBmpaqWr5T+ZGWtuVnDjWOkngE1dkGqQyLHVKlNMCM=
-SHA256 (hackage/base-orphans-0.8.4.tar.gz) = 
N7K1k1bANACi1QmGJnc5PF/3BqCqv4JsEE9v4D2Tu7M=
-SHA256 (hackage/bifunctors-5.5.10.tar.gz) = 
53Kc/Ytq9c7NfdUJ5OST7sDxUih2zAzPT1gFSVwzqQ

[PATCH 3/9] Upgrade x11/xmobar 0.38->0.39

2021-10-17 Thread Greg Steuck

Running this now on amd64.

OK?

>From b428631964cd86cad125d028d16f8ce702932bbd Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sun, 17 Oct 2021 18:52:20 -0700
Subject: [PATCH 3/9] Upgrade x11/xmobar 0.38->0.39

---
 x11/xmobar/Makefile | 104 +++---
 x11/xmobar/distinfo | 204 +++-
 2 files changed, 157 insertions(+), 151 deletions(-)

diff --git a/x11/xmobar/Makefile b/x11/xmobar/Makefile
index 10ab00922ea..9d03be26e07 100644
--- a/x11/xmobar/Makefile
+++ b/x11/xmobar/Makefile
@@ -3,7 +3,7 @@
 COMMENT =  minimalistic text based status bar
 
 MODCABAL_STEM =xmobar
-MODCABAL_VERSION = 0.38
+MODCABAL_VERSION = 0.39
 CATEGORIES =   x11
 HOMEPAGE = https://xmobar.org
 
@@ -21,25 +21,25 @@ MODCABAL_FLAGS =with_xft with_mpd with_mpris 
with_inotify
 # % cd ./xmobar-0.38
 # % 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   \
+MODCABAL_MANIFEST = \
+   StateVar1.2.2   0   \
+   X11 1.10.1  0   \
X11-xft 0.3.1   0   \
adjunctions 4.4 2   \
-   aeson   1.5.6.0 1   \
+   aeson   2.0.1.0 0   \
appar   0.1.8   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   \
+   async   2.2.4   0   \
attoparsec  0.14.1  0   \
-   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   \
+   base-compat 0.12.0  0   \
+   base-compat-batteries   0.12.0  1   \
+   base-orphans0.8.5   0   \
+   base64-bytestring   1.2.1.0 0   \
basement0.0.12  1   \
-   bifunctors  5.5.11  0   \
+   bifunctors  5.5.11  1   \
blaze-builder   0.4.2.1 0   \
blaze-html  0.9.1.2 1   \
blaze-markup0.8.2.8 0   \
@@ -47,91 +47,89 @@ MODCABAL_MANIFEST   = \
cabal-doctest   1.0.8   2   \
call-stack  0.4.0   0   \
case-insensitive1.2.1.0 0   \
-   cereal  0.5.8.1 0   \
-   comonad 5.0.8   0   \
-   conduit 1.3.4.1 0   \
+   cereal  0.5.8.1 1   \
+   comonad 5.0.8   1   \
+   conduit 1.3.4.2 0   \
conduit-extra   1.3.5   0   \
connection  0.3.1   1   \
-   contravariant   1.5.3   0   \
+   contravariant   1.5.5   0   \
cookie  0.4.5   0   \
cryptonite  0.290   \
-   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   \
+   data-fix0.3.2   0   \
dbus1.2.21  0   \
-   distributive0.6.2.1 0   \
+   distributive0.6.2.1 1   \
dlist   1.0 0   \
extensible-exceptions   0.1.1.4 0   \
free5.1.7   0   \
-   hashable1.3.1.0 0   \
+   hashable1.3.4.1 0   \
hinotify0.4.1   0   \
hourglass   0.2.12  0   \
hsc2hs  0.68.7  1   \
-   http-client 0.7.8   0   \
+   http-client 0.7.9   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   \
+   indexed-traversable 0.1.1   1   \
indexed-traversable-instances   0.1 0   \
integer-logarithms  1.0.3.1 0   \
invariant   0.5.4   0   \
iproute 1.7.11  0   \
-   kan-extensions  5.2.2   0   \
-   lens5.0.1   1   \
+   kan-extensions  5.2.3   0   \
+   lens5.0.1   2   \
libmpd  0.10.0.00   \
memory  0.16.0  0   \
mime-types  0.1.0.9 0   \
-   mono-traversable1.0.15.10   \
-   network 3.1.2.1 1   \
+   mono-traversable1.0.15.30   \
+   network 3.1.2.5 0   \
network-uri 2.6.4.1 0   \
old-locale  1.0.0.7 2   \
parallel3.2.2.0 3   \
parsec-numbers  0.1.0   0   \
pem 0.2.4   0   \
-   primitive   0.7.1.0 3   \
-   profunctors 5.6.2   0   \
-   random  1.2.0   5

[PATCH 2/9] Regenerate x11/xmonad with newer dependency libraries

2021-10-17 Thread Greg Steuck

I'm running this now on amd64.

OK?

>From db2131972ba8309f84d482244b73701b342b1ebd Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Sun, 17 Oct 2021 18:47:22 -0700
Subject: [PATCH 2/9] Regenerate x11/xmonad with newer dependency libraries

Included library X11-1.10.1 has some non-trivial bug fixes.
https://hackage.haskell.org/package/X11-1.10.1/changelog
---
 x11/xmonad/Makefile | 10 +++---
 x11/xmonad/distinfo | 16 ++--
 2 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/x11/xmonad/Makefile b/x11/xmonad/Makefile
index 361408e7dde..911a6cea8ea 100644
--- a/x11/xmonad/Makefile
+++ b/x11/xmonad/Makefile
@@ -4,7 +4,8 @@ COMMENT =   tiling window manager
 
 MODCABAL_STEM =xmonad
 MODCABAL_VERSION = 0.15
-REVISION = 0
+MODCABAL_REVISION =1
+REVISION = 1
 
 PKGNAME =  ${DISTNAME}
 CATEGORIES =   x11
@@ -18,7 +19,7 @@ WANTLIB = X11 Xext Xinerama Xrandr Xss c charset 
ffi gmp \
 
 MODULES =  devel/cabal
 MODCABAL_MANIFEST = \
-   X11 1.9.2   0   \
+   X11 1.10.1  0   \
data-default0.7.1.1 0   \
data-default-class  0.1.2.0 0   \
data-default-instances-containers   0.0.1   0   \
@@ -26,13 +27,16 @@ MODCABAL_MANIFEST = \
data-default-instances-old-locale   0.0.1   0   \
dlist   1.0 0   \
extensible-exceptions   0.1.1.4 0   \
+   hsc2hs  0.68.7  1   \
old-locale  1.0.0.7 2   \
-   utf8-string 1.0.1.1 3   \
+   utf8-string 1.0.2   0   \
 
 LIB_DEPENDS =  converters/libiconv \
devel/gmp \
devel/libffi
 
+FIX_CRLF_FILES = xmonad.cabal
+
 post-install:
${INSTALL_MAN} ${WRKSRC}/man/xmonad.1 ${PREFIX}/man/man1
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/${DISTNAME}
diff --git a/x11/xmonad/distinfo b/x11/xmonad/distinfo
index 6fd50cc4e3a..bb901926202 100644
--- a/x11/xmonad/distinfo
+++ b/x11/xmonad/distinfo
@@ -1,4 +1,4 @@
-SHA256 (hackage/X11-1.9.2.tar.gz) = 
BbDZo3n0arihcDoLyxsLl8CAdkOyEHHuREkv3oi3fgQ=
+SHA256 (hackage/X11-1.10.1.tar.gz) = 
r39lnfJDAp+DLEBg11rgM8CB2Q0uDcr4IDpYnpHDQI0=
 SHA256 (hackage/data-default-0.7.1.1.tar.gz) = 
sPldJ5zXXKyqgVKgFZDcNGD3E09oQLNwUquzujyypRE=
 SHA256 (hackage/data-default-class-0.1.2.0.tar.gz) = 
TwG0I/AAw+BpqvUqNIVkplNnl/MUmLuFw9tL0tCXPlY=
 SHA256 (hackage/data-default-instances-containers-0.0.1.tar.gz) = 
pV4HrwBcmBXYLz/JXhJduCmUN3yfSnaUKIeHAdTsCBo=
@@ -6,12 +6,14 @@ SHA256 (hackage/data-default-instances-dlist-0.0.1.tar.gz) = 
fWg3Ecvwir163NWsK+g
 SHA256 (hackage/data-default-instances-old-locale-0.0.1.tar.gz) = 
YNOwKSKVjEkI178rJN32FRFmV0X3hCJ9IGdFeEsMCAI=
 SHA256 (hackage/dlist-1.0.tar.gz) = 
Fz1jcyi7Fz/MNl8w0p/0qUKSoeDlVYrrPfwR3oFRARU=
 SHA256 (hackage/extensible-exceptions-0.1.1.4.tar.gz) = 
bOXogBdgOFpAjatxtTVQ+HYp5mGyYL3CzUHGpDm244g=
+SHA256 (hackage/hsc2hs-0.68.7.tar.gz) = 
/XkV5B4+07x3UP7g6K3StPMtysi3xUTP31VCKTIjiUo=
+SHA256 (hackage/hsc2hs-0.68.7_1.cabal) = 
Sg9oYKF+fCRWRpdePCmBQWr9y2p7NVPDEAXrNkGn9Vs=
 SHA256 (hackage/old-locale-1.0.0.7.tar.gz) = 
26+L9riI+5iEVwUHkpaiPD9A7i9EnfcxL39/HeGNe1A=
 SHA256 (hackage/old-locale-1.0.0.7_2.cabal) = 
+pmL4sfgDNJqbpB1vqeQyq85Msqj6Ul61pvCA4DdaRE=
-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/utf8-string-1.0.2.tar.gz) = 
7kjeradgA3ByjEFWywAkQd53DQEhrjOmgTmp7ZwZsJo=
 SHA256 (hackage/xmonad-0.15.tar.gz) = 
SnlI5u7l40on0VREWJreOz+hreytvze5Q8/4NIOA+Sg=
-SIZE (hackage/X11-1.9.2.tar.gz) = 190757
+SHA256 (hackage/xmonad-0.15_1.cabal) = 
jafP/R0fg39FWdn2nobbWPAiIxtJlu8/yJTCi7FJEHs=
+SIZE (hackage/X11-1.10.1.tar.gz) = 192561
 SIZE (hackage/data-default-0.7.1.1.tar.gz) = 1627
 SIZE (hackage/data-default-class-0.1.2.0.tar.gz) = 2522
 SIZE (hackage/data-default-instances-containers-0.0.1.tar.gz) = 1659
@@ -19,8 +21,10 @@ SIZE (hackage/data-default-instances-dlist-0.0.1.tar.gz) = 
1503
 SIZE (hackage/data-default-instances-old-locale-0.0.1.tar.gz) = 1519
 SIZE (hackage/dlist-1.0.tar.gz) = 18667
 SIZE (hackage/extensible-exceptions-0.1.1.4.tar.gz) = 8531
+SIZE (hackage/hsc2hs-0.68.7.tar.gz) = 38630
+SIZE (hackage/hsc2hs-0.68.7_1.cabal) = 2794
 SIZE (hackage/old-locale-1.0.0.7.tar.gz) = 3384
 SIZE (hackage/old-locale-1.0.0.7_2.cabal) = 1071
-SIZE (hackage/utf8-string-1.0.1.1.tar.gz) = 8667
-SIZE (hackage/utf8-string-1.0.1.1_3.cabal) = 1151
+SIZE (hackage/utf8-string-1.0.2.tar.gz) = 10726
 SIZE (hackage/xmonad-0.15.tar.gz) = 68822
+SIZE (hackage/xmonad-0.15_1.cabal) = 5397
-- 
2.33.1

[PATCH 1/9] Upgrade cabal-bundler to the latest snapshot

2021-10-17 Thread Greg Steuck

I regenerated the rest of the patches with this patch.

OK?

>From 7872462308b4e05616d12da0c4222f49fb3fa7cc Mon Sep 17 00:00:00 2001
From: Greg Steuck 
Date: Thu, 14 Oct 2021 22:23:26 -0700
Subject: [PATCH 1/9] Upgrade cabal-bundler to the latest snapshot

This version uses the most recent Cabal library.
---
 devel/cabal-bundler/Makefile |  98 +-
 devel/cabal-bundler/distinfo | 196 +++
 2 files changed, 153 insertions(+), 141 deletions(-)

diff --git a/devel/cabal-bundler/Makefile b/devel/cabal-bundler/Makefile
index bc0f1ccc5b0..41ed604a432 100644
--- a/devel/cabal-bundler/Makefile
+++ b/devel/cabal-bundler/Makefile
@@ -3,9 +3,9 @@
 COMMENT =  use cabal solver to build standalone installation
 
 # https://github.com/phadej/cabal-extras/issues/37
-V =0.1.20210523
+V =0.1.20210825
 GH_ACCOUNT =   phadej
-GH_COMMIT =43fe572c3b6fe378be965a37a4a0e1c576296eed
+GH_COMMIT =bb82ebb7fdaa939c27762e10cb4cad49249b553f
 GH_PROJECT =   cabal-extras
 
 # Overrides cabal.port.mk which would otherwise preempt bsd.port.mk
@@ -42,80 +42,80 @@ MODCABAL_EXECUTABLES =  cabal-bundler
 # $ cd cabal-extras/cabal-bundler
 # $ cabal v2-run -w /usr/local/bin/ghc exe:cabal-bundler -- \
 #  cabal-bundler --openbsd --executable cabal-bundler -p 
../dist-newstyle/cache/plan.json
-MODCABAL_MANIFEST =\
-   Cabal   3.4.0.0 0   \
-   Glob0.10.1  0   \
+MODCABAL_MANIFEST  = \
+   Cabal   3.6.2.0 0   \
+   Glob0.10.1  1   \
QuickCheck  2.14.2  0   \
-   StateVar1.2.1   0   \
-   aeson   1.5.6.0 0   \
+   StateVar1.2.2   0   \
+   aeson   1.5.6.0 2   \
ansi-terminal   0.110   \
ansi-wl-pprint  0.6.9   2   \
assoc   1.0.2   1   \
-   async   2.2.3   0   \
-   attoparsec  0.13.2.51   \
+   async   2.2.4   0   \
+   attoparsec  0.14.1  0   \
base-compat 0.11.2  0   \
base-compat-batteries   0.11.2  0   \
-   base-orphans0.8.4   0   \
+   base-orphans0.8.5   0   \
base16-bytestring   1.0.1.0 0   \
-   bifunctors  5.5.10  0   \
-   binary-instances1.0.1   1   \
+   bifunctors  5.5.11  1   \
+   binary-instances1.0.2   0   \
binary-orphans  1.0.1   5   \
-   cabal-install-parsers   0.4.1   1   \
-   cabal-plan  0.7.2.0 0   \
+   cabal-install-parsers   0.4.3   1   \
+   cabal-plan  0.7.2.1 0   \
case-insensitive1.2.1.0 0   \
-   cborg   0.2.4.0 0   \
+   cborg   0.2.5.0 1   \
clock   0.8.2   0   \
-   colour  2.3.5   0   \
-   comonad 5.0.8   0   \
-   contravariant   1.5.3   0   \
-   cryptohash-sha256   0.11.102.0  0   \
-   data-fix0.3.1   0   \
-   distributive0.6.2.1 0   \
+   colour  2.3.6   0   \
+   comonad 5.0.8   1   \
+   contravariant   1.5.5   0   \
+   cryptohash-sha256   0.11.102.1  0   \
+   data-fix0.3.2   0   \
+   distributive0.6.2.1 1   \
dlist   1.0 0   \
edit-distance   0.2.2.1 1   \
half0.3.1   0   \
-   hashable1.3.1.0 0   \
+   hashable1.3.4.1 0   \
hsc2hs  0.68.7  1   \
-   indexed-profunctors 0.1 0   \
-   indexed-traversable 0.1.1   0   \
+   indexed-profunctors 0.1.1   0   \
+   indexed-traversable 0.1.1   1   \
indexed-traversable-instances   0.1 0   \
integer-logarithms  1.0.3.1 0   \
-   lattices2.0.2   3   \
+   lattices2.0.2   4   \
lukko   0.1.1.3 1   \
network-uri 2.6.4.1 0   \
optics-core 0.3.0.1 0   \
optics-extra0.3 2   \
-   optparse-applicative0.16.1.00   \
+   optparse-applicative0.16.1.01   \
paths   0.2.0.0 3   \
-   primitive   0.7.1.0 2   \
-   random  1.2.0   5   \
-   scientific  0.3.6.2 0   \
-   semialign   1.2 0   \
-   semigroupoids   5.3.5   0   \
-   semigroups  0.19.1  0   \
-   serialise   0.2.3.0 1   \
-   some1.0.2   0   \
+   primitive   0.7.2.0 0   \
+   random  1.2.1   0   \
+   scientific  0.3.7.0 0   \
+   semialign   1.2 1   \
+   semigroupoids   5.3.6   1   \
+   semigroups  0.19.2  0   \
+   serialise   0.2.3.0 2   \
+   some1.0.3   0   \
sop-core0.5.0.1 1   \
splitmix0.1.0.3 0   \
-   strict  0.4.0.1 0

Re: NEW: spdlog 1.9.2

2021-10-17 Thread Brad Smith

On Sat, Oct 02, 2021 at 04:45:03AM -0400, Brad Smith wrote:
> Attached is a port of spdlog.
> 
> Comment:
> super fast C++ logging library
> 
> Description:
> Super fast C++ logging library.

An updated port with a nonfunctional workaround removed, but the stdio.h
header fix I posted to tech@ needs to go in first.

spdlog.tar.gz
Description: application/tar-gz

Re: [update] samba-4.15.0

2021-10-17 Thread Jeremie Courreges-Anglas

On Sat, Oct 16 2021, Bjorn Ketelaars  wrote:
> On Mon 11/10/2021 00:33, Jeremie Courreges-Anglas wrote:
>> 
>> Hi,
>> 
>> Here's a rather straightforward update, introducing bison as a new
>> non-optional build dependency.  As usual, test reports and input
>> welcome.
>
> Building failed for me (did not use a chroot) because of version
> requirements for databases/tdb and devel/libtalloc. Diff below fixes
> this for me.

Ah, right.  Those version markers are here to help people who build from
source but I forgot about them.

> I have been running with samba-4.15.0 @home for the last couple of days
> without any issues.

Thanks for the diff and for the report!  I'll commit this soonish.

>
> --- Makefile.orig Sat Oct 16 08:47:45 2021
> +++ Makefile  Sat Oct 16 08:47:31 2021
> @@ -118,10 +118,10 @@ LIB_DEPENDS-main =  ${BUILD_PKGPATH},-ldb>=${LDB_V} 
> \
>   ${BUILD_PKGPATH},-util>=${VERSION} \
>   converters/libiconv \
>   databases/openldap \
> - databases/tdb>=1.4.3 \
> + databases/tdb>=1.4.4 \
>   devel/gettext,-runtime \
>   devel/jansson \
> - devel/libtalloc>=2.1.16 \
> + devel/libtalloc>=2.3.3 \
>   devel/libtalloc,-python \
>   devel/popt \
>   net/avahi,-libs \
> @@ -134,11 +134,11 @@ LIB_DEPENDS-ldb =   
> ${BUILD_PKGPATH},-tevent>=${TEVENT_V
>   ${BUILD_PKGPATH},-util>=${VERSION} \
>   devel/popt \
>   databases/openldap \
> - databases/tdb>=1.4.3 \
> - devel/libtalloc>=2.3.2
> + databases/tdb>=1.4.4 \
> + devel/libtalloc>=2.3.3
>  
>  LIB_DEPENDS-tevent = ${BUILD_PKGPATH},-util>=${VERSION} \
> - devel/libtalloc>=2.3.2
> + devel/libtalloc>=2.3.3
>  
>  LIB_DEPENDS-docs =
>  
>

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

Maintainer Update: games/moonlight-qt 3.1.4

2021-10-17 Thread Muhammad Kaisar Arkhan (Yuki)


Hello,

This is an update for the games/moonlight-qt port to ensure 
compatibility with newer versions of NVIDIA Experience / Gamestream.


Thanks to Matthias Erhardt for letting me know that the old version 
doesn't work anymore.


OK?

Yuki

---
 games/moonlight-qt/Makefile | 2 +-
 games/moonlight-qt/distinfo | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/games/moonlight-qt/Makefile b/games/moonlight-qt/Makefile
index c2cf22b..6070d04 100644
--- a/games/moonlight-qt/Makefile
+++ b/games/moonlight-qt/Makefile
@@ -2,7 +2,7 @@

 COMMENT =  open-source nvidia gamestream client

-V =3.0.0
+V =3.1.4
 PKGNAME =  moonlight-qt-${V}

 DISTNAME = MoonlightSrc-${V}
diff --git a/games/moonlight-qt/distinfo b/games/moonlight-qt/distinfo
index 88b86cd..4776071 100644
--- a/games/moonlight-qt/distinfo
+++ b/games/moonlight-qt/distinfo
@@ -1,2 +1,2 @@
-SHA256 (MoonlightSrc-3.0.0.tar.gz) = 
LOIcC0AcI/kxxvArn7aNTRaGdLYw+Y4HVI9p2M9pJGM=

-SIZE (MoonlightSrc-3.0.0.tar.gz) = 54759762
+SHA256 (MoonlightSrc-3.1.4.tar.gz) = 
OelZCcNiVktYIukeURIQfB4PEh1xONtiTZury2AewgQ=

+SIZE (MoonlightSrc-3.1.4.tar.gz) = 55034473
--
2.33.1

Re: [UPDATE] net/gpodder-3.10.20 -> 3.10.21

2021-10-17 Thread trondd

Rebump in case previous was mangled...

trondd  wrote:

> Post release re-submission.  Tested against a recent snapshot and the
> newest textproc/py-podcastparser (also subitted).
> 
> Improvements
> 
> #1071 narrow channel dialog
> add Strawberry player to the enqueue extension
> skip non-integer youtube formats
> use util.urlopen instead of requests.get for youtube
> save and restore channel dialog state
> 
> Bug fixes
> 
> #1065 prevent soundcloud from downloading existing episodes on each update
> #1073 fix native youtube support in Europe by automatically accepting 
> GDPR consent form
> #1084 fix native youtube support by trying new endpoint before old 
> endpoint
> #1095 fix links in About dialog on platforms without gvfs
> fix 'msgid' format string with unnamed arguments cannot be properly 
> localized warning
> fix DRM content detection for youtube episodes
> fix "gpo sync" failure
> fix soundcloud API change when adding new channels
> 
> Tim.
> 

Index: Makefile
===
RCS file: /cvs/ports/net/gpodder/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile28 Jun 2021 07:26:05 -  1.29
+++ Makefile3 Oct 2021 20:35:14 -
@@ -2,7 +2,7 @@
 
 COMMENT=   media aggregator and podcast client
 
-MODPY_EGG_VERSION= 3.10.20
+MODPY_EGG_VERSION= 3.10.21
 
 GH_ACCOUNT=gpodder
 GH_PROJECT=gpodder
Index: distinfo
===
RCS file: /cvs/ports/net/gpodder/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo28 Jun 2021 07:26:05 -  1.14
+++ distinfo3 Oct 2021 20:35:14 -
@@ -1,2 +1,2 @@
-SHA256 (gpodder-3.10.20.tar.gz) = mU9/BKMcaPs0ea0ADU6a8sDYyvAsFh7eccfCzUubyAQ=
-SIZE (gpodder-3.10.20.tar.gz) = 1081171
+SHA256 (gpodder-3.10.21.tar.gz) = AU5hneZNPj3ISTkpr4AHs8rwndd+FTv3ePFwjVWUaHg=
+SIZE (gpodder-3.10.21.tar.gz) = 1105520
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/gpodder/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST   28 Jun 2021 07:26:05 -  1.13
+++ pkg/PLIST   3 Oct 2021 20:35:14 -
@@ -334,6 +334,7 @@ share/locale/pt/LC_MESSAGES/gpodder.mo
 share/locale/pt_BR/LC_MESSAGES/gpodder.mo
 share/locale/ro/LC_MESSAGES/gpodder.mo
 share/locale/ru/LC_MESSAGES/gpodder.mo
+share/locale/sk/LC_MESSAGES/gpodder.mo
 share/locale/sv/LC_MESSAGES/gpodder.mo
 share/locale/tr/LC_MESSAGES/gpodder.mo
 share/locale/uk/LC_MESSAGES/gpodder.mo

Re: [UPDATE] textproc/py-podcastparser-0.6.6 -> 0.6.8

2021-10-17 Thread trondd

Rebump incase the previous was mangled.


trondd  wrote:

> Adds some additional xml tag parsing.  Used by net/gpodder.
> 
> Tim.
> 

Index: Makefile
===
RCS file: /cvs/ports/textproc/py-podcastparser/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile19 Feb 2021 23:13:06 -  1.12
+++ Makefile3 Oct 2021 20:34:37 -
@@ -2,11 +2,10 @@
 
 COMMENT=   simple, fast and efficient podcast parser
 
-MODPY_EGG_VERSION= 0.6.6
+MODPY_EGG_VERSION= 0.6.8
 DISTNAME=  podcastparser-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 CATEGORIES=textproc
-REVISION=  0
 
 MAINTAINER=Tim Meunier 
 
Index: distinfo
===
RCS file: /cvs/ports/textproc/py-podcastparser/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo30 Dec 2020 03:41:47 -  1.6
+++ distinfo3 Oct 2021 20:34:37 -
@@ -1,2 +1,2 @@
-SHA256 (podcastparser-0.6.6.tar.gz) = 
ow6EECAD+w60IABUZRQkWs97l1Qduk6IjRxMBrHIRFQ=
-SIZE (podcastparser-0.6.6.tar.gz) = 23482
+SHA256 (podcastparser-0.6.8.tar.gz) = 
PbA5/z/VmBfUGbENw75ZY3OQboPujcJC+g5UXUtjHcw=
+SIZE (podcastparser-0.6.8.tar.gz) = 29809

Re: [UPDATE] www/links+-2.23 -> 2.25

2021-10-17 Thread Omar Polo



"TronDD"  writes:

> Bump.
>
> On Sun Oct 3, 2021 at 4:55 PM EDT, trondd wrote:
>> Small bugfix updates.
>>
>> === RELEASE 2.25 ===
>>
>> Fri Oct 1 18:27:25 CEST 2021 mikulas:
>>
>> Delete the expired Let's encrypt certificate from the builtin
>> certificate store
>>
>> Thu Sep 30 21:45:10 CET 2021 mikulas:
>>
>> Set the flag X509_V_FLAG_TRUSTED_FIRST, so that Let's encrypt works
>> with openssl-1.0.2
>>
>> === RELEASE 2.24 ===
>>
>> Mon Sep 13 18:31:27 CEST 2021 mikulas:
>>
>> Avoid a hang in the X driver if the program that converts a selection
>> stops responding. Use 10 second timeout.
>>
>> Fri Sep 10 18:37:30 CEST 2021 mikulas:
>>
>> Fix a crash in the X driver if some window asks for clipboard and is
>> closed before Links responds to this request
>>
>> Thu Aug 19 19:54:43 CEST 2021 Emir Yasin SARI :
>>
>> Updated the Turkish translation
>>
>> Sun Jul 4 18:02:44 CEST 2021 mikulas:
>>
>> Support the "id" attribute on COLGROUP, COL, TR, THEAD, TBODY, TFOOT
>> tags
>>
>> Tim.

The patch was mangled, but I managed to update using the one from your
first submission (which I'm going to re-attach for convenience.)

compiles fine, checked lib depends and plist for both flavors,
everything is fine.

tested both flavors quickly.  I missed links+, haven't used it in ages!
It handled some pages better than I would have expected :)


Index: Makefile
===
RCS file: /home/cvs/ports/www/links+/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile28 Jun 2021 07:35:35 -  1.71
+++ Makefile17 Oct 2021 18:35:32 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.71 2021/06/28 07:35:35 sthen Exp $
 
 COMMENT=   graphics and text browser
-VER=   2.23
+VER=   2.25
 DISTNAME=  links-${VER}
 PKGNAME=   links+-${VER}
 CATEGORIES=www
Index: distinfo
===
RCS file: /home/cvs/ports/www/links+/distinfo,v
retrieving revision 1.41
diff -u -p -r1.41 distinfo
--- distinfo28 Jun 2021 07:35:35 -  1.41
+++ distinfo17 Oct 2021 18:35:52 -
@@ -1,2 +1,2 @@
-SHA256 (links-2.23.tar.gz) = 1xGL2XgWCBKfSrXlb8rB/e6s+lwvQE0py/idqrhblR0=
-SIZE (links-2.23.tar.gz) = 7111783
+SHA256 (links-2.25.tar.gz) = XAs7C4/h88hpT1+3+9sZxjJ4rGiuRkbaabSWQLICg7E=
+SIZE (links-2.25.tar.gz) = 7094185

Re: UPDATE: openimageio 2.2.18.0

2021-10-17 Thread Dimitri Karamazov

On Sat, Oct 16, 2021 at 07:54:31PM -0400, Brad Smith wrote:
> On Sat, Oct 16, 2021 at 04:11:02PM -0400, Brad Smith wrote:
> > Here is an update to openimageio 2.2.18.0.
> 
> An updated diff. Enable the HEIF support and fix the hardcoded library
> version in the PLIST.
> 
I guess you've your own reason for HEIF support since the only dependent
port (blender) I know doesn't need it, in that case know that the heif
test still fails, otherwise better to keep dependencies to a minimum.

88% tests passed, 11 tests failed out of 92

Total Test time (real) = 155.45 sec

The following tests FAILED:
 61 - texture-icwrite (Failed)
 62 - texture-icwrite.batch (Failed)
 63 - field3d-broken (Failed)
 64 - texture-field3d-broken (Failed)
 65 - texture-field3d-broken.batch (Failed)
 66 - heif (Failed)
 67 - openvdb-broken (Failed)
 68 - ptex-broken (Failed)
 75 - unit_strutil (Failed)
 81 - unit_timer (Failed)
 86 - unit_typedesc (Failed)

regards,
  Dimitri

Re: unbreak games/boswars

2021-10-17 Thread Stuart Henderson


No need, PATH is setup explicitly (see PORTPATH)

--
 Sent from a phone, apologies for poor formatting.

On 17 October 2021 14:33:03 Thomas Frohwein  wrote:


On Sun, Oct 17, 2021 at 01:40:11AM +0200, Omar Polo wrote:

Hello,

In my quest to update scons I noticed that boswars currently fails at
runtime due to invalid png files:

libpng warning: iCCP: known incorrect sRGB profile
libpng error: IDAT: invalid distance too far back
Error reading the PNG file.
Can't load the graphic `graphics/ui/ui_minimap.png'

This is an attempt at fixing the images using optipng (I think pngcrush
could also be used, but optipng is what I had available.)  It makes the
build a bit longer but the game seems playable again.  The exact list of
broken PNGs is a courtesy of haikuports :)

https://github.com/haikuports/haikuports/blob/master/games-strategy/boswars/boswars-2.7.recipe#L66


This fixes boswars for me, too. I think that's an acceptable solution
for now for a port with no new versions since 2013 per HOMEPAGE. I
wonder if other aging, unmaintained games will run into similar
issues...



OK?


See comment about the command inline below; with or without that
suggestion ok thfr@..



P.S.: portcheck complaints are not due this patch

P.P.S: if you're bothered by the c++ warning 'optimization flag ... is
   not supported' I'm addressing that in a following patch to build
   it with scons 4


No significant issues in P.S. and P.P.S. for the moment, so that's fine
with me.




Index: Makefile
===
RCS file: /home/cvs/ports/games/boswars/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile12 Jul 2019 20:46:15 -  1.26
+++ Makefile16 Oct 2021 23:33:22 -
@@ -7,7 +7,7 @@ DISTNAME=   boswars-${V}-src
 PKGNAME=   boswars-${V}
 CATEGORIES=games x11
 MASTER_SITES=  http://www.boswars.org/dist/releases/
-REVISION=  1
+REVISION=  2

 HOMEPAGE=  http://www.boswars.org/

@@ -24,7 +24,8 @@ MODULES=  devel/scons \
 MODSCONS_FLAGS=CPPPATH="${LOCALBASE}/include ${X11BASE}/include" \
opengl=1

-BUILD_DEPENDS= devel/sdl-image
+BUILD_DEPENDS= devel/sdl-image \
+   graphics/optipng
 LIB_DEPENDS=   devel/sdl \
multimedia/libtheora \
audio/libvorbis \
@@ -34,6 +35,12 @@ LIB_DEPENDS= devel/sdl \
 NO_TEST=   Yes

 DATA_DIR=  campaigns graphics intro languages maps patches scripts sounds 
units
+
+post-extract:
+.for f in maps/antarticum.map/terrain.png graphics/ui/ui_*.png \
+   units/radar/radar*.png units/tree*/tree*.png
+   optipng -force -fix ${WRKSRC}/${f}


With something less commonly used in LOCALBASE, maybe absolute path
will grant a small protection to builders from stray commands in PATH?

${LOCALBASE}/bin/optipng -force -fix ${WRKSRC}/${f}


+.endfor

 pre-configure:
@${SUBST_CMD} ${WRKSRC}/SConstruct \

aarch64 bulk build report

2021-10-17 Thread phessler

bulk build on arm64.ports.openbsd.org
started on  Fri Oct 15 08:27:09 MDT 2021
finished at Sun Oct 17 11:44:40 MDT 2021
lasted 2D03h17m
done with kern.version=OpenBSD 7.0-current (GENERIC.MP) #1352: Fri Oct 15 
05:13:30 MDT 2021

built packages:11101
Oct 15:3898
Oct 16:2122
Oct 17:5080


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

build failures: 14
http://build-failures.rhaalovely.net/aarch64/2021-10-15/comms/gnuradio.log
http://build-failures.rhaalovely.net/aarch64/2021-10-15/devel/dtools.log
http://build-failures.rhaalovely.net/aarch64/2021-10-15/editors/micro.log
http://build-failures.rhaalovely.net/aarch64/2021-10-15/emulators/mgba,-libretro.log
http://build-failures.rhaalovely.net/aarch64/2021-10-15/games/shockolate.log
http://build-failures.rhaalovely.net/aarch64/2021-10-15/graphics/gmic.log
http://build-failures.rhaalovely.net/aarch64/2021-10-15/graphics/simgear.log
http://build-failures.rhaalovely.net/aarch64/2021-10-15/sysutils/gitlab-runner.log
http://build-failures.rhaalovely.net/aarch64/2021-10-15/sysutils/rundeck.log
http://build-failures.rhaalovely.net/aarch64/2021-10-15/sysutils/telegraf.log
http://build-failures.rhaalovely.net/aarch64/2021-10-15/www/iridium.log
http://build-failures.rhaalovely.net/aarch64/2021-10-15/www/seamonkey,-lightning.log
http://build-failures.rhaalovely.net/aarch64/2021-10-15/www/varnish.log
http://build-failures.rhaalovely.net/aarch64/2021-10-15/x11/gnome/grilo.log

recurrent failures
 failures/comms/gnuradio.log
 failures/editors/micro.log
 failures/games/shockolate.log
 failures/graphics/gmic.log
 failures/graphics/simgear.log
 failures/sysutils/gitlab-runner.log
 failures/sysutils/rundeck.log
 failures/sysutils/telegraf.log
 failures/www/seamonkey,-lightning.log
 failures/x11/gnome/grilo.log
new failures
+++ ls-failures Sun Oct 17 11:44:51 2021
+failures/devel/dtools.log
+failures/emulators/mgba,-libretro.log
+failures/www/iridium.log
+failures/www/varnish.log
resolved failures
--- ../old/aarch64/last//ls-failuresMon Oct 11 09:52:31 2021
-failures/lang/pcc/pcc.log
-failures/net/tailscale.log

MAINTAINER UPDATE: net/swirc: 3.3.1 -> 3.3.2

2021-10-17 Thread Markus Uhlin

Hi ports@,

Here comes an update for net/swirc:

## [3.3.2] - 2021-10-17 ##
- **Added** command line option `-j`
- **Added** function `getuser()` and made use of it
- **Added** null checks
- **Added** the following command aliases:
  - `/j` (`/join`)
  - `/p` (`/part`)
- **Added** the following commands:
  - `/ignore`
  - `/unignore`
- **Fixed** unchecked return values
- Made improvements to the following files:
  - `commands/connect.c`
  - `events/channel.cpp`
  - `events/misc.cpp`
  - `events/notice.cpp`
  - `events/privmsg.cpp`
  - `events/welcome.cpp`
  - `events/whois.cpp`
  - `dataClassify.c`
  - `log.c`
  - `nestHome.c`
- Reformatted and reindented files
- **Rewrote** the `/join` and `/part` commands in C++
- **Updated** the translations

I attach a diff.

Markus

Index: Makefile
===
RCS file: /cvs/ports/net/swirc/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile	13 Sep 2021 17:06:45 -	1.13
+++ Makefile	17 Oct 2021 14:41:05 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.13 2021/09/13 17:06:45 solene Exp $
 
 COMMENT =	curses icb and irc client
-DISTNAME =	swirc-3.3.1
+DISTNAME =	swirc-3.3.2
 CATEGORIES =	net
 HOMEPAGE =	https://www.nifty-networks.net/swirc/
 
Index: distinfo
===
RCS file: /cvs/ports/net/swirc/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo	13 Sep 2021 17:06:45 -	1.12
+++ distinfo	17 Oct 2021 14:41:05 -
@@ -1,2 +1,2 @@
-SHA256 (swirc-3.3.1.tgz) = YGbT4xu415MJiVhveoreCgSQG8d77+K89Y2ZaJ0wRoU=
-SIZE (swirc-3.3.1.tgz) = 253839
+SHA256 (swirc-3.3.2.tgz) = nGGirR8x0lTA7Btku78LQtVUy1i0A3m/PcdOzOHSTHA=
+SIZE (swirc-3.3.2.tgz) = 257424

Re: [UPDATE] net/gpodder-3.10.20 -> 3.10.21

2021-10-17 Thread TronDD

Bump.


On Sun Oct 3, 2021 at 5:13 PM EDT, trondd wrote:
> Post release re-submission. Tested against a recent snapshot and the
> newest textproc/py-podcastparser (also subitted).
>
> Improvements
>
> #1071 narrow channel dialog
> add Strawberry player to the enqueue extension
> skip non-integer youtube formats
> use util.urlopen instead of requests.get for youtube
> save and restore channel dialog state
>
> Bug fixes
>
> #1065 prevent soundcloud from downloading existing episodes on each
> update
> #1073 fix native youtube support in Europe by automatically accepting
> GDPR consent form
> #1084 fix native youtube support by trying new endpoint before old
> endpoint
> #1095 fix links in About dialog on platforms without gvfs
> fix 'msgid' format string with unnamed arguments cannot be properly
> localized warning
> fix DRM content detection for youtube episodes
> fix "gpo sync" failure
> fix soundcloud API change when adding new channels
>
> Tim.
>

Index: Makefile
===
RCS file: /cvs/ports/net/gpodder/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- Makefile 28 Jun 2021 07:26:05 - 1.29
+++ Makefile 3 Oct 2021 20:35:14 -
@@ -2,7 +2,7 @@
 
COMMENT= media aggregator and podcast client
 
-MODPY_EGG_VERSION= 3.10.20
+MODPY_EGG_VERSION= 3.10.21
 
GH_ACCOUNT= gpodder
GH_PROJECT= gpodder
Index: distinfo
===
RCS file: /cvs/ports/net/gpodder/distinfo,v
retrieving revision 1.14
diff -u -p -r1.14 distinfo
--- distinfo 28 Jun 2021 07:26:05 - 1.14
+++ distinfo 3 Oct 2021 20:35:14 -
@@ -1,2 +1,2 @@
-SHA256 (gpodder-3.10.20.tar.gz) =
mU9/BKMcaPs0ea0ADU6a8sDYyvAsFh7eccfCzUubyAQ=
-SIZE (gpodder-3.10.20.tar.gz) = 1081171
+SHA256 (gpodder-3.10.21.tar.gz) =
AU5hneZNPj3ISTkpr4AHs8rwndd+FTv3ePFwjVWUaHg=
+SIZE (gpodder-3.10.21.tar.gz) = 1105520
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/gpodder/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 28 Jun 2021 07:26:05 - 1.13
+++ pkg/PLIST 3 Oct 2021 20:35:14 -
@@ -334,6 +334,7 @@ share/locale/pt/LC_MESSAGES/gpodder.mo
share/locale/pt_BR/LC_MESSAGES/gpodder.mo
share/locale/ro/LC_MESSAGES/gpodder.mo
share/locale/ru/LC_MESSAGES/gpodder.mo
+share/locale/sk/LC_MESSAGES/gpodder.mo
share/locale/sv/LC_MESSAGES/gpodder.mo
share/locale/tr/LC_MESSAGES/gpodder.mo
share/locale/uk/LC_MESSAGES/gpodder.mo

Re: [UPDATE] textproc/py-podcastparser-0.6.6 -> 0.6.8

2021-10-17 Thread TronDD

Bump.

On Sun Oct 3, 2021 at 5:05 PM EDT, trondd wrote:
> Adds some additional xml tag parsing. Used by net/gpodder.
>
> Tim.
>

Index: Makefile
===
RCS file: /cvs/ports/textproc/py-podcastparser/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile 19 Feb 2021 23:13:06 - 1.12
+++ Makefile 3 Oct 2021 20:34:37 -
@@ -2,11 +2,10 @@
 
COMMENT= simple, fast and efficient podcast parser
 
-MODPY_EGG_VERSION= 0.6.6
+MODPY_EGG_VERSION= 0.6.8
DISTNAME= podcastparser-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
CATEGORIES= textproc
-REVISION= 0
 
MAINTAINER= Tim Meunier 
 
Index: distinfo
===
RCS file: /cvs/ports/textproc/py-podcastparser/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 30 Dec 2020 03:41:47 - 1.6
+++ distinfo 3 Oct 2021 20:34:37 -
@@ -1,2 +1,2 @@
-SHA256 (podcastparser-0.6.6.tar.gz) =
ow6EECAD+w60IABUZRQkWs97l1Qduk6IjRxMBrHIRFQ=
-SIZE (podcastparser-0.6.6.tar.gz) = 23482
+SHA256 (podcastparser-0.6.8.tar.gz) =
PbA5/z/VmBfUGbENw75ZY3OQboPujcJC+g5UXUtjHcw=
+SIZE (podcastparser-0.6.8.tar.gz) = 29809

Re: [UPDATE] www/links+-2.23 -> 2.25

2021-10-17 Thread TronDD

Bump.

On Sun Oct 3, 2021 at 4:55 PM EDT, trondd wrote:
> Small bugfix updates.
>
> === RELEASE 2.25 ===
>
> Fri Oct 1 18:27:25 CEST 2021 mikulas:
>
> Delete the expired Let's encrypt certificate from the builtin
> certificate store
>
> Thu Sep 30 21:45:10 CET 2021 mikulas:
>
> Set the flag X509_V_FLAG_TRUSTED_FIRST, so that Let's encrypt works
> with openssl-1.0.2
>
> === RELEASE 2.24 ===
>
> Mon Sep 13 18:31:27 CEST 2021 mikulas:
>
> Avoid a hang in the X driver if the program that converts a selection
> stops responding. Use 10 second timeout.
>
> Fri Sep 10 18:37:30 CEST 2021 mikulas:
>
> Fix a crash in the X driver if some window asks for clipboard and is
> closed before Links responds to this request
>
> Thu Aug 19 19:54:43 CEST 2021 Emir Yasin SARI :
>
> Updated the Turkish translation
>
> Sun Jul 4 18:02:44 CEST 2021 mikulas:
>
> Support the "id" attribute on COLGROUP, COL, TR, THEAD, TBODY, TFOOT
> tags
>
> Tim.
>

Index: Makefile
===
RCS file: /cvs/ports/www/links+/Makefile,v
retrieving revision 1.71
diff -u -p -r1.71 Makefile
--- Makefile 28 Jun 2021 07:35:35 - 1.71
+++ Makefile 3 Oct 2021 20:10:36 -
@@ -1,7 +1,7 @@
# $OpenBSD: Makefile,v 1.71 2021/06/28 07:35:35 sthen Exp $
 
COMMENT= graphics and text browser
-VER= 2.23
+VER= 2.25
DISTNAME= links-${VER}
PKGNAME= links+-${VER}
CATEGORIES= www
Index: distinfo
===
RCS file: /cvs/ports/www/links+/distinfo,v
retrieving revision 1.41
diff -u -p -r1.41 distinfo
--- distinfo 28 Jun 2021 07:35:35 - 1.41
+++ distinfo 3 Oct 2021 20:10:36 -
@@ -1,2 +1,2 @@
-SHA256 (links-2.23.tar.gz) =
1xGL2XgWCBKfSrXlb8rB/e6s+lwvQE0py/idqrhblR0=
-SIZE (links-2.23.tar.gz) = 7111783
+SHA256 (links-2.25.tar.gz) =
XAs7C4/h88hpT1+3+9sZxjJ4rGiuRkbaabSWQLICg7E=
+SIZE (links-2.25.tar.gz) = 7094185

Re: NEW PORT: pngcheck

2021-10-17 Thread Thomas Frohwein

On Sun, Oct 17, 2021 at 09:06:11AM -0400, Josh Grosse wrote:
> On Sun, Oct 17, 2021 at 11:03:38AM +0200, Marc Espie wrote:
> > Compiles out of the box, a bit of love to the man pages
> > (upstreamed)
> > 
> > seems to work just fine, verifies correct pngs, and errors out properly
> > on truncated ones
> 
> Works for me on amd64 with .png files.  I don't have the other forms of
> *ng files to test. 
> 
> There's trailing whitespace on two lines in pkg/DESCR.
> 

Builds and seems to work fine here, too. I actually found a .mng file
`mgp.mng` that is part of misc/magicpoint port. It passes the test like
my local .png files do:

$ pngcheck /usr/local/share/doc/mgp/sample/mgp.mng
OK: /usr/local/share/doc/mgp/sample/mgp.mng (550x150, 183 chunks, VLC).

port is ok thfr@ (would remove the above-mentioned trailing whitespace
before commit, of course)

Re: NEW: devel/arm-compute-library

2021-10-17 Thread Kevin Lo

On Sat, Oct 16, 2021 at 04:40:18PM +0100, Stuart Henderson wrote:
> 
> On 2021/10/16 20:33, Kevin Lo wrote:
> > On Fri, Oct 15, 2021 at 11:35:33AM +0100, Stuart Henderson wrote:
> > > 
> > > On 2021/10/15 13:57, Kevin Lo wrote:
> > > > Hi,
> > > > 
> > > > Attached is a port of arm-compute-library 21.08.
> > > > 
> > > > Comment:
> > > > Arm compute library
> > > > 
> > > > Description:
> > > > Arm Compute Library is a software library for computer vision and 
> > > > machine
> > > > learning.  It is a collection of low-level functions optimized for Arm 
> > > > CPU
> > > > and GPU architectures targeted at image processing, computer vision, and
> > > > machine learning.
> > > > 
> > > > Tested on arm64(RockPro64).
> > > > OK?
> > > 
> > > scons.port.mk should be passing in CC/CXX anyway so the patches to
> > > default_c_compiler/default_cpp_compiler _ought_ not to be necessary
> > > (and if they are, it's indicating that something isn't working
> > > correctly with scons.port.mk)
> > 
> > Thanks for the comments.  I removed a patch about default_c_compiler /
> > default_cpp_compiler, here's the revised tarball, thanks.
> 
> OK sthen@.
> 
> I do think MAKE_ENV should not be necessary, but I think there is
> something wrong with scons.port.mk so I am ok with this as a workaround.

Thanks.  I'm not sure if there's something wrong with scons.port.mk, but it
seems to me there are ports such as emulators/fceux and games/dangerdeep 
that use MAKE_ENV.

> One thing I looked at when reviewing - often software uses "native
> build" to mean "use CPU features detected from the build machine"
> (-march=native compiler flag) so I wanted to check that it wasn't the
> case here - aarch64 builds are done on eMAG boxes, cpu "Applied Micro
> X-Gene r3p2" so I wanted to make sure it doesn't use some fancy
> feature which isn't available on other machines. So it might be
> worth a little comment e.g.
> 
> # "build=native" here just means "not cross-compiled"

Attached is a new version of arm-compute-library which doesn't set CC/CXX
in MAKE_ENV and adds a comment on the build option.


arm-compute-library.tgz
Description: application/tar-gz

Re: unbreak games/boswars

2021-10-17 Thread Omar Polo

Thomas Frohwein  writes:

> On Sun, Oct 17, 2021 at 01:40:11AM +0200, Omar Polo wrote:
>> Hello,
>> 
>> In my quest to update scons I noticed that boswars currently fails at
>> runtime due to invalid png files:
>> 
>> libpng warning: iCCP: known incorrect sRGB profile
>> libpng error: IDAT: invalid distance too far back
>> Error reading the PNG file.
>> Can't load the graphic `graphics/ui/ui_minimap.png'
>> 
>> This is an attempt at fixing the images using optipng (I think pngcrush
>> could also be used, but optipng is what I had available.)  It makes the
>> build a bit longer but the game seems playable again.  The exact list of
>> broken PNGs is a courtesy of haikuports :)
>> 
>> https://github.com/haikuports/haikuports/blob/master/games-strategy/boswars/boswars-2.7.recipe#L66
>
> This fixes boswars for me, too. I think that's an acceptable solution
> for now for a port with no new versions since 2013 per HOMEPAGE. I
> wonder if other aging, unmaintained games will run into similar
> issues...

I don't know how widespread are PNGs like that, but in the future we may
use espie' new port pngcheck: it includes an utility to check for
malformed jpegs and pngs, as well as a png-fix-IDAT-windowsize that
fixes this kinds of errors and is slightly faster than optipng.  I've
sent a diff to the pngcheck authors that adds an `-inline' flag that
would be so handy in these cases.

> [...]
>> +
>> +post-extract:
>> +.for f in maps/antarticum.map/terrain.png graphics/ui/ui_*.png \
>> +units/radar/radar*.png units/tree*/tree*.png
>> +optipng -force -fix ${WRKSRC}/${f}
>
> With something less commonly used in LOCALBASE, maybe absolute path
> will grant a small protection to builders from stray commands in PATH?
>
> ${LOCALBASE}/bin/optipng -force -fix ${WRKSRC}/${f}

Yep, I haven't thought about that.  sthen@ already committed this diff,
so I'll address this in a future diff.

Thanks!

Re: [UPDATE] audio/ncspot to 0.9.0

2021-10-17 Thread Henrik Friedrichsen

On Sun, Oct 17, 2021 at 01:35:56PM +, Klemens Nanni wrote:
> crates.inc already exists, so this diff is bogus.

Not sure what happened there. Here is another diff.Index: Makefile
===
RCS file: /cvs/ports/audio/ncspot/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile30 Aug 2021 12:43:52 -  1.19
+++ Makefile17 Oct 2021 13:42:04 -
@@ -6,7 +6,7 @@ COMMENT =   ncurses Spotify client
 
 GH_ACCOUNT =   hrkfdn
 GH_PROJECT =   ncspot
-GH_TAGNAME =   v0.8.2
+GH_TAGNAME =   v0.9.0
 
 CATEGORIES =   audio
 
Index: crates.inc
===
RCS file: /cvs/ports/audio/ncspot/crates.inc,v
retrieving revision 1.1
diff -u -p -r1.1 crates.inc
--- crates.inc  30 Aug 2021 12:43:52 -  1.1
+++ crates.inc  17 Oct 2021 13:42:04 -
@@ -1,5 +1,4 @@
-# $OpenBSD: crates.inc,v 1.1 2021/08/30 12:43:52 kn Exp $
-
+# $OpenBSD$
 MODCARGO_CRATES += addr2line   0.16.0  # Apache-2.0/MIT
 MODCARGO_CRATES += adler   1.0.2   # 0BSD OR MIT OR Apache-2.0
 MODCARGO_CRATES += aes 0.6.0   # MIT OR Apache-2.0
@@ -23,34 +22,34 @@ MODCARGO_CRATES +=  backtrace   0.3.61  # MI
 MODCARGO_CRATES += base64  0.10.1  # MIT/Apache-2.0
 MODCARGO_CRATES += base64  0.13.0  # MIT/Apache-2.0
 MODCARGO_CRATES += bindgen 0.56.0  # BSD-3-Clause
-MODCARGO_CRATES += bitflags0.9.1   # MIT/Apache-2.0
-MODCARGO_CRATES += bitflags1.2.1   # MIT/Apache-2.0
+MODCARGO_CRATES += bitflags1.3.2   # MIT/Apache-2.0
 MODCARGO_CRATES += blake2b_simd0.5.11  # MIT
 MODCARGO_CRATES += block   0.1.6   # MIT
 MODCARGO_CRATES += block-buffer0.9.0   # MIT OR Apache-2.0
-MODCARGO_CRATES += bumpalo 3.7.0   # MIT/Apache-2.0
+MODCARGO_CRATES += bumpalo 3.7.1   # MIT/Apache-2.0
 MODCARGO_CRATES += byteorder   1.4.3   # Unlicense OR MIT
 MODCARGO_CRATES += bytes   0.4.12  # MIT
 MODCARGO_CRATES += bytes   0.5.6   # MIT
 MODCARGO_CRATES += bytes   1.1.0   # MIT
 MODCARGO_CRATES += cache-padded1.1.1   # Apache-2.0 OR MIT
-MODCARGO_CRATES += cc  1.0.69  # MIT/Apache-2.0
+MODCARGO_CRATES += cc  1.0.71  # MIT/Apache-2.0
 MODCARGO_CRATES += cesu8   1.1.0   # Apache-2.0/MIT
 MODCARGO_CRATES += cexpr   0.4.0   # Apache-2.0/MIT
 MODCARGO_CRATES += cfg-if  0.1.10  # MIT/Apache-2.0
 MODCARGO_CRATES += cfg-if  1.0.0   # MIT/Apache-2.0
 MODCARGO_CRATES += chrono  0.4.19  # MIT/Apache-2.0
 MODCARGO_CRATES += cipher  0.2.5   # MIT OR Apache-2.0
-MODCARGO_CRATES += clang-sys   1.2.1   # Apache-2.0
+MODCARGO_CRATES += clang-sys   1.2.2   # Apache-2.0
 MODCARGO_CRATES += clap2.33.3  # MIT
 MODCARGO_CRATES += clipboard   0.5.0   # MIT / Apache-2.0
 MODCARGO_CRATES += clipboard-win   2.2.0   # MIT
 MODCARGO_CRATES += cloudabi0.0.3   # BSD-2-Clause
 MODCARGO_CRATES += combine 4.6.1   # MIT
 MODCARGO_CRATES += concurrent-queue1.2.2   # Apache-2.0 OR MIT
+MODCARGO_CRATES += const-sha1  0.2.0   # Apache-2.0/MIT
 MODCARGO_CRATES += constant_time_eq0.1.5   # CC0-1.0
-MODCARGO_CRATES += core-foundation 0.9.1   # MIT / Apache-2.0
-MODCARGO_CRATES += core-foundation-sys 0.8.2   # MIT / Apache-2.0
+MODCARGO_CRATES += core-foundation 0.9.2   # MIT / Apache-2.0
+MODCARGO_CRATES += core-foundation-sys 0.8.3   # MIT / Apache-2.0
 MODCARGO_CRATES += coreaudio-rs0.10.0  # MIT/Apache-2.0
 MODCARGO_CRATES += coreaudio-sys   0.2.8   # MIT
 MODCARGO_CRATES += cpal0.13.4  # Apache-2.0
@@ -67,8 +66,8 @@ MODCARGO_CRATES +=darling_core0.9.0   # 
 MODCARGO_CRATES += darling_core0.10.2  # MIT
 MODCARGO_CRATES += darling_macro   0.9.0   # MIT
 MODCARGO_CRATES += darling_macro   0.10.2  # MIT
-MODCARGO_CRATES += dbus0.9.3   # Apache-2.0/MIT
-MODCARGO_CRATES += dbus-tree   0.9.1   # Apache-2.0/MIT
+MODCARGO_CRATES += dbus0.9.5   # Apache-2.0/MIT
+MODCARGO_CRATES += dbus-tree   0.9.2   # Apache-2.0/MIT
 MODCARGO_CRATES += derivative  2.2.0   # MIT/Apache-2.0
 MODCARGO_CRATES += derive_builder  0.7.2   # MIT/Apache-2.0
 MODCARGO_CRATES += derive_builder_core 0.5.0   # MIT/Apache-2.0
@@ -96,31 +95,31 @@ MODCARGO_CRATES +=  fuchsia-cprng   0.1.1   #
 MODCARGO_CRATES += fuchsia-zircon  0.3.3   # BSD-3-Clause
 MODCARGO_CRATES += fuchsia-zircon-sys  0.3.3   # BSD-3-Clause
 MODCARGO_CRATES += futures 0.1.31  # MIT/Apache-2.0
-MODCARGO_CRATES += futures 0.3.16  # MIT OR Apache-2.0
-MODCARGO_CRATES += futures-channel 0.3.16  # MIT OR Apache-2.0
-MODCARGO_CRATES += futures-core0.3.16  # MIT OR Apache-2.0
-MODCARGO_CRATES += futures-executor0.3.16  # MIT OR Apache-2.0
-MODCARGO_CRATES += futures-io  0.3.16  # MIT OR

Re: [UPDATE] audio/ncspot to 0.9.0

2021-10-17 Thread Klemens Nanni

On Sun, Oct 17, 2021 at 02:01:40PM +0200, Henrik Friedrichsen wrote:
> Attached diff updates ncspot to 0.9.0
> 
> Changelog:
> 
> Maintenance
> - Sort library after saving an album (#428)
> - Add scoop instruction for installation (#602)
> - Update librespot to 0.3.0, see also release notes
> 
> Features
> - Add command to show recommendations (#593)
> - Enable binding multiple commands to a key (#598)
> - Add "Share album" contextmenu entry (#606)
> - Add redraw command and bind to CTRL+L (#609)
> - Add initial_screen config variable (#616)
> - Add userRating entity to MPRIS metadata, with 0 and 1 corresponding to 
> unliked/liked in Spotify (#624)
> 
> OK?

> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/ncspot/Makefile,v
> retrieving revision 1.19
> diff -u -p -r1.19 Makefile
> --- Makefile  30 Aug 2021 12:43:52 -  1.19
> +++ Makefile  17 Oct 2021 11:41:02 -
> @@ -6,7 +6,7 @@ COMMENT = ncurses Spotify client
>  
>  GH_ACCOUNT = hrkfdn
>  GH_PROJECT = ncspot
> -GH_TAGNAME = v0.8.2
> +GH_TAGNAME = v0.9.0
>  
>  CATEGORIES = audio
>  
> Index: crates.inc
> ===
> RCS file: crates.inc
> diff -N crates.inc
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ crates.inc17 Oct 2021 11:41:02 -

crates.inc already exists, so this diff is bogus.

Re: unbreak games/boswars

2021-10-17 Thread Thomas Frohwein

On Sun, Oct 17, 2021 at 01:40:11AM +0200, Omar Polo wrote:
> Hello,
> 
> In my quest to update scons I noticed that boswars currently fails at
> runtime due to invalid png files:
> 
> libpng warning: iCCP: known incorrect sRGB profile
> libpng error: IDAT: invalid distance too far back
> Error reading the PNG file.
> Can't load the graphic `graphics/ui/ui_minimap.png'
> 
> This is an attempt at fixing the images using optipng (I think pngcrush
> could also be used, but optipng is what I had available.)  It makes the
> build a bit longer but the game seems playable again.  The exact list of
> broken PNGs is a courtesy of haikuports :)
> 
> https://github.com/haikuports/haikuports/blob/master/games-strategy/boswars/boswars-2.7.recipe#L66

This fixes boswars for me, too. I think that's an acceptable solution
for now for a port with no new versions since 2013 per HOMEPAGE. I
wonder if other aging, unmaintained games will run into similar
issues...

> 
> OK?

See comment about the command inline below; with or without that
suggestion ok thfr@..

> 
> P.S.: portcheck complaints are not due this patch
> 
> P.P.S: if you're bothered by the c++ warning 'optimization flag ... is
>not supported' I'm addressing that in a following patch to build
>it with scons 4

No significant issues in P.S. and P.P.S. for the moment, so that's fine
with me.

> 
> 
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/games/boswars/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- Makefile  12 Jul 2019 20:46:15 -  1.26
> +++ Makefile  16 Oct 2021 23:33:22 -
> @@ -7,7 +7,7 @@ DISTNAME= boswars-${V}-src
>  PKGNAME= boswars-${V}
>  CATEGORIES=  games x11
>  MASTER_SITES=http://www.boswars.org/dist/releases/
> -REVISION=1
> +REVISION=2
>  
>  HOMEPAGE=http://www.boswars.org/
>  
> @@ -24,7 +24,8 @@ MODULES=devel/scons \
>  MODSCONS_FLAGS=  CPPPATH="${LOCALBASE}/include ${X11BASE}/include" \
>   opengl=1
>  
> -BUILD_DEPENDS=   devel/sdl-image
> +BUILD_DEPENDS=   devel/sdl-image \
> + graphics/optipng
>  LIB_DEPENDS= devel/sdl \
>   multimedia/libtheora \
>   audio/libvorbis \
> @@ -34,6 +35,12 @@ LIB_DEPENDS=   devel/sdl \
>  NO_TEST= Yes
>  
>  DATA_DIR=campaigns graphics intro languages maps patches scripts sounds 
> units
> +
> +post-extract:
> +.for f in maps/antarticum.map/terrain.png graphics/ui/ui_*.png \
> + units/radar/radar*.png units/tree*/tree*.png
> + optipng -force -fix ${WRKSRC}/${f}

With something less commonly used in LOCALBASE, maybe absolute path
will grant a small protection to builders from stray commands in PATH?

${LOCALBASE}/bin/optipng -force -fix ${WRKSRC}/${f}

> +.endfor
>  
>  pre-configure:
>   @${SUBST_CMD} ${WRKSRC}/SConstruct \
>

Re: NEW PORT: pngcheck

2021-10-17 Thread Josh Grosse

On Sun, Oct 17, 2021 at 11:03:38AM +0200, Marc Espie wrote:
> Compiles out of the box, a bit of love to the man pages
> (upstreamed)
> 
> seems to work just fine, verifies correct pngs, and errors out properly
> on truncated ones

Works for me on amd64 with .png files.  I don't have the other forms of
*ng files to test. 

There's trailing whitespace on two lines in pkg/DESCR.

[UPDATE] audio/ncspot to 0.9.0

2021-10-17 Thread Henrik Friedrichsen

Attached diff updates ncspot to 0.9.0

Changelog:

Maintenance
- Sort library after saving an album (#428)
- Add scoop instruction for installation (#602)
- Update librespot to 0.3.0, see also release notes

Features
- Add command to show recommendations (#593)
- Enable binding multiple commands to a key (#598)
- Add "Share album" contextmenu entry (#606)
- Add redraw command and bind to CTRL+L (#609)
- Add initial_screen config variable (#616)
- Add userRating entity to MPRIS metadata, with 0 and 1 corresponding to 
unliked/liked in Spotify (#624)

OK?Index: Makefile
===
RCS file: /cvs/ports/audio/ncspot/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile30 Aug 2021 12:43:52 -  1.19
+++ Makefile17 Oct 2021 11:41:02 -
@@ -6,7 +6,7 @@ COMMENT =   ncurses Spotify client
 
 GH_ACCOUNT =   hrkfdn
 GH_PROJECT =   ncspot
-GH_TAGNAME =   v0.8.2
+GH_TAGNAME =   v0.9.0
 
 CATEGORIES =   audio
 
Index: crates.inc
===
RCS file: crates.inc
diff -N crates.inc
--- /dev/null   1 Jan 1970 00:00:00 -
+++ crates.inc  17 Oct 2021 11:41:02 -
@@ -0,0 +1,408 @@
+# $OpenBSD$
+MODCARGO_CRATES += addr2line   0.16.0  # Apache-2.0/MIT
+MODCARGO_CRATES += adler   1.0.2   # 0BSD OR MIT OR Apache-2.0
+MODCARGO_CRATES += aes 0.6.0   # MIT OR Apache-2.0
+MODCARGO_CRATES += aes-ctr 0.6.0   # MIT OR Apache-2.0
+MODCARGO_CRATES += aes-soft0.6.4   # MIT OR Apache-2.0
+MODCARGO_CRATES += aesni   0.10.0  # MIT OR Apache-2.0
+MODCARGO_CRATES += ahash   0.6.3   # MIT OR Apache-2.0
+MODCARGO_CRATES += aho-corasick0.7.18  # Unlicense/MIT
+MODCARGO_CRATES += alsa0.5.0   # Apache-2.0/MIT
+MODCARGO_CRATES += alsa-sys0.3.1   # MIT
+MODCARGO_CRATES += ansi_term   0.11.0  # MIT
+MODCARGO_CRATES += array-macro 1.0.5   # MIT/Apache-2.0
+MODCARGO_CRATES += arrayref0.3.6   # BSD-2-Clause
+MODCARGO_CRATES += arrayvec0.5.2   # MIT/Apache-2.0
+MODCARGO_CRATES += async-io1.6.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += async-trait 0.1.51  # MIT OR Apache-2.0
+MODCARGO_CRATES += atty0.2.14  # MIT
+MODCARGO_CRATES += autocfg 0.1.7   # Apache-2.0/MIT
+MODCARGO_CRATES += autocfg 1.0.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += backtrace   0.3.61  # MIT/Apache-2.0
+MODCARGO_CRATES += base64  0.10.1  # MIT/Apache-2.0
+MODCARGO_CRATES += base64  0.13.0  # MIT/Apache-2.0
+MODCARGO_CRATES += bindgen 0.56.0  # BSD-3-Clause
+MODCARGO_CRATES += bitflags1.3.2   # MIT/Apache-2.0
+MODCARGO_CRATES += blake2b_simd0.5.11  # MIT
+MODCARGO_CRATES += block   0.1.6   # MIT
+MODCARGO_CRATES += block-buffer0.9.0   # MIT OR Apache-2.0
+MODCARGO_CRATES += bumpalo 3.7.1   # MIT/Apache-2.0
+MODCARGO_CRATES += byteorder   1.4.3   # Unlicense OR MIT
+MODCARGO_CRATES += bytes   0.4.12  # MIT
+MODCARGO_CRATES += bytes   0.5.6   # MIT
+MODCARGO_CRATES += bytes   1.1.0   # MIT
+MODCARGO_CRATES += cache-padded1.1.1   # Apache-2.0 OR MIT
+MODCARGO_CRATES += cc  1.0.71  # MIT/Apache-2.0
+MODCARGO_CRATES += cesu8   1.1.0   # Apache-2.0/MIT
+MODCARGO_CRATES += cexpr   0.4.0   # Apache-2.0/MIT
+MODCARGO_CRATES += cfg-if  0.1.10  # MIT/Apache-2.0
+MODCARGO_CRATES += cfg-if  1.0.0   # MIT/Apache-2.0
+MODCARGO_CRATES += chrono  0.4.19  # MIT/Apache-2.0
+MODCARGO_CRATES += cipher  0.2.5   # MIT OR Apache-2.0
+MODCARGO_CRATES += clang-sys   1.2.2   # Apache-2.0
+MODCARGO_CRATES += clap2.33.3  # MIT
+MODCARGO_CRATES += clipboard   0.5.0   # MIT / Apache-2.0
+MODCARGO_CRATES += clipboard-win   2.2.0   # MIT
+MODCARGO_CRATES += cloudabi0.0.3   # BSD-2-Clause
+MODCARGO_CRATES += combine 4.6.1   # MIT
+MODCARGO_CRATES += concurrent-queue1.2.2   # Apache-2.0 OR MIT
+MODCARGO_CRATES += const-sha1  0.2.0   # Apache-2.0/MIT
+MODCARGO_CRATES += constant_time_eq0.1.5   # CC0-1.0
+MODCARGO_CRATES += core-foundation 0.9.2   # MIT / Apache-2.0
+MODCARGO_CRATES += core-foundation-sys 0.8.3   # MIT / Apache-2.0
+MODCARGO_CRATES += coreaudio-rs0.10.0  # MIT/Apache-2.0
+MODCARGO_CRATES += coreaudio-sys   0.2.8   # MIT
+MODCARGO_CRATES += cpal0.13.4  # Apache-2.0
+MODCARGO_CRATES += cpufeatures 0.2.1   # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-channel   0.5.1   # MIT OR Apache-2.0
+MODCARGO_CRATES += crossbeam-utils 0.8.5   # MIT OR Apache-2.0
+MODCARGO_CRATES += crypto-mac  0.11.1  # MIT OR Apache-2.0
+MODCARGO_CRATES += ctr 0.6.0   # MIT OR Apache-2.0
+MODCARGO_CRATES += cursive 0.16.3  # MIT
+MODCARGO_CRATES += cursive_core0.2.2   # MIT
+MODCARGO_CRATES += darling 0.9.0

Re: unbreak games/boswars

2021-10-17 Thread Stuart Henderson

thanks, committed.

On 2021/10/17 10:41, Omar Polo wrote:
> Stuart Henderson  writes:
> 
> > On 2021/10/17 01:40, Omar Polo wrote:
> >> [...]
> >> +
> >> +post-extract:
> >> +.for f in maps/antarticum.map/terrain.png graphics/ui/ui_*.png \
> >> +  units/radar/radar*.png units/tree*/tree*.png
> >> +  optipng -force -fix ${WRKSRC}/${f}
> >> +.endfor
> >>  
> >>  pre-configure:
> >>@${SUBST_CMD} ${WRKSRC}/SConstruct \
> >
> > For extract stages, please stick to just things which unpack files
> > rather than doing any processsing (especially any which requires
> > dependenxies beyond common archive tools), it makes it harder to unpack
> > the ports tree (e.g. to search source, which is done with NO_DEPENDS
> > set). Running it from pre-configure would be ok.
> 
> Sure, here's an updated patch that fixes the images in the pre-configure
> step
> 
> 
> Index: Makefile
> ===
> RCS file: /home/cvs/ports/games/boswars/Makefile,v
> retrieving revision 1.26
> diff -u -p -r1.26 Makefile
> --- Makefile  12 Jul 2019 20:46:15 -  1.26
> +++ Makefile  17 Oct 2021 08:40:54 -
> @@ -7,7 +7,7 @@ DISTNAME= boswars-${V}-src
>  PKGNAME= boswars-${V}
>  CATEGORIES=  games x11
>  MASTER_SITES=http://www.boswars.org/dist/releases/
> -REVISION=1
> +REVISION=2
>  
>  HOMEPAGE=http://www.boswars.org/
>  
> @@ -24,7 +24,8 @@ MODULES=devel/scons \
>  MODSCONS_FLAGS=  CPPPATH="${LOCALBASE}/include ${X11BASE}/include" \
>   opengl=1
>  
> -BUILD_DEPENDS=   devel/sdl-image
> +BUILD_DEPENDS=   devel/sdl-image \
> + graphics/optipng
>  LIB_DEPENDS= devel/sdl \
>   multimedia/libtheora \
>   audio/libvorbis \
> @@ -38,6 +39,10 @@ DATA_DIR=  campaigns graphics intro langu
>  pre-configure:
>   @${SUBST_CMD} ${WRKSRC}/SConstruct \
>   ${WRKSRC}/engine/include/stratagus.h
> +.for f in maps/antarticum.map/terrain.png graphics/ui/ui_*.png \
> + units/radar/radar*.png units/tree*/tree*.png
> + optipng -force -fix ${WRKSRC}/${f}
> +.endfor
>  
>  do-install:
>   ${INSTALL_DATA_DIR} ${PREFIX}/share/boswars
>

NEW PORT: pngcheck

2021-10-17 Thread Marc Espie

Compiles out of the box, a bit of love to the man pages
(upstreamed)

seems to work just fine, verifies correct pngs, and errors out properly
on truncated ones


pngcheck-3.0.3.tgz
Description: application/tar-gz

Re: unbreak games/boswars

2021-10-17 Thread Omar Polo

Stuart Henderson  writes:

> On 2021/10/17 01:40, Omar Polo wrote:
>> [...]
>> +
>> +post-extract:
>> +.for f in maps/antarticum.map/terrain.png graphics/ui/ui_*.png \
>> +units/radar/radar*.png units/tree*/tree*.png
>> +optipng -force -fix ${WRKSRC}/${f}
>> +.endfor
>>  
>>  pre-configure:
>>  @${SUBST_CMD} ${WRKSRC}/SConstruct \
>
> For extract stages, please stick to just things which unpack files
> rather than doing any processsing (especially any which requires
> dependenxies beyond common archive tools), it makes it harder to unpack
> the ports tree (e.g. to search source, which is done with NO_DEPENDS
> set). Running it from pre-configure would be ok.

Sure, here's an updated patch that fixes the images in the pre-configure
step


Index: Makefile
===
RCS file: /home/cvs/ports/games/boswars/Makefile,v
retrieving revision 1.26
diff -u -p -r1.26 Makefile
--- Makefile12 Jul 2019 20:46:15 -  1.26
+++ Makefile17 Oct 2021 08:40:54 -
@@ -7,7 +7,7 @@ DISTNAME=   boswars-${V}-src
 PKGNAME=   boswars-${V}
 CATEGORIES=games x11
 MASTER_SITES=  http://www.boswars.org/dist/releases/
-REVISION=  1
+REVISION=  2
 
 HOMEPAGE=  http://www.boswars.org/
 
@@ -24,7 +24,8 @@ MODULES=  devel/scons \
 MODSCONS_FLAGS=CPPPATH="${LOCALBASE}/include ${X11BASE}/include" \
opengl=1
 
-BUILD_DEPENDS= devel/sdl-image
+BUILD_DEPENDS= devel/sdl-image \
+   graphics/optipng
 LIB_DEPENDS=   devel/sdl \
multimedia/libtheora \
audio/libvorbis \
@@ -38,6 +39,10 @@ DATA_DIR=campaigns graphics intro langu
 pre-configure:
@${SUBST_CMD} ${WRKSRC}/SConstruct \
${WRKSRC}/engine/include/stratagus.h
+.for f in maps/antarticum.map/terrain.png graphics/ui/ui_*.png \
+   units/radar/radar*.png units/tree*/tree*.png
+   optipng -force -fix ${WRKSRC}/${f}
+.endfor
 
 do-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/boswars

Re: NEW: net/gmid

2021-10-17 Thread Stuart Henderson

This is missing the rc script referred to in PLIST. Please send tars not 
diffs for new ports and use style for COMMENT that is consistent with other 
ports


--
 Sent from a phone, apologies for poor formatting.

On 17 October 2021 04:45:53 Stephen Gregoratto  wrote:


Attached is a port of gmid[1], a secure Gemini server. It forks+execs
multiple processes, with each using a pledge+unveil sandbox. I'm
currently dogfooding this port on my 7.0 box at gemini.sgregoratto.me,
and can confirm it works. This is my first time porting a daemon, so any
comments are appreciated.

[1]: https://github.com/omar-polo/gmid
--
Stephen Gregoratto

Re: unbreak games/boswars

2021-10-17 Thread Stuart Henderson

On 2021/10/17 01:40, Omar Polo wrote:
> @@ -24,7 +24,8 @@ MODULES=devel/scons \
>  MODSCONS_FLAGS=  CPPPATH="${LOCALBASE}/include ${X11BASE}/include" \
>   opengl=1
>  
> -BUILD_DEPENDS=   devel/sdl-image
> +BUILD_DEPENDS=   devel/sdl-image \
> + graphics/optipng
>  LIB_DEPENDS= devel/sdl \
>   multimedia/libtheora \
>   audio/libvorbis \
> @@ -34,6 +35,12 @@ LIB_DEPENDS=   devel/sdl \
>  NO_TEST= Yes
>  
>  DATA_DIR=campaigns graphics intro languages maps patches scripts sounds 
> units
> +
> +post-extract:
> +.for f in maps/antarticum.map/terrain.png graphics/ui/ui_*.png \
> + units/radar/radar*.png units/tree*/tree*.png
> + optipng -force -fix ${WRKSRC}/${f}
> +.endfor
>  
>  pre-configure:
>   @${SUBST_CMD} ${WRKSRC}/SConstruct \

For extract stages, please stick to just things which unpack files
rather than doing any processsing (especially any which requires
dependenxies beyond common archive tools), it makes it harder to unpack
the ports tree (e.g. to search source, which is done with NO_DEPENDS
set). Running it from pre-configure would be ok.

NEW: net/gmid

2021-10-17 Thread Stephen Gregoratto

Attached is a port of gmid[1], a secure Gemini server. It forks+execs
multiple processes, with each using a pledge+unveil sandbox. I'm
currently dogfooding this port on my 7.0 box at gemini.sgregoratto.me,
and can confirm it works. This is my first time porting a daemon, so any
comments are appreciated.

[1]: https://github.com/omar-polo/gmid
-- 
Stephen Gregoratto
Index: infrastructure/db/user.list
===
RCS file: /cvs/ports/infrastructure/db/user.list,v
retrieving revision 1.390
diff -u -p -r1.390 user.list
--- infrastructure/db/user.list 27 Aug 2021 16:30:16 -  1.390
+++ infrastructure/db/user.list 17 Oct 2021 03:38:52 -
@@ -378,3 +378,4 @@ id  usergroup   port
 867 _notify_push   www/nextcloud_notify_push
 868 _igmpproxy _igmpproxy  net/igmpproxy
 869 _headscale _headscale  net/headscale
+870 _gmid  _gmid   net/gmid
Index: net/gmid/Makefile
===
RCS file: net/gmid/Makefile
diff -N net/gmid/Makefile
--- /dev/null   1 Jan 1970 00:00:00 -
+++ net/gmid/Makefile   17 Oct 2021 03:38:52 -
@@ -0,0 +1,29 @@
+# $OpenBSD: Makefile,v$
+
+COMMENT =  A simple and secure Gemini server
+V =1.7.5
+DISTNAME = gmid-${V}
+
+CATEGORIES =   net
+
+HOMEPAGE = https://gmid.omarpolo.com/
+
+# ISC
+PERMIT_PACKAGE =   Yes
+
+# uses pledge()
+# uses unveil()
+WANTLIB += c crypto event ssl tls util
+
+MASTER_SITES = https://github.com/omar-polo/gmid/releases/download/$V/
+
+CONFIGURE_STYLE =  simple
+
+ALL_TARGET =   gmid
+INSTALL_TARGET =   install
+TEST_TARGET =  regress
+
+post-install:
+   install -c -m 0555 ${WRKSRC}/contrib/gmid 
${WRKINST}${SYSCONFDIR}/rc.d/gmid
+
+.include 
Index: net/gmid/distinfo
===
RCS file: net/gmid/distinfo
diff -N net/gmid/distinfo
--- /dev/null   1 Jan 1970 00:00:00 -
+++ net/gmid/distinfo   17 Oct 2021 03:38:52 -
@@ -0,0 +1,2 @@
+SHA256 (gmid-1.7.5.tar.gz) = 4bMaE9MgkptwrAMOhAapEh2gn7NARSUmH/diaUrI62E=
+SIZE (gmid-1.7.5.tar.gz) = 82100
Index: net/gmid/pkg/DESCR
===
RCS file: net/gmid/pkg/DESCR
diff -N net/gmid/pkg/DESCR
--- /dev/null   1 Jan 1970 00:00:00 -
+++ net/gmid/pkg/DESCR  17 Oct 2021 03:38:52 -
@@ -0,0 +1,14 @@
+gmid is a fast Gemini server written with security in mind.
+It contains the following features:
+
+- sandboxed by default on OpenBSD, Linux and FreeBSD
+- reconfiguration: reload the running configuration without interruption
+- automatic redirect/error pages (see block return)
+- IRI support (RFC3987)
+- automatic certificate generation for config-less mode
+- CGI and FastCGI support
+- virtual hosts
+- location rules
+- event-based asynchronous I/O model
+- low memory footprint
+- small codebase, easily hackable
Index: net/gmid/pkg/PLIST
===
RCS file: net/gmid/pkg/PLIST
diff -N net/gmid/pkg/PLIST
--- /dev/null   1 Jan 1970 00:00:00 -
+++ net/gmid/pkg/PLIST  17 Oct 2021 03:38:52 -
@@ -0,0 +1,4 @@
+@comment $OpenBSD: PLIST,v$
+@rcscript ${RCDIR}/gmid
+@bin bin/gmid
+@man man/man1/gmid.1

37 matches

Mail list logo