Re: transmission_daemon silently freeze?

[Josh Grosse]

On Tue, May 21, 2024 at 08:37:26PM +0300, kasak wrote:
> 
> 03.05.2024 20:21, Josh Grosse ??:
> > On Fri, May 03, 2024 at 05:31:16PM +0300, kasak wrote:
> > > OpenBSD 7.5 GENERIC.MP#82 amd64
> > There's not enough information here to understand either the cause
> > or solution to your problem.
> > 
> > I happen to have pre-built, unsigned debug-* packages for 7.5-release on
> > amd64, for use with egdb (from devel/gdb).
> > 
> > https://jggimi.net/transmission/debug-transmission-4.0.5p0.tgz
> > https://jggimi.net/transmission/debug-transmission-qt-4.0.5p0.tgz
> > https://jggimi.net/transmission/debug-transmission-gtk-4.0.5p0.tgz
> > 
> > These may help you debug the problem.
> > 
> Some time has passed. Just want to inform you about my progress :)
> 
> Before I wrote you first time, transmission was freezing each day.
> I have installed your debug packages and since then, it freezed only two
> times. After 5 days, and after 15 :)
> 
> Unfortunately, it does not crash, it just freezes, so it does not leave me
> any debug.
> 
> I think it is not so frequently, and maybe I am alone with this problem, so,
> let it be :)

You may be able to recreate the problem while running transmission-daemon
as a foreground process (-f), from within egdb:

$ egdb transmission-daemon
GNU gdb (GDB) 9.2
Copyright (C) 2020 Free Software Foundation, Inc.
License ...

Reading symbols from transmission-daemon...
Reading symbols from /usr/local/bin/.debug/transmission-daemon.dbg...
(gdb) r -f

If it hangs, return to that terminal window, break execution with
ctrl-C, and then you might be able to debug from there.

Re: transmission_daemon silently freeze?

[Josh Grosse]

On Fri, May 03, 2024 at 05:31:16PM +0300, kasak wrote:
 
> OpenBSD 7.5 GENERIC.MP#82 amd64

There's not enough information here to understand either the cause
or solution to your problem.

I happen to have pre-built, unsigned debug-* packages for 7.5-release on
amd64, for use with egdb (from devel/gdb).  

https://jggimi.net/transmission/debug-transmission-4.0.5p0.tgz
https://jggimi.net/transmission/debug-transmission-qt-4.0.5p0.tgz
https://jggimi.net/transmission/debug-transmission-gtk-4.0.5p0.tgz

These may help you debug the problem.

Re: transmission_daemon silently freeze?

[Josh Grosse]

On Fri, May 03, 2024 at 11:26:00AM +0300, kasak wrote:
> i'm sorry for bothering.
> 
> my transmission_daemon freezes for unknown reason, I wanted to know is this
> some bug or troubles with my hardware?

I'm the maintainer for net/transmission.  I'm aware of one previously reported
issue with transmission-daemon, where it hangs on start when executed in a
rtable other than the default rtable 0. (I know it's an issue with 
libcurl-multi,
but as yet I have not determined the root cause.)

Your problem appears to be different, since the daemon is able to operate on 
start,
and hangs later.

Are you running 7.5?  -current?  Are you on amd64? Another architecture?

> Freezes happens after day or so. rcctl and ps both show me that daemon is
> running, but i can't connect to web ui and torrents are not downloading or
> uploading
> 
> this is frozen daemon:
> 
> mx$ curl -v gw:9091
> * Host gw:9091 was resolved.
> * IPv6: (none)
> * IPv4: 192.168.0.1
> * Trying 192.168.0.1:9091...
> * Connected to gw (192.168.0.1) port 9091
> > GET / HTTP/1.1
> > Host: gw:9091
> > User-Agent: curl/8.7.1
> > Accept: */*
> >
> * Request completely sent off
> 
> ^C
> 
> and after restarting it, it works as should:
> 
> mx$ doas rcctl restart transmission_daemon
> transmission_daemon(ok)
> transmission_daemon(ok)
> mx$ curl -v gw:9091
> * Host gw:9091 was resolved.
> * IPv6: (none)
> * IPv4: 192.168.0.1
> * Trying 192.168.0.1:9091...
> * Connected to gw (192.168.0.1) port 9091
> > GET / HTTP/1.1
> > Host: gw:9091
> > User-Agent: curl/8.7.1
> > Accept: */*
> >
> * Request completely sent off
> < HTTP/1.1 301 Moved Permanently
> < Server: Transmission
> < Access-Control-Allow-Origin: *
> < Location: /transmission/web/
> < Date: Fri, 03 May 2024 08:03:26 GMT
> < Content-Length: 31
> < Content-Type: text/html; charset=ISO-8859-1
> <
> * Connection #0 to host gw left intact
> 301: Moved Permanentlymx$
> 
> i think this behavior appeared since 7.5.
> 
> Am I alone with this or maybe someone hit this too?
> 
> And I forgot to mention, no logs from transmission_daemon appearing before
> or after freeze
> 

Re: [update] shells/tcsh 6.24.07 -> 6.24.10

[Josh Grosse]

On Tue, Jan 09, 2024 at 08:34:52AM +0100, Rafael Sadowski wrote:
> On Mon Jan 08, 2024 at 05:40:50PM -0500, Josh Grosse wrote:
> > Ping.
> 
> Thanks Josh Grosse.
> 
> Committed with missing patches updates (make update-patches).

Thank you for catching that!  When a `make patch` is successful
I seem to assume that there are no changes, when instead patch(1)
is able to determine and correct minor line number errors in a
unified diff.

Thanks, again!  It's appreciated.

Re: [update] shells/tcsh 6.24.07 -> 6.24.10

[Josh Grosse]

Ping.

On Thu, Dec 28, 2023 at 01:44:15PM -0500, Josh Grosse wrote:
> I've been using this minor update on amd64 for a week
> without any issues.

> diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
> index 9d88e16c1c5..57525949880 100644
> --- a/shells/tcsh/Makefile
> +++ b/shells/tcsh/Makefile
> @@ -1,6 +1,6 @@
>  COMMENT= extended C-shell with many useful features
>  
> -DISTNAME=tcsh-6.24.07
> +DISTNAME=tcsh-6.24.10
>  CATEGORIES=  shells
>  HOMEPAGE=https://www.tcsh.org/
>  
> diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
> index 9888bbfe496..e4b94f0cf0b 100644
> --- a/shells/tcsh/distinfo
> +++ b/shells/tcsh/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (tcsh-6.24.07.tar.gz) = dOTpgFy9lBPtNLT/odcvyNDvgaW3lHaFQJFBbOkzaZU=
> -SIZE (tcsh-6.24.07.tar.gz) = 946889
> +SHA256 (tcsh-6.24.10.tar.gz) = E0dcD763QTnTPteTvwD/u7KsLcn7HURGekEHYKujZmQ=
> +SIZE (tcsh-6.24.10.tar.gz) = 956578

[update] shells/tcsh 6.24.07 -> 6.24.10

[Josh Grosse]

I've been using this minor update on amd64 for a week
without any issues.
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index 9d88e16c1c5..57525949880 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -1,6 +1,6 @@
 COMMENT=   extended C-shell with many useful features
 
-DISTNAME=  tcsh-6.24.07
+DISTNAME=  tcsh-6.24.10
 CATEGORIES=shells
 HOMEPAGE=  https://www.tcsh.org/
 
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index 9888bbfe496..e4b94f0cf0b 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcsh-6.24.07.tar.gz) = dOTpgFy9lBPtNLT/odcvyNDvgaW3lHaFQJFBbOkzaZU=
-SIZE (tcsh-6.24.07.tar.gz) = 946889
+SHA256 (tcsh-6.24.10.tar.gz) = E0dcD763QTnTPteTvwD/u7KsLcn7HURGekEHYKujZmQ=
+SIZE (tcsh-6.24.10.tar.gz) = 956578

[update] net/transmission 4.0.5

[Josh Grosse]

Attached is a minor update from 4.0.4 to 4.0.5, described
upstream as a bug fix release.

The gtk, qt, and web clients (this last with transmission-daemon)
have been lightly tested on amd64.  The change log follows.

-

Highlights

