CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2022/02/27 20:47:03

Modified files:
math/py-scikit-learn: Makefile 

Log message:
we have pytest >= 5.0.1 now

CVS: cvs.openbsd.org: ports

[Gleydson Soares]

CVSROOT:/cvs
Module name:ports
Changes by: gsoa...@cvs.openbsd.org 2022/02/27 19:02:12

Modified files:
multimedia/mpv : Makefile 

Log message:
hook up www/yt-dlp to RUN_DEPENDS, unbreak mpv's ytdl_hook.lua script
ok sthen

Re: [UPDATE] lang/nim to 1.6.4

[Omar Polo]

Volker Schlecht  wrote:
> I think I got all -O3 replaced by -O2 now. It's still mostly hardcoded 
> and not picked up from CFLAGS.
> 
> That seems to be intentional:
> https://github.com/nim-lang/Nim/issues/3050
> 
> Also included:
> 
> * your fix for i386 CPU detection
> * removed the git call when building nimble
> * @sample rename.rules.cfg
> * I'm taking the gamble that the
> "slow machines can get a head of themselves and fail to link"
> comment is not valid anymore, using MAKE_JOBS for the parallelBuild 
> parameter.

I can't really comment on that.  If it was set that way it was for a
reason, but IIRC until we add the DPB_PROPERTIES parallel to the port it
should still be built with one job on bulk machines, so...

(plus i'm happy to see the speed up on my machine!)

> How does that work for you?

almost there :)

The point is not really to blindly use "-O2" instead of "-O3", but to
respect the CFLAGS from /etc/mk.conf (which are "-O2 -pipe" by default.)
The attached patch does that using SUBST_CMD to set the correct CFLAGS
in pre-configure.  However this has the consequence (advantage?) that
all the executables built with nim will probably inherit the CFLAGS that
were set at build time, don't know if it's unwanted or not.  There's
also the issue that now the "speed" and "size" cflags are actually the
same ^^

I've added some comments to the patches, the only thing I don't
understand is why comment useFork (I admit I haven't looked into what it
does)

I've also taken the chance to do some cosmethic changes to the makefile:

 - drop unused variable VERSION
 - no need to ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin, it's already there
 - group some common patterns in a .for loop

Thoughts?


Index: Makefile
===
RCS file: /home/cvs/ports/lang/nim/Makefile,v
retrieving revision 1.11
diff -u -p -r1.11 Makefile
--- Makefile2 May 2020 09:33:06 -   1.11
+++ Makefile27 Feb 2022 23:33:05 -
@@ -2,25 +2,24 @@
 
 ONLY_FOR_ARCHS =   i386 amd64
 
-BROKEN-i386 = hardcodes gcc; see config/nim.cfg
-
 COMMENT =  statically typed, imperative programming language
 
-VERSION =  1.2.0
-DISTNAME = nim-${VERSION}
+DISTNAME = nim-1.6.4
 EXTRACT_SUFX = .tar.xz
-REVISION = 0
 
 CATEGORIES =   lang
 
-HOMEPAGE = http://nim-lang.org/
-MASTER_SITES = http://nim-lang.org/download/ \
-   https://download.tuxfamily.org/jod/lang/nim/
+HOMEPAGE = https://nim-lang.org/
+MASTER_SITES = https://nim-lang.org/download/
 
 # MIT
 PERMIT_PACKAGE =   Yes
 
-WANTLIB =  c m
+WANTLIB =  c m pthread
+
+MODULES =  lang/python
+
+SUBST_VARS +=  CFLAGS
 
 post-patch:
mkdir -p ${WRKSRC}/nimcache-port
@@ -29,26 +28,30 @@ post-patch:
perl -i -pe "s#NIM_PORT_CACHE#${WRKSRC}/nimcache-port-test#" \
${WRKSRC}/koch.nim
 
+pre-configure:
+   ${SUBST_CMD} ${WRKSRC}/config/nim.cfg
+
 do-build:
cd ${WRKSRC} && ${SETENV} CC="${CC}" LINKER="${CC}" \
+   COMP_FLAGS="${CPPFLAGS} ${CFLAGS}" LINK_FLAGS="${LDFLAGS}" \
CFLAGS="${CFLAGS}" sh build.sh
-   # slow machines can get a head of themselves and fail to link
-   cd ${WRKSRC} && bin/nim c -d:release --parallelBuild:1 \
+   cd ${WRKSRC} && bin/nim c -d:release --parallelBuild:${MAKE_JOBS} \
--nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
--listCmd --putenv:"PATH=${PATH}" koch
-   cd ${WRKSRC} && ./koch boot -d:release --parallelBuild:1 \
-   --nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
-   --listCmd --putenv:"PATH=${PATH}"
-   cd ${WRKSRC} && ./koch nimble -d:release --parallelBuild:1 \
+.for t in boot nimble tools
+   cd ${WRKSRC} && ./koch $t -d:release --parallelBuild:${MAKE_JOBS} \
--nimcache:"${WRKSRC}/nimcache-port" --listFullPaths \
--listCmd --putenv:"PATH=${PATH}"
+.endfor
 
 do-install:
-   ${INSTALL_PROGRAM_DIR} ${PREFIX}/bin
-   ${INSTALL_PROGRAM} ${WRKSRC}/bin/nim ${PREFIX}/bin
-   ${INSTALL_PROGRAM} ${WRKSRC}/bin/nimble ${PREFIX}/bin
+.for b in nim nimble nimpretty nimgrep nimsuggest testament
+   ${INSTALL_PROGRAM} ${WRKSRC}/bin/$b ${PREFIX}/bin
+.endfor
${INSTALL_DATA_DIR} ${PREFIX}/lib/nim
cp -R ${WRKSRC}/lib/* ${PREFIX}/lib/nim
+   ${MODPY_BIN} ${MODPY_LIBDIR}/compileall.py \
+   ${PREFIX}/lib/nim/pure/unidecode/gen.py
chown -R ${LIBOWN}:${LIBGRP} ${PREFIX}/lib/nim
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nim
${INSTALL_DATA} ${WRKSRC}/doc/*.txt ${PREFIX}/share/doc/nim
Index: distinfo
===
RCS file: /home/cvs/ports/lang/nim/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo2 May 2020 

Re: update net/{toxcore,toxic}

[Omar Polo]

frendly ping :)

Omar Polo  wrote:
> Hello,
> 
> this updates toxcore and toxic to the latest releases, the changelog is
> here:
> 
> https://github.com/TokTok/c-toxcore/releases/tag/v0.2.16
> https://github.com/TokTok/toxic/releases/tag/v0.11.3
> 
> It's a straightforward update, I've only tweaked toxcore makefile to
> avoid the otherwise unnecessary variable V and added the new lib
> depends.
> 
> The only other consumer, net/utox, still builds fine.  (tested on amd64
> and i386.)
> 
> Comments/OK?
> 
> side question: some files have the executable bit set.  What's the
> correct way to fix those with CVS?  They get updated upon commit?
> 
> Thanks,
> 
> Omar Polo

Index: toxcore/Makefile
===
RCS file: /home/cvs/ports/net/toxcore/Makefile,v
retrieving revision 1.8
diff -u -p -r1.8 Makefile
--- toxcore/Makefile3 Jan 2021 19:35:02 -   1.8
+++ toxcore/Makefile19 Feb 2022 14:41:15 -
@@ -2,14 +2,13 @@
 
 COMMENT =  Tox client library
 
-V =0.2.12
-DISTNAME = toxcore-$V
+PKGNAME =  ${DISTNAME:S/c-//}
 
 GH_ACCOUNT =   TokTok
 GH_PROJECT =   c-toxcore
-GH_TAGNAME =   v$V
+GH_TAGNAME =   v0.2.16
 
-SHARED_LIBS += toxcore 1.0
+SHARED_LIBS += toxcore 2.0
 
 CATEGORIES =   net telephony
 
@@ -18,13 +17,14 @@ HOMEPAGE =  https://tox.chat/
 # GPLv3+
 PERMIT_PACKAGE =   Yes
 
-WANTLIB = c config m opus pthread sodium vpx
+WANTLIB = c config m opus msgpackc pthread sodium vpx
 
 MODULES =  devel/cmake
 COMPILER = base-clang ports-gcc
 
 LIB_DEPENDS =  audio/opus \
devel/libconfig \
+   devel/msgpack \
multimedia/libvpx \
security/libsodium
 
Index: toxcore/distinfo
===
RCS file: /home/cvs/ports/net/toxcore/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- toxcore/distinfo3 Jan 2021 19:35:02 -   1.3
+++ toxcore/distinfo19 Feb 2022 15:27:31 -
@@ -1,2 +1,2 @@
-SHA256 (toxcore-0.2.12.tar.gz) = MK4yY8m2jTvvBveZup16Z+P61EcDBiXw/6S7ImhCKLA=
-SIZE (toxcore-0.2.12.tar.gz) = 504832
+SHA256 (c-toxcore-0.2.16.tar.gz) = ZTqkJlS2B/CUDOz6yHPpzlVgURmpDR3EVNEJD/bKKcA=
+SIZE (c-toxcore-0.2.16.tar.gz) = 556720
Index: toxcore/pkg/PLIST
===
RCS file: /home/cvs/ports/net/toxcore/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- toxcore/pkg/PLIST   3 Jan 2021 19:35:02 -   1.2
+++ toxcore/pkg/PLIST   19 Feb 2022 14:37:40 -
@@ -3,8 +3,13 @@
 @bin bin/tox-bootstrapd
 include/tox/
 include/tox/tox.h
+include/tox/tox_dispatch.h
+include/tox/tox_events.h
 include/tox/toxav.h
 include/tox/toxencryptsave.h
 @static-lib lib/libtoxcore.a
 @lib lib/libtoxcore.so.${LIBtoxcore_VERSION}
 lib/pkgconfig/toxcore.pc
+share/bash-completion/
+share/bash-completion/completions/
+share/bash-completion/completions/tox-bootstrapd
Index: toxic/Makefile
===
RCS file: /home/cvs/ports/net/toxic/Makefile,v
retrieving revision 1.15
diff -u -p -r1.15 Makefile
--- toxic/Makefile  17 Jan 2022 01:35:46 -  1.15
+++ toxic/Makefile  19 Feb 2022 14:46:59 -
@@ -4,8 +4,7 @@ COMMENT =   ncurses-based Tox client
 
 GH_ACCOUNT =   Jfreegman
 GH_PROJECT =   toxic
-GH_TAGNAME =   v0.11.1
-REVISION = 0
+GH_TAGNAME =   v0.11.3
 
 CATEGORIES =   net
 
Index: toxic/distinfo
===
RCS file: /home/cvs/ports/net/toxic/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- toxic/distinfo  14 Oct 2021 20:38:17 -  1.3
+++ toxic/distinfo  19 Feb 2022 14:47:15 -
@@ -1,2 +1,2 @@
-SHA256 (toxic-0.11.1.tar.gz) = XfjzzyHCsihUY5nwwqd8bY9TVpOahcMiIqT2omuCaIo=
-SIZE (toxic-0.11.1.tar.gz) = 1204163
+SHA256 (toxic-0.11.3.tar.gz) = Gj/UKJhSv2TuF7mKJ1l9DY9efTyayQGAvU5jqOWuU9k=
+SIZE (toxic-0.11.3.tar.gz) = 1197252

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2022/02/27 16:33:08

Modified files:
devel/py-async-timeout: Makefile 

Log message:
we have newer py-test now

CVS: cvs.openbsd.org: ports

[Daniel Dickman]

CVSROOT:/cvs
Module name:ports
Changes by: dan...@cvs.openbsd.org  2022/02/27 16:32:01

Modified files:
textproc/py-pygments: Makefile 

Log message:
we have py-test >= 6.0 now

Re: www/py-httpie update, NEW: textproc/py-charset-normalizer

[Kurt Mosiejczuk]

On Sun, Feb 27, 2022 at 01:54:17PM +, Stuart Henderson wrote:
> httpie updates require a new charset detection library, port for
> that attached. OK to import?

It needs textproc/py-inicofig and devel/py-test-cov as TEST_DEPENDS.
Otherwise ok kmos for import

> httpie update diff using it inline.

ok kmos

--Kurt

> Index: Makefile
> ===
> RCS file: /cvs/ports/www/py-httpie/Makefile,v
> retrieving revision 1.24
> diff -u -p -r1.24 Makefile
> --- Makefile  2 Nov 2021 00:02:53 -   1.24
> +++ Makefile  27 Feb 2022 13:53:48 -
> @@ -2,15 +2,14 @@
>  
>  COMMENT =command-line HTTP client
>  
> -MODPY_EGG_VERSION =  2.5.0
> +MODPY_EGG_VERSION =  3.0.2
>  GH_TAGNAME = ${MODPY_EGG_VERSION}
> -GH_ACCOUNT = jakubroztocil
> +GH_ACCOUNT = httpie
>  GH_PROJECT = httpie
> -REVISION =   0
>  
>  CATEGORIES = www net
>  
> -HOMEPAGE =   https://httpie.org/
> +HOMEPAGE =   https://httpie.io/
>  
>  # BSD
>  PERMIT_PACKAGE = Yes
> @@ -22,10 +21,12 @@ MODPY_SETUPTOOLS =Yes
>  MODPY_PYTEST =   Yes
>  
>  RUN_DEPENDS =net/py-socks${MODPY_FLAVOR} \
> - www/py-requests${MODPY_FLAVOR} \
> - www/py-requests-toolbelt${MODPY_FLAVOR} \
> + textproc/py-charset-normalizer${MODPY_FLAVOR} \
>   textproc/py-defusedxml${MODPY_FLAVOR} \
> - textproc/py-pygments${MODPY_FLAVOR}
> + textproc/py-pygments${MODPY_FLAVOR} \
> + www/py-multidict${MODPY_FLAVOR} \
> + www/py-requests${MODPY_FLAVOR} \
> + www/py-requests-toolbelt${MODPY_FLAVOR}
>  TEST_DEPENDS =   devel/py-test-httpbin${MODPY_FLAVOR} \
>   devel/py-mock${MODPY_FLAVOR}
>  TEST_ENV =   PY_IGNORE_IMPORTMISMATCH=1
> Index: distinfo
> ===
> RCS file: /cvs/ports/www/py-httpie/distinfo,v
> retrieving revision 1.13
> diff -u -p -r1.13 distinfo
> --- distinfo  3 Oct 2021 19:17:10 -   1.13
> +++ distinfo  27 Feb 2022 13:53:48 -
> @@ -1,2 +1,2 @@
> -SHA256 (httpie-2.5.0.tar.gz) = Zq9W4O/BymI3Mj8Rhro0vKG+JOZ6Qxn9XfciirmG+uo=
> -SIZE (httpie-2.5.0.tar.gz) = 1105177
> +SHA256 (httpie-3.0.2.tar.gz) = c3otfOOH6BysFKsHHKjyhwGnXSpNU6uMy466AaUHAvM=
> +SIZE (httpie-3.0.2.tar.gz) = 1169342
> Index: pkg/PLIST
> ===
> RCS file: /cvs/ports/www/py-httpie/pkg/PLIST,v
> retrieving revision 1.9
> diff -u -p -r1.9 PLIST
> --- pkg/PLIST 3 Oct 2021 19:17:10 -   1.9
> +++ pkg/PLIST 27 Feb 2022 13:53:48 -
> @@ -1,5 +1,6 @@
>  @comment $OpenBSD: PLIST,v 1.9 2021/10/03 19:17:10 sthen Exp $
>  bin/http
> +bin/httpie
>  bin/https
>  lib/python${MODPY_VERSION}/site-packages/httpie/
>  
> lib/python${MODPY_VERSION}/site-packages/httpie-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
> @@ -14,19 +15,21 @@ lib/python${MODPY_VERSION}/site-packages
>  
> ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}/
>  
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}adapters.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}downloads.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}encoding.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}sessions.${MODPY_PYC_MAGIC_TAG}pyc
> -lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}ssl.${MODPY_PYC_MAGIC_TAG}pyc
> +lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}ssl_.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}status.${MODPY_PYC_MAGIC_TAG}pyc
>  
> lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}uploads.${MODPY_PYC_MAGIC_TAG}pyc
>  
> 

Re: powerpc bulk build report

[George Koehler]

On Fri, 25 Feb 2022 12:44:43 -0700 (MST)
gkoeh...@openbsd.org wrote:

> Bulk build on macppc-0.ports.openbsd.org
> 
> Started : Fri Feb  4 19:39:07 MST 2022
> Finished: Fri Feb 25 12:44:23 MST 2022
> Duration: 20 Days 17 hours 5 minutes
> 
> Built using OpenBSD 7.0-current (GENERIC) #992: Thu Feb  3 01:10:29 MST 2022
> 
> Built 9265 packages

This is the first bulk with a fixed cairo-1.17.4p1, which fixes
gtk+[23] apps.  The packages in this bulk need libX11.so.17.1, which
is older than the newest libX11.so.18.0, so I see messages like,

sylpheed:/usr/X11R6/lib/libX11.so.18.0: /usr/X11R6/lib/libX11.so.17.1:
WARNING: symbol(_XkeyTable) size mismatch, relink your program

I can still use sylpheed to send this mail.  The faster arches have
fixed these messages by rebuilding all the packages.

The 12 build failures include 7 real failures and 5 false positives.
The 7 real failures are

emulators/higanLLVM ERROR: out of memory
emulators/mednafen error: ... #if LIBCO_COMPROTECT
games/hyperrogue   ./langen: Segmentation fault (core dumped)
games/irrlamb  error: unknown FP unit 'sse'
lang/pcc-libs  error: expected ';' after top-level asm block
lang/racket-minimal./racketcgc: out of memory
math/coq   pkg_create: Error: *.cmo does not exist

The only new failure is racket.

The 5 false positives are spyder3, py3-opcua-widgets, gpodder,
rednotebook, py3-qtconsole.  These packages exist.  Near the end of
the bulk, macppc-1 tried to rebuild them without installing python 3,
and the rebuilds failed.
--George

> Build failures: 12
> http://build-failures.rhaalovely.net/powerpc/2022-02-04/devel/spyder/spyder,python3.log
> http://build-failures.rhaalovely.net/powerpc/2022-02-04/emulators/higan.log
> http://build-failures.rhaalovely.net/powerpc/2022-02-04/emulators/mednafen.log
> http://build-failures.rhaalovely.net/powerpc/2022-02-04/games/hyperrogue.log
> http://build-failures.rhaalovely.net/powerpc/2022-02-04/games/irrlamb.log
> http://build-failures.rhaalovely.net/powerpc/2022-02-04/lang/pcc/pcc-libs.log
> http://build-failures.rhaalovely.net/powerpc/2022-02-04/lang/racket-minimal,no_jit.log
> http://build-failures.rhaalovely.net/powerpc/2022-02-04/math/coq.log
> http://build-failures.rhaalovely.net/powerpc/2022-02-04/misc/freeopcua/py-opcua-widgets,python3.log
> http://build-failures.rhaalovely.net/powerpc/2022-02-04/net/gpodder.log
> http://build-failures.rhaalovely.net/powerpc/2022-02-04/productivity/rednotebook.log
> http://build-failures.rhaalovely.net/powerpc/2022-02-04/shells/py-qtconsole,python3.log

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 15:50:23

Modified files:
devel/py-setuptools_scm: Makefile 

Log message:
py3-setuptools_scm now needs py3-packaging; add missing RDEP

setuptools picks up some extensions (lile setultools_scm) present at
build time and fails if they don't load, even if they're not wanted by
the software you're trying to build, so this caused a bunch of breakage
in unrelated ports as run into by naddy

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 15:27:26

Modified files:
devel  : Makefile 
devel/py-py: Makefile 
devel/py-py/pkg: DESCR PLIST 

Log message:
actually I had it right in devel/Makefile before, py2 py-py is unused
now, I just forgot to change FLAVOR/PLIST in the port itself

CVS: cvs.openbsd.org: ports

[Greg Steuck]

CVSROOT:/cvs
Module name:ports
Changes by: gne...@cvs.openbsd.org  2022/02/27 15:14:14

Modified files:
fonts/jetbrains-mono: Makefile distinfo 
fonts/jetbrains-mono/pkg: PLIST 

Log message:
Upgrade fonts/jetbrains-mono: 1.0.3->2.242

ok op@

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 14:56:37

Modified files:
devel  : Makefile 

Log message:
readd py2 py-py to devel/Makefile, the port itself is still 2+3 needed for 
py-six

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 13:26:31

Modified files:
x11/mplayer/patches: patch-configure 

Log message:
tweak to sndio pkgconfig bits, from Brad

Re: UPDATE: lang/dmd 2.098.0 => 2.098.1 and devel/dtools 2.098.0 => 2.098.1

[Ryan Boggs]

Hi,

On Sun, Jan 23, 2022, 6:03 PM Ryan Boggs  wrote:

> On Wed, Dec 29, 2021 at 8:55 AM Ryan Boggs  wrote:
> >
> > Hi,
> >
> > On amd64, dmd builds as expected and builds one of my projects  Dtools
> > builds as expected but very lightly tested.
> >
> > No issues.
> >
> > Thanks,
> > Ryan
> >
> > On Fri, Dec 24, 2021 at 8:32 AM Brian Callahan 
> wrote:
> > >
> > > Hi ports --
> > >
> > > Attached is an update to DMD and the D tools. Now that I have a better
> > > feel for how the update process will go, I've streamlined things to
> > > reduce/totally eliminate churn for each update. So apologies for the
> bit
> > > of churn in this one but it's a one-time thing.
> > >
> > > The changelog can be found here:
> https://dlang.org/changelog/2.098.1.html
> > >
> > > DMD and D tools need to be kept in sync, hence why both ports are being
> > > sent in one diff.
> > >
> > > Works well on amd64.
> > >
> > > OK?
> Any updates on this one?
>
Ping?

>
> > >
> > > ~Brian
>
> Thanks,
> Ryan
>

Re: [UPDATE] lang/nim to 1.6.4

[Omar Polo]

Omar Polo  wrote:
> Volker Schlecht  wrote:
> > Updates lang/nim to 1.6.4
> > 
> > * Builds tools along with the main compiler
> > -- nimgrep
> > -- nimpretty
> > -- nimsuggest
> > 
> > * Drops the install.sh patch (install.sh is not used in do-install)
> > 
> > * Drops defunct mirror site
> > 
> > Built and tested (toying with tutorials, installing packages with 
> > nimble, Neovim integration with nimsuggest) on amd64.
> 
> couple of comments, otherwise looks good :)
> 
>  - there are some -O3 hardcoded in the build that should be removed.  I
>killed the one in build.sh easily, but the rest of the build still uses
>-O3 and I don't know from whence it came.  I've patched 
> compiler/extccmop.nim,
>compile/mappings.txt and config/nim.cfg to remove every -O3 and -Os but 
> there
>are still lines like:
> 
> Hint: clang -c -w -ferror-limit=3 -O3 -fno-ident
> -I/home/_pobj/nim-1.6.4/nim-1.6.4/lib -I/usr/local/include
> -I/usr/local/include -I/home/_pobj/nim-1.6.4/nim-1.6.4/compiler -o
> /home/_pobj/nim-1.6.4/nim-1.6.4/nimcache-port/@mwordrecg.nim.c.o
> /home/_pobj/nim-1.6.4/nim-1.6.4/nimcache-port/@mwordrecg.nim.c [Exec]
> 
>(this one in particular completely ignores ${CFLAGS}...)
> 
>  - all the others share/examples/nim/*.cfg are @sample'd into /etc/nim/,
>should we do the same for the new rename.rules.cfg?
> 
> Btw, the build failure on i386 persist but for a different reason: it
> thinks it's running on amd64 and complains that sizeof(void *) != 8.

found it, I don't know how I haven't seen it before.  build.sh has:

case $ucpu in
  *i386* | *i486* | *i586* | *i686* | *bepc* | *i86pc* )
if [ isOpenIndiana -eq "yes" ]; then
  mycpu="amd64"
else
  mycpu="i386"
fi

Apart from the missing sigil and quoting around isOpenIndiana, -eq is to
compare numbers not strings, so test exits with 0 and mycpu is set to
amd64...  With s/-eq/==/ I can successfully build nim on i386.

still no idea for the -O3...

oh, and waiting for the build on i386 i noticed that it tries to call
git, another thing that should be dropped:

/usr/ports/pobj/nim-1.6.4/nim-1.6.4/dist/nimble/src/nimblepkg/options.nim(168,14)
Warning: Couldn't determine GIT hash: fatal: not a git repository (or
any parent up to mount point /) Stopping at filesystem boundary
(GIT_DISCOVERY_ACROSS_FILESYSTEM not set). [User]

Re: mpv: add youtube-dl to RUN_DEPENDS

[Gleydson Soares]

>yt-dlp would probably be a better choice (mpv prefers it over
>youtube-dl).

sure, i couldn't agree more about it.
diff updated, ok?

Index: Makefile
===
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.79
diff -u -p -u -p -r1.79 Makefile
--- Makefile29 Jan 2022 12:30:14 -  1.79
+++ Makefile27 Feb 2022 18:34:42 -
@@ -6,6 +6,8 @@ GH_ACCOUNT =mpv-player
 GH_PROJECT =   mpv
 GH_TAGNAME =   v0.34.1
 
+REVISION = 0
+
 SHARED_LIBS += mpv 0.2 # 1.109
 
 CATEGORIES =   multimedia x11
@@ -54,6 +56,7 @@ LIB_DEPENDS = archivers/libarchive \
 
 MODPY_RUNDEP = No
 RUN_DEPENDS =  devel/desktop-file-utils \
+   www/yt-dlp \
x11/gtk+3,-guic
 
 SEPARATE_BUILD =   Yes

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 11:35:08

Modified files:
geo/foxtrotgps : Makefile 
geo/foxtrotgps/patches: patch-src_gps_functions_c 

Log message:
fix with newer gpsd, whuch removed deprecated STATUS_NO_FIX in favour
of fix.mode. adapted from upstream commit (whuch added fix.mode but didn't
remove STATUS_NO_FIX)..

Re: [UPDATE] lang/nim to 1.6.4

[Omar Polo]

Volker Schlecht  wrote:
> Updates lang/nim to 1.6.4
> 
> * Builds tools along with the main compiler
> -- nimgrep
> -- nimpretty
> -- nimsuggest
> 
> * Drops the install.sh patch (install.sh is not used in do-install)
> 
> * Drops defunct mirror site
> 
> Built and tested (toying with tutorials, installing packages with 
> nimble, Neovim integration with nimsuggest) on amd64.

couple of comments, otherwise looks good :)

 - there are some -O3 hardcoded in the build that should be removed.  I
   killed the one in build.sh easily, but the rest of the build still uses
   -O3 and I don't know from whence it came.  I've patched 
compiler/extccmop.nim,
   compile/mappings.txt and config/nim.cfg to remove every -O3 and -Os but there
   are still lines like:

Hint: clang -c -w -ferror-limit=3 -O3 -fno-ident
-I/home/_pobj/nim-1.6.4/nim-1.6.4/lib -I/usr/local/include
-I/usr/local/include -I/home/_pobj/nim-1.6.4/nim-1.6.4/compiler -o
/home/_pobj/nim-1.6.4/nim-1.6.4/nimcache-port/@mwordrecg.nim.c.o
/home/_pobj/nim-1.6.4/nim-1.6.4/nimcache-port/@mwordrecg.nim.c [Exec]

   (this one in particular completely ignores ${CFLAGS}...)

 - all the others share/examples/nim/*.cfg are @sample'd into /etc/nim/,
   should we do the same for the new rename.rules.cfg?

Btw, the build failure on i386 persist but for a different reason: it
thinks it's running on amd64 and complains that sizeof(void *) != 8.

[new] sysutils/cortex-tools v0.10.7

[Denis Fondras]

A set of powerful command line tools for interacting with Cortex
and friends.

* cortextool: Interacts with user-facing Cortex APIs and backend
  storage components
* chunktool: Interacts with chunks stored and indexed in Cortex
  storage backends.
* logtool: Tool which parses Cortex query-frontend logs and formats
  them for easy analysis.

https://cortexmetrics.io/

OK ?


cortex-tools-v0.10.7.tgz
Description: application/tar-gz

Re: mpv: add youtube-dl to RUN_DEPENDS

[Stuart Henderson]

yt-dlp would probably be a better choice (mpv prefers it over youtube-dl).

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

On 27 February 2022 14:24:32 Gleydson Soares  wrote:


the following patch adds youtube-dl to mpv's RUN_DEPENDS.

$ mpv --no-video https://www.youtube.com/watch?v=...
[ytdl_hook]
[ytdl_hook] youtube-dl failed: not found or not enough permissions
Failed to recognize file format.

OK?

Thanks,
gsoares

Re: riscv64 bulk build report

[Jeremie Courreges-Anglas]

On Sun, Feb 27 2022, j...@wxcvbn.org wrote:
> Bulk build on riscv64.ports.openbsd.org
>
> Started : Sun Feb 20 03:54:32 MST 2022
> Finished: Sun Feb 27 07:27:46 MST 2022
> Duration: 7 Days 3 hours 33 minutes
>
> Built using OpenBSD 7.0-current (GENERIC.MP) #45: Fri Feb 18 05:43:50 MST 2022
>
> Built 9172 packages
>
> Number of packages built each day:
> Feb 20: 2905
> Feb 21: 830
> Feb 22: 457
> Feb 23: 667
> Feb 24: 633
> Feb 25: 655
> Feb 26: 835
> Feb 27: 2190
>
>
> Critical path missing pkgs:
> http://build-failures.rhaalovely.net/riscv64/2022-02-20/summary.log
>
> Build failures: 3

False positives,

> http://build-failures.rhaalovely.net/riscv64/2022-02-20/devel/libsoup2.log
> cp: paths/devel/libsoup2.log: No such file or directory

Bogus package.

> http://build-failures.rhaalovely.net/riscv64/2022-02-20/geo/gpsbabel,-main.log
> cp: paths/geo/gpsbabel,-main.log: No such file or directory

Was not ignored even though qtwebengine isn't built on riscv64.

> http://build-failures.rhaalovely.net/riscv64/2022-02-20/multimedia/mlt7,-main.log
> cp: paths/multimedia/mlt7,-main.log: No such file or directory

Shouldn't have been tried, because it depends on
pulseaudio -> consolekit -> polkit -> spidermonkey78 -> rust...

> Recurrent failures:
>
> New failures:
>
> Resolved failures:
> -failures/geo/gpsbabel,-main.log
> -failures/multimedia/mlt7,-main.log
>
> Packages newly built:
> +devel/libgusb
> +devel/py-beniget,python3
> +devel/py-gast,python3
> +devel/py-matrix-common,python3
> +devel/py-rx,python3
> +lang/pythran
> +net/libnice
> +www/unit/unit-php,php74
> +x11/py-i3ipc,python3
>
> Packages not built this time:
> -geo/geoclue
> -lang/php/7.4,embed,-main
> -x11/qt5/qtdeclarative,
>

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

update games/godot to 3.4.3

[Omar Polo]

Hello ports,

please find attached a diff to update games/godot to its latest release.
The announcement is available here:

https://godotengine.org/article/maintenance-release-godot-3-4-3

> As of now, there are no known incompatibilities with the previous
> Godot 3.4.x releases. We encourage all users to upgrade to 3.4.3.

port wise I've switched it to devel/bullet instead of the bundled copy
since we finally have a recent version of it.

Quickly tested and seems to work just fine, audio included :)


Index: Makefile
===
RCS file: /home/cvs/ports/games/godot/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile23 Dec 2021 02:25:33 -  1.31
+++ Makefile26 Feb 2022 07:36:22 -
@@ -4,7 +4,7 @@ BROKEN-powerpc =fails at runtime, the U
 
 COMMENT =  2D and 3D game engine
 
-V =3.4.2
+V =3.4.3
 GODOTSTEAM_V = g34-s152-gs311
 DISTNAME = godot-${V}-stable
 PKGNAME =  godot-${V}
@@ -15,8 +15,8 @@ MAINTAINER =  Omar Polo 
 # MIT
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += ${COMPILER_LIBCXX}
-WANTLIB += GL X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr
+WANTLIB += ${COMPILER_LIBCXX} BulletCollision BulletDynamics BulletSoftBody
+WANTLIB += LinearMath GL X11 Xau Xcursor Xdmcp Xext Xfixes Xi Xinerama Xrandr
 WANTLIB += Xrender c enet execinfo freetype intl m mbedtls mbedcrypto
 WANTLIB += mbedx509 mpcdec ogg opus opusfile png sndio steam_api theora
 WANTLIB += theoradec vorbis vorbisfile webp xcb z pcre2-32 vpx zstd
@@ -32,7 +32,7 @@ EXTRACT_SUFX =.tar.xz
 DIST_SUBDIR =   ${PKGNAME}
 
 MODULES =  devel/scons
-# Can't disable builtin_bullet until devel/bullet has been updated to 2.88
+
 # 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}" \
@@ -40,6 +40,7 @@ MODSCONS_FLAGS =  CC="${CC}" \
CFLAGS="${CFLAGS}" \
CXXFLAGS="${CXXFLAGS} -Wno-deprecated-register" \
LINKFLAGS="${LDFLAGS} -lintl -lmpcdec" \
+   builtin_bullet=no \
builtin_enet=no \
builtin_freetype=no \
builtin_glew=no \
@@ -73,6 +74,7 @@ LIB_DEPENDS = archivers/zstd \
audio/libvorbis \
audio/musepack \
audio/opusfile \
+   devel/bullet \
devel/gettext,-runtime \
devel/pcre2 \
games/goldberg_emulator \
Index: distinfo
===
RCS file: /home/cvs/ports/games/godot/distinfo,v
retrieving revision 1.12
diff -u -p -r1.12 distinfo
--- distinfo23 Dec 2021 02:25:33 -  1.12
+++ distinfo26 Feb 2022 07:36:47 -
@@ -1,4 +1,4 @@
-SHA256 (godot-3.4.2/g34-s152-gs311.tar.gz) = 
hjoW9t+RN6JTjWn2RhEZ2H7EljJ5tV5ybU4JwK/6wpc=
-SHA256 (godot-3.4.2/godot-3.4.2-stable.tar.xz) = 
+VfBBxgrq8yqMn4xwlM92Fvx0gLuv2DVbLpSf8KaHlU=
-SIZE (godot-3.4.2/g34-s152-gs311.tar.gz) = 197461
-SIZE (godot-3.4.2/godot-3.4.2-stable.tar.xz) = 22399864
+SHA256 (godot-3.4.3/g34-s152-gs311.tar.gz) = 
hjoW9t+RN6JTjWn2RhEZ2H7EljJ5tV5ybU4JwK/6wpc=
+SHA256 (godot-3.4.3/godot-3.4.3-stable.tar.xz) = 
ZG56zh93N/52F0xUk52yDC98BQ2NhzYc+BZNQFnmVF0=
+SIZE (godot-3.4.3/g34-s152-gs311.tar.gz) = 197461
+SIZE (godot-3.4.3/godot-3.4.3-stable.tar.xz) = 22413508

Anyone else with cups/backend/usb crashed on signal 11

[Mikolaj Kucharski]

I've noticed this recently, and didn't dive into it yet. Was wondering
did anyone else see this?

This is triggered by network print via Android phone, with service
discovery by avahi.

OpenBSD 7.1-beta (GENERIC.MP) #387: Sat Feb 26 17:21:00 MST 2022
dera...@amd64.openbsd.org:/usr/src/sys/arch/amd64/compile/GENERIC.MP


# pkg_info -qI | grep cups
cups-2.4.1
cups-filters-1.28.12
cups-libs-2.4.1
debug-cups-2.4.1
debug-cups-filters-1.28.12
debug-cups-libs-2.4.1


# egdb /usr/local/libexec/cups/backend/usb /usb.core
GNU gdb (GDB) 9.2
Copyright (C) 2020 Free Software Foundation, Inc.
License GPLv3+: GNU GPL version 3 or later 
This is free software: you are free to change and redistribute it.
There is NO WARRANTY, to the extent permitted by law.
Type "show copying" and "show warranty" for details.
This GDB was configured as "x86_64-unknown-openbsd7.1".
Type "show configuration" for configuration details.
For bug reporting instructions, please see:
.
Find the GDB manual and other documentation resources online at:
.

For help, type "help".
Type "apropos word" to search for commands related to "word"...
Reading symbols from /usr/local/libexec/cups/backend/usb...
Reading symbols from /usr/local/libexec/cups/backend/.debug/usb.dbg...
[New process 501399]
[New process 303223]
Core was generated by `usb'.
Program terminated with signal SIGSEGV, Segmentation fault.
#0  0x0e413e79c530 in libusb_submit_transfer () from 
/usr/local/lib/libusb-1.0.so.1.2
[Current thread is 1 (process 501399)]
(gdb) bt
#0  0x0e413e79c530 in libusb_submit_transfer () from 
/usr/local/lib/libusb-1.0.so.1.2
#1  0x0e413e79e6ad in do_sync_bulk_transfer () from 
/usr/local/lib/libusb-1.0.so.1.2
#2  0x0e413e79e5de in libusb_bulk_transfer () from 
/usr/local/lib/libusb-1.0.so.1.2
#3  0x0e3f0092cd28 in read_thread (reference=) at 
./usb-libusb.c:1734
#4  0x0e41e0311621 in _rthread_start (v=) at 
/usr/src/lib/librthread/rthread.c:96
#5  0x0e41f8542b3a in __tfork_thread () at 
/usr/src/lib/libc/arch/amd64/sys/tfork_thread.S:84
(gdb)


from /var/log/cups/error_log
...
D [27/Feb/2022:09:02:50 +] [Job 39] Read 7848 bytes of print data...
D [27/Feb/2022:09:02:50 +] [Job 39] kid4 exited with status 0
D [27/Feb/2022:09:02:50 +] [Job 39] kid3 finished
D [27/Feb/2022:09:02:50 +] [Job 39] Kid3 exit status: 0
D [27/Feb/2022:09:02:50 +] [Job 39] Closing foomatic-rip.
D [27/Feb/2022:09:02:50 +] [Job 39] Wrote 7848 bytes of print data...
D [27/Feb/2022:09:02:50 +] [Job 39] Sent 286376 bytes...
D [27/Feb/2022:09:02:50 +] [Job 39] Waiting for read thread to exit...
D [27/Feb/2022:09:02:50 +] [Job 39] PID 17625 
(/usr/local/libexec/cups/filter/foomatic-rip) exited with no errors.
D [27/Feb/2022:09:02:50 +] [Job 39] Read thread still active, aborting the 
pending read...
D [27/Feb/2022:09:02:50 +] [Job 39] Device reset failed, error code: -12
D [27/Feb/2022:09:02:50 +] [Job 39] PID 55597 
(/usr/local/libexec/cups/backend/usb) crashed on signal 11.
D [27/Feb/2022:09:02:50 +] [Job 39] Hint: Try setting the LogLevel to 
"debug" to find out more.
D [27/Feb/2022:09:02:50 +] [Job 39] time-at-completed=1645952570
D [27/Feb/2022:09:02:50 +] [Job 39] End of messages
D [27/Feb/2022:09:02:50 +] [Job 39] printer-state=3(idle)
D [27/Feb/2022:09:02:50 +] [Job 39] printer-state-message="Backend failed"
D [27/Feb/2022:09:02:50 +] [Job 39] printer-state-reasons=none


# usbdevs -vvv
Controller /dev/usb0:
addr 01: 1022: AMD, xHCI root hub
 super speed, self powered, config 1, rev 1.00
 driver: uhub0
 port 01: .02a0 power Rx.detect
 port 02: .02a0 power Rx.detect
 port 03: .0503 connect enabled recovery
 port 04: .02a0 power Rx.detect
addr 02: 04e8:3469 Samsung Electronics Co., Ltd., M2070 Series
 high speed, self powered, config 1, rev 1.00, iSerial ZF46B8KM2D02Z1A
 driver: ugen0
Controller /dev/usb1:
addr 01: 1022: AMD, EHCI root hub
 high speed, self powered, config 1, rev 1.00
 driver: uhub1
 port 01: .0503 connect enabled power
 port 02: .0500 power
addr 02: 0438:7900 Advanced Micro Devices, Hub
 high speed, self powered, config 1, rev 0.18
 driver: uhub2
 port 01: .0100 power
 port 02: .0100 power
 port 03: .0503 connect enabled power
 port 04: .0100 power
addr 03: 1199:9071 Sierra Wireless, Incorporated, Sierra Wireless MC7455 
Qualcomm\M-. Snapdragon? X7 LTE-A
 high speed, power 500 mA, config 1, rev 0.06, iSerial LQ80634656021021
 driver: umb0
 driver: ugen1


# lsusb -vvv -d 04e8:3469

Bus 000 Device 002: ID 04e8:3469 Samsung Electronics Co., Ltd 
Device Descriptor:
  bLength18
  bDescriptorType 1
  bcdUSB  

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2022/02/27 07:41:06

Modified files:
misc/vttest: Makefile distinfo 

Log message:
misc/vttest: update to 20220215

CVS: cvs.openbsd.org: ports

[Christian Weisgerber]

CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2022/02/27 07:36:46

Modified files:
editors/nano   : Makefile distinfo 

Log message:
editors/nano: update to 6.2

riscv64 bulk build report

[jca]

Bulk build on riscv64.ports.openbsd.org

Started : Sun Feb 20 03:54:32 MST 2022
Finished: Sun Feb 27 07:27:46 MST 2022
Duration: 7 Days 3 hours 33 minutes

Built using OpenBSD 7.0-current (GENERIC.MP) #45: Fri Feb 18 05:43:50 MST 2022

Built 9172 packages

Number of packages built each day:
Feb 20: 2905
Feb 21: 830
Feb 22: 457
Feb 23: 667
Feb 24: 633
Feb 25: 655
Feb 26: 835
Feb 27: 2190


Critical path missing pkgs:
http://build-failures.rhaalovely.net/riscv64/2022-02-20/summary.log

Build failures: 3
http://build-failures.rhaalovely.net/riscv64/2022-02-20/devel/libsoup2.log
cp: paths/devel/libsoup2.log: No such file or directory
http://build-failures.rhaalovely.net/riscv64/2022-02-20/geo/gpsbabel,-main.log
cp: paths/geo/gpsbabel,-main.log: No such file or directory
http://build-failures.rhaalovely.net/riscv64/2022-02-20/multimedia/mlt7,-main.log
cp: paths/multimedia/mlt7,-main.log: No such file or directory

Recurrent failures:

New failures:

Resolved failures:
-failures/geo/gpsbabel,-main.log
-failures/multimedia/mlt7,-main.log

Packages newly built:
+devel/libgusb
+devel/py-beniget,python3
+devel/py-gast,python3
+devel/py-matrix-common,python3
+devel/py-rx,python3
+lang/pythran
+net/libnice
+www/unit/unit-php,php74
+x11/py-i3ipc,python3

Packages not built this time:
-geo/geoclue
-lang/php/7.4,embed,-main
-x11/qt5/qtdeclarative,

mpv: add youtube-dl to RUN_DEPENDS

[Gleydson Soares]

the following patch adds youtube-dl to mpv's RUN_DEPENDS.

$ mpv --no-video https://www.youtube.com/watch?v=...
[ytdl_hook]
[ytdl_hook] youtube-dl failed: not found or not enough permissions
Failed to recognize file format.

OK?

Thanks,
gsoares
Index: Makefile
===
RCS file: /cvs/ports/multimedia/mpv/Makefile,v
retrieving revision 1.79
diff -u -p -u -p -r1.79 Makefile
--- Makefile29 Jan 2022 12:30:14 -  1.79
+++ Makefile27 Feb 2022 13:06:35 -
@@ -6,6 +6,8 @@ GH_ACCOUNT =mpv-player
 GH_PROJECT =   mpv
 GH_TAGNAME =   v0.34.1
 
+REVISION = 0
+
 SHARED_LIBS += mpv 0.2 # 1.109
 
 CATEGORIES =   multimedia x11
@@ -54,6 +56,7 @@ LIB_DEPENDS = archivers/libarchive \
 
 MODPY_RUNDEP = No
 RUN_DEPENDS =  devel/desktop-file-utils \
+   www/youtube-dl \
x11/gtk+3,-guic
 
 SEPARATE_BUILD =   Yes

UPDATE: graphics/azpainter 2.1.6 => 3.0.4

[Brian Callahan]

Hi ports --

Attached is an update to AzPainter. I was recently informed that the
repo we were previously getting our tarballs from is dead and that the
author had a separate repo elsewhere. So I've switched to that.

There are a lot of differences between our version and the latest
upstream. Here is a link to the ChangeLog with all the changes:
https://gitlab.com/azelpg/azpainter/-/blob/master/ChangeLog

I am under the impression that all our big endian patches were
integrated upstream and are no longer needed. But I don't have a big
endian machine to confirm that. Any big endian tests would be much
appreciated.

OK?

~BrianIndex: Makefile
===
RCS file: /cvs/ports/graphics/azpainter/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile22 May 2020 15:47:32 -  1.3
+++ Makefile27 Feb 2022 13:52:46 -
@@ -1,23 +1,28 @@
 # $OpenBSD: Makefile,v 1.3 2020/05/22 15:47:32 kmos Exp $
 
-V =2.1.6
+V =3.0.4
 COMMENT =  full color painting software for illustrations
-DISTNAME = azpainter-${V}
-EXTRACT_SUFX = .tar.xz
+DISTNAME = azpainter-v${V}
+PKGNAME =  azpainter-${V}
+EXTRACT_SUFX = .tar.bz2
 CATEGORIES =   graphics multimedia x11
 
-HOMEPAGE = https://osdn.net/projects/azpainter/
+HOMEPAGE = http://azsky2.html.xdomain.jp/
 MAINTAINER =   Brian Callahan 
 
 # GPLv3+
 PERMIT_PACKAGE =   Yes
 
-WANTLIB += X11 Xext Xi c fontconfig freetype jpeg m png pthread
-WANTLIB += z
+WANTLIB += X11 Xcursor Xext Xi c fontconfig freetype iconv jpeg
+WANTLIB += m png pthread tiff webp z
 
-MASTER_SITES = https://github.com/Symbian9/azpainter/releases/download/v${V}/
+MASTER_SITES = https://gitlab.com/azelpg/azpainter/-/archive/v${V}/
+
+# C11
+COMPILER = base-clang ports-gcc
 
 LIB_DEPENDS =  graphics/jpeg \
+   graphics/libwebp \
graphics/png
 
 RUN_DEPENDS =  devel/desktop-file-utils \
@@ -29,10 +34,13 @@ RUN_DEPENDS =   devel/desktop-file-utils \
 CONFIGURE_STYLE =  simple
 CONFIGURE_ARGS =   CC="${CC}"
 
-CFLAGS +=  -std=gnu99
+CFLAGS +=  -std=gnu11
 
 USE_GMAKE =Yes
 
 NO_TEST =  Yes
+
+do-gen:
+   sed -i "s,%LOCALBASE%,${LOCALBASE},g" ${WRKSRC}/src/main.c
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/graphics/azpainter/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo20 May 2020 17:06:29 -  1.2
+++ distinfo27 Feb 2022 13:52:46 -
@@ -1,2 +1,2 @@
-SHA256 (azpainter-2.1.6.tar.xz) = hfP5NedrQg8uXiclFDaP375MJcAdqh4WGsKKbh7bDSw=
-SIZE (azpainter-2.1.6.tar.xz) = 747464
+SHA256 (azpainter-v3.0.4.tar.bz2) = 
o8g4Kt87ZP4Mgl/VYHUoag5OJ+QXL+VhcWeVXxO+5qU=
+SIZE (azpainter-v3.0.4.tar.bz2) = 986326
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/graphics/azpainter/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in   20 May 2020 17:06:29 -  1.1
+++ patches/patch-Makefile_in   27 Feb 2022 13:52:46 -
@@ -5,12 +5,12 @@ Respect CFLAGS.
 Index: Makefile.in
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -11,7 +11,7 @@ package_full := $(package_name)-$(package_version)
- instfile := install -m 644
+@@ -15,7 +15,7 @@ inst_dir := install -m 755 -d
+ inst_file := install -m 644
  
  CC := @CC@
--CFLAGS := @CFLAGS@ -pthread -Isrc/include -Imlib/include -I. -DHAVE_CONFIG_H \
-+CFLAGS += @CFLAGS@ -pthread -Isrc/include -Imlib/include -I. -DHAVE_CONFIG_H \
-  -DPACKAGE_DATA_DIR=\"$(datadir)\"
+-CFLAGS := @CFLAGS@ -pthread -Isrc/include -Imlk/include -I. -DHAVE_CONFIG_H
++CFLAGS += @CFLAGS@ -pthread -Isrc/include -Imlk/include -I. -DHAVE_CONFIG_H
  LDFLAGS := @LDFLAGS@ -pthread
  LIBS := @LIBS@ -lm
+ 
Index: patches/patch-configure
===
RCS file: /cvs/ports/graphics/azpainter/patches/patch-configure,v
retrieving revision 1.1
diff -u -p -r1.1 patch-configure
--- patches/patch-configure 20 May 2020 17:06:29 -  1.1
+++ patches/patch-configure 27 Feb 2022 13:52:46 -
@@ -1,16 +1,29 @@
 $OpenBSD: patch-configure,v 1.1 2020/05/20 17:06:29 bcallah Exp $
 
 Don't hardcode optimization flags.
+Add OpenBSD to supported OS list.
 
 Index: configure
 --- configure.orig
 +++ configure
-@@ -214,8 +214,6 @@ done
- if test -z "$CFLAGS";then
+@@ -274,7 +274,7 @@ if test -z "$CFLAGS";then
if test "$cf_debug" = yes;then
-   CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-g"`
--  else
--  CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-O2"`
+   CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-g -Wall"`
+   else
+-  CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-O2 -Wall"`
++  CFLAGS_ADD=`fc_add_string "$CFLAGS_ADD" "-Wall"`
fi
  fi
  
+@@ -290,6 +290,11 @@ elif 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 06:57:28

Modified files:
x11/bemenu : Makefile distinfo 
x11/bemenu/patches: patch-GNUmakefile 

Log message:
update to bemenu-0.6.7

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 06:57:24

Modified files:
www/qutebrowser: Makefile distinfo 

Log message:
update to qutebrowser-2.4.0, from Dimitri Karamazov (maintainer)

Re: [new] net/py-libknot - python bindings for knot DNS

[Jeremie Courreges-Anglas]

On Sat, Feb 26 2022, Stuart Henderson  wrote:
> On 2022/02/26 17:15, Kurt Mosiejczuk wrote:
>> On Sat, Feb 26, 2022 at 11:55:46AM -0500, aisha wrote:
>> > Hi,
>> >   I've attached a port for py-libknot which allows
>> > a much better control for knot through scripting rather
>> > than parsing the knotc(8) output. Plus this is
>> > maintained by the knot team and in the same repository
>> > as knot so it should be (and imo is) pretty stable.
>> 
>> > Port made with `portgen py libknot`.
>> 
>> Since it is a library, it shouldn't use MODPY_DEFAULT_VERSION_3 (which is
>> now the default anyway) it should use FLAVORS=python3 and FLAVOR=python3.
>> 
>> With that changed, ok kmos for import
>> 
>> --Kurt
>> 
>
> I do wonder if it might be better to build this in net/knot instead
> (the files are in the main knot distfile too) and subpackage it.

The main knot tarball doesn't come with the generated setuptools glue.
So I'm not sure how to get the same resulting python package as
a subpackage of net/knot.  Certainly doable, but I can only think of
hacks.

> I suspect it may be a fairly tight dependency so they probably will need
> handling together in updates.

Implementing tight requirements can be done in a separate port too
(something like RUN_DEPENDS = net/knot=${MODPY_EGG_VERSION} ?).
Probably better than a forced LIB_DEPENDS / WANTLIB setup.

I agree with kmos@ regarding MODPY_DEFAULT_VERSION_3

> Pinging jca@ (net/knot maintainer) for any comments ..

FWIW I would gladly leave maintainership of net/knot to someone else, as
I don't actually use knot on a daily basis.  Or I can help
co-maintaining this. ;)

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

www/py-httpie update, NEW: textproc/py-charset-normalizer

[Stuart Henderson]

httpie updates require a new charset detection library, port for
that attached. OK to import?

httpie update diff using it inline.

Index: Makefile
===
RCS file: /cvs/ports/www/py-httpie/Makefile,v
retrieving revision 1.24
diff -u -p -r1.24 Makefile
--- Makefile2 Nov 2021 00:02:53 -   1.24
+++ Makefile27 Feb 2022 13:53:48 -
@@ -2,15 +2,14 @@
 
 COMMENT =  command-line HTTP client
 
-MODPY_EGG_VERSION =2.5.0
+MODPY_EGG_VERSION =3.0.2
 GH_TAGNAME =   ${MODPY_EGG_VERSION}
-GH_ACCOUNT =   jakubroztocil
+GH_ACCOUNT =   httpie
 GH_PROJECT =   httpie
-REVISION = 0
 
 CATEGORIES =   www net
 
-HOMEPAGE = https://httpie.org/
+HOMEPAGE = https://httpie.io/
 
 # BSD
 PERMIT_PACKAGE =   Yes
@@ -22,10 +21,12 @@ MODPY_SETUPTOOLS =  Yes
 MODPY_PYTEST = Yes
 
 RUN_DEPENDS =  net/py-socks${MODPY_FLAVOR} \
-   www/py-requests${MODPY_FLAVOR} \
-   www/py-requests-toolbelt${MODPY_FLAVOR} \
+   textproc/py-charset-normalizer${MODPY_FLAVOR} \
textproc/py-defusedxml${MODPY_FLAVOR} \
-   textproc/py-pygments${MODPY_FLAVOR}
+   textproc/py-pygments${MODPY_FLAVOR} \
+   www/py-multidict${MODPY_FLAVOR} \
+   www/py-requests${MODPY_FLAVOR} \
+   www/py-requests-toolbelt${MODPY_FLAVOR}
 TEST_DEPENDS = devel/py-test-httpbin${MODPY_FLAVOR} \
devel/py-mock${MODPY_FLAVOR}
 TEST_ENV = PY_IGNORE_IMPORTMISMATCH=1
Index: distinfo
===
RCS file: /cvs/ports/www/py-httpie/distinfo,v
retrieving revision 1.13
diff -u -p -r1.13 distinfo
--- distinfo3 Oct 2021 19:17:10 -   1.13
+++ distinfo27 Feb 2022 13:53:48 -
@@ -1,2 +1,2 @@
-SHA256 (httpie-2.5.0.tar.gz) = Zq9W4O/BymI3Mj8Rhro0vKG+JOZ6Qxn9XfciirmG+uo=
-SIZE (httpie-2.5.0.tar.gz) = 1105177
+SHA256 (httpie-3.0.2.tar.gz) = c3otfOOH6BysFKsHHKjyhwGnXSpNU6uMy466AaUHAvM=
+SIZE (httpie-3.0.2.tar.gz) = 1169342
Index: pkg/PLIST
===
RCS file: /cvs/ports/www/py-httpie/pkg/PLIST,v
retrieving revision 1.9
diff -u -p -r1.9 PLIST
--- pkg/PLIST   3 Oct 2021 19:17:10 -   1.9
+++ pkg/PLIST   27 Feb 2022 13:53:48 -
@@ -1,5 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.9 2021/10/03 19:17:10 sthen Exp $
 bin/http
+bin/httpie
 bin/https
 lib/python${MODPY_VERSION}/site-packages/httpie/
 
lib/python${MODPY_VERSION}/site-packages/httpie-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
@@ -14,19 +15,21 @@ lib/python${MODPY_VERSION}/site-packages
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}/
 
lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}adapters.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}client.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}compat.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}config.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}constants.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}context.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}downloads.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}encoding.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}models.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}sessions.${MODPY_PYC_MAGIC_TAG}pyc
-lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}ssl.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}ssl_.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}status.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}uploads.${MODPY_PYC_MAGIC_TAG}pyc
 
lib/python${MODPY_VERSION}/site-packages/httpie/${MODPY_PYCACHE}utils.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/httpie/adapters.py
 lib/python${MODPY_VERSION}/site-packages/httpie/cli/
 lib/python${MODPY_VERSION}/site-packages/httpie/cli/__init__.py
 
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/httpie/cli/${MODPY_PYCACHE}/
@@ -37,21 +40,37 

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 06:44:16

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

Log message:
update to py3-sqlalchemy-1.4.31

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 06:43:46

Modified files:
devel/py-setuptools-rust: Makefile distinfo 
devel/py-setuptools-rust/pkg: PLIST 

Log message:
update to py3-setuptools-rust-1.1.2

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 06:40:32

Modified files:
devel/py-regex : Makefile distinfo 

Log message:
update to py3-regex-2022.1.18

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 06:33:36

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

Log message:
update to py-urllib3-1.26.8

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 06:17:58

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

Log message:
update to py3-country-22.1.10

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 06:14:30

Modified files:
devel/py-click-plugins: Makefile distinfo 

Log message:
update to py3-click-plugins-1.1.1

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 06:13:07

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

Log message:
update to py3-ConfigArgParse-1.5.3

CVS: cvs.openbsd.org: ports

[Denis Fondras]

CVSROOT:/cvs
Module name:ports
Changes by: de...@cvs.openbsd.org   2022/02/27 06:11:34

Modified files:
databases/timescaledb: Makefile distinfo 
databases/timescaledb/pkg: PLIST 

Log message:
Update to 2.6.0

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 06:06:30

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

Log message:
update to py-mongo-3.12.0

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 05:43:25

Modified files:
multimedia/libbluray: Makefile 
Added files:
multimedia/libbluray/patches: patch-src_libbluray_bluray_c 
  patch-src_libbluray_disc_bdplus_c 
  patch-src_libbluray_disc_dec_c 

Log message:
libbluray: cherrypick patches from upstream. from Brad

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 05:42:43

Modified files:
devel/libdvdread: Makefile 
Added files:
devel/libdvdread/patches: patch-src_bitreader_c 
  patch-src_dvd_reader_c 
  patch-src_dvdread_bitreader_h 
  patch-src_dvdread_ifo_types_h 
  patch-src_ifo_read_c 

Log message:
libdvdread: cherrypick patches from upstream. from Brad

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 05:41:51

Modified files:
x11/mplayer/patches: patch-configure 

Log message:
mplayer: use pkgconfig for sndio; from Brad

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 05:40:16

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

Log message:
update to py3-setuptools_scm-6.4.2, ok/feedback bket@

Re: py-setuptools_scm update -> NEW: textproc/py-tomli

[Stuart Henderson]

On 2022/02/27 08:29, Bjorn Ketelaars wrote:
> On Sat 26/02/2022 22:22, Stuart Henderson wrote:
> > Newer setuptools_scm uses a different TOML parser, py-tomli; port attached.
> > OK to import? There's some slight mess, we don't handle distutils
> > ports without setup.py yet, so there's a patch to add a tweaked
> > file from an old upstream version.
> 
> py-tomli looks good, and builds. OK bket@
> 
> > The scm diff to go with it is below (this one is needed by newer
> > setuptools_rust).
> 
> Diff looks good, and builds. I'm seeing two failing tests (test.log
> enclosed), likely because I'm using PORTS_PRIVSEP=Yes. OK bket@

Thanks, one is PORTS_PRIVSEP (it explicitly wants to fetch from the
net, it's not a hidden test dep), the other because it calls "python",
I'll symlink MODPY_BIN into WRKDIR/bin/python to fix that.

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 05:37:12

Modified files:
textproc   : Makefile 

Log message:
+py-tomli

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 05:36:50

Log message:
import ports/textproc/py-tomli, ok bket@

Tomli is a Python library for parsing TOML, it is fully compatible
with TOML v1.0.0.

Status:

Vendor Tag: sthen
Release Tags:   sthen_20220227

N ports/textproc/py-tomli/Makefile
N ports/textproc/py-tomli/distinfo
N ports/textproc/py-tomli/pkg/DESCR
N ports/textproc/py-tomli/pkg/PLIST
N ports/textproc/py-tomli/patches/patch-setup_py

No conflicts created by this import

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 05:21:37

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

Log message:
tidy: no point doing py-foo -> py3-foo and then listing py3-foo in
obsolete_reason; just list both in obsolete_reason

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 05:14:41

Modified files:
math/py-pandas : Makefile 
textproc/py-confuse: Makefile 
textproc/py-natsort: Makefile 

Log message:
remove bogus TEST_DEPENDS

CVS: cvs.openbsd.org: ports

[Stuart Henderson]

CVSROOT:/cvs
Module name:ports
Changes by: st...@cvs.openbsd.org   2022/02/27 05:06:45

Modified files:
www/trac   : Makefile distinfo 
Added files:
www/trac/patches: patch-trac_util_presentation_py 
Removed files:
www/trac/patches: patch-trac_util_daemon_py 

Log message:
uodate to trac-1.5.3 and unbreak with newer jinja2

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/02/27 04:03:52

Modified files:
games/gcompris : Makefile distinfo 

Log message:
Update to gcompris-2.3.

CVS: cvs.openbsd.org: ports

[Antoine Jacoutot]

CVSROOT:/cvs
Module name:ports
Changes by: ajacou...@cvs.openbsd.org   2022/02/27 03:57:02

Modified files:
devel/libgit2/libgit2: Makefile distinfo 

Log message:
Update to libgit2-1.4.2.

mame on arm64

[adr]

I managed to compiled emulators/mame in an rpi4.

Some thoughts about the port:

In patch-makefile

 ifeq ($(OS),windows)
 ifeq (posix,$(SHELLTYPE))
-GCC_VERSION  := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> 
/dev/null)
-CLANG_VERSION:= $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> /dev/null| head 
-n 1 | grep clang | sed 
"s/^.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$$/\1/" | head -n 1)
+GCC_VERSION  := $(shell cc -dumpversion 2> /dev/null)
+CLANG_VERSION:= $(shell cc --version 2> /dev/null | head -n 1 | grep -e 
'version [0-9]\.[0-9]\.[0-9]' -o | sed -e 's,version ,,' | tail -n 1)
 PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo 
python)
 GIT_AVAILABLE:= $(shell git --version > /dev/null 2>&1 && echo git)
 else

This doesn't make any sense, this part is only processed on windows.
But you'd need 'grep clang' anyway or CLANG_VERSION would be set
even if the compiler is gcc. Note that if this weren't the case,
you could just use -dumpversion.

CC ends up defined to gcc by default by makefile, but using OVERRIDE_CC
isn't sufficient because CLANG_VERSION is left out of the conditional
code:

[...]
ifdef OVERRIDE_CC
GCC_VERSION  := $(shell $(TOOLCHAIN)$(subst @,,$(OVERRIDE_CC)) -dumpversion 
2> /dev/null)
else
GCC_VERSION  := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> 
/dev/null)
endif
ifeq ($(findstring emcc,$(CC)),emcc)
CLANG_VERSION:= $(shell $(TOOLCHAIN)$(subst @,,$(CC))  -v  2>&1 >/dev/null 
| grep 'clang version' | head -n 1 | grep -e 'version [0-9]\+\.[0-9]\+
\(\.[0-9]\+\)\?' -o | grep -e '[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' -o | tail -n 1)
else
CLANG_VERSION:= $(shell $(TOOLCHAIN)$(subst @,,$(CC))  --version  2> 
/dev/null | head -n 1 | grep -e 'version [0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' -o
 | grep -e '[0-9]\+\.[0-9]\+\(\.[0-9]\+\)\?' -o | tail -n 1)
endif
PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo python)
GIT_AVAILABLE := $(shell git --version > /dev/null 2>&1 && echo git)
endif

ifeq ($(CLANG_VERSION),)
$(info GCC $(GCC_VERSION) detected)
else
$(info Clang $(CLANG_VERSION) detected)
ifneq ($(TARGETOS),asmjs)
ifeq ($(ARCHITECTURE),_x64)
ARCHITECTURE := _x64_clang
else
ifneq ($(filter arm64%,$(UNAME_M)),)
ARCHITECTURE := _arm64_clang
else
ARCHITECTURE := _x86_clang
endif
endif
endif
endif
[...]

Even correcting this, CLANG_VERSION is not detected because grep
is using gnu basic regular expression syntax, in openbsd BRE there
is no + nor ? [re_format(7)].

Here is a diff only tested on arm64.

I left out emcc of the ifdef OVERRIDE_CC statement, add it if you
think it will be of any use in the future.

Regards,
adr

=
Index: Makefile
===
RCS file: /cvs/ports/emulators/mame/Makefile,v
retrieving revision 1.57
diff -u -p -r1.57 Makefile
--- Makefile1 Dec 2021 14:55:20 -   1.57
+++ Makefile27 Feb 2022 10:49:37 -
@@ -1,7 +1,7 @@
 # $OpenBSD: Makefile,v 1.57 2021/12/01 14:55:20 fcambus Exp $

 BROKEN-i386 =  broken on 32-bit; enum in src/frontend/mame/ui/videoopt.h 
starting at 0x8000
-ONLY_FOR_ARCHS = amd64 i386
+ONLY_FOR_ARCHS = amd64 i386 arm64
 DPB_PROPERTIES = parallel

 USE_WXNEEDED = Yes
Index: patches/patch-makefile
===
RCS file: /cvs/ports/emulators/mame/patches/patch-makefile,v
retrieving revision 1.20
diff -u -p -r1.20 patch-makefile
--- patches/patch-makefile  1 Oct 2021 12:13:51 -   1.20
+++ patches/patch-makefile  27 Feb 2022 10:49:37 -
@@ -27,14 +27,51 @@ Index: makefile
  # set the symbols level
  ifdef SYMBOLS
  PARAMS += --SYMBOLS='$(SYMBOLS)'
-@@ -995,8 +990,8 @@ endif
- 
- ifeq ($(OS),windows)

- ifeq (posix,$(SHELLTYPE))
--GCC_VERSION  := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> 
/dev/null)
--CLANG_VERSION:= $(shell $(TOOLCHAIN)$(subst @,,$(CC)) --version 2> /dev/null| head 
-n 1 | grep clang | sed 
"s/^.*[^0-9]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\).*$$/\1/" | head -n 1)
-+GCC_VERSION  := $(shell cc -dumpversion 2> /dev/null)
-+CLANG_VERSION:= $(shell cc --version 2> /dev/null | head -n 1 | grep -e 
'version [0-9]\.[0-9]\.[0-9]' -o | sed -e 's,version ,,' | tail -n 1)
- PYTHON_AVAILABLE := $(shell $(PYTHON) --version > /dev/null 2>&1 && echo 
python)
- GIT_AVAILABLE:= $(shell git --version > /dev/null 2>&1 && echo git)
+@@ -1024,14 +1019,15 @@ endif
+ else
+ ifdef OVERRIDE_CC
+ GCC_VERSION  := $(shell $(TOOLCHAIN)$(subst @,,$(OVERRIDE_CC)) -dumpversion 
2> /dev/null)
++CLANG_VERSION:= $(shell $(TOOLCHAIN)$(subst @,,$(OVERRIDE_CC))  --version  
2> /dev/null | head -n 1 | grep -Ee 'version [0-9]+\.[0-9]+(\.[0-9]+)?' -o | 
grep -Ee '[0-9]+\.[0-9]+(\.[0-9]+)?' -o | tail -n 1)
  else
+ GCC_VERSION  := $(shell $(TOOLCHAIN)$(subst @,,$(CC)) -dumpversion 2> 
/dev/null)
+-endif
+ ifeq