Re: update net/libstrophe and profanity

2023-09-23 Thread Rafael Sadowski 
On Tue Sep 19, 2023 at 03:45:30PM +0200, Omar Polo wrote:
> This is a late update to libstrophe and profanity.
> 
> https://github.com/strophe/libstrophe/releases/tag/0.12.3
> https://github.com/profanity-im/profanity/releases/tag/0.14.0
> 
> portwise is not particular interesting, but some further testing is
> not bad since I think I only use 1% of the features or so :-)
> I plan to commit this next week unless issues arise.

OK for me

> 
> Thanks,
> 
> Index: net/libstrophe/Makefile
> ===
> RCS file: /home/cvs/ports/net/libstrophe/Makefile,v
> retrieving revision 1.10
> diff -u -p -r1.10 Makefile
> --- net/libstrophe/Makefile   9 Aug 2022 08:17:02 -   1.10
> +++ net/libstrophe/Makefile   19 Sep 2023 09:54:02 -
> @@ -1,6 +1,6 @@
>  COMMENT =simple, lightweight XMPP C library
>  
> -V =  0.12.2
> +V =  0.12.3
>  DISTNAME =   libstrophe-${V}
>  
>  SHARED_LIBS =strophe 4.0 # 12.1
> Index: net/libstrophe/distinfo
> ===
> RCS file: /home/cvs/ports/net/libstrophe/distinfo,v
> retrieving revision 1.7
> diff -u -p -r1.7 distinfo
> --- net/libstrophe/distinfo   9 Aug 2022 08:17:02 -   1.7
> +++ net/libstrophe/distinfo   19 Sep 2023 09:54:06 -
> @@ -1,2 +1,2 @@
> -SHA256 (libstrophe-0.12.2.tar.gz) = 
> re3KHP/2oXCVqqfifuz/LNPWCAh/Vf4ek5WmqxqJN0A=
> -SIZE (libstrophe-0.12.2.tar.gz) = 581031
> +SHA256 (libstrophe-0.12.3.tar.gz) = 
> dZ+bvv8go5LIP66BRFXNm82q6BJWspAW93fLwHDYlEU=
> +SIZE (libstrophe-0.12.3.tar.gz) = 579381
> Index: net/profanity/Makefile
> ===
> RCS file: /home/cvs/ports/net/profanity/Makefile,v
> retrieving revision 1.29
> diff -u -p -r1.29 Makefile
> --- net/profanity/Makefile13 Nov 2022 15:28:49 -  1.29
> +++ net/profanity/Makefile19 Sep 2023 12:38:44 -
> @@ -1,7 +1,6 @@
>  COMMENT =console based XMPP client
> -DISTNAME =   profanity-0.13.1
> +DISTNAME =   profanity-0.14.0
>  CATEGORIES = net
> -REVISION =   1
>  
>  HOMEPAGE =   https://profanity-im.github.io/
>  
> @@ -16,9 +15,9 @@ MASTER_SITES =  https://profanity-im.gith
>  
>  WANTLIB += assuan c crypto curl curses ereadline expat ffi gcrypt
>  WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gpg-error
> -WANTLIB += gpgme iconv intl m nghttp2 otr pcre2-8 pthread ${MODPY_WANTLIB}
> -WANTLIB += qrencode signal-protocol-c sqlite3 ssl strophe util
> -WANTLIB += z
> +WANTLIB += gpgme iconv intl m nghttp2 nghttp3 ngtcp2 ngtcp2_crypto_openssl
> +WANTLIB += otr pcre2-8 pthread python3.10 qrencode signal-protocol-c
> +WANTLIB += sqlite3 ssl strophe util z
>  
>  MODULES +=   lang/python
>  
> Index: net/profanity/distinfo
> ===
> RCS file: /home/cvs/ports/net/profanity/distinfo,v
> retrieving revision 1.16
> diff -u -p -r1.16 distinfo
> --- net/profanity/distinfo13 Oct 2022 07:19:27 -  1.16
> +++ net/profanity/distinfo19 Sep 2023 12:33:27 -
> @@ -1,2 +1,2 @@
> -SHA256 (profanity-0.13.1.tar.gz) = 
> K1B1Jy5+ydnJkVQuWSsdR0//iMYcZufiMJatMG7SyEo=
> -SIZE (profanity-0.13.1.tar.gz) = 903811
> +SHA256 (profanity-0.14.0.tar.gz) = 
> /SP/04oxkHl0poCjkAyVnhTUThbx+33yvbf2xnvXz38=
> +SIZE (profanity-0.14.0.tar.gz) = 936272
> Index: net/profanity/pkg/PLIST
> ===
> RCS file: /home/cvs/ports/net/profanity/pkg/PLIST,v
> retrieving revision 1.11
> diff -u -p -r1.11 PLIST
> --- net/profanity/pkg/PLIST   13 Oct 2022 07:19:28 -  1.11
> +++ net/profanity/pkg/PLIST   19 Sep 2023 12:35:22 -
> @@ -56,7 +56,6 @@ lib/libprofanity.la
>  @man man/man1/profanity-notify.1
>  @man man/man1/profanity-occupants.1
>  @man man/man1/profanity-omemo.1
> -@man man/man1/profanity-os.1
>  @man man/man1/profanity-otr.1
>  @man man/man1/profanity-outtype.1
>  @man man/man1/profanity-ox-setup.1
> @@ -68,6 +67,7 @@ lib/libprofanity.la
>  @man man/man1/profanity-prefs.1
>  @man man/man1/profanity-presence.1
>  @man man/man1/profanity-priority.1
> +@man man/man1/profanity-privacy.1
>  @man man/man1/profanity-privileges.1
>  @man man/man1/profanity-quit.1
>  @man man/man1/profanity-receipts.1
> @@ -91,6 +91,7 @@ lib/libprofanity.la
>  @man man/man1/profanity-states.1
>  @man man/man1/profanity-status.1
>  @man man/man1/profanity-statusbar.1
> +@man man/man1/profanity-strophe.1
>  @man man/man1/profanity-sub.1
>  @man man/man1/profanity-subject.1
>  @man man/man1/profanity-theme.1
> @@ -99,6 +100,7 @@ lib/libprofanity.la
>  @man man/man1/profanity-tls.1
>  @man man/man1/profanity-tray.1
>  @man man/man1/profanity-url.1
> +@man man/man1/profanity-vcard.1
>  @man man/man1/profanity-vercheck.1
>  @man man/man1/profanity-who.1
>  @man man/man1/profanity-win.1
>

Re: UPDATE: net/nextcloudclient-3.10.0

2023-09-23 Thread Rafael Sadowski 
On Tue Sep 19, 2023 at 08:08:25AM -0400, Adriano Barbosa wrote:
> Hi.
> Update for net/nextcloudclient v3.10.0
> Changelog:
> 3.10.0 https://github.com/nextcloud/desktop/releases/v3.10.0
> 3.9.4  https://github.com/nextcloud/desktop/releases/v3.9.4
> 
> Obrigado!

Committed, obrigado.