* Fixed 4.0.0 bug where the IP address field in UDP announces were not
  encoded in network byte order. [BEP-15]. (#6132)

* Fixed a bug that incorrectly escaped JSON strings in some locales.
  (#6005, #6133)

* Fixed 4.0.4 decreased download speeds for people who set a low upload
  bandwidth limit. (#6134)

All Platforms

* Fixed bug that prevented editing trackers on magnet links. (#5957)

* Fixed HTTP tracker announces and scrapes sometimes failing after
  adding a torrent file by HTTPS URL. (#5969)

* In RPC responses, change the default sort order of torrents to match
  Transmission 3.00. (#5604)

* Fixed tr_sys_path_copy() behavior on some Synology Devices. (#5974)

Qt Client

* Fix: only append .added suffix to watchdir files. (#5705)

GTK Client

* Fixed crash when opening torrent file from "Recently used" section in
  GTK 4. (#6131, #6142)
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index e10eef5ef99..b2b5f3ff3dd 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,7 +2,7 @@ COMMENT-main=   BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   4.0.4
+VER=   4.0.5
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
diff --git a/net/transmission/distinfo b/net/transmission/distinfo
index 77eb8ce..644e3f51975 100644
--- a/net/transmission/distinfo
+++ b/net/transmission/distinfo
@@ -1,2 +1,2 @@
-SHA256 (transmission-4.0.4.tar.xz) = 
Ffe0MY/fv/sZqo2aaw/Yk0jm7x6GuqIaCAb/0Yk71aY=
-SIZE (transmission-4.0.4.tar.xz) = 9755152
+SHA256 (transmission-4.0.5.tar.xz) = 
/Wj/EUpHkgAEPDDH5p26TBky9682ykxbXS7ctYZuY1c=
+SIZE (transmission-4.0.5.tar.xz) = 9745756
diff --git a/net/transmission/pkg/PLIST-main b/net/transmission/pkg/PLIST-main
index 65d196e2731..fa3fe3bf428 100644
--- a/net/transmission/pkg/PLIST-main
+++ b/net/transmission/pkg/PLIST-main
@@ -60,6 +60,7 @@ share/doc/transmission/news/news-4.0.1.md
 share/doc/transmission/news/news-4.0.2.md
 share/doc/transmission/news/news-4.0.3.md
 share/doc/transmission/news/news-4.0.4.md
+share/doc/transmission/news/news-4.0.5.md
 share/doc/transmission/rpc-spec.md
 share/doc/transmission/send-email-when-torrent-done.sh
 @comment XXX update-plist(1) really wants this here, but -main is CLI only
@@ -76,7 +77,8 @@ share/transmission/public_html/images/favicon.ico
 share/transmission/public_html/images/favicon.png
 share/transmission/public_html/images/webclip-icon.png
 share/transmission/public_html/index.html
+share/transmission/public_html/transmission-app.css
 share/transmission/public_html/transmission-app.js
-share/transmission/public_html/transmission-app.js.LICENSE.txt
+share/transmission/public_html/transmission-app.js.LEGAL.txt
 @comment XXX update-plist(1) really wants this here, but -main is CLI only
 @comment @tag gtk-update-icon-cache %D/share/icons/hicolor

Re: [update] net/transmission 4.0.4

[Josh Grosse]

ping.

On Mon, Sep 18, 2023 at 08:42:01PM -0400, Josh Grosse wrote:
> This is an update from 4.0.3 to 4.0.4.  Lightly tested
> the -gtk, -qt, and -daemon binaries on amd64.
> 

> diff --git a/net/transmission/Makefile b/net/transmission/Makefile
> index ce94928b0ad..d5070c72809 100644
> --- a/net/transmission/Makefile
> +++ b/net/transmission/Makefile
> @@ -2,7 +2,7 @@ COMMENT-main= BitTorrent command line and daemon client
>  COMMENT-gtk= BitTorrent client with GTK+ interface
>  COMMENT-qt=  BitTorrent client with Qt interface
>  
> -VER= 4.0.3
> +VER= 4.0.4
>  DISTNAME=transmission-${VER}
>  PKGNAME-main=transmission-${VER}
>  PKGNAME-gtk= transmission-gtk-${VER}
> @@ -10,9 +10,6 @@ PKGNAME-qt= transmission-qt-${VER}
>  CATEGORIES=  net
>  HOMEPAGE=    https://transmissionbt.com/
>  MAINTAINER=  Josh Grosse 
> -REVISION-gtk=1
> -REVISION-main=   1
> -REVISION-qt= 1
>  
>  # GPLv2+
>  PERMIT_PACKAGE=  Yes
> diff --git a/net/transmission/distinfo b/net/transmission/distinfo
> index 438c9be7cc0..77eb8ce 100644
> --- a/net/transmission/distinfo
> +++ b/net/transmission/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (transmission-4.0.3.tar.xz) = 
> trAf1Y5CuxT3q6AlPbkyztBQ/NK7pdn4Rp133ditVFo=
> -SIZE (transmission-4.0.3.tar.xz) = 10062044
> +SHA256 (transmission-4.0.4.tar.xz) = 
> Ffe0MY/fv/sZqo2aaw/Yk0jm7x6GuqIaCAb/0Yk71aY=
> +SIZE (transmission-4.0.4.tar.xz) = 9755152
> diff --git a/net/transmission/patches/patch-cli_cli_cc 
> b/net/transmission/patches/patch-cli_cli_cc
> deleted file mode 100644
> index dd129a87d74..000
> --- a/net/transmission/patches/patch-cli_cli_cc
> +++ /dev/null
> @@ -1,14 +0,0 @@
> -PR 5424 - fix from upstream
> -Index: cli/cli.cc
>  cli/cli.cc.orig
> -+++ cli/cli.cc
> -@@ -257,7 +257,8 @@ int tr_main(int argc, char* argv[])
> - 
> - tr_ctorSetPaused(ctor, TR_FORCE, false);
> - 
> --if (tr_ctorSetMetainfoFromFile(ctor, torrentPath, nullptr) || 
> tr_ctorSetMetainfoFromMagnetLink(ctor, torrentPath, nullptr))
> -+if (tr_sys_path_exists(torrentPath) ? tr_ctorSetMetainfoFromFile(ctor, 
> torrentPath, nullptr) :
> -+  
> tr_ctorSetMetainfoFromMagnetLink(ctor, torrentPath, nullptr))
> - {
> - // all good
> - }

[update] net/transmission 4.0.4

[Josh Grosse]

This is an update from 4.0.3 to 4.0.4.  Lightly tested
the -gtk, -qt, and -daemon binaries on amd64.

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index ce94928b0ad..d5070c72809 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,7 +2,7 @@ COMMENT-main=   BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   4.0.3
+VER=   4.0.4
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -10,9 +10,6 @@ PKGNAME-qt=   transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  1
-REVISION-main= 1
-REVISION-qt=   1
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
diff --git a/net/transmission/distinfo b/net/transmission/distinfo
index 438c9be7cc0..77eb8ce 100644
--- a/net/transmission/distinfo
+++ b/net/transmission/distinfo
@@ -1,2 +1,2 @@
-SHA256 (transmission-4.0.3.tar.xz) = 
trAf1Y5CuxT3q6AlPbkyztBQ/NK7pdn4Rp133ditVFo=
-SIZE (transmission-4.0.3.tar.xz) = 10062044
+SHA256 (transmission-4.0.4.tar.xz) = 
Ffe0MY/fv/sZqo2aaw/Yk0jm7x6GuqIaCAb/0Yk71aY=
+SIZE (transmission-4.0.4.tar.xz) = 9755152
diff --git a/net/transmission/patches/patch-cli_cli_cc 
b/net/transmission/patches/patch-cli_cli_cc
deleted file mode 100644
index dd129a87d74..000
--- a/net/transmission/patches/patch-cli_cli_cc
+++ /dev/null
@@ -1,14 +0,0 @@
-PR 5424 - fix from upstream
-Index: cli/cli.cc
 cli/cli.cc.orig
-+++ cli/cli.cc
-@@ -257,7 +257,8 @@ int tr_main(int argc, char* argv[])
- 
- tr_ctorSetPaused(ctor, TR_FORCE, false);
- 
--if (tr_ctorSetMetainfoFromFile(ctor, torrentPath, nullptr) || 
tr_ctorSetMetainfoFromMagnetLink(ctor, torrentPath, nullptr))
-+if (tr_sys_path_exists(torrentPath) ? tr_ctorSetMetainfoFromFile(ctor, 
torrentPath, nullptr) :
-+  
tr_ctorSetMetainfoFromMagnetLink(ctor, torrentPath, nullptr))
- {
- // all good
- }

Re: [revision] fix missing libdep for net/transmission

[Josh Grosse]

On Fri, Sep 15, 2023 at 07:53:16PM +0200, Antoine Jacoutot wrote:
> I don???t think icewm is in scope for this change :-) 

Oh, man.  Sorry for the trailing garbage.

The "v3" attached used `$ git diff master transmission .` and should
only have the appropriate commit.
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 335908e903f..ce94928b0ad 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -10,9 +10,9 @@ PKGNAME-qt=   transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=    Josh Grosse 
-REVISION-gtk=  0
-REVISION-main= 0
-REVISION-qt=   0
+REVISION-gtk=  1
+REVISION-main= 1
+REVISION-qt=   1
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
@@ -31,7 +31,8 @@ FLAVOR?=
 
 .include 
 
-WANTLIB-common =   ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp psl 
ssl
+WANTLIB-common =   ${COMPILER_LIBCXX} c crypto curl deflate
+WANTLIB-common +=  m miniupnpc natpmp psl ssl
 
 WANTLIB-main = ${WANTLIB-common}
 
@@ -46,7 +47,8 @@ WANTLIB-qt += Qt6Widgets
 MODULES += devel/cmake \
textproc/intltool
 
-LIB_DEPENDS-common +=  net/curl \
+LIB_DEPENDS-common +=  archivers/libdeflate \
+   net/curl \
net/libpsl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc>=1.9

Re: [revision] fix missing libdep for net/transmission

[Josh Grosse]

On Fri, Sep 15, 2023 at 07:31:00PM +0200, Antoine Jacoutot wrote:
> On Fri, Sep 15, 2023 at 12:22:59PM -0400, Josh Grosse wrote:
> > During bulk build, naddy@ took note of a missing libdep
> > in net/transmission's Makefile.  The build failed to
> > find libdeflate due to the bulk build's junk removal.
> > 
> > This patch adds the explicit libdep.  Builds and runs on amd64.
> 
> Have you run port-lib-depends-check?
> Because if you add an LDEP you need the corresponding WANTLIB (deflate in this
> case).

Revised diff attached.  Thank you for catching my error! 
 
> 
> > diff --git a/net/transmission/Makefile b/net/transmission/Makefile
> > index 335908e903f..e2cf1338446 100644
> > --- a/net/transmission/Makefile
> > +++ b/net/transmission/Makefile
> > @@ -10,9 +10,9 @@ PKGNAME-qt=   transmission-qt-${VER}
> >  CATEGORIES=    net
> >  HOMEPAGE=  https://transmissionbt.com/
> >  MAINTAINER=Josh Grosse 
> > -REVISION-gtk=  0
> > -REVISION-main= 0
> > -REVISION-qt=   0
> > +REVISION-gtk=  1
> > +REVISION-main= 1
> > +REVISION-qt=   1
> >  
> >  # GPLv2+
> >  PERMIT_PACKAGE=Yes
> > @@ -46,7 +46,8 @@ WANTLIB-qt += Qt6Widgets
> >  MODULES += devel/cmake \
> > textproc/intltool
> >  
> > -LIB_DEPENDS-common +=  net/curl \
> > +LIB_DEPENDS-common +=  archivers/libdeflate \
> > +   net/curl \
> > net/libpsl \
> > net/miniupnp/libnatpmp \
> > net/miniupnp/miniupnpc>=1.9
> 
> 
> -- 
> Antoine
> 
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 335908e903f..ce94928b0ad 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -10,9 +10,9 @@ PKGNAME-qt=   transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  0
-REVISION-main= 0
-REVISION-qt=   0
+REVISION-gtk=  1
+REVISION-main= 1
+REVISION-qt=   1
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
@@ -31,7 +31,8 @@ FLAVOR?=
 
 .include 
 
-WANTLIB-common =   ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp psl 
ssl
+WANTLIB-common =   ${COMPILER_LIBCXX} c crypto curl deflate
+WANTLIB-common +=  m miniupnpc natpmp psl ssl
 
 WANTLIB-main = ${WANTLIB-common}
 
@@ -46,7 +47,8 @@ WANTLIB-qt += Qt6Widgets
 MODULES += devel/cmake \
textproc/intltool
 
-LIB_DEPENDS-common +=  net/curl \
+LIB_DEPENDS-common +=  archivers/libdeflate \
+   net/curl \
net/libpsl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc>=1.9
diff --git a/x11/icewm/Makefile b/x11/icewm/Makefile
index acfc9f06d54..194ff976136 100644
--- a/x11/icewm/Makefile
+++ b/x11/icewm/Makefile
@@ -1,7 +1,7 @@
 # unconditionally uses machine/apmvar.h and related structures/defines
 ONLY_FOR_ARCHS=${APM_ARCHS}
 
-V= 3.4.2
+V= 3.4.1
 COMMENT=   small and fast window manager
 DISTNAME=  icewm-${V}
 EXTRACT_SUFX=  .tar.lz
diff --git a/x11/icewm/distinfo b/x11/icewm/distinfo
index ef2f7d1cca7..bd4c1271441 100644
--- a/x11/icewm/distinfo
+++ b/x11/icewm/distinfo
@@ -1,2 +1,2 @@
-SHA256 (icewm-3.4.2.tar.lz) = tkxLPlh+IB7kvkjna16UupH8cTkoEnV9h3601EEWceI=
-SIZE (icewm-3.4.2.tar.lz) = 1828756
+SHA256 (icewm-3.4.1.tar.lz) = mZiONdDtO4ftIx5+ikS7KmfLNkUzcrLpEVlqkU1MJzs=
+SIZE (icewm-3.4.1.tar.lz) = 1828032

[revision] fix missing libdep for net/transmission

[Josh Grosse]

During bulk build, naddy@ took note of a missing libdep
in net/transmission's Makefile.  The build failed to
find libdeflate due to the bulk build's junk removal.

This patch adds the explicit libdep.  Builds and runs on amd64.
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 335908e903f..e2cf1338446 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -10,9 +10,9 @@ PKGNAME-qt=   transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  0
-REVISION-main= 0
-REVISION-qt=   0
+REVISION-gtk=  1
+REVISION-main= 1
+REVISION-qt=   1
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
@@ -46,7 +46,8 @@ WANTLIB-qt += Qt6Widgets
 MODULES += devel/cmake \
textproc/intltool
 
-LIB_DEPENDS-common +=  net/curl \
+LIB_DEPENDS-common +=  archivers/libdeflate \
+   net/curl \
net/libpsl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc>=1.9

[update] net/transmission 4.0.3

[Josh Grosse]

Attached is an update for net/transmission from 4.0.2 to 4.0.3.

4.0.3 is a minor bugfix release.

This diff includes a new patch from upstream for their PR #5424
to fix a problem reported to ports@ by Raf Czlonka yesterday:

 https://marc.info/?t=16819898542=1=2

The patch has been tested by both Raf and by me.
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 6cd2ce7db45..a90da8abdc3 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,7 +2,7 @@ COMMENT-main=   BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-VER=   4.0.2
+VER=   4.0.3
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
diff --git a/net/transmission/distinfo b/net/transmission/distinfo
index ec566e87c0f..438c9be7cc0 100644
--- a/net/transmission/distinfo
+++ b/net/transmission/distinfo
@@ -1,2 +1,2 @@
-SHA256 (transmission-4.0.2.tar.xz) = 
Ob96EEpyKAWp3Aic2q/+M7+QuCIwp+p/NAyuWfAKLug=
-SIZE (transmission-4.0.2.tar.xz) = 10055708
+SHA256 (transmission-4.0.3.tar.xz) = 
trAf1Y5CuxT3q6AlPbkyztBQ/NK7pdn4Rp133ditVFo=
+SIZE (transmission-4.0.3.tar.xz) = 10062044
diff --git a/net/transmission/patches/patch-cli_cli_cc 
b/net/transmission/patches/patch-cli_cli_cc
new file mode 100644
index 000..dd129a87d74
--- /dev/null
+++ b/net/transmission/patches/patch-cli_cli_cc
@@ -0,0 +1,14 @@
+PR 5424 - fix from upstream
+Index: cli/cli.cc
+--- cli/cli.cc.orig
 cli/cli.cc
+@@ -257,7 +257,8 @@ int tr_main(int argc, char* argv[])
+ 
+ tr_ctorSetPaused(ctor, TR_FORCE, false);
+ 
+-if (tr_ctorSetMetainfoFromFile(ctor, torrentPath, nullptr) || 
tr_ctorSetMetainfoFromMagnetLink(ctor, torrentPath, nullptr))
++if (tr_sys_path_exists(torrentPath) ? tr_ctorSetMetainfoFromFile(ctor, 
torrentPath, nullptr) :
++  
tr_ctorSetMetainfoFromMagnetLink(ctor, torrentPath, nullptr))
+ {
+ // all good
+ }
diff --git a/net/transmission/pkg/PLIST-main b/net/transmission/pkg/PLIST-main
index 383529f755a..29e2f7d32e0 100644
--- a/net/transmission/pkg/PLIST-main
+++ b/net/transmission/pkg/PLIST-main
@@ -58,6 +58,7 @@ share/doc/transmission/news/news-4.0.0-beta-3.md
 share/doc/transmission/news/news-4.0.0.md
 share/doc/transmission/news/news-4.0.1.md
 share/doc/transmission/news/news-4.0.2.md
+share/doc/transmission/news/news-4.0.3.md
 share/doc/transmission/rpc-spec.md
 share/doc/transmission/send-email-when-torrent-done.sh
 @comment XXX update-plist(1) really wants this here, but -main is CLI only

Re: UPDATE: pianobar 2022.04.01

[Josh Grosse]

On Tue, Apr 18, 2023 at 08:08:45PM -0400, Brad Smith wrote:
> Here is an update to pianobar 2022.04.01.
> 
> 
> Release 2022.04.01
> 
> - Not a joke
> - Fix compilation with ffmpeg 5.0 and replace deprecated function
> - Improved retry handling with unreliable HTTP proxies
> - Minor UI improvements

Lightly tested on amd64.

Re: [net/transmission] issues with magnet links after port update to 4.0.2

[Josh Grosse]

On Thu, Apr 20, 2023 at 12:23:38PM +0100, Raf Czlonka wrote:
> Hello,
> 
> Recent transmission port update brought some issues related to
> magnet links when used with transmission-cli - essentially, the
> error/warning messages are the same as the ones reported for
> transmission-remote[0][1], e.g.:
> 
>   $ transmission-cli 
> "magnet:?xt=urn:btih:ad377e33a5ad91a2291564c96af534e1d87336bb=FreeBSD-13.2-RELEASE-amd64-mini-memstick.img.xz"
>   transmission-cli 4.0.2 (2a57b17031)
>   [2023-04-20 12:13:06.455] utils.cc:76: Couldn't read 
> 'magnet:?xt=urn:btih:ad377e33a5ad91a2291564c96af534e1d87336bb=FreeBSD-13.2-RELEASE-amd64-mini-memstick.img.xz':
>  No such file or directory (2)
> 
> Both issues with transmission-remote were fixed before 4.0.2 got
> released[2] but transmission-cli remains affected.
> 
> Also, 4.0.3 has been released last week so perhaps update/fix could
> be combined?
> 
> [0] https://github.com/transmission/transmission/issues/5028
> [1] https://github.com/transmission/transmission/issues/5073
> [2] https://github.com/transmission/transmission/pull/5088
> [3] https://github.com/transmission/transmission/releases/tag/4.0.3
> 
> Regards,
> 
> Raf
> 
> P.S. I'm not subscribed to ports@ mailing list so please CC me if need be.

Thank you for the report!  I can reproduce the problem with 4.0.3, and I've
opened PR 5424 with upstream to resolve. 

https://github.com/transmission/transmission/issues/5424

Re: [update] net/transmission 4.0.2

[Josh Grosse]

On Wed, Apr 12, 2023 at 12:18:47AM +0300, Kirill Bychkov wrote:
> On Fri, April 7, 2023 14:35, Josh Grosse wrote:
> > On Fri, Apr 07, 2023 at 10:30:22AM +0100, Stuart Henderson wrote:
> >> ..
> >> > +LIB_DEPENDS-common +=   net/curl net/libpsl net/miniupnp/libnatpmp
> >> > +LIB_DEPENDS-common +=   net/miniupnp/miniupnpc>=1.9
> >>
> >> would prefer one-per-line in LIB_DEPENDS like other ports do
> >
> > Done.
> >
> >> ..
> >> > +share/metainfo/
> >> > +share/metainfo/transmission-gtk.metainfo.xml
> >>
> >> that should be in PLIST-gtk
> >
> > Thank you for catching this. Corrected.
> >
> Hi,
> I guess share/transmission/translations/transmission_*.qm should go to
> PLIST-qt, not PLIST-main. Spotted while running update-plist with 
> FLAVOR=no_qt.
 
Thank you, Kirill!  "v3" diff attached.
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 3deb9382f4a..cf5cbfa77a5 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,10 +2,7 @@ COMMENT-main=  BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-NOT_FOR_ARCHS-gtk= sparc64
-NOT_FOR_ARCHS-qt= sparc64
-
-VER=   3.00
+VER=   4.0.2
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -13,22 +10,17 @@ PKGNAME-qt= transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  2
-REVISION-main= 2
-REVISION-qt=   2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  
https://github.com/transmission/transmission-releases/raw/master/
+MASTER_SITES=  
https://github.com/transmission/transmission/releases/download/${VER}/
 EXTRACT_SUFX=  .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt= ${MODGCC4_ARCHS} ${CLANG_ARCHS}
-
+# gnu++17
 COMPILER = base-clang ports-gcc
-COMPILER_LANGS =   c
 
 
 PSEUDO_FLAVORS=no_gtk no_qt
@@ -36,84 +28,56 @@ FLAVOR?=
 
 .include 
 
-WANTLIB-common=c crypto curl event_core event_extra m miniupnpc>=2.0 \
-   natpmp pthread ssl z intl
-WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
-WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
-   Xext Xfixes Xi Xinerama Xrandr Xrender \
-   atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
-   expat ffi fontconfig freetype fribidi \
-   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 graphite2 gthread-2.0 gtk-3 \
-   harfbuzz pango-1.0 pangoft2-1.0 \
-   pangocairo-1.0 pixman-1 png pcre2-8 xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv \
-   Xau Xdmcp execinfo jpeg ${COMPILER_LIBCXX}
-WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
-   fontconfig freetype $(COMPILER_LIBCXX)
-
-MODULES+=  textproc/intltool
-
-LIB_DEPENDS-common=devel/gettext,-runtime \
-   devel/libevent2 \
-   net/curl \
-   net/miniupnp/libnatpmp \
-   net/miniupnp/miniupnpc>=1.9
-LIB_DEPENDS-main=${LIB_DEPENDS-common}
-LIB_DEPENDS-gtk=${LIB_DEPENDS-common} \
-   x11/gtk+3
-LIB_DEPENDS-qt=${LIB_DEPENDS-common} \
-   ${MODQT_LIB_DEPENDS}
-
-RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
-   devel/desktop-file-utils \
-   x11/gtk+3,-guic
-RUN_DEPENDS-qt=${PKGNAME-main}:${BUILD_PKGPATH} \
-   devel/desktop-file-utils
-
-USE_GMAKE= Yes
-CONFIGURE_STYLE=gnu
-
-CONFIGURE_ARGS=--disable-shared \
-   --enable-cli \
-   --enable-external-natpmp
-
-# -I$(top_builddir)/third-party is required, but configure fails to
-# set it if we use external miniupnp libs.
-
-CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib"
+WANTLIB-common =   ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp psl 
ssl
 
-.if ${BUILD_PACKAGES:M-qt}
-MODULES+=  devel/qmake x11/qt5
-COMPILER_LANGS +=  c++
-# avoid setting LINK=
-MODQT5_USE_CXX11=  No
-MODQMAKE_PROJECTS= qt/qtr.pro
-CONFIGURE_STYLE+=  qmake
-SEPARATE_BUILD=No
-MODQMAKE_INSTALL_ROOT= ${PREFIX}
-.endif
+WANTLIB-main = ${WANTLIB-common}
 
-.if !${BUILD_PACKAGES:M-gtk}
-CONFIGURE_ARGS+=--without-gtk
-.endif
+WANTLIB-gtk += ${WANTLIB-common} atk-1.0 atkmm-1.6 cairo cairo-gobject
+WANTLIB-gtk += cairomm-1.0 gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0
+WANTLIB-gtk += giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 gtk-3 gtkmm-3.0
+WANTLIB-gtk += harfbuzz intl pango-1.0 pangocairo-1.0

Re: [update] net/transmission 4.0.2

[Josh Grosse]

On Fri, Apr 07, 2023 at 10:30:22AM +0100, Stuart Henderson wrote:
> ..
> > +LIB_DEPENDS-common +=  net/curl net/libpsl net/miniupnp/libnatpmp
> > +LIB_DEPENDS-common +=  net/miniupnp/miniupnpc>=1.9
> 
> would prefer one-per-line in LIB_DEPENDS like other ports do

Done.
 
> ..
> > +share/metainfo/
> > +share/metainfo/transmission-gtk.metainfo.xml
> 
> that should be in PLIST-gtk
 
Thank you for catching this. Corrected.
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 3deb9382f4a..cf5cbfa77a5 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,10 +2,7 @@ COMMENT-main=  BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-NOT_FOR_ARCHS-gtk= sparc64
-NOT_FOR_ARCHS-qt= sparc64
-
-VER=   3.00
+VER=   4.0.2
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -13,22 +10,17 @@ PKGNAME-qt= transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  2
-REVISION-main= 2
-REVISION-qt=   2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  
https://github.com/transmission/transmission-releases/raw/master/
+MASTER_SITES=  
https://github.com/transmission/transmission/releases/download/${VER}/
 EXTRACT_SUFX=  .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt= ${MODGCC4_ARCHS} ${CLANG_ARCHS}
-
+# gnu++17
 COMPILER = base-clang ports-gcc
-COMPILER_LANGS =   c
 
 
 PSEUDO_FLAVORS=no_gtk no_qt
@@ -36,84 +28,56 @@ FLAVOR?=
 
 .include 
 
-WANTLIB-common=c crypto curl event_core event_extra m miniupnpc>=2.0 \
-   natpmp pthread ssl z intl
-WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
-WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
-   Xext Xfixes Xi Xinerama Xrandr Xrender \
-   atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
-   expat ffi fontconfig freetype fribidi \
-   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 graphite2 gthread-2.0 gtk-3 \
-   harfbuzz pango-1.0 pangoft2-1.0 \
-   pangocairo-1.0 pixman-1 png pcre2-8 xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv \
-   Xau Xdmcp execinfo jpeg ${COMPILER_LIBCXX}
-WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
-   fontconfig freetype $(COMPILER_LIBCXX)
-
-MODULES+=  textproc/intltool
-
-LIB_DEPENDS-common=devel/gettext,-runtime \
-   devel/libevent2 \
-   net/curl \
-   net/miniupnp/libnatpmp \
-   net/miniupnp/miniupnpc>=1.9
-LIB_DEPENDS-main=${LIB_DEPENDS-common}
-LIB_DEPENDS-gtk=${LIB_DEPENDS-common} \
-   x11/gtk+3
-LIB_DEPENDS-qt=${LIB_DEPENDS-common} \
-   ${MODQT_LIB_DEPENDS}
-
-RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
-   devel/desktop-file-utils \
-   x11/gtk+3,-guic
-RUN_DEPENDS-qt=${PKGNAME-main}:${BUILD_PKGPATH} \
-   devel/desktop-file-utils
-
-USE_GMAKE= Yes
-CONFIGURE_STYLE=gnu
-
-CONFIGURE_ARGS=--disable-shared \
-   --enable-cli \
-   --enable-external-natpmp
-
-# -I$(top_builddir)/third-party is required, but configure fails to
-# set it if we use external miniupnp libs.
-
-CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib"
+WANTLIB-common =   ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp psl 
ssl
 
-.if ${BUILD_PACKAGES:M-qt}
-MODULES+=  devel/qmake x11/qt5
-COMPILER_LANGS +=  c++
-# avoid setting LINK=
-MODQT5_USE_CXX11=  No
-MODQMAKE_PROJECTS= qt/qtr.pro
-CONFIGURE_STYLE+=  qmake
-SEPARATE_BUILD=No
-MODQMAKE_INSTALL_ROOT= ${PREFIX}
-.endif
+WANTLIB-main = ${WANTLIB-common}
 
-.if !${BUILD_PACKAGES:M-gtk}
-CONFIGURE_ARGS+=--without-gtk
-.endif
+WANTLIB-gtk += ${WANTLIB-common} atk-1.0 atkmm-1.6 cairo cairo-gobject
+WANTLIB-gtk += cairomm-1.0 gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0
+WANTLIB-gtk += giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 gtk-3 gtkmm-3.0
+WANTLIB-gtk += harfbuzz intl pango-1.0 pangocairo-1.0 pangomm-1.4 sigc-2.0
+
+WANTLIB-qt +=  ${WANTLIB-common} GL Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Svg
+WANTLIB-qt +=  Qt6Widgets
+
+MODULES += devel/cmake textproc/intltool
+
+LIB_DEPENDS-common +=  net/curl 
+LIB_DEPENDS-common +=  net/libpsl
+LIB_DEPENDS-common +=  net/miniupnp/libnatpmp
+LIB_DEPENDS-common +=  net/miniupnp/miniupnpc>=1.9
 
-FIX_CRLF_FILES=third-party/libutp/*.h third-party/libutp/*.cpp
+LIB_DEPENDS-main = ${LIB_DEPENDS-common}
+
+LIB_DEPEN

[update] net/transmission 4.0.2

[Josh Grosse]

The attached patch has been prepared with Klemens Nanni's kind
guidance.  Without it, I would not have been able to complete
this diff.

We have both performed light testing of the application.

The key difference from the 4.0.1 diff submitted to ports@ previously
is that this builds with gtk+3, the version fallback is required due
to recent API changes found in gtk+4.10.
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 3deb9382f4a..4c4b5a4ef26 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,10 +2,7 @@ COMMENT-main=  BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-NOT_FOR_ARCHS-gtk= sparc64
-NOT_FOR_ARCHS-qt= sparc64
-
-VER=   3.00
+VER=   4.0.2
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -13,22 +10,17 @@ PKGNAME-qt= transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  2
-REVISION-main= 2
-REVISION-qt=   2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  
https://github.com/transmission/transmission-releases/raw/master/
+MASTER_SITES=  
https://github.com/transmission/transmission/releases/download/${VER}/
 EXTRACT_SUFX=  .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt= ${MODGCC4_ARCHS} ${CLANG_ARCHS}
-
+# gnu++17
 COMPILER = base-clang ports-gcc
-COMPILER_LANGS =   c
 
 
 PSEUDO_FLAVORS=no_gtk no_qt
@@ -36,84 +28,54 @@ FLAVOR?=
 
 .include 
 
-WANTLIB-common=c crypto curl event_core event_extra m miniupnpc>=2.0 \
-   natpmp pthread ssl z intl
-WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
-WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
-   Xext Xfixes Xi Xinerama Xrandr Xrender \
-   atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
-   expat ffi fontconfig freetype fribidi \
-   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 graphite2 gthread-2.0 gtk-3 \
-   harfbuzz pango-1.0 pangoft2-1.0 \
-   pangocairo-1.0 pixman-1 png pcre2-8 xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv \
-   Xau Xdmcp execinfo jpeg ${COMPILER_LIBCXX}
-WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
-   fontconfig freetype $(COMPILER_LIBCXX)
-
-MODULES+=  textproc/intltool
-
-LIB_DEPENDS-common=devel/gettext,-runtime \
-   devel/libevent2 \
-   net/curl \
-   net/miniupnp/libnatpmp \
-   net/miniupnp/miniupnpc>=1.9
-LIB_DEPENDS-main=${LIB_DEPENDS-common}
-LIB_DEPENDS-gtk=${LIB_DEPENDS-common} \
-   x11/gtk+3
-LIB_DEPENDS-qt=${LIB_DEPENDS-common} \
-   ${MODQT_LIB_DEPENDS}
-
-RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
-   devel/desktop-file-utils \
-   x11/gtk+3,-guic
-RUN_DEPENDS-qt=${PKGNAME-main}:${BUILD_PKGPATH} \
-   devel/desktop-file-utils
-
-USE_GMAKE= Yes
-CONFIGURE_STYLE=gnu
-
-CONFIGURE_ARGS=--disable-shared \
-   --enable-cli \
-   --enable-external-natpmp
-
-# -I$(top_builddir)/third-party is required, but configure fails to
-# set it if we use external miniupnp libs.
-
-CONFIGURE_ENV= CPPFLAGS="-I${WRKSRC}/third-party -I${LOCALBASE}/include" \
-   LDFLAGS="-L${LOCALBASE}/lib"
+WANTLIB-common =   ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp psl 
ssl
 
-.if ${BUILD_PACKAGES:M-qt}
-MODULES+=  devel/qmake x11/qt5
-COMPILER_LANGS +=  c++
-# avoid setting LINK=
-MODQT5_USE_CXX11=  No
-MODQMAKE_PROJECTS= qt/qtr.pro
-CONFIGURE_STYLE+=  qmake
-SEPARATE_BUILD=No
-MODQMAKE_INSTALL_ROOT= ${PREFIX}
-.endif
+WANTLIB-main = ${WANTLIB-common}
 
-.if !${BUILD_PACKAGES:M-gtk}
-CONFIGURE_ARGS+=--without-gtk
-.endif
+WANTLIB-gtk += ${WANTLIB-common} atk-1.0 atkmm-1.6 cairo cairo-gobject
+WANTLIB-gtk += cairomm-1.0 gdk-3 gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0
+WANTLIB-gtk += giomm-2.4 glib-2.0 glibmm-2.4 gobject-2.0 gtk-3 gtkmm-3.0
+WANTLIB-gtk += harfbuzz intl pango-1.0 pangocairo-1.0 pangomm-1.4 sigc-2.0
+
+WANTLIB-qt +=  ${WANTLIB-common} GL Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Svg
+WANTLIB-qt +=  Qt6Widgets
+
+MODULES += devel/cmake textproc/intltool
+
+LIB_DEPENDS-common +=  net/curl net/libpsl net/miniupnp/libnatpmp
+LIB_DEPENDS-common +=  net/miniupnp/miniupnpc>=1.9
 
-FIX_CRLF_FILES=third-party/libutp/*.h third-party/libutp/*.cpp
+LIB_DEPENDS-main = ${LIB_DEPENDS-common}
+
+LIB_DEPENDS-gtk += ${LIB_DEPENDS-common} x11/gtk3mm x11/gtk+3
+
+LIB_DEPENDS-qt +=  ${LIB_DEPENDS-common} ${MODQT_LIB_DEPENDS}
+LIB_DEPENDS-qt +=  x11

Re: [update] net/transmission 4.0.1 - work in progress

[Josh Grosse]

On Thu, Apr 06, 2023 at 11:55:18AM +, Klemens Nanni wrote:
> On Tue, Mar 14, 2023 at 09:28:45PM -0400, Josh Grosse wrote:
> > I think this may be ready for testing by transmission users.
> 
> I saw now feedback on this.  Shall we commit?
> Works for me in light testing.

Upstream is now at 4.0.2.   I'd like to test that revision.   

Re: [update] net/transmission 4.0.1 - work in progress

[Josh Grosse]

On Sat, Mar 11, 2023 at 12:55:39PM +, Klemens Nanni wrote:
> 10.03.2023 20:47, Klemens Nanni ??:
> > +++ pkg/PLIST-main  10 Mar 2023 14:45:13 -
> > @@ -22,81 +22,84 @@
> >  @man man/man1/transmission-remote.1
> >  @man man/man1/transmission-show.1
> >  @comment share/applications/
> 
> (This @comment  can probably go well and then get cleaned up from
>  update-plist, now that I see it...)
> 
> > +share/doc/transmission/
> > +share/doc/transmission/AUTHORS
> > +share/doc/transmission/COPYING
> > +share/doc/transmission/README.md
> > +share/doc/transmission/news/
> > +share/doc/transmission/news/news-2.42-and-older.md
> [lots of news files]
> > +share/doc/transmission/news/news-4.0.1.md
> > +share/doc/transmission/rpc-spec.md
> > +share/doc/transmission/send-email-when-torrent-done.sh
> 
> These come from default INSTALL_DOC, either default =ON should put the
> script into the examples dir and account for its nail(1) usage, imho, or
> =OFF should be used to skip all those files.  Or just zap news/?

I've added INSTALL_DOC=NO to the Makefile, removed the @comment,
and updated the plist.  Thank you for your help and your guidance!

I think this may be ready for testing by transmission users.

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 3deb9382f4a..8c18efcee02 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -2,10 +2,7 @@ COMMENT-main=  BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
 COMMENT-qt=BitTorrent client with Qt interface
 
-NOT_FOR_ARCHS-gtk= sparc64
-NOT_FOR_ARCHS-qt= sparc64
-
-VER=   3.00
+VER=   4.0.1
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -13,22 +10,17 @@ PKGNAME-qt= transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  2
-REVISION-main= 2
-REVISION-qt=   2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  
https://github.com/transmission/transmission-releases/raw/master/
+MASTER_SITES=  
https://github.com/transmission/transmission/releases/download/${VER}/
 EXTRACT_SUFX=  .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
 
-ONLY_FOR_ARCHS-qt= ${MODGCC4_ARCHS} ${CLANG_ARCHS}
-
+# gnu++17
 COMPILER = base-clang ports-gcc
-COMPILER_LANGS =   c
 
 
 PSEUDO_FLAVORS=no_gtk no_qt
@@ -36,84 +28,63 @@ FLAVOR?=
 
 .include 
 
-WANTLIB-common=c crypto curl event_core event_extra m miniupnpc>=2.0 \
-   natpmp pthread ssl z intl
-WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
-WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
-   Xext Xfixes Xi Xinerama Xrandr Xrender \
-   atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
-   expat ffi fontconfig freetype fribidi \
-   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 graphite2 gthread-2.0 gtk-3 \
-   harfbuzz pango-1.0 pangoft2-1.0 \
-   pangocairo-1.0 pixman-1 png pcre2-8 xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv \
-   Xau Xdmcp execinfo jpeg ${COMPILER_LIBCXX}
-WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
-   fontconfig freetype $(COMPILER_LIBCXX)
-
-MODULES+=  textproc/intltool
-
-LIB_DEPENDS-common=devel/gettext,-runtime \
-   devel/libevent2 \
-   net/curl \
+WANTLIB-common = ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp psl ssl
+
+WANTLIB-main = ${WANTLIB-common}
+
+WANTLIB-gtk += ${WANTLIB-common} cairo cairo-gobject cairomm-1.16 
gdk_pixbuf-2.0
+WANTLIB-gtk += gio-2.0 giomm-2.68 glib-2.0 glibmm-2.68 gobject-2.0 graphene-1.0
+WANTLIB-gtk += gtk-4 gtkmm-4.0 harfbuzz intl pango-1.0 pangocairo-1.0
+WANTLIB-gtk += pangomm-2.48 sigc-3.0
+
+WANTLIB-qt += ${WANTLIB-common} GL Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Svg
+WANTLIB-qt += Qt6Widgets
+
+MODULES =  devel/cmake \
+   textproc/intltool
+
+LIB_DEPENDS-common=net/curl \
+   net/libpsl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc>=1.9
 LIB_DEPENDS-main=${LIB_DEPENDS-common}
 LIB_DEPENDS-gtk=${LIB_DEPENDS-common} \
-   x11/gtk+3
+   x11/gtkmm40 \
+   x11/gtk+4
 LIB_DEPENDS-qt=${LIB_DEPENDS-common} \
-   ${MODQT_LIB_DEPENDS}
+   ${MODQT_LIB_DEPENDS} \
+   x11/qt6/qtsvg
 
 RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils \
-   x11/gtk+3,-guic
+   x11/gtk+3,-guic \
+   x11/gtk+4,-guic
 RUN_DEPENDS-qt=${PKGNAME-main}:${BUILD_PKGPATH} \

Re: [update] net/transmission 4.0.1 - work in progress

[Josh Grosse]

On Sat, Mar 11, 2023 at 12:55:39PM +, Klemens Nanni wrote:
> 10.03.2023 20:47, Klemens Nanni ??:
> > +++ pkg/PLIST-main  10 Mar 2023 14:45:13 -
> > @@ -22,81 +22,84 @@
> >  @man man/man1/transmission-remote.1
> >  @man man/man1/transmission-show.1
> >  @comment share/applications/
> 
> (This @comment  can probably go well and then get cleaned up from
>  update-plist, now that I see it...)
> 
> > +share/doc/transmission/
> > +share/doc/transmission/AUTHORS
> > +share/doc/transmission/COPYING
> > +share/doc/transmission/README.md
> > +share/doc/transmission/news/
> > +share/doc/transmission/news/news-2.42-and-older.md
> [lots of news files]
> > +share/doc/transmission/news/news-4.0.1.md
> > +share/doc/transmission/rpc-spec.md
> > +share/doc/transmission/send-email-when-torrent-done.sh
> 
> These come from default INSTALL_DOC, either default =ON should put the
> script into the examples dir and account for its nail(1) usage, imho, or
> =OFF should be used to skip all those files.  Or just zap news/?
> 
> 
> Enabling tests could be useful, they use a bundled gtest, though.
> Perhaps upstream could change that to allow system gtest?
> 
> 
> Regardless of the update, is transmission.rc's daemon_reload=NO still
> accurate?  In 4.0.1 ${WRKSRC}/daemon/daemon.cc I see
> 
> 750 /* If we got a SIGHUP during startup, process that now. */
> 751 if (seen_hup_)
> 752 {
> 753 reconfigure();
> 754 }
> 
> which looks like the daemon is reconfiguring on HUP, i.e. reloading.
 
Thank you, Klemens, for all your help.  I will review.

Re: [update] net/transmission 4.0.1 - work in progress

[Josh Grosse]

On Fri, Mar 10, 2023 at 03:09:42PM +, Klemens Nanni wrote:
[snip]
> Here is a diff using cmake, qt6 and gtk4 as per upstream defaults.
> Above mentioned cmake issues should be mentioned upstream.
> The one new local patch is trivial, free PR for anyone taking their time.
> 
> Both gtk and qt run fine on amd64 for me.

Thank you for your diff!  

1. I needed to add a BUILD_DEPENDS for x11/qt6/qttools to complete the
qt configure step; it wasn't pre-installed on my build system when I began.  

2. transmission-gtk now produces a locale warning here. I'm not sure how
to correct it as I'm one of those en_US.UTF-8 users who never pays any
attention to locale -- until something like this happens and then I just
stare at the screen with a slack-jawed gaze.

** (transmission-gtk:32822): WARNING **: 14:20:24.974: Can't make the global 
C++ locale equal to the C locale.
   collate_byname::collate_byname failed to construct for 
C/en_US.UTF-8/C/C/C/C
   C locale = C/en_US.UTF-8/C/C/C/C
 
I have some additional minor changes to your Makefile:

  * the BDEP noted above
  * 2 lines of WANTLIB-qt per port-lib-depends-check
  * RDEP adds and deletes according to portcheck(1)
  * MASTER_SITES over 2 lines to fit within 80 chars, per portcheck().

diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index ae7a342a6b4..6c384373071 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -14,7 +14,8 @@ MAINTAINER=   Josh Grosse 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  
https://github.com/transmission/transmission/releases/download/${VER}/
+MASTER_SITES=  \
+   https://github.com/transmission/transmission/releases/download/${VER}/
 EXTRACT_SUFX=  .tar.xz
 
 MULTI_PACKAGES=-main -gtk -qt
@@ -22,7 +23,6 @@ MULTI_PACKAGES=   -main -gtk -qt
 # gnu++17
 COMPILER = base-clang ports-gcc
 
-
 PSEUDO_FLAVORS=no_gtk no_qt
 FLAVOR?=
 
@@ -38,12 +38,13 @@ WANTLIB-gtk += gtk-4 gtkmm-4.0 harfbuzz intl pango-1.0 
pangocairo-1.0
 WANTLIB-gtk += pangomm-2.48 sigc-3.0
 
 WANTLIB-qt += GL Qt6Core Qt6DBus Qt6Gui Qt6Network Qt6Svg Qt6Widgets
+WANTLIB-qt += ${COMPILER_LIBCXX} c crypto curl m miniupnpc natpmp
+WANTLIB-qt += psl ssl
 
 MODULES =  devel/cmake \
textproc/intltool
 
-LIB_DEPENDS-common=devel/gettext,-runtime \
-   net/curl \
+LIB_DEPENDS-common=net/curl \
net/libpsl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc>=1.9
@@ -57,6 +58,7 @@ LIB_DEPENDS-qt=   ${LIB_DEPENDS-common} \
 
 RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils \
+   x11/gtk+3,-guic \
x11/gtk+4,-guic
 RUN_DEPENDS-qt=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils
@@ -80,6 +82,7 @@ MODULES +=x11/qt6
 # XXX =6 finds "Qt6", =5 fails to find "Qt", but Qt6 is preferred, anyway
 CONFIGURE_ARGS +=  -DENABLE_QT=ON \
-DUSE_QT_VERSION=6
+BUILD_DEPENDS+=x11/qt6/qttools
 .else
 CONFIGURE_ARGS +=  -DENABLE_QT=OFF
 .endif

Re: [update] net/transmission 4.0.1 - work in progress

[Josh Grosse]

On Fri, Mar 10, 2023 at 03:20:51PM +0100, Antoine Jacoutot wrote:
> On Fri, Mar 10, 2023 at 09:10:56AM -0500, Josh Grosse wrote:
> > On Fri, Mar 10, 2023 at 07:37:20AM +, Stuart Henderson wrote:
> > > On 2023/03/09 18:02, Josh Grosse wrote:
> > > > 2) I am having an issue with "size mismatch" warnings as both 
> > > >libevent and devel/libevent2 are required by the main and
> > > >gtk subpackages.  
> > > 
> > > Mixing the two won't work, it will need to use either one or the other.
> >  
> > Thanks, got that cured by adding to the CMakeLists.txt patch:
> > 
> > -tr_auto_option(USE_SYSTEM_EVENT2 "Use system event2 library" AUTO)
> > +tr_auto_option(USE_SYSTEM_EVENT2 "Use system event2 library" OFF)
> 
> You should just be able to add -DUSE_SYSTEM_EVENT2=Off to CONFIGURE_ARGS, no?

Yes, that works too, with an upper-case OFF.  Better in the Makefile than the
patch file.  Thanks!

Re: [update] net/transmission 4.0.1 - work in progress

[Josh Grosse]

On Fri, Mar 10, 2023 at 07:37:20AM +, Stuart Henderson wrote:
> On 2023/03/09 18:02, Josh Grosse wrote:
> > 2) I am having an issue with "size mismatch" warnings as both 
> >libevent and devel/libevent2 are required by the main and
> >gtk subpackages.  
> 
> Mixing the two won't work, it will need to use either one or the other.
 
Thanks, got that cured by adding to the CMakeLists.txt patch:

-tr_auto_option(USE_SYSTEM_EVENT2 "Use system event2 library" AUTO)
+tr_auto_option(USE_SYSTEM_EVENT2 "Use system event2 library" OFF)

and then removing the base `event` from Makefile WANTLIBs.  

kn@ wrote to me off-list that he may be able to look at the Qt issue.
I'll post an updated diff once that problem is solved.

Thanks again, as always!

[update] net/transmission 4.0.1 - work in progress

[Josh Grosse]

The attached "version 1" patch is a work-in-progress; I'm looking for
advice and corrections

1) I have (temporarily) disabled the Qt subpackage 
   build, because upstream has switched to using CMake for
   everything, and I do not know enough about either CMake
   or QMake to get it to build. I could use some help here,
   as it won't build under CMake and with QMake it looks for
   a Makefile which doesn't exist.
   
2) I am having an issue with "size mismatch" warnings as both 
   libevent and devel/libevent2 are required by the main and
   gtk subpackages.  

The updated programs:

transmission-daemon
transmission-cli
transmission-gtk 

have had limited testing on amd64.

Thanks in advance for any cluebats!
diff --git a/net/transmission/Makefile b/net/transmission/Makefile
index 3deb9382f4a..ff6ce4c8891 100644
--- a/net/transmission/Makefile
+++ b/net/transmission/Makefile
@@ -1,89 +1,88 @@
 COMMENT-main=  BitTorrent command line and daemon client
 COMMENT-gtk=   BitTorrent client with GTK+ interface
-COMMENT-qt=BitTorrent client with Qt interface
+#COMMENT-qt=   BitTorrent client with Qt interface
 
 NOT_FOR_ARCHS-gtk= sparc64
-NOT_FOR_ARCHS-qt= sparc64
+#NOT_FOR_ARCHS-qt= sparc64
 
-VER=   3.00
+VER=   4.0.1
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
-PKGNAME-qt=transmission-qt-${VER}
+#PKGNAME-qt=   transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  2
-REVISION-main= 2
-REVISION-qt=   2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
 
-MASTER_SITES=  
https://github.com/transmission/transmission-releases/raw/master/
+MASTER_SITES=  \
+   https://github.com/transmission/transmission/releases/download/${VER}/
 EXTRACT_SUFX=  .tar.xz
 
-MULTI_PACKAGES=-main -gtk -qt
+#MULTI_PACKAGES=   -main -gtk -qt
+MULTI_PACKAGES=-main -gtk
 
-ONLY_FOR_ARCHS-qt= ${MODGCC4_ARCHS} ${CLANG_ARCHS}
+#ONLY_FOR_ARCHS-qt=${MODGCC4_ARCHS} ${CLANG_ARCHS}
 
 COMPILER = base-clang ports-gcc
 COMPILER_LANGS =   c
 
 
-PSEUDO_FLAVORS=no_gtk no_qt
+#PSEUDO_FLAVORS=   no_gtk no_qt
+PSEUDO_FLAVORS=no_gtk
 FLAVOR?=
 
 .include 
 
-WANTLIB-common=c crypto curl event_core event_extra m miniupnpc>=2.0 \
-   natpmp pthread ssl z intl
-WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
-WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
-   Xext Xfixes Xi Xinerama Xrandr Xrender \
-   atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
-   expat ffi fontconfig freetype fribidi \
-   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
-   gobject-2.0 graphite2 gthread-2.0 gtk-3 \
-   harfbuzz pango-1.0 pangoft2-1.0 \
-   pangocairo-1.0 pixman-1 png pcre2-8 xcb \
-   xcb-render xcb-shm epoxy nghttp2 iconv \
-   Xau Xdmcp execinfo jpeg ${COMPILER_LIBCXX}
-WANTLIB-qt=${WANTLIB-common} ${MODQT_WANTLIB} \
-   GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
-   fontconfig freetype $(COMPILER_LIBCXX)
-
-MODULES+=  textproc/intltool
+WANTLIB-common=${COMPILER_LIBCXX} c crypto curl event \
+   event_core event_extra intl m miniupnpc>=2.0 \
+   natpmp psl pthread ssl
+WANTLIB-main=  ${WANTLIB-common}
+WANTLIB-gtk=   ${WANTLIB-common} atk-1.0 atkmm-1.6 cairo \
+   cairo-gobject cairomm-1.0 event gdk-3 \
+   gdk_pixbuf-2.0 gdkmm-3.0 gio-2.0 giomm-2.4 \
+   glib-2.0 glibmm-2.4 gobject-2.0 gtk-3 gtkmm-3.0 \
+   harfbuzz pango-1.0 pangocairo-1.0 pangomm-1.4 sigc-2.0
+#WANTLIB-qt=   ${WANTLIB-common} ${MODQT_WANTLIB} \
+#  GL Qt5Core Qt5DBus Qt5Gui Qt5Network Qt5Widgets \
+#  fontconfig freetype $(COMPILER_LIBCXX)
+
+MODULES+=  textproc/intltool devel/cmake
 
 LIB_DEPENDS-common=devel/gettext,-runtime \
devel/libevent2 \
net/curl \
+   net/libpsl \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc>=1.9
 LIB_DEPENDS-main=${LIB_DEPENDS-common}
 LIB_DEPENDS-gtk=${LIB_DEPENDS-common} \
+   devel/atk2mm \
+   devel/glib2mm \
+   devel/libsigc++-2 \
+   devel/pangomm \
+   graphics/cairomm \
+   x11/gtk3mm \
x11/gtk+3
 LIB_DEPENDS-qt=${LIB_DEPENDS-common} \
${MODQT_LIB_DEPENDS}
 
+RUN_DEPENDS-main=x11/gtk+3,-guic
 RUN_DEPENDS-gtk=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils \
x11/gtk+3,-guic
 RUN_DEPENDS-qt=${PKGNAME-main}:${BUILD_PKGPATH} \
devel/desktop-file-utils
 
-USE_GMAKE= Yes
-CONFIGUR

Re: UPDATE: SMPlayer-22.7.0

[Josh Grosse]

On Tue, Feb 07, 2023 at 09:38:28AM +0100, Gonzalo L. Rodriguez wrote:
> Hello,
> 
> Update for SMPlayer to 22.7.0:
> 
> https://www.smplayer.info/en/changes
> 
> OK? Comments?

Tested on amd64. :)

portcheck(1) recommends that:
manual pages should go under ${PREFIX}/man/ rather than under 
${PREFIX}/share/man/

> 
> Cheers.-
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/smplayer/Makefile,v
> retrieving revision 1.66
> diff -u -p -r1.66 Makefile
> --- Makefile  21 Jun 2022 10:16:21 -  1.66
> +++ Makefile  7 Feb 2023 08:36:48 -
> @@ -1,6 +1,6 @@
>  COMMENT =complete front-end for MPlayer and MPV
>  
> -DISTNAME =   smplayer-22.2.0
> +DISTNAME =   smplayer-22.7.0
>  CATEGORIES = multimedia x11
>  
>  HOMEPAGE =   https://www.smplayer.info/
> Index: distinfo
> ===
> RCS file: /cvs/ports/x11/smplayer/distinfo,v
> retrieving revision 1.47
> diff -u -p -r1.47 distinfo
> --- distinfo  21 Jun 2022 10:16:21 -  1.47
> +++ distinfo  7 Feb 2023 08:36:48 -
> @@ -1,2 +1,2 @@
> -SHA256 (smplayer-22.2.0.tar.bz2) = 
> +JN+RKd+atizqzZnMZYfOaM8TIWf+xNrirBrbZlxWO0=
> -SIZE (smplayer-22.2.0.tar.bz2) = 5165034
> +SHA256 (smplayer-22.7.0.tar.bz2) = 
> 970p0gsj3U+ElJSGCfB4nIlQyaGjf8ufKiCxa9xe+S0=
> +SIZE (smplayer-22.7.0.tar.bz2) = 5144368
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/x11/smplayer/pkg/PLIST,v
> retrieving revision 1.21
> diff -u -p -r1.21 PLIST
> --- pkg/PLIST 11 Mar 2022 20:17:21 -  1.21
> +++ pkg/PLIST 7 Feb 2023 08:36:48 -
> @@ -46,7 +46,6 @@ share/icons/hicolor/64x64/apps/smplayer.
>  share/icons/hicolor/scalable/apps/smplayer.svg
>  @mandir share/man/
>  share/man/man1/
> -share/metainfo/
>  share/metainfo/smplayer.appdata.xml
>  share/smplayer/
>  share/smplayer/input.conf
> 
> -- 
> 
>%gonzalo
> 

Re: [update] sysutils/udfclient

[Josh Grosse]

Ping.  

On Fri, Dec 16, 2022 at 08:11:42AM -0500, Josh Grosse wrote:
> A minor update from 0.8.12 -> 0.8.20 is attached.  Tested on amd64.
> 
> Changelog:
> 
> "Minor release adding support for realtime file types as found
> on discs written by PVRs."
diff --git a/sysutils/udfclient/Makefile b/sysutils/udfclient/Makefile
index 84c25fd4a7f..797cdd8d944 100644
--- a/sysutils/udfclient/Makefile
+++ b/sysutils/udfclient/Makefile
@@ -1,6 +1,6 @@
 COMMENT =  userland implementation of the UDF filesystem
 
-V =0.8.12
+V =0.8.20
 DISTNAME = UDFclient.${V}
 PKGNAME =  udfclient-${V}
 CATEGORIES =   sysutils
diff --git a/sysutils/udfclient/distinfo b/sysutils/udfclient/distinfo
index aaddbda2ce9..7ffba9cd9e9 100644
--- a/sysutils/udfclient/distinfo
+++ b/sysutils/udfclient/distinfo
@@ -1,2 +1,2 @@
-SHA256 (UDFclient.0.8.12.tgz) = Txgo4XgO4bDUQUR96k0RTgvNiRl/pp/QP/ncvLKj7dg=
-SIZE (UDFclient.0.8.12.tgz) = 256400
+SHA256 (UDFclient.0.8.20.tgz) = uCTKXxXVASIR/tbnSDmmSnVyrjGjqtyz4Ga3XHec4Rc=
+SIZE (UDFclient.0.8.20.tgz) = 257392

[update] sysutils/udfclient

[Josh Grosse]

A minor update from 0.8.12 -> 0.8.20 is attached.  Tested on amd64.

Changelog:

"Minor release adding support for realtime file types as found
on discs written by PVRs."

Re: [update] sysutils/udfclient

[Josh Grosse]

It would help if I attached the diff

On Fri, Dec 16, 2022 at 08:11:42AM -0500, Josh Grosse wrote:
> A minor update from 0.8.12 -> 0.8.20 is attached.  Tested on amd64.
> 
> Changelog:
> 
> "Minor release adding support for realtime file types as found
> on discs written by PVRs."
diff --git a/sysutils/udfclient/Makefile b/sysutils/udfclient/Makefile
index 84c25fd4a7f..797cdd8d944 100644
--- a/sysutils/udfclient/Makefile
+++ b/sysutils/udfclient/Makefile
@@ -1,6 +1,6 @@
 COMMENT =  userland implementation of the UDF filesystem
 
-V =0.8.12
+V =0.8.20
 DISTNAME = UDFclient.${V}
 PKGNAME =  udfclient-${V}
 CATEGORIES =   sysutils
diff --git a/sysutils/udfclient/distinfo b/sysutils/udfclient/distinfo
index aaddbda2ce9..7ffba9cd9e9 100644
--- a/sysutils/udfclient/distinfo
+++ b/sysutils/udfclient/distinfo
@@ -1,2 +1,2 @@
-SHA256 (UDFclient.0.8.12.tgz) = Txgo4XgO4bDUQUR96k0RTgvNiRl/pp/QP/ncvLKj7dg=
-SIZE (UDFclient.0.8.12.tgz) = 256400
+SHA256 (UDFclient.0.8.20.tgz) = uCTKXxXVASIR/tbnSDmmSnVyrjGjqtyz4Ga3XHec4Rc=
+SIZE (UDFclient.0.8.20.tgz) = 257392

Re: update sysutils/obsdfreqd

[Josh Grosse]

On Mon, Oct 31, 2022 at 06:57:53PM +0100, Sol??ne Rapenne wrote:
> I made a new release of obsdfreqd. The temperature mode is now trying
> to detect a CPU temperature sensor instead of using the first sensor
> found, or you can give it a specific temperature sensor to use.

No regressions noted running here on an amd64 laptop (T450 with i5 CPU).

Re: [new] archivers/7zip

[Josh Grosse]

On Sun, Sep 18, 2022 at 09:20:56PM +0100, Stuart Henderson wrote:
> The issue with the unrar code is that it changes the produced binary to
> a non-free license. That's why it is packaged separately in p7zip.
> (roughly "must not use to create a rar compatible compressor")

The attached v5 tarball now has an unrar flavor, since the RAR code
is a compile option rather than a plugin.
 
> Still not setting CC/CFLAGS otherwise that would have egcc and -O2 -pipe.
 
I could use a cluestick where to insert that.

Thanks again!


7zip.v5.tgz
Description: application/tar-gz

Re: [new] archivers/7zip

[Josh Grosse]

On Sun, Sep 18, 2022 at 12:47:28AM -0400, George Koehler wrote:
> On Fri, 16 Sep 2022 21:54:54 -0400
> Josh Grosse  wrote:
> 
> > Attached is a "v3" tarball with the above changes, producing a single `7zz`
> > executable binary.  There is no long any conflict with p7zip.  I've tested
> > this build on amd64. George may want to retest on powerpc64 to see if his 
> > patch to
> > C/7zCrcOpt.c can be removed.
> 
> Yes, please $ rm patches/patch-C_7zCrcOpt_c
> 
> I can now build 7zz without patch-C_7zCrcOpt_c on both macppc (which
> is 32-bit powerpc) and powerpc64.  Also, we can remove 7zCrcOpt.c
> from FIX_CRLF_FILES.

Both are complete in the attached "v4" tarball.

> 7zz does more formats than 7za, see "7zz i".  I can extract my old
> .rar file with 7zz.  Other distros (Alpine, Debian, FreeBSD) are also
> building 7zz and not 7za.  (Alpine and FreeBSD also symlink 7z to 7zz;
> Alpine and Debian also disable the .rar code.)

It should be easy enough to disable with the knobs provided, either 
DISABLE_RAR=1
or DISABLE_RAR_COMPRESS=1.  But there is the dependency for the p7zip unrar
plugin in mail/amavisd-new, and I am looking forward to the day when p7zip
will be removed.
 
> Another problem: the port sets COMPILER = base-clang ports-gcc, but
> I believe that gcc can't build this port as is.  I don't have a real
> gcc arch (sparc64).  I try forcing "make COMPILER=ports-gcc" on a
> clang arch.  (I know that COMPILER=ports-gcc on a clang arch can go
> wrong when mixing C++ code from clang and gcc.)
> 
> 1st problem, cmpl_clang.mak is running clang, not gcc.  I try to
> use cmpl_gcc.mak instead, this way,
> 
> MAKE_FILE_base-clang =../../cmpl_clang.mak
> MAKE_FILE_ports-gcc = ../../cmpl_gcc.mak
> MAKE_FILE =   ${MAKE_FILE_${CHOSEN_COMPILER}}
 
I like that solution.
  
> 2nd problem, gcc immediately fails with,
> egcc: error: unrecognized command line option '-Waddress-of-packed-member'
> 
> I have not tried to remove the option.

I did, and on amd64 I get an assembly error compiling C/LzFind.c. Log
fragment follows:

===>  Building for 7zip-22.01
gcc  -O2 -c -Wall -Wextra -Waddress -Waggressive-loop-optimizations 
-Wattributes -Wbool-compare -Wbool-operation -Wcast-align -Wcast-align=strict 
-Wcomment -Wdangling-else -Wdiv-by-zero -Wduplicated-branches -Wduplicated-cond 
-Wformat-contains-nul -Wimplicit-fallthrough=5 -Winit-self 
-Wint-in-bool-context -Wint-to-pointer-cast -Wunused -Wunused-macros 
-Wconversion   -DNDEBUG -D_REENTRANT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE 
-fPIC  -o b/g/LzFind.o ../../../../C/LzFind.c
/tmp//ccGUWuj4.s: Assembler messages:
/tmp//ccGUWuj4.s:479: Error: no such instruction: `vpbroadcastd -4(%rsp),%ymm0'
/tmp//ccGUWuj4.s:482: Error: no such instruction: `vpmaxud (%rsi),%ymm0,%ymm1'
/tmp//ccGUWuj4.s:484: Error: no such instruction: `vpsubd %ymm0,%ymm1,%ymm1'
/tmp//ccGUWuj4.s:485: Error: no such instruction: `vmovdqa %ymm1,-64(%rsi)'
/tmp//ccGUWuj4.s:486: Error: no such instruction: `vpmaxud 
-32(%rsi),%ymm0,%ymm1'
/tmp//ccGUWuj4.s:487: Error: no such instruction: `vpsubd %ymm0,%ymm1,%ymm1'
/tmp//ccGUWuj4.s:488: Error: no such instruction: `vmovdqa %ymm1,-32(%rsi)'
/tmp//ccGUWuj4.s:491: Error: no such instruction: `vzeroupper'
/tmp//ccGUWuj4.s:508: Error: no such instruction: `pmaxud %xmm0,%xmm1'
/tmp//ccGUWuj4.s:512: Error: no such instruction: `pmaxud %xmm0,%xmm1'
/tmp//ccGUWuj4.s:516: Error: no such instruction: `pmaxud %xmm0,%xmm1'
/tmp//ccGUWuj4.s:520: Error: no such instruction: `pmaxud %xmm0,%xmm1'
gmake: *** [../../7zip_gcc.mak:1099: b/g/LzFind.o] Error 1



7zip.v4.tgz
Description: application/tar-gz

Re: [new] archivers/7zip

[Josh Grosse]

On Fri, Sep 16, 2022 at 09:35:12AM -0400, Josh Grosse wrote:
> On Fri, Sep 16, 2022 at 08:44:09AM +0100, Stuart Henderson wrote:
> > Well done, Windows-centric software is usually a pain to get building! Sorry
> > I have found a few more things though - some easy some a bit more fiddly.
> > 
> > Some of the -Wno-xxx might not be accepted by gcc, and the actual
> > warnings(->errors) produced can vary by arch, so it's simpler (and standard
> > in ports) to patch away -Werror.
> 
> Thank you.
>  
> > SEPARATE_BUILD is for "out of source tree" builds, with this the build dir
> > shouldn't have source files in it (the main reason for SEPARATE_BUILD is so
> > that the build dir can be cleaned without rerunning autoconf) - this port
> > has source files there so it shouldn't use SEPARATE_BUILD, and
> > s/WRKBUILD/WRKSRC/
>  
> Will correct, thanks!
> 
> > Installing the binary should handle stripping, the simplest way is to use
> > ${INSTALL_PROGRAM} which handles it automatically (including not stripping
> > when building with DEBUG) - I would move this to do-install rather than
> > patching upstream's Makefile.
> 
> Will do!
>  
> > There are some complications with the different makefiles for clang and gcc.
> > Not sure how best to handle that but it needs to build on ports-gcc arch's
> > without using clang - I don't have a suitable arch to test (sparc64 will do
> > but also need to check the build log to make sure if doesn't call clang
> > which is present there but shouldn't be used in that case). It should use
> > CC/CXX/CFLAGS/CXXFLAGS rather than hardcoding clang/clang++/-O2
> 
> I only have amd64/i386 archs available, so won't be able to test this either.
>  
> > The conflict isn't ideal because various other ports depend on p7zip.
> > Probably best to either replace p7zip completely (changing those other ports
> > to use 7zip) or rename the binaries in p7zip (use a 'p' prefix, again
> > changing the other ports to cope). As a result I think this port is one for
> > post-7.1.
> 
> One possiblity is to only produce the `7zz` full-feature binary.  There would
> be no conflict.  I haven't tried to build it.  So far, the only Bundle's I've
> tested have been `7za` which is in this port, and `7zr` the "restricted" 
> Bundle,
> which built and ran.
>  
> > (also we need some way to handle rar if it's going to replace p7zip
> > completely - e.g. build 7zz from the Alone2 dir - could either use similar
> > to the v6 flavour in ports/net/bird/1 which deals with a similar problem -
> > or could run the build in the second dir via post-build and use
> > subpackages).
> 
> A quick scan of the tree shows mail/amavisd-new is currently the only port 
> with
> a dependency on the unrar plugin.  
> 
> I will have to experiment with `7zz`, which would allow both ports to 
> co-exist.
> 
> Thank you, as always, for your insights and recommendations!

Attached is a "v3" tarball with the above changes, producing a single `7zz`
executable binary.  There is no long any conflict with p7zip.  I've tested
this build on amd64. George may want to retest on powerpc64 to see if his patch 
to
C/7zCrcOpt.c can be removed.


7zip.v3.tgz
Description: application/tar-gz

Re: [new] archivers/7zip

[Josh Grosse]

On Fri, Sep 16, 2022 at 08:44:09AM +0100, Stuart Henderson wrote:
> Well done, Windows-centric software is usually a pain to get building! Sorry
> I have found a few more things though - some easy some a bit more fiddly.
> 
> Some of the -Wno-xxx might not be accepted by gcc, and the actual
> warnings(->errors) produced can vary by arch, so it's simpler (and standard
> in ports) to patch away -Werror.

