Add pandoc-2.12 via devel/cabal module

2021-03-14 Thread Greg Steuck
I personally don't have much use for pandoc. If people want to see it in
6.9, please test and report back soon. I'd also want somebody's OK.

Subject: [PATCH] Add pandoc-2.12 via devel/cabal module

Tested on simple md and docx conversions.
Broken and disabled on i386.

diff --git a/textproc/pandoc/Makefile b/textproc/pandoc/Makefile
new file mode 100644
index 000..c3644eecd3f
--- /dev/null
+++ b/textproc/pandoc/Makefile
@@ -0,0 +1,150 @@
+# $OpenBSD$
+
+# Even with the highest memory limit pandoc fails to compile.
+BROKEN-i386=   ghc: out of memory (requested 2097152 bytes)
+
+COMMENT =  Conversion between markup formats
+
+CATEGORIES =   textproc
+
+HOMEPAGE = https://pandoc.org
+
+# GPL2
+PERMIT_PACKAGE =   Yes
+
+WANTLIB =  c ffi gmp iconv m pthread util z
+
+MODULES =  devel/cabal
+MODCABAL_FLAGS =   embed_data_files
+MODCABAL_STEM  = pandoc
+MODCABAL_VERSION   = 2.12
+MODCABAL_MANIFEST  = \
+   Glob0.10.1  0   \
+   HTTP4000.3.15   2   \
+   HsYAML  0.2.1.0 2   \
+   JuicyPixels 3.3.5   0   \
+   QuickCheck  2.14.2  0   \
+   SHA 1.6.4.4 0   \
+   aeson   1.5.6.0 0   \
+   aeson-pretty0.8.8   0   \
+   ansi-terminal   0.110   \
+   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   \
+   base16-bytestring   1.0.1.0 0   \
+   base64-bytestring   1.2.0.1 0   \
+   basement0.0.11  3   \
+   bifunctors  5.5.10  0   \
+   blaze-builder   0.4.2.1 0   \
+   blaze-html  0.9.1.2 1   \
+   blaze-markup0.8.2.8 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   \
+   conduit-extra   1.3.5   0   \
+   connection  0.3.1   1   \
+   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   \
+   digest  0.0.1.2 0   \
+   distributive0.6.2.1 0   \
+   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   \
+   hourglass   0.2.12  0   \
+   hsc2hs  0.68.7  1   \
+   hslua   1.3.0.1 0   \
+   hslua-module-path   0.1.0.1 0   \
+   hslua-module-system 0.2.2.1 0   \
+   hslua-module-text   0.3.0.1 0   \
+   http-client 0.7.6   0   \
+   http-client-tls 0.3.5.3 1   \
+   http-types  0.12.3  0   \
+   indexed-traversable 0.1.1   0   \
+   integer-logarithms  1.0.3.1 0   \
+   ipynb   0.1.0.1 0   \
+   jira-wiki-markup1.3.4   0   \
+   memory  0.15.0  1   \
+   mime-types  0.1.0.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   \
+   pandoc-types1.220   \
+   pem 0.2.4   0   \
+   primitive   0.7.1.0 2   \
+   random  1.1 1   \
+   resourcet   1.2.4.2 0   \
+   rfc5051 0.2 0   \
+   safe0.3.19  0   \
+   scientific  0.3.6.2 0   \
+   skylighting 0.10.4  0   \
+   skylighting-core0.10.4  0   \
+   socks   0.6.1   0   \
+   split   0.2.3.4 1   \
+   splitmix0.1.0.3 0   \
+   streaming-commons   0.2.2.1 0   \
+   strict  0.4.0.1 0   \
+   syb 0.7.2.1 0   \
+   tagged  0.8.6.1 0   \
+   tagsoup 0.14.8  0   \
+   temporary   1.3 0   \
+   texmath 0.12.1.10   \
+   text-conversions0.3.1   0   \
+   th-abstraction  0.4.2.0 0   \

CVS: cvs.openbsd.org: ports

2021-03-14 Thread Kevin Lo
CVSROOT:/cvs
Module name:ports
Changes by: ke...@cvs.openbsd.org   2021/03/14 19:50:01

Modified files:
net: Makefile 

Log message:
+pidgin-skypeweb



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Kevin Lo
CVSROOT:/cvs
Module name:ports
Changes by: ke...@cvs.openbsd.org   2021/03/14 19:49:03

Log message:
Import pidgin-skypeweb, a Skype protocol plugin for Pidgin.

Input from and ok bentley@

Status:

Vendor Tag: kevlo
Release Tags:   kevlo_20210315

N ports/net/pidgin-skypeweb/Makefile
N ports/net/pidgin-skypeweb/distinfo
N ports/net/pidgin-skypeweb/patches/patch-skypeweb_CMakeLists_txt
N ports/net/pidgin-skypeweb/pkg/DESCR
N ports/net/pidgin-skypeweb/pkg/PLIST

No conflicts created by this import



Re: [NEW] net/Vger

2021-03-14 Thread Solene Rapenne
On Sun, 14 Mar 2021 21:19:06 +
Stuart Henderson :

> On 2021/03/14 22:05, Florian Viehweger wrote:
> > Hi ports,
> > 
> > attached is a port of Vger, a gemini server supporting chroot,
> > virtualhosts, CGI, default language choice, redirections and MIME types
> > detection.
> > 
> > Initial work was done by prx, with permission I'm taking maintainership.
> > 
> > I've created a dedicated user and group '_gemini_user' both with ID 865.  
> 
> users are normally named after the port i.e. this would be better using
> _vger than _gemini_user
> 
> > 'make test' works on amd64.
> > 
> > 'portcheck -N' complains about
> > "hardcoded paths detected in pkg/README, consider using SUBST_VARS and
> > TRUEPREFIX/LOCALBASE/LOCALSTATEDIR/VARBASE"
> > but this is for an example inetd.conf file.
> > 
> > Comments? OK?
> > 
> > Thanks!
> > 
> > -- 
> > greetings,
> > 
> > Florian Viehweger  
> 
> inetd, really, in 2021?!
> 
> 127.0.0.1:11965 stream tcp nowait _gemini_user /usr/local/bin/vger vger
> 
> - this should use ${TRUEPREFIX} not hardcoded /usr/local.
> 
> README should follow the formatting used in
> ports/infrastructure/README.template and every other pkg-readme file.
> 

