UPDATE: R-4.2.3

2023-08-28 Thread Rafael Sadowski
Simple update R to 4.2.3. Lightly tested on amd64. OK?

Cheers Rafael

Index: Makefile
===
RCS file: /cvs/ports/math/R/Makefile,v
retrieving revision 1.127
diff -u -p -u -p -r1.127 Makefile
--- Makefile3 Aug 2022 15:13:25 -   1.127
+++ Makefile29 Aug 2023 05:54:53 -
@@ -1,9 +1,9 @@
 COMMENT=   powerful math/statistics/graphics language
-DISTNAME=  R-4.2.1
+DISTNAME=  R-4.2.3
 
 # When bumping SO_VERSION, adjust
 # math/rstudio/patches/patch-src_cpp_core_r_util_REnvironmentPosix_cpp
-SO_VERSION=39.0
+SO_VERSION=39.1
 .for _lib in R Rblas Rlapack
 SHARED_LIBS += ${_lib} ${SO_VERSION}
 .endfor
@@ -17,9 +17,10 @@ MAINTAINER=  Ingo Feinerer  7



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2023/08/28 23:54:23

Modified files:
audio/taglib   : Makefile distinfo 

Log message:
Update taglib to 1.13.1

OK aja, tested with easytag and ok sdk@



Re: UPDATE: taglib-1.13.1

2023-08-28 Thread Stefan Hagen
Rafael Sadowski wrote (2023-08-28 22:14 CEST):
> Simple update taglib-1.13.1. Tested on amd64. OK?

I did a runtime check with easytag.
All tests pass on taglib and easytag.

OK sdk@

- Stefan


> Cheers Rafael
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/taglib/Makefile,v
> retrieving revision 1.51
> diff -u -p -u -p -r1.51 Makefile
> --- Makefile  20 Feb 2023 16:35:18 -  1.51
> +++ Makefile  28 Aug 2023 20:11:12 -
> @@ -1,6 +1,5 @@
>  COMMENT= managing meta-data of audio formats
> -DISTNAME=taglib-1.13
> -REVISION=0
> +DISTNAME=taglib-1.13.1
>  
>  CATEGORIES=  audio devel
>  
> Index: distinfo
> ===
> RCS file: /cvs/ports/audio/taglib/distinfo,v
> retrieving revision 1.15
> diff -u -p -u -p -r1.15 distinfo
> --- distinfo  11 Dec 2022 11:21:20 -  1.15
> +++ distinfo  28 Aug 2023 20:11:12 -
> @@ -1,2 +1,2 @@
> -SHA256 (taglib-1.13.tar.gz) = WPCLTbPcMe0VLASJbukXLSIFK8fvEoiAKMAdix1greA=
> -SIZE (taglib-1.13.tar.gz) = 1371504
> +SHA256 (taglib-1.13.1.tar.gz) = yNorEPG/7CzX2/zTP0ojONsHZdhRpQWD1BC6zwVc/Qs=
> +SIZE (taglib-1.13.1.tar.gz) = 1372618
> 



Re: UPDATE: taglib-1.13.1

2023-08-28 Thread Antoine Jacoutot
OK. 

—
Antoine

> On 29 Aug 2023, at 07:05, Rafael Sadowski  wrote:
> 
> Simple update taglib-1.13.1. Tested on amd64. OK?
> 
> Cheers Rafael
> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/audio/taglib/Makefile,v
> retrieving revision 1.51
> diff -u -p -u -p -r1.51 Makefile
> --- Makefile20 Feb 2023 16:35:18 -1.51
> +++ Makefile28 Aug 2023 20:11:12 -
> @@ -1,6 +1,5 @@
> COMMENT=managing meta-data of audio formats
> -DISTNAME=taglib-1.13
> -REVISION=0
> +DISTNAME=taglib-1.13.1
> 
> CATEGORIES=audio devel
> 
> Index: distinfo
> ===
> RCS file: /cvs/ports/audio/taglib/distinfo,v
> retrieving revision 1.15
> diff -u -p -u -p -r1.15 distinfo
> --- distinfo11 Dec 2022 11:21:20 -1.15
> +++ distinfo28 Aug 2023 20:11:12 -
> @@ -1,2 +1,2 @@
> -SHA256 (taglib-1.13.tar.gz) = WPCLTbPcMe0VLASJbukXLSIFK8fvEoiAKMAdix1greA=
> -SIZE (taglib-1.13.tar.gz) = 1371504
> +SHA256 (taglib-1.13.1.tar.gz) = yNorEPG/7CzX2/zTP0ojONsHZdhRpQWD1BC6zwVc/Qs=
> +SIZE (taglib-1.13.1.tar.gz) = 1372618
> 



UPDATE: redis-7.2.0

2023-08-28 Thread Rafael Sadowski
Simple update redis to 7.2.0. Lightly tested on amd64.
I think this needs more tests from redis users!

Cheers Rafael

Index: Makefile
===
RCS file: /cvs/ports/databases/redis/Makefile,v
retrieving revision 1.134
diff -u -p -u -p -r1.134 Makefile
--- Makefile11 Jul 2023 01:40:18 -  1.134
+++ Makefile29 Aug 2023 05:20:23 -
@@ -1,6 +1,6 @@
 COMMENT =  persistent key-value database
 
-DISTNAME = redis-6.2.13
+DISTNAME = redis-7.2.0
 CATEGORIES =   databases
 HOMEPAGE = https://redis.io/
 
Index: distinfo
===
RCS file: /cvs/ports/databases/redis/distinfo,v
retrieving revision 1.105
diff -u -p -u -p -r1.105 distinfo
--- distinfo11 Jul 2023 01:40:18 -  1.105
+++ distinfo29 Aug 2023 05:20:23 -
@@ -1,2 +1,2 @@
-SHA256 (redis-6.2.13.tar.gz) = if8nyA1CBFanIcz7O+t8xijYg8UwWYA1E3SeEyFKI9E=
-SIZE (redis-6.2.13.tar.gz) = 2496004
+SHA256 (redis-7.2.0.tar.gz) = ixLiQmR2NbQZoOGDPtoCtlv2TjnrnlCdnbSIj7MSSUM=
+SIZE (redis-7.2.0.tar.gz) = 3381269
Index: patches/patch-deps_Makefile
===
RCS file: /cvs/ports/databases/redis/patches/patch-deps_Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 patch-deps_Makefile
--- patches/patch-deps_Makefile 11 Jul 2023 01:40:18 -  1.16
+++ patches/patch-deps_Makefile 29 Aug 2023 05:20:23 -
@@ -1,7 +1,7 @@
 Index: deps/Makefile
 --- deps/Makefile.orig
 +++ deps/Makefile
-@@ -49,19 +49,16 @@ ifeq ($(BUILD_TLS),yes)
+@@ -51,19 +51,16 @@ ifneq (,$(filter $(BUILD_TLS),yes module))
  endif
  
  hiredis: .make-prerequisites
@@ -21,7 +21,7 @@ Index: deps/Makefile
cd hdr_histogram && $(MAKE)
  
  .PHONY: hdr_histogram
-@@ -85,7 +82,6 @@ AR=ar
+@@ -98,7 +95,6 @@ AR=ar
  ARFLAGS=rc
  
  lua: .make-prerequisites
Index: patches/patch-deps_hiredis_Makefile
===
RCS file: /cvs/ports/databases/redis/patches/patch-deps_hiredis_Makefile,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 patch-deps_hiredis_Makefile
--- patches/patch-deps_hiredis_Makefile 11 Mar 2022 18:31:43 -  1.12
+++ patches/patch-deps_hiredis_Makefile 29 Aug 2023 05:20:23 -
@@ -1,21 +1,12 @@
 Index: deps/hiredis/Makefile
 --- deps/hiredis/Makefile.orig
 +++ deps/hiredis/Makefile