Thank you.
 
> SEPARATE_BUILD is for "out of source tree" builds, with this the build dir
> shouldn't have source files in it (the main reason for SEPARATE_BUILD is so
> that the build dir can be cleaned without rerunning autoconf) - this port
> has source files there so it shouldn't use SEPARATE_BUILD, and
> s/WRKBUILD/WRKSRC/
 
Will correct, thanks!

> Installing the binary should handle stripping, the simplest way is to use
> ${INSTALL_PROGRAM} which handles it automatically (including not stripping
> when building with DEBUG) - I would move this to do-install rather than
> patching upstream's Makefile.

Will do!
 
> There are some complications with the different makefiles for clang and gcc.
> Not sure how best to handle that but it needs to build on ports-gcc arch's
> without using clang - I don't have a suitable arch to test (sparc64 will do
> but also need to check the build log to make sure if doesn't call clang
> which is present there but shouldn't be used in that case). It should use
> CC/CXX/CFLAGS/CXXFLAGS rather than hardcoding clang/clang++/-O2

I only have amd64/i386 archs available, so won't be able to test this either.
 
> The conflict isn't ideal because various other ports depend on p7zip.
> Probably best to either replace p7zip completely (changing those other ports
> to use 7zip) or rename the binaries in p7zip (use a 'p' prefix, again
> changing the other ports to cope). As a result I think this port is one for
> post-7.1.

One possiblity is to only produce the `7zz` full-feature binary.  There would
be no conflict.  I haven't tried to build it.  So far, the only Bundle's I've
tested have been `7za` which is in this port, and `7zr` the "restricted" Bundle,
which built and ran.
 
> (also we need some way to handle rar if it's going to replace p7zip
> completely - e.g. build 7zz from the Alone2 dir - could either use similar
> to the v6 flavour in ports/net/bird/1 which deals with a similar problem -
> or could run the build in the second dir via post-build and use
> subpackages).

A quick scan of the tree shows mail/amavisd-new is currently the only port with
a dependency on the unrar plugin.  

I will have to experiment with `7zz`, which would allow both ports to co-exist.

Thank you, as always, for your insights and recommendations!

Re: [new] archivers/7zip

[Josh Grosse]

Oops.  V2 tarball attached, now.

On Thu, Sep 15, 2022 at 11:37:43PM -0400, Josh Grosse wrote:
> On Thu, Sep 15, 2022 at 10:23:00PM -0400, George Koehler wrote:
> > On Thu, 15 Sep 2022 13:55:35 -0400
> > Josh Grosse  wrote:
> > 
> > > A corrected tarball is attached -- pkg/DESCR was accidently empty.
> > 
> > I can't install p7zip with 7zip,
> > 
> > | Collision in p7zip-16.02p6: the following files already exist
> > | /usr/local/bin/7za (7zip-22.01 and p7zip-16.02p6)
> > | Couldn't install p7zip-16.02p6
> > 
> > Should we declare a conflict?  See @conflict in pkg_create(8)
> 
> I've added a @conflict to the PLIST.  Thanks for catching that!
>  
> > Also, I need one more patch.  I attach patch-C_7zCrcOpt_c; please add
> > it to your patches, so I can build 7zip on my big-endian macppc.  The
> > patch prevents the errors at the end of this mail.  After I added
> > patch-C_7zCrcOpt_c, I also built 7zip on powerpc64.
> > 
> > I might not need patch-C_7zCrcOpt_c if we would delete -Werror from the
> > flags.
> 
> I've added your patch without carriage returns, and added it to
> the FIX_CRLF_FILES list.
> 
> I am unsure if we should remove -Werror.  I've added several -Wno-[blah]
> flags to CPP/7zip/warn_clang.mak so this would build on amd64.
> 
> Thank you for reviewing this port!


7zip.v2.tgz
Description: application/tar-gz

Re: [new] archivers/7zip

[Josh Grosse]

On Thu, Sep 15, 2022 at 10:23:00PM -0400, George Koehler wrote:
> On Thu, 15 Sep 2022 13:55:35 -0400
> Josh Grosse  wrote:
> 
> > A corrected tarball is attached -- pkg/DESCR was accidently empty.
> 
> I can't install p7zip with 7zip,
> 
> | Collision in p7zip-16.02p6: the following files already exist
> | /usr/local/bin/7za (7zip-22.01 and p7zip-16.02p6)
> | Couldn't install p7zip-16.02p6
> 
> Should we declare a conflict?  See @conflict in pkg_create(8)

I've added a @conflict to the PLIST.  Thanks for catching that!
 
> Also, I need one more patch.  I attach patch-C_7zCrcOpt_c; please add
> it to your patches, so I can build 7zip on my big-endian macppc.  The
> patch prevents the errors at the end of this mail.  After I added
> patch-C_7zCrcOpt_c, I also built 7zip on powerpc64.
> 
> I might not need patch-C_7zCrcOpt_c if we would delete -Werror from the
> flags.

I've added your patch without carriage returns, and added it to
the FIX_CRLF_FILES list.

I am unsure if we should remove -Werror.  I've added several -Wno-[blah]
flags to CPP/7zip/warn_clang.mak so this would build on amd64.

Thank you for reviewing this port!

[new] archivers/7zip

[Josh Grosse]

The 7zip project was originally Windows-only.  It is now directly
buildable on open systems. Attached is a port for its standalone
command-line executable.

My expectation is that this should eventually replace archivers/p7zip,
as that portable version of 7zip is both a defunct project and it
has a number of unaddressed CVEs.


7zip.tgz
Description: application/tar-gz

Re: [new] archivers/7zip

[Josh Grosse]

A corrected tarball is attached -- pkg/DESCR was accidently empty.


7zip.tgz
Description: application/tar-gz

Re: UPDATE: SMPlayer-22.2.0

[Josh Grosse]

On Mon, Jun 20, 2022 at 10:42:56AM +0200, Gonzalo Rodriguez wrote:
> ping
> 
> On 5/31/22 20:44, Gonzalo L. Rodriguez wrote:
> > Update for SMPlayer to 22.2.0:
> > 
> > https://www.smplayer.info/en/changes

Works fine on amd64.  Unable to test new features.

Re: security update: sysutils/ntfs-3g: 2017.3.23 -> 2022.5.17

[Josh Grosse]

On Sat, Jun 11, 2022 at 02:49:40AM +, Yifei Zhan wrote:
> This is a security update for ntfs-3g.
> 
> - Tested on amd64, mount/read OK. 

Tested on amd64 with writes.  Wrtes of small files work fine.
The tested drive is on mSATA connected via a USB 3.0 adapter.

Re: mail/procmail CVE-2017-16844

[Josh Grosse]

On Thu, May 05, 2022 at 12:09:37AM +0100, Stuart Henderson wrote:

> It has been de-abandoned upstream, there is a new release from earlier this
> year. Update diff for that below FWIW. It builds, runtime not tested, I
> have forgotten how to use it.

I've just tested it on amd64, and it works fine with my narrow use case:
as an mda which routes to Maildirs, and has a simple SpamAssasin header
inspection for routing to the user's spam Maildir.

Re: Let codeblocks build on riscv64

[Josh Grosse]

On Tue, Apr 19, 2022 at 01:39:04AM +0200, Jeremie Courreges-Anglas wrote:
> 
> codeblocks doesn't build any more on riscv64, I had to duplicate the
> aarch64 #define goo in the embedded copy of nspr or something.  This
> should be safe, riscv64 is a little-endian LP64 arch like aarch64 or
> amd64.
> 
> This was present in the 7.1 packages release builds, I just didn't send
> it early enough.  No bump needed as it only affects riscv64.
> 
> ok?

The patch integrates, but I have no way to test it as I only have
amd64 and i386 available to me.

I'd prefer a revision bump, just to cover all the bases.

 
> 
> Index: 
> patches/patch-src_sdk_mozilla_chardet_include_nsprpub_pr_include_prcpucfg_linux_h
> ===
> RCS file: 
> patches/patch-src_sdk_mozilla_chardet_include_nsprpub_pr_include_prcpucfg_linux_h
> diff -N 
> patches/patch-src_sdk_mozilla_chardet_include_nsprpub_pr_include_prcpucfg_linux_h
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ 
> patches/patch-src_sdk_mozilla_chardet_include_nsprpub_pr_include_prcpucfg_linux_h
>  30 Mar 2022 02:25:43 -
> @@ -0,0 +1,56 @@
> +Index: src/sdk/mozilla_chardet/include/nsprpub/pr/include/prcpucfg_linux.h
> +--- src/sdk/mozilla_chardet/include/nsprpub/pr/include/prcpucfg_linux.h.orig
>  src/sdk/mozilla_chardet/include/nsprpub/pr/include/prcpucfg_linux.h
> +@@ -643,6 +643,52 @@
> + #define PR_BYTES_PER_WORD_LOG2  3
> + #define PR_BYTES_PER_DWORD_LOG2 3
> + 
> ++#elif defined(__riscv) && __riscv_xlen == 64
> ++
> ++#define IS_LITTLE_ENDIAN 1
> ++#undef  IS_BIG_ENDIAN
> ++#define IS_64
> ++
> ++#define PR_BYTES_PER_BYTE   1
> ++#define PR_BYTES_PER_SHORT  2
> ++#define PR_BYTES_PER_INT4
> ++#define PR_BYTES_PER_INT64  8
> ++#define PR_BYTES_PER_LONG   8
> ++#define PR_BYTES_PER_FLOAT  4
> ++#define PR_BYTES_PER_DOUBLE 8
> ++#define PR_BYTES_PER_WORD   8
> ++#define PR_BYTES_PER_DWORD  8
> ++
> ++#define PR_BITS_PER_BYTE8
> ++#define PR_BITS_PER_SHORT   16
> ++#define PR_BITS_PER_INT 32
> ++#define PR_BITS_PER_INT64   64
> ++#define PR_BITS_PER_LONG64
> ++#define PR_BITS_PER_FLOAT   32
> ++#define PR_BITS_PER_DOUBLE  64
> ++#define PR_BITS_PER_WORD64
> ++
> ++#define PR_BITS_PER_BYTE_LOG2   3
> ++#define PR_BITS_PER_SHORT_LOG2  4
> ++#define PR_BITS_PER_INT_LOG25
> ++#define PR_BITS_PER_INT64_LOG2  6
> ++#define PR_BITS_PER_LONG_LOG2   6
> ++#define PR_BITS_PER_FLOAT_LOG2  5
> ++#define PR_BITS_PER_DOUBLE_LOG2 6
> ++#define PR_BITS_PER_WORD_LOG2   6
> ++
> ++#define PR_ALIGN_OF_SHORT   2
> ++#define PR_ALIGN_OF_INT 4
> ++#define PR_ALIGN_OF_LONG8
> ++#define PR_ALIGN_OF_INT64   8
> ++#define PR_ALIGN_OF_FLOAT   4
> ++#define PR_ALIGN_OF_DOUBLE  8
> ++#define PR_ALIGN_OF_POINTER 8
> ++#define PR_ALIGN_OF_WORD8
> ++
> ++#define PR_BYTES_PER_WORD_LOG2  3
> ++#define PR_BYTES_PER_DWORD_LOG2 3
> ++
> + #elif defined(__hppa__)
> + 
> + #undef  IS_LITTLE_ENDIAN
> 
> 
> -- 
> jca | PGP : 0x1524E7EE / 5135 92C1 AD36 5293 2BDF  DDCC 0DFA 74AE 1524 E7EE
> 

Re: [new] obsdfreqd, a frequency scheduler daemon in userland

[Josh Grosse]

On Thu, Apr 07, 2022 at 09:50:16PM +0200, Solene Rapenne wrote:
> let me present you obsdfreqd, a program to manage the CPU frequency,
> fully parametric. It can support different values depending on battery
> or not for building more advanced profiles. One fun feature is that you
> can also target a specific maximum temperature the system shoudln't
> exceed to avoid burning your body parts.
> 
> While it may be complicated when looking into all the parameters, the
> defaults values are more or less matching the auto mode as it was in
> OpenBSD 7.0 but more performant and more energy efficient, so it
> doesn't require tuning for most users.

Thanks for turning this fabulous tool into a port!  I've been running
it since your initial announcement on Mastodon.

Building the package here stopped due to non-ASCII in your $MAINTAINER
string.  Once I changed your name to ASCII "Solene" I was able to build
and install.

Thanks again!!

Re: [update] krita-gmic-plugin 3.0.0.2 => 3.0.2.1

[Josh Grosse]

On March 29, 2022 3:20:12 PM EDT, Stefan Hagen  
wrote:
>Hi,
>
>just a few days ago, the krita patched gmic plugin was updated to same
>version as the gmic-qt 3.0.2 we have already. They versioned it as 3.0.2.1.
>
>I want to commit this update before the lock, because it prevents me to 
>set EPOCH on the port. It's updated via quirk from gmic-qt-krita-3.0.2.
>
>OK?
>
>Best Regards,
>Stefan
>
>
>Index: graphics/krita-gmic-plugin/Makefile
>===
>RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/Makefile,v
>retrieving revision 1.1.1.1
>diff -u -p -u -p -r1.1.1.1 Makefile
>--- graphics/krita-gmic-plugin/Makefile26 Mar 2022 20:33:50 -  
>1.1.1.1
>+++ graphics/krita-gmic-plugin/Makefile29 Mar 2022 18:41:08 -
>@@ -1,6 +1,6 @@
> COMMENT = krita gmic plugin
> 
>-V =   3.0.0.1
>+V =   3.0.2.1
> DISTNAME =krita-gmic-plugin-${V}
> 
> CATEGORIES =  graphics
>Index: graphics/krita-gmic-plugin/distinfo
>===
>RCS file: /home/cvs/ports/graphics/krita-gmic-plugin/distinfo,v
>retrieving revision 1.1.1.1
>diff -u -p -u -p -r1.1.1.1 distinfo
>--- graphics/krita-gmic-plugin/distinfo26 Mar 2022 20:33:50 -  
>1.1.1.1
>+++ graphics/krita-gmic-plugin/distinfo29 Mar 2022 18:41:19 -
>@@ -1,2 +1,2 @@
>-SHA256 (gmic-3.0.0.1-patched.tar.gz) = 
>BeJTZ68BA5qXxS1IaU8A2vNu4YD6aCIPclIqryRaeCs=
>-SIZE (gmic-3.0.0.1-patched.tar.gz) = 10212684
>+SHA256 (gmic-3.0.2.1-patched.tar.gz) = 
>fAkURYOrBxsLztvUKS7iK6Wzpz6S1E91UfHuA8P+oF0=
>+SIZE (gmic-3.0.2.1-patched.tar.gz) = 10451871
>

I would love to test this but my laptop's fan controller failed.  I have 
already swapped out the fan and heat sink assembly and have a replacement 
workstation on order. 

I think that Lenovo X220, which I had acquired refurbished, lasted 10 years. 

  -Josh-

Re: [WIP] UPDATE: security/keepassxc 1.6.6 -> 1.7.0 | Feedback/testing needed

[Josh Grosse]

On Sun, Mar 27, 2022 at 08:39:48AM +0200, Rafael Sadowski wrote:
> Other tests, feedback?
 
Rafael,

COMPILER_LIBCXX is still in use, producing "Extra:  pthread.26"
 
I've also tested with FLAVOR=browser for the first time, which I'd
never used before.

Thanks!

Re: [WIP] UPDATE: security/keepassxc 1.6.6 -> 1.7.0 | Feedback/testing needed

[Josh Grosse]

On Sat, Mar 26, 2022 at 08:08:57PM +0100, ~Ricardo wrote:
> .diff and .log attached.

Works fine, here, *after* I added this to the Makefile:

FIX_CRLF_FILES =src/keeshare/ShareExport.cpp

Your emailed .diff stripped the Carriage Returns again.  Adding
this to the makefile will strip them from the file before
patching, and then the patch file won't need them.  
 
I can't comment on test failures.  :)

> Obrigado.
> ~Ricardo
> 
> > 
> > From: ~Ricardo 
> > Sent: Sat Mar 26 20:04:11 CET 2022
> > To: , Josh Grosse 
> > Cc: Rsadowski 
> > Subject: Re: [WIP] UPDATE: security/keepassxc 1.6.6 -> 1.7.0 | 
> > Feedback/testing needed
> > 
> > 
> > Hey ports@ and Josh
> > 
> > After some trial and too many errors, I eventually figured out that:
> > 
> > - libgcrypt and libsodium were replaced with botan;
> > - quazip was replaced with minizip;
> > - Xi gpg-error and pthread were not being used.
> > 
> > WANTLIB and LIB_DEPENDS were modified to reflect that.
> > 
> > portcheck and 'make port-lib-depends-check' does not seem to complain under 
> > amd64.
> > 
> > 'make test', however, returns this:
> > 
> > 90% tests passed, 4 tests failed out of 39
> > 
> > The following tests FAILED:
> > 36 - testcli (Subprocess aborted)
> > 37 - testgui (Subprocess aborted)
> > 38 - testguipixmaps (Subprocess aborted)
> > 39 - testguifdosecrets (Failed)
> > 
> > I attached a more detailed log. Would be cool to get some help 
> > troubleshooting these errors and fix them or, as last resort, ignore them.
> > Every other step works properly:
> > 
> >     make 
> > makesum|extract|configure|build|update-plist|package|install|deinstall [OK]
> > 
> > 
> > Any comments or feedback? 
> > 
> > Take care.
> > ~Ricardo
> > 
> > > 
> > > From: Josh Grosse 
> > > Sent: Sat Mar 26 14:52:21 CET 2022
> > > To: 
> > > Subject: Re: [WIP] UPDATE: security/keepassxc 1.6.6 -> 1.7.0 | 
> > > Feedback/testing needed
> > > 
> > > 
> > > On Sat, Mar 26, 2022 at 11:07:46AM +0100, ~Ricardo wrote:
> > > > Opps, Forgot to remove quazip dependency. It's no longer used.
> > > > Summary of changes: 
> > > > https://github.com/keepassxreboot/keepassxc/releases/tag/2.7.0
> > > > 
> > > > Obrigado.
> > > > ~Ricardo
> > > 
> > > Built and tested on amd64.  Notes:
> > > 
> > > I removed REVISION from your Makefile - as revisions are used to track 
> > > committed 
> > > changes to a port that don't bump versions, and you were using this for
> > > personal version tracking.
> > 
> > Sorry, forgot to comment that line. Thanks. :)
> >  
> > > I had to revise your patch to include lost embedded Carriage Return (^M) 
> > > characters.
> > 
> > I do not even know how that happened but thanks for fixing it.
> > 
> > > 
> > > And port-lib-depends-check shows:
> > > 
> > > Extra:  Xi.12 gcrypt.21 gpg-error.3 pthread.26 sodium.10
> > 
> > Eventually I got this output as well, but after some trial and too many 
> > errors, I figured out that:
> > 
> > - libgcrypt and libsodium were replaced by botan;
> > - quazip was replaced with minizip.
> > 
> > All those libs from  'port-lib-depends-check' were deleted from WANTLIB and 
> > now 'port-lib-depends-check' returns nothing, as it should.
> > 
> > 
> > The only thing that does not work entirely are the regress tests:
> > 
> > 
> > 
> > -- 
> > Sent with https://mailfence.com  
> > Secure and private email
> 
> 
> Take care.
> 
> Obrigado e boa semana.
> ~Ricardo
> 
> -- 
> Sent with https://mailfence.com  
> Secure and private email

> Start testing: Mar 26 17:09 WET
> --
> 1/39 Testing: testgroup
> 1/39 Test: testgroup
> Command: "/usr/ports/pobj/keepassxc-2.7.0/build-amd64/tests/testgroup"
> Directory: /usr/ports/pobj/keepassxc-2.7.0/build-amd64/tests
> "testgroup" start time: Mar 26 17:09 WET
> Output:
> --
> * Start testing of TestGroup *
> Config: Using QtTest library 5.15.2, Qt 5.15.2 (x86_64-little_endian-lp64 
> shared (dynamic) release build; by Clang 1

Re: [WIP] UPDATE: security/keepassxc 1.6.6 -> 1.7.0 | Feedback/testing needed

[Josh Grosse]

On Sat, Mar 26, 2022 at 11:07:46AM +0100, ~Ricardo wrote:
> Opps, Forgot to remove quazip dependency. It's no longer used.
> Summary of changes: 
> https://github.com/keepassxreboot/keepassxc/releases/tag/2.7.0
> 
> Obrigado.
> ~Ricardo

Built and tested on amd64.  Notes:

I removed REVISION from your Makefile - as revisions are used to track 
committed 
changes to a port that don't bump versions, and you were using this for
personal version tracking.

I had to revise your patch to include lost embedded Carriage Return (^M) 
characters.

And port-lib-depends-check shows:

Extra:  Xi.12 gcrypt.21 gpg-error.3 pthread.26 sodium.10

Re: update devel/codeblocks to 20.03 patch level 12751

[Josh Grosse]

On Sun, Mar 20, 2022 at 09:49:15AM +, Stuart Henderson wrote:

[snip]
> How about this on top? (Plus maybe go back to the smaller distfile?)
> It doesn't inlude the svn date but the rev should be good enough.
> 
> diff -uNp -x CVS -r codeblocks.jggimi/Makefile codeblocks/Makefile
[snip]

Absolutely OK with this.  Attached is a consolidated new diff,
combining yours with a revised distinfo as I rebuilt the exported
tarball.

Thanks for fixing the historical mistakes, and especaially for your
time and multiple efforts to review and improve this port!
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 3e30ad54745..d4b55b1b1a0 100755
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -1,13 +1,17 @@
 BROKEN-alpha=  sqvm.cpp:394:1: internal compiler error: Segmentation fault
 COMMENT=   Code::Blocks C/C++ IDE
 
+R= 12751
 V= 20.03
-DISTNAME=  codeblocks-${V}
-PKGNAME=   codeblocks-${V}
+
+DISTNAME=  codeblocks-${V}pl${R}
 EXTRACT_SUFX=  .tar.xz
-REVISION=  2
 
-WRKDIST=   ${WRKDIR}/codeblocks-${V}
+# source tarball for this OpenBSD-specific patch level:
+MASTER_SITES=  https://jggimi.net/codeblocks/
+#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=codeblocks/Sources/${V}/}
+
+DEBUG_PACKAGES=${BUILD_PACKAGES}
 
 SHARED_LIBS +=  codeblocks   0.1  # 0.1
 SHARED_LIBS +=  wxchartctrl  0.1  # 0.1
@@ -31,7 +35,7 @@ HOMEPAGE= http://www.codeblocks.org/
 PERMIT_PACKAGE=Yes
 
 WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
-WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xss
+WANTLIB += Xau Xdmcp Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xss
 WANTLIB += Xxf86vm atk-1.0 atk-bridge-2.0 boost_system bz2 c cairo
 WANTLIB += cairo-gobject curses epoxy execinfo expat ffi fontconfig
 WANTLIB += freetype fribidi gamin-1 gdk-3 gdk_pixbuf-2.0 gio-2.0
@@ -44,8 +48,6 @@ WANTLIB += wx_gtk3u_aui-3.0 wx_gtk3u_core-3.0 
wx_gtk3u_html-3.0
 WANTLIB += wx_gtk3u_propgrid-3.0 wx_gtk3u_qa-3.0 wx_gtk3u_richtext-3.0
 WANTLIB += wx_gtk3u_xrc-3.0 xcb xcb-render xcb-shm z zstd
 
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=codeblocks/Sources/${V}/}
-
 BUILD_DEPENDS= archivers/zip
 
 LIB_DEPENDS=   archivers/bzip2 \