I'm vger author. What's wrong with inetd? In this case it acts
behind a program that will manage TLS connection and pass it to
local inetd. Limit rate can be done on the server behind to
prevent inetd to spawn too many processes (that's the only issue
I'm aware of)



Re: NEW: net/pidgin-skypeweb

2021-03-14 Thread Kevin Lo
On Sun, Mar 14, 2021 at 04:00:22PM -0600, Anthony J. Bentley wrote:
> 
> Kevin Lo writes:
> > On Sun, Mar 14, 2021 at 04:39:24AM -0600, Anthony J. Bentley wrote:
> > > CONFIGURE_ARGS =   -DCMAKE_SHARED_LINKER_FLAGS="-L${LOCALBASE}/lib"
> > > 
> > > This line should not be necessary. Removing it causes the build to fail,
> > > which I assume is because of the 'link_directories()' call's relative
> > > position within CMakeLists.txt (cmake's upstream documentation says
> > > "The command will apply only to targets created after it is called").
> >
> > Understood.  I used CMAKE_SHARED_LINKER_FLAGS because I thought it wouldn't 
> > require a patch :(
> 
> For something permanent, avoiding a patch is nice. But in this case,
> where the problem is an upstream bug, better to use a patch, since it
> will be removed once the port is updated to a release that no longer
> needs it. A makefile setting will probably be forgotten by whoever
> updates the port in the future, and kept even after the bug is fixed
> upstream.

It makes sense.  Thank you Anthony :)



[Update] www/py-beautifulsoup4 4.8.1 -> 4.9.3 - Drop python2

2021-03-14 Thread Kurt Mosiejczuk
Update www/py-beautifulsoup4 to 4.9.3

Changes can be found here: 
https://bazaar.launchpad.net/%7Eleonardr/beautifulsoup/bs4/view/head:/CHANGELOG

(4.10.0 isn't actually released yet according to the main website)

This update pairs well with the py-soupsieve update I just sent since
it fixes 4 regression test failures that occur with the old version of
bs4 with the new soupsieve.

Drop the python2 flavor since nothing uses it.

Tests of consumers (that have tests) succeed the same as previous version.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/www/py-beautifulsoup4/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile3 Jul 2020 21:13:18 -   1.16
+++ Makefile14 Mar 2021 22:52:21 -
@@ -2,10 +2,10 @@
 
 COMMENT =  HTML/XML parser that supports invalid markup
 
-MODPY_EGG_VERSION =4.8.1
+MODPY_EGG_VERSION =4.9.3
 DISTNAME = beautifulsoup4-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 1
+
 
 CATEGORIES =   www
 
@@ -17,7 +17,7 @@ PERMIT_PACKAGE =  Yes
 MODULES =  lang/python
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 MODPY_SETUPTOOLS = Yes
 MODPY_PI = Yes
Index: distinfo
===
RCS file: /cvs/ports/www/py-beautifulsoup4/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo17 Nov 2019 04:19:49 -  1.9
+++ distinfo14 Mar 2021 22:52:21 -
@@ -1,2 +1,2 @@
-SHA256 (beautifulsoup4-4.8.1.tar.gz) = 
YTXbK6Z4FowHlQ+aFsQDGCLG9K7HWmXgqXvFygl4mTE=
-SIZE (beautifulsoup4-4.8.1.tar.gz) = 159164
+SHA256 (beautifulsoup4-4.9.3.tar.gz) = 
hHKeMirR1bTSX4Bb+gW5At2WRQ9DhCxOmQZ9XhNp6yU=
+SIZE (beautifulsoup4-4.9.3.tar.gz) = 376031
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-beautifulsoup4/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   17 Nov 2019 04:19:49 -  1.3
+++ pkg/PLIST   14 Mar 2021 22:52:21 -
@@ -1,6 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.3 2019/11/17 04:19:49 kmos Exp $
-lib/python${MODPY_VERSION}/
-lib/python${MODPY_VERSION}/site-packages/
+@conflict www/py-beautifulsoup4-*
+@pkgpath www/py-beautifulsoup4
 
lib/python${MODPY_VERSION}/site-packages/beautifulsoup4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/beautifulsoup4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
 
lib/python${MODPY_VERSION}/site-packages/beautifulsoup4-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
@@ -11,7 +11,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bs4/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/bs4/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/bs4/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/bs4/${MODPY_PYCACHE}check_block.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bs4/${MODPY_PYCACHE}dammit.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bs4/${MODPY_PYCACHE}diagnose.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/bs4/${MODPY_PYCACHE}element.${MODPY_PYC_MAGIC_TAG}pyc
@@ -27,7 +26,6 @@ lib/python${MODPY_VERSION}/site-packages
 lib/python${MODPY_VERSION}/site-packages/bs4/builder/_html5lib.py
 lib/python${MODPY_VERSION}/site-packages/bs4/builder/_htmlparser.py
 lib/python${MODPY_VERSION}/site-packages/bs4/builder/_lxml.py
-lib/python${MODPY_VERSION}/site-packages/bs4/check_block.py
 lib/python${MODPY_VERSION}/site-packages/bs4/dammit.py
 lib/python${MODPY_VERSION}/site-packages/bs4/diagnose.py
 lib/python${MODPY_VERSION}/site-packages/bs4/element.py



[Update] www/py-soupsieve 1.9.5 -> 2.2

2021-03-14 Thread Kurt Mosiejczuk
Update py-soupsieve to 2.2 and drop python2 flavor.

Nothing uses the python2 flavor now (after recent commits) and it isn't 
supported for >= 2.0 anyway.

This pairs well with the py-beautifulsoup4 update I'm about to send (a few
bs4 tests fail with this new version but not the updated bs4).

Consumers that have tests (other than bs4) have the same or better regression
test results on amd64.

ok?

--Kurt

Index: Makefile
===
RCS file: /cvs/ports/www/py-soupsieve/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile3 Jul 2020 21:13:20 -   1.3
+++ Makefile14 Mar 2021 03:51:24 -
@@ -2,10 +2,9 @@
 
 COMMENT =  modern CSS selector implementation for Beautiful Soup
 
-MODPY_EGG_VERSION =1.9.5
+MODPY_EGG_VERSION =2.2
 DISTNAME = soupsieve-${MODPY_EGG_VERSION}
 PKGNAME =  py-${DISTNAME}
-REVISION = 0
 
 CATEGORIES =   www
 
@@ -21,16 +20,12 @@ MODPY_SETUPTOOLS =  Yes
 MODPY_PYTEST = Yes
 
 FLAVORS =  python3
-FLAVOR ?=
+FLAVOR =   python3
 
 TEST_DEPENDS = devel/py-coverage${MODPY_FLAVOR} \
devel/py-html5lib${MODPY_FLAVOR} \
devel/py-test-cov${MODPY_FLAVOR} \
textproc/py-lxml${MODPY_FLAVOR} \
www/py-beautifulsoup4${MODPY_FLAVOR}
-
-.if !${FLAVOR:Mpython3}
-RUN_DEPENDS += devel/py-backports-functools-lru-cache
-.endif
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/www/py-soupsieve/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo17 Nov 2019 04:16:16 -  1.2
+++ distinfo14 Mar 2021 03:51:24 -
@@ -1,2 +1,2 @@
-SHA256 (soupsieve-1.9.5.tar.gz) = 4sHF3uShw2vLeQ4Pq9VJLYdLjr1GF2IsT2pzFwEGDdo=
-SIZE (soupsieve-1.9.5.tar.gz) = 98999
+SHA256 (soupsieve-2.2.tar.gz) = QH+h6Os0WNG1YU31HZZRoRgOpf7fB/60bkXX4l5tbN0=
+SIZE (soupsieve-2.2.tar.gz) = 102948
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-soupsieve/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST   12 Aug 2019 23:58:09 -  1.1.1.1
+++ pkg/PLIST   14 Mar 2021 03:51:24 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2019/08/12 23:58:09 kmos Exp $
+@conflict www/py-soupsieve-*
+@pkgpath www/py-soupsieve
 lib/python${MODPY_VERSION}/site-packages/soupsieve/
 
lib/python${MODPY_VERSION}/site-packages/soupsieve-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
 
lib/python${MODPY_VERSION}/site-packages/soupsieve-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2021/03/14 17:48:30

Modified files:
www: Makefile 

Log message:
py-html5-parser is already python3 only. Alter Makefile to reflect that
fact to avoid confusion.



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2021/03/14 17:39:37

Removed files:
databases/redis/patches: patch-deps_hiredis_net_c 

Log message:
databases/redis: zap noop patch

In Redis 2.8.12, this patch was needed due to TCP_KEEPIDLE.
Since Redis 4.0.1, the code is guarded by #if defined(__GLIBC__) && ...
so adding && !defined(__OpenBSD__) doesn't make a difference.



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Theo Buehler
CVSROOT:/cvs
Module name:ports
Changes by: t...@cvs.openbsd.org2021/03/14 17:06:17

Modified files:
databases/redis/patches: patch-src_Makefile 

Log message:
databases/redis: simplify Makefile patch

INSTALL_SBIN is no longer used, so no need to add it.



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2021/03/14 16:31:25

Modified files:
www: Makefile 

Log message:
Remove unflavored (python3) version of py-webob from Makefile



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2021/03/14 16:23:22

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

Log message:
Quirks for the dropped python2 flavors of py-webob and py-webtest



Re: NEW: textproc/gron

2021-03-14 Thread Stuart Henderson
On 2021/03/14 22:06, Stuart Henderson wrote:
> woohoo! portgen go worked with no fuss this time around (this is very
> unusual for me! I tried with gron a few months ago and gave up but
> something improved in the meantime). It's quite handy for when you just
> want a quick search and don't want to wrap your head around the jq
> language.
> 
> OK to import?
> 
> $ pkg_info gron
> Information for inst:gron-0.6.1
> 
> Comment:
> make JSON greppable
> 
> Description:
> gron transforms JSON into discrete assignments to make it easier to
> grep for what you want and see the absolute 'path' to it. It eases the
> exploration of APIs that return large blobs of JSON but have terrible
> documentation.
> 
> $ gron "https://api.github.com/repos/tomnomnom/gron/commits?per_page=1; | \
> fgrep "commit.author"
> json[0].commit.author = {};
> json[0].commit.author.date = "2016-07-02T10:51:21Z";
> json[0].commit.author.email = "m...@tomnomnom.com";
> json[0].commit.author.name = "Tom Hudson";
> 
> gron can work backwards too, enabling you to turn your filtered data back
> into JSON (gron --ungron).
> 
> Maintainer: The OpenBSD ports mailing-list 
> 
> 

Now with 100% more attachment.


gron.tgz
Description: application/tar-gz


NEW: textproc/gron

2021-03-14 Thread Stuart Henderson
woohoo! portgen go worked with no fuss this time around (this is very
unusual for me! I tried with gron a few months ago and gave up but
something improved in the meantime). It's quite handy for when you just
want a quick search and don't want to wrap your head around the jq
language.

OK to import?

$ pkg_info gron
Information for inst:gron-0.6.1

Comment:
make JSON greppable

Description:
gron transforms JSON into discrete assignments to make it easier to
grep for what you want and see the absolute 'path' to it. It eases the
exploration of APIs that return large blobs of JSON but have terrible
documentation.

$ gron "https://api.github.com/repos/tomnomnom/gron/commits?per_page=1; | \
fgrep "commit.author"
json[0].commit.author = {};
json[0].commit.author.date = "2016-07-02T10:51:21Z";
json[0].commit.author.email = "m...@tomnomnom.com";
json[0].commit.author.name = "Tom Hudson";

gron can work backwards too, enabling you to turn your filtered data back
into JSON (gron --ungron).

Maintainer: The OpenBSD ports mailing-list 




Re: NEW: net/pidgin-skypeweb

2021-03-14 Thread Anthony J. Bentley
Kevin Lo writes:
> On Sun, Mar 14, 2021 at 04:39:24AM -0600, Anthony J. Bentley wrote:
> > CONFIGURE_ARGS =   -DCMAKE_SHARED_LINKER_FLAGS="-L${LOCALBASE}/lib"
> > 
> > This line should not be necessary. Removing it causes the build to fail,
> > which I assume is because of the 'link_directories()' call's relative
> > position within CMakeLists.txt (cmake's upstream documentation says
> > "The command will apply only to targets created after it is called").
>
> Understood.  I used CMAKE_SHARED_LINKER_FLAGS because I thought it wouldn't 
> require a patch :(

For something permanent, avoiding a patch is nice. But in this case,
where the problem is an upstream bug, better to use a patch, since it
will be removed once the port is updated to a release that no longer
needs it. A makefile setting will probably be forgotten by whoever
updates the port in the future, and kept even after the bug is fixed
upstream.



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/03/14 15:48:58

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

Log message:
update to libftdi1-1.5



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2021/03/14 15:31:43

Modified files:
www/py-webtest : Makefile distinfo 
www/py-webtest/pkg: PLIST 

Log message:
Update www/py-webtest to most recent version and drop python 2 flavor.

Changelog (from https://github.com/Pylons/webtest/blob/master/CHANGELOG.rst)

2.0.35 (2020-04-27)

python3.8 compat
Remove use of deprecated splittype and splithost

2.0.34 (2020-01-29)

Fix the test length == 0 in check_content_type.
Treat  like .
Handle query parameters for the head method.

2.0.33 (2019-02-09)

Fixed #210. Allow to reset select multiple with field.value = []
Support for PYTHONOPTIMIZE=2, fix tests on PYTHONOPTIMIZE=1, 2
Fixed #196. Fix deprecation warnings for collections to use
collections.abc for Iterable on Python 3.

2.0.32 (2018-10-05)

remove invalid email from setup.py

2.0.31 (2018-10-05)

py33 is no longer supported. It may works but has been removed from tox
config
Fixed #205: Use empty string as default value for submit and button
tests use pytest

ok sthen@



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Kurt Mosiejczuk
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2021/03/14 15:30:45

Modified files:
www/py-webob   : Makefile distinfo 
www/py-webob/pkg: PLIST 

Log message:
Update py-webob to 1.8.7 and drop python 2 flavor

Changelog: https://docs.pylonsproject.org/projects/webob/en/stable/changes.html

ok sthen@



Re: [NEW] net/Vger

2021-03-14 Thread Stuart Henderson
On 2021/03/14 22:05, Florian Viehweger wrote:
> Hi ports,
> 
> attached is a port of Vger, a gemini server supporting chroot,
> virtualhosts, CGI, default language choice, redirections and MIME types
> detection.
> 
> Initial work was done by prx, with permission I'm taking maintainership.
> 
> I've created a dedicated user and group '_gemini_user' both with ID 865.

users are normally named after the port i.e. this would be better using
_vger than _gemini_user

> 'make test' works on amd64.
> 
> 'portcheck -N' complains about
> "hardcoded paths detected in pkg/README, consider using SUBST_VARS and
> TRUEPREFIX/LOCALBASE/LOCALSTATEDIR/VARBASE"
> but this is for an example inetd.conf file.
> 
> Comments? OK?
> 
> Thanks!
> 
> -- 
> greetings,
> 
> Florian Viehweger

inetd, really, in 2021?!

127.0.0.1:11965 stream tcp nowait _gemini_user /usr/local/bin/vger vger

- this should use ${TRUEPREFIX} not hardcoded /usr/local.

README should follow the formatting used in
ports/infrastructure/README.template and every other pkg-readme file.



[NEW] net/Vger

2021-03-14 Thread Florian Viehweger
Hi ports,

attached is a port of Vger, a gemini server supporting chroot,
virtualhosts, CGI, default language choice, redirections and MIME types
detection.

Initial work was done by prx, with permission I'm taking maintainership.

I've created a dedicated user and group '_gemini_user' both with ID 865.

'make test' works on amd64.

'portcheck -N' complains about
"hardcoded paths detected in pkg/README, consider using SUBST_VARS and
TRUEPREFIX/LOCALBASE/LOCALSTATEDIR/VARBASE"
but this is for an example inetd.conf file.

Comments? OK?

Thanks!

-- 
greetings,

Florian Viehweger


vger.tgz
Description: application/compressed-tar


Re: [update] socat 1.7.4.1

2021-03-14 Thread Stuart Henderson
On 2021/03/13 20:39, Theo Buehler wrote:
> I wanted to test something and noticed that socat was a bit outdated.
> There are a few security fixes and lots of small other fixes.
> http://www.dest-unreach.org/socat/doc/CHANGES
> 
> The SSL EGD and compression stuff is now properly ifdef'ed so we can get
> rid of a lot of patching.
> 
> New patch due to non-portable getprotobynumber_r use.
> 
> I added a test target, so tests can be run from the ports directory. The
> test results look about the same between 1.7.3.1 and 1.7.4.1. I haven't
> investigated deeply.

OK sthen@. It's definitely good to get rid of the SSL patches.

> Someone with more IPv6 knowledge may want to take a closer look.

LGTM. The most obvious ones that look a bit funny relate to ipv6-v6only;
OpenBSD forces this all the time and has no way to disable it.



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/03/14 14:29:00

Modified files:
www/stagit : Makefile distinfo 

Log message:
update to stagit-0.9.5, from maintainer Hiltjo Posthuma



Re: Update scdoc to 1.11.1

2021-03-14 Thread Stuart Henderson
On 2021/03/14 14:17, Martin Vahlensieck wrote:
> Hi
> 
> Here is an update to scdoc version 1.11.1.  I also pledged it while
> there (not sure what the ports policy is for adding pledge patches).

I'm a bit wary in general with pledge in ports because we have been
bitten with pledges added to ports (and in some cases submitted
upstream) that have not been well thought through and result in problems
(we now have ports with patches to *remove* incorrect pledges that have
been committed upstream; this is not really helpful!).
Sometimes it's valid and useful but definitely not everywhere.

There are a couple of main things to consider:

- is the pledge taking into account all possible current codepaths

This software is simple so it's easy to reason with. No config, no
different command-line options, it's just an stdin-to-stdout filter,
so that's good. Let's see what it uses:

$ nm -s scdoc|grep -w U
 U __assert2
 U __errno
 U __sF
 U _csu_finish
 U _ctype_
 U atexit
 U calloc
 U exit
 U fclose
 U fgetc
 U fprintf
 U fputc
 U fread
 U free
 U fseek
 U fwrite
 U getenv
 U gmtime
 U malloc
 U puts
 U realloc
 U snprintf
 U strcmp
 U strerror
 U strftime
 U strstr
 U strtol
 U strtoull
 U time

No problem with stdio for these.

- is it using libraries that are likely to get updated and changed in
such a way that results in changes needed to the pledge?

Not here!

- Are future updates to the port likely to result in problems with the
pledge (especially problems that might not be noticed by the porter
doing an update)?

Again I think we are good.

So in this case I think it's a good candidate and diff is OK with me.
I'll wait for others to comment but as long as I don't forget I'll commit
it soon (or am happy for someone else to commit if they agree).


> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/scdoc/Makefile,v
> retrieving revision 1.2
> diff -u -p -r1.2 Makefile
> --- Makefile  4 Apr 2020 16:58:26 -   1.2
> +++ Makefile  14 Mar 2021 13:17:04 -
> @@ -1,7 +1,7 @@
>  # $OpenBSD: Makefile,v 1.2 2020/04/04 16:58:26 schwarze Exp $
>  
>  COMMENT =convert scdoc text files to man(7) pages
> -VERSION =1.10.1
> +VERSION =1.11.1
>  DISTNAME =   scdoc-${VERSION}
>  CATEGORIES = textproc
>  HOMEPAGE =   https://git.sr.ht/~sircmpwn/scdoc
> @@ -12,6 +12,7 @@ PERMIT_PACKAGE =Yes
>  MASTER_SITES =   https://git.sr.ht/~sircmpwn/scdoc/
>  DISTFILES =  scdoc-{archive/}${VERSION}${EXTRACT_SUFX}
>  
> +# uses pledge(2)
>  WANTLIB =c
>  
>  USE_GMAKE =  Yes
> Index: distinfo
> ===
> RCS file: /cvs/ports/textproc/scdoc/distinfo,v
> retrieving revision 1.2
> diff -u -p -r1.2 distinfo
> --- distinfo  4 Apr 2020 16:58:26 -   1.2
> +++ distinfo  14 Mar 2021 13:17:04 -
> @@ -1,2 +1,2 @@
> -SHA256 (scdoc-1.10.1.tar.gz) = gOAhxzLMos1mWdzPMwbUb1nuy/j7qk2r21AvU3J4p48=
> -SIZE (scdoc-1.10.1.tar.gz) = 12422
> +SHA256 (scdoc-1.11.1.tar.gz) = EJih7S4IdZb8Cz9lfByKXgBBImeqS682GeNoJDBmRbE=
> +SIZE (scdoc-1.11.1.tar.gz) = 12510
> Index: patches/patch-src_main_c
> ===
> RCS file: patches/patch-src_main_c
> diff -N patches/patch-src_main_c
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_main_c  14 Mar 2021 13:17:04 -
> @@ -0,0 +1,25 @@
> +$OpenBSD$
> +
> +--- src/main.c.old
>  src/main.c
> +@@ -15,6 +15,7 @@
> + 
> + char *strstr(const char *haystack, const char *needle);
> + char *strerror(int errnum);
> ++int pledge(const char *, const char *);
> + 
> + static struct str *parse_section(struct parser *p) {
> + struct str *section = str_create();
> +@@ -755,6 +756,12 @@ int main(int argc, char **argv) {
> + fprintf(stderr, "Usage: scdoc < input.scd > output.roff\n");
> + return 1;
> + }
> ++
> ++if (pledge("stdio", NULL) == -1) {
> ++fprintf(stderr, "pledge: %s", strerror(errno));
> ++exit(EXIT_FAILURE);
> ++}
> ++
> + struct parser p = {
> + .input = stdin,
> + .output = stdout,
> 



NEW: net/libyang

2021-03-14 Thread Stuart Henderson
needed for FRRouting. OK to import?

libyang is a YANG data modelling language parser and toolkit written
(and providing API) in C. The library is used e.g. in libnetconf2,
Netopeer2, sysrepo and FRRouting projects.

- Parsing (and validating) schemas in YANG format.
- Parsing (and validating) schemas in YIN format.
- Parsing, validating and printing instance data in XML format.
- Parsing, validating and printing instance data in JSON format (RFC 7951).
- Manipulation with the instance data.
- Support for default values in the instance data (RFC 6243).
- Support for YANG extensions.
- Support for YANG Metadata (RFC 7952).
- yanglint - feature-rich YANG tool.

Current implementation covers YANG 1.0 (RFC 6020) as well as YANG 1.1 (RFC 
7950).


libyang.tgz
Description: application/tar-gz


CVS: cvs.openbsd.org: ports

2021-03-14 Thread Bjorn Ketelaars
CVSROOT:/cvs
Module name:ports
Changes by: b...@cvs.openbsd.org2021/03/14 13:50:49

Modified files:
mail/notmuch   : Makefile.inc 
mail/notmuch/notmuch: Makefile distinfo 
mail/notmuch/notmuch/patches: patch-test_T360-symbol-hiding_sh 
mail/notmuch/notmuch/pkg: PLIST-emacs 
mail/notmuch/py-notmuch: distinfo 

Log message:
Update to notmuch-0.31.4

Changes:
https://git.notmuchmail.org/git?p=notmuch;a=blob;f=NEWS;h=6e88ebd9f703fd72508a8a05b989c84566dd8225;hb=HEAD



[UPDATE] editors/sigil

2021-03-14 Thread Kirill Bychkov
Hi!
The diff attached updates sigil to the latest version.
The main change is that upstream switched from qtwebkit to
qtwebengine.
Changelog:
https://github.com/Sigil-Ebook/Sigil/blob/master/ChangeLog.txt

Slightly tested with random epub file.
OK? Comments?

sigil-1.4.3.diff
Description: Binary data


Re: CVS: cvs.openbsd.org: ports

2021-03-14 Thread Stuart Henderson
On 2021/03/14 10:47, Pascal Stumpf wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   pas...@cvs.openbsd.org  2021/03/14 10:47:17
> 
> Modified files:
>   lang/nqp   : Makefile 
> 
> Log message:
> BUILD_DEPENDS+=math/libtommath, found by naddy and sthen
> 

Given the build failure (and that moarvm has "--has-libtommath"),
shouldn't it be a RUN_DEPENDS in moarvm rather than a BUILD_DEPENDS in
nqp?



Re: Remove x11/qt4-sqlite2

2021-03-14 Thread Stuart Henderson
On 2021/03/14 17:02, Klemens Nanni wrote:
> On Sun, Mar 14, 2021 at 03:27:07PM +, Stuart Henderson wrote:
> > On 2021/03/14 16:00, Klemens Nanni wrote:
> > > On Sun, Mar 14, 2021 at 02:54:42PM +, Stuart Henderson wrote:
> > > > > @@ -2293,6 +2293,7 @@ my $obsolete_reason = {
> > > > >   'lives' => 42,
> > > > >   'py-wsgiproxy' => 5,
> > > > >   'py-sqlite' => 5,
> > > > > + 'qt4-sqlite2' => 5,
> > > > 
> > > > seems no pointing in keeping it around by adding it here? I would have
> > > > merged into the main package by adding @pkgpath x11/qt4,-sqlite2 to 
> > > > PLIST-main
> > > > instead.
> > > 
> > > Merging implies we still provide the sqlite2 bits, no?  I intend to not
> > > provide it and remove databases/sqlite eventually.
> > > 
> > 
> > No, just makes the old package vanish.
> Sure, that's how it works.  Sorry if I wasn't clear:  I meant that
> merging the package might give the impression (to users) that
> qt4-sqlite2 functionality still exists but is merely provided through a
> different package now -- either way, I don't think I care enough about
> this detail (who else would, anyway?).
> 
> OK?

quirks would stay the same, all that's needed is the pkgpath marker (we've
been doing these for long before quirks was a thing)



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Ricardo Mestre
CVSROOT:/cvs
Module name:ports
Changes by: mes...@cvs.openbsd.org  2021/03/14 11:27:01

Modified files:
www/youtube-dl : Makefile distinfo 

Log message:
update to 2021.03.14



UPDATE: www/stagit 0.9.4 -> 0.9.5

2021-03-14 Thread Hiltjo Posthuma
Hi,

This bumps stagit from 0.9.4 to 0.9.5:

It has the following changes:

* Fix warning with libgit2 v0.99+, remain compatible with older versions.
* Add abbreviated commit hash to submodule file.
* Add an -u option to make URLs in Atom feeds absolute.
* style.css
  * Add meta viewport for scaling on mobile.
  * Slightly improve constrast.
* A few performance micro-optimizations.
* Some code-style improvements.


Patch below tested on -current on amd64:


diff --git www/stagit/Makefile www/stagit/Makefile
index fab53047763..739f6554397 100644
--- www/stagit/Makefile
+++ www/stagit/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  static git page generator
 
-DISTNAME = stagit-0.9.4
+DISTNAME = stagit-0.9.5
 
 CATEGORIES =   www
 
diff --git www/stagit/distinfo www/stagit/distinfo
index d6af0498811..e0e9021a5c3 100644
--- www/stagit/distinfo
+++ www/stagit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (stagit-0.9.4.tar.gz) = iImrE/o0VynNw8ySyP3OENSfZmDzmmDe92RshtimEwA=
-SIZE (stagit-0.9.4.tar.gz) = 18912
+SHA256 (stagit-0.9.5.tar.gz) = AloXx746TpiiMZ78TrYynp6mp3iysksOuXo0Ls6bsDk=
+SIZE (stagit-0.9.5.tar.gz) = 19115

-- 
Kind regards,
Hiltjo



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Pascal Stumpf
CVSROOT:/cvs
Module name:ports
Changes by: pas...@cvs.openbsd.org  2021/03/14 10:47:17

Modified files:
lang/nqp   : Makefile 

Log message:
BUILD_DEPENDS+=math/libtommath, found by naddy and sthen



Re: ruby27 vs Puppet

2021-03-14 Thread Giovanni Bechis
On Sat, Mar 13, 2021 at 02:33:48PM +0100, Klemens Nanni wrote:
> On Sat, Mar 13, 2021 at 09:05:18AM +0100, Giovanni Bechis wrote:
> > Hi,
> > after updating to current I receive daily warnings that my Puppet client is 
> > not running.
> > This is because ruby27 starts programs in a different way then ruby26.
> > 
> > On OpenBSD 6.8 I have:
> > $ ps auxww | grep puppet
> > root 63876  0.0 10.2 82024 51836 ??  S  Fri05PM0:05.56 
> > /usr/local/bin/ruby26 /usr/local/bin/puppet agent
> > snb  29563  0.0  0.2   288  1252 p0  S+p 8:59AM0:00.00 grep 
> > puppet
> > 
> > on OpenBSD 6.9-current:
> > $ ps auxww | grep puppet
> > root 91047  0.0  1.4 108760 56900 ??  S  Fri07PM0:05.86 
> > /usr/local/bin/ruby27 -W0 /usr/local/bin/puppet agent
> > root 81078  0.0  0.0   632  1544 p0  S+p 9:00AM0:00.01 grep 
> > puppet
> Not sure, I think this is because sebastia added `-W0' in 5/Makefile:
> 
>   revision 1.33
>   date: 2021/01/18 22:26:11;  author: sebastia;  state: Exp;  lines: +4 
> -2;  commitid: V8KuIdf4R32pgNMt;
>   suppress the huge number of deprecation/obsolete warnings since Ruby 2.7
> 
> > The "-W0" parameter breaks "rcctl ls failed" and a daily warning is sent.
> > Is this a known issue ? I think other softwares may be affected.
> I did not notice it because I'm using Puppet 6, but also without the
> rc script, i.e. in a masterless setup.
> 
> I think the diff below should have been part of sebastia's commit,
> it is untested however;  can you give this a try?
> 
That diff fixes it.
ok giovanni@ if sebastia@ agrees.

 Cheers & Thanks
   Giovanni


> 
> Index: 5/Makefile
> ===
> RCS file: /cvs/ports/sysutils/ruby-puppet/5/Makefile,v
> retrieving revision 1.36
> diff -u -p -r1.36 Makefile
> --- 5/Makefile2 Feb 2021 20:10:09 -   1.36
> +++ 5/Makefile13 Mar 2021 13:26:22 -
> @@ -3,7 +3,7 @@
>  PORTROACH=   limit:^5
>  
>  VERSION= 5.5.22
> -REVISION=6
> +REVISION=7
>  
>  RUN_DEPENDS+=databases/ruby-hiera3,${MODRUBY_FLAVOR} \
>   devel/ruby-gettext-setup,${MODRUBY_FLAVOR}>=0.28,<1 \
> Index: 6/Makefile
> ===
> RCS file: /cvs/ports/sysutils/ruby-puppet/6/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- 6/Makefile17 Feb 2021 18:45:58 -  1.16
> +++ 6/Makefile13 Mar 2021 13:26:20 -
> @@ -3,6 +3,7 @@
>  PORTROACH=   limit:^6
>  
>  VERSION= 6.21.1
> +REVISION=0
>  
>  MAINTAINER=  Klemens Nanni 
>  
> @@ -32,5 +33,7 @@ do-install:
>   mv ${WRKINST}${SYSCONFDIR}/puppetlabs 
> ${PREFIX}/${MODRUBY_RELEXAMPLEDIR}-puppet
>   ${INSTALL_DATA} ${WRKSRC}/conf/*.conf \
>   ${PREFIX}/${MODRUBY_RELEXAMPLEDIR}-puppet/puppet/
> + # Suppress a huge number of Ruby deprecation/obsolete warnings
> + sed -i -e "s/ruby${MODRUBY_BINREV}/ruby${MODRUBY_BINREV} -W0/" 
> ${PREFIX}/bin/puppet
>  
>  .include 
> Index: pkg/puppet.rc
> ===
> RCS file: /cvs/ports/sysutils/ruby-puppet/pkg/puppet.rc,v
> retrieving revision 1.3
> diff -u -p -r1.3 puppet.rc
> --- pkg/puppet.rc 11 Jan 2018 19:27:10 -  1.3
> +++ pkg/puppet.rc 13 Mar 2021 13:26:49 -
> @@ -6,7 +6,7 @@ daemon="${TRUEPREFIX}/bin/puppet agent"
>  
>  . /etc/rc.d/rc.subr
>  
> -pexp="${RUBY} ${daemon}${daemon_flags:+ ${daemon_flags}}"
> +pexp="${RUBY} -W0 ${daemon}${daemon_flags:+ ${daemon_flags}}"
>  rc_reload=NO
>  
>  rc_cmd $1
> 


signature.asc
Description: PGP signature


Re: Remove x11/qt4-sqlite2

2021-03-14 Thread Klemens Nanni
On Sun, Mar 14, 2021 at 03:27:07PM +, Stuart Henderson wrote:
> On 2021/03/14 16:00, Klemens Nanni wrote:
> > On Sun, Mar 14, 2021 at 02:54:42PM +, Stuart Henderson wrote:
> > > > @@ -2293,6 +2293,7 @@ my $obsolete_reason = {
> > > > 'lives' => 42,
> > > > 'py-wsgiproxy' => 5,
> > > > 'py-sqlite' => 5,
> > > > +   'qt4-sqlite2' => 5,
> > > 
> > > seems no pointing in keeping it around by adding it here? I would have
> > > merged into the main package by adding @pkgpath x11/qt4,-sqlite2 to 
> > > PLIST-main
> > > instead.
> > 
> > Merging implies we still provide the sqlite2 bits, no?  I intend to not
> > provide it and remove databases/sqlite eventually.
> > 
> 
> No, just makes the old package vanish.
Sure, that's how it works.  Sorry if I wasn't clear:  I meant that
merging the package might give the impression (to users) that
qt4-sqlite2 functionality still exists but is merely provided through a
different package now -- either way, I don't think I care enough about
this detail (who else would, anyway?).

OK?


Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1228
diff -u -p -r1.1228 Makefile
--- devel/quirks/Makefile   14 Mar 2021 13:20:01 -  1.1228
+++ devel/quirks/Makefile   14 Mar 2021 15:56:04 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-3.615
+PKGNAME =  quirks-3.616
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1242
diff -u -p -r1.1242 Quirks.pm
--- devel/quirks/files/Quirks.pm14 Mar 2021 13:20:01 -  1.1242
+++ devel/quirks/files/Quirks.pm14 Mar 2021 16:00:18 -
@@ -608,6 +608,7 @@ my $stem_extensions = {
'py-ofxparse' => 'py3-ofxparse',
'py-puppetboard' => 'py3-puppetboard',
'py-urlgrabber' => 'py3-urlgrabber',
+   'qt4-sqlite2' => 'qt4',
 };
 
 my $obsolete_reason = {
Index: x11/qt4/Makefile
===
RCS file: /cvs/ports/x11/qt4/Makefile,v
retrieving revision 1.165
diff -u -p -r1.165 Makefile
--- x11/qt4/Makefile26 Jan 2021 18:29:01 -  1.165
+++ x11/qt4/Makefile14 Mar 2021 15:55:46 -
@@ -10,23 +10,20 @@ COMMENT-examples =  examples for qt4
 COMMENT-html = off-line html documentation for qt4
 COMMENT-postgresql =   PostgresSQL plugin for qt4
 COMMENT-mysql =MySQL plugin for qt4
-COMMENT-sqlite2 =  sqlite2 plugin for qt4
 COMMENT-tds =  tds plugin for qt4
 
 PKGNAME =  qt4-${PKGVERSION}
 PKGNAME-mysql =qt4-mysql-${PKGVERSION}
 PKGNAME-postgresql =   qt4-postgresql-${PKGVERSION}
 PKGNAME-examples = qt4-examples-${PKGVERSION}
-PKGNAME-sqlite2 =  qt4-sqlite2-${PKGVERSION}
 PKGNAME-tds =  qt4-tds-${PKGVERSION}
 PKGNAME-main = qt4-${PKGVERSION}
 PKGNAME-debug =qt4-debug-${PKGVERSION}
 FULLPKGNAME-html = qt4-html-${PKGVERSION}
 FULLPKGPATH-html = ${BASE_PKGPATH},-html
-REVISION-main =24
+REVISION-main =25
 REVISION-mysql =   8
 REVISION-postgresql =  7
-REVISION-sqlite2 = 7
 REVISION-tds = 7
 REVISION-debug =   5
 REVISION-examples =10
@@ -138,7 +135,7 @@ BUILD_DEPENDS +=databases/postgresql,-s
 BUILD_DEPENDS +=   print/cups,-libs
 
 MULTI_PACKAGES =   -main -examples \
-   -html -mysql -postgresql -sqlite2 -tds
+   -html -mysql -postgresql -tds
 
 .if ${FLAVOR:Mdebug}
 CONFIGURE_ARGS +=  -debug
@@ -182,11 +179,6 @@ WANTLIB-mysql =${sqlWANTLIB} mariadb
 LIB_DEPENDS-postgresql =${BUILD_PKGPATH} \
databases/postgresql
 WANTLIB-postgresql =   ${sqlWANTLIB}  pq
-
-
-LIB_DEPENDS-sqlite2 =  ${BUILD_PKGPATH} \
-   databases/sqlite
-WANTLIB-sqlite2 =  ${sqlWANTLIB} sqlite
 
 
 LIB_DEPENDS-tds =  ${BUILD_PKGPATH} \
Index: x11/qt4/pkg/DESCR-sqlite2
===
RCS file: x11/qt4/pkg/DESCR-sqlite2
diff -N x11/qt4/pkg/DESCR-sqlite2
--- x11/qt4/pkg/DESCR-sqlite2   15 May 2006 21:09:39 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1 +0,0 @@
-database plugin (sqlite2) for qt4.
Index: x11/qt4/pkg/PLIST-main
===
RCS file: /cvs/ports/x11/qt4/pkg/PLIST-main,v
retrieving revision 1.39
diff -u -p -r1.39 PLIST-main
--- x11/qt4/pkg/PLIST-main  26 Jan 2021 18:29:01 -  1.39
+++ x11/qt4/pkg/PLIST-main  14 Mar 2021 15:55:13 -
@@ -3,6 +3,7 @@
 @pkgpath x11/qt4
 @pkgpath x11/qt4,-phonon
 @pkgpath x11/qt4,-sqlite
+@pkgpath x11/qt4,-sqlite2
 bin/assistant4
 

Re: Remove x11/qt4-sqlite2

2021-03-14 Thread Stuart Henderson
On 2021/03/14 16:00, Klemens Nanni wrote:
> On Sun, Mar 14, 2021 at 02:54:42PM +, Stuart Henderson wrote:
> > > @@ -2293,6 +2293,7 @@ my $obsolete_reason = {
> > >   'lives' => 42,
> > >   'py-wsgiproxy' => 5,
> > >   'py-sqlite' => 5,
> > > + 'qt4-sqlite2' => 5,
> > 
> > seems no pointing in keeping it around by adding it here? I would have
> > merged into the main package by adding @pkgpath x11/qt4,-sqlite2 to 
> > PLIST-main
> > instead.
> 
> Merging implies we still provide the sqlite2 bits, no?  I intend to not
> provide it and remove databases/sqlite eventually.
> 

No, just makes the old package vanish.



Re: CVS: cvs.openbsd.org: ports

2021-03-14 Thread Stuart Henderson
On 2021/03/11 05:17, Pascal Stumpf wrote:
> CVSROOT:  /cvs
> Module name:  ports
> Changes by:   pas...@cvs.openbsd.org  2021/03/11 05:17:22
> 
> Modified files:
>   lang/moarvm: Makefile distinfo 
>   lang/moarvm/patches: patch-Configure_pl patch-build_Makefile_in 
>patch-build_setup_pm 
>   lang/moarvm/pkg: PLIST 
>   lang/nqp   : Makefile distinfo 
>   lang/nqp/pkg   : DESCR PLIST 
>   lang/rakudo: Makefile distinfo 
>   lang/rakudo/patches: patch-src_core_Compiler_pm6 
>patch-tools_build_Makefile-Moar_in 
>   lang/rakudo/pkg: DESCR PLIST 
> Added files:
>   lang/nqp/patches: patch-Configure_pl 
>   lang/rakudo/patches: patch-Configure_pl 
> Removed files:
>   lang/moarvm/patches: patch-src_6model_reprs_MVMHash_c 
>patch-src_6model_serialization_c 
> 
> Log message:
> Update moarvm, nqp and rakudo to 2021.02.  This yields a working rakudo on
> amd64, aarch64, sparc64, powerpc and powerpc64.
> 
> Joint work with and ok gkoehler@
> 

nqp build fails:

In file included from /usr/local/include/moar/moar.h:121:
/usr/local/include/moar/core/threadcontext.h:5:10: fatal error: 'tommath.h' 
file not found
#include "tommath.h"
 ^~~ 



Re: Remove x11/qt4-sqlite2

2021-03-14 Thread Klemens Nanni
On Sun, Mar 14, 2021 at 02:54:42PM +, Stuart Henderson wrote:
> > @@ -2293,6 +2293,7 @@ my $obsolete_reason = {
> > 'lives' => 42,
> > 'py-wsgiproxy' => 5,
> > 'py-sqlite' => 5,
> > +   'qt4-sqlite2' => 5,
> 
> seems no pointing in keeping it around by adding it here? I would have
> merged into the main package by adding @pkgpath x11/qt4,-sqlite2 to PLIST-main
> instead.

Merging implies we still provide the sqlite2 bits, no?  I intend to not
provide it and remove databases/sqlite eventually.



Re: Remove x11/qt4-sqlite2

2021-03-14 Thread Stuart Henderson
On 2021/03/14 15:15, Klemens Nanni wrote:
> Nothing uses it and both Qt4 and sqlite2 are (being) deprecated.
> I've left patches untouched which have sqlite context, my amd64 is still
> running without databases/sqlite installed to see if it builds and
> packages fine after removing the -sqlite2 subpackage and its LIB_DEPENDS
> (which is pulled in at build time).
> 
> Assuming that `make package' works: OK?
> 
> Index: devel/quirks/Makefile
> ===
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.1226
> diff -u -p -r1.1226 Makefile
> --- devel/quirks/Makefile 14 Mar 2021 11:53:18 -  1.1226
> +++ devel/quirks/Makefile 14 Mar 2021 13:06:34 -
> @@ -5,7 +5,7 @@ CATEGORIES =  devel databases
>  DISTFILES =
>  
>  # API.rev
> -PKGNAME =quirks-3.613
> +PKGNAME =quirks-3.614
>  PKG_ARCH =   *
>  MAINTAINER = Marc Espie 
>  
> Index: devel/quirks/files/Quirks.pm
> ===
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.1240
> diff -u -p -r1.1240 Quirks.pm
> --- devel/quirks/files/Quirks.pm  14 Mar 2021 11:53:18 -  1.1240
> +++ devel/quirks/files/Quirks.pm  14 Mar 2021 13:06:34 -
> @@ -2293,6 +2293,7 @@ my $obsolete_reason = {
>   'lives' => 42,
>   'py-wsgiproxy' => 5,
>   'py-sqlite' => 5,
> + 'qt4-sqlite2' => 5,

seems no pointing in keeping it around by adding it here? I would have
merged into the main package by adding @pkgpath x11/qt4,-sqlite2 to PLIST-main
instead.

>  };
>  
>  # reasons for obsolete packages
> Index: x11/qt4/Makefile
> ===
> RCS file: /cvs/ports/x11/qt4/Makefile,v
> retrieving revision 1.165
> diff -u -p -r1.165 Makefile
> --- x11/qt4/Makefile  26 Jan 2021 18:29:01 -  1.165
> +++ x11/qt4/Makefile  14 Mar 2021 13:06:34 -
> @@ -10,14 +10,12 @@ COMMENT-examples =examples for qt4
>  COMMENT-html =   off-line html documentation for qt4
>  COMMENT-postgresql = PostgresSQL plugin for qt4
>  COMMENT-mysql =  MySQL plugin for qt4
> -COMMENT-sqlite2 =sqlite2 plugin for qt4
>  COMMENT-tds =tds plugin for qt4
>  
>  PKGNAME =qt4-${PKGVERSION}
>  PKGNAME-mysql =  qt4-mysql-${PKGVERSION}
>  PKGNAME-postgresql = qt4-postgresql-${PKGVERSION}
>  PKGNAME-examples =   qt4-examples-${PKGVERSION}
> -PKGNAME-sqlite2 =qt4-sqlite2-${PKGVERSION}
>  PKGNAME-tds =qt4-tds-${PKGVERSION}
>  PKGNAME-main =   qt4-${PKGVERSION}
>  PKGNAME-debug =  qt4-debug-${PKGVERSION}
> @@ -26,7 +24,6 @@ FULLPKGPATH-html =  ${BASE_PKGPATH},-html
>  REVISION-main =  24
>  REVISION-mysql = 8
>  REVISION-postgresql =7
> -REVISION-sqlite2 =   7
>  REVISION-tds =   7
>  REVISION-debug = 5
>  REVISION-examples =  10
> @@ -138,7 +135,7 @@ BUILD_DEPENDS +=  databases/postgresql,-s
>  BUILD_DEPENDS += print/cups,-libs
>  
>  MULTI_PACKAGES = -main -examples \
> - -html -mysql -postgresql -sqlite2 -tds
> + -html -mysql -postgresql -tds
>  
>  .if ${FLAVOR:Mdebug}
>  CONFIGURE_ARGS +=-debug
> @@ -182,11 +179,6 @@ WANTLIB-mysql =  ${sqlWANTLIB} mariadb
>  LIB_DEPENDS-postgresql =${BUILD_PKGPATH} \
>   databases/postgresql
>  WANTLIB-postgresql = ${sqlWANTLIB}  pq
> -
> -
> -LIB_DEPENDS-sqlite2 =${BUILD_PKGPATH} \
> - databases/sqlite
> -WANTLIB-sqlite2 =${sqlWANTLIB} sqlite
>  
>  
>  LIB_DEPENDS-tds =${BUILD_PKGPATH} \
> Index: x11/qt4/pkg/DESCR-sqlite2
> ===
> RCS file: x11/qt4/pkg/DESCR-sqlite2
> diff -N x11/qt4/pkg/DESCR-sqlite2
> --- x11/qt4/pkg/DESCR-sqlite2 15 May 2006 21:09:39 -  1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1 +0,0 @@
> -database plugin (sqlite2) for qt4.
> Index: x11/qt4/pkg/PLIST-sqlite2
> ===
> RCS file: x11/qt4/pkg/PLIST-sqlite2
> diff -N x11/qt4/pkg/PLIST-sqlite2
> --- x11/qt4/pkg/PLIST-sqlite2 18 Mar 2020 05:14:03 -  1.3
> +++ /dev/null 1 Jan 1970 00:00:00 -
> @@ -1,2 +0,0 @@
> -@comment $OpenBSD: PLIST-sqlite2,v 1.3 2020/03/18 05:14:03 tb Exp $
> -@so lib/qt4/plugins/sqldrivers/libqsqlite2.so
> 



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2021/03/14 08:35:07

Modified files:
devel/kf5  : kf5.port.mk 
devel/kf5/attica: distinfo 
devel/kf5/baloo: distinfo 
devel/kf5/baloo/pkg: PLIST-main 
devel/kf5/bluez-qt: distinfo 
devel/kf5/breeze-icons: distinfo 
devel/kf5/breeze-icons/pkg: PLIST 
devel/kf5/extra-cmake-modules: distinfo 
devel/kf5/extra-cmake-modules/pkg: PLIST 
devel/kf5/frameworkintegration: distinfo 
devel/kf5/kactivities: distinfo 
devel/kf5/kactivities-stats: distinfo 
devel/kf5/kapidox: distinfo 
devel/kf5/kapidox/pkg: PLIST 
devel/kf5/karchive: distinfo 
devel/kf5/kauth: distinfo 
devel/kf5/kbookmarks: distinfo 
devel/kf5/kcalendarcore: distinfo 
devel/kf5/kcmutils: distinfo 
devel/kf5/kcodecs: distinfo 
devel/kf5/kcompletion: distinfo 
devel/kf5/kconfig: distinfo 
devel/kf5/kconfigwidgets: distinfo 
devel/kf5/kcontacts: distinfo 
devel/kf5/kcoreaddons: distinfo 
devel/kf5/kcoreaddons/pkg: PLIST 
devel/kf5/kcrash: distinfo 
devel/kf5/kdav : distinfo 
devel/kf5/kdav/pkg: PLIST 
devel/kf5/kdbusaddons: distinfo 
devel/kf5/kdeclarative: distinfo 
devel/kf5/kded : distinfo 
devel/kf5/kdelibs4support: distinfo 
devel/kf5/kdesignerplugin: distinfo 
devel/kf5/kdesu: distinfo 
devel/kf5/kdewebkit: distinfo 
devel/kf5/kdnssd: Makefile distinfo 
devel/kf5/kdoctools: distinfo 
devel/kf5/kemoticons: distinfo 
devel/kf5/kfilemetadata: Makefile distinfo 
devel/kf5/kfilemetadata/pkg: PLIST-locale PLIST-main 
devel/kf5/kglobalaccel: distinfo 
devel/kf5/kguiaddons: distinfo 
devel/kf5/kholidays: distinfo 
devel/kf5/khtml: distinfo 
devel/kf5/ki18n: distinfo 
devel/kf5/kiconthemes: distinfo 
devel/kf5/kidletime: distinfo 
devel/kf5/kimageformats: distinfo 
devel/kf5/kinit: distinfo 
devel/kf5/kio  : distinfo 
devel/kf5/kio/pkg: PLIST 
devel/kf5/kirigami2: distinfo 
devel/kf5/kirigami2/pkg: PLIST 
devel/kf5/kitemmodels: distinfo 
devel/kf5/kitemviews: distinfo 
devel/kf5/kjobwidgets: distinfo 
devel/kf5/kjs  : distinfo 
devel/kf5/kjsembed: distinfo 
devel/kf5/kmediaplayer: distinfo 
devel/kf5/knewstuff: distinfo 
devel/kf5/knotifications: distinfo 
devel/kf5/knotifyconfig: distinfo 
devel/kf5/kpackage: distinfo 
devel/kf5/kparts: distinfo 
devel/kf5/kparts/pkg: PLIST 
devel/kf5/kpeople: distinfo 
devel/kf5/kplotting: distinfo 
devel/kf5/kpty : distinfo 
devel/kf5/kross: distinfo 
devel/kf5/krunner: distinfo 
devel/kf5/krunner/pkg: PLIST 
devel/kf5/kservice: distinfo 
devel/kf5/ktexteditor: distinfo 
devel/kf5/ktextwidgets: distinfo 
devel/kf5/kunitconversion: distinfo 
devel/kf5/kwallet: distinfo 
devel/kf5/kwidgetsaddons: distinfo 
devel/kf5/kwindowsystem: distinfo 
devel/kf5/kxmlgui: distinfo 
devel/kf5/kxmlrpcclient: distinfo 
devel/kf5/oxygen-icons: distinfo 
devel/kf5/plasma-framework: distinfo 
devel/kf5/plasma-framework/pkg: PLIST 
devel/kf5/prison: distinfo 
devel/kf5/purpose: distinfo 
devel/kf5/qqc2-desktop-style: distinfo 
devel/kf5/solid: distinfo 
devel/kf5/sonnet: distinfo 
devel/kf5/syndication: distinfo 
devel/kf5/syntax-highlighting: Makefile distinfo 
devel/kf5/threadweaver: distinfo 

Log message:
Update KDE Frameworks to 5.80.0

https://kde.org/announcements/frameworks/5/5.80.0/



Remove x11/qt4-sqlite2

2021-03-14 Thread Klemens Nanni
Nothing uses it and both Qt4 and sqlite2 are (being) deprecated.
I've left patches untouched which have sqlite context, my amd64 is still
running without databases/sqlite installed to see if it builds and
packages fine after removing the -sqlite2 subpackage and its LIB_DEPENDS
(which is pulled in at build time).

Assuming that `make package' works: OK?

Index: devel/quirks/Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.1226
diff -u -p -r1.1226 Makefile
--- devel/quirks/Makefile   14 Mar 2021 11:53:18 -  1.1226
+++ devel/quirks/Makefile   14 Mar 2021 13:06:34 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
 DISTFILES =
 
 # API.rev
-PKGNAME =  quirks-3.613
+PKGNAME =  quirks-3.614
 PKG_ARCH = *
 MAINTAINER =   Marc Espie 
 
Index: devel/quirks/files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.1240
diff -u -p -r1.1240 Quirks.pm
--- devel/quirks/files/Quirks.pm14 Mar 2021 11:53:18 -  1.1240
+++ devel/quirks/files/Quirks.pm14 Mar 2021 13:06:34 -
@@ -2293,6 +2293,7 @@ my $obsolete_reason = {
'lives' => 42,
'py-wsgiproxy' => 5,
'py-sqlite' => 5,
+   'qt4-sqlite2' => 5,
 };
 
 # reasons for obsolete packages
Index: x11/qt4/Makefile
===
RCS file: /cvs/ports/x11/qt4/Makefile,v
retrieving revision 1.165
diff -u -p -r1.165 Makefile
--- x11/qt4/Makefile26 Jan 2021 18:29:01 -  1.165
+++ x11/qt4/Makefile14 Mar 2021 13:06:34 -
@@ -10,14 +10,12 @@ COMMENT-examples =  examples for qt4
 COMMENT-html = off-line html documentation for qt4
 COMMENT-postgresql =   PostgresSQL plugin for qt4
 COMMENT-mysql =MySQL plugin for qt4
-COMMENT-sqlite2 =  sqlite2 plugin for qt4
 COMMENT-tds =  tds plugin for qt4
 
 PKGNAME =  qt4-${PKGVERSION}
 PKGNAME-mysql =qt4-mysql-${PKGVERSION}
 PKGNAME-postgresql =   qt4-postgresql-${PKGVERSION}
 PKGNAME-examples = qt4-examples-${PKGVERSION}
-PKGNAME-sqlite2 =  qt4-sqlite2-${PKGVERSION}
 PKGNAME-tds =  qt4-tds-${PKGVERSION}
 PKGNAME-main = qt4-${PKGVERSION}
 PKGNAME-debug =qt4-debug-${PKGVERSION}
@@ -26,7 +24,6 @@ FULLPKGPATH-html =${BASE_PKGPATH},-html
 REVISION-main =24
 REVISION-mysql =   8
 REVISION-postgresql =  7
-REVISION-sqlite2 = 7
 REVISION-tds = 7
 REVISION-debug =   5
 REVISION-examples =10
@@ -138,7 +135,7 @@ BUILD_DEPENDS +=databases/postgresql,-s
 BUILD_DEPENDS +=   print/cups,-libs
 
 MULTI_PACKAGES =   -main -examples \
-   -html -mysql -postgresql -sqlite2 -tds
+   -html -mysql -postgresql -tds
 
 .if ${FLAVOR:Mdebug}
 CONFIGURE_ARGS +=  -debug
@@ -182,11 +179,6 @@ WANTLIB-mysql =${sqlWANTLIB} mariadb
 LIB_DEPENDS-postgresql =${BUILD_PKGPATH} \
databases/postgresql
 WANTLIB-postgresql =   ${sqlWANTLIB}  pq
-
-
-LIB_DEPENDS-sqlite2 =  ${BUILD_PKGPATH} \
-   databases/sqlite
-WANTLIB-sqlite2 =  ${sqlWANTLIB} sqlite
 
 
 LIB_DEPENDS-tds =  ${BUILD_PKGPATH} \
Index: x11/qt4/pkg/DESCR-sqlite2
===
RCS file: x11/qt4/pkg/DESCR-sqlite2
diff -N x11/qt4/pkg/DESCR-sqlite2
--- x11/qt4/pkg/DESCR-sqlite2   15 May 2006 21:09:39 -  1.1
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1 +0,0 @@
-database plugin (sqlite2) for qt4.
Index: x11/qt4/pkg/PLIST-sqlite2
===
RCS file: x11/qt4/pkg/PLIST-sqlite2
diff -N x11/qt4/pkg/PLIST-sqlite2
--- x11/qt4/pkg/PLIST-sqlite2   18 Mar 2020 05:14:03 -  1.3
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,2 +0,0 @@
-@comment $OpenBSD: PLIST-sqlite2,v 1.3 2020/03/18 05:14:03 tb Exp $
-@so lib/qt4/plugins/sqldrivers/libqsqlite2.so



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Klemens Nanni
CVSROOT:/cvs
Module name:ports
Changes by: k...@cvs.openbsd.org2021/03/14 08:12:27

Modified files:
graphics/digikam: Makefile 

Log message:
Switch to proper sqlite version

Digikam 0.7.x required sqlite2, 0.8.x and ongoing need sqlite3.
We package 7.1.0.

OK rsadowski



Re: NEW: net/pidgin-skypeweb

2021-03-14 Thread Kevin Lo
On Sun, Mar 14, 2021 at 04:39:24AM -0600, Anthony J. Bentley wrote:
> 
> Kevin Lo writes:
> > On Mon, Mar 01, 2021 at 11:07:52AM +0800, Kevin Lo wrote:
> > > Hi,
> > > 
> > > This is a port of pidgin-skypeweb, a Skype (http) protocol plugin for 
> > > Pidgi
> > n.
> > > I have tested it on amd64.
> > > 
> > > Comments or OK ?
> 
> CONFIGURE_ARGS =   -DCMAKE_SHARED_LINKER_FLAGS="-L${LOCALBASE}/lib"
> 
> This line should not be necessary. Removing it causes the build to fail,
> which I assume is because of the 'link_directories()' call's relative
> position within CMakeLists.txt (cmake's upstream documentation says
> "The command will apply only to targets created after it is called").

Understood.  I used CMAKE_SHARED_LINKER_FLAGS because I thought it wouldn't 
require a patch :(

> Replace CONFIGURE_ARGS with this patch that moves it next to the call to
> include_directories() (and push the patch upstream), and the port is ok
> with me.

Thank you very much for taking the time to review my port.

> 
> $OpenBSD$
> 
> Index: skypeweb/CMakeLists.txt
> --- skypeweb/CMakeLists.txt.orig
> +++ skypeweb/CMakeLists.txt
> @@ -29,6 +29,10 @@ include_directories(
>  ${CMAKE_CURRENT_SOURCE_DIR}/purple2compat
>  )
>  
> +link_directories(
> +${PURPLE_LIBRARY_DIRS}
> +)
> +
>  set(SRC_LIST
>  skypeweb_connection.c
>  skypeweb_contacts.c
> @@ -47,11 +51,6 @@ target_link_libraries(${PROJECT_NAME}
>  ${GLIB2_LIBRARIES}
>  ${JSON-GLIB_LIBRARIES}
>  )
> -
> -link_directories(
> -${PURPLE_LIBRARY_DIRS}
> -)
> -
>  
>  #install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
>  exec_program("${PKG_CONFIG_EXECUTABLE} --variable=plugindir purple 
> 2>/dev/null"



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Solene Rapenne
CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2021/03/14 07:49:01

Modified files:
net/lagrange   : Makefile distinfo 

Log message:
Update to lagrange-1.2.3



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Sebastian Reitenbach
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2021/03/14 07:26:48

Modified files:
net/ruby-msgpack: Makefile distinfo 
net/ruby-msgpack/pkg: PLIST 

Log message:
update 1.3.3 -> 1.4.2



Re: [PATCH] Add cabal-module(5) man page

2021-03-14 Thread Klemens Nanni
On Sat, Mar 13, 2021 at 09:17:41PM -0800, Greg Steuck wrote:
> This is a companion of devel/cabal-bundler port describing how to make
> Haskell program ports. I'm fairly clueless about mdoc(7) and could use
> some help to get this into shape.
This looks quite fine already.  For mdoc you can prod

$ mandoc -T lint ./cabal-module.5
mandoc: cabal-module.5:64:15: WARNING: new sentence, new line
mandoc: cabal-module.5:130:61: WARNING: new sentence, new line
mandoc: cabal-module.5:138:2: WARNING: unusual Xr order: cabal(1) after 
port-modules(5)
mandoc: cabal-module.5:41:6: STYLE: referenced manual not found: Xr 
cabal 1 (5 times)

Fix the first three, then it's OK kn.

The last one you can ignore, i.e. cabal(1) does not have to be installed
for obvious reasons.



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/03/14 07:20:02

Modified files:
www: Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
www/py-urlgrabber: Makefile distinfo 
www/py-urlgrabber/pkg: PLIST 

Log message:
update py-urlgrabber (fixing build with newer py-curl) and move to py3



Update scdoc to 1.11.1

2021-03-14 Thread Martin Vahlensieck
Hi

Here is an update to scdoc version 1.11.1.  I also pledged it while
there (not sure what the ports policy is for adding pledge patches).

Best,

Martin


Index: Makefile
===
RCS file: /cvs/ports/textproc/scdoc/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- Makefile4 Apr 2020 16:58:26 -   1.2
+++ Makefile14 Mar 2021 13:17:04 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.2 2020/04/04 16:58:26 schwarze Exp $
 
 COMMENT =  convert scdoc text files to man(7) pages
-VERSION =  1.10.1
+VERSION =  1.11.1
 DISTNAME = scdoc-${VERSION}
 CATEGORIES =   textproc
 HOMEPAGE = https://git.sr.ht/~sircmpwn/scdoc
@@ -12,6 +12,7 @@ PERMIT_PACKAGE =  Yes
 MASTER_SITES = https://git.sr.ht/~sircmpwn/scdoc/
 DISTFILES =scdoc-{archive/}${VERSION}${EXTRACT_SUFX}
 
+# uses pledge(2)
 WANTLIB =  c
 
 USE_GMAKE =Yes
Index: distinfo
===
RCS file: /cvs/ports/textproc/scdoc/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo4 Apr 2020 16:58:26 -   1.2
+++ distinfo14 Mar 2021 13:17:04 -
@@ -1,2 +1,2 @@
-SHA256 (scdoc-1.10.1.tar.gz) = gOAhxzLMos1mWdzPMwbUb1nuy/j7qk2r21AvU3J4p48=
-SIZE (scdoc-1.10.1.tar.gz) = 12422
+SHA256 (scdoc-1.11.1.tar.gz) = EJih7S4IdZb8Cz9lfByKXgBBImeqS682GeNoJDBmRbE=
+SIZE (scdoc-1.11.1.tar.gz) = 12510
Index: patches/patch-src_main_c
===
RCS file: patches/patch-src_main_c
diff -N patches/patch-src_main_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_main_c14 Mar 2021 13:17:04 -
@@ -0,0 +1,25 @@
+$OpenBSD$
+
+--- src/main.c.old
 src/main.c
+@@ -15,6 +15,7 @@
+ 
+ char *strstr(const char *haystack, const char *needle);
+ char *strerror(int errnum);
++int pledge(const char *, const char *);
+ 
+ static struct str *parse_section(struct parser *p) {
+   struct str *section = str_create();
+@@ -755,6 +756,12 @@ int main(int argc, char **argv) {
+   fprintf(stderr, "Usage: scdoc < input.scd > output.roff\n");
+   return 1;
+   }
++
++  if (pledge("stdio", NULL) == -1) {
++  fprintf(stderr, "pledge: %s", strerror(errno));
++  exit(EXIT_FAILURE);
++  }
++
+   struct parser p = {
+   .input = stdin,
+   .output = stdout,



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Sebastian Reitenbach
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2021/03/14 07:13:25

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

Log message:
add quirk for py-puppetdb now python3 only



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Sebastian Reitenbach
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2021/03/14 07:11:16

Modified files:
databases  : Makefile 

Log message:
drop py2 flavor of py-puppetdb



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Sebastian Reitenbach
CVSROOT:/cvs
Module name:ports
Changes by: sebas...@cvs.openbsd.org2021/03/14 07:10:13

Modified files:
databases/py-puppetdb: Makefile distinfo 
databases/py-puppetdb/pkg: PLIST 

Log message:
update 2.2.0 -> 2.3.0
drop py2 flavor, nothing uses it



graphics/digikam: switch to correct sqlite3 dependency

2021-03-14 Thread Klemens Nanni
Digikam 0.7.x required sqlite(2), 0.8.x and ongoing needs sqlite3, so
this dependency is probably just a leftover.

The (only?) one consumer digitaglinktree(1) explicitly uses sqlite3.

OK?

Index: Makefile
===
RCS file: /cvs/ports/graphics/digikam/Makefile,v
retrieving revision 1.70
diff -u -p -r1.70 Makefile
--- Makefile26 Oct 2020 12:59:24 -  1.70
+++ Makefile14 Mar 2021 12:59:29 -
@@ -5,7 +5,7 @@ COMMENT =   KDE digital photo and video ma
 V =7.1.0
 DISTNAME = digikam-${V}
 CATEGORIES =   graphics
-REVISION = 0
+REVISION = 1
 
 HOMEPAGE = https://www.digikam.org/
 
@@ -53,7 +53,7 @@ BUILD_DEPENDS =   devel/bison \
misc/shared-desktop-ontologies \
multimedia/qtav
 
-RUN_DEPENDS =  databases/sqlite \
+RUN_DEPENDS =  databases/sqlite3 \
devel/desktop-file-utils \
devel/kf5/kdoctools \
multimedia/qtav \



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/03/14 05:53:18

Modified files:
databases  : Makefile 
devel/quirks   : Makefile 
devel/quirks/files: Quirks.pm 
Removed files:
databases/py-sqlite: Makefile distinfo 
databases/py-sqlite/pkg: DESCR PLIST 

Log message:
Drop unused 2004-vintage pysqlite. Python has current sqlite support in core.



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2021/03/14 05:50:02

Modified files:
www/epiphany   : Makefile distinfo 
www/epiphany/patches: patch-meson_build 

Log message:
update to epiphany-3.38.3



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2021/03/14 05:47:04

Modified files:
security/yubiserve: Makefile 

Log message:
drop unused py-sqlite dep, this uses python's built-in sqlite3 support



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Solene Rapenne
CVSROOT:/cvs
Module name:ports
Changes by: sol...@cvs.openbsd.org  2021/03/14 05:31:40

Modified files:
net/swirc  : Makefile distinfo 

Log message:
Update to swirc-3.2.7

Diff from maintainer Markus Uhlin



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Stefan Sperling
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2021/03/14 04:55:06

Modified files:
emulators/desmume: Makefile 
Added files:
emulators/desmume/patches: patch-src_gtk_main_cpp 

Log message:
Set a black background in desmume's main GTK window to prevent colored bars
around emulated screens in fullscreen mode. GTK's white default background
color is rather unpleasant to stare at for longer periods of time.

ok bentley (maintainer)



Re: NEW: net/pidgin-skypeweb

2021-03-14 Thread Anthony J. Bentley
Kevin Lo writes:
> On Mon, Mar 01, 2021 at 11:07:52AM +0800, Kevin Lo wrote:
> > Hi,
> > 
> > This is a port of pidgin-skypeweb, a Skype (http) protocol plugin for Pidgi
> n.
> > I have tested it on amd64.
> > 
> > Comments or OK ?

CONFIGURE_ARGS =   -DCMAKE_SHARED_LINKER_FLAGS="-L${LOCALBASE}/lib"

This line should not be necessary. Removing it causes the build to fail,
which I assume is because of the 'link_directories()' call's relative
position within CMakeLists.txt (cmake's upstream documentation says
"The command will apply only to targets created after it is called").

Replace CONFIGURE_ARGS with this patch that moves it next to the call to
include_directories() (and push the patch upstream), and the port is ok
with me.

$OpenBSD$

Index: skypeweb/CMakeLists.txt
--- skypeweb/CMakeLists.txt.orig
+++ skypeweb/CMakeLists.txt
@@ -29,6 +29,10 @@ include_directories(
 ${CMAKE_CURRENT_SOURCE_DIR}/purple2compat
 )
 
+link_directories(
+${PURPLE_LIBRARY_DIRS}
+)
+
 set(SRC_LIST
 skypeweb_connection.c
 skypeweb_contacts.c
@@ -47,11 +51,6 @@ target_link_libraries(${PROJECT_NAME}
 ${GLIB2_LIBRARIES}
 ${JSON-GLIB_LIBRARIES}
 )
-
-link_directories(
-${PURPLE_LIBRARY_DIRS}
-)
-
 
 #install(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
 exec_program("${PKG_CONFIG_EXECUTABLE} --variable=plugindir purple 2>/dev/null"



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Kirill Bychkov
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2021/03/14 04:38:10

Modified files:
graphics/posterazor: Makefile distinfo 
Added files:
graphics/posterazor/patches: patch-src_paintcanvas_cpp 
Removed files:
graphics/posterazor/patches: patch-src_FlPosteRazorDialog_cpp 

Log message:
update to posterazor-1.9.7



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/03/14 04:18:33

Modified files:
print/qpdf : Makefile distinfo 

Log message:
Update to qpdf-10.3.1.



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/03/14 04:16:31

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

Log message:
Update to dconf-0.40.0.



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/03/14 04:13:22

Modified files:
sysutils/terragrunt: Makefile distinfo 

Log message:
Update to terragrunt-0.28.11.



CVS: cvs.openbsd.org: ports

2021-03-14 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2021/03/14 03:55:27

Modified files:
sysutils/p5-Sys-Virt: Makefile distinfo 
sysutils/p5-Sys-Virt/pkg: PLIST 

Log message:
Update to p5-Sys-Virt-7.1.0.