> --
> Adriano
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/nextcloudclient/Makefile,v
> retrieving revision 1.54
> diff -u -p -r1.54 Makefile
> --- Makefile  24 Aug 2023 06:16:21 -  1.54
> +++ Makefile  19 Sep 2023 12:03:39 -
> @@ -2,7 +2,7 @@ USE_WXNEEDED =Yes
>  
>  COMMENT =desktop sync client for Nextcloud
>  
> -V =  3.9.3
> +V =  3.10.0
>  DISTNAME =   nextcloudclient-${V}
>  
>  GH_ACCOUNT = nextcloud
> @@ -13,8 +13,8 @@ CATEGORIES =net
>  
>  HOMEPAGE =   https://nextcloud.com
>  
> -SHARED_LIBS +=  nextcloudsync 12.0 # 3.9.1
> -SHARED_LIBS +=  nextcloud_csync   6.0 # 3.9.1
> +SHARED_LIBS +=  nextcloudsync 13.0 # 3.10.0
> +SHARED_LIBS +=  nextcloud_csync   6.1 # 3.10.0
>  SHARED_LIBS +=  nextcloudsync_vfs_suffix  1.0 # 3.9.0
>  
>  MAINTAINER = Adriano Barbosa 
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/nextcloudclient/distinfo,v
> retrieving revision 1.43
> diff -u -p -r1.43 distinfo
> --- distinfo  24 Aug 2023 06:16:21 -  1.43
> +++ distinfo  19 Sep 2023 12:03:39 -
> @@ -1,2 +1,2 @@
> -SHA256 (nextcloudclient-3.9.3.tar.gz) = 
> QCdaKUC/vQDXS/7L3nua8gCZhQ3RZIB5L1NSr6f7U/o=
> -SIZE (nextcloudclient-3.9.3.tar.gz) = 15752014
> +SHA256 (nextcloudclient-3.10.0.tar.gz) = 
> CLoDQISahTcbEKT2kEmiXs8pBIUiGAuZqRSnCX7FA0k=
> +SIZE (nextcloudclient-3.10.0.tar.gz) = 13529232
>

Re: Remove Qt5Pdf support in x11/qt5/qtwebengine

2023-09-23 Thread Rafael Sadowski 
On Sat Sep 23, 2023 at 07:18:35PM +, Klemens Nanni wrote:
> On Sat, Sep 23, 2023 at 09:00:25PM +0200, Rafael Sadowski wrote:
> > I see no shortcut to fix "libQt5Pdf.so.1.0: undefined symbol
> > FPDF_InitLibrary". Yes, linking explicitly against libQt5WebEngineCore
> > could fix the issue but it's not so easy to fix it in qmake/re2 for me.
> > 
> > I would suggest to disable Qt5Pdf support for now. Nothing use it
> > directly, maybe via plugin.
> 
> grep shows x11/qt5/qt5.port.mk handling Qt5Pdf{,Widgets} for cmake setup;
> no mention in ports WANTLIB looks like, but I can't tell if that is enough.

I know about x11/qt5/qt5.port.mk, this has no effect (tm).

> 
> So would neochat need a rebuild or is this something decided at runtime?

Nothing needs to be rebuilt. I tested with neochat and konqueror.