@@ -67,7 +69,9 @@ BUILD_DEPENDS +=  ${MODGNU_AUTOCONF_DEPENDS} \
${MODGNU_AUTOMAKE_DEPENDS} \
devel/libtool
 
-CONFIGURE_STYLE=gnu
+CONFIGURE_STYLE=autoreconf
+AUTORECONF=./bootstrap
+
 CXXFLAGS +=-std=c++11
 CONFIGURE_ENV= CPPFLAGS="-I${X11BASE}/include -I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
@@ -75,15 +79,11 @@ CONFIGURE_ARGS= --with-contrib-plugins=all
 CONFIGURE_ARGS += --enable-debug
 CONFIGURE_ARGS += --with-boost-libdir=${LOCALBASE}/lib
 
-MAKE_ENV=  AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
-   AUTOCONF_VERSION=${AUTOCONF_VERSION}
-
-pre-patch:
-   cd ${WRKSRC}; \
-   env \
-   AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
-   AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-   ${WRKSRC}/bootstrap
+post-patch:
+   echo : > ${WRKSRC}/update_revision.sh
+   echo 'm4_define([SVN_REV], ${R})' > ${WRKSRC}/revision.m4
+   echo 'm4_define([SVN_REVISION], ${V}svn${R})' >> ${WRKSRC}/revision.m4
+   echo 'm4_define([SVN_DATE], )' >> ${WRKSRC}/revision.m4
 
 pre-configure:
${SUBST_CMD} ${WRKSRC}/src/plugins/compilergcc/compilergcc.cpp
diff --git a/devel/codeblocks/distinfo b/devel/codeblocks/distinfo
index 09f55e353a9..81f021815f9 100644
--- a/devel/codeblocks/distinfo
+++ b/devel/codeblocks/distinfo
@@ -1,2 +1,2 @@
-SHA256 (codeblocks-20.03.tar.xz) = Fe6z4orqBU4fOLDH9GcbTU0RFv0F9jwHqpWpHbieqsU=
-SIZE (codeblocks-20.03.tar.xz) = 11799264
+SHA256 (codeblocks-20.03pl12751.tar.xz) = 
Me8U5kehxIfth3eSLUvcn8FdQPbTl9mh7QglVijBmAk=
+SIZE (codeblocks-20.03pl12751.tar.xz) = 16711100
diff --git a/devel/codeblocks/patches/patch-bootstrap 
b/devel/codeblocks/patches/patch-bootstrap
new file mode 100644
index 000..21d1fe873c6
--- /dev/null
+++ b/devel/codeblocks/patches/patch-bootstrap
@@ -0,0 +1,12 @@
+Index: bootstrap
+--- bootstrap.orig
 bootstrap
+@@ -64,7 +64,7 @@ rm -rf autom4te.cache
+ 
+ # Make the build more robust if a Makefile.am is removed from the file 
system, but it is not removed
+ # from the configure.ac file.
+-find . | grep -v wxSmithSTC/stc| grep Makefile.in$ | xargs rm -v
++find . | grep -v wxSmithSTC/stc| grep Makefile.in$ | xargs -r rm -v
+ 
+ rm -vf debian/control
+ echo "Note: If you want to build debian packages you have to first run the 
debian/setup_control.sh script. See the script for details how to use it."
diff --git a/devel/codeblocks/patches/patch-configure 
b/devel/codeblocks/patches/patch-configure
index 46c8967c235..e69de29bb2d 100644
--- a/devel/codeblocks/patches/patch-configure
+++ b/devel/codeblocks/patches/patch-configure
@@ -1,21 +0,0 @@
-undefined reference to `free'
-
-Index: configure
 configure.orig
-+++ 

Re: update devel/codeblocks to 20.03 patch level 12751

[Josh Grosse]

On Thu, Mar 17, 2022 at 12:38:07AM +, Stuart Henderson wrote:
> On 2022/03/16 19:39, Josh Grosse wrote:
> > Yes, thanks!  I'll rebuild here and send an updated diff
> > after I've tested.  It takes a few hours on this laptop. :)

New diff attached.  Your recommended changes, plus:

   * revised distinfo - the tarball is now an svn repository instead
 of an export from it.
   * subversion added to BUILD_DEPENDS.

This allows the banner to display the correct patch level.

> It took a while here too :)
> 
> If you find yourself rebuilding ports a few times while you work
> on an update, you might save some time with ccache:
> 
> pkg_add ccache
> echo 'USE_CCACHE=Yes' >> /etc/mk.conf
 
Using ccache helped a great deal.  Thank you!
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 3e30ad54745..2b04993456b 100755
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -1,11 +1,17 @@
 BROKEN-alpha=  sqvm.cpp:394:1: internal compiler error: Segmentation fault
 COMMENT=   Code::Blocks C/C++ IDE
 
-V= 20.03
+V= 20.03pl12751
+
+# source tarball for this OpenBSD-specific patch level:
+MASTER_SITES1= https://jggimi.net/codeblocks/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:1
+
 DISTNAME=  codeblocks-${V}
 PKGNAME=   codeblocks-${V}
 EXTRACT_SUFX=  .tar.xz
-REVISION=  2
+
+DEBUG_PACKAGES=${BUILD_PACKAGES}
 
 WRKDIST=   ${WRKDIR}/codeblocks-${V}
 
@@ -31,7 +37,7 @@ HOMEPAGE= http://www.codeblocks.org/
 PERMIT_PACKAGE=Yes
 
 WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
-WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xss
+WANTLIB += Xau Xdmcp Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xss
 WANTLIB += Xxf86vm atk-1.0 atk-bridge-2.0 boost_system bz2 c cairo
 WANTLIB += cairo-gobject curses epoxy execinfo expat ffi fontconfig
 WANTLIB += freetype fribidi gamin-1 gdk-3 gdk_pixbuf-2.0 gio-2.0
@@ -46,7 +52,8 @@ WANTLIB += wx_gtk3u_xrc-3.0 xcb xcb-render xcb-shm z zstd
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=codeblocks/Sources/${V}/}
 
-BUILD_DEPENDS= archivers/zip
+BUILD_DEPENDS= archivers/zip \
+   devel/subversion,-main
 
 LIB_DEPENDS=   archivers/bzip2 \
devel/boost \
diff --git a/devel/codeblocks/distinfo b/devel/codeblocks/distinfo
index 09f55e353a9..acdd8b882c6 100644
--- a/devel/codeblocks/distinfo
+++ b/devel/codeblocks/distinfo
@@ -1,2 +1,2 @@
-SHA256 (codeblocks-20.03.tar.xz) = Fe6z4orqBU4fOLDH9GcbTU0RFv0F9jwHqpWpHbieqsU=
-SIZE (codeblocks-20.03.tar.xz) = 11799264
+SHA256 (codeblocks-20.03pl12751.tar.xz) = 
HagjdMW4C+2Vg+kg/H0vMg0EOw/ZGbJpJOCenpafCAw=
+SIZE (codeblocks-20.03pl12751.tar.xz) = 34112980
diff --git a/devel/codeblocks/patches/patch-configure 
b/devel/codeblocks/patches/patch-configure
index 46c8967c235..353f464c7cb 100644
--- a/devel/codeblocks/patches/patch-configure
+++ b/devel/codeblocks/patches/patch-configure
@@ -3,7 +3,7 @@ undefined reference to `free'
 Index: configure
 --- configure.orig
 +++ configure
-@@ -16911,7 +16911,6 @@ if ${ax_cv_check_ldflags___Wl___no_undefined+:} false;
+@@ -16899,7 +16899,6 @@ if ${ax_cv_check_ldflags___Wl___no_undefined+:} false;
  else
  
ax_check_save_flags=$LDFLAGS
@@ -11,7 +11,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -16935,7 +16934,6 @@ fi
+@@ -16923,7 +16922,6 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: 
$ax_cv_check_ldflags___Wl___no_undefined" >&5
  $as_echo "$ax_cv_check_ldflags___Wl___no_undefined" >&6; }
  if test "x$ax_cv_check_ldflags___Wl___no_undefined" = xyes; then :
diff --git a/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in 
b/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in
index 59247107298..ab710b33327 100644
--- a/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in
+++ b/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in
@@ -4,7 +4,7 @@ Fix build when tinyxml is installed.
 Index: src/base/tinyxml/Makefile.in
 --- src/base/tinyxml/Makefile.in.orig
 +++ src/base/tinyxml/Makefile.in
-@@ -423,10 +423,10 @@ top_builddir = @top_builddir@
+@@ -417,10 +417,10 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zlib_CFLAGS = @zlib_CFLAGS@
  zlib_LIBS = @zlib_LIBS@
diff --git 
a/devel/codeblocks/patches/patch-src_include_mozilla_chardet_nsprpub_pr_include_prcpucfg_linux_h
 
b/devel/codeblocks/patches/patch-src_include_mozilla_chardet_nsprpub_pr_include_prcpucfg_linux_h
deleted file mode 100644
index 59dead9a877..000
--- 
a/devel/codeblocks/patches/patch-src_include_mozilla_chardet_nsprpub_pr_include_prcpucfg_linux_h
+++ /dev/null
@@ -1,58 +0,0 @@
-Add support for riscv64
-
-Index: src/include/mozilla_chardet/nsprpub/pr/include/prcpucfg_linux.h
 src/include/mozilla_chardet/nsprpub/pr/include/prcpucfg_linux.h.orig
-+++ src/include/mozilla_chardet/nsprpub/

Re: update devel/codeblocks to 20.03 patch level 12751

[Josh Grosse]

On Wed, Mar 16, 2022 at 11:31:34PM +, Stuart Henderson wrote:
> > diff --git 
> > a/devel/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg_h
> >  
> > b/devel/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg_h
> > index ccf08ff3315..c9aaaee7fc3 100644
> > --- 
> > a/devel/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg_h
> > +++ 
> > b/devel/codeblocks/patches/patch-src_plugins_contrib_dragscroll_dragscrollcfg_h
> > @@ -8,7 +8,7 @@ Index: src/plugins/contrib/dragscroll/dragscrollcfg.h
> >   void OnApply();
> >   void OnCancel(){}
> >  +#if defined(LOGGING)
> > - virtual void InitDialog(){ asm("int3");} /*trap*/
> > + virtual void InitDialog() { } /*trap*/
> >  +#endif
> 
> With the upstream change getting rid of the asm int3 call,
> I think it probably doesn't make sense to patch for the
> reason described in the comment any more

Thank you for catching this, and ...
> 
> > --- a/devel/codeblocks/patches/patch-src_sdk_scripting_squirrel_sqvm_cpp
> > +++ b/devel/codeblocks/patches/patch-src_sdk_scripting_squirrel_sqvm_cpp
> > @@ -2,12 +2,12 @@ Index: src/sdk/scripting/squirrel/sqvm.cpp
> >  --- src/sdk/scripting/squirrel/sqvm.cpp.orig
> >  +++ src/sdk/scripting/squirrel/sqvm.cpp
> >  @@ -1,8 +1,8 @@
> > - /*
> > -   see copyright notice in squirrel.h
> > - */
> > --#include "sqpcheader.h"
> > - #include 
> > -+#include "sqpcheader.h"
> > - #include 
> > - #include "sqopcodes.h"
> > - #include "sqfuncproto.h"
> > + /*
> > + see copyright notice in squirrel.h
> > + */
> > +-#include "sqpcheader.h"
> > + #include 
> > ++#include "sqpcheader.h"
> > + #include 
> > + #include "sqopcodes.h"
> > + #include "sqvm.h"
> 
> This patch doesn't apply (the patch against the ports tree
> applies, but the resulting patch doesn't apply to the upstream
> code) - codeblocks builds without this patch, should it just be
> rm'd instead? 
 
Yes, thanks!  I'll rebuild here and send an updated diff
after I've tested.  It takes a few hours on this laptop. :)

Re: update devel/codeblocks to 20.03 patch level 12751

[Josh Grosse]

Attached is the diff I should have sent, with correct WANTLIBS
added.

On Tue, Mar 15, 2022 at 10:12:32PM -0400, Josh Grosse wrote:
> Recently, problems with wxWidgets handling and startup have been
> noticed with codeblocks 20.03.  Upstream has 730+ commits since
> 20.03 but have not yet tagged any new release or candidates of any kind.
> 
> Their recent HEAD at revision 12571 seems to solves both issues.

Sorry, typo.  The revision is 12751.
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 3e30ad54745..fb4238123f3 100755
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -1,11 +1,17 @@
 BROKEN-alpha=  sqvm.cpp:394:1: internal compiler error: Segmentation fault
 COMMENT=   Code::Blocks C/C++ IDE
 
-V= 20.03
+V= 20.03pl12751
+
+# source tarball for this OpenBSD-specific patch level:
+MASTER_SITES1= https://jggimi.net/codeblocks/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:1
+
 DISTNAME=  codeblocks-${V}
 PKGNAME=   codeblocks-${V}
 EXTRACT_SUFX=  .tar.xz
-REVISION=  2
+
+DEBUG_PACKAGES=${BUILD_PACKAGES}
 
 WRKDIST=   ${WRKDIR}/codeblocks-${V}
 
@@ -31,7 +37,7 @@ HOMEPAGE= http://www.codeblocks.org/
 PERMIT_PACKAGE=Yes
 
 WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
-WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xss
+WANTLIB += Xau Xdmcp Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xss
 WANTLIB += Xxf86vm atk-1.0 atk-bridge-2.0 boost_system bz2 c cairo
 WANTLIB += cairo-gobject curses epoxy execinfo expat ffi fontconfig
 WANTLIB += freetype fribidi gamin-1 gdk-3 gdk_pixbuf-2.0 gio-2.0
diff --git a/devel/codeblocks/distinfo b/devel/codeblocks/distinfo
index 09f55e353a9..0182edab851 100644
--- a/devel/codeblocks/distinfo
+++ b/devel/codeblocks/distinfo
@@ -1,2 +1,2 @@
-SHA256 (codeblocks-20.03.tar.xz) = Fe6z4orqBU4fOLDH9GcbTU0RFv0F9jwHqpWpHbieqsU=
-SIZE (codeblocks-20.03.tar.xz) = 11799264
+SHA256 (codeblocks-20.03pl12751.tar.xz) = 
ZP/Co2/RU2CzLUsxQEAvxjkpmSkwiA/xT4+zB9VNczs=
+SIZE (codeblocks-20.03pl12751.tar.xz) = 16711944
diff --git a/devel/codeblocks/patches/patch-configure 
b/devel/codeblocks/patches/patch-configure
index 46c8967c235..353f464c7cb 100644
--- a/devel/codeblocks/patches/patch-configure
+++ b/devel/codeblocks/patches/patch-configure
@@ -3,7 +3,7 @@ undefined reference to `free'
 Index: configure
 --- configure.orig
 +++ configure
-@@ -16911,7 +16911,6 @@ if ${ax_cv_check_ldflags___Wl___no_undefined+:} false;
+@@ -16899,7 +16899,6 @@ if ${ax_cv_check_ldflags___Wl___no_undefined+:} false;
  else
  
ax_check_save_flags=$LDFLAGS
@@ -11,7 +11,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -16935,7 +16934,6 @@ fi
+@@ -16923,7 +16922,6 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: 
$ax_cv_check_ldflags___Wl___no_undefined" >&5
  $as_echo "$ax_cv_check_ldflags___Wl___no_undefined" >&6; }
  if test "x$ax_cv_check_ldflags___Wl___no_undefined" = xyes; then :
diff --git a/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in 
b/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in
index 59247107298..ab710b33327 100644
--- a/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in
+++ b/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in
@@ -4,7 +4,7 @@ Fix build when tinyxml is installed.
 Index: src/base/tinyxml/Makefile.in
 --- src/base/tinyxml/Makefile.in.orig
 +++ src/base/tinyxml/Makefile.in
-@@ -423,10 +423,10 @@ top_builddir = @top_builddir@
+@@ -417,10 +417,10 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zlib_CFLAGS = @zlib_CFLAGS@
  zlib_LIBS = @zlib_LIBS@
diff --git 
a/devel/codeblocks/patches/patch-src_include_mozilla_chardet_nsprpub_pr_include_prcpucfg_linux_h
 
b/devel/codeblocks/patches/patch-src_include_mozilla_chardet_nsprpub_pr_include_prcpucfg_linux_h
deleted file mode 100644
index 59dead9a877..000
--- 
a/devel/codeblocks/patches/patch-src_include_mozilla_chardet_nsprpub_pr_include_prcpucfg_linux_h
+++ /dev/null
@@ -1,58 +0,0 @@
-Add support for riscv64
-
-Index: src/include/mozilla_chardet/nsprpub/pr/include/prcpucfg_linux.h
 src/include/mozilla_chardet/nsprpub/pr/include/prcpucfg_linux.h.orig
-+++ src/include/mozilla_chardet/nsprpub/pr/include/prcpucfg_linux.h
-@@ -643,6 +643,52 @@
- #define PR_BYTES_PER_WORD_LOG2  3
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
-+#elif defined(__riscv) && __riscv_xlen == 64
-+
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT 32

update devel/codeblocks to 20.03 patch level 12751

[Josh Grosse]

Recently, problems with wxWidgets handling and startup have been
noticed with codeblocks 20.03.  Upstream has 730+ commits since
20.03 but have not yet tagged any new release or candidates of any kind.

Their recent HEAD at revision 12571 seems to solves both issues.

I have exported the source tree from their subversion repository
and am self-hosting a distfile tarball as MASTER_SITES1, which I will
maintain -- if this is an acceptable solution for a cherry picked 
collection of hundreds of upstream patches -- until after end-of-life
of 7.1 or any future release which may still require it for port 
building. 

Tested on amd64 at -current by me and with a backport tested by
John Lloyd on amd64 at 7.0-stable. 
diff --git a/devel/codeblocks/Makefile b/devel/codeblocks/Makefile
index 3e30ad54745..b95d338d46d 100755
--- a/devel/codeblocks/Makefile
+++ b/devel/codeblocks/Makefile
@@ -1,11 +1,17 @@
 BROKEN-alpha=  sqvm.cpp:394:1: internal compiler error: Segmentation fault
 COMMENT=   Code::Blocks C/C++ IDE
 
-V= 20.03
+V= 20.03pl12751
+
+# source tarball for this OpenBSD-specific patch level:
+MASTER_SITES1= https://jggimi.net/codeblocks/
+DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:1
+
 DISTNAME=  codeblocks-${V}
 PKGNAME=   codeblocks-${V}
 EXTRACT_SUFX=  .tar.xz
-REVISION=  2
+
+DEBUG_PACKAGES=${BUILD_PACKAGES}
 
 WRKDIST=   ${WRKDIR}/codeblocks-${V}
 
diff --git a/devel/codeblocks/distinfo b/devel/codeblocks/distinfo
index 09f55e353a9..0182edab851 100644
--- a/devel/codeblocks/distinfo
+++ b/devel/codeblocks/distinfo
@@ -1,2 +1,2 @@
-SHA256 (codeblocks-20.03.tar.xz) = Fe6z4orqBU4fOLDH9GcbTU0RFv0F9jwHqpWpHbieqsU=
-SIZE (codeblocks-20.03.tar.xz) = 11799264
+SHA256 (codeblocks-20.03pl12751.tar.xz) = 
ZP/Co2/RU2CzLUsxQEAvxjkpmSkwiA/xT4+zB9VNczs=
+SIZE (codeblocks-20.03pl12751.tar.xz) = 16711944
diff --git a/devel/codeblocks/patches/patch-configure 
b/devel/codeblocks/patches/patch-configure
index 46c8967c235..353f464c7cb 100644
--- a/devel/codeblocks/patches/patch-configure
+++ b/devel/codeblocks/patches/patch-configure
@@ -3,7 +3,7 @@ undefined reference to `free'
 Index: configure
 --- configure.orig
 +++ configure
-@@ -16911,7 +16911,6 @@ if ${ax_cv_check_ldflags___Wl___no_undefined+:} false;
+@@ -16899,7 +16899,6 @@ if ${ax_cv_check_ldflags___Wl___no_undefined+:} false;
  else
  
ax_check_save_flags=$LDFLAGS
@@ -11,7 +11,7 @@ Index: configure
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -16935,7 +16934,6 @@ fi
+@@ -16923,7 +16922,6 @@ fi
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: 
$ax_cv_check_ldflags___Wl___no_undefined" >&5
  $as_echo "$ax_cv_check_ldflags___Wl___no_undefined" >&6; }
  if test "x$ax_cv_check_ldflags___Wl___no_undefined" = xyes; then :
diff --git a/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in 
b/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in
index 59247107298..ab710b33327 100644
--- a/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in
+++ b/devel/codeblocks/patches/patch-src_base_tinyxml_Makefile_in
@@ -4,7 +4,7 @@ Fix build when tinyxml is installed.
 Index: src/base/tinyxml/Makefile.in
 --- src/base/tinyxml/Makefile.in.orig
 +++ src/base/tinyxml/Makefile.in
-@@ -423,10 +423,10 @@ top_builddir = @top_builddir@
+@@ -417,10 +417,10 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  zlib_CFLAGS = @zlib_CFLAGS@
  zlib_LIBS = @zlib_LIBS@
diff --git 
a/devel/codeblocks/patches/patch-src_include_mozilla_chardet_nsprpub_pr_include_prcpucfg_linux_h
 
b/devel/codeblocks/patches/patch-src_include_mozilla_chardet_nsprpub_pr_include_prcpucfg_linux_h
deleted file mode 100644
index 59dead9a877..000
--- 
a/devel/codeblocks/patches/patch-src_include_mozilla_chardet_nsprpub_pr_include_prcpucfg_linux_h
+++ /dev/null
@@ -1,58 +0,0 @@
-Add support for riscv64
-
-Index: src/include/mozilla_chardet/nsprpub/pr/include/prcpucfg_linux.h
 src/include/mozilla_chardet/nsprpub/pr/include/prcpucfg_linux.h.orig
-+++ src/include/mozilla_chardet/nsprpub/pr/include/prcpucfg_linux.h
-@@ -643,6 +643,52 @@
- #define PR_BYTES_PER_WORD_LOG2  3
- #define PR_BYTES_PER_DWORD_LOG2 3
- 
-+#elif defined(__riscv) && __riscv_xlen == 64
-+
-+#define IS_LITTLE_ENDIAN 1
-+#undef  IS_BIG_ENDIAN
-+#define IS_64
-+
-+#define PR_BYTES_PER_BYTE   1
-+#define PR_BYTES_PER_SHORT  2
-+#define PR_BYTES_PER_INT4
-+#define PR_BYTES_PER_INT64  8
-+#define PR_BYTES_PER_LONG   8
-+#define PR_BYTES_PER_FLOAT  4
-+#define PR_BYTES_PER_DOUBLE 8
-+#define PR_BYTES_PER_WORD   8
-+#define PR_BYTES_PER_DWORD  8
-+
-+#define PR_BITS_PER_BYTE8
-+#define PR_BITS_PER_SHORT   16
-+#define PR_BITS_PER_INT 32
-+#define PR_BITS_PER_INT64   64
-+#define PR_BITS_PER_LONG64
-+#define PR_BITS_PER_FLOAT   32
-+#define PR_BITS_PER_DOUBLE  64
-+#define PR_BITS_PER_WORD64
-+
-+#define PR_BITS_PER_BYTE_LOG2   3
-+#define PR_BITS_PER_SHORT_LOG2  4
-+#define PR_BITS_PER_INT_LOG25
-+#define 

Re: update: sysutils/udfclient 0.8.12

[Josh Grosse]

Ping.

On Sat, Feb 26, 2022 at 08:16:31AM -0500, Josh Grosse wrote:
> Upgrade from 0.8.11 to 0.8.12.
> 
> Changelog: Minor release adding support for NetBSD's dk(4) disc devices.
> 
> Tested -- without testing dk(4) -- on amd64.

> diff --git a/sysutils/udfclient/Makefile b/sysutils/udfclient/Makefile
> index 13a839df483..0a3342a8cdc 100644
> --- a/sysutils/udfclient/Makefile
> +++ b/sysutils/udfclient/Makefile
> @@ -2,7 +2,7 @@
>  
>  COMMENT =userland implementation of the UDF filesystem
>  
> -V =  0.8.11
> +V =  0.8.12
>  REVISION=0
>  DISTNAME =   UDFclient.${V}
>  PKGNAME =udfclient-${V}
> diff --git a/sysutils/udfclient/distinfo b/sysutils/udfclient/distinfo
> index 6907affe9dd..aaddbda2ce9 100644
> --- a/sysutils/udfclient/distinfo
> +++ b/sysutils/udfclient/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (UDFclient.0.8.11.tgz) = TlsQLPfxND2G+DDLb2n+osGWtBE2u9MN3CbLiWnt350=
> -SIZE (UDFclient.0.8.11.tgz) = 252986
> +SHA256 (UDFclient.0.8.12.tgz) = Txgo4XgO4bDUQUR96k0RTgvNiRl/pp/QP/ncvLKj7dg=
> +SIZE (UDFclient.0.8.12.tgz) = 256400

Re: update: textproc/calibre to 5.37.0

[Josh Grosse]

Ping.

On Wed, Feb 23, 2022 at 05:35:24PM -0500, Josh Grosse wrote:
> Update from 5.32.0 to 5.37.0
> 
> Change log: https://calibre-ebook.com/whats-new
> 
> Tested lightly on amd64.

> diff --git a/textproc/calibre/Makefile b/textproc/calibre/Makefile
> index a5f09344e64..b1a78e4ea16 100644
> --- a/textproc/calibre/Makefile
> +++ b/textproc/calibre/Makefile
> @@ -2,7 +2,7 @@
>  
>  COMMENT =ebook management application
>  
> -V =  5.32.0
> +V =  5.37.0
>  DISTNAME =   calibre-$V
>  
>  CATEGORIES = textproc
> diff --git a/textproc/calibre/distinfo b/textproc/calibre/distinfo
> index 4b610ef9399..a92ea121ecd 100644
> --- a/textproc/calibre/distinfo
> +++ b/textproc/calibre/distinfo
> @@ -1,2 +1,2 @@
> -SHA256 (calibre-5.32.0.tar.xz) = NXHvwcx3PkU7RZCWo4sUH9DHeE+5YRUFofmlVkj0fl4=
> -SIZE (calibre-5.32.0.tar.xz) = 37115596
> +SHA256 (calibre-5.37.0.tar.xz) = x2u4v0k05WMATSsuo76NnqChIz8BcTuZfPkZa0uLnMY=
> +SIZE (calibre-5.37.0.tar.xz) = 38369808
> diff --git a/textproc/calibre/patches/patch-setup___init___py 
> b/textproc/calibre/patches/patch-setup___init___py
> index 6341b4456a9..e776d30f0ef 100644
> --- a/textproc/calibre/patches/patch-setup___init___py
> +++ b/textproc/calibre/patches/patch-setup___init___py
> @@ -3,7 +3,7 @@ $OpenBSD: patch-setup___init___py,v 1.9 2021/08/14 10:24:26 
> sthen Exp $
>  Index: setup/__init__.py
>  --- setup/__init__.py.orig
>  +++ setup/__init__.py
> -@@ -25,7 +25,8 @@ ismacos = 'darwin' in sys.platform
> +@@ -24,7 +24,8 @@ ismacos = 'darwin' in sys.platform
>   isfreebsd = 'freebsd' in sys.platform
>   isnetbsd = 'netbsd' in sys.platform
>   isdragonflybsd = 'dragonfly' in sys.platform
> diff --git a/textproc/calibre/patches/patch-setup_build_py 
> b/textproc/calibre/patches/patch-setup_build_py
> index 180dd66571b..4184af5ef2a 100644
> --- a/textproc/calibre/patches/patch-setup_build_py
> +++ b/textproc/calibre/patches/patch-setup_build_py
> @@ -3,7 +3,7 @@ $OpenBSD: patch-setup_build_py,v 1.8 2021/10/25 13:11:46 
> sthen Exp $
>  Index: setup/build.py
>  --- setup/build.py.orig
>  +++ setup/build.py
> -@@ -72,15 +72,7 @@ class Extension:
> +@@ -71,15 +71,7 @@ class Extension:
>   
>   self.ldflags = d['ldflags'] = kwargs.get('ldflags', [])
>   self.optional = d['options'] = kwargs.get('optional', False)
> @@ -19,12 +19,12 @@ Index: setup/build.py
>   def lazy_load(name):
>   if name.startswith('!'):
>   name = name[1:]
> -@@ -196,6 +188,8 @@ def init_env(debug=False, sanitize=False):
> +@@ -206,6 +198,8 @@ def init_env(debug=False, sanitize=False):
>   if isbsd:
>   cflags.append('-pthread')
>   ldflags.append('-shared')
> -+cflags.append('-I'+os.path.join(sysconfig.PREFIX, 'include'))
> -+ldflags.append('-L'+os.path.join(sysconfig.PREFIX, 'lib'))
> ++cflags.append('-I${PREFIX}/include')
> ++ldflags.append('-L${PREFIX}/lib')
>   
>   if ishaiku:
>   cflags.append('-lpthread')
> diff --git a/textproc/calibre/patches/patch-setup_install_py 
> b/textproc/calibre/patches/patch-setup_install_py
> index 02671652c28..1934745612b 100644
> --- a/textproc/calibre/patches/patch-setup_install_py
> +++ b/textproc/calibre/patches/patch-setup_install_py
> @@ -3,7 +3,7 @@ $OpenBSD: patch-setup_install_py,v 1.7 2021/04/28 20:23:06 
> sthen Exp $
>  Index: setup/install.py
>  --- setup/install.py.orig
>  +++ setup/install.py
> -@@ -270,7 +270,7 @@ class Install(Develop):
> +@@ -272,7 +272,7 @@ class Install(Develop):
>   reldir = os.path.relpath(x[0], self.SRC)
>   destdir = os.path.join(dest, reldir)
>   for f in x[-1]:
> diff --git a/textproc/calibre/patches/patch-src_calibre_constants_py 
> b/textproc/calibre/patches/patch-src_calibre_constants_py
> index d3851393167..8b848eec784 100644
> --- a/textproc/calibre/patches/patch-src_calibre_constants_py
> +++ b/textproc/calibre/patches/patch-src_calibre_constants_py
> @@ -8,7 +8,7 @@ supports OSX, Windows, and Linux SYSFS.
>  Index: src/calibre/constants.py
>  --- src/calibre/constants.py.orig
>  +++ src/calibre/constants.py
> -@@ -22,7 +22,8 @@ isnewosx  = ismacos and getattr(sys, 'new_app_bundle',
> +@@ -21,7 +21,8 @@ isnewosx  = ismacos and getattr(sys, 'new_app_bundle',
>   isfreebsd = 'freebsd' in _plat
>   isnetbsd = 'netbsd' in _plat
>   isdragonflybsd = 'dragonfly' in _plat
> @@ -18,7 +18,7 @@ Index: src/calibre/constants.py
>   ishaiku = 'haiku1' in _plat
>   islinux   = not(iswindows or ismacos or isbsd or ishaiku)
>   isfrozen  = hasattr(sys, 'frozen')
> -@@ -256,7 +257,7 @@ class ExtensionsImporter:
> +@@ -255,7 +256,7 @@ cl

Re: gmic update

[Josh Grosse]

On Tue, Mar 01, 2022 at 05:42:32PM +0100, Marc Espie wrote:
> 
> Here's an update to gmic and gmic-qt.
> This uses the newly commited framework parts that ditch $OpenBSD$
> Hence a bit of churn.
> 
> Apart from that, things seem okay.
> 
> There was a fuck-up wrt the cmake framework with upstream, taken care of
> with (merged) pr264, so that part of the patch should go away when the next
> minor release comes out.
> 
> Tested lightly with the gmic demos and the gimp filters.

Tested gmic, gmic-qt-none, and gmic-qt-gimp successfully.

I am unable to successfully test gmic-qt-krita.  AFAIK, krita 5.0.0 integrated
gmic, and we are at krita 5.0.2. I'm not a krita user, so my inability to
find gmic filters within may just be my limited understanding of how to
use krita.  Or, it could be that gmic-qt-krita is no longer needed.

update: sysutils/udfclient 0.8.12

[Josh Grosse]

Upgrade from 0.8.11 to 0.8.12.

Changelog: Minor release adding support for NetBSD's dk(4) disc devices.

Tested -- without testing dk(4) -- on amd64.
diff --git a/sysutils/udfclient/Makefile b/sysutils/udfclient/Makefile
index 13a839df483..0a3342a8cdc 100644
--- a/sysutils/udfclient/Makefile
+++ b/sysutils/udfclient/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  userland implementation of the UDF filesystem
 
-V =0.8.11
+V =0.8.12
 REVISION=  0
 DISTNAME = UDFclient.${V}
 PKGNAME =  udfclient-${V}
diff --git a/sysutils/udfclient/distinfo b/sysutils/udfclient/distinfo
index 6907affe9dd..aaddbda2ce9 100644
--- a/sysutils/udfclient/distinfo
+++ b/sysutils/udfclient/distinfo
@@ -1,2 +1,2 @@
-SHA256 (UDFclient.0.8.11.tgz) = TlsQLPfxND2G+DDLb2n+osGWtBE2u9MN3CbLiWnt350=
-SIZE (UDFclient.0.8.11.tgz) = 252986
+SHA256 (UDFclient.0.8.12.tgz) = Txgo4XgO4bDUQUR96k0RTgvNiRl/pp/QP/ncvLKj7dg=
+SIZE (UDFclient.0.8.12.tgz) = 256400

update: textproc/calibre to 5.37.0

[Josh Grosse]

Update from 5.32.0 to 5.37.0

Change log: https://calibre-ebook.com/whats-new

Tested lightly on amd64.
diff --git a/textproc/calibre/Makefile b/textproc/calibre/Makefile
index a5f09344e64..b1a78e4ea16 100644
--- a/textproc/calibre/Makefile
+++ b/textproc/calibre/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  ebook management application
 
-V =5.32.0
+V =5.37.0
 DISTNAME = calibre-$V
 
 CATEGORIES =   textproc
diff --git a/textproc/calibre/distinfo b/textproc/calibre/distinfo
index 4b610ef9399..a92ea121ecd 100644
--- a/textproc/calibre/distinfo
+++ b/textproc/calibre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (calibre-5.32.0.tar.xz) = NXHvwcx3PkU7RZCWo4sUH9DHeE+5YRUFofmlVkj0fl4=
-SIZE (calibre-5.32.0.tar.xz) = 37115596
+SHA256 (calibre-5.37.0.tar.xz) = x2u4v0k05WMATSsuo76NnqChIz8BcTuZfPkZa0uLnMY=
+SIZE (calibre-5.37.0.tar.xz) = 38369808
diff --git a/textproc/calibre/patches/patch-setup___init___py 
b/textproc/calibre/patches/patch-setup___init___py
index 6341b4456a9..e776d30f0ef 100644
--- a/textproc/calibre/patches/patch-setup___init___py
+++ b/textproc/calibre/patches/patch-setup___init___py
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup___init___py,v 1.9 2021/08/14 10:24:26 
sthen Exp $
 Index: setup/__init__.py
 --- setup/__init__.py.orig
 +++ setup/__init__.py
-@@ -25,7 +25,8 @@ ismacos = 'darwin' in sys.platform
+@@ -24,7 +24,8 @@ ismacos = 'darwin' in sys.platform
  isfreebsd = 'freebsd' in sys.platform
  isnetbsd = 'netbsd' in sys.platform
  isdragonflybsd = 'dragonfly' in sys.platform
diff --git a/textproc/calibre/patches/patch-setup_build_py 
b/textproc/calibre/patches/patch-setup_build_py
index 180dd66571b..4184af5ef2a 100644
--- a/textproc/calibre/patches/patch-setup_build_py
+++ b/textproc/calibre/patches/patch-setup_build_py
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup_build_py,v 1.8 2021/10/25 13:11:46 sthen 
Exp $
 Index: setup/build.py
 --- setup/build.py.orig
 +++ setup/build.py
-@@ -72,15 +72,7 @@ class Extension:
+@@ -71,15 +71,7 @@ class Extension:
  
  self.ldflags = d['ldflags'] = kwargs.get('ldflags', [])
  self.optional = d['options'] = kwargs.get('optional', False)
@@ -19,12 +19,12 @@ Index: setup/build.py
  def lazy_load(name):
  if name.startswith('!'):
  name = name[1:]
-@@ -196,6 +188,8 @@ def init_env(debug=False, sanitize=False):
+@@ -206,6 +198,8 @@ def init_env(debug=False, sanitize=False):
  if isbsd:
  cflags.append('-pthread')
  ldflags.append('-shared')
-+cflags.append('-I'+os.path.join(sysconfig.PREFIX, 'include'))
-+ldflags.append('-L'+os.path.join(sysconfig.PREFIX, 'lib'))
++cflags.append('-I${PREFIX}/include')
++ldflags.append('-L${PREFIX}/lib')
  
  if ishaiku:
  cflags.append('-lpthread')
diff --git a/textproc/calibre/patches/patch-setup_install_py 
b/textproc/calibre/patches/patch-setup_install_py
index 02671652c28..1934745612b 100644
--- a/textproc/calibre/patches/patch-setup_install_py
+++ b/textproc/calibre/patches/patch-setup_install_py
@@ -3,7 +3,7 @@ $OpenBSD: patch-setup_install_py,v 1.7 2021/04/28 20:23:06 
sthen Exp $
 Index: setup/install.py
 --- setup/install.py.orig
 +++ setup/install.py
-@@ -270,7 +270,7 @@ class Install(Develop):
+@@ -272,7 +272,7 @@ class Install(Develop):
  reldir = os.path.relpath(x[0], self.SRC)
  destdir = os.path.join(dest, reldir)
  for f in x[-1]:
diff --git a/textproc/calibre/patches/patch-src_calibre_constants_py 
b/textproc/calibre/patches/patch-src_calibre_constants_py
index d3851393167..8b848eec784 100644
--- a/textproc/calibre/patches/patch-src_calibre_constants_py
+++ b/textproc/calibre/patches/patch-src_calibre_constants_py
@@ -8,7 +8,7 @@ supports OSX, Windows, and Linux SYSFS.
 Index: src/calibre/constants.py
 --- src/calibre/constants.py.orig
 +++ src/calibre/constants.py
-@@ -22,7 +22,8 @@ isnewosx  = ismacos and getattr(sys, 'new_app_bundle',
+@@ -21,7 +21,8 @@ isnewosx  = ismacos and getattr(sys, 'new_app_bundle',
  isfreebsd = 'freebsd' in _plat
  isnetbsd = 'netbsd' in _plat
  isdragonflybsd = 'dragonfly' in _plat
@@ -18,7 +18,7 @@ Index: src/calibre/constants.py
  ishaiku = 'haiku1' in _plat
  islinux   = not(iswindows or ismacos or isbsd or ishaiku)
  isfrozen  = hasattr(sys, 'frozen')
-@@ -256,7 +257,7 @@ class ExtensionsImporter:
+@@ -255,7 +256,7 @@ class ExtensionsImporter:
  extra = ('winutil', 'wpd', 'winfonts', 'winsapi')
  elif ismacos:
  extra = ('usbobserver', 'cocoa', 'libusb', 'libmtp')
diff --git a/textproc/calibre/patches/patch-src_calibre_gui2___init___py 
b/textproc/calibre/patches/patch-src_calibre_gui2___init___py
index 94accb54210..93668f52d43 100644
--- a/textproc/calibre/patches/patch-src_calibre_gui2___init___py
+++ b/textproc/calibre/patches/patch-src_calibre_gui2___init___py
@@ -5,7 +5,7 @@ $OpenBSD: patch-src_calibre_gui2___init___py,v 1.14 2021/10/25 
13:11:46 sthen Ex
 Index: 

Update: audio/pianobar 2020.04.05 -> 2020.11.28

[Josh Grosse]

Tested on amd64.  ChangeLog:

Release 2020.11.28

- Support changing station modes
- Allow choosing time format
- Add optional debug output
diff --git a/audio/pianobar/Makefile b/audio/pianobar/Makefile
index f3e3c013d39..fabe5511b56 100644
--- a/audio/pianobar/Makefile
+++ b/audio/pianobar/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  command-line client for Pandora Internet Radio
 
-DISTNAME = pianobar-2020.04.05
+DISTNAME = pianobar-2020.11.28
 EXTRACT_SUFX = .tar.bz2
 CATEGORIES =   audio
 
@@ -10,7 +10,7 @@ HOMEPAGE =https://6xq.net/pianobar/
 
 MASTER_SITES = ${HOMEPAGE}
 
-SHARED_LIBS =  piano   9.0 # 0.0.0
+SHARED_LIBS =  piano   10.0# 0.0.0
 
 # MIT
 PERMIT_PACKAGE =   Yes
diff --git a/audio/pianobar/distinfo b/audio/pianobar/distinfo
index b7e7cb96085..44990d00160 100644
--- a/audio/pianobar/distinfo
+++ b/audio/pianobar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pianobar-2020.04.05.tar.bz2) = 
bBc7aynMwfQy4AE/tCXo+ctCYVObWNNE4LInSWNyZIA=
-SIZE (pianobar-2020.04.05.tar.bz2) = 48823
+SHA256 (pianobar-2020.11.28.tar.bz2) = 
ZTv7lrVIJZ46w2B1L2b9t36OIgMS5SpDxlL365bn1P4=
+SIZE (pianobar-2020.11.28.tar.bz2) = 50580

Update: graphics/gimp/stable 2.10.28 -> 2.10.30

[Josh Grosse]

Tested (lightly) on amd64.

Copied from the head of file "NEWS":


Overview of Changes from GIMP 2.10.28 to GIMP 2.10.30
=

Core:

  - Do not follow subpixel font rendering choice from system settings
for text layer rendering. These systems are useful for GUI
rendering on a screen of a specific type and pixel order. Yet when
rendering an image which can be zoomed in or out, showed on various
screens or even printed, subpixel font rendering doesn't make sense.
  - Rewrite the core selection drawing logics so that it works on macOS
Big Sur and over. This is a backport (adapted to GTK+2) of the fix
brought in GIMP 2.99.8 for Wayland and macOS.
  - Ignore MakerNote metadata tag at export and only store the tags that
go in it, hence avoiding partial invalid metadata.
  - Color picking from Colors dockable can now use the Freedesktop
portal.
  - On Windows, move from GetICMProfile() to WcsGetDefaultColorProfile()
because the former is broken in Windows 11.

Plug-ins:

  - metadata-viewer: improve how XMP tags with multiple values are
handled and shown (now each value on a separate line for better
readability).
  - metadata-editor:
* XMP array tags of type BAG and SEQ are now on separate lines.
* Comparing XMP tags with equivalent IPTC tags with multiple values,
  each value is compared individually, instead of comparing the list
  as a whole.
  - Many robustness improvements and other fixes to the metadata
plug-ins.
  - AVIF: prefer AOM encoder for export.
  - PSD:
* Skip sanity check for mask of rendered layers as some layer mask
  have invalid dimensions in such cases. They will now be loaded
  correctly.
* Fixed loading of CMYK PSD files without alpha.
* Fixed loading of CMYK images without layers.
* Fixed loading of merged image of a 16 bit per channel RGBA PSD
  file with the alpha channel opaque.
   - PBM: large file export now always works and does not depend anymore
 on the platform's long int size.
   - Screenshot:
 * GNOME shell implementation dropped because the D-Bus API has been
   restricted to core components for security reasons, thus our
   plug-in was failing.
 * KDE portal moved as last fallback after the X implementation
   (when running on X) and Freedesktop portal, because KDE is also
   starting to block API calls for security reasons.

Installer:

  - Extension .avif now associated to GIMP.
  - Drop codepage conversion, use UTF-8 for language files.

Build:

  - macOS support officially bumped to macOS 10.12 (Sierra). We would
usually try to avoid doing this within a stable release but the
conditions (lack of contributors) is such that it is hard to avoid.
diff --git a/graphics/gimp/stable/Makefile b/graphics/gimp/stable/Makefile
index 25af0048bfb..2a79480326a 100644
--- a/graphics/gimp/stable/Makefile
+++ b/graphics/gimp/stable/Makefile
@@ -2,11 +2,11 @@
 
 COMMENT=   GNU Image Manipulation Program
 
-DISTNAME = gimp-2.10.28
+DISTNAME = gimp-2.10.30
 
 .for i in gimp gimpbase gimpcolor gimpconfig gimpmath gimpmodule \
gimpthumb gimpui gimpwidgets
-SHARED_LIBS +=  $i-2.0 274.0
+SHARED_LIBS +=  $i-2.0 275.0
 .endfor
 
 CATEGORIES=graphics
@@ -26,15 +26,15 @@ PERMIT_PACKAGE= Yes
 WANTLIB += ${COMPILER_LIBCXX}
 WANTLIB += ICE Iex-3_1 IlmThread-3_1 OpenEXR-3_1 OpenEXRCore-3_1 
OpenEXRUtil-3_1
 WANTLIB += Imath-3_1 SM X11 Xcomposite Xcursor Xdamage Xext Xfixes
-WANTLIB += Xi Xinerama Xmu Xpm Xrandr Xrender Xt aa aom atk-1.0
+WANTLIB += Xau Xdmcp Xi Xinerama Xmu Xpm Xrandr Xrender Xt aa aom atk-1.0
 WANTLIB += avahi-client avahi-common babl-0.1 bz2 c cairo cairo-gobject
 WANTLIB += cups curses dav1d dbus-1 de265 execinfo exiv2 expat
 WANTLIB += ffi fontconfig freetype fribidi gdk-x11-2.0 gdk_pixbuf-2.0
 WANTLIB += gegl-0.4 gexiv2 gio-2.0 glib-2.0 gmodule-2.0 gmp gnutls
 WANTLIB += gobject-2.0 graphite2 gs gtk-x11-2.0 harfbuzz heif
-WANTLIB += hogweed iconv idn2 ijs intl jbig2dec jpeg json-c json-glib-1.0
+WANTLIB += hogweed iconv idn idn2 ijs intl jbig2dec jpeg json-c json-glib-1.0
 WANTLIB += lcms lcms2 lzma m mng mypaint nettle openjp2 p11-kit
-WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1
+WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 paper pcre pixman-1
 WANTLIB += png poppler poppler-glib rsvg-2 tasn1 tiff unistring
 WANTLIB += webp webpdemux webpmux wmf-0.2 wmflite-0.2 x265 xcb
 WANTLIB += xcb-render xcb-shm xml2 z zstd
diff --git a/graphics/gimp/stable/distinfo b/graphics/gimp/stable/distinfo
index 6365753e6b1..6f45d0af4e2 100644
--- a/graphics/gimp/stable/distinfo
+++ b/graphics/gimp/stable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gimp-2.10.28.tar.bz2) = T03CLP8atfAm/qoqtV4Fd1s6EeGYGGtHvat5y/oHiCY=
-SIZE (gimp-2.10.28.tar.bz2) = 31675862
+SHA256 (gimp-2.10.30.tar.bz2) = iIFdqnbtfUJ37rNTNYuvoRbNL80shh2VuVE1wdUrZ9w=
+SIZE 

Re: update: graphics/gnofract4d

[Josh Grosse]

Attached is a "v3" diff, because:

On Wed, Dec 29, 2021 at 08:54:23PM -0500, Josh Grosse wrote:

> > Removing py-gtk2 without a replacement rings alarm bells. Checking
> > the requirements list on https://github.com/fract4d/gnofract4d
> > it's going to want at least RDEP on py-gobject3 and py-cairo (with
> > ${MODPY_FLAVOR}) and gtk+3 and BDEP on glib2 for glib-compile-resources.

gtk+3,-guic is already an RDEP.  glib2 added as a BDEP.
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index d62be733b1a..10c762f0c7a 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -2,35 +2,35 @@
 
 COMMENT =  fractal image generator
 
-MODPY_EGG_VERSION =3.14.1
-DISTNAME = gnofract4d-${MODPY_EGG_VERSION}
+MODPY_EGG_VERSION =4.3
+MODPY_SETUPTOOLS = Yes
 
-GH_PROJECT =   gnofract4d
-GH_ACCOUNT =   edyoung
-GH_TAGNAME =   V_${MODPY_EGG_VERSION:S/./_/g}
-REVISION = 4
+MASTER_SITES = 
https://github.com/fract4d/gnofract4d/releases/download/v${MODPY_EGG_VERSION}/
+DISTNAME = gnofract4d-${MODPY_EGG_VERSION}
 
 CATEGORIES =   graphics
 
-HOMEPAGE = http://gnofract4d.sourceforge.net
+HOMEPAGE = https://github.com/fract4d/gnofract4d
 
 # 3-clause BSD
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += ${MODPY_WANTLIB}
-WANTLIB += m png pthread z ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} m z png jpeg
 
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc
 
 MODULES =  lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
 
-LIB_DEPENDS =  graphics/png
+BUILD_DEPENDS +=   devel/glib2
+
+LIB_DEPENDS =  graphics/png \
+   graphics/jpeg
 
-RUN_DEPENDS =  devel/desktop-file-utils \
-   misc/shared-mime-info \
-   x11/gnome/yelp \
-   x11/py-gtk2
+RUN_DEPENDS += misc/shared-mime-info \
+   x11/gtk+3,-guic \
+   devel/desktop-file-utils \
+   devel/py-gobject3,${MODPY_FLAVOR} \
+   graphics/py-cairo,${MODPY_FLAVOR}
 
 NO_TEST =  Yes
 
diff --git a/graphics/gnofract4d/distinfo b/graphics/gnofract4d/distinfo
index 8631231b3a5..18999449730 100644
--- a/graphics/gnofract4d/distinfo
+++ b/graphics/gnofract4d/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnofract4d-3.14.1.tar.gz) = 
KfBdmwf3tTvyULD4H3S3bb1o78XWunH01V7zMva2+D0=
-SIZE (gnofract4d-3.14.1.tar.gz) = 4660808
+SHA256 (gnofract4d-4.3.tar.gz) = SvoYuzZhA3wqmI8ShTFakFX1pphqIdX/cePCYaK1VqE=
+SIZE (gnofract4d-4.3.tar.gz) = 886445
diff --git a/graphics/gnofract4d/patches/patch-fract4d_compiler_fc_py 
b/graphics/gnofract4d/patches/patch-fract4d_compiler_fc_py
new file mode 100644
index 000..8abd25bf9eb
--- /dev/null
+++ b/graphics/gnofract4d/patches/patch-fract4d_compiler_fc_py
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: fract4d_compiler/fc.py
+--- fract4d_compiler/fc.py.orig
 fract4d_compiler/fc.py
+@@ -148,7 +148,7 @@ class Compiler:
+ self.c_code = ""
+ self.path_lists = [[], [], [], []]
+ 
+-self.compiler_name = "gcc"
++self.compiler_name = "cc"
+ 
+ self.include_path = "-I%s/c/" % os.path.dirname(fract4d.__file__)
+ self.flags = "-fPIC -DPIC -g -O3 -shared"
diff --git 
a/graphics/gnofract4d/patches/patch-fract4d_compiler_tests_test_codegen_py 
b/graphics/gnofract4d/patches/patch-fract4d_compiler_tests_test_codegen_py
new file mode 100644
index 000..552c7d99c4e
--- /dev/null
+++ b/graphics/gnofract4d/patches/patch-fract4d_compiler_tests_test_codegen_py
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: fract4d_compiler/tests/test_codegen.py
+--- fract4d_compiler/tests/test_codegen.py.orig
 fract4d_compiler/tests/test_codegen.py
+@@ -247,7 +247,7 @@ int main()
+ cmd = "gcc -Wall -fPIC -DPIC -Ifract4d/c -shared %s -o %s -lm 
-flat_namespace -undefined suppress" % (
+ cFile.name, oFileName)
+ else:
+-cmd = "gcc -Wall -fPIC -DPIC -Ifract4d/c -shared %s -o %s -lm" % (
++cmd = "cc -Wall -fPIC -DPIC -Ifract4d/c -shared %s -o %s -lm" % (
+ cFile.name, oFileName)
+ status, output = subprocess.getstatusoutput(cmd)
+ self.assertEqual(status, 0, "C error:\n%s\nProgram:\n%s\n" %
diff --git a/graphics/gnofract4d/patches/patch-fract4d_fractconfig_py 
b/graphics/gnofract4d/patches/patch-fract4d_fractconfig_py
new file mode 100644
index 000..52360adc465
--- /dev/null
+++ b/graphics/gnofract4d/patches/patch-fract4d_fractconfig_py
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: fract4d/fractconfig.py
+--- fract4d/fractconfig.py.orig
 fract4d/fractconfig.py
+@@ -12,7 +12,7 @@ c

Re: update: graphics/gnofract4d

[Josh Grosse]

Thank you, Stuart, as always!

On Wed, Dec 29, 2021 at 11:26:54AM +, Stuart Henderson wrote:
> Please change these unconditionally i.e. for gcc archs too.
> cc/c++ are still valid names in that case (and gcc/g++ aren't
> really)..

Done. 

> >   COMPILER = base-clang ports-gcc base-gcc
> 
> Build uses -std=c++17 so you can remove base-gcc.

Done.
 
> Removing py-gtk2 without a replacement rings alarm bells. Checking
> the requirements list on https://github.com/fract4d/gnofract4d
> it's going to want at least RDEP on py-gobject3 and py-cairo (with
> ${MODPY_FLAVOR}) and gtk+3 and BDEP on glib2 for glib-compile-resources.

Done.

> > + if sys.platform[:6] == "darwin":
> > +-cmd = "gcc -Wall -fPIC -DPIC -Ifract4d/c -shared %s -o %s -lm 
> > -flat_namespace -undefined suppress" % (
> > ++cmd = "cc -Wall -fPIC -DPIC -Ifract4d/c -shared %s -o %s -lm 
> > -flat_namespace -undefined suppress" % (
> > + cFile.name, oFileName)
> 
> I would skip patching the darwin one, less chance of needing to merge
> the patch in a future update.
 
Done.
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index d62be733b1a..cad396b501c 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -2,35 +2,33 @@
 
 COMMENT =  fractal image generator
 
-MODPY_EGG_VERSION =3.14.1
-DISTNAME = gnofract4d-${MODPY_EGG_VERSION}
+MODPY_EGG_VERSION =4.3
+MODPY_SETUPTOOLS = Yes
 
-GH_PROJECT =   gnofract4d
-GH_ACCOUNT =   edyoung
-GH_TAGNAME =   V_${MODPY_EGG_VERSION:S/./_/g}
-REVISION = 4
+MASTER_SITES = 
https://github.com/fract4d/gnofract4d/releases/download/v${MODPY_EGG_VERSION}/
+DISTNAME = gnofract4d-${MODPY_EGG_VERSION}
 
 CATEGORIES =   graphics
 
-HOMEPAGE = http://gnofract4d.sourceforge.net
+HOMEPAGE = https://github.com/fract4d/gnofract4d
 
 # 3-clause BSD
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += ${MODPY_WANTLIB}
-WANTLIB += m png pthread z ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} m z png jpeg
 
-COMPILER = base-clang ports-gcc base-gcc
+COMPILER = base-clang ports-gcc
 
 MODULES =  lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
 
-LIB_DEPENDS =  graphics/png
+LIB_DEPENDS =  graphics/png \
+   graphics/jpeg
 
-RUN_DEPENDS =  devel/desktop-file-utils \
-   misc/shared-mime-info \
-   x11/gnome/yelp \
-   x11/py-gtk2
+RUN_DEPENDS += misc/shared-mime-info \
+   x11/gtk+3,-guic \
+   devel/desktop-file-utils \
+   devel/py-gobject3,${MODPY_FLAVOR} \
+   graphics/py-cairo,${MODPY_FLAVOR}
 
 NO_TEST =  Yes
 
diff --git a/graphics/gnofract4d/distinfo b/graphics/gnofract4d/distinfo
index 8631231b3a5..18999449730 100644
--- a/graphics/gnofract4d/distinfo
+++ b/graphics/gnofract4d/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnofract4d-3.14.1.tar.gz) = 
KfBdmwf3tTvyULD4H3S3bb1o78XWunH01V7zMva2+D0=
-SIZE (gnofract4d-3.14.1.tar.gz) = 4660808
+SHA256 (gnofract4d-4.3.tar.gz) = SvoYuzZhA3wqmI8ShTFakFX1pphqIdX/cePCYaK1VqE=
+SIZE (gnofract4d-4.3.tar.gz) = 886445
diff --git a/graphics/gnofract4d/patches/patch-fract4d_compiler_fc_py 
b/graphics/gnofract4d/patches/patch-fract4d_compiler_fc_py
new file mode 100644
index 000..8abd25bf9eb
--- /dev/null
+++ b/graphics/gnofract4d/patches/patch-fract4d_compiler_fc_py
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: fract4d_compiler/fc.py
+--- fract4d_compiler/fc.py.orig
 fract4d_compiler/fc.py
+@@ -148,7 +148,7 @@ class Compiler:
+ self.c_code = ""
+ self.path_lists = [[], [], [], []]
+ 
+-self.compiler_name = "gcc"
++self.compiler_name = "cc"
+ 
+ self.include_path = "-I%s/c/" % os.path.dirname(fract4d.__file__)
+ self.flags = "-fPIC -DPIC -g -O3 -shared"
diff --git 
a/graphics/gnofract4d/patches/patch-fract4d_compiler_tests_test_codegen_py 
b/graphics/gnofract4d/patches/patch-fract4d_compiler_tests_test_codegen_py
new file mode 100644
index 000..552c7d99c4e
--- /dev/null
+++ b/graphics/gnofract4d/patches/patch-fract4d_compiler_tests_test_codegen_py
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: fract4d_compiler/tests/test_codegen.py
+--- fract4d_compiler/tests/test_codegen.py.orig
 fract4d_compiler/tests/test_codegen.py
+@@ -247,7 +247,7 @@ int main()
+ cmd = "gcc -Wall -fPIC -DPIC -Ifract4d/c -shared %s -o %s -lm 
-flat_namespace -undefined suppress" % (
+ cFile.name, oFileName)
+ else:
+-cmd = "gcc -Wall -fPIC -DPIC -Ifract4d/c -shared %s -o %s -lm" % (
++cmd = "cc -Wall -fPIC -DPIC -Ifract4d/c -shared %s -o %s -lm" % (
+ cFile.name, oFileName)
+ status, output = 

update: graphics/gnofract4d

[Josh Grosse]

Attached is a diff to update from 3.14.1 to 4.3.

Tested on amd64 only.  This could use tests on
on a gcc4 architecture -- if both gtk+3 and python 3.9
are available -- as I am using an alternate
PATCHDIR to modify a hard-coded "gcc" as the default
compiler to "cc" on clang architectures only. 

The gcc requirement predates the transition to 
clang as a base compiler.

An improved solution would be welcome; this would
be the only port in the tree that references an
alternate PATCHDIR.
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index d62be733b1a..cbdf341b349 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -2,36 +2,37 @@
 
 COMMENT =  fractal image generator
 
-MODPY_EGG_VERSION =3.14.1
-DISTNAME = gnofract4d-${MODPY_EGG_VERSION}
+MODPY_EGG_VERSION =4.3
+MODPY_SETUPTOOLS = Yes
 
-GH_PROJECT =   gnofract4d
-GH_ACCOUNT =   edyoung
-GH_TAGNAME =   V_${MODPY_EGG_VERSION:S/./_/g}
-REVISION = 4
+MASTER_SITES = 
https://github.com/fract4d/gnofract4d/releases/download/v${MODPY_EGG_VERSION}/
+DISTNAME = gnofract4d-${MODPY_EGG_VERSION}
 
 CATEGORIES =   graphics
 
-HOMEPAGE = http://gnofract4d.sourceforge.net
+HOMEPAGE = https://github.com/fract4d/gnofract4d
 
 # 3-clause BSD
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += ${MODPY_WANTLIB}
-WANTLIB += m png pthread z ${COMPILER_LIBCXX}
+WANTLIB += ${COMPILER_LIBCXX} m z png jpeg
 
 COMPILER = base-clang ports-gcc base-gcc
 
 MODULES =  lang/python
-MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
 
-LIB_DEPENDS =  graphics/png
+LIB_DEPENDS =  graphics/png \
+   graphics/jpeg
 
-RUN_DEPENDS =  devel/desktop-file-utils \
-   misc/shared-mime-info \
-   x11/gnome/yelp \
-   x11/py-gtk2
+RUN_DEPENDS += misc/shared-mime-info \
+   x11/gtk+3,-guic \
+   devel/desktop-file-utils
 
 NO_TEST =  Yes
 
+.include 
+.if ${PROPERTIES:Mclang}
+PATCHDIR = patches-clang
+.endif
+
 .include 
diff --git a/graphics/gnofract4d/distinfo b/graphics/gnofract4d/distinfo
index 8631231b3a5..18999449730 100644
--- a/graphics/gnofract4d/distinfo
+++ b/graphics/gnofract4d/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnofract4d-3.14.1.tar.gz) = 
KfBdmwf3tTvyULD4H3S3bb1o78XWunH01V7zMva2+D0=
-SIZE (gnofract4d-3.14.1.tar.gz) = 4660808
+SHA256 (gnofract4d-4.3.tar.gz) = SvoYuzZhA3wqmI8ShTFakFX1pphqIdX/cePCYaK1VqE=
+SIZE (gnofract4d-4.3.tar.gz) = 886445
diff --git a/graphics/gnofract4d/patches-clang/patch-fract4d_compiler_fc_py 
b/graphics/gnofract4d/patches-clang/patch-fract4d_compiler_fc_py
new file mode 100644
index 000..8abd25bf9eb
--- /dev/null
+++ b/graphics/gnofract4d/patches-clang/patch-fract4d_compiler_fc_py
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: fract4d_compiler/fc.py
+--- fract4d_compiler/fc.py.orig
 fract4d_compiler/fc.py
+@@ -148,7 +148,7 @@ class Compiler:
+ self.c_code = ""
+ self.path_lists = [[], [], [], []]
+ 
+-self.compiler_name = "gcc"
++self.compiler_name = "cc"
+ 
+ self.include_path = "-I%s/c/" % os.path.dirname(fract4d.__file__)
+ self.flags = "-fPIC -DPIC -g -O3 -shared"
diff --git 
a/graphics/gnofract4d/patches-clang/patch-fract4d_compiler_tests_test_codegen_py
 
b/graphics/gnofract4d/patches-clang/patch-fract4d_compiler_tests_test_codegen_py
new file mode 100644
index 000..fd0d8edd7e0
--- /dev/null
+++ 
b/graphics/gnofract4d/patches-clang/patch-fract4d_compiler_tests_test_codegen_py
@@ -0,0 +1,18 @@
+$OpenBSD$
+
+Index: fract4d_compiler/tests/test_codegen.py
+--- fract4d_compiler/tests/test_codegen.py.orig
 fract4d_compiler/tests/test_codegen.py
+@@ -244,10 +244,10 @@ int main()
+ oFileName = str(Path(cFile.name).with_suffix(".so"))
+ import sys
+ if sys.platform[:6] == "darwin":
+-cmd = "gcc -Wall -fPIC -DPIC -Ifract4d/c -shared %s -o %s -lm 
-flat_namespace -undefined suppress" % (
++cmd = "cc -Wall -fPIC -DPIC -Ifract4d/c -shared %s -o %s -lm 
-flat_namespace -undefined suppress" % (
+ cFile.name, oFileName)
+ else:
+-cmd = "gcc -Wall -fPIC -DPIC -Ifract4d/c -shared %s -o %s -lm" % (
++cmd = "cc -Wall -fPIC -DPIC -Ifract4d/c -shared %s -o %s -lm" % (
+ cFile.name, oFileName)
+ status, output = subprocess.getstatusoutput(cmd)
+ self.assertEqual(status, 0, "C error:\n%s\nProgram:\n%s\n" %
diff --git a/graphics/gnofract4d/patches-clang/patch-fract4d_fractconfig_py 
b/graphics/gnofract4d/patches-clang/patch-fract4d_fractconfig_py
new file mode 100644
index 000..52360adc465
--- /dev/null
+++ b/graphics/gnofract4d/patches-clang/patch-fract4d_fractconfig_py
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: 

Re: UPDATE: QEMU 6.2.0

[Josh Grosse]

On Fri, Dec 17, 2021 at 09:05:53AM -0500, Josh Grosse wrote:
> On Wed, Dec 15, 2021 at 12:16:01AM -0500, Brad Smith wrote:
> > Here is an update to QEMU 6.2.0.
> 
> Builds fine, and I did some very minimal testing of OpenBSD 
> guests with i386/amd64.

I've also test an OpenBSD/arm64 guest on amd64.  I used
`-cpu cortex-a57` and the most recent `-bios QEMU_EFI.fd`
from linaro.org.

Re: UPDATE: QEMU 6.2.0

[Josh Grosse]

On Wed, Dec 15, 2021 at 12:16:01AM -0500, Brad Smith wrote:
> Here is an update to QEMU 6.2.0.

Builds fine, and I did some very minimal testing of OpenBSD 
guests with i386/amd64.

Thus spake portcheck:

hardcoded paths detected in pkg/README-main, consider using SUBST_VARS and 
TRUEPREFIX/LOCALBASE/LOCALSTATEDIR/VARBASE
in -main: missing RDEP on x11/gtk+3,-guic
in -main: missing RDEP on devel/desktop-file-utils

Re: UPDATE: gmic/gmic-qt

[Josh Grosse]

On Thu, Dec 09, 2021 at 09:23:06PM +0100, Marc Espie wrote:
> g'mic released a new major(!) version 3.0.
> 
> Things seem to work just fine.
> 
> I've removed my junk for rebuilding the script file since the new one
> includes some community scripts.
> 
> okay ?

Did a little bit of testing of gmic (demos), gmic-qt standalone, and
gmic-qt plugin for gimp, on amd64.  No issues.

Re: UPDATE: SMPlayer-21.10.0

[Josh Grosse]

On Thu, Dec 09, 2021 at 03:53:52PM +0100, Gonzalo L. Rodriguez wrote:
> Hello,
> 
> Update for SMPlayer to 21.10.0:
> 
> https://www.smplayer.info/en/changes
> 
> OK? Comments?

Working OK for me on amd64; youtube vids work well through it too
as long as yt-dlp is installed.  It could be considered a possible run
dependency.

Re: UPDATE: SMTube-21.10.0

[Josh Grosse]

On Thu, Dec 09, 2021 at 03:21:19PM +0100, Gonzalo L. Rodriguez wrote:
> Hello,
> 
> Update for SMTube to 21.10.0:
> 
> https://www.smtube.org/en/index
> 
> OK? Comments?

I needed to install yt-dlp to stop hesitations, so this minor
Makefile change may help.  Otherwise tested OK on amd64 for me.

diff --git a/x11/smtube/Makefile b/x11/smtube/Makefile
index 9b673fcf369..e16063e5251 100644
--- a/x11/smtube/Makefile
+++ b/x11/smtube/Makefile
@@ -25,6 +25,7 @@ EXTRACT_SUFX =.tar.bz2
 MODULES =  x11/qt5
 RUN_DEPENDS =  x11/smplayer \
devel/desktop-file-utils \
+   www/yt-dlp \
x11/gtk+3,-guic
 
 LIB_DEPENDS =  x11/qt5/qtwebkit

Re: patch print/py-reportlab for Python 3.9 base64

[Josh Grosse]

On Mon, Dec 06, 2021 at 11:11:01PM +, Stuart Henderson wrote:
> On 2021/12/06 16:20, Josh Grosse wrote:
> > It appears that the transition to Python 3.9 caused a regression
> > for print/py-reportlab.  The base64 API changed: encodestring and
> > decodestring are now encodebytes and decode bytes.  The attached
> > patch revises print/py-reportlab accordingly.
> 
> It would be much better to update instead. Can you try this diff please?

It solves the problem.  Thank you!
> 
> > I have added `MODPY_VERSION=3.9` to the Makefile, which I am 
> > unsure is the correct action.
> 
> It's not; that is the default for the python3 flavour anyway, but also the
> port needs to support Python 2 unless a py2- version is split off (sK1
> doesn't support py3).

I'd forgotten about setting FLAVOR for the build; no need to set the
version explicitly..  Once again, thank you for your advice and 
corrections.  It's appreciated!

patch print/py-reportlab for Python 3.9 base64

[Josh Grosse]

It appears that the transition to Python 3.9 caused a regression
for print/py-reportlab.  The base64 API changed: encodestring and
decodestring are now encodebytes and decode bytes.  The attached
patch revises print/py-reportlab accordingly.

I have added `MODPY_VERSION=3.9` to the Makefile, which I am 
unsure is the correct action.
diff --git a/print/py-reportlab/Makefile b/print/py-reportlab/Makefile
index c744c24a10d..476f27044de 100644
--- a/print/py-reportlab/Makefile
+++ b/print/py-reportlab/Makefile
@@ -6,7 +6,8 @@ MODPY_EGG_VERSION=  3.2.0
 DISTNAME=  reportlab-${MODPY_EGG_VERSION}
 PKGNAME=   py-${DISTNAME}
 EPOCH= 0
-REVISION=  9
+MODPY_VERSION= 3.9
+REVISION=  10
 
 # see patches/patch-setup_py
 # grep 'archive =' reportlab-3.2.0/setup.py
diff --git a/print/py-reportlab/patches/patch-src_reportlab_lib_pdfencrypt_py 
b/print/py-reportlab/patches/patch-src_reportlab_lib_pdfencrypt_py
new file mode 100644
index 000..5c494111e64
--- /dev/null
+++ b/print/py-reportlab/patches/patch-src_reportlab_lib_pdfencrypt_py
@@ -0,0 +1,27 @@
+$OpenBSD$
+
+Index: src/reportlab/lib/pdfencrypt.py
+--- src/reportlab/lib/pdfencrypt.py.orig
 src/reportlab/lib/pdfencrypt.py
+@@ -240,10 +240,10 @@ def computeO(userPassword, ownerPassword, revision):
+ if DEBUG: print('computeO(%s,%s,%s)==>%s' % tuple([hexText(str(x)) for x 
in (userPassword, ownerPassword, revision,O)]))
+ return O
+ 
+-def computeU(encryptionkey, 
encodestring=PadString,revision=2,documentId=None):
++def computeU(encryptionkey, encodebytes=PadString,revision=2,documentId=None):
+ from reportlab.lib.arciv import ArcIV
+ if revision == 2:
+-result = ArcIV(encryptionkey).encode(encodestring)
++result = ArcIV(encryptionkey).encode(encodebytes)
+ elif revision == 3:
+ assert documentId is not None, "Revision 3 algorithm needs the 
document ID!"
+ h = md5(PadString)
+@@ -256,7 +256,7 @@ def computeU(encryptionkey, encodestring=PadString,rev
+ while len(tmp) < 32:
+ tmp += b'\0'
+ result = tmp
+-if DEBUG: print('computeU(%s,%s,%s,%s)==>%s' % tuple([hexText(str(x)) for 
x in (encryptionkey, encodestring,revision,documentId,result)]))
++if DEBUG: print('computeU(%s,%s,%s,%s)==>%s' % tuple([hexText(str(x)) for 
x in (encryptionkey, encodebytes,revision,documentId,result)]))
+ return result
+ 
+ def checkU(encryptionkey, U):
diff --git a/print/py-reportlab/patches/patch-src_reportlab_lib_utils_py 
b/print/py-reportlab/patches/patch-src_reportlab_lib_utils_py
new file mode 100644
index 000..d8d525eec1b
--- /dev/null
+++ b/print/py-reportlab/patches/patch-src_reportlab_lib_utils_py
@@ -0,0 +1,40 @@
+$OpenBSD$
+
+Index: src/reportlab/lib/utils.py
+--- src/reportlab/lib/utils.py.orig
 src/reportlab/lib/utils.py
+@@ -5,7 +5,7 @@ __version__=''' $Id$ '''
+ __doc__='''Gazillions of miscellaneous internal utility functions'''
+ 
+ import os, sys, imp, time, types
+-from base64 import decodestring as base64_decodestring, encodestring as 
base64_encodestring
++from base64 import decodebytes as base64_decodebytes, encodebytes as 
base64_encodebytes
+ from reportlab import isPy3
+ from reportlab.lib.logger import warnOnce
+ from reportlab.lib.rltempfile import get_rl_tempfile, get_rl_tempdir, 
_rl_getuid
+@@ -115,10 +115,10 @@ if isPy3:
+ return str(x).encode(enc)
+ 
+ def encode_label(args):
+-return 
base64_encodestring(pickle.dumps(args)).strip().decode('latin1')
++return base64_encodebytes(pickle.dumps(args)).strip().decode('latin1')
+ 
+ def decode_label(label):
+-return pickle.loads(base64_decodestring(label.encode('latin1')))
++return pickle.loads(base64_decodebytes(label.encode('latin1')))
+ 
+ def rawUnicode(s):
+ '''converts first 256 unicodes 1-1'''
+@@ -212,10 +212,10 @@ else:
+ from string import letters as ascii_letters, uppercase as 
ascii_uppercase, lowercase as ascii_lowercase
+ 
+ def encode_label(args):
+-return base64_encodestring(pickle.dumps(args)).strip()
++return base64_encodebytes(pickle.dumps(args)).strip()
+ 
+ def decode_label(label):
+-return pickle.loads(base64_decodestring(label))
++return pickle.loads(base64_decodebytes(label))
+ 
+ def rawUnicode(s):
+ '''converts first 256 unicodes 1-1'''

Re: [wip] graphics/gimp/stable 2.99.8

[Josh Grosse]

On Wed, Nov 03, 2021 at 02:49:29PM +0100, Landry Breuil wrote:
> Hi,
> 
> here's a very wip port for gimp 3 latest beta (cf
> https://www.gimp.org/news/2021/10/20/gimp-2-99-8-released/), builds and
> packages fine here - untested at runtime, but that's one less py-gtk2
> consumer. Seems it detects vala, gjs and lua for plugins, but fails for
> pygobject and luajit:
> 
> WARNING: PyGObject 3.0 not found
>  Python plug-ins will be installed anyway but you should make
>  sure that a compatible Python interpreter and PyGObject are
>  available at installation, otherwise installed plug-ins won't
>  be usable.
> WARNING: luajit not found.
>  Lua plug-ins will be installed anyway but you should make
>  sure that luajit and LGI are available at installation,
>  otherwise installed plug-ins won't be usable.
> 
> Sending this just so that people relying on arcane plugins for their
> workflow can start looking at upgrading them to gtk3/gimp3 versions, or
> find a replacement if their plugin is dead upstream ;)
> 
> Landry

I have been using this beta on and off for several weeks without 
any issues.  I'm the occasional graphics/gmic-qt consumer, and found I needed
the attached diff to integrate its plugin. The patch for CMakeLists.txt is
a temporary circumvention for the Gimp beta.
diff --git a/graphics/gmic-qt/gimp/Makefile b/graphics/gmic-qt/gimp/Makefile
index 66f1cc837fe..510d931c0fc 100644
--- a/graphics/gmic-qt/gimp/Makefile
+++ b/graphics/gmic-qt/gimp/Makefile
@@ -1,8 +1,9 @@
 # $OpenBSD: Makefile,v 1.1.1.1 2021/05/16 09:42:24 espie Exp $
 
 QT_HOST =  gimp
+REVISION = 0
 
-WANTLIB += gimp-2.0 gimpbase-2.0 gimpcolor-2.0 gimpconfig-2.0 gimpmath-2.0
+WANTLIB += gimp-3.0 gimpbase-3.0 gimpcolor-3.0 gimpconfig-3.0 gimpmath-3.0
 WANTLIB += gegl-0.4  babl-0.1 cairo json-glib-1.0 intl
 WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0
 
diff --git a/graphics/gmic-qt/gimp/pkg/PLIST b/graphics/gmic-qt/gimp/pkg/PLIST
index 15b99f6fea2..42334bcb488 100644
--- a/graphics/gmic-qt/gimp/pkg/PLIST
+++ b/graphics/gmic-qt/gimp/pkg/PLIST
@@ -1,3 +1,3 @@
 @comment $OpenBSD: PLIST,v 1.1.1.1 2021/05/16 09:42:24 espie Exp $
-lib/gimp/2.0/plug-ins/gmic_gimp_qt/
-@bin lib/gimp/2.0/plug-ins/gmic_gimp_qt/gmic_gimp_qt
+lib/gimp/2.99/plug-ins/gmic_gimp_qt/
+@bin lib/gimp/2.99/plug-ins/gmic_gimp_qt/gmic_gimp_qt
diff --git a/graphics/gmic-qt/patches/patch-gmic-qt_CMakeLists_txt 
b/graphics/gmic-qt/patches/patch-gmic-qt_CMakeLists_txt
new file mode 100644
index 000..46a4fea5d51
--- /dev/null
+++ b/graphics/gmic-qt/patches/patch-gmic-qt_CMakeLists_txt
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Index: gmic-qt/CMakeLists.txt
+--- gmic-qt/CMakeLists.txt.orig
 gmic-qt/CMakeLists.txt
+@@ -517,11 +517,7 @@ set(gmic_qt_QRC
+ )
+ 
+ if (${GMIC_QT_HOST} STREQUAL "gimp" OR ${GMIC_QT_HOST} STREQUAL "gimp3")
+-if (${GMIC_QT_HOST} STREQUAL "gimp3")
+ set(TARGET_GIMP_VERSION 3)
+-else()
+-set(TARGET_GIMP_VERSION 2)
+-endif()
+ 
+ find_package(PkgConfig REQUIRED)
+ pkg_check_modules(GIMP REQUIRED gimp-${TARGET_GIMP_VERSION}.0 
IMPORTED_TARGET)

Re: UPDATE: FFmpeg 4.4.1

[Josh Grosse]

On Sat, Nov 06, 2021 at 10:30:35PM -0400, Brad Smith wrote:
> On Sun, Oct 24, 2021 at 09:35:11PM -0400, Brad Smith wrote:
> > Here is an update to FFmpeg 4.4.1.
> 
> And with the missing MPlayer piece.

Tested ffplay / ffmpeg and mplayer on amd64.  Working for me.

Re: [new] graphics/peek, a simple screencast to mp4/gif recorder

[Josh Grosse]

On Fri, Oct 29, 2021 at 10:28:24PM +0200, Landry Breuil wrote:
> Hi,
> 
> seems to work in basic testing, either outputting gif or mp4 files, cf
> https://github.com/phw/peek/ for the website. it can use
> https://gif.ski/ at runtime if found but that isnt port yet, for now it
> seems to work fine using ffmpeg. Note: this doesnt record audio, only
> the screen :)
> 
> feedback welcome !
> 
> Landry

Tested on amd64 here.  Easy to operate, but I've only tested it creating
small gif files.

update: textproc/calibre

[Josh Grosse]

Update from 5.28.0 to 5.30.0.  Tested on amd64.
Changelog: https://calibre-ebook.com/whats-new
diff --git a/textproc/calibre/Makefile b/textproc/calibre/Makefile
index 958c9fa7eab..32bbf6600bd 100644
--- a/textproc/calibre/Makefile
+++ b/textproc/calibre/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  ebook management application
 
-V =5.28.0
+V =5.30.0
 DISTNAME = calibre-$V
 
 CATEGORIES =   textproc
diff --git a/textproc/calibre/distinfo b/textproc/calibre/distinfo
index b3374a00c77..72e1e8bad98 100644
--- a/textproc/calibre/distinfo
+++ b/textproc/calibre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (calibre-5.28.0.tar.xz) = 6AIRMcjk93WAVg1woNSayxrKv7QOPZEnQhTfkl1fOto=
-SIZE (calibre-5.28.0.tar.xz) = 37002032
+SHA256 (calibre-5.30.0.tar.xz) = jvh/JLpMpW2EIlKVFpDJZAL072CWthh0JPQOBjvGDRU=
+SIZE (calibre-5.30.0.tar.xz) = 37002224
diff --git a/textproc/calibre/patches/patch-src_calibre_gui2_update_py 
b/textproc/calibre/patches/patch-src_calibre_gui2_update_py
index a8502bb229c..77b056cc8ff 100644
--- a/textproc/calibre/patches/patch-src_calibre_gui2_update_py
+++ b/textproc/calibre/patches/patch-src_calibre_gui2_update_py
@@ -5,7 +5,7 @@ $OpenBSD: patch-src_calibre_gui2_update_py,v 1.3 2021/03/27 
14:35:12 sthen Exp $
 Index: src/calibre/gui2/update.py
 --- src/calibre/gui2/update.py.orig
 +++ src/calibre/gui2/update.py
-@@ -35,35 +35,7 @@ def get_download_url():
+@@ -32,35 +32,7 @@ def get_download_url():
  
  
  def get_newest_version():
@@ -27,14 +27,14 @@ Index: src/calibre/gui2/update.py
 -# certificate verification failed, since the version check contains no
 -# critical information, ignore and proceed
 -# We have to do this as if the calibre CA certificate ever
--# needs to be revoked, then we wont be able to do version checks
+-# needs to be revoked, then we won't be able to do version checks
 -version = get_https_resource_securely(URL, headers=headers, 
cacerts=None)
 -try:
 -version = version.decode('utf-8').strip()
 -except UnicodeDecodeError:
 -version = ''
 -ans = NO_CALIBRE_UPDATE
--m = re.match(unicode_type(r'(\d+)\.(\d+).(\d+)$'), version)
+-m = re.match(r'(\d+)\.(\d+).(\d+)$', version)
 -if m is not None:
 -ans = tuple(map(int, (m.group(1), m.group(2), m.group(3
 -return ans
diff --git a/textproc/calibre/pkg/PLIST b/textproc/calibre/pkg/PLIST
index f8f24e705ea..2349f7ae416 100644
--- a/textproc/calibre/pkg/PLIST
+++ b/textproc/calibre/pkg/PLIST
@@ -1806,6 +1806,7 @@ 
lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}match_books_ui.${MODPY_PYC_MAGI
 
lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}message_box.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}metadata_bulk.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}metadata_bulk_ui.${MODPY_PYC_MAGIC_TAG}pyc
+lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}multisort.${MODPY_PYC_MAGIC_TAG}pyc
 lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}opml.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}password.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/calibre/calibre/gui2/dialogs/${MODPY_PYCACHE}password_ui.${MODPY_PYC_MAGIC_TAG}pyc
@@ -1872,6 +1873,7 @@ lib/calibre/calibre/gui2/dialogs/match_books_ui.py
 lib/calibre/calibre/gui2/dialogs/message_box.py
 lib/calibre/calibre/gui2/dialogs/metadata_bulk.py
 lib/calibre/calibre/gui2/dialogs/metadata_bulk_ui.py
+lib/calibre/calibre/gui2/dialogs/multisort.py
 lib/calibre/calibre/gui2/dialogs/opml.py
 lib/calibre/calibre/gui2/dialogs/password.py
 lib/calibre/calibre/gui2/dialogs/password_ui.py
@@ -4552,6 +4554,8 @@ share/calibre/recipes/high_country_news.png
 share/calibre/recipes/high_country_news.recipe
 share/calibre/recipes/hindu.recipe
 share/calibre/recipes/hindu_business_line.recipe
+share/calibre/recipes/hindu_human_rights.recipe
+share/calibre/recipes/hindu_post.recipe
 share/calibre/recipes/historia_pl.png
 share/calibre/recipes/historia_pl.recipe
 share/calibre/recipes/history_today.recipe
@@ -4645,9 +4649,11 @@ share/calibre/recipes/independent.recipe
 share/calibre/recipes/independent_australia.recipe
 share/calibre/recipes/index_hu.png
 share/calibre/recipes/index_hu.recipe
+share/calibre/recipes/india_facts.recipe
 share/calibre/recipes/india_today.recipe
 share/calibre/recipes/indian_express.png
 share/calibre/recipes/indian_express.recipe
+share/calibre/recipes/indic_today.recipe
 share/calibre/recipes/indy_star.recipe
 share/calibre/recipes/infobae.png
 share/calibre/recipes/infobae.recipe
@@ -5277,6 +5283,7 @@ share/calibre/recipes/onda_rock.recipe
 share/calibre/recipes/onemagazine.png
 share/calibre/recipes/onemagazine.recipe
 share/calibre/recipes/onionavclub.recipe
+share/calibre/recipes/opindia.recipe
 share/calibre/recipes/opinion_bo.recipe
 share/calibre/recipes/optyczne_pl.png
 share/calibre/recipes/optyczne_pl.recipe
@@ -5402,6 +5409,7 @@ 

Re: NEW PORT: pngcheck

[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.

Re: update: security/cvechecker

[Josh Grosse]

Oops.  I neglected to include the new patches.  Revised diff
attached.
diff --git a/security/cvechecker/Makefile b/security/cvechecker/Makefile
index d52a00ba1bc..1a9f106c6ca 100755
--- a/security/cvechecker/Makefile
+++ b/security/cvechecker/Makefile
@@ -4,8 +4,7 @@ COMMENT=local CVE checker tool
 
 GH_ACCOUNT=sjvermeu
 GH_PROJECT=cvechecker
-GH_TAGNAME=v3.9
-REVISION=  1
+GH_TAGNAME=cvechecker-4.0
 
 CATEGORIES=security sysutils
 
@@ -21,6 +20,7 @@ LIB_DEPENDS=  devel/libconfig \
 
 RUN_DEPENDS=   net/wget \
sysutils/coreutils \
+   textproc/jq \
textproc/libxslt
 
 LOCALSTATEDIR= ${BASELOCALSTATEDIR}/db
diff --git a/security/cvechecker/distinfo b/security/cvechecker/distinfo
index 67b5bf2bcf6..0ee8ae80ca9 100644
--- a/security/cvechecker/distinfo
+++ b/security/cvechecker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cvechecker-3.9.tar.gz) = qMBb6egVM70blEH+GjjlTSk5Ejr3xdkzusKMtR1B3Cc=
-SIZE (cvechecker-3.9.tar.gz) = 3329468
+SHA256 (cvechecker-cvechecker-4.0.tar.gz) = 
1ItMGXbYZvbPSTNA3EjkwrZ9I5S2tUZ93HYLD4JGbE0=
+SIZE (cvechecker-cvechecker-4.0.tar.gz) = 419915
diff --git a/security/cvechecker/patches/hide/patch-configure_ac 
b/security/cvechecker/patches/hide/patch-configure_ac
new file mode 100644
index 000..63e4a47daa0
--- /dev/null
+++ b/security/cvechecker/patches/hide/patch-configure_ac
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Index: configure.ac
+--- configure.ac.orig
 configure.ac