-@@ -76,7 +76,7 @@ ifeq ($(USE_SSL),1)
-   CFLAGS+=-DHIREDIS_TEST_SSL
- endif
- 
--ifeq ($(uname_S),Linux)
-+ifneq (,filter Linux OpenBSD,$(uname_S))
-   ifdef OPENSSL_PREFIX
- CFLAGS+=-I$(OPENSSL_PREFIX)/include
- SSL_LDFLAGS+=-L$(OPENSSL_PREFIX)/lib -lssl -lcrypto
-@@ -263,7 +263,7 @@ $(SSL_PKGCONFNAME): hiredis_ssl.h
+@@ -307,7 +307,7 @@ $(SSL_PKGCONFNAME): hiredis_ssl.h
@echo Libs.private: -lssl -lcrypto >> $@
  
- install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME)
+ install: $(DYLIBNAME) $(STLIBNAME) $(PKGCONFNAME) $(SSL_INSTALL)
 -  mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters 
$(INSTALL_LIBRARY_PATH)
 +  $(INSTALL_DIR) $(INSTALL_INCLUDE_PATH) $(INSTALL_INCLUDE_PATH)/adapters 
$(INSTALL_LIBRARY_PATH)
-   $(INSTALL) hiredis.h async.h read.h sds.h alloc.h 
$(INSTALL_INCLUDE_PATH)
+   $(INSTALL) hiredis.h async.h read.h sds.h alloc.h sockcompat.h 
$(INSTALL_INCLUDE_PATH)
$(INSTALL) adapters/*.h $(INSTALL_INCLUDE_PATH)/adapters
$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
Index: patches/patch-deps_linenoise_linenoise_c
===
RCS file: /cvs/ports/databases/redis/patches/patch-deps_linenoise_linenoise_c,v
retrieving revision 1.3
diff -u -p -u -p -r1.3 patch-deps_linenoise_linenoise_c
--- patches/patch-deps_linenoise_linenoise_c11 Mar 2022 18:31:43 -  
1.3
+++ patches/patch-deps_linenoise_linenoise_c29 Aug 2023 05:20:23 -
@@ -7,7 +7,7 @@ https://github.com/antirez/linenoise/pul
 Index: deps/linenoise/linenoise.c
 --- deps/linenoise/linenoise.c.orig
 +++ deps/linenoise/linenoise.c
-@@ -819,7 +819,7 @@ static int linenoiseEdit(int stdin_fd, int stdout_fd, 
+@@ -822,7 +822,7 @@ static int linenoiseEdit(int stdin_fd, int stdout_fd, 
  
  if (write(l.ofd,prompt,l.plen) == -1) return -1;
  while(1) {
Index: patches/patch-redis_conf
===
RCS file: /cvs/ports/databases/redis/patches/patch-redis_conf,v
retrieving revision 1.30
diff -u -p -u -p -r1.30 patch-redis_conf
--- patches/patch-redis_conf28 Apr 2022 03:02:36 -  1.30
+++ patches/patch-redis_conf29 Aug 2023 05:20:23 -
@@ -7,7 +7,7 @@ Main changes in this file:
 Index: redis.conf
 --- redis.conf.orig
 +++ redis.conf
-@@ -112,8 +112,8 @@ tcp-backlog 511
+@@ -152,8 +152,8 @@ tcp-backlog 511
  # incoming connections. There is no default, so Redis will not listen
  # on a unix 

UPDATE: taglib-1.13.1

2023-08-28 Thread Rafael Sadowski
Simple update taglib-1.13.1. Tested on amd64. OK?

Cheers Rafael

Index: Makefile
===
RCS file: /cvs/ports/audio/taglib/Makefile,v
retrieving revision 1.51
diff -u -p -u -p -r1.51 Makefile
--- Makefile20 Feb 2023 16:35:18 -  1.51
+++ Makefile28 Aug 2023 20:11:12 -
@@ -1,6 +1,5 @@
 COMMENT=   managing meta-data of audio formats
-DISTNAME=  taglib-1.13
-REVISION=  0
+DISTNAME=  taglib-1.13.1
 
 CATEGORIES=audio devel
 
Index: distinfo
===
RCS file: /cvs/ports/audio/taglib/distinfo,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 distinfo
--- distinfo11 Dec 2022 11:21:20 -  1.15
+++ distinfo28 Aug 2023 20:11:12 -
@@ -1,2 +1,2 @@
-SHA256 (taglib-1.13.tar.gz) = WPCLTbPcMe0VLASJbukXLSIFK8fvEoiAKMAdix1greA=
-SIZE (taglib-1.13.tar.gz) = 1371504
+SHA256 (taglib-1.13.1.tar.gz) = yNorEPG/7CzX2/zTP0ojONsHZdhRpQWD1BC6zwVc/Qs=
+SIZE (taglib-1.13.1.tar.gz) = 1372618



Re: sysutils/obsdfreqd update

2023-08-28 Thread Florian Viehweger
Am Mon, 28 Aug 2023 20:38:51 +0200
schrieb Stefan Hagen :

> Solene Rapenne wrote (2023-08-23 08:58 CEST):
> > here is an update for obsdfreqd
> > 
> > I moved the code to sourcehut because tildegit.org seems broken at
> > the moment and I have no idea how to get in touch with the admin,
> > so I'll remove my code from there
> > 
> > 1.2.0 received a change to the threshold value, instead of being a
> > fixed 30%, now it calculates 80% of a single core usage by looking
> > at the number of online CPU and doing 100/NCPU*0.8, the default
> > value will now scale automatically fine for computers with more
> > than 4 CPUs
> 
> It works fine on my 8 core AMD machine.
> 
> OK sdk

Works fine on my 2 core Intel machine too. Thanks!


> > Index: Makefile
> > ===
> > RCS file: /cvs/ports/sysutils/obsdfreqd/Makefile,v
> > retrieving revision 1.8
> > diff -u -p -r1.8 Makefile
> > --- Makefile7 Nov 2022 22:43:03 -   1.8
> > +++ Makefile23 Aug 2023 06:55:26 -
> > @@ -1,12 +1,12 @@
> >  COMMENT =  userland daemon to manage CPU frequency
> > -V =1.1.1
> > +V =1.2.0
> >  DISTNAME = obsdfreqd-${V}
> >  
> >  CATEGORIES =   sysutils
> >  
> >  MAINTAINER =   Florian Viehweger
> >  
> > -HOMEPAGE = https://tildegit.org/solene/obsdfreqd/
> > +HOMEPAGE = https://git.sr.ht/~solene/obsdfreqd
> >  
> >  # ISC
> >  PERMIT_PACKAGE =   Yes
> > @@ -14,10 +14,9 @@ PERMIT_PACKAGE = Yes
> >  # uses unveil()
> >  WANTLIB += c m
> >  
> > -MASTER_SITES =
> > https://tildegit.org/solene/obsdfreqd/archive/ +MASTER_SITES
> > =   https://git.sr.ht/~solene/obsdfreqd/archive/ 
> >  DISTFILES =obsdfreqd-{}${V}${EXTRACT_SUFX}
> > -WRKDIST =  ${WRKDIR}/obsdfreqd
> >  NO_TEST =  Yes
> >  
> >  .include 
> > Index: distinfo
> > ===
> > RCS file: /cvs/ports/sysutils/obsdfreqd/distinfo,v
> > retrieving revision 1.3
> > diff -u -p -r1.3 distinfo
> > --- distinfo7 Nov 2022 22:43:03 -   1.3
> > +++ distinfo23 Aug 2023 06:55:26 -
> > @@ -1,2 +1,2 @@
> > -SHA256 (obsdfreqd-1.1.1.tar.gz) =
> > N80z2nIE1XpYtP8X0kbpU1TOgS4wagWU4QQ0Pd8HODE= -SIZE
> > (obsdfreqd-1.1.1.tar.gz) = 8841 +SHA256 (obsdfreqd-1.2.0.tar.gz) =
> > hVIZdlWtZofYOsIgexg/vba86tqqxt9KLBneyZQKPQ8= +SIZE
> > (obsdfreqd-1.2.0.tar.gz) = 9366
> > 



-- 
greetings,

Florian Viehweger



Re: UPDATE: x11/fvwm3 to 1.0.7

2023-08-28 Thread Michael
On Sun, Aug 27, 2023 at 11:19:22PM +0200, Stefan Hagen wrote:
> Michael wrote (2023-08-27 02:07 CEST):
> > On Fri, Aug 25, 2023 at 02:41:25PM +0200, Michael wrote:
> > > Hi ports@,
> > > 
> > > this is an update to the latest fvwm3 release [1].
> > > 
> > > Unfortunately there was a bug [2] that caused consistent crashes on 
> > > OpenBSD. Reverting the commit in question seems to resolve that issue, 
> > > which is also what others [3] seem to be doing for now. Patch for this 
> > > is included as 'patch-fvwm_ewmh_names_c'.
> > > 
> > > Tested on amd64.
> > > 
> > > 
> > > [1] https://github.com/fvwmorg/fvwm3/releases/tag/1.0.7
> > > [2] https://github.com/fvwmorg/fvwm3/issues/873
> > > [3] 
> > > https://github.com/freebsd/freebsd-ports/commit/3e35051e913e46e0132df070d5a718d443bfd0b8
> > 
> > Upstream commited a fix for the mentioned issue so let's use this 
> > instead, see 'patch-fvwm_ewmh_c'. Patch below.
> > 
> > Tested on amd64.
> 
> Works here. It starts and most buttons work (default setup). I have
> not seen any crashes.
> 
> OK sdk
> 
> However, the default config could use some attention:
> * It doesn't honor --program-transform-name (executables and manpages)
> * It links to manpages that don't exist
> * It links to manpages from base fvwm
> 
> - Stefan
> 

Thank you for your feedback Stefan. I had a look into this and it looks 
like manpages were never built at all. Enabling this required adding 
textproc/asciidoctor and switching to gmake. The wildcard expansion in 
doc/Makefile.in didn't seem to work so I put the file names in there 
manually for now. Further some *.adoc files required setting the correct 
absolute path in the include statement which is what the sed run in 
pre-configure is for. Those manpages should conflict with x11/fvwm2 so I 
think we need '@conflict fvwm2-*' in PLIST now. I am not sure if this 
requires adding an additional entry to quirks too?

I don't really like the patch or sed call to get the manpages built. Does 
someone have any ideas how to improve this? Then again it works for now...

Slightly tested on amd64, updated patch below.


Index: Makefile
===
RCS file: /cvs/ports/x11/fvwm3/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- Makefile24 Jan 2023 18:05:35 -  1.8
+++ Makefile28 Aug 2023 21:29:04 -
@@ -1,6 +1,6 @@
 COMMENT=   multiple virtual desktop window manager
 
-VERSION=   1.0.6a
+VERSION=   1.0.7
 DISTNAME=  fvwm3-${VERSION}
 
 CATEGORIES= x11
@@ -20,6 +20,8 @@ WANTLIB += readline rsvg-2 event_core ev
 
 MASTER_SITES=  https://github.com/fvwmorg/fvwm3/releases/download/${VERSION}/
 
+BUILD_DEPENDS= textproc/asciidoctor
+
 LIB_DEPENDS+=  graphics/png \
x11/gnome/librsvg \
devel/libevent2
@@ -27,17 +29,22 @@ LIB_DEPENDS+=   graphics/png \
 SUBST_VARS=VERSION
 
 SEPARATE_BUILD=Yes
+USE_GMAKE= Yes
 CONFIGURE_STYLE=   gnu
 
 CONFIGURE_ARGS+=   --enable-mandoc \
--disable-bidi \
-   --program-transform-name='s/^fvwm-/fvwm3-/' \
-   --localedir=${TRUEPREFIX}/share/fvwm3/locale
+   --localedir=${TRUEPREFIX}/share/fvwm3/locale \
+   --program-transform-name='s/^fvwm-/fvwm3-/'
 
 CONFIGURE_ENV+=CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
 DEBUG_PACKAGES =   ${BUILD_PACKAGES}
+
+pre-configure:
+   sed -Ei 's#^(include::)(.*\.ad)(\[.*\])#\1'${WRKBUILD}'/doc/\2\3#' \
+   ${WRKSRC}/doc/*.adoc
 
 post-install:
mv ${WRKINST}/${TRUEPREFIX}/bin/FvwmCommand{,3}
Index: distinfo
===
RCS file: /cvs/ports/x11/fvwm3/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo22 Jan 2023 12:11:26 -  1.3
+++ distinfo28 Aug 2023 21:29:04 -
@@ -1,2 +1,2 @@
-SHA256 (fvwm3-1.0.6a.tar.gz) = RmWmYTPgcLeRkXsHlMxt9rdUZ56+kTBxhCfbZHm7W2g=
-SIZE (fvwm3-1.0.6a.tar.gz) = 4538100
+SHA256 (fvwm3-1.0.7.tar.gz) = OqzXz+/2DbG82cdzMtxXX+dxHS0wbwR5UlN43G2z0x4=
+SIZE (fvwm3-1.0.7.tar.gz) = 4512128
Index: patches/patch-configure
===
RCS file: /cvs/ports/x11/fvwm3/patches/patch-configure,v
retrieving revision 1.3
diff -u -p -r1.3 patch-configure
--- patches/patch-configure 13 Oct 2022 16:00:45 -  1.3
+++ patches/patch-configure 28 Aug 2023 21:29:04 -
@@ -1,7 +1,7 @@
 Index: configure
 --- configure.orig
 +++ configure
-@@ -11779,7 +11779,7 @@ then :
+@@ -11726,7 +11726,7 @@ then :
  else $as_nop
  
  with_intl=maybe
Index: patches/patch-default-config_Makefile_in
===
RCS file: /cvs/ports/x11/fvwm3/patches/patch-default-config_Makefile_in,v

CVS: cvs.openbsd.org: ports

2023-08-28 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2023/08/28 14:07:56

Modified files:
sysutils/kubectl: Makefile distinfo 

Log message:
Update kubectl to 1.28.1



CVS: cvs.openbsd.org: ports

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

Modified files:
net/weechat: Makefile distinfo 

Log message:
Update weechat to 4.0.4



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2023/08/28 13:56:25

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

Log message:
Update cmake to 3.27.4



Re: [NEW]textproc/typst

2023-08-28 Thread Johannes Thyssen Tishman
Hi,

please find attached version 0.7.0 of the typst port.

I made the following changes:
- Dropped patch-Cargo.toml due to update upstream
- Updated crates list
- Added missing WANTLIBS

The crates list generated by 'make modcargo-gen-crates' was missing
the iai package even though it is listed in the Cargo.lock file,
so I added it manually. Don't know if this is due to something
missing on my part or perhaps some kind of parsing issue.

Both port-lib-depends-check and portcheck are happy. I've tested
the port a little and it seems to be working fine.

Kind regards,
Johannes



typst-0.7.0.tar.gz
Description: GNU Zip compressed data


Re: [update] games/widelands to 1.1

2023-08-28 Thread Stefan Hagen
Christopher Zimmermann wrote (2023-08-28 17:43 CEST):
> Hi,
> 
> I'm looking for oks for this update of games/widelands to 1.1. The PLIST
> diff is too large to attach uncompressed, so I include that only in the
> attached gzipped diff.

Looks good to me. The previous version ran into a segfault on my machine
and this update fixes that. The patches make sense to me. Portcheck
and port lib depends check are happy.

OK sdk@

> 
> Index: Makefile
> ===
> RCS file: /cvs/ports/games/widelands/Makefile,v
> retrieving revision 1.36
> diff -u -p -r1.36 Makefile
> --- Makefile  24 Apr 2023 11:40:42 -  1.36
> +++ Makefile  28 Aug 2023 11:52:34 -
> @@ -2,8 +2,7 @@ COMMENT = economic and military simulati
>  GH_ACCOUNT = widelands
>  GH_PROJECT = widelands
> -GH_TAGNAME = v1.0
> -REVISION =  0
> +GH_TAGNAME = v1.1
>  CATEGORIES = games
> @@ -13,21 +12,19 @@ HOMEPAGE =https://www.widelands.org/
>  PERMIT_PACKAGE = Yes
>  WANTLIB += ${COMPILER_LIBCXX} GL GLEW SDL2 SDL2_image SDL2_mixer
> -WANTLIB += SDL2_ttf boost_unit_test_framework-mt boost_system-mt
> -WANTLIB += c curl execinfo iconv icudata icuuc intl m png z
> +WANTLIB += SDL2_ttf c execinfo iconv icudata icuuc intl m png z
>  # c++11
>  COMPILER =   base-clang ports-gcc
> -BUILD_DEPENDS =  devel/gettext,-tools
> -LIB_DEPENDS =devel/boost \
> - devel/gettext,-runtime \
> +BUILD_DEPENDS =  devel/asio \
> + devel/gettext,-tools
> +LIB_DEPENDS =devel/gettext,-runtime \
>   devel/sdl2-image \
>   devel/sdl2-mixer \
>   devel/sdl2-ttf \
>   graphics/png \
>   graphics/glew \
> - net/curl \
>   textproc/icu4c
>  RUN_DEPENDS =devel/desktop-file-utils \
>   x11/gtk+4,-guic
> @@ -40,7 +37,10 @@ MODPY_RUNDEP=  No
>  CONFIGURE_ARGS = -DWL_INSTALL_DATADIR=${PREFIX}/share/widelands \
>   -DWL_INSTALL_BASEDIR=${PREFIX}/share/widelands \
> + -DWL_INSTALL_BINDIR=${PREFIX}/share/widelands \
> + -DWL_INSTALL_MANDIR=${PREFIX}/man \
>   -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON \
> + -DOPTION_FORCE_EMBEDDED_MINIZIP=ON \
>   -DGTK_UPDATE_ICON_CACHE=False \
>   -Wno-dev
> Index: distinfo
> ===
> RCS file: /cvs/ports/games/widelands/distinfo,v
> retrieving revision 1.6
> diff -u -p -r1.6 distinfo
> --- distinfo  26 Jun 2021 05:31:16 -  1.6
> +++ distinfo  28 Aug 2023 11:52:34 -
> @@ -1,2 +1,2 @@
> -SHA256 (widelands-1.0.tar.gz) = HasMQGKHPMcsXgVY+eliCw7xhfGniSOnfEzlue12Axo=
> -SIZE (widelands-1.0.tar.gz) = 792124780
> +SHA256 (widelands-1.1.tar.gz) = aFP889rsm2YAVpHlvLADJmNLrwmFrYmn5lEVAmEvZBI=
> +SIZE (widelands-1.1.tar.gz) = 416104611
> Index: patches/patch-CMakeLists_txt
> ===
> RCS file: /cvs/ports/games/widelands/patches/patch-CMakeLists_txt,v
> retrieving revision 1.7
> diff -u -p -r1.7 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt  11 Mar 2022 19:05:11 -  1.7
> +++ patches/patch-CMakeLists_txt  28 Aug 2023 11:52:34 -
> @@ -1,56 +1,12 @@
> -- Don't set -O3.
>  - Don't install source docs.
> -- Unbreak build with cmake 3.15
>  Index: CMakeLists.txt
>  --- CMakeLists.txt.orig
>  +++ CMakeLists.txt
> -@@ -192,21 +192,9 @@ if(CMAKE_BUILD_TYPE STREQUAL "Debug")
> -   endif()
> -   option(OPTION_ASAN "Build with AddressSanitizer" ON)
> - elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
> --  if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND 
> (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
> --message(STATUS "GCC >6.2.0 breaks -03, setting -02")
> --set(WL_OPTIMIZE_FLAGS "-O2")
> --  else()
> --set(WL_OPTIMIZE_FLAGS "-O3")
> --  endif ()
> -   set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
> -   option(OPTION_ASAN "Build with AddressSanitizer" OFF)
> - elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
> --  if(("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") AND 
> (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 6.2))
> --message(STATUS "GCC >6.2.0 breaks -03, setting -02")
> --set(WL_OPTIMIZE_FLAGS "-O2")
> --  else()
> --set(WL_OPTIMIZE_FLAGS "-O3")
> --  endif ()
> -   set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
> -   option(OPTION_ASAN "Build with AddressSanitizer" ON)
> - else()
> -@@ -255,7 +243,7 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
> -   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-unreachable-code")
> -   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wno-documentation")
> - --  wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=deprecated")
> -+  #wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=deprecated")
> -   wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=non-pod-varargs")
> - -   

CVS: cvs.openbsd.org: ports

2023-08-28 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2023/08/28 13:23:55

Modified files:
telephony/linphone/liblinphone: Makefile 
telephony/linphone/liblinphone/pkg: PLIST 

Log message:
Unbreak with doxygen 1.9.7



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2023/08/28 13:23:51

Modified files:
net/signond: Makefile 
net/signond/pkg: PLIST 

Log message:
Unbreak with doxygen 1.9.7



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2023/08/28 13:23:46

Modified files:
net/libaccounts-qt: Makefile 
net/libaccounts-qt/pkg: PLIST 

Log message:
Unbreak with doxygen 1.9.7



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2023/08/28 13:23:42

Modified files:
graphics/orthanc/server: Makefile 
graphics/orthanc/server/pkg: PLIST 

Log message:
Unbreak with doxygen 1.9.7



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2023/08/28 13:23:38

Modified files:
graphics/libgphoto2: Makefile 
graphics/libgphoto2/pkg: PLIST 

Log message:
Unbreak with doxygen 1.9.7



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2023/08/28 13:23:33

Modified files:
graphics/ipe   : Makefile 
graphics/ipe/pkg: PLIST 

Log message:
Unbreak with doxygen 1.9.7



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Rafael Sadowski
CVSROOT:/cvs
Module name:ports
Changes by: rsadow...@cvs.openbsd.org   2023/08/28 13:23:27

Modified files:
devel/doxygen-gui: Makefile distinfo 
devel/doxygen  : Makefile distinfo 
devel/doxygen/patches: patch-doc_CMakeLists_txt 

Log message:
Update doxygen to 1.9.7

This update brings breaking changes with it (as usually). Fixes are committed
separately.



[update] graphics/krita-gmic-plugin 3.1.6.1 to 3.2.4.1

2023-08-28 Thread Stefan Hagen
Stefan Hagen wrote (2023-07-05 08:27 CEST):
> *ping*
> 
> Stefan Hagen wrote (2023-05-07 16:42 CEST):
> > Hi,
> > 
> > this is an update to the krita gmic plugin for the gmic version
> > 3.2.1.
> > 
> > There's no changelog for the plugin itself. But this repo is used 
> > to develop the plugin:
> > https://github.com/amyspark/gmic/compare/v3.1.6.1...v3.2.1.1
> > 
> > I added post-configure bits to build the translation files.
> > Otherwise the build fails.
> > 
> > Comments / OKs?

Here is the next update. Now to version 3.2.4.1.

Changes:
https://github.com/amyspark/gmic/compare/v3.1.6.1...v3.2.4.1

OK?

- Stefan

Index: graphics/krita-gmic-plugin/Makefile
===
RCS file: /cvs/ports/graphics/krita-gmic-plugin/Makefile,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 Makefile
--- graphics/krita-gmic-plugin/Makefile 26 Sep 2022 11:03:06 -  1.7
+++ graphics/krita-gmic-plugin/Makefile 28 Aug 2023 19:10:14 -
@@ -1,12 +1,18 @@
 COMMENT =  krita gmic plugin
 
-V =3.1.6.1
+V =3.2.4.1
 DISTNAME = krita-gmic-plugin-${V}
 
 CATEGORIES =   graphics
 
 HOMEPAGE = https://krita.org
 
+# Info about this plugin:
+# https://invent.kde.org/graphics/krita/-/blob/master/README.packagers.md
+
+# Actually developed here:
+# https://github.com/amyspark/gmic
+
 MAINTAINER =   Stefan Hagen 
 
 # CeCILL, GPLv3
@@ -27,10 +33,17 @@ LIB_DEPENDS =   graphics/krita \
 
 WRKSRC =   ${WRKDIST}/gmic-qt
 
-CONFIGURE_ARGS +=  -DENABLE_SYSTEM_GMIC=false \
+CONFIGURE_ARGS +=  -DCMAKE_PREFIX_PATH=${LOCALBASE}/lib/qt5/cmake \
+   -DENABLE_SYSTEM_GMIC=false \
-DGMIC_QT_HOST=krita-plugin
 
+USE_GMAKE =Yes
+
 post-extract:
mv ${WRKDIR}/gmic-${V}-patched ${WRKDIST}
+
+post-configure:
+   chmod +x ${WRKSRC}/translations/lrelease.sh
+   cd ${WRKSRC}/translations/filters && gmake
 
 .include 
Index: graphics/krita-gmic-plugin/distinfo
===
RCS file: /cvs/ports/graphics/krita-gmic-plugin/distinfo,v
retrieving revision 1.7
diff -u -p -u -p -r1.7 distinfo
--- graphics/krita-gmic-plugin/distinfo 26 Sep 2022 11:03:06 -  1.7
+++ graphics/krita-gmic-plugin/distinfo 28 Aug 2023 19:10:14 -
@@ -1,2 +1,2 @@
-SHA256 (gmic-3.1.6.1-patched.tar.gz) = 
FeGVqnKKXYjTERoZnscwadBJGATdSa+0m+7D6F6T2ZQ=
-SIZE (gmic-3.1.6.1-patched.tar.gz) = 12025532
+SHA256 (gmic-3.2.4.1-patched.tar.gz) = 
5e+B3tTeLX0uF6YPkOgEbivAa8eiQ5qzoBI2EdIQ7tg=
+SIZE (gmic-3.2.4.1-patched.tar.gz) = 11803760
Index: graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp
===
RCS file: /cvs/ports/graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp,v
retrieving revision 1.2
diff -u -p -u -p -r1.2 patch-src_gmic_cpp
--- graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp   29 May 2022 
07:41:37 -  1.2
+++ graphics/krita-gmic-plugin/patches/patch-src_gmic_cpp   28 Aug 2023 
19:10:14 -
@@ -1,21 +1,12 @@
 Index: src/gmic.cpp
 --- src/gmic.cpp.orig
 +++ src/gmic.cpp
-@@ -2518,6 +2518,8 @@ CImgList gmic::list_p_is_abort = CImgList& gmic_runs() {
+ inline void* get_tid() {
  #if defined(__MACOSX__) || defined(__APPLE__)
void* tid = (void*)(cimg_ulong)getpid();
 +#elif defined(__OpenBSD__)
 +  void* tid = (void*)pthread_self();
  #elif cimg_OS==1
-   void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);
- #elif cimg_OS==2
-@@ -2860,6 +2862,8 @@ gmic::~gmic() {
-   cimg::mutex(21);
- #if defined(__MACOSX__) || defined(__APPLE__)
-   void* tid = (void*)(cimg_ulong)getpid();
-+#elif defined(__OpenBSD__)
-+  void* tid = (void*)pthread_self();
- #elif cimg_OS==1
-   void* tid = (void*)(cimg_ulong)syscall(SYS_gettid);
- #elif cimg_OS==2
+ #if defined(__NetBSD__) || defined(cimg_use_pthread) || cimg_display==1
+   void* tid = (void*)(cimg_ulong)pthread_self();



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Robert Nagy
CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2023/08/28 13:08:44

Modified files:
www/chromium   : Makefile 
www/chromium/patches: 
  
patch-components_password_manager_core_browser_ui_passwords_grouper_cc 
  
patch-components_webauthn_core_browser_passkey_sync_bridge_cc 
www/ungoogled-chromium: Makefile 
www/ungoogled-chromium/patches: 

patch-components_password_manager_core_browser_ui_passwords_grouper_cc 

patch-components_webauthn_core_browser_passkey_sync_bridge_cc 
www/iridium: Makefile 
www/iridium/patches: 
 
patch-components_password_manager_core_browser_ui_passwords_grouper_cc 
 
patch-components_webauthn_core_browser_passkey_sync_bridge_cc 
Added files:
www/chromium/patches: patch-third_party_ffmpeg_configure 
  
patch-third_party_webrtc_modules_desktop_capture_linux_wayland_egl_dmabuf_cc 
  
patch-ui_ozone_platform_wayland_host_zwp_text_input_wrapper_v1_cc 
www/ungoogled-chromium/patches: 
patch-third_party_ffmpeg_configure 

patch-third_party_webrtc_modules_desktop_capture_linux_wayland_egl_dmabuf_cc 

patch-ui_ozone_platform_wayland_host_zwp_text_input_wrapper_v1_cc 
www/iridium/patches: patch-third_party_ffmpeg_configure 
 
patch-third_party_webrtc_modules_desktop_capture_linux_wayland_egl_dmabuf_cc 
 
patch-ui_ozone_platform_wayland_host_zwp_text_input_wrapper_v1_cc 

Log message:
sync with my shared bsd patch repo so that we don't miss any patches on the 
next update



Re: sysutils/obsdfreqd update

2023-08-28 Thread Stefan Hagen
Solene Rapenne wrote (2023-08-23 08:58 CEST):
> here is an update for obsdfreqd
> 
> I moved the code to sourcehut because tildegit.org seems broken at the
> moment and I have no idea how to get in touch with the admin, so I'll
> remove my code from there
> 
> 1.2.0 received a change to the threshold value, instead of being a
> fixed 30%, now it calculates 80% of a single core usage by looking at
> the number of online CPU and doing 100/NCPU*0.8, the default value will
> now scale automatically fine for computers with more than 4 CPUs

It works fine on my 8 core AMD machine.

OK sdk

> Index: Makefile
> ===
> RCS file: /cvs/ports/sysutils/obsdfreqd/Makefile,v
> retrieving revision 1.8
> diff -u -p -r1.8 Makefile
> --- Makefile  7 Nov 2022 22:43:03 -   1.8
> +++ Makefile  23 Aug 2023 06:55:26 -
> @@ -1,12 +1,12 @@
>  COMMENT =userland daemon to manage CPU frequency
> -V =  1.1.1
> +V =  1.2.0
>  DISTNAME =   obsdfreqd-${V}
>  
>  CATEGORIES = sysutils
>  
>  MAINTAINER = Florian Viehweger 
>  
> -HOMEPAGE =   https://tildegit.org/solene/obsdfreqd/
> +HOMEPAGE =   https://git.sr.ht/~solene/obsdfreqd
>  
>  # ISC
>  PERMIT_PACKAGE = Yes
> @@ -14,10 +14,9 @@ PERMIT_PACKAGE =   Yes
>  # uses unveil()
>  WANTLIB +=   c m
>  
> -MASTER_SITES =   https://tildegit.org/solene/obsdfreqd/archive/
> +MASTER_SITES =   https://git.sr.ht/~solene/obsdfreqd/archive/
>  
>  DISTFILES =  obsdfreqd-{}${V}${EXTRACT_SUFX}
> -WRKDIST =${WRKDIR}/obsdfreqd
>  NO_TEST =Yes
>  
>  .include 
> Index: distinfo
> ===
> RCS file: /cvs/ports/sysutils/obsdfreqd/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo  7 Nov 2022 22:43:03 -   1.3
> +++ distinfo  23 Aug 2023 06:55:26 -
> @@ -1,2 +1,2 @@
> -SHA256 (obsdfreqd-1.1.1.tar.gz) = 
> N80z2nIE1XpYtP8X0kbpU1TOgS4wagWU4QQ0Pd8HODE=
> -SIZE (obsdfreqd-1.1.1.tar.gz) = 8841
> +SHA256 (obsdfreqd-1.2.0.tar.gz) = 
> hVIZdlWtZofYOsIgexg/vba86tqqxt9KLBneyZQKPQ8=
> +SIZE (obsdfreqd-1.2.0.tar.gz) = 9366
> 



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Stefan Hagen
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2023/08/28 12:08:34

Modified files:
sysutils/nnn   : Makefile distinfo 

Log message:
update sysutils/nnn to 4.9; from MAINTAINER Martin Ziemer, thanks!

FLAVOR=nerd needs nerd-fonts >= 3.0.0

Changes:
https://github.com/jarun/nnn/releases/tag/v4.9

OK op@



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Stefan Hagen
CVSROOT:/cvs
Module name:ports
Changes by: s...@cvs.openbsd.org2023/08/28 11:33:13

Modified files:
fonts/nerd-fonts: Makefile.inc 
fonts/nerd-fonts/codenewroman: distinfo 
fonts/nerd-fonts/codenewroman/pkg: PLIST 
fonts/nerd-fonts/dejavusansmono: distinfo 
fonts/nerd-fonts/dejavusansmono/pkg: PLIST 
fonts/nerd-fonts/fantasquesansmono: distinfo 
fonts/nerd-fonts/fantasquesansmono/pkg: PLIST 
fonts/nerd-fonts/noto: distinfo 
fonts/nerd-fonts/noto/pkg: PLIST 
fonts/nerd-fonts/profont: distinfo 
fonts/nerd-fonts/profont/pkg: PLIST 
fonts/nerd-fonts/terminus: distinfo 
fonts/nerd-fonts/terminus/pkg: PLIST 
fonts/nerd-fonts/ubuntu: distinfo 
fonts/nerd-fonts/ubuntu/pkg: PLIST 
fonts/nerd-fonts/ubuntu-mono: distinfo 
fonts/nerd-fonts/ubuntu-mono/pkg: PLIST 

Log message:
Update nerd-fonts to 3.0.2, patch from Joel Carnat, thanks!

We're going from version 2.2.2 to 3.0.2.

Breaking Changes:

1. This release fixes some long standing issues that are due to the
naming of the fonts: There is a completely new naming scheme. This might
be inconvientient for existing setups.

2. The old Material Design Icon codepoints are finally dropped. Due
to an historic mistace we placed them in between some asiatic glyphs,
breaking that script Since v2.3.0 the (updated and expanded) Material
Design Icons have new codepoints in the 5 digit region.

More details are described in the 3.0.0 change log:
https://github.com/ryanoasis/nerd-fonts/releases/tag/v3.0.0

ok op@



PATCH: rbw-1.8.3

2023-08-28 Thread Mikolaj Kucharski
Hi,

I wanted to update to latest version, but it doesn't work for
organization which I am part of after upgrade to v1.8.3 :/

I also tested 1.8.2 and also doesn't work for me here.

I suspect it may be related to settings related to the org.

The organization is using https://vault.bitwarden.com/ as backend.

Sending, in case it is useful for someone else.

$ rbw -V
rbw 1.8.3

$ rbw stop-agent
$ rbw login
rbw login: failed to parse message from agent: EOF while parsing a value at 
line 1 column 0

I think I could use local copy of secrets with rbw-1.6.0p0.tgz from
ports, but I don't think sync worked. I suspect I just has stale
entries in my local cache.


Index: Makefile
===
RCS file: /cvs/ports/security/rbw/Makefile,v
retrieving revision 1.15
diff -u -p -u -r1.15 Makefile
--- Makefile10 Jul 2023 19:35:13 -  1.15
+++ Makefile28 Aug 2023 15:37:17 -
@@ -3,10 +3,11 @@ NOT_FOR_ARCHS =   powerpc64 riscv64 sparc6
 
 COMMENT =  command line BitWarden client
 
-DISTNAME = rbw-1.6.0
-REVISION = 0
+DISTNAME = rbw-1.8.3
 
 CATEGORIES =   security
+
+HOMEPAGE = https://git.tozt.net/rbw
 
 MASTER_SITES = https://git.tozt.net/rbw/snapshot/
 
Index: crates.inc
===
RCS file: /cvs/ports/security/rbw/crates.inc,v
retrieving revision 1.3
diff -u -p -u -r1.3 crates.inc
--- crates.inc  15 Mar 2023 00:35:38 -  1.3
+++ crates.inc  28 Aug 2023 15:37:17 -
@@ -1,57 +1,79 @@
-MODCARGO_CRATES += aes 0.8.2   # MIT OR Apache-2.0
+MODCARGO_CRATES += addr2line   0.20.0  # Apache-2.0 OR MIT
+MODCARGO_CRATES += adler   1.0.2   # 0BSD OR MIT OR Apache-2.0
+MODCARGO_CRATES += aes 0.8.3   # MIT OR Apache-2.0
 MODCARGO_CRATES += ahash   0.7.6   # MIT OR Apache-2.0
-MODCARGO_CRATES += aho-corasick0.7.20  # Unlicense OR MIT
-MODCARGO_CRATES += anyhow  1.0.69  # MIT OR Apache-2.0
-MODCARGO_CRATES += arrayvec0.7.2   # MIT OR Apache-2.0
-MODCARGO_CRATES += async-trait 0.1.66  # MIT OR Apache-2.0
+MODCARGO_CRATES += aho-corasick1.0.2   # Unlicense OR MIT
+MODCARGO_CRATES += anstream0.3.2   # MIT OR Apache-2.0
+MODCARGO_CRATES += anstyle 1.0.1   # MIT OR Apache-2.0
+MODCARGO_CRATES += anstyle-parse   0.2.1   # MIT OR Apache-2.0
+MODCARGO_CRATES += anstyle-query   1.0.0   # MIT OR Apache-2.0
+MODCARGO_CRATES += anstyle-wincon  1.0.1   # MIT OR Apache-2.0
+MODCARGO_CRATES += anyhow  1.0.72  # MIT OR Apache-2.0
+MODCARGO_CRATES += argon2  0.5.1   # MIT OR Apache-2.0
+MODCARGO_CRATES += arrayvec0.7.4   # MIT OR Apache-2.0
+MODCARGO_CRATES += async-trait 0.1.71  # MIT OR Apache-2.0
 MODCARGO_CRATES += autocfg 1.1.0   # Apache-2.0 OR MIT
+MODCARGO_CRATES += backtrace   0.3.68  # MIT OR Apache-2.0
 MODCARGO_CRATES += base32  0.4.0   # MIT OR Apache-2.0
-MODCARGO_CRATES += base64  0.21.0  # MIT OR Apache-2.0
+MODCARGO_CRATES += base64  0.21.2  # MIT OR Apache-2.0
 MODCARGO_CRATES += base64ct1.6.0   # Apache-2.0 OR MIT
 MODCARGO_CRATES += bitflags1.3.2   # MIT/Apache-2.0
+MODCARGO_CRATES += blake2  0.10.6  # MIT OR Apache-2.0
+MODCARGO_CRATES += block   0.1.6   # MIT
 MODCARGO_CRATES += block-buffer0.10.4  # MIT OR Apache-2.0
-MODCARGO_CRATES += block-padding   0.3.2   # MIT OR Apache-2.0
-MODCARGO_CRATES += bumpalo 3.12.0  # MIT/Apache-2.0
+MODCARGO_CRATES += block-padding   0.3.3   # MIT OR Apache-2.0
+MODCARGO_CRATES += bumpalo 3.13.0  # MIT/Apache-2.0
 MODCARGO_CRATES += byteorder   1.4.3   # Unlicense OR MIT
 MODCARGO_CRATES += bytes   1.4.0   # MIT
 MODCARGO_CRATES += cbc 0.1.2   # MIT OR Apache-2.0
 MODCARGO_CRATES += cc  1.0.79  # MIT OR Apache-2.0
 MODCARGO_CRATES += cfg-if  1.0.0   # MIT/Apache-2.0
 MODCARGO_CRATES += cipher  0.4.4   # MIT OR Apache-2.0
-MODCARGO_CRATES += clap4.1.8   # MIT OR Apache-2.0
-MODCARGO_CRATES += clap_complete   4.1.4   # MIT OR Apache-2.0
-MODCARGO_CRATES += clap_derive 4.1.8   # MIT OR Apache-2.0
-MODCARGO_CRATES += clap_lex0.3.2   # MIT OR Apache-2.0
-MODCARGO_CRATES += const-oid   0.9.2   # Apache-2.0 OR MIT
+MODCARGO_CRATES += clap4.3.15  # MIT OR Apache-2.0
+MODCARGO_CRATES += clap_builder4.3.15  # MIT OR Apache-2.0
+MODCARGO_CRATES += clap_complete   4.3.2   # MIT OR Apache-2.0
+MODCARGO_CRATES += clap_derive 4.3.12  # MIT OR Apache-2.0
+MODCARGO_CRATES += clap_lex0.5.0   # MIT OR Apache-2.0
+MODCARGO_CRATES += clipboard-win   3.1.1   # MIT
+MODCARGO_CRATES += colorchoice 1.0.0   # MIT OR Apache-2.0
+MODCARGO_CRATES += const-oid   0.9.4   # Apache-2.0 OR MIT
+MODCARGO_CRATES += copypasta   0.8.2   # MIT / Apache-2.0
 MODCARGO_CRATES += core-foundation 0.9.3   # MIT / Apache-2.0

CVS: cvs.openbsd.org: ports

2023-08-28 Thread Volker Schlecht
CVSROOT:/cvs
Module name:ports
Changes by: vol...@cvs.openbsd.org  2023/08/28 09:27:32

Modified files:
shells/nushell : Makefile crates.inc distinfo 

Log message:
shells/nushell: Update to 0.84.0

ok sthen@



Fix lang/php/{8.1,8.2} build on mips64

2023-08-28 Thread Visa Hankala
Building lang/php/{8.1,8.2} fails on mips64:

/usr/bin/ld: Zend/asm/.libs/make_mips64_n64_elf_gas.o: CALL16 reloc at 0x14 not 
against global symbol
Zend/asm/.libs/make_mips64_n64_elf_gas.o: could not read symbols: Bad value
cc: error: linker command failed with exit code 1 (use -v to see invocation)

Make the offending symbol explicitly local so that the assembler
produces a local GOT reference. This fixes the build.

Index: 8.1/patches/patch-Zend_asm_make_mips64_n64_elf_gas_S
===
RCS file: 8.1/patches/patch-Zend_asm_make_mips64_n64_elf_gas_S
diff -N 8.1/patches/patch-Zend_asm_make_mips64_n64_elf_gas_S
--- /dev/null   1 Jan 1970 00:00:00 -
+++ 8.1/patches/patch-Zend_asm_make_mips64_n64_elf_gas_S28 Aug 2023 
15:04:01 -
@@ -0,0 +1,13 @@
+Avoid an incorrect R_MIPS_CALL16 relocation with a local symbol.
+
+Index: Zend/asm/make_mips64_n64_elf_gas.S
+--- Zend/asm/make_mips64_n64_elf_gas.S.orig
 Zend/asm/make_mips64_n64_elf_gas.S
+@@ -70,6 +70,7 @@ make_fcontext:
+ sd  $gp, 136($v0)
+ 
+ # psudo instruction compute abs address of label finish based on GP
++.local  finish
+ dla  $t9, finish
+ 
+ # save address of finish as return-address for context-function
Index: 8.2/patches/patch-Zend_asm_make_mips64_n64_elf_gas_S
===
RCS file: 8.2/patches/patch-Zend_asm_make_mips64_n64_elf_gas_S
diff -N 8.2/patches/patch-Zend_asm_make_mips64_n64_elf_gas_S
--- /dev/null   1 Jan 1970 00:00:00 -
+++ 8.2/patches/patch-Zend_asm_make_mips64_n64_elf_gas_S28 Aug 2023 
15:04:01 -
@@ -0,0 +1,13 @@
+Avoid an incorrect R_MIPS_CALL16 relocation with a local symbol.
+
+Index: Zend/asm/make_mips64_n64_elf_gas.S
+--- Zend/asm/make_mips64_n64_elf_gas.S.orig
 Zend/asm/make_mips64_n64_elf_gas.S
+@@ -70,6 +70,7 @@ make_fcontext:
+ sd  $gp, 136($v0)
+ 
+ # psudo instruction compute abs address of label finish based on GP
++.local  finish
+ dla  $t9, finish
+ 
+ # save address of finish as return-address for context-function



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Alexander Bluhm
CVSROOT:/cvs
Module name:ports
Changes by: bl...@cvs.openbsd.org   2023/08/28 08:46:38

Modified files:
misc/p5-OPCUA-Open62541: Makefile distinfo 

Log message:
update p5-OPCUA-Open62541 to 2.04



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Sebastien Marie
CVSROOT:/cvs
Module name:ports
Changes by: sema...@cvs.openbsd.org 2023/08/28 07:50:19

Modified files:
lang/sbcl  : Makefile distinfo 

Log message:
update lang/sbcl to 2.3.8



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2023/08/28 07:07:42

Modified files:
geo/postgis: Makefile distinfo 
geo/postgis/patches: patch-liblwgeom_Makefile_in 
geo/postgis/pkg: PLIST 
Added files:
geo/postgis/patches: patch-loader_postgis_pl 
Removed files:
geo/postgis/patches: 
 patch-deps_flatgeobuf_include_flatbuffers_base_h 

Log message:
geo/postgis: update to 3.4.0

see https://postgis.net/2023/08/PostGIS-3.4.0/
- add patch to drop -v from ln options, reported upstream
- stop manually installing doc images, upstream does so properly now



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2023/08/28 06:14:18

Modified files:
editors/libreoffice: Makefile 

Log message:
editors/libreoffice: revert PORTHOME addition, fix typo in USE_WXNEEDED



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/08/28 02:31:58

Modified files:
math/libqalculate: Makefile distinfo 

Log message:
update to libqalculate-4.8.0



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/08/28 02:31:08

Modified files:
mail/pecl-mailparse: Makefile distinfo 

Log message:
update to pecl-mailparse-3.1.6



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/08/28 02:31:04

Modified files:
math/calc  : Makefile distinfo 

Log message:
update to calc-2.14.3.5



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/08/28 02:30:58

Modified files:
devel/py-wheel : Makefile distinfo 

Log message:
update to py3-wheel-0.41.2



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/08/28 02:30:54

Modified files:
devel/py-virtualenv: Makefile distinfo 
devel/py-virtualenv/pkg: PLIST 

Log message:
update to py3-virtualenv-20.24.3



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Stuart Henderson
CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2023/08/28 02:30:48

Modified files:
textproc/py-sphinx-automodapi: Makefile distinfo 

Log message:
update to py3-sphinx-automodapi-0.16.0



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Antoine Jacoutot
CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2023/08/28 01:34:29

Modified files:
graphics/gthumb: Makefile distinfo 
graphics/gthumb/patches: patch-gthumb_gth-browser_c 
graphics/gthumb/pkg: PLIST 
Removed files:
graphics/gthumb/patches: 
 patch-extensions_exiv2_tools_exiv2-utils_cpp 
 
patch-extensions_raw_files_gth-metadata-provider-raw_c 
 
patch-extensions_raw_files_gth-metadata-provider-raw_h 
 patch-extensions_raw_files_main_c 

Log message:
Update to gthumb-3.12.3.



[maintainer update] getmail 6.18.12 -> 6.18.13

2023-08-28 Thread Martin Ziemer
This patch updates getmail from 6.18.12 to 6.18.13.

Tested on amd64.


Index: Makefile
===
RCS file: /cvs/ports/mail/getmail/Makefile,v
retrieving revision 1.105
diff -u -p -r1.105 Makefile
--- Makefile7 Feb 2023 16:35:52 -   1.105
+++ Makefile28 Aug 2023 06:54:54 -
@@ -1,6 +1,6 @@
 COMMENT=   IMAP/POP3/SDPS mail retriever
 
-MODPY_EGG_VERSION= 6.18.12
+MODPY_EGG_VERSION= 6.18.13
 GH_ACCOUNT=getmail6
 GH_PROJECT=getmail6
 GH_TAGNAME=v${MODPY_EGG_VERSION}
Index: distinfo
===
RCS file: /cvs/ports/mail/getmail/distinfo,v
retrieving revision 1.84
diff -u -p -r1.84 distinfo
--- distinfo7 Feb 2023 16:35:52 -   1.84
+++ distinfo28 Aug 2023 06:54:54 -
@@ -1,2 +1,2 @@
-SHA256 (getmail6-6.18.12.tar.gz) = QZ3BEYSxR+9NqsLsnxNrGzfmRQ4vRAmWKaa3ZQ3rBEo=
-SIZE (getmail6-6.18.12.tar.gz) = 207087
+SHA256 (getmail6-6.18.13.tar.gz) = l3qPv2NJS2J4ww8iXHv7x8vf3/3b0vKfzYh9+2zg1Qk=
+SIZE (getmail6-6.18.13.tar.gz) = 213033
Index: patches/patch-getmails
===
RCS file: /cvs/ports/mail/getmail/patches/patch-getmails,v
retrieving revision 1.3
diff -u -p -r1.3 patch-getmails
--- patches/patch-getmails  7 Feb 2023 16:35:52 -   1.3
+++ patches/patch-getmails  28 Aug 2023 06:54:54 -
@@ -1,10 +1,10 @@
-# Fix for use on OpenBSD and ignore Directories in folder
+# Fix for use on OpenBSD
 
 Index: getmails
 --- getmails.orig
 +++ getmails
-@@ -28,7 +28,7 @@ BASE1=${1##*/}
- [ "$BASE1" != "${BASE1#$2}" ] && return 0 || return 1
+@@ -38,7 +38,7 @@ isrc() {
+ [ -f "$1" ] && return 0 || return 1;
  }
  UID_BY_ID=$(id -u)
 -PID_GETMAILS=$(pgrep -U $UID_BY_ID '^getmails$')
@@ -12,23 +12,3 @@ Index: getmails
  if [ "x$PID_GETMAILS" != "x$$" ]; then
echo "The getmails script is already running as PID=\"$PID_GETMAILS\" 
." >&2
exit 1
-@@ -57,7 +57,8 @@ if $para ; then
-! endwith "$file" '#' && \
-! startswith "$file" 'oldmail-' && \
-! endwith "$file" '.swp' && \
--   ! endwith "$file" '.bak' ; then
-+   ! endwith "$file" '.bak' && \
-+   [ -f "$file" ]; then
-   $rcfiles --rcfile "$file" "$@" &
-   pids="$pids $!"
- fi
-@@ -79,7 +80,8 @@ else
-! endwith "$file" '#' && \
-! startswith "$file" 'oldmail-' && \
-! endwith "$file" '.swp' && \
--   ! endwith "$file" '.bak' ; then
-+   ! endwith "$file" '.bak' && \
-+   [ -f "$file" ]; then
- rcfiles="$rcfiles --rcfile \"$file\""
- fi
- done



Re: graphics/imlib2 without rust

2023-08-28 Thread Stefan Hagen
George Koehler wrote (2023-08-27 00:12 CEST):
> On Thu, 24 Aug 2023 12:48:22 +0200
> Omar Polo  wrote:
> 
> > while I can't test on a !rust arch I did a few 'simulation' and it
> > seems to package correctly both with and without rsvg.
> > 
> > not super-familiar with plist fragments but it seems fine.  ok op@
> 
> semarie@ showed me how to conditionally comment a file in PLIST.
> This is easier than a plist fragment for a small number of files
> (here, only svg.so).
> 
> The diff now sets COMMENT_SVG to an empty string or "@comment ".
> I will commit it after I finish checking it.

Nice! I learned this too now. The port looks good here on amd64. I don't
have a non-rust arch available, so I changed ".if ${PROPERTIES:Mrust}"
to ".if 0" and build it that way.

Works as intended. I tested with nsxiv, which picks up .svg files when 
imlib2 is built with rsvg, and ignores these files when not.

OK sdk

> Index: Makefile
> ===
> RCS file: /cvs/ports/graphics/imlib2/Makefile,v
> retrieving revision 1.49
> diff -u -p -r1.49 Makefile
> --- Makefile  7 May 2023 06:54:21 -   1.49
> +++ Makefile  26 Aug 2023 21:53:59 -
> @@ -1,6 +1,7 @@
>  COMMENT= image manipulation library
>  
>  DISTNAME=imlib2-1.11.0
> +REVISION=0
>  SHARED_LIBS= Imlib2  8.0 # 12.0
>  CATEGORIES=  graphics
>  
> @@ -11,14 +12,11 @@ PERMIT_PACKAGE=   Yes
>  
>  MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=enlightenment/}
>  
> -WANTLIB += ${COMPILER_LIBCXX} X11 X11-xcb Xau Xdmcp Xext Xrender
> -WANTLIB += aom brotlicommon brotlidec brotlienc bz2 c cairo cairo-gobject
> -WANTLIB += dav1d de265 expat ffi fontconfig freetype gdk_pixbuf-2.0
> -WANTLIB += gif gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 harfbuzz
> -WANTLIB += heif hwy iconv id3tag intl jpeg jxl jxl_threads lcms2
> -WANTLIB += lzma m openjp2 pango-1.0 pangocairo-1.0 pangoft2-1.0
> -WANTLIB += pcre2-8 pixman-1 png rsvg-2 tiff webp webpdemux x265
> -WANTLIB += xcb xcb-render xcb-shm xml2 z zstd
> +WANTLIB += ${COMPILER_LIBCXX} X11 X11-xcb Xau Xdmcp Xext aom brotlicommon
> +WANTLIB += brotlidec brotlienc bz2 c dav1d de265 freetype gif
> +WANTLIB += heif hwy id3tag jpeg jxl jxl_threads lcms2 lzma m openjp2
> +WANTLIB += png sharpyuv tiff webp webpdemux x265 xcb xcb-shm z
> +WANTLIB += zstd
>  
>  COMPILER=base-clang ports-gcc
>  
> @@ -31,14 +29,29 @@ LIB_DEPENDS+= archivers/bzip2 \
>   graphics/openjp2 \
>   graphics/png \
>   graphics/tiff \
> - multimedia/libheif \
> - x11/gnome/librsvg
> + multimedia/libheif
>  
>  SEPARATE_BUILD=  Yes
>  CONFIGURE_STYLE= gnu
>  .if ${MACHINE_ARCH} == "i386"
>  CONFIGURE_ARGS+= --disable-mmx
>  .endif
> +
> +.include 
> +.if ${PROPERTIES:Mrust}
> +# We have librsvg-2.0 >= 2.46 only for rust archs.
> +WANTLIB += Xrender cairo cairo-gobject expat ffi fontconfig gdk_pixbuf-2.0
> +WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 harfbuzz iconv
> +WANTLIB += intl pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre2-8
> +WANTLIB += pixman-1 rsvg-2 xcb-render xml2
> +LIB_DEPENDS+=x11/gnome/librsvg
> +COMMENT_SVG=
> +.else
> +CONFIGURE_ARGS+= --without-svg
> +COMMENT_SVG= "@comment "
> +.endif
> +SUBST_VARS+= COMMENT_SVG
> +UPDATE_PLIST_ARGS+=  -c COMMENT_SVG
>  
>  CONFIGURE_ARGS+= --without-ps
>  
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/graphics/imlib2/pkg/PLIST,v
> retrieving revision 1.12
> diff -u -p -r1.12 PLIST
> --- pkg/PLIST 29 Apr 2023 08:10:43 -  1.12
> +++ pkg/PLIST 26 Aug 2023 21:53:59 -
> @@ -33,7 +33,7 @@ lib/imlib2/loaders/
>  @so lib/imlib2/loaders/lzma.so
>  @so lib/imlib2/loaders/png.so
>  @so lib/imlib2/loaders/pnm.so
> -@so lib/imlib2/loaders/svg.so
> +${COMMENT_SVG}@so lib/imlib2/loaders/svg.so
>  @so lib/imlib2/loaders/tga.so
>  @so lib/imlib2/loaders/tiff.so
>  @so lib/imlib2/loaders/webp.so
> 



CVS: cvs.openbsd.org: ports

2023-08-28 Thread Landry Breuil
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org  2023/08/28 00:28:10

Modified files:
x11/xfce4/xfce4-appfinder: Makefile distinfo 

Log message:
x11/xfce4/xfce4-appfinder: update to 4.18.1.

see https://mail.xfce.org/pipermail/xfce-announce/2023-August/001319.html



Re: [maintainer update] nnn 4.8 -> 4.9

2023-08-28 Thread Martin Ziemer
Am Sun, Aug 27, 2023 at 07:59:35PM +0200 schrieb Stefan Hagen:
> Martin Ziemer wrote (2023-08-27 08:04 CEST):
> > This patch updates nnn from 4.8 to 4.9.
> > 
> > Tested on amd64.
> 
> Have you tried the -nerd flavor?
No, just the "normal" version.

> We should update nerd fonts to 3.0 first and then update nnn.
Yes. Sorry for not checking the nerd flavor.