> 
> > 
> > Objections?
> > 
> > 
> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/x11/qt5/qtwebengine/Makefile,v
> > retrieving revision 1.45
> > diff -u -p -u -p -r1.45 Makefile
> > --- Makefile16 Sep 2023 09:01:40 -  1.45
> > +++ Makefile23 Sep 2023 18:48:47 -
> > @@ -15,15 +15,18 @@ COMMENT =   Chromium-based web engine for
> >  # Many parts are copied from www/chromium port, so keep in sync
> >  DISTNAME = 
> > qtwebengine-everywhere-opensource-src-${QT5_WEBENGINE_VERSION}
> >  QT5NAME =  QtWebEngine
> > -REVISION = 4
> > +REVISION = 5
> >  
> >  CATEGORIES =   www
> >  
> >  SHARED_LIBS +=  Qt5WebEngine  2.0 # 5.15
> >  SHARED_LIBS +=  Qt5WebEngineCore  2.0 # 5.15
> >  SHARED_LIBS +=  Qt5WebEngineWidgets   2.0 # 5.15
> > -SHARED_LIBS +=  Qt5Pdf1.0 # 5.15
> > -SHARED_LIBS +=  Qt5PdfWidgets 1.0 # 5.15
> > +
> > +# XXX libQt5Pdf.so.1.0: undefined symbol FPDF_InitLibrary
> > +# libQt5Pdf needs to link explicitly against libQt5WebEngineCore?
> > +#SHARED_LIBS +=  Qt5Pdf1.0 # 5.15
> > +#SHARED_LIBS +=  Qt5PdfWidgets 1.0 # 5.15
> >  
> >  WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Designer Qt5Gui Qt5Network
> >  WANTLIB += Qt5Positioning Qt5PrintSupport Qt5Qml Qt5QmlModels
> > Index: patches/patch-src_buildtools_configure_json
> > ===
> > RCS file: 
> > /cvs/ports/x11/qt5/qtwebengine/patches/patch-src_buildtools_configure_json,v
> > retrieving revision 1.4
> > diff -u -p -u -p -r1.4 patch-src_buildtools_configure_json
> > --- patches/patch-src_buildtools_configure_json 11 Jul 2023 13:11:01 
> > -  1.4
> > +++ patches/patch-src_buildtools_configure_json 23 Sep 2023 18:48:47 
> > -
> > @@ -68,7 +68,7 @@ Index: src/buildtools/configure.json
> >  - && (!config.linux || features.pkg-config)
> >  - && (!config.linux || 
> > features.webengine-host-pkg-config)
> >  - && (!config.win32 || 
> > features.webengine-winversion)",
> > -+"condition": "(config.unix || config.win32 || config.macos || 
> > config.ios)",
> > ++"condition": "(config.win32 || config.macos || config.ios)",
> >   "output": [ "privateFeature" ]
> >   },
> >   "build-qtwebengine-core": {
> > Index: patches/patch-src_plugins_plugins_pro
> > ===
> > RCS file: patches/patch-src_plugins_plugins_pro
> > diff -N patches/patch-src_plugins_plugins_pro
> > --- /dev/null   1 Jan 1970 00:00:00 -
> > +++ patches/patch-src_plugins_plugins_pro   23 Sep 2023 18:48:47 -
> > @@ -0,0 +1,7 @@
> > +Index: src/plugins/plugins.pro
> > +--- src/plugins/plugins.pro.orig
> >  src/plugins/plugins.pro
> > +@@ -1,3 +1,2 @@
> > + TEMPLATE = subdirs
> > + qtHaveModule(webenginewidgets): qtHaveModule(designer): SUBDIRS += 
> > qwebengineview
> > +-qtHaveModule(pdf): qtConfig(imageformatplugin): SUBDIRS += imageformats
> > Index: pkg/PLIST
> > ===
> > RCS file: /cvs/ports/x11/qt5/qtwebengine/pkg/PLIST,v
> > retrieving revision 1.3
> > diff -u -p -u -p -r1.3 PLIST
> > --- pkg/PLIST   11 Mar 2022 20:17:10 -  1.3
> > +++ pkg/PLIST   23 Sep 2023 18:48:47 -
> > @@ -1,54 +1,4 @@
> > -include/X11/qt5/QtPdf/
> > -include/X11/qt5/QtPdf/${VERSION}/
> > -include/X11/qt5/QtPdf/${VERSION}/QtPdf/
> > -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/
> > -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdfdestination_p.h
> > -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdfdocument_p.h
> > -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdflinkmodel_p.h
> > -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdflinkmodel_p_p.h
> > -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdfsearchmodel_p.h
> > -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdfsearchresult_p.h
> > -include/X11/qt5/Qt

Re: Enable LTO for arm/aarch64 cross-compiler

2023-09-23 Thread Jonathan Gray 
On Sat, Sep 23, 2023 at 09:31:16PM +0200, Mark Kettenis wrote:
> Newer U-Boot versions have started to require LTO in order to save
> some space for certain targets.  I don't see a downside in enabling it
> as the cross compiler won't be used to build OpenBSD binaries.
> 
> ok?

if atf, m1n1, u-boot, newlib still build, sure
ok jsg@

> 
> 
> Index: devel/arm-none-eabi/gcc/Makefile
> ===
> RCS file: /cvs/ports/devel/arm-none-eabi/gcc/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- devel/arm-none-eabi/gcc/Makefile  21 Sep 2023 09:49:48 -  1.3
> +++ devel/arm-none-eabi/gcc/Makefile  23 Sep 2023 19:25:41 -
> @@ -3,7 +3,7 @@ COMMENT=  gcc for ${CONFIG} cross-develop
>  VERSION= 12.2.0
>  DISTNAME=gcc-${VERSION}
>  PKGNAME= ${CONFIG}-gcc-${VERSION}
> -REVISION=0
> +REVISION=1
>  
>  USE_NOEXECONLY=  Yes
>  
> @@ -55,7 +55,6 @@ CONFIGURE_ARGS+=--enable-languages=${LAN
>   --with-gmp=${LOCALBASE} \
>   --with-newlib   \
>   --disable-libcc1\
> - --disable-lto   \
>   --enable-cpp\
>   --without-isl   \
>   --without-zstd
> Index: devel/arm-none-eabi/gcc/pkg/PLIST
> ===
> RCS file: /cvs/ports/devel/arm-none-eabi/gcc/pkg/PLIST,v
> retrieving revision 1.1
> diff -u -p -r1.1 PLIST
> --- devel/arm-none-eabi/gcc/pkg/PLIST 22 Apr 2023 16:23:25 -  1.1
> +++ devel/arm-none-eabi/gcc/pkg/PLIST 23 Sep 2023 19:25:41 -
> @@ -11,6 +11,7 @@
>  @bin bin/${CONFIG}-gcov
>  @bin bin/${CONFIG}-gcov-dump
>  @bin bin/${CONFIG}-gcov-tool
> +@bin bin/${CONFIG}-lto-dump
>  libexec/gcc/
>  libexec/gcc/${CONFIG}/
>  libexec/gcc/${CONFIG}/${VERSION}/
> @@ -23,7 +24,10 @@ libexec/gcc/${CONFIG}/${VERSION}/install
>  @bin libexec/gcc/${CONFIG}/${VERSION}/install-tools/fixincl
>  libexec/gcc/${CONFIG}/${VERSION}/install-tools/mkheaders
>  libexec/gcc/${CONFIG}/${VERSION}/install-tools/mkinstalldirs
> +libexec/gcc/${CONFIG}/${VERSION}/liblto_plugin.la
> +@so libexec/gcc/${CONFIG}/${VERSION}/liblto_plugin.so
>  @bin libexec/gcc/${CONFIG}/${VERSION}/lto-wrapper
> +@bin libexec/gcc/${CONFIG}/${VERSION}/lto1
>  libexec/gcc/${CONFIG}/${VERSION}/plugin/
>  @bin libexec/gcc/${CONFIG}/${VERSION}/plugin/gengtype
>  @man man/man1/${CONFIG}-cpp.1
> @@ -35,3 +39,4 @@ libexec/gcc/${CONFIG}/${VERSION}/plugin/
>  @comment @man man/man7/fsf-funding.7
>  @comment @man man/man7/gfdl.7
>  @comment @man man/man7/gpl.7
> +@man man/man1/${CONFIG}-lto-dump.1
> 
>

[NEW] editors/hyx

2023-09-23 Thread Thim Cederlund 
Hi ports@,

Here's a port for this neat little hex editor with vim keybindings.

There is no man page for hyx unfortunately, but passing the `--help`
or `-h` flag tells you all about it.

The upstream makefile has no install target which is why I opted for
a do-install in the port.

% pkg_info hyx
Information for inst:hyx-2021.06.09

Comment:
minimal cli hex editor with Vim-like keybindings

Description:
minimalistic but powerful terminal hex editor with features such as:
insert/replace/delete, copy/paste, undo/redo, search, colors and
vim-inspired controls.

Maintainer: Thim Cederlund 

WWW: https://yx7.cc/code


Please let me know what you guys think. Thanks.

Best Regards,

Thim Cederlund


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

Re: BTI fix ruby 3.2.2

2023-09-23 Thread Jeremy Evans 
On 09/23 08:38, Mark Kettenis wrote: > The configure scripts adds
-mbranch-protection=pac-ret, which on > OpenBSD actually *downgrades* the
protection and makes things fail on > arm64 systems that implement BTI. >
> Use -mbranch-protection=standard instead. > > ok? OK jeremy@ > Index:
lang/ruby/3.2/Makefile >
=== > RCS
file: /cvs/ports/lang/ruby/3.2/Makefile,v > retrieving revision 1.5 >
diff -u -p -r1.5 Makefile > --- lang/ruby/3.2/Makefile 13 Jun 2023
05:00:23 - 1.5 > +++ lang/ruby/3.2/Makefile 23 Sep 2023 18:32:57
- > @@ -3,7 +3,7 @@ DISTNAME = ruby-${VERSION} > SHARED_LIBS = ruby32
0.0 > NEXTVER = 3.3 > PKGSPEC-main ?= ruby->=3.2.0,<${NEXTVER} >
-REVISION-main = 0 > +REVISION-main = 1 > > PSEUDO_FLAVORS= no_ri_docs
bootstrap > # Do not build the RI docs on slow arches > Index:
lang/ruby/3.2/patches/patch-configure >
=== > RCS
file: /cvs/ports/lang/ruby/3.2/patches/patch-configure,v > retrieving
revision 1.2 > diff -u -p -r1.2 patch-configure > ---
lang/ruby/3.2/patches/patch-configure 1 Apr 2023 19:28:26 - 1.2 > +++
lang/ruby/3.2/patches/patch-configure 23 Sep 2023 18:32:57 - > @@
-1,4 +1,5 @@ > Support arm64 coroutines. > +Don't downgrade arm64 branch
protection. > > Set correct shared library name. > > @@ -8,6 +9,15 @@ so
ports don't have to be bumped when Op > Index: configure > ---
configure.orig > +++ configure > +@@ -10897,7 +10897,7 @@ esac > + case
"$target_cpu" in #( > + aarch64) : > + > +- for opt in
-mbranch-protection=pac-ret -msign-return-address=all > ++ for opt in
-mbranch-protection=standard -msign-return-address=all > + do : > + > + >
@@ -29475,6 +29475,10 @@ esac > > coroutine_type=x86

Re: [update] net/transmission 4.0.4

2023-09-23 Thread Klemens Nanni 
On Sat, Sep 23, 2023 at 11:36:27AM -0400, Josh Grosse wrote:
> 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.

Thanks, after syncing PLIST.

Enable LTO for arm/aarch64 cross-compiler

2023-09-23 Thread Mark Kettenis 
Newer U-Boot versions have started to require LTO in order to save
some space for certain targets.  I don't see a downside in enabling it
as the cross compiler won't be used to build OpenBSD binaries.

ok?


Index: devel/arm-none-eabi/gcc/Makefile
===
RCS file: /cvs/ports/devel/arm-none-eabi/gcc/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/arm-none-eabi/gcc/Makefile21 Sep 2023 09:49:48 -  1.3
+++ devel/arm-none-eabi/gcc/Makefile23 Sep 2023 19:25:41 -
@@ -3,7 +3,7 @@ COMMENT=gcc for ${CONFIG} cross-develop
 VERSION=   12.2.0
 DISTNAME=  gcc-${VERSION}
 PKGNAME=   ${CONFIG}-gcc-${VERSION}
-REVISION=  0
+REVISION=  1
 
 USE_NOEXECONLY=Yes
 
@@ -55,7 +55,6 @@ CONFIGURE_ARGS+=--enable-languages=${LAN
--with-gmp=${LOCALBASE} \
--with-newlib   \
--disable-libcc1\
-   --disable-lto   \
--enable-cpp\
--without-isl   \
--without-zstd
Index: devel/arm-none-eabi/gcc/pkg/PLIST
===
RCS file: /cvs/ports/devel/arm-none-eabi/gcc/pkg/PLIST,v
retrieving revision 1.1
diff -u -p -r1.1 PLIST
--- devel/arm-none-eabi/gcc/pkg/PLIST   22 Apr 2023 16:23:25 -  1.1
+++ devel/arm-none-eabi/gcc/pkg/PLIST   23 Sep 2023 19:25:41 -
@@ -11,6 +11,7 @@
 @bin bin/${CONFIG}-gcov
 @bin bin/${CONFIG}-gcov-dump
 @bin bin/${CONFIG}-gcov-tool
+@bin bin/${CONFIG}-lto-dump
 libexec/gcc/
 libexec/gcc/${CONFIG}/
 libexec/gcc/${CONFIG}/${VERSION}/
@@ -23,7 +24,10 @@ libexec/gcc/${CONFIG}/${VERSION}/install
 @bin libexec/gcc/${CONFIG}/${VERSION}/install-tools/fixincl
 libexec/gcc/${CONFIG}/${VERSION}/install-tools/mkheaders
 libexec/gcc/${CONFIG}/${VERSION}/install-tools/mkinstalldirs
+libexec/gcc/${CONFIG}/${VERSION}/liblto_plugin.la
+@so libexec/gcc/${CONFIG}/${VERSION}/liblto_plugin.so
 @bin libexec/gcc/${CONFIG}/${VERSION}/lto-wrapper
+@bin libexec/gcc/${CONFIG}/${VERSION}/lto1
 libexec/gcc/${CONFIG}/${VERSION}/plugin/
 @bin libexec/gcc/${CONFIG}/${VERSION}/plugin/gengtype
 @man man/man1/${CONFIG}-cpp.1
@@ -35,3 +39,4 @@ libexec/gcc/${CONFIG}/${VERSION}/plugin/
 @comment @man man/man7/fsf-funding.7
 @comment @man man/man7/gfdl.7
 @comment @man man/man7/gpl.7
+@man man/man1/${CONFIG}-lto-dump.1

Re: UPDATE emulators/snes9x 1.62.3

2023-09-23 Thread Frederic Cambus 
Hi,

On Mon, Sep 18, 2023 at 07:37:14AM +, Lucas wrote:

> Here's an update for snes9x to latest version. Of potential interest,
> there is now a Vulkan renderer support. Full changelog at [0].
> 
> Port-wise, the build system changed CMake and dropped support for GTK+2
> by means of depending on x11/gtk3mm. A BDEP on graphics/spirv-cross, new
> port submitted by op@ [1], is added. I take maintainership of the port,
> too.

Committed, thanks!

Re: Remove Qt5Pdf support in x11/qt5/qtwebengine

2023-09-23 Thread Klemens Nanni 
On Sat, Sep 23, 2023 at 09:00:25PM +0200, Rafael Sadowski wrote:
> I see no shortcut to fix "libQt5Pdf.so.1.0: undefined symbol
> FPDF_InitLibrary". Yes, linking explicitly against libQt5WebEngineCore
> could fix the issue but it's not so easy to fix it in qmake/re2 for me.
> 
> I would suggest to disable Qt5Pdf support for now. Nothing use it
> directly, maybe via plugin.

grep shows x11/qt5/qt5.port.mk handling Qt5Pdf{,Widgets} for cmake setup;
no mention in ports WANTLIB looks like, but I can't tell if that is enough.

So would neochat need a rebuild or is this something decided at runtime?

> 
> Objections?
> 
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/x11/qt5/qtwebengine/Makefile,v
> retrieving revision 1.45
> diff -u -p -u -p -r1.45 Makefile
> --- Makefile  16 Sep 2023 09:01:40 -  1.45
> +++ Makefile  23 Sep 2023 18:48:47 -
> @@ -15,15 +15,18 @@ COMMENT = Chromium-based web engine for
>  # Many parts are copied from www/chromium port, so keep in sync
>  DISTNAME =   
> qtwebengine-everywhere-opensource-src-${QT5_WEBENGINE_VERSION}
>  QT5NAME =QtWebEngine
> -REVISION =   4
> +REVISION =   5
>  
>  CATEGORIES = www
>  
>  SHARED_LIBS +=  Qt5WebEngine  2.0 # 5.15
>  SHARED_LIBS +=  Qt5WebEngineCore  2.0 # 5.15
>  SHARED_LIBS +=  Qt5WebEngineWidgets   2.0 # 5.15
> -SHARED_LIBS +=  Qt5Pdf1.0 # 5.15
> -SHARED_LIBS +=  Qt5PdfWidgets 1.0 # 5.15
> +
> +# XXX libQt5Pdf.so.1.0: undefined symbol FPDF_InitLibrary
> +# libQt5Pdf needs to link explicitly against libQt5WebEngineCore?
> +#SHARED_LIBS +=  Qt5Pdf1.0 # 5.15
> +#SHARED_LIBS +=  Qt5PdfWidgets 1.0 # 5.15
>  
>  WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Designer Qt5Gui Qt5Network
>  WANTLIB += Qt5Positioning Qt5PrintSupport Qt5Qml Qt5QmlModels
> Index: patches/patch-src_buildtools_configure_json
> ===
> RCS file: 
> /cvs/ports/x11/qt5/qtwebengine/patches/patch-src_buildtools_configure_json,v
> retrieving revision 1.4
> diff -u -p -u -p -r1.4 patch-src_buildtools_configure_json
> --- patches/patch-src_buildtools_configure_json   11 Jul 2023 13:11:01 
> -  1.4
> +++ patches/patch-src_buildtools_configure_json   23 Sep 2023 18:48:47 
> -
> @@ -68,7 +68,7 @@ Index: src/buildtools/configure.json
>  - && (!config.linux || features.pkg-config)
>  - && (!config.linux || 
> features.webengine-host-pkg-config)
>  - && (!config.win32 || 
> features.webengine-winversion)",
> -+"condition": "(config.unix || config.win32 || config.macos || 
> config.ios)",
> ++"condition": "(config.win32 || config.macos || config.ios)",
>   "output": [ "privateFeature" ]
>   },
>   "build-qtwebengine-core": {
> Index: patches/patch-src_plugins_plugins_pro
> ===
> RCS file: patches/patch-src_plugins_plugins_pro
> diff -N patches/patch-src_plugins_plugins_pro
> --- /dev/null 1 Jan 1970 00:00:00 -
> +++ patches/patch-src_plugins_plugins_pro 23 Sep 2023 18:48:47 -
> @@ -0,0 +1,7 @@
> +Index: src/plugins/plugins.pro
> +--- src/plugins/plugins.pro.orig
>  src/plugins/plugins.pro
> +@@ -1,3 +1,2 @@
> + TEMPLATE = subdirs
> + qtHaveModule(webenginewidgets): qtHaveModule(designer): SUBDIRS += 
> qwebengineview
> +-qtHaveModule(pdf): qtConfig(imageformatplugin): SUBDIRS += imageformats
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/x11/qt5/qtwebengine/pkg/PLIST,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 PLIST
> --- pkg/PLIST 11 Mar 2022 20:17:10 -  1.3
> +++ pkg/PLIST 23 Sep 2023 18:48:47 -
> @@ -1,54 +1,4 @@
> -include/X11/qt5/QtPdf/
> -include/X11/qt5/QtPdf/${VERSION}/
> -include/X11/qt5/QtPdf/${VERSION}/QtPdf/
> -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/
> -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdfdestination_p.h
> -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdfdocument_p.h
> -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdflinkmodel_p.h
> -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdflinkmodel_p_p.h
> -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdfsearchmodel_p.h
> -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdfsearchresult_p.h
> -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdfselection_p.h
> -include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qtpdf-config_p.h
> -include/X11/qt5/QtPdf/QPdfBookmarkModel
> -include/X11/qt5/QtPdf/QPdfDestination
> -include/X11/qt5/QtPdf/QPdfDocument
> -include/X11/qt5/QtPdf/QPdfDocumentRenderOptions
> -include/X11/qt5/QtPdf/QPdfPageNavigation
> -include/X11/qt5/QtPdf/QPdfPageRenderer
> -include/X11/qt5/QtPdf/QPdfSearchModel
> -include/

Remove Qt5Pdf support in x11/qt5/qtwebengine

2023-09-23 Thread Rafael Sadowski 
I see no shortcut to fix "libQt5Pdf.so.1.0: undefined symbol
FPDF_InitLibrary". Yes, linking explicitly against libQt5WebEngineCore
could fix the issue but it's not so easy to fix it in qmake/re2 for me.

I would suggest to disable Qt5Pdf support for now. Nothing use it
directly, maybe via plugin.

Objections?


Index: Makefile
===
RCS file: /cvs/ports/x11/qt5/qtwebengine/Makefile,v
retrieving revision 1.45
diff -u -p -u -p -r1.45 Makefile
--- Makefile16 Sep 2023 09:01:40 -  1.45
+++ Makefile23 Sep 2023 18:48:47 -
@@ -15,15 +15,18 @@ COMMENT =   Chromium-based web engine for
 # Many parts are copied from www/chromium port, so keep in sync
 DISTNAME = 
qtwebengine-everywhere-opensource-src-${QT5_WEBENGINE_VERSION}
 QT5NAME =  QtWebEngine
-REVISION = 4
+REVISION = 5
 
 CATEGORIES =   www
 
 SHARED_LIBS +=  Qt5WebEngine  2.0 # 5.15
 SHARED_LIBS +=  Qt5WebEngineCore  2.0 # 5.15
 SHARED_LIBS +=  Qt5WebEngineWidgets   2.0 # 5.15
-SHARED_LIBS +=  Qt5Pdf1.0 # 5.15
-SHARED_LIBS +=  Qt5PdfWidgets 1.0 # 5.15
+
+# XXX libQt5Pdf.so.1.0: undefined symbol FPDF_InitLibrary
+# libQt5Pdf needs to link explicitly against libQt5WebEngineCore?
+#SHARED_LIBS +=  Qt5Pdf1.0 # 5.15
+#SHARED_LIBS +=  Qt5PdfWidgets 1.0 # 5.15
 
 WANTLIB += ${COMPILER_LIBCXX} GL Qt5Core Qt5Designer Qt5Gui Qt5Network
 WANTLIB += Qt5Positioning Qt5PrintSupport Qt5Qml Qt5QmlModels
Index: patches/patch-src_buildtools_configure_json
===
RCS file: 
/cvs/ports/x11/qt5/qtwebengine/patches/patch-src_buildtools_configure_json,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 patch-src_buildtools_configure_json
--- patches/patch-src_buildtools_configure_json 11 Jul 2023 13:11:01 -  
1.4
+++ patches/patch-src_buildtools_configure_json 23 Sep 2023 18:48:47 -
@@ -68,7 +68,7 @@ Index: src/buildtools/configure.json
 - && (!config.linux || features.pkg-config)
 - && (!config.linux || 
features.webengine-host-pkg-config)
 - && (!config.win32 || features.webengine-winversion)",
-+"condition": "(config.unix || config.win32 || config.macos || 
config.ios)",
++"condition": "(config.win32 || config.macos || config.ios)",
  "output": [ "privateFeature" ]
  },
  "build-qtwebengine-core": {
Index: patches/patch-src_plugins_plugins_pro
===
RCS file: patches/patch-src_plugins_plugins_pro
diff -N patches/patch-src_plugins_plugins_pro
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_plugins_plugins_pro   23 Sep 2023 18:48:47 -
@@ -0,0 +1,7 @@
+Index: src/plugins/plugins.pro
+--- src/plugins/plugins.pro.orig
 src/plugins/plugins.pro
+@@ -1,3 +1,2 @@
+ TEMPLATE = subdirs
+ qtHaveModule(webenginewidgets): qtHaveModule(designer): SUBDIRS += 
qwebengineview
+-qtHaveModule(pdf): qtConfig(imageformatplugin): SUBDIRS += imageformats
Index: pkg/PLIST
===
RCS file: /cvs/ports/x11/qt5/qtwebengine/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 PLIST
--- pkg/PLIST   11 Mar 2022 20:17:10 -  1.3
+++ pkg/PLIST   23 Sep 2023 18:48:47 -
@@ -1,54 +1,4 @@
-include/X11/qt5/QtPdf/
-include/X11/qt5/QtPdf/${VERSION}/
-include/X11/qt5/QtPdf/${VERSION}/QtPdf/
-include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/
-include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdfdestination_p.h
-include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdfdocument_p.h
-include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdflinkmodel_p.h
-include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdflinkmodel_p_p.h
-include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdfsearchmodel_p.h
-include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdfsearchresult_p.h
-include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qpdfselection_p.h
-include/X11/qt5/QtPdf/${VERSION}/QtPdf/private/qtpdf-config_p.h
-include/X11/qt5/QtPdf/QPdfBookmarkModel
-include/X11/qt5/QtPdf/QPdfDestination
-include/X11/qt5/QtPdf/QPdfDocument
-include/X11/qt5/QtPdf/QPdfDocumentRenderOptions
-include/X11/qt5/QtPdf/QPdfPageNavigation
-include/X11/qt5/QtPdf/QPdfPageRenderer
-include/X11/qt5/QtPdf/QPdfSearchModel
-include/X11/qt5/QtPdf/QPdfSearchResult
-include/X11/qt5/QtPdf/QPdfSelection
-include/X11/qt5/QtPdf/QtPdf
-include/X11/qt5/QtPdf/QtPdfDepends
-include/X11/qt5/QtPdf/QtPdfVersion
-include/X11/qt5/QtPdf/qpdfbookmarkmodel.h
-include/X11/qt5/QtPdf/qpdfdestination.h
-include/X11/qt5/QtPdf/qpdfdocument.h
-include/X11/qt5/QtPdf/qpdfdocumentrenderoptions.h
-include/X11/qt5/QtPdf/qpdfnamespace.h
-include/X11/qt5/QtPdf/qpdfpagenavigation.h
-include/X11/qt5/QtPdf/qpdfpagerenderer.h
-include/X11/qt5/QtPdf/q

BTI fix ruby 3.2.2

2023-09-23 Thread Mark Kettenis 
The configure scripts adds -mbranch-protection=pac-ret, which on
OpenBSD actually *downgrades* the protection and makes things fail on
arm64 systems that implement BTI.

Use -mbranch-protection=standard instead.

ok?


Index: lang/ruby/3.2/Makefile
===
RCS file: /cvs/ports/lang/ruby/3.2/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- lang/ruby/3.2/Makefile  13 Jun 2023 05:00:23 -  1.5
+++ lang/ruby/3.2/Makefile  23 Sep 2023 18:32:57 -
@@ -3,7 +3,7 @@ DISTNAME =  ruby-${VERSION}
 SHARED_LIBS =  ruby32  0.0
 NEXTVER =  3.3
 PKGSPEC-main ?= ruby->=3.2.0,<${NEXTVER}
-REVISION-main =0
+REVISION-main =1
 
 PSEUDO_FLAVORS=no_ri_docs bootstrap
 # Do not build the RI docs on slow arches
Index: lang/ruby/3.2/patches/patch-configure
===
RCS file: /cvs/ports/lang/ruby/3.2/patches/patch-configure,v
retrieving revision 1.2
diff -u -p -r1.2 patch-configure
--- lang/ruby/3.2/patches/patch-configure   1 Apr 2023 19:28:26 -   
1.2
+++ lang/ruby/3.2/patches/patch-configure   23 Sep 2023 18:32:57 -
@@ -1,4 +1,5 @@
 Support arm64 coroutines.
+Don't downgrade arm64 branch protection.
 
 Set correct shared library name.
 
@@ -8,6 +9,15 @@ so ports don't have to be bumped when Op
 Index: configure
 --- configure.orig
 +++ configure
+@@ -10897,7 +10897,7 @@ esac
+ case "$target_cpu" in #(
+   aarch64) :
+ 
+-  for opt in -mbranch-protection=pac-ret -msign-return-address=all
++  for opt in -mbranch-protection=standard -msign-return-address=all
+ do :
+ 
+ 
 @@ -29475,6 +29475,10 @@ esac
  
  coroutine_type=x86

HEADS-UP: MASTER_SITES0...9 going away

2023-09-23 Thread Marc Espie 
I'm currently running a patch that converts the last few ports with
MASTER_SITES0...9 to the new style of SITES.sufx.

Accordingly, once the bulk finishes (succesfully)
I will also remove the support in bsd.port.mk.

In the meantime, if you commit stuff that reintroduces
MASTER_SITES0..9, well, it will break.

Re: godot - diff to build with C#/mono support

2023-09-23 Thread Thomas Frohwein 
Hi,

Took some time to overhaul this and I have a middle-ground proposition:
Build on all arches, not just MONO_ARCHS, but only on MONO_ARCHS build
with mono bits and only there install the -sharp subpackage.

Tested the build and packaging for both scenarios on my amd64 (by
tweaking the IS_MONO_ARCH test if you want to know).

This seems to be a bit unconventional use of bsd.port.arch.mk, let me
know if I'm overlooking something.

Smaller adjustments with comments inline and then the updated diff...

On Sat, Sep 02, 2023 at 07:04:29PM +0200, Omar Polo wrote:

[...]

> Would be too hard to turn this into a flavor?  Then in the future we
> might eventually also move -tools to a flavor, and build a set of
> packages:
> 
>   godot   (this would be the current -main)
>   godot-tools (this would be the current -tools)
>   godot-mono
>   godot-mono-tools
> 
> just an idea.  I'm fine with your current diff as is if it simplify
> future work, we can iterate in-tree :)