+@@ -34,14 +34,12 @@ AC_CHECK_HEADERS([argp.h],,[AC_MSG_ERROR([argp.h heade
+ AC_CHECK_HEADERS([string.h],,[AC_MSG_ERROR([string.h header missing])])
+ 
+ # Checks for library functions.
+-AC_CHECK_FUNCS([gethostname memset regcomp strchr strrchr strstr strlcpy],,
+-  [PKG_CHECK_MODULES([BSD], [libbsd])])
++AC_CHECK_FUNCS([gethostname memset regcomp strchr strrchr strstr strlcpy]
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_SIZE_T
+ 
+ AC_MSG_WARN([Please make sure pkg-config is installed and autoreconf run])
+-PKG_CHECK_MODULES([BSD], [libbsd])
+ PKG_CHECK_MODULES([CONFIG], [libconfig >= 1.3])
+ CFLAGS="$CFLAGS $CONFIG_CFLAGS"
+ LIBS="$LIBS $CONFIG_LIBS $BSD_LIBS"
diff --git a/security/cvechecker/patches/patch-configure_ac 
b/security/cvechecker/patches/patch-configure_ac
new file mode 100644
index 000..d882de35c72
--- /dev/null
+++ b/security/cvechecker/patches/patch-configure_ac
@@ -0,0 +1,21 @@
+$OpenBSD$
+
+Index: configure.ac
+--- configure.ac.orig
 configure.ac
+@@ -34,14 +34,12 @@ AC_CHECK_HEADERS([argp.h],,[AC_MSG_ERROR([argp.h heade
+ AC_CHECK_HEADERS([string.h],,[AC_MSG_ERROR([string.h header missing])])
+ 
+ # Checks for library functions.
+-AC_CHECK_FUNCS([gethostname memset regcomp strchr strrchr strstr strlcpy],,
+-  [PKG_CHECK_MODULES([BSD], [libbsd])])
++AC_CHECK_FUNCS([gethostname memset regcomp strchr strrchr strstr strlcpy])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+ AC_TYPE_SIZE_T
+ 
+ AC_MSG_WARN([Please make sure pkg-config is installed and autoreconf run])
+-PKG_CHECK_MODULES([BSD], [libbsd])
+ PKG_CHECK_MODULES([CONFIG], [libconfig >= 1.3])
+ CFLAGS="$CFLAGS $CONFIG_CFLAGS"
+ LIBS="$LIBS $CONFIG_LIBS $BSD_LIBS"
diff --git a/security/cvechecker/patches/patch-src_cvecheck_common_h 
b/security/cvechecker/patches/patch-src_cvecheck_common_h
new file mode 100644
index 000..30d808ccfa6
--- /dev/null
+++ b/security/cvechecker/patches/patch-src_cvecheck_common_h
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/cvecheck_common.h
+--- src/cvecheck_common.h.orig
 src/cvecheck_common.h
+@@ -1,7 +1,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+ 
+ #ifdef _USE_SQLITE3
+ #include 
diff --git a/security/cvechecker/patches/patch-src_output_stringscmd_h 
b/security/cvechecker/patches/patch-src_output_stringscmd_h
new file mode 100644
index 000..9c0d90a0503
--- /dev/null
+++ b/security/cvechecker/patches/patch-src_output_stringscmd_h
@@ -0,0 +1,13 @@
+$OpenBSD$
+
+Index: src/output/stringscmd.h
+--- src/output/stringscmd.h.orig
 src/output/stringscmd.h
+@@ -1,7 +1,6 @@
+ #include 
+ #include 
+ #include 
+-#include 
+ #include "../cvecheck_common.h"
+ #include "../swstring.h"
+ 
diff --git a/security/cvechecker/pkg/PLIST b/security/cvechecker/pkg/PLIST
index 7ea43da6cb0..5d93d0ce3cb 100644
--- a/security/cvechecker/pkg/PLIST
+++ b/security/cvechecker/pkg/PLIST
@@ -17,7 +17,6 @@ share/cvechecker/
 share/cvechecker/csv2xml.awk
 share/cvechecker/cvereport.xsl
 share/cvechecker/mysql_cvechecker.sql
-share/cvechecker/nvdcve2simple.xsl
 share/cvechecker/report.css
 share/doc/cvechecker/
 share/doc/cvechecker/acknowledgements.xml

update: security/cvechecker

[Josh Grosse]

Attached is an update to cvechecker 4.0, which switches to JSON
from gzip.

Tested on amd64.
diff --git a/security/cvechecker/Makefile b/security/cvechecker/Makefile
index d52a00ba1bc..1a9f106c6ca 100755
--- a/security/cvechecker/Makefile
+++ b/security/cvechecker/Makefile
@@ -4,8 +4,7 @@ COMMENT=local CVE checker tool
 
 GH_ACCOUNT=sjvermeu
 GH_PROJECT=cvechecker
-GH_TAGNAME=v3.9
-REVISION=  1
+GH_TAGNAME=cvechecker-4.0
 
 CATEGORIES=security sysutils
 
@@ -21,6 +20,7 @@ LIB_DEPENDS=  devel/libconfig \
 
 RUN_DEPENDS=   net/wget \
sysutils/coreutils \
+   textproc/jq \
textproc/libxslt
 
 LOCALSTATEDIR= ${BASELOCALSTATEDIR}/db
diff --git a/security/cvechecker/distinfo b/security/cvechecker/distinfo
index 67b5bf2bcf6..0ee8ae80ca9 100644
--- a/security/cvechecker/distinfo
+++ b/security/cvechecker/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cvechecker-3.9.tar.gz) = qMBb6egVM70blEH+GjjlTSk5Ejr3xdkzusKMtR1B3Cc=
-SIZE (cvechecker-3.9.tar.gz) = 3329468
+SHA256 (cvechecker-cvechecker-4.0.tar.gz) = 
1ItMGXbYZvbPSTNA3EjkwrZ9I5S2tUZ93HYLD4JGbE0=
+SIZE (cvechecker-cvechecker-4.0.tar.gz) = 419915
diff --git a/security/cvechecker/pkg/PLIST b/security/cvechecker/pkg/PLIST
index 7ea43da6cb0..5d93d0ce3cb 100644
--- a/security/cvechecker/pkg/PLIST
+++ b/security/cvechecker/pkg/PLIST
@@ -17,7 +17,6 @@ share/cvechecker/
 share/cvechecker/csv2xml.awk
 share/cvechecker/cvereport.xsl
 share/cvechecker/mysql_cvechecker.sql
-share/cvechecker/nvdcve2simple.xsl
 share/cvechecker/report.css
 share/doc/cvechecker/
 share/doc/cvechecker/acknowledgements.xml

Re: textproc/calibre depends on devel/py-jeepney

[Josh Grosse]

On Mon, Oct 04, 2021 at 07:23:41PM +0200, Caspar Schutijser wrote:
> Hi,
> 
> Calibre depends on py-deepney. Becomes apparent for example when
> clicking "Fetch news", selecting a news source and then clicking
> "Download now". Diff below is one way to fix it.
> 
> Caspar
 
Thanks, Caspar.  This looks ok to me, FWIW. :)
 
> Index: Makefile
> ===
> RCS file: /cvs/ports/textproc/calibre/Makefile,v
> retrieving revision 1.92
> diff -u -p -r1.92 Makefile
> --- Makefile  14 Aug 2021 10:24:26 -  1.92
> +++ Makefile  4 Oct 2021 17:20:35 -
> @@ -4,6 +4,7 @@ COMMENT = ebook management application
>  
>  V =  5.25.0
>  DISTNAME =   calibre-$V
> +REVISION =   0
>  
>  CATEGORIES = textproc
>  
> @@ -64,6 +65,7 @@ BUILD_DEPENDS = ${COMMON_DEPENDS} \
>  RUN_DEPENDS =${COMMON_DEPENDS} \
>   converters/py-html2text${MODPY_FLAVOR} \
>   devel/desktop-file-utils \
> + devel/py-jeepney${MODPY_FLAVOR} \
>   misc/shared-mime-info \
>   net/py-netifaces${MODPY_FLAVOR}  \
>   print/poppler,-utils \

[update] textproc/calibre

[Josh Grosse]

This update to 5.28.0 has had some testing on amd64.
diff --git a/textproc/calibre/Makefile b/textproc/calibre/Makefile
index cb9b5e6c48b..154f735cc86 100644
--- a/textproc/calibre/Makefile
+++ b/textproc/calibre/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  ebook management application
 
-V =5.25.0
+V =5.28.0
 DISTNAME = calibre-$V
 
 CATEGORIES =   textproc
diff --git a/textproc/calibre/distinfo b/textproc/calibre/distinfo
index 800c9622670..b3374a00c77 100644
--- a/textproc/calibre/distinfo
+++ b/textproc/calibre/distinfo
@@ -1,2 +1,2 @@
-SHA256 (calibre-5.25.0.tar.xz) = WmIToUNoqGPU91P308EfxbBSn2FP6eCm58eQqniVRPY=
-SIZE (calibre-5.25.0.tar.xz) = 36849112
+SHA256 (calibre-5.28.0.tar.xz) = 6AIRMcjk93WAVg1woNSayxrKv7QOPZEnQhTfkl1fOto=
+SIZE (calibre-5.28.0.tar.xz) = 37002032
diff --git a/textproc/calibre/pkg/PLIST b/textproc/calibre/pkg/PLIST
index fe9bf6e6779..2126bc7e633 100644
--- a/textproc/calibre/pkg/PLIST
+++ b/textproc/calibre/pkg/PLIST
@@ -5236,6 +5236,7 @@ share/calibre/recipes/nypost.png
 share/calibre/recipes/nypost.recipe
 share/calibre/recipes/nytimes.png
 share/calibre/recipes/nytimes.recipe
+share/calibre/recipes/nytimes_cooking.recipe
 share/calibre/recipes/nytimes_sports.png
 share/calibre/recipes/nytimes_sports.recipe
 share/calibre/recipes/nytimes_sub.png
@@ -5795,6 +5796,7 @@ share/calibre/recipes/the_scotsman.png
 share/calibre/recipes/the_scotsman.recipe
 share/calibre/recipes/the_sun.recipe
 share/calibre/recipes/the_verge.recipe
+share/calibre/recipes/the_week.recipe
 share/calibre/recipes/the_week_magazine_free.png
 share/calibre/recipes/the_week_magazine_free.recipe
 share/calibre/recipes/the_workingham_times.png

Re: UPDATE: gmic and dependent ports

[Josh Grosse]

On Mon, Aug 30, 2021 at 04:37:56PM +0200, Marc Espie wrote:
> On Sun, Aug 01, 2021 at 01:19:10PM +0200, Marc Espie wrote:
> > G'mic released a new version, 2.9.8.
> > 
> > Here's a patch to adjust to the new version (mostly removal of upstreamed
> > patch). There are some minor tweaks (there's no debug info in the plugins,
> > so the debug packages do not make sense)
> > 
> > There's a small twist: gmic-qt actually has a stand-alone version.
> > Also attached is a sub-port to enable that version.
> > [...]
> ping...

Tested all 4 ports on amd64: graphics/gmic, graphics/gmic-qt/{gimp,krita,none}.
All seem to work as expected.  

One suggestion would be to add a RUN_DEPENDS for krita to that plugin's 
Makefile,
such as in the attached diff.
diff --git a/graphics/gmic-qt/krita/Makefile b/graphics/gmic-qt/krita/Makefile
index d26dc931857..2e415c06660 100644
--- a/graphics/gmic-qt/krita/Makefile
+++ b/graphics/gmic-qt/krita/Makefile
@@ -2,6 +2,7 @@
 
 COMMENT =  gmic plugin for krita
 
+RUN_DEPENDS = graphics/krita
 QT_HOST = krita
 
 .include 

Re: UPDATE: SMTube-21.7.0

[Josh Grosse]

On Thu, Aug 19, 2021 at 12:03:43PM +0100, Stuart Henderson wrote:
> On 2021/08/19 06:28, Josh Grosse wrote:
> > On Thu, Aug 19, 2021 at 10:26:02AM +0200, Gonzalo L. Rodriguez wrote:
> > > ping...
> > > 
> > > anyone?
> > 
> > Hi.  I get the following message from portcheck(1).  The output from
> > port-lib-depends-check is clean.
> > 
> > "LIB_DEPENDS x11/qt5/qtscript not needed for x11/smtube ?"
> 
> man bsd.port.mk | less +'/not needed'
> 
> This usually means a WANTLIB was removed and the associated LIB_DEPENDS was
> not removed. The package will be created *without* the dependency.

LIB_DEPENDS for qtscript removed, and qtscript uninstalled.  Rebuilt, and
working fine on amd64.  Revised diff attached.
diff --git a/x11/smtube/Makefile b/x11/smtube/Makefile
index 3779ab3129a..8cb5ad3f61e 100644
--- a/x11/smtube/Makefile
+++ b/x11/smtube/Makefile
@@ -4,7 +4,7 @@ USE_WXNEEDED =  Yes
 
 COMMENT =  browse and download YouTube videos
 
-DISTNAME = smtube-20.6.0
+DISTNAME = smtube-21.7.0
 
 CATEGORIES =   multimedia x11
 
@@ -27,8 +27,7 @@ RUN_DEPENDS = x11/smplayer \
devel/desktop-file-utils \
x11/gtk+3,-guic
 
-LIB_DEPENDS =  x11/qt5/qtscript \
-   x11/qt5/qtwebkit
+LIB_DEPENDS =  x11/qt5/qtwebkit
 
 USE_GMAKE =Yes
 
diff --git a/x11/smtube/distinfo b/x11/smtube/distinfo
index 07ecba7d81f..73e64175dc2 100644
--- a/x11/smtube/distinfo
+++ b/x11/smtube/distinfo
@@ -1,2 +1,2 @@
-SHA256 (smtube-20.6.0.tar.bz2) = gvHrBtLY+kMEWGpAwubd5qRLIiTjFX8Dmxbzr19R30I=
-SIZE (smtube-20.6.0.tar.bz2) = 746094
+SHA256 (smtube-21.7.0.tar.bz2) = d+R3eM2BPdrsY7XX+6IWpz6cKIy/L2x0iLZH0mTgfcc=
+SIZE (smtube-21.7.0.tar.bz2) = 966127
diff --git a/x11/smtube/patches/patch-src_browserwindow_cpp 
b/x11/smtube/patches/patch-src_browserwindow_cpp
index ab0f510f94f..b70c14cab68 100644
--- a/x11/smtube/patches/patch-src_browserwindow_cpp
+++ b/x11/smtube/patches/patch-src_browserwindow_cpp
@@ -3,7 +3,7 @@ $OpenBSD: patch-src_browserwindow_cpp,v 1.2 2020/07/27 08:08:25 
gonzalo Exp $
 Index: src/browserwindow.cpp
 --- src/browserwindow.cpp.orig
 +++ src/browserwindow.cpp
-@@ -202,7 +202,7 @@ QString BrowserWindow::homePageUrl() {
+@@ -236,7 +236,7 @@ QString BrowserWindow::homePageUrl() {
  #ifdef USE_SITES
return sites.currentSite().homeUrl();
  #else
@@ -12,7 +12,7 @@ Index: src/browserwindow.cpp
  #endif
  }
  
-@@ -436,7 +436,7 @@ void BrowserWindow::openYTUrl(QString title, QString e
+@@ -481,7 +481,7 @@ void BrowserWindow::openYTUrl(QString title, QString e
if (current_player == WebBrowser) {
QString u = url;
#if 1
@@ -21,7 +21,7 @@ Index: src/browserwindow.cpp
  "=" + title.toUtf8().toBase64().toPercentEncoding();
#endif
QDesktopServices::openUrl(u);
-@@ -691,7 +691,7 @@ void BrowserWindow::loadConfig() {
+@@ -777,7 +777,7 @@ void BrowserWindow::loadConfig() {
  #ifdef D_BUTTON
add_download_button = settings->value("add_download_button", 
false).toBool();
  
diff --git a/x11/smtube/pkg/PLIST b/x11/smtube/pkg/PLIST
index 7f2f684fff8..61cf007acbd 100644
--- a/x11/smtube/pkg/PLIST
+++ b/x11/smtube/pkg/PLIST
@@ -2,10 +2,9 @@
 @bin bin/smtube
 share/applications/smtube.desktop
 share/doc/smtube/
-share/doc/smtube/Changelog
 share/doc/smtube/Copying.txt
 share/doc/smtube/Readme.txt
-share/doc/smtube/Release_notes.txt
+share/doc/smtube/Release_notes.md
 share/icons/hicolor/128x128/apps/smtube.png
 share/icons/hicolor/16x16/apps/smtube.png
 share/icons/hicolor/256x256/apps/smtube.png

Re: UPDATE: SMTube-21.7.0

[Josh Grosse]

On Thu, Aug 19, 2021 at 10:26:02AM +0200, Gonzalo L. Rodriguez wrote:
> ping...
> 
> anyone?

Hi.  I get the following message from portcheck(1).  The output from
port-lib-depends-check is clean.

"LIB_DEPENDS x11/qt5/qtscript not needed for x11/smtube ?"

Tested fine on amd64.

Re: [update] shells/tcsh 6.22.03 -> 6.22.04

[Josh Grosse]

Corrected.  This removes $REVISION.
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index d178f13a6e9..1e0ce9eb387 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -2,8 +2,7 @@
 
 COMMENT=   extended C-shell with many useful features
 
-DISTNAME=  tcsh-6.22.03
-REVISION=  0
+DISTNAME=  tcsh-6.22.04
 CATEGORIES=shells
 HOMEPAGE=  http://www.tcsh.org/
 
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index 7d18689ea83..e63de9b2663 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcsh-6.22.03.tar.gz) = viz9ZT0qDH9QbS3RTBIyS6dJvUhAN75t9Eo5c/UiYrc=
-SIZE (tcsh-6.22.03.tar.gz) = 1012758
+SHA256 (tcsh-6.22.04.tar.gz) = 6xY1YkMhjDLzngcljXK/iyHmLOlLsOipXjGLFROX4jE=
+SIZE (tcsh-6.22.04.tar.gz) = 1012977
diff --git a/shells/tcsh/patches/patch-sh_lex_c 
b/shells/tcsh/patches/patch-sh_lex_c
deleted file mode 100644
index 4f21b6fd717..000
--- a/shells/tcsh/patches/patch-sh_lex_c
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-sh_lex_c,v 1.1 2021/03/27 16:54:23 naddy Exp $
-
-Restore the behavior where both $foo:h and $foo:t return the whole string
-https://github.com/tcsh-org/tcsh/commit/05d3d6bfc22462584f9347493499621056995ac1
-
-Index: sh.lex.c
 sh.lex.c.orig
-+++ sh.lex.c
-@@ -1046,7 +1046,7 @@ domod(Char *cp, Char type)
- case 't':
-   wp = Strrchr(cp, '/');
-   if (wp == NULL)
--  return Strsave(type == 't' ? cp : STRNULL);
-+  return NULL;
-   if (type == 't')
-   xp = Strsave(wp + 1);
-   else
diff --git a/shells/tcsh/patches/patch-tests_lexical_at 
b/shells/tcsh/patches/patch-tests_lexical_at
deleted file mode 100644
index 0d5a1a88019..000
--- a/shells/tcsh/patches/patch-tests_lexical_at
+++ /dev/null
@@ -1,26 +0,0 @@
-$OpenBSD: patch-tests_lexical_at,v 1.1 2021/03/27 16:54:23 naddy Exp $
-
-Restore the behavior where both $foo:h and $foo:t return the whole string   
-https://github.com/tcsh-org/tcsh/commit/05d3d6bfc22462584f9347493499621056995ac1
-
-Index: tests/lexical.at
 tests/lexical.at.orig
-+++ tests/lexical.at
-@@ -677,7 +677,7 @@ AT_CHECK([tcsh -f colon_r_no_extension.csh], 0,
- 
- AT_CLEANUP
- 
--AT_SETUP([$x:q:h does not cause out of memory crash and yields nothing])
-+AT_SETUP([$x:q:h does not cause out of memory crash and yields the full 
string])
- 
- AT_DATA([x_colon_q_colon_h.csh],
- [[set x='a/b c/d.e'
-@@ -686,7 +686,7 @@ exit 0
- ]])
- 
- AT_CHECK([tcsh -f x_colon_q_colon_h.csh], 0,
--[
-+[a/b c/d.e
- ])
- 
- AT_CLEANUP

[update] shells/tcsh 6.22.03 -> 6.22.04

[Josh Grosse]

>From the "Fixes" file:

 Don't crash with 'bindkey "^0" clear-screen' (Karl Jeacle)
 Fix $x:q:h and $x:q:t return the whole string for strings not containing /
diff --git a/shells/tcsh/Makefile b/shells/tcsh/Makefile
index d178f13a6e9..b109f141950 100644
--- a/shells/tcsh/Makefile
+++ b/shells/tcsh/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT=   extended C-shell with many useful features
 
-DISTNAME=  tcsh-6.22.03
+DISTNAME=  tcsh-6.22.04
 REVISION=  0
 CATEGORIES=shells
 HOMEPAGE=  http://www.tcsh.org/
diff --git a/shells/tcsh/distinfo b/shells/tcsh/distinfo
index 7d18689ea83..e63de9b2663 100644
--- a/shells/tcsh/distinfo
+++ b/shells/tcsh/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tcsh-6.22.03.tar.gz) = viz9ZT0qDH9QbS3RTBIyS6dJvUhAN75t9Eo5c/UiYrc=
-SIZE (tcsh-6.22.03.tar.gz) = 1012758
+SHA256 (tcsh-6.22.04.tar.gz) = 6xY1YkMhjDLzngcljXK/iyHmLOlLsOipXjGLFROX4jE=
+SIZE (tcsh-6.22.04.tar.gz) = 1012977
diff --git a/shells/tcsh/patches/patch-sh_lex_c 
b/shells/tcsh/patches/patch-sh_lex_c
deleted file mode 100644
index 4f21b6fd717..000
--- a/shells/tcsh/patches/patch-sh_lex_c
+++ /dev/null
@@ -1,17 +0,0 @@
-$OpenBSD: patch-sh_lex_c,v 1.1 2021/03/27 16:54:23 naddy Exp $
-
-Restore the behavior where both $foo:h and $foo:t return the whole string
-https://github.com/tcsh-org/tcsh/commit/05d3d6bfc22462584f9347493499621056995ac1
-
-Index: sh.lex.c
 sh.lex.c.orig
-+++ sh.lex.c
-@@ -1046,7 +1046,7 @@ domod(Char *cp, Char type)
- case 't':
-   wp = Strrchr(cp, '/');
-   if (wp == NULL)
--  return Strsave(type == 't' ? cp : STRNULL);
-+  return NULL;
-   if (type == 't')
-   xp = Strsave(wp + 1);
-   else
diff --git a/shells/tcsh/patches/patch-tests_lexical_at 
b/shells/tcsh/patches/patch-tests_lexical_at
deleted file mode 100644
index 0d5a1a88019..000
--- a/shells/tcsh/patches/patch-tests_lexical_at
+++ /dev/null
@@ -1,26 +0,0 @@
-$OpenBSD: patch-tests_lexical_at,v 1.1 2021/03/27 16:54:23 naddy Exp $
-
-Restore the behavior where both $foo:h and $foo:t return the whole string   
-https://github.com/tcsh-org/tcsh/commit/05d3d6bfc22462584f9347493499621056995ac1
-
-Index: tests/lexical.at
 tests/lexical.at.orig
-+++ tests/lexical.at
-@@ -677,7 +677,7 @@ AT_CHECK([tcsh -f colon_r_no_extension.csh], 0,
- 
- AT_CLEANUP
- 
--AT_SETUP([$x:q:h does not cause out of memory crash and yields nothing])
-+AT_SETUP([$x:q:h does not cause out of memory crash and yields the full 
string])
- 
- AT_DATA([x_colon_q_colon_h.csh],
- [[set x='a/b c/d.e'
-@@ -686,7 +686,7 @@ exit 0
- ]])
- 
- AT_CHECK([tcsh -f x_colon_q_colon_h.csh], 0,
--[
-+[a/b c/d.e
- ])
- 
- AT_CLEANUP

Re: wip - unbreak graphics/mapnik

[Josh Grosse]

Please remove me as maintainer per my last email. 

Thanks. 

On May 20, 2021 10:54:40 AM EDT, Kirill Bychkov  wrote:
>On Thu, May 20, 2021 09:05, Landry Breuil wrote:
>> Le Wed, May 19, 2021 at 05:51:07PM +0300, Kirill Bychkov a ?crit :
>>> >
>>> Josh, would you like to take maintainership?
>>> Landry, OK for update and test comments?
>>
>> yes, thanks ! and remove me from MAINTAINER, that'll be more inline
>with
>> reality.
>>
>>> Tests are 14MB + 137MB archive so I'm not sure if we should burden
>our
>>> mirrors.
>>
>> it's okay to have a comment stating where/how to fetch tests, but i
>have
>> no idea if using TEST_IS_INTERACTIVE is the right way to express that
>:)
>>
>>
>
>Attached is a diff I would like to commit if there is no objections.

-- 
Sent from my Android device with K-9 Mail. Please excuse my brevity.

Re: wip - unbreak graphics/mapnik

[Josh Grosse]

On Wed, May 19, 2021 at 05:51:07PM +0300, Kirill Bychkov wrote:

Josh want to take maintainership, dont hesitate ! I dont use it.

Thank you for the offer, but I've never used mapnik.  I was hoping
to get past the $BROKEN issue so that I could see what it could do
with OSM files.

wip - unbreak graphics/mapnik

[Josh Grosse]

The attached patch updates mapnik from 3.0.10 to 3.1.0.

  * This resolves the undefined unicode string that broke
earlier releases of mapnik. 

  * I am unable to figure out how to set the XMLPARSER to
libxml2 so that OpenStreetMap map files can be parsed
by mapnik-render.  I've tried setting it in MODSCONS_FLAGS,
and in this patch set it is currently set in MODSCONS_ENV.
The XML parsing issue is described at:

   https://github.com/mapnik/mapnik/wiki/InstallationTroubleshooting
diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile
index 06069ab7617..6413f46db4e 100644
--- a/graphics/mapnik/Makefile
+++ b/graphics/mapnik/Makefile
@@ -1,19 +1,19 @@
 # $OpenBSD: Makefile,v 1.37 2021/02/23 19:39:25 sthen Exp $
 
-BROKEN =   undefined reference to '_ZN6icu_5613UnicodeStringC1EOS0_'
-
 # out of memory, renderer_common/process_group_symbolizer.cpp
 # powerpc  OOM's on expression_grammar.cpp
 ONLY_FOR_ARCHS =   amd64
 
 COMMENT =  toolkit for developing mapping applications
 
-DISTNAME = mapnik-v3.0.10
-PKGNAME =  ${DISTNAME:S/v//}
-EXTRACT_SUFX = .tar.bz2
-REVISION = 5
+V =3.1.0
+DISTNAME = mapnik-${V}
+
+GH_ACCOUNT =mapnik
+GH_PROJECT =mapnik
+GH_TAGNAME =v${V}
 
-SHARED_LIBS =  mapnik 3.0 #3.0
+SHARED_LIBS =  mapnik 3.1 #3.1
 CATEGORIES =   graphics geo
 
 HOMEPAGE = http://mapnik.org/
@@ -23,14 +23,13 @@ DPB_PROPERTIES = nojunk
 # LGPLv2.1
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += X11 Xau Xdmcp Xext Xrender boost_filesystem-mt
-WANTLIB += boost_program_options-mt boost_regex-mt harfbuzz webp
-WANTLIB += boost_system-mt c cairo expat fontconfig freetype 
-WANTLIB += gdal glib-2.0 gobject-2.0 iconv icuuc intl jpeg m pcre pixman-1
-WANTLIB += png>=17.0 pq proj pthread sqlite3 tiff
-WANTLIB += xcb xcb-render xcb-shm z ${COMPILER_LIBCXX}
+WANTLIB += X11 Xau Xdmcp Xext Xrender boost_filesystem
+WANTLIB += boost_program_options boost_regex harfbuzz webp
+WANTLIB += boost_system ffi icudata icui18n c cairo expat fontconfig freetype
+WANTLIB += gdal glib-2.0 gobject-2.0 icuuc intl jpeg m pcre pixman-1
+WANTLIB += png>=17.0 pq pthread sqlite3 tiff
+WANTLIB += xcb xcb-render xcb-shm xml2 z ${COMPILER_LIBCXX}
 
-MASTER_SITES = http://mapnik.s3.amazonaws.com/dist/v3.0.10/
 MODULES =  devel/scons \
lang/python
 MODPY_VERSION =${MODPY_DEFAULT_VERSION_2}
@@ -42,14 +41,16 @@ MODGCC4_ARCHS = amd64 i386 powerpc sparc64
 TEST_DEPENDS = shells/bash \
${BUILD_PKGPATH}
 
+BUILD_DEPENDS = geo/osrm-backend
+
 LIB_DEPENDS =  devel/boost>=1.58 \
databases/sqlite3 \
graphics/cairo \
graphics/libwebp \
-   devel/proj \
devel/harfbuzz \
geo/gdal \
-   textproc/icu4c
+   textproc/icu4c \
+   textproc/libxml
 
 # Scons sucks. Use WARNING_CXXFLAGS as a way to pass freetype2 includes
 MODSCONS_FLAGS =   PREFIX="${TRUEPREFIX}" \
@@ -61,8 +62,12 @@ MODSCONS_FLAGS = PREFIX="${TRUEPREFIX}" \
WARNING_CXXFLAGS="-I${X11BASE}/include/freetype2" \
SYSTEM_FONTS=${X11BASE}/lib/X11/fonts/TTF/ \
FAST=yes \
+   CUSTOM_LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
INPUT_PLUGINS=raster,postgis,shape,gdal,ogr,sqlite
 
+MODSCONS_ENV = XMLPARSER=libxml2
+
+
 pre-configure:
# subst shlib version
${SUBST_CMD} ${WRKSRC}/src/build.py
diff --git a/graphics/mapnik/distinfo b/graphics/mapnik/distinfo
index a85213a8ed8..124442ccf58 100644
--- a/graphics/mapnik/distinfo
+++ b/graphics/mapnik/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mapnik-v3.0.10.tar.bz2) = NkC87Bl6NO4HgVPmZ8NEM9pbceAvH6fBSAEtl702qjk=
-SIZE (mapnik-v3.0.10.tar.bz2) = 86209028
+SHA256 (mapnik-3.1.0.tar.gz) = R8RLUIqZEIDcCj1CKa30vf+C/KjXv5QYVkRHVHeutl4=
+SIZE (mapnik-3.1.0.tar.gz) = 10473693
diff --git a/graphics/mapnik/patches/patch-SConstruct 
b/graphics/mapnik/patches/patch-SConstruct
index 6646a9a0c61..d3982ff3403 100644
--- a/graphics/mapnik/patches/patch-SConstruct
+++ b/graphics/mapnik/patches/patch-SConstruct
@@ -1,8 +1,8 @@
 $OpenBSD: patch-SConstruct,v 1.7 2016/09/04 16:46:57 landry Exp $
 2nd chunk is needed for proper boost_thread detection
 SConstruct.origFri Feb 26 03:02:05 2016
-+++ SConstruct Sun Sep  4 17:29:08 2016
-@@ -290,7 +290,7 @@ opts.AddVariables(
+--- SConstruct.origFri Jan  8 06:20:06 2021
 SConstruct Sat May 15 02:43:25 2021
+@@ -297,7 +297,7 @@
  ('CUSTOM_LDFLAGS', 'Custom linker flags, e.g. -L if you have 
libraries in a nonstandard directory ', ''),
  EnumVariable('LINKING', "Set library format for libmapnik",'shared', 
['shared','static']),
  EnumVariable('RUNTIME_LINK', "Set preference for linking 
dependencies",'shared', ['shared','static']),
@@ -10,14 +10,13 @@ $OpenBSD: patch-SConstruct,v 1.7 2016/09/04 16:46:57 landry 
Exp $
 +

Re: UPDATE: textproc/hunspell

[Josh Grosse]

On Tue, Sep 15, 2020 at 06:43:36AM +0200, Rafael Sadowski wrote:
> I was a little surprised at the k2k20 that our hunspell version is so
> old. The latest version 1.7 is from 11.2018. Please find below a diff to
> update hunspell to 1.7 and bump/adjust all consumer.

I've tested the updated hunspell with the updated codeblocks.  
Working for me on amd64 with the latest en_US.{dic,aif} files.

devel/codeblocks maintainer OK.

[WIP] sysutils/e2fsprogs 1.42.2 -> 1.45.6

[Josh Grosse]

This WIP update to the latest revision adds fuse2fs(1), which is
a fuse(4) client for ext2/ext3/ext4.  At the moment this
tool is effectively a read-only mount.  I can read files with it,
and use mkdir to create new directories, but normal files are not
writeable, from my testing on amd64.  The behaviour is the same on
all three filesystems, except the fuse2fs mount warns that the
journal will not be written when you mount either an ext3 or ext4
filesystem.

My patch to misc/fuse2fs.c replaces the undefined FUSE_MAKE_VERSION
tests but my interpretation may be incorrect, so I may be the cause
of the operational issue noted above..

Additionally, my patches to lib/ext2fs/imager.c and misc/e2fuzz.c
revise loff_t to off_t -- as loff_t is not defined in sys/types.h.
This may not be an appropriate solution.

Comments, recommendations, and cluebats welcome.
diff --git a/sysutils/e2fsprogs/patches/patch-doc_Makefile_in 
b/sysutils/e2fsprogs/patches/patch-doc_Makefile_in
index cb9ae719e8a..948ad6160fd 100644
--- a/sysutils/e2fsprogs/patches/patch-doc_Makefile_in
+++ b/sysutils/e2fsprogs/patches/patch-doc_Makefile_in
@@ -1,6 +1,7 @@
 $OpenBSD: patch-doc_Makefile_in,v 1.4 2014/04/30 11:40:04 ajacoutot Exp $
 doc/Makefile.in.orig   Sun Dec 29 05:18:02 2013
-+++ doc/Makefile.inWed Apr 30 10:36:56 2014
+Index: doc/Makefile.in
+--- doc/Makefile.in.orig
 doc/Makefile.in
 @@ -17,9 +17,9 @@ INFO=@MAKEINFO@
  HTML=makeinfo --html --no-split
  PS2PDF=ps2pdf
@@ -11,14 +12,14 @@ $OpenBSD: patch-doc_Makefile_in,v 1.4 2014/04/30 11:40:04 
ajacoutot Exp $
 -install-doc-libs: libext2fs.info libext2fs.dvi
 +install-doc-libs: libext2fs.info
$(Q) $(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
-   $(E) "  MKINSTALLDIRS $(infodir)"
-   $(Q) $(MKINSTALLDIRS) $(DESTDIR)$(infodir)
+   $(E) "  MKDIR_P $(infodir)"
+   $(Q) $(MKDIR_P) $(DESTDIR)$(infodir)
 @@ -27,8 +27,6 @@ install-doc-libs: libext2fs.info libext2fs.dvi
echo "  INSTALL_DATA $(infodir)/$$i" ; \
$(INSTALL_DATA) $$i $(DESTDIR)$(infodir)/$$i ; \
done
 -  $(E) "  GZIP $(infodir)/libext2fs.info*"
--  -$(Q) gzip -9 $(DESTDIR)$(infodir)/libext2fs.info*
+-  -$(Q) gzip -9n $(DESTDIR)$(infodir)/libext2fs.info*
  
  uninstall-doc-libs:
$(RM) -rf $(DESTDIR)$(infodir)/libext2fs.info*
diff --git a/sysutils/e2fsprogs/patches/patch-lib_Makefile_elf-lib 
b/sysutils/e2fsprogs/patches/patch-lib_Makefile_elf-lib
index 23245203bc5..79c5db0e331 100644
--- a/sysutils/e2fsprogs/patches/patch-lib_Makefile_elf-lib
+++ b/sysutils/e2fsprogs/patches/patch-lib_Makefile_elf-lib
@@ -3,8 +3,9 @@ $OpenBSD: patch-lib_Makefile_elf-lib,v 1.7 2013/06/21 22:35:51 
sthen Exp $
 Don't generate library symlinks.
 Don't run ldconfig.
 
 lib/Makefile.elf-lib.orig  Wed Aug 15 21:43:55 2012
-+++ lib/Makefile.elf-lib   Wed Jun 19 14:25:04 2013
+Index: lib/Makefile.elf-lib
+--- lib/Makefile.elf-lib.orig
 lib/Makefile.elf-lib
 @@ -32,7 +32,6 @@ $(ELF_LIB): $(OBJS)
$(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) \
`echo $(my_dir) | sed -e 's;lib/;;'`/$(ELF_LIB) $(ELF_LIB))
@@ -12,7 +13,7 @@ Don't run ldconfig.
 -  $(Q) (cd ..; $(LN) $(LINK_BUILD_FLAGS) $(ELF_LIB) $(ELF_SONAME))
  
  installdirs-elf-lib::
-   $(E) "  MKINSTALLDIRS $(ELF_INSTALL_DIR) $(libdir)"
+   $(E) "  MKDIR_P $(ELF_INSTALL_DIR) $(libdir)"
 @@ -44,14 +43,6 @@ installdirs:: installdirs-elf-lib
  install-shlibs install:: $(ELF_LIB) installdirs-elf-lib $(DEP_INSTALL_SYMLINK)
$(E) "  INSTALL-ELF-LIB $(ELF_INSTALL_DIR)/$(ELF_LIB)"
diff --git a/sysutils/e2fsprogs/patches/patch-lib_blkid_getsize_c 
b/sysutils/e2fsprogs/patches/patch-lib_blkid_getsize_c
index 83626d1612b..ea35bcf592d 100644
--- a/sysutils/e2fsprogs/patches/patch-lib_blkid_getsize_c
+++ b/sysutils/e2fsprogs/patches/patch-lib_blkid_getsize_c
@@ -1,7 +1,8 @@
 $OpenBSD: patch-lib_blkid_getsize_c,v 1.3 2014/11/08 11:28:04 sthen Exp $
 lib/blkid/getsize.c.orig   Sat Aug  2 21:26:22 2014
-+++ lib/blkid/getsize.cSat Nov  8 10:41:17 2014
-@@ -25,6 +25,7 @@
+Index: lib/blkid/getsize.c
+--- lib/blkid/getsize.c.orig
 lib/blkid/getsize.c
+@@ -29,6 +29,7 @@
  #include 
  #ifdef HAVE_SYS_IOCTL_H
  #include 
diff --git a/sysutils/e2fsprogs/patches/patch-lib_e2p_Makefile_in 
b/sysutils/e2fsprogs/patches/patch-lib_e2p_Makefile_in
index 1840bb582a9..0de426472bd 100644
--- a/sysutils/e2fsprogs/patches/patch-lib_e2p_Makefile_in
+++ b/sysutils/e2fsprogs/patches/patch-lib_e2p_Makefile_in
@@ -1,7 +1,8 @@
 $OpenBSD: patch-lib_e2p_Makefile_in,v 1.3 2013/06/21 22:35:51 sthen Exp $
 lib/e2p/Makefile.in.orig   Fri Sep 21 17:30:42 2012
-+++ lib/e2p/Makefile.inWed Jun 19 14:25:06 2013
-@@ -34,8 +34,8 @@ HFILES= e2p.h
+Index: lib/e2p/Makefile.in
+--- lib/e2p/Makefile.in.orig
 lib/e2p/Makefile.in
+@@ -36,8 +36,8 @@ HFILES= e2p.h
  LIBRARY= libe2p
  LIBDIR= e2p
  
diff --git a/sysutils/e2fsprogs/patches/patch-lib_ext2fs_Makefile_in 

[update] graphics/gimp/stable 2.10.18 -> 2.10.20

[Josh Grosse]

Working for me on amd64.  

Release highlights (from 
https://www.gimp.org/news/2020/06/11/gimp-2-10-20-released/)

Tool-group menus can now expand on hover
Non-destructive cropping now available by cropping the canvas rather than 
actual pixels
Better PSD support: exporting of 16-bit files now available, 
reading/writing channels in the right order
On-canvas controls for the Vignette filter
New filters: Bloom, Focus Blur, Lens Blur, Variable Blur
Blending options now built into filter dialogs
Over 30 bugfixes

diff --git a/graphics/gimp/stable/Makefile b/graphics/gimp/stable/Makefile
index f060be79985..24a3cda13e5 100644
--- a/graphics/gimp/stable/Makefile
+++ b/graphics/gimp/stable/Makefile
@@ -2,8 +2,7 @@
 
 COMMENT=   GNU Image Manipulation Program
 
-DISTNAME = gimp-2.10.18
-REVISION = 3
+DISTNAME = gimp-2.10.20
 
 .for i in gimp gimpbase gimpcolor gimpconfig gimpmath gimpmodule \
gimpthumb gimpui gimpwidgets
diff --git a/graphics/gimp/stable/distinfo b/graphics/gimp/stable/distinfo
index 758870b74e9..96fe63325b1 100644
--- a/graphics/gimp/stable/distinfo
+++ b/graphics/gimp/stable/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gimp-2.10.18.tar.bz2) = Zb/hEejuv/093jAWzLUH+ZSNJmPZSXy0ONm7YJ4R1xY=
-SIZE (gimp-2.10.18.tar.bz2) = 32946467
+SHA256 (gimp-2.10.20.tar.bz2) = 4S+fh0saAHxCd7YKqB4LZzML5+YVPldJ6tg5uQL8ezw=
+SIZE (gimp-2.10.20.tar.bz2) = 33108938
diff --git a/graphics/gimp/stable/pkg/PLIST b/graphics/gimp/stable/pkg/PLIST
index 06571362000..23a9cfc5b60 100644
--- a/graphics/gimp/stable/pkg/PLIST
+++ b/graphics/gimp/stable/pkg/PLIST
@@ -4794,16 +4794,6 @@ share/gtk-doc/html/libgimp/GimpProcBrowserDialog.html
 share/gtk-doc/html/libgimp/GimpProgressBar.html
 share/gtk-doc/html/libgimp/GimpSelectButton.html
 share/gtk-doc/html/libgimp/GimpZoomPreview.html
-share/gtk-doc/html/libgimp/api-index-2-10-14.html
-share/gtk-doc/html/libgimp/api-index-2-10-2.html
-share/gtk-doc/html/libgimp/api-index-2-10-4.html
-share/gtk-doc/html/libgimp/api-index-2-10-6.html
-share/gtk-doc/html/libgimp/api-index-2-10.html
-share/gtk-doc/html/libgimp/api-index-2-2.html
-share/gtk-doc/html/libgimp/api-index-2-4.html
-share/gtk-doc/html/libgimp/api-index-2-6.html
-share/gtk-doc/html/libgimp/api-index-2-8.html
-share/gtk-doc/html/libgimp/api-index-deprecated.html
 share/gtk-doc/html/libgimp/api-index-full.html
 share/gtk-doc/html/libgimp/home.png
 share/gtk-doc/html/libgimp/index.html
@@ -4895,12 +4885,6 @@ share/gtk-doc/html/libgimp/style.css
 share/gtk-doc/html/libgimp/up-insensitive.png
 share/gtk-doc/html/libgimp/up.png
 share/gtk-doc/html/libgimpbase/
-share/gtk-doc/html/libgimpbase/api-index-2-10-10.html
-share/gtk-doc/html/libgimpbase/api-index-2-10.html
-share/gtk-doc/html/libgimpbase/api-index-2-2.html
-share/gtk-doc/html/libgimpbase/api-index-2-4.html
-share/gtk-doc/html/libgimpbase/api-index-2-8.html
-share/gtk-doc/html/libgimpbase/api-index-deprecated.html
 share/gtk-doc/html/libgimpbase/api-index-full.html
 share/gtk-doc/html/libgimpbase/home.png
 share/gtk-doc/html/libgimpbase/index.html
@@ -4933,12 +4917,6 @@ share/gtk-doc/html/libgimpbase/up-insensitive.png
 share/gtk-doc/html/libgimpbase/up.png
 share/gtk-doc/html/libgimpcolor/
 share/gtk-doc/html/libgimpcolor/GimpColorManaged.html
-share/gtk-doc/html/libgimpcolor/api-index-2-10.html
-share/gtk-doc/html/libgimpcolor/api-index-2-2.html
-share/gtk-doc/html/libgimpcolor/api-index-2-4.html
-share/gtk-doc/html/libgimpcolor/api-index-2-6.html
-share/gtk-doc/html/libgimpcolor/api-index-2-8.html
-share/gtk-doc/html/libgimpcolor/api-index-deprecated.html
 share/gtk-doc/html/libgimpcolor/api-index-full.html
 share/gtk-doc/html/libgimpcolor/home.png
 share/gtk-doc/html/libgimpcolor/index.html
@@ -4963,11 +4941,6 @@ share/gtk-doc/html/libgimpcolor/up-insensitive.png
 share/gtk-doc/html/libgimpcolor/up.png
 share/gtk-doc/html/libgimpconfig/
 share/gtk-doc/html/libgimpconfig/GimpColorConfig.html
-share/gtk-doc/html/libgimpconfig/api-index-2-10.html
-share/gtk-doc/html/libgimpconfig/api-index-2-4.html
-share/gtk-doc/html/libgimpconfig/api-index-2-6.html
-share/gtk-doc/html/libgimpconfig/api-index-2-8.html
-share/gtk-doc/html/libgimpconfig/api-index-deprecated.html
 share/gtk-doc/html/libgimpconfig/api-index-full.html
 share/gtk-doc/html/libgimpconfig/home.png
 share/gtk-doc/html/libgimpconfig/index.html
@@ -4991,11 +4964,6 @@ share/gtk-doc/html/libgimpconfig/style.css
 share/gtk-doc/html/libgimpconfig/up-insensitive.png
 share/gtk-doc/html/libgimpconfig/up.png
 share/gtk-doc/html/libgimpmath/
-share/gtk-doc/html/libgimpmath/api-index-2-10-16.html
-share/gtk-doc/html/libgimpmath/api-index-2-10.html
-share/gtk-doc/html/libgimpmath/api-index-2-4.html
-share/gtk-doc/html/libgimpmath/api-index-2-8.html
-share/gtk-doc/html/libgimpmath/api-index-deprecated.html
 share/gtk-doc/html/libgimpmath/api-index-full.html
 share/gtk-doc/html/libgimpmath/home.png
 share/gtk-doc/html/libgimpmath/index.html
@@ -5015,9 +4983,6 @@ 

Re: [pkg-readme update] sysutils/udfclient

[Josh Grosse]

Argh.  Yet another diff, as the prior post missed the Makefile REVISION.
diff --git a/sysutils/udfclient/Makefile b/sysutils/udfclient/Makefile
index 7dc63d78d72..5a268222e62 100644
--- a/sysutils/udfclient/Makefile
+++ b/sysutils/udfclient/Makefile
@@ -3,6 +3,7 @@
 COMMENT =  userland implementation of the UDF filesystem
 
 V =0.8.11
+REVISION=  0
 DISTNAME = UDFclient.${V}
 PKGNAME =  udfclient-${V}
 CATEGORIES =   sysutils
diff --git a/sysutils/udfclient/pkg/README b/sysutils/udfclient/pkg/README
index caa00e7de1e..9f2063994d3 100644
--- a/sysutils/udfclient/pkg/README
+++ b/sysutils/udfclient/pkg/README
@@ -31,16 +31,19 @@ Special files and links
 UDF on disk drives
 --
 
-Disklabels are not used, except for virtual partition "a" with
-2048-byte blocksize devices.  MBRs are not used, the filesystem
-begins at LBA 0.  Partition "c" should be used if writing directly
-to a drive instead of an image file.  If the drive contains prior
-data, zero the leading sectors before use as shown in the first
-command below.
+OpenBSD disklabels are not used on storage media.  OpenBSD will create
+an in-memory virtual "a" partition when natively mounting UDF filesystems
+read-only on 2048-byte block devices or images; see Interoperability with
+mount_udf(8) below.
+
+MBRs are not used, the filesystem begins at LBA 0.  Raw partition "c"
+should be used if writing directly to a drive instead of an image file.
+If the drive contains prior data, zero the leading sectors before use as
+shown in the first command below.
 
 # dd if=/dev/zero of=/dev/rsd9c count=63
 # newfs_udf -L shared.drive /dev/rsd9c
-# ufsclient -W /dev/rsd9c
+# udfclient -W /dev/rsd9c
 
 While it is possible to direct a filesystem image to a disklabel
 partition, there would be no interoperability with other OSes.

Re: [pkg-readme update] sysutils/udfclient

[Josh Grosse]

New diff - an additional typo was discovered by Jens A. Griepentrog.
diff --git a/sysutils/udfclient/pkg/README b/sysutils/udfclient/pkg/README
index caa00e7de1e..9f2063994d3 100644
--- a/sysutils/udfclient/pkg/README
+++ b/sysutils/udfclient/pkg/README
@@ -31,16 +31,19 @@ Special files and links
 UDF on disk drives
 --
 
-Disklabels are not used, except for virtual partition "a" with
-2048-byte blocksize devices.  MBRs are not used, the filesystem
-begins at LBA 0.  Partition "c" should be used if writing directly
-to a drive instead of an image file.  If the drive contains prior
-data, zero the leading sectors before use as shown in the first
-command below.
+OpenBSD disklabels are not used on storage media.  OpenBSD will create
+an in-memory virtual "a" partition when natively mounting UDF filesystems
+read-only on 2048-byte block devices or images; see Interoperability with
+mount_udf(8) below.
+
+MBRs are not used, the filesystem begins at LBA 0.  Raw partition "c"
+should be used if writing directly to a drive instead of an image file.
+If the drive contains prior data, zero the leading sectors before use as
+shown in the first command below.
 
 # dd if=/dev/zero of=/dev/rsd9c count=63
 # newfs_udf -L shared.drive /dev/rsd9c
-# ufsclient -W /dev/rsd9c
+# udfclient -W /dev/rsd9c
 
 While it is possible to direct a filesystem image to a disklabel
 partition, there would be no interoperability with other OSes.

[pkg-readme update] sysutils/udfclient

[Josh Grosse]

This diff clarifies when a virtual "a" partition may be
used with udfclient images.

Thanks to Jens A. Griepen for bringing the matter to my
attention.
diff --git a/sysutils/udfclient/Makefile b/sysutils/udfclient/Makefile
index 7dc63d78d72..7c2c926fa9f 100644
--- a/sysutils/udfclient/Makefile
+++ b/sysutils/udfclient/Makefile
@@ -2,7 +2,7 @@
 
 COMMENT =  userland implementation of the UDF filesystem
 
-V =0.8.11
+V =0.8.11p0
 DISTNAME = UDFclient.${V}
 PKGNAME =  udfclient-${V}
 CATEGORIES =   sysutils
diff --git a/sysutils/udfclient/pkg/README b/sysutils/udfclient/pkg/README
index caa00e7de1e..410d4606cc6 100644
--- a/sysutils/udfclient/pkg/README
+++ b/sysutils/udfclient/pkg/README
@@ -31,12 +31,15 @@ Special files and links
 UDF on disk drives
 --
 
-Disklabels are not used, except for virtual partition "a" with
-2048-byte blocksize devices.  MBRs are not used, the filesystem
-begins at LBA 0.  Partition "c" should be used if writing directly
-to a drive instead of an image file.  If the drive contains prior
-data, zero the leading sectors before use as shown in the first
-command below.
+OpenBSD disklabels are not used on storage media.  OpenBSD will create
+an in-memory virtual "a" partition when natively mounting UDF filesystems
+read-only on 2048-byte block devices or images; see Interoperability with
+mount_udf(8) below.
+
+MBRs are not used, the filesystem begins at LBA 0.  Raw partition "c"
+should be used if writing directly to a drive instead of an image file.
+If the drive contains prior data, zero the leading sectors before use as
+shown in the first command below.
 
 # dd if=/dev/zero of=/dev/rsd9c count=63
 # newfs_udf -L shared.drive /dev/rsd9c

Re: [pkg-readme update] sysutils/udfclient

[Josh Grosse]

On Sun, Sep 06, 2020 at 06:06:40PM -0400, Josh Grosse wrote:
> This diff clarifies when a virtual "a" partition may be
> used with udfclient images.
> 
> Thanks to Jens A. Griepen for bringing the matter to my
> attention.

Corrected thinko in Makefile.
diff --git a/sysutils/udfclient/Makefile b/sysutils/udfclient/Makefile
index 7dc63d78d72..5a268222e62 100644
--- a/sysutils/udfclient/Makefile
+++ b/sysutils/udfclient/Makefile
@@ -3,6 +3,7 @@
 COMMENT =  userland implementation of the UDF filesystem
 
 V =0.8.11
+REVISION=  0
 DISTNAME = UDFclient.${V}
 PKGNAME =  udfclient-${V}
 CATEGORIES =   sysutils
diff --git a/sysutils/udfclient/pkg/README b/sysutils/udfclient/pkg/README
index caa00e7de1e..410d4606cc6 100644
--- a/sysutils/udfclient/pkg/README
+++ b/sysutils/udfclient/pkg/README
@@ -31,12 +31,15 @@ Special files and links
 UDF on disk drives
 --
 
-Disklabels are not used, except for virtual partition "a" with
-2048-byte blocksize devices.  MBRs are not used, the filesystem
-begins at LBA 0.  Partition "c" should be used if writing directly
-to a drive instead of an image file.  If the drive contains prior
-data, zero the leading sectors before use as shown in the first
-command below.
+OpenBSD disklabels are not used on storage media.  OpenBSD will create
+an in-memory virtual "a" partition when natively mounting UDF filesystems
+read-only on 2048-byte block devices or images; see Interoperability with
+mount_udf(8) below.
+
+MBRs are not used, the filesystem begins at LBA 0.  Raw partition "c"
+should be used if writing directly to a drive instead of an image file.
+If the drive contains prior data, zero the leading sectors before use as
+shown in the first command below.
 
 # dd if=/dev/zero of=/dev/rsd9c count=63
 # newfs_udf -L shared.drive /dev/rsd9c

Re: x11/i3 bugfix release

[Josh Grosse]

On Thu, Jul 30, 2020 at 01:26:42PM +0200, Solene Rapenne wrote:
> This updates i3 to last version, a tiny bugfix release

Working for me on amd64.  Thanks!!

Re: [update] net/transmission

[Josh Grosse]

"Ping."  

On Sat, May 23, 2020 at 02:20:38PM -0400, Josh Grosse wrote:
> Update from 2.94 to 3.00
> 
> Changelog: https://github.com/transmission/transmission/releases/tag/3.00

> Index: Makefile
> ===
> RCS file: /systems/cvs/ports/net/transmission/Makefile,v
> retrieving revision 1.134
> diff -u -p -r1.134 Makefile
> --- Makefile  12 Jul 2019 20:48:50 -  1.134
> +++ Makefile  23 May 2020 18:01:27 -
> @@ -7,7 +7,7 @@ COMMENT-qt=   BitTorrent client with Qt in
>  NOT_FOR_ARCHS-gtk= sparc64
>  NOT_FOR_ARCHS-qt= sparc64
>  
> -VER= 2.94
> +VER= 3.00
>  DISTNAME=transmission-${VER}
>  PKGNAME-main=transmission-${VER}
>  PKGNAME-gtk= transmission-gtk-${VER}
> @@ -15,9 +15,6 @@ PKGNAME-qt= transmission-qt-${VER}
>  CATEGORIES=  net
>  HOMEPAGE=https://transmissionbt.com/
>  MAINTAINER=  Josh Grosse 
> -REVISION-gtk=4
> -REVISION-qt= 4
> -REVISION-main=   2
>  
>  # GPLv2+
>  PERMIT_PACKAGE=  Yes
> @@ -43,8 +40,8 @@ WANTLIB-common= c crypto curl event_core
>  WANTLIB-main=${WANTLIB-common} nghttp2 iconv
>  WANTLIB-gtk= ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
>   Xext Xfixes Xi Xinerama Xrandr Xrender \
> - atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject \
> - dbus-1 expat ffi fontconfig freetype fribidi \
> + atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
> + expat ffi fontconfig freetype fribidi \
>   gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
>   gobject-2.0 graphite2 gthread-2.0 gtk-3 \
>   harfbuzz pango-1.0 pangoft2-1.0 \
> Index: distinfo
> ===
> RCS file: /systems/cvs/ports/net/transmission/distinfo,v
> retrieving revision 1.52
> diff -u -p -r1.52 distinfo
> --- distinfo  14 May 2018 21:23:59 -  1.52
> +++ distinfo  23 May 2020 17:46:46 -
> @@ -1,2 +1,2 @@
> -SHA256 (transmission-2.94.tar.xz) = 
> NUQsyEn5H435gsPQ1HnWUMbKGTEKmU7M2qeaSvORa30=
> -SIZE (transmission-2.94.tar.xz) = 3365952
> +SHA256 (transmission-3.00.tar.xz) = 
> kURlL+dC9/fdZldxbjeNpgt1Gq7ai++DRLPu/E2yVfI=
> +SIZE (transmission-3.00.tar.xz) = 3329220
> Index: pkg/PLIST-gtk
> ===
> RCS file: /systems/cvs/ports/net/transmission/pkg/PLIST-gtk,v
> retrieving revision 1.11
> diff -u -p -r1.11 PLIST-gtk
> --- pkg/PLIST-gtk 29 Jun 2018 22:16:19 -  1.11
> +++ pkg/PLIST-gtk 23 May 2020 18:15:10 -
> @@ -5,163 +5,89 @@
>  share/applications/transmission-gtk.desktop
>  share/icons/
>  share/icons/hicolor/
> -share/icons/hicolor/16x16/
> -share/icons/hicolor/16x16/apps/
> -share/icons/hicolor/16x16/apps/transmission.png
> -share/icons/hicolor/22x22/
> -share/icons/hicolor/22x22/apps/
> -share/icons/hicolor/22x22/apps/transmission.png
> -share/icons/hicolor/24x24/
> -share/icons/hicolor/24x24/apps/
> -share/icons/hicolor/24x24/apps/transmission.png
> -share/icons/hicolor/256x256/
> -share/icons/hicolor/256x256/apps/
> -share/icons/hicolor/256x256/apps/transmission.png
> -share/icons/hicolor/32x32/
> -share/icons/hicolor/32x32/apps/
> -share/icons/hicolor/32x32/apps/transmission.png
> -share/icons/hicolor/48x48/
> -share/icons/hicolor/48x48/apps/
> -share/icons/hicolor/48x48/apps/transmission.png
>  share/icons/hicolor/scalable/
>  share/icons/hicolor/scalable/apps/
>  share/icons/hicolor/scalable/apps/transmission.svg
> -share/locale/an/
> -share/locale/an/LC_MESSAGES/
>  share/locale/an/LC_MESSAGES/transmission-gtk.mo
> -share/locale/ar/
> -share/locale/ar/LC_MESSAGES/
>  share/locale/ar/LC_MESSAGES/transmission-gtk.mo
> -share/locale/ast/
> -share/locale/ast/LC_MESSAGES/
>  share/locale/ast/LC_MESSAGES/transmission-gtk.mo
> -share/locale/az/
> -share/locale/az/LC_MESSAGES/
>  share/locale/az/LC_MESSAGES/transmission-gtk.mo
>  share/locale/be/LC_MESSAGES/transmission-gtk.mo
> -share/locale/be@latin/
> -share/locale/be@latin/LC_MESSAGES/
> -share/locale/be@latin/LC_MESSAGES/transmission-gtk.mo
>  share/locale/bg/LC_MESSAGES/transmission-gtk.mo
> -share/locale/bn/
> -share/locale/bn/LC_MESSAGES/
>  share/locale/bn/LC_MESSAGES/transmission-gtk.mo
>  share/locale/bo/
>  share/locale/bo/LC_MESSAGES/
>  share/locale/bo/LC_MESSAGES/transmission-gtk.mo
> -share/locale/br/
> -share/locale/br/LC_MESSAGES/
>  share/locale/br/LC_MESSAGES/transmission-gtk.mo
> -share/locale/bs/
> -share/locale/bs/LC_MESSAGES/
>  share/locale/bs/LC_MESSAGES/transmission-gtk.mo
>  share/locale/ca/LC_MESSAGES/transmission-gtk.mo

Re: [update] devel/codeblocks

[Josh Grosse]

On Thu, Jun 25, 2020 at 04:04:28PM +0200, Charlene Wendling wrote:
> Hi,
> 
> On Fri, 5 Jun 2020 19:44:06 -0400
> Josh Grosse wrote:
> 
> > Update from 17.12 to 20.03.  Builds and runs
> > on amd64.  Changelog:
> > http://www.codeblocks.org/downloads/binaries/changelog
> > 
> 
> As far as x86 is concerned it's good, but it won't build on !x86 because
> some plugin uses the int3 asm instruction.
> 
> I made the following changes to your diff: 
> 
> - patch out the int3 instruction, fix stolen from Debian
> - refresh patches
> - change COMPILER reason
> - fix a trailing whitespace in Makefile
> 
> This builds and works fine on amd64 and macppc.
> 
> Charl??ne.

Thank you!  I have rebuilt and tested on amd64 with Charlene's improved
diffs, including the new patch-src_plugins_contrib_dragscroll_dragscrollcfg_h.

Runs fine on amd64.  OK maintainer.

[update] devel/codeblocks

[Josh Grosse]

Update from 17.12 to 20.03.  Builds and runs
on amd64.  Changelog: http://www.codeblocks.org/downloads/binaries/changelog

Index: Makefile
===
RCS file: /systems/cvs/ports/devel/codeblocks/Makefile,v
retrieving revision 1.55
diff -u -p -r1.55 Makefile
--- Makefile12 Jul 2019 20:44:06 -  1.55
+++ Makefile5 Jun 2020 23:30:43 -
@@ -3,9 +3,8 @@
 BROKEN-alpha=  sqvm.cpp:394:1: internal compiler error: Segmentation fault
 COMMENT=   Code::Blocks C/C++ IDE
 
-V= 17.12
-REVISION=  6
-DISTNAME=  codeblocks_${V}
+V= 20.03
+DISTNAME=  codeblocks-${V}
 PKGNAME=   codeblocks-${V}
 EXTRACT_SUFX=  .tar.xz
 
@@ -34,8 +33,8 @@ PERMIT_PACKAGE=   Yes
 
 WANTLIB += ${COMPILER_LIBCXX} ICE SDL2 SM X11 Xcomposite Xcursor
 WANTLIB += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender Xxf86vm
-WANTLIB += atk-1.0 atk-bridge-2.0 atspi boost_system bz2 c cairo
-WANTLIB += cairo-gobject dbus-1 epoxy expat ffi fontconfig freetype
+WANTLIB += atk-1.0 atk-bridge-2.0 boost_system bz2 c cairo
+WANTLIB += cairo-gobject epoxy expat ffi fontconfig freetype
 WANTLIB += fribidi gamin-1 gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0
 WANTLIB += gmodule-2.0 gobject-2.0 graphite2 gthread-2.0 gtk-3
 WANTLIB += harfbuzz hunspell-1.6 iconv intl jpeg m mspack notify
@@ -45,6 +44,7 @@ WANTLIB += wx_baseu_xml-3.0 wx_gtk3u_adv
 WANTLIB += wx_gtk3u_core-3.0 wx_gtk3u_html-3.0 wx_gtk3u_propgrid-3.0
 WANTLIB += wx_gtk3u_qa-3.0 wx_gtk3u_richtext-3.0 wx_gtk3u_xrc-3.0
 WANTLIB += xcb xcb-render xcb-shm z
+WANTLIB += Xss lzma zstd
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=codeblocks/Sources/${V}/}
 
Index: distinfo
===
RCS file: /systems/cvs/ports/devel/codeblocks/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo6 Feb 2018 15:28:51 -   1.6
+++ distinfo5 Jun 2020 21:12:52 -
@@ -1,2 +1,2 @@
-SHA256 (codeblocks_17.12.tar.xz) = E4gaCnJ2lpToLlMbjngU1R+/H6EixzxQBOGGVg+8V+A=
-SIZE (codeblocks_17.12.tar.xz) = 15725976
+SHA256 (codeblocks-20.03.tar.xz) = Fe6z4orqBU4fOLDH9GcbTU0RFv0F9jwHqpWpHbieqsU=
+SIZE (codeblocks-20.03.tar.xz) = 11799264
Index: pkg/PLIST
===
RCS file: /systems/cvs/ports/devel/codeblocks/pkg/PLIST,v
retrieving revision 1.14
diff -u -p -r1.14 PLIST
--- pkg/PLIST   2 Jan 2019 12:44:06 -   1.14
+++ pkg/PLIST   5 Jun 2020 23:34:28 -
@@ -20,6 +20,7 @@ include/codeblocks/autodetectcompilers.h
 include/codeblocks/backgroundthread.h
 include/codeblocks/base64.h
 include/codeblocks/blockallocated.h
+include/codeblocks/cbart_provider.h
 include/codeblocks/cbauibook.h
 include/codeblocks/cbcolourmanager.h
 include/codeblocks/cbdebugger_interfaces.h
@@ -365,92 +366,93 @@ include/wxsmith/wxwidgets/wxwidgetsres.h
 include/wxsmith/wxwidgets/wxwidgetsresfactory.h
 lib/codeblocks/
 lib/codeblocks/plugins/
-lib/codeblocks/plugins/libAstyle.so
-lib/codeblocks/plugins/libAutoVersioning.so
-lib/codeblocks/plugins/libBrowseTracker.so
-lib/codeblocks/plugins/libCccc.so
-lib/codeblocks/plugins/libCppCheck.so
-lib/codeblocks/plugins/libCscope.so
-lib/codeblocks/plugins/libDoxyBlocks.so
-lib/codeblocks/plugins/libEditorConfig.so
-lib/codeblocks/plugins/libEditorTweaks.so
-lib/codeblocks/plugins/libFileManager.so
-lib/codeblocks/plugins/libHexEditor.so
-lib/codeblocks/plugins/libIncrementalSearch.so
-lib/codeblocks/plugins/libMouseSap.so
-lib/codeblocks/plugins/libNassiShneiderman.so
-lib/codeblocks/plugins/libProfiler.so
-lib/codeblocks/plugins/libProjectOptionsManipulator.so
-lib/codeblocks/plugins/libRegExTestbed.so
-lib/codeblocks/plugins/libReopenEditor.so
-lib/codeblocks/plugins/libSmartIndentCpp.so
-lib/codeblocks/plugins/libSmartIndentFortran.so
-lib/codeblocks/plugins/libSmartIndentHDL.so
-lib/codeblocks/plugins/libSmartIndentLua.so
-lib/codeblocks/plugins/libSmartIndentPascal.so
-lib/codeblocks/plugins/libSmartIndentPython.so
-lib/codeblocks/plugins/libSmartIndentXML.so
-lib/codeblocks/plugins/libSpellChecker.so
-lib/codeblocks/plugins/libSymTab.so
-lib/codeblocks/plugins/libThreadSearch.so
-lib/codeblocks/plugins/libToolsPlus.so
-lib/codeblocks/plugins/libValgrind.so
-lib/codeblocks/plugins/libabbreviations.so
-lib/codeblocks/plugins/libautosave.so
-lib/codeblocks/plugins/libbyogames.so
-lib/codeblocks/plugins/libcb_koders.so
-lib/codeblocks/plugins/libclasswizard.so
-lib/codeblocks/plugins/libcodecompletion.so
-lib/codeblocks/plugins/libcodesnippets.so
-lib/codeblocks/plugins/libcodestat.so
-lib/codeblocks/plugins/libcompiler.so
-lib/codeblocks/plugins/libcopystrings.so
-lib/codeblocks/plugins/libdebugger.so
-lib/codeblocks/plugins/libdefaultmimehandler.so
-lib/codeblocks/plugins/libdragscroll.so
-lib/codeblocks/plugins/libenvvars.so
-lib/codeblocks/plugins/libexporter.so
-lib/codeblocks/plugins/libheaderfixup.so
-lib/codeblocks/plugins/libhelp_plugin.so

[update] sysutils/udfclient

[Josh Grosse]

Update 0.8.9 -> 0.8.11.

>From $HOMEPAGE: 

"Minor release fixing compilation errors on gcc 10. 
Also corrected some minor spelling mistakes."

Index: Makefile
===
RCS file: /systems/cvs/ports/sysutils/udfclient/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile12 Jul 2019 20:49:53 -  1.9
+++ Makefile28 May 2020 01:02:18 -
@@ -2,7 +2,7 @@
 
 COMMENT =  userland implementation of the UDF filesystem
 
-V =0.8.9
+V =0.8.11
 DISTNAME = UDFclient.${V}
 PKGNAME =  udfclient-${V}
 CATEGORIES =   sysutils
Index: distinfo
===
RCS file: /systems/cvs/ports/sysutils/udfclient/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo26 May 2019 15:17:23 -  1.5
+++ distinfo28 May 2020 01:02:47 -
@@ -1,2 +1,2 @@
-SHA256 (UDFclient.0.8.9.tgz) = mLlRDYgIOTLjxypk4eaiIogEanBqyuGMiee5ewRJyIo=
-SIZE (UDFclient.0.8.9.tgz) = 257062
+SHA256 (UDFclient.0.8.11.tgz) = TlsQLPfxND2G+DDLb2n+osGWtBE2u9MN3CbLiWnt350=
+SIZE (UDFclient.0.8.11.tgz) = 252986

[update] net/transmission

[Josh Grosse]

Update from 2.94 to 3.00

Changelog: https://github.com/transmission/transmission/releases/tag/3.00
Index: Makefile
===
RCS file: /systems/cvs/ports/net/transmission/Makefile,v
retrieving revision 1.134
diff -u -p -r1.134 Makefile
--- Makefile12 Jul 2019 20:48:50 -  1.134
+++ Makefile23 May 2020 18:01:27 -
@@ -7,7 +7,7 @@ COMMENT-qt= BitTorrent client with Qt in
 NOT_FOR_ARCHS-gtk= sparc64
 NOT_FOR_ARCHS-qt= sparc64
 
-VER=   2.94
+VER=   3.00
 DISTNAME=  transmission-${VER}
 PKGNAME-main=  transmission-${VER}
 PKGNAME-gtk=   transmission-gtk-${VER}
@@ -15,9 +15,6 @@ PKGNAME-qt=   transmission-qt-${VER}
 CATEGORIES=net
 HOMEPAGE=  https://transmissionbt.com/
 MAINTAINER=Josh Grosse 
-REVISION-gtk=  4
-REVISION-qt=   4
-REVISION-main= 2
 
 # GPLv2+
 PERMIT_PACKAGE=Yes
@@ -43,8 +40,8 @@ WANTLIB-common=   c crypto curl event_core
 WANTLIB-main=  ${WANTLIB-common} nghttp2 iconv
 WANTLIB-gtk=   ${WANTLIB-common} X11 Xcomposite Xcursor Xdamage \
Xext Xfixes Xi Xinerama Xrandr Xrender \
-   atk-1.0 atk-bridge-2.0 atspi cairo cairo-gobject \
-   dbus-1 expat ffi fontconfig freetype fribidi \
+   atk-1.0 atk-bridge-2.0 cairo cairo-gobject \
+   expat ffi fontconfig freetype fribidi \
gdk-3 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gmodule-2.0 \
gobject-2.0 graphite2 gthread-2.0 gtk-3 \
harfbuzz pango-1.0 pangoft2-1.0 \
Index: distinfo
===
RCS file: /systems/cvs/ports/net/transmission/distinfo,v
retrieving revision 1.52
diff -u -p -r1.52 distinfo
--- distinfo14 May 2018 21:23:59 -  1.52
+++ distinfo23 May 2020 17:46:46 -
@@ -1,2 +1,2 @@
-SHA256 (transmission-2.94.tar.xz) = 
NUQsyEn5H435gsPQ1HnWUMbKGTEKmU7M2qeaSvORa30=
-SIZE (transmission-2.94.tar.xz) = 3365952
+SHA256 (transmission-3.00.tar.xz) = 
kURlL+dC9/fdZldxbjeNpgt1Gq7ai++DRLPu/E2yVfI=
+SIZE (transmission-3.00.tar.xz) = 3329220
Index: pkg/PLIST-gtk
===
RCS file: /systems/cvs/ports/net/transmission/pkg/PLIST-gtk,v
retrieving revision 1.11
diff -u -p -r1.11 PLIST-gtk
--- pkg/PLIST-gtk   29 Jun 2018 22:16:19 -  1.11
+++ pkg/PLIST-gtk   23 May 2020 18:15:10 -
@@ -5,163 +5,89 @@
 share/applications/transmission-gtk.desktop
 share/icons/
 share/icons/hicolor/
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
-share/icons/hicolor/16x16/apps/transmission.png
-share/icons/hicolor/22x22/
-share/icons/hicolor/22x22/apps/
-share/icons/hicolor/22x22/apps/transmission.png
-share/icons/hicolor/24x24/
-share/icons/hicolor/24x24/apps/
-share/icons/hicolor/24x24/apps/transmission.png
-share/icons/hicolor/256x256/
-share/icons/hicolor/256x256/apps/
-share/icons/hicolor/256x256/apps/transmission.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
-share/icons/hicolor/32x32/apps/transmission.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
-share/icons/hicolor/48x48/apps/transmission.png
 share/icons/hicolor/scalable/
 share/icons/hicolor/scalable/apps/
 share/icons/hicolor/scalable/apps/transmission.svg
-share/locale/an/
-share/locale/an/LC_MESSAGES/
 share/locale/an/LC_MESSAGES/transmission-gtk.mo
-share/locale/ar/
-share/locale/ar/LC_MESSAGES/
 share/locale/ar/LC_MESSAGES/transmission-gtk.mo
-share/locale/ast/
-share/locale/ast/LC_MESSAGES/
 share/locale/ast/LC_MESSAGES/transmission-gtk.mo
-share/locale/az/
-share/locale/az/LC_MESSAGES/
 share/locale/az/LC_MESSAGES/transmission-gtk.mo
 share/locale/be/LC_MESSAGES/transmission-gtk.mo
-share/locale/be@latin/
-share/locale/be@latin/LC_MESSAGES/
-share/locale/be@latin/LC_MESSAGES/transmission-gtk.mo
 share/locale/bg/LC_MESSAGES/transmission-gtk.mo
-share/locale/bn/
-share/locale/bn/LC_MESSAGES/
 share/locale/bn/LC_MESSAGES/transmission-gtk.mo
 share/locale/bo/
 share/locale/bo/LC_MESSAGES/
 share/locale/bo/LC_MESSAGES/transmission-gtk.mo
-share/locale/br/
-share/locale/br/LC_MESSAGES/
 share/locale/br/LC_MESSAGES/transmission-gtk.mo
-share/locale/bs/
-share/locale/bs/LC_MESSAGES/
 share/locale/bs/LC_MESSAGES/transmission-gtk.mo
 share/locale/ca/LC_MESSAGES/transmission-gtk.mo
-share/locale/ca@valencia/
-share/locale/ca@valencia/LC_MESSAGES/
 share/locale/ca@valencia/LC_MESSAGES/transmission-gtk.mo
 share/locale/ceb/
 share/locale/ceb/LC_MESSAGES/
 share/locale/ceb/LC_MESSAGES/transmission-gtk.mo
-share/locale/ckb/
-share/locale/ckb/LC_MESSAGES/
 share/locale/ckb/LC_MESSAGES/transmission-gtk.mo
 share/locale/cs/LC_MESSAGES/transmission-gtk.mo
+share/locale/cy/LC_MESSAGES/transmission-gtk.mo
 share/locale/da/LC_MESSAGES/transmission-gtk.mo
 share/locale/de/LC_MESSAGES/transmission-gtk.mo
 share/locale/el/LC_MESSAGES/transmission-gtk.mo
 share/locale/en_AU/
 share/locale/en_AU/LC_MESSAGES/
 share

Re: UPDATE: SMPlayer-20.4.2

[Josh Grosse]

On Fri, May 15, 2020 at 04:32:35PM +0200, Gonzalo L. Rodriguez wrote:
> yes, right! diff attached!

No more complaints from port-lib-depends-check.  :)

Working for me on amd64.