Now the packages would look like this:

MONO_ARCHS:
godot
godot-tools
godot-sharp

!MONO_ARCHS:
godot
godot-tools

> >  post-extract:
> > +   @# install backends from FILESDIR
> 
> first time i'm seeing @ added in front of a comment ^^"
> 
> I know (at least) Emacs syntax highlighting complains, but just
> # ... should be enough.

I removed the @ in my updated diff; wouldn't want to get emacs angry...
The reason for the @ was that the comment is only there to make it
easier for anyone working with the Makefile to understand the steps.

> > +-file_found = find_file_in_dir(hint_dir, mono_lib_names, 
> > prefixes=["lib"], extensions=[sharedlib_ext])
> > ++file_found = find_file_in_dir(hint_dir, mono_lib_names, 
> > prefixes=["lib"], extensions=[sharedlib_ext], suffix=[".1.0"])
> 
> hardcoding the shlib version like this is ugly :(
> 
> I don't have a better suggestion though.  We could at least avoid the
> hardcoding by using a glob(3) and picking the highest numbered one.
> Still ugly, but at least without the hardcoding.

The diff includes a mechanism with make(1) != to achieve this now (see
MONOSGEN_V).

> > +   String data_mono_root_dir = data_dir_root.plus_file("Mono");
> > +   data_mono_etc_dir = data_mono_root_dir.plus_file("etc");
> > ++  */
> 
> using #if 0 may be more robust if in an update upstreams adds a
> /*comment*/ inbetween.

Makes sense, I added this to the diff.

Index: Makefile
===
RCS file: /cvs/ports/games/godot/Makefile,v
retrieving revision 1.49
diff -u -p -r1.49 Makefile
--- Makefile14 Aug 2023 12:40:50 -  1.49
+++ Makefile23 Sep 2023 17:30:44 -
@@ -2,12 +2,12 @@ BROKEN-powerpc =  fails at runtime, the U
 
 COMMENT-main = 2D and 3D game engine
 COMMENT-tools= 2D and 3D game engine (with tools)
+COMMENT-sharp =glue for mono/C# module of Godot
 
 V =3.5.2
-GODOTSTEAM_V = v3.20
 DISTNAME = godot-${V}-stable
 PKGNAME =  godot-${V}
-REVISION = 5
+REVISION = 6
 
 CATEGORIES =   games
 
@@ -18,7 +18,7 @@ MAINTAINER =  Omar Polo 
 # MIT
 PERMIT_PACKAGE =   Yes
 
-MULTI_PACKAGES =   -main -tools
+MULTI_PACKAGES =   -main -tools -sharp
 
 WANTLIB += ${COMPILER_LIBCXX} BulletCollision BulletDynamics BulletSoftBody
 WANTLIB += GL LinearMath X11 X11-xcb Xau Xcursor Xdmcp Xext Xfixes
@@ -35,16 +35,18 @@ WANTLIB-tools = ${WANTLIB}
 COMPILER = base-clang ports-gcc
 
 MASTER_SITES = https://downloads.tuxfamily.org/godotengine/${V}/
-MASTER_SITES0 =
https://github.com/CoaguCo-Industries/GodotSteam/archive/refs/tags/
-DISTFILES = ${DISTNAME}${EXTRACT_SUFX} \
-   ${GODOTSTEAM_V}.tar.gz:0
+DISTFILES = ${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_SUFX = .tar.xz
+
+SITES.sharp =  https://thfr.info/distfiles/
+DISTFILES.sharp =  godot-${V}-mono-glue.tar.gz 
godot-${V}-nuget-packages.tar.xz
+
+DIST_TUPLE +=  github CoaguCo-Industries GodotSteam v3.20 godotsteam # MIT
+
 DIST_SUBDIR =   ${PKGNAME}
 
 MODULES =  devel/scons
 
-# Building with module_mono_enabled requires msbuild and to fix the
-# sharedlib_ext in modules/mono/config.py to '.so.1.0'
 MODSCONS_FLAGS =   CC="${CC}" \
CXX="${CXX}" \
CFLAGS="${CFLAGS}" \
@@ -93,15 +95,57 @@ LIB_DEPENDS =   archivers/zstd \
multimedia/libvpx \
net/enet \
security/polarssl
-
 RUN_DEPENDS-tools =devel/desktop-file-utils
 
-DEBUG_PACKAGES =   ${BUILD_PACKAGES}
-NO_TEST =  Yes
-
 DPB_PROPERTIES =   parallel
 
 .include 
+
+IS_MONO_ARCH=
+.for _arch in ${MONO_ARCHS}
+.  if ${MACHINE_ARCH} == ${_arch}
+IS_MONO_ARCH = 1
+.  endif
+.endfor
+
+.if !empty(IS_MONO_ARCH)
+USE_WXNEEDED = Yes
+USE_NOBTCFI =  Yes
+MONOSGEN !=/bin/ls -1

Re: [update] net/transmission 4.0.4

2023-09-23 Thread 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
> - }

[Proposal] security/vault without devel/yarn

2023-09-23 Thread Volker Schlecht 
Changes documentation how to rebuild security vault's UI without having
devel/yarn installed or having any version of devel/yarn installed globally.

With lang/node in ports, the bundled version of yarn works out of the box.
Index: Makefile
===
RCS file: /cvs/ports/security/vault/Makefile,v
retrieving revision 1.87
diff -u -p -r1.87 Makefile
--- Makefile	14 Sep 2023 06:15:36 -	1.87
+++ Makefile	23 Sep 2023 13:42:14 -
@@ -6,7 +6,7 @@ VERSION=		1.14.3
 # vault-vendored distfile generated by fetching archive from
 # https://github.com/hashicorp/vault/archive/v$VERSION/vault-$VERSION.tar.gz
 # and running "go mod tidy" + "go mod vendor"
-# UI prebuilt with: cd ui; yarn install; npm rebuild node-sass; yarn run build
+# UI prebuilt with: cd ui; corepack yarn; npm rebuild node-sass; corepack yarn run build
 DISTNAME=		vault-vendored-${VERSION}
 PKGNAME=		vault-${VERSION}

Re: [Maintainer Update] lang/node v18.18.0

2023-09-23 Thread Volker Schlecht 
Update to the original patch including a fix for ppc64 from gkoehler@

ok?

On Wed Sep 20, 2023 at 12:14 AM CEST, Volker Schlecht wrote:
> * Updates lang/node to the latest revision of the LTS release branch.
> * Use SITES
>
> Node dropped the node-gyp binary in this release, which has been deprecated 
> for
> a while. As far as I can tell, the only port that's actually building a node
> extension is lang/node itself, so this shouldn't cause any fallout.
>
> www/mozilla-firefox, devel/swig and devel/yarn still build and run. I gave up 
> on
> www/chromium half-way through the build, but honestly see no reason why it 
> should
> break either.
>
> Built and tested on amd64 and arm64.
>
> ok?

Index: Makefile
===
RCS file: /cvs/ports/lang/node/Makefile,v
retrieving revision 1.126
diff -u -p -r1.126 Makefile
--- Makefile	15 Aug 2023 13:46:30 -	1.126
+++ Makefile	23 Sep 2023 12:49:30 -
@@ -5,17 +5,17 @@ USE_WXNEEDED =		Yes
 
 COMMENT = JavaScript runtime built on Chrome's V8 JavaScript engine
 
-NODE_VERSION =		v18.17.1
+NODE_VERSION =		v18.18.0
 PLEDGE_VER =		1.1.3
-DISTFILES =		node-pledge-{}${PLEDGE_VER}.tar.gz:0 \
-			${DISTNAME}-headers.tar.gz \
+DISTFILES =		${DISTNAME}-headers.tar.gz \
 			${DISTNAME}.tar.xz
+DISTFILES.pledge =	node-pledge-{}${PLEDGE_VER}.tar.gz
 
 DISTNAME =		node-${NODE_VERSION}
 PKGNAME =		${DISTNAME:S/v//g}
 EPOCH =			0
 
-MASTER_SITES0 =		https://github.com/qbit/node-pledge/archive/
+SITES.pledge =		https://github.com/qbit/node-pledge/archive/
 
 CATEGORIES =		lang devel
 
@@ -98,8 +98,6 @@ post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/node
 	${INSTALL_DATA} ${FULLDISTDIR}/${DISTNAME}-headers.tar.gz \
 		${PREFIX}/share/node/${DISTNAME}-headers.tar.gz
-	ln -fs ${TRUEPREFIX}/lib/node_modules/npm/bin/node-gyp-bin/node-gyp \
-		${PREFIX}/bin/node-gyp;
 	rm -r ${PREFIX}/lib/node_modules/npm/node_modules/node-pledge/build/node_gyp_bins
 	cd ${PREFIX}/lib/node_modules/npm/node_modules && for x in *; do \
 		mv $$x ../..; \
Index: distinfo
===
RCS file: /cvs/ports/lang/node/distinfo,v
retrieving revision 1.71
diff -u -p -r1.71 distinfo
--- distinfo	15 Aug 2023 13:46:31 -	1.71
+++ distinfo	23 Sep 2023 12:49:30 -
@@ -1,6 +1,6 @@
 SHA256 (node-pledge-1.1.3.tar.gz) = fEaXvLg6hYEJ69K+mgQFizf8DiJY2/DtyFJB/pEanVU=
-SHA256 (node-v18.17.1-headers.tar.gz) = BO5D9bJyADec9TH5VNTeKJtIcMNhYcSNQn+nQb4+Z/s=
-SHA256 (node-v18.17.1.tar.xz) = 8hXPA9DwDwesC2dMaBn4BMFULhbxUtoEmAAirsz15lo=
+SHA256 (node-v18.18.0-headers.tar.gz) = 3NwDNUJuPiT44f9p1t3SFyw+Q5bobb9LeiyXPXLeR4U=
+SHA256 (node-v18.18.0.tar.xz) = 5NTbrDY02Z+JLwDbR9p4+YSTwzlYLoqV+y3Vn1z+D5A=
 SIZE (node-pledge-1.1.3.tar.gz) = 3167
-SIZE (node-v18.17.1-headers.tar.gz) = 8576937
-SIZE (node-v18.17.1.tar.xz) = 40788836
+SIZE (node-v18.18.0-headers.tar.gz) = 8712286
+SIZE (node-v18.18.0.tar.xz) = 40813264
Index: patches/patch-Makefile
===
RCS file: /cvs/ports/lang/node/patches/patch-Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 patch-Makefile
--- patches/patch-Makefile	4 May 2023 12:25:23 -	1.18
+++ patches/patch-Makefile	23 Sep 2023 12:49:30 -
@@ -16,7 +16,7 @@ Index: Makefile
  build-addons: | $(NODE_EXE) test/addons/.buildstamp
 +
 +build-pledge: $(NODE_EXE)
-+	$(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp rebuild \
++	$(NODE) deps/npm/node_modules/node-gyp/bin/node-gyp.js rebuild \
 +		--directory="deps/npm/node_modules/node-pledge" \
 +		--nodedir="$(shell pwd)" && \
 +	$(RM) -rf deps/npm/node_modules/node-pledge/build/Release/{.deps,../Makefile,obj.target}
Index: patches/patch-common_gypi
===
RCS file: /cvs/ports/lang/node/patches/patch-common_gypi,v
retrieving revision 1.29
diff -u -p -r1.29 patch-common_gypi
--- patches/patch-common_gypi	7 Jul 2023 10:44:15 -	1.29
+++ patches/patch-common_gypi	23 Sep 2023 12:49:30 -
@@ -18,14 +18,23 @@ Index: common.gypi
 +, '-Wl,-rpath,${EOPENSSL_LIB}'
 +],
}],
- ],
- 'conditions': [
+   ['_toolset=="host"', {
+ 'conditions': [
 @@ -426,7 +427,7 @@
- 'ldflags': [ '-m32' ],
-   }],
-   [ 'target_arch=="ppc64" and OS not in "aix os400"', {
--'cflags': [ '-m64', '-mminimal-toc' ],
-+'cflags': [ '-m64' ],
- 'ldflags': [ '-m64' ],
-   }],
-   [ 'target_arch=="s390x" and OS=="linux"', {
+ 'ldflags': [ '-m32' ],
+   }],
+   [ 'host_arch=="ppc64" and OS not in "aix os400"', {
+-'cflags': [ '-m64', '-mminimal-toc' ],
++'cflags': [ '-m64' ],
+ 'ldflags': [ '-m64' ],
+   }],
+   [ 'host_arch=="s390x" and OS=="linux"', {
+@@ -450,7 +451,7 @@
+ '

Re: [Fix] editors/helix

2023-09-23 Thread Volker Schlecht 
Ping, hoping MAINTAINER's mail doesn't bounce anymore.
As it stands editors/helix in ports is unusable.

On Sat Sep 16, 2023 at 6:54 AM CEST, Sebastien Marie wrote:
> Hi,
>
> It looks good to me.
>
> Maybe use the link to the exact commit in helix (instead of the commit as 
> proposed)
> https://github.com/helix-editor/helix/commit/de0ef8af15945fb7f761503c615a2d6213d2fd82
>
> ok semarie@ (but let's Maintainer time to reply too).
>
> Thanks.

UPDATE: neovim-0.9.2

2023-09-23 Thread Edd Barrett 
Hi,

Relatively simple update to neovim.

Only lightly tested. Please try it out.

OK?


Index: Makefile
===
RCS file: /cvs/ports/editors/neovim/Makefile,v
retrieving revision 1.38
diff -u -p -r1.38 Makefile
--- Makefile21 Sep 2023 12:22:34 -  1.38
+++ Makefile23 Sep 2023 11:00:20 -
@@ -13,8 +13,7 @@ COMMENT = continuation and extension of 
 
 GH_ACCOUNT =   neovim
 GH_PROJECT =   neovim
-GH_TAGNAME =   v0.9.1
-REVISION = 0
+GH_TAGNAME =   v0.9.2
 
 # embedded luajit
 USE_NOBTCFI =  Yes
@@ -24,8 +23,8 @@ HOMEPAGE =https://neovim.io
 MAINTAINER =   Edd Barrett 
 
 # The versions listed here must match those in cmake.deps/CMakeLists.txt.
-LUV_VER =  093a977b82077591baefe1e880d37dfa2730bd54
-LUAJIT_VER =   505e2c03de35e2718eef0d2d3660712e06dadf1f
+LUV_VER =  1.45.0-0
+LUAJIT_VER =   03c31124cc3b521ef54fe398e10fa55660a5057d
 LUACOMPAT_VER =v0.9
 
 SITES.a =  https://github.com/luvit/luv/archive/
@@ -85,7 +84,7 @@ CONFIGURE_ARGS += -DUSE_BUNDLED=OFF \
-DLIBLUV_INCLUDE_DIR=${STATIC_DEPS_INST}/include \
-DLIBLUV_LIBRARY=${STATIC_DEPS_INST}/lib/libluv.a
 .if ${EMBED_LUAJIT} == "Yes"
-CONFIGURE_ARGS +=  -DLUA_PRG=${STATIC_DEPS_INST}/bin/luajit-2.1.0-beta3 \
+CONFIGURE_ARGS +=  -DLUA_PRG=${STATIC_DEPS_INST}/bin/luajit \

-DLUAJIT_INCLUDE_DIR=${STATIC_DEPS_INST}/include/luajit-2.1 \
-DLUAJIT_LIBRARY=${STATIC_DEPS_INST}/lib/libluajit-5.1.a
 .else
Index: distinfo
===
RCS file: /cvs/ports/editors/neovim/distinfo,v
retrieving revision 1.20
diff -u -p -r1.20 distinfo
--- distinfo5 Jun 2023 13:22:15 -   1.20
+++ distinfo23 Sep 2023 11:00:20 -
@@ -1,8 +1,8 @@
 SHA256 (lua-compat-5.3-v0.9.tar.gz) = 
rQVUDS2WpIclu3mh3vNc9mUqTi7CY3biYXyM4rqm9BY=
-SHA256 (luajit-505e2c03de35e2718eef0d2d3660712e06dadf1f.tar.gz) = 
Z8iDmbkBoi6aI29Ld+b+Oa8A9rcUTOndb1EUHZIfEHY=
-SHA256 (luv-093a977b82077591baefe1e880d37dfa2730bd54.tar.gz) = 
Iis4tkJfCSYhjhTn2oFIH93m+WYMH+rCWlPm+1LohuY=
-SHA256 (neovim-0.9.1.tar.gz) = jbF8Kh9HdtzaAOWUieoNmLqC99Go6gMoHWQOWNijoA4=
+SHA256 (luajit-03c31124cc3b521ef54fe398e10fa55660a5057d.tar.gz) = 
YdzHrj9UOuPMMOZtsGDjHip35L407mXjcMlT0RK01gw=
+SHA256 (luv-1.45.0-0.tar.gz) = l+iZQPnuqo37NPHBn4DdNzKZxCcZ0VIo7HkPQV1OSWU=
+SHA256 (neovim-0.9.2.tar.gz) = BrhRi61CN6KKZ6T7wW7DJYHzXyFrJ/TJg0es7n9fs2k=
 SIZE (lua-compat-5.3-v0.9.tar.gz) = 53599
-SIZE (luajit-505e2c03de35e2718eef0d2d3660712e06dadf1f.tar.gz) = 1075264
-SIZE (luv-093a977b82077591baefe1e880d37dfa2730bd54.tar.gz) = 127241
-SIZE (neovim-0.9.1.tar.gz) = 11567358
+SIZE (luajit-03c31124cc3b521ef54fe398e10fa55660a5057d.tar.gz) = 1073919
+SIZE (luv-1.45.0-0.tar.gz) = 130334
+SIZE (neovim-0.9.2.tar.gz) = 11580390
Index: patches/patch-static-deps_luajit_src_host_buildvm_asm_c
===
RCS file: 
/cvs/ports/editors/neovim/patches/patch-static-deps_luajit_src_host_buildvm_asm_c,v
retrieving revision 1.2
diff -u -p -r1.2 patch-static-deps_luajit_src_host_buildvm_asm_c
--- patches/patch-static-deps_luajit_src_host_buildvm_asm_c 11 Mar 2022 
18:58:33 -  1.2
+++ patches/patch-static-deps_luajit_src_host_buildvm_asm_c 23 Sep 2023 
11:00:20 -
@@ -3,7 +3,7 @@
 Index: static-deps/luajit/src/host/buildvm_asm.c
 --- static-deps/luajit/src/host/buildvm_asm.c.orig
 +++ static-deps/luajit/src/host/buildvm_asm.c
-@@ -327,7 +327,7 @@ void emit_asm(BuildCtx *ctx)
+@@ -330,7 +330,7 @@ void emit_asm(BuildCtx *ctx)
  #if !(LJ_TARGET_PS3 || LJ_TARGET_PSVITA)
  fprintf(ctx->fp, "\t.section .note.GNU-stack,\"\"," ELFASM_PX 
"progbits\n");
  #endif
Index: patches/patch-static-deps_luajit_src_lj_arch_h
===
RCS file: 
/cvs/ports/editors/neovim/patches/patch-static-deps_luajit_src_lj_arch_h,v
retrieving revision 1.3
diff -u -p -r1.3 patch-static-deps_luajit_src_lj_arch_h
--- patches/patch-static-deps_luajit_src_lj_arch_h  4 Jul 2022 14:49:03 
-   1.3
+++ patches/patch-static-deps_luajit_src_lj_arch_h  23 Sep 2023 11:00:20 
-
@@ -5,7 +5,7 @@ ignore the gcc version check ifdef hell 
 Index: static-deps/luajit/src/lj_arch.h
 --- static-deps/luajit/src/lj_arch.h.orig
 +++ static-deps/luajit/src/lj_arch.h
-@@ -432,7 +432,7 @@
+@@ -445,7 +445,7 @@
  /* -- Checks for requirements - */
  
  /* Check for minimum required compiler versions. */

-- 
Best Regards
Edd Barrett

https://www.theunixzoo.co.uk