UNBREAK/UPDATE: lang/ldc 1.35.0 => 1.38.0, and de-bootstrap ldc
Hi ports --
Attached is an update to the latest LDC. With this, I would also like to
make the build process a lot easier.
LDC does not need to be built with itself; it can be built with DMD or
GDC as well. I would like to make LDC have a BDEP on DMD. Now that DMD
has an LTS bootstrap it should be always have a package available. Also,
Phobos, the D standard library, is always built and shipped as a static
library, so DMD won't be an LDEP or RDEP, just a BDEP.
This has the instant benefit of enabling LDC on i386, which I have
tested alongside amd64 and does work. This also has the benefit of
making LDC much easier to update. Should be as easy as cranking version
number, updating patches, and updating plist.
Other platforms may need a bootstrap or use GDC to build LDC, but I will
tackle those on an as-needed basis.
I tried making an LTS bootstrap of LDC but there are linker errors for
multiple symbols of the same name. And I think this new strategy is good
enough.
OK?
~BrianIndex: Makefile
===
RCS file: /cvs/ports/lang/ldc/Makefile,v
retrieving revision 1.13
diff -u -p -r1.13 Makefile
--- Makefile9 Mar 2024 15:18:28 - 1.13
+++ Makefile24 May 2024 00:52:45 -
@@ -1,15 +1,14 @@
-BROKEN=needs new bootstrap
+# A bootstrap may be needed for !amd64, !i386 archs.
+# Can try GDC to bootstrap as well.
+ONLY_FOR_ARCHS = amd64 i386
-# You must create a bootstrap for each supported arch.
-# Can use GDC to create said bootstrap compiler.
-ONLY_FOR_ARCHS = amd64
+# No BT CFI yet.
+USE_NOBTCFI = Yes
-V =1.35.0
+V =1.38.0
COMMENT = LLVM D Compiler
DISTFILES =ldc-${V}-src.tar.gz
-DISTFILES.boot= ldc-${V}-bootstrap.tar.gz
PKGNAME = ldc-${V}
-REVISION = 0
CATEGORIES = lang
HOMEPAGE = https://wiki.dlang.org/LDC
@@ -23,7 +22,6 @@ PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} c execinfo m z
SITES =
https://github.com/ldc-developers/ldc/releases/download/v${V}/
-SITES.boot = https://github.com/ibara/ldc/releases/download/bootstrap-${V}/
# C++14
COMPILER = base-clang ports-gcc
@@ -34,29 +32,18 @@ MODCLANG_COMPILER_LINKS = No
MODCLANG_RUNDEP = No
MODCLANG_VERSION = 16
+BUILD_DEPENDS =lang/dmd
+
# COMPILE_D_MODULES_SEPARATELY=ON lets ldc compile with sane memory limits.
CONFIGURE_ARGS = -DCOMPILE_D_MODULES_SEPARATELY=ON \
-DLDC_DYNAMIC_COMPILE=OFF \
-DLDC_WITH_LLD=OFF \
-DLLVM_CONFIG="${LOCALBASE}/bin/llvm-config-${MODCLANG_VERSION}"
-# Use a bootstrap compiler, similar to DMD.
-CONFIGURE_ENV =
DMD="${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/ldmd2" \
- LD_LIBRARY_PATH="${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}"
-
-MAKE_ENV +=LD_LIBRARY_PATH="${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}"
+# Use DMD as the bootstrap compiler.
+CONFIGURE_ENV =DMD="${LOCALBASE}/bin/dmd"
WRKDIST= ${WRKDIR}/ldc-${V}-src
-
-# I put a vanilla ldc2.conf in the bootstrap tarball.
-# This fixes it up for the specifics for each arch.
-post-patch:
- sed -i 's#/usr/local/include/d#${WRKDIR}/ldc-${V}-bootstrap/d#g' \
- ${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/ldc2.conf
- sed -i
's#"/usr/local/lib",#"/usr/local/lib","${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}",#g'
\
- ${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/ldc2.conf
- chmod 644 ${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/lib*.so* # XXX
- cp /usr/lib/libc.so.98.* ${WRKDIR}/ldc-${V}-bootstrap/${MACHINE_ARCH}/
# XXX
# Same trick as with flang:
# Replace the shared LLVM.so library with the static libraries.
Index: distinfo
===
RCS file: /cvs/ports/lang/ldc/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo14 Dec 2023 15:31:31 - 1.6
+++ distinfo24 May 2024 00:52:45 -
@@ -1,4 +1,2 @@
-SHA256 (ldc-1.35.0-bootstrap.tar.gz) =
8IbnqIzaBxRP2vOWAl3c3sTvyTVv9NxMuJD24CVF1i8=
-SHA256 (ldc-1.35.0-src.tar.gz) = bilpk3BsdsCT5gkTmqCz+HBDVfoPN1b2dY141EIm36A=
-SIZE (ldc-1.35.0-bootstrap.tar.gz) = 49813924
-SIZE (ldc-1.35.0-src.tar.gz) = 8241960
+SHA256 (ldc-1.38.0-src.tar.gz) = ymI47+Ai40zTB2dB+KBwxqN3GWNRxhlJpIpIyZN5844=
+SIZE (ldc-1.38.0-src.tar.gz) = 8691096
Index: patches/patch-driver_cl_options_instrumentation_cpp
===
RCS file: patches/patch-driver_cl_options_instrumentation_cpp
diff -N patches/patch-driver_cl_options_instrumentation_cpp
--- patches/patch-driver_cl_options_instrumentation_cpp 14 Aug 2023 22:35:35
- 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-Default to -fcf-protection=branch
-May need to be tweaked if ldc grows !amd64 packages...
-
-Index: driver/cl_opt
sparc64 bulk build report
Bulk build on sparc64-0a.ports.openbsd.org Started : Tue May 21 23:10:34 MDT 2024 Finished: Thu May 23 21:21:12 MDT 2024 Duration: 1 Days 22 hours 11 minutes Built using OpenBSD 7.5-current (GENERIC.MP) #2134: Sun May 19 20:01:27 MDT 2024 Built 8423 packages Number of packages built each day: May 21: 1578 May 22: 5304 May 23: 1541 Critical path missing pkgs: http://build-failures.rhaalovely.net/sparc64/2024-05-21/summary.log Build failures: 67 http://build-failures.rhaalovely.net/sparc64/2024-05-21/archivers/blosc2.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/audio/ncmpc.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/audio/xmms2.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/arm-none-eabi/binutils.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/arm-none-eabi/gdb.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/avr/gcc.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/bazel.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/binutils.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/difftastic.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/libbgcode.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/mtxclient.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/or1k-elf/gcc.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/py-thrift,python3.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/rgbds.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/sdl.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/vim-command-t.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/woboq_codebrowser.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/xsd.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/devel/yder.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/emulators/dosbox-x.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/emulators/libretro-pcsx-rearmed.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/emulators/openmsx.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/bugdom.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/bugdom2.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/cataclysm-dda,no_x11.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/choria.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/colobot/colobot.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/cromagrally.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/devilutionx.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/emptyclip.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/fheroes2.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/gnukem.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/openttd.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/ottomatic.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/scid.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/widelands.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/games/wrath.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/geo/osm2pgrouting.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/graphics/oxipng.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/graphics/sane-backends.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/graphics/shaderc.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/graphics/tesseract/tesseract.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/lang/algol68g.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/lang/gambit.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/lang/wabt.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/mail/grommunio/index.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/mail/rspamd,hyperscan.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/math/gunits.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/math/openfst.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/net/powerdns.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/net/proxychains-ng.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/shells/nsh,static.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/sysutils/borgmatic.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/sysutils/flashrom.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/sysutils/libvirt.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/sysutils/lnav.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/sysutils/nix.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/sysutils/pftop.log http://build-failures.rhaalovely.net/sparc64/2024-05-21/telephony/baresip/re.log http://b
Re: [update] net/soju 0.7.0 -> 0.8.0
On Thu, May 23, 2024 at 05:16:13PM GMT, Johannes Thyssen Tishman wrote:
> Please find below an update for net/soju to version 0.8.0. Builds and
> runs fine, however testing would be appreciated as I'm running it on
> -stable and I haven't been able to build the package for -stable yet.
Works fine on -current, ok lraab@
>
> Index: Makefile
> ===
> RCS file: /cvs/ports/net/soju/Makefile,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 Makefile
> --- Makefile 17 Dec 2023 21:24:54 - 1.1.1.1
> +++ Makefile 23 May 2024 16:49:22 -
> @@ -1,7 +1,7 @@
> COMMENT =user-friendly IRC bouncer
>
> MODGO_MODNAME = git.sr.ht/~emersion/soju
> -MODGO_VERSION = v0.7.0
> +MODGO_VERSION = v0.8.0
> DISTNAME = soju-${MODGO_VERSION}
>
> CATEGORIES = net
> Index: distinfo
> ===
> RCS file: /cvs/ports/net/soju/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 17 Dec 2023 21:24:54 - 1.1.1.1
> +++ distinfo 23 May 2024 16:49:22 -
> @@ -1,15 +1,15 @@
> -SHA256
> (go_modules/git.sr.ht/~emersion/go-scfg/@v/v0.0.0-20231004133111-9dce55c8d63b.mod)
> = UQq4Yi6ZhuV6XtRhtSoE3YYEq40j5iInGvIqe0oCjOk=
> -SHA256
> (go_modules/git.sr.ht/~emersion/go-scfg/@v/v0.0.0-20231004133111-9dce55c8d63b.zip)
> = lLjWFL4n9PzsWxAkC2bu51z+YDzW1a4GwU03bmrkzOQ=
> -SHA256
> (go_modules/git.sr.ht/~emersion/go-sqlite3-fts5/@v/v0.0.0-20230217131031-f2c8767594fc.mod)
> = GwjiRLeBo0h3da1OiM8UWFmXQTiPs3Vn4s6bUpfPNsg=
> -SHA256
> (go_modules/git.sr.ht/~emersion/go-sqlite3-fts5/@v/v0.0.0-20230217131031-f2c8767594fc.zip)
> = B5pHejv9V2HCr9G6d4u2LijqDwIhyKP62uGfvO9JI/A=
> +SHA256
> (go_modules/git.sr.ht/~emersion/go-scfg/@v/v0.0.0-20240128091534-2ae16e782082.mod)
> = UQq4Yi6ZhuV6XtRhtSoE3YYEq40j5iInGvIqe0oCjOk=
> +SHA256
> (go_modules/git.sr.ht/~emersion/go-scfg/@v/v0.0.0-20240128091534-2ae16e782082.zip)
> = YkvKNahczgGXG0/tapN3pu6Ci+EZ/J66WTQYK8+OLLc=
> +SHA256
> (go_modules/git.sr.ht/~emersion/go-sqlite3-fts5/@v/v0.0.0-20240124102820-f3a72e8b79b1.mod)
> = 3daNj0Qsc+f8DnDzavmqWlEWobU0cQRm3dJ7MB35ES4=
> +SHA256
> (go_modules/git.sr.ht/~emersion/go-sqlite3-fts5/@v/v0.0.0-20240124102820-f3a72e8b79b1.zip)
> = O/1SoyhrgATId//httl+BcKjAb0wsovPUlVsmb9cti4=
> SHA256
> (go_modules/git.sr.ht/~sircmpwn/getopt/@v/v0.0.0-20191230200459-23622cc906b3.mod)
> = JKqQcy+IHLONXXl/PBB8RU7ygm2ZbHGoSCP45a2scPI=
> SHA256
> (go_modules/git.sr.ht/~sircmpwn/getopt/@v/v0.0.0-20191230200459-23622cc906b3.zip)
> = FSv9m7IIj8oLgmRdOQVtjvG9L4eH7TuUQh0ooluoHL8=
> SHA256
> (go_modules/git.sr.ht/~sircmpwn/go-bare/@v/v0.0.0-20210406120253-ab86bc2846d9.mod)
> = ubFx04v5ZZhlnrlY7hExo4xQ7jg6hW6yAECn40Y+qVs=
> SHA256
> (go_modules/git.sr.ht/~sircmpwn/go-bare/@v/v0.0.0-20210406120253-ab86bc2846d9.zip)
> = UwmJeGHnVYM6DCXygShZ+0fXircvQAgT3a54q5U5GtY=
> SHA256 (go_modules/github.com/!sher!clock!holmes/webpush-go/@v/v1.3.0.mod) =
> OmdfHlDKoVby7fHora7OnaD5kZo6YZb7XCWlqTmAJSA=
> SHA256 (go_modules/github.com/!sher!clock!holmes/webpush-go/@v/v1.3.0.zip) =
> pA61sDjGzxQNlTWZmuS2Umu5aW5rHEpZHqC3Jmfb9m8=
> -SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.2.mod) =
> 17OszAg8LYhxB+e5mY0rfap993NS0WnmnW+75plfuL0=
> -SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.2.zip) =
> jzMPNcpCm2acOXzy5rWLjNaJT7bWQ39wmZMdLRQAuQk=
> +SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.4.0.mod) =
> 17OszAg8LYhxB+e5mY0rfap993NS0WnmnW+75plfuL0=
> +SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.4.0.zip) =
> 7x6m/q0h5fzJ4VMhh4iMjHxPPrvbAFh6tnoZJFIGymY=
> SHA256
> (go_modules/github.com/alecthomas/units/@v/v0.0.0-20211218093645-b94a6e3cc137.mod)
> = ftH6kO7vq7UGWGCrf2fdM/5ysTVwVCejb0515qgQBls=
> SHA256
> (go_modules/github.com/alecthomas/units/@v/v0.0.0-20211218093645-b94a6e3cc137.zip)
> = tiQ310pSMImvRroBFezhzhG8peMh/h4dTJduzKbueKo=
> SHA256 (go_modules/github.com/beorn7/perks/@v/v1.0.1.mod) =
> yHCz/lC2lE+rCVsGII2ciJh2PpFzyx7tMljD1YMJumY=
> @@ -21,8 +21,8 @@ SHA256 (go_modules/github.com/davecgh/go
> SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.zip) =
> a0SoQ5UfNxtwEMdU7MPKvv6BXVztHFuUCfstaX6KiQ0=
> SHA256 (go_modules/github.com/dustin/go-humanize/@v/v1.0.1.mod) =
> QyWZnQpoQQMSWKJWHCKHnZ+993q8azKhexy27fCBD7I=
> SHA256 (go_modules/github.com/dustin/go-humanize/@v/v1.0.1.zip) =
> MZQE6oTIpOLT2D8wmIsAbn3QSXbePhoakEhK2UZ5+kY=
> -SHA256
> (go_modules/github.com/emersion/go-sasl/@v/v0.0.0-20220912192320-0145f2c60ead.mod)
> = pCH9kPoNx7tTJWvfgeIrHa21k0obLWu70lAA/xVvNqg=
> -SHA256
> (go_modules/github.com/emersion/go-sasl/@v/v0.0.0-20220912192320-0145f2c60ead.zip)
> = mpkhKMTAOMa/dZLxdtPcwn4vXitytUo4mwjTomwzQBc=
> +SHA256
> (go_modules/github.com/emersion/go-sasl/@v/v0.0.0-20231106173351-e73c9f7bad43.mod)
> = pCH9kPoNx7tTJWvfgeIrHa21k0obLWu70lAA/xVvNqg=
> +SHA256
> (go
Re: archivers/lha to 1.14i-ac20220213 with all the subsequent commits
Stuart Henderson writes: > thanks, committed. thanks! > On 2024/05/23 03:02, Yozo TODA wrote: > > thanks stu@, > > (btw, i am sthen@, stu@ is somebody else) wow, got it. -- yozo.
[update] net/soju 0.7.0 -> 0.8.0
Please find below an update for net/soju to version 0.8.0. Builds and
runs fine, however testing would be appreciated as I'm running it on
-stable and I haven't been able to build the package for -stable yet.
Index: Makefile
===
RCS file: /cvs/ports/net/soju/Makefile,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 Makefile
--- Makefile17 Dec 2023 21:24:54 - 1.1.1.1
+++ Makefile23 May 2024 16:49:22 -
@@ -1,7 +1,7 @@
COMMENT = user-friendly IRC bouncer
MODGO_MODNAME =git.sr.ht/~emersion/soju
-MODGO_VERSION =v0.7.0
+MODGO_VERSION =v0.8.0
DISTNAME = soju-${MODGO_VERSION}
CATEGORIES = net
Index: distinfo
===
RCS file: /cvs/ports/net/soju/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo17 Dec 2023 21:24:54 - 1.1.1.1
+++ distinfo23 May 2024 16:49:22 -
@@ -1,15 +1,15 @@
-SHA256
(go_modules/git.sr.ht/~emersion/go-scfg/@v/v0.0.0-20231004133111-9dce55c8d63b.mod)
= UQq4Yi6ZhuV6XtRhtSoE3YYEq40j5iInGvIqe0oCjOk=
-SHA256
(go_modules/git.sr.ht/~emersion/go-scfg/@v/v0.0.0-20231004133111-9dce55c8d63b.zip)
= lLjWFL4n9PzsWxAkC2bu51z+YDzW1a4GwU03bmrkzOQ=
-SHA256
(go_modules/git.sr.ht/~emersion/go-sqlite3-fts5/@v/v0.0.0-20230217131031-f2c8767594fc.mod)
= GwjiRLeBo0h3da1OiM8UWFmXQTiPs3Vn4s6bUpfPNsg=
-SHA256
(go_modules/git.sr.ht/~emersion/go-sqlite3-fts5/@v/v0.0.0-20230217131031-f2c8767594fc.zip)
= B5pHejv9V2HCr9G6d4u2LijqDwIhyKP62uGfvO9JI/A=
+SHA256
(go_modules/git.sr.ht/~emersion/go-scfg/@v/v0.0.0-20240128091534-2ae16e782082.mod)
= UQq4Yi6ZhuV6XtRhtSoE3YYEq40j5iInGvIqe0oCjOk=
+SHA256
(go_modules/git.sr.ht/~emersion/go-scfg/@v/v0.0.0-20240128091534-2ae16e782082.zip)
= YkvKNahczgGXG0/tapN3pu6Ci+EZ/J66WTQYK8+OLLc=
+SHA256
(go_modules/git.sr.ht/~emersion/go-sqlite3-fts5/@v/v0.0.0-20240124102820-f3a72e8b79b1.mod)
= 3daNj0Qsc+f8DnDzavmqWlEWobU0cQRm3dJ7MB35ES4=
+SHA256
(go_modules/git.sr.ht/~emersion/go-sqlite3-fts5/@v/v0.0.0-20240124102820-f3a72e8b79b1.zip)
= O/1SoyhrgATId//httl+BcKjAb0wsovPUlVsmb9cti4=
SHA256
(go_modules/git.sr.ht/~sircmpwn/getopt/@v/v0.0.0-20191230200459-23622cc906b3.mod)
= JKqQcy+IHLONXXl/PBB8RU7ygm2ZbHGoSCP45a2scPI=
SHA256
(go_modules/git.sr.ht/~sircmpwn/getopt/@v/v0.0.0-20191230200459-23622cc906b3.zip)
= FSv9m7IIj8oLgmRdOQVtjvG9L4eH7TuUQh0ooluoHL8=
SHA256
(go_modules/git.sr.ht/~sircmpwn/go-bare/@v/v0.0.0-20210406120253-ab86bc2846d9.mod)
= ubFx04v5ZZhlnrlY7hExo4xQ7jg6hW6yAECn40Y+qVs=
SHA256
(go_modules/git.sr.ht/~sircmpwn/go-bare/@v/v0.0.0-20210406120253-ab86bc2846d9.zip)
= UwmJeGHnVYM6DCXygShZ+0fXircvQAgT3a54q5U5GtY=
SHA256 (go_modules/github.com/!sher!clock!holmes/webpush-go/@v/v1.3.0.mod) =
OmdfHlDKoVby7fHora7OnaD5kZo6YZb7XCWlqTmAJSA=
SHA256 (go_modules/github.com/!sher!clock!holmes/webpush-go/@v/v1.3.0.zip) =
pA61sDjGzxQNlTWZmuS2Umu5aW5rHEpZHqC3Jmfb9m8=
-SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.2.mod) =
17OszAg8LYhxB+e5mY0rfap993NS0WnmnW+75plfuL0=
-SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.3.2.zip) =
jzMPNcpCm2acOXzy5rWLjNaJT7bWQ39wmZMdLRQAuQk=
+SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.4.0.mod) =
17OszAg8LYhxB+e5mY0rfap993NS0WnmnW+75plfuL0=
+SHA256 (go_modules/github.com/alecthomas/kingpin/v2/@v/v2.4.0.zip) =
7x6m/q0h5fzJ4VMhh4iMjHxPPrvbAFh6tnoZJFIGymY=
SHA256
(go_modules/github.com/alecthomas/units/@v/v0.0.0-20211218093645-b94a6e3cc137.mod)
= ftH6kO7vq7UGWGCrf2fdM/5ysTVwVCejb0515qgQBls=
SHA256
(go_modules/github.com/alecthomas/units/@v/v0.0.0-20211218093645-b94a6e3cc137.zip)
= tiQ310pSMImvRroBFezhzhG8peMh/h4dTJduzKbueKo=
SHA256 (go_modules/github.com/beorn7/perks/@v/v1.0.1.mod) =
yHCz/lC2lE+rCVsGII2ciJh2PpFzyx7tMljD1YMJumY=
@@ -21,8 +21,8 @@ SHA256 (go_modules/github.com/davecgh/go
SHA256 (go_modules/github.com/davecgh/go-spew/@v/v1.1.1.zip) =
a0SoQ5UfNxtwEMdU7MPKvv6BXVztHFuUCfstaX6KiQ0=
SHA256 (go_modules/github.com/dustin/go-humanize/@v/v1.0.1.mod) =
QyWZnQpoQQMSWKJWHCKHnZ+993q8azKhexy27fCBD7I=
SHA256 (go_modules/github.com/dustin/go-humanize/@v/v1.0.1.zip) =
MZQE6oTIpOLT2D8wmIsAbn3QSXbePhoakEhK2UZ5+kY=
-SHA256
(go_modules/github.com/emersion/go-sasl/@v/v0.0.0-20220912192320-0145f2c60ead.mod)
= pCH9kPoNx7tTJWvfgeIrHa21k0obLWu70lAA/xVvNqg=
-SHA256
(go_modules/github.com/emersion/go-sasl/@v/v0.0.0-20220912192320-0145f2c60ead.zip)
= mpkhKMTAOMa/dZLxdtPcwn4vXitytUo4mwjTomwzQBc=
+SHA256
(go_modules/github.com/emersion/go-sasl/@v/v0.0.0-20231106173351-e73c9f7bad43.mod)
= pCH9kPoNx7tTJWvfgeIrHa21k0obLWu70lAA/xVvNqg=
+SHA256
(go_modules/github.com/emersion/go-sasl/@v/v0.0.0-20231106173351-e73c9f7bad43.zip)
= 0mrzzfDfEkVlkXZVSgfN8FY5qdNZsoFJfSxcB31OZtk=
SHA256 (go_modules/github.com/go-kit/log/@v/v0.2.1.mod) =
N0PEgN83M7LBHXp+4mQ34hJc9siOtZa8BFneCcm4djM=
SHA256 (go_modules/github.com/go-kit/log/@v/v0.2.1.zip) =
Re: [update] editors/neovim 0.10.0
Hi Edd,
- Mail original -
> I don't think this will block the update, but I think we should
> update the testing comments, so that others can see that it's a known issue.
>
> If you could send a revised diff for that please?
OK, attached a new version of my diff with a comment about test failure for
"Test_linebreak_list" in test_breakindent.vim.
Also removed the comment about test failure with cscope (cscope feature was
removed, see https://github.com/neovim/neovim/pull/20545).
Laurent
Index: Makefile
===
RCS file: /cvs/ports/editors/neovim/Makefile,v
diff -u -p -r1.44 Makefile
--- Makefile 20 Feb 2024 11:59:21 - 1.44
+++ Makefile 23 May 2024 16:40:41 -
@@ -11,29 +11,23 @@ EMBED_LUAJIT = No
COMMENT = continuation and extension of Vim
-DIST_TUPLE = github neovim neovim v0.9.5 .
+DIST_TUPLE = github neovim neovim v0.10.0 .
# embedded luajit
USE_NOBTCFI = Yes
CATEGORIES = editors devel
-REVISION = 0
HOMEPAGE = https://neovim.io
MAINTAINER = Edd Barrett
-# The versions listed here must match those in cmake.deps/CMakeLists.txt.
+# The versions listed here must match those in cmake.deps/deps.txt.
STATIC_DEPS_WRKSRC = ${WRKDIST}/static-deps/
-DIST_TUPLE += github luvit luv 1.45.0-0 ${STATIC_DEPS_WRKSRC}/luv
-DIST_TUPLE += github LuaJIT LuaJIT 03c31124cc3b521ef54fe398e10fa55660a5057d \
+DIST_TUPLE += github luvit luv 1.48.0-2 ${STATIC_DEPS_WRKSRC}/luv
+DIST_TUPLE += github LuaJIT LuaJIT 75e92777988017fe47c5eb290998021bbf972d1f \
${STATIC_DEPS_WRKSRC}/luajit
-DIST_TUPLE += github keplerproject lua-compat-5.3 v0.9 \
+DIST_TUPLE += github keplerproject lua-compat-5.3 v0.13 \
${STATIC_DEPS_WRKSRC}/lua-compat-5.3
-SITES.fix = https://github.com/neovim/neovim/commit/
-# fix(stream): do not close handle if it is already closing (#26537)
-PATCHFILES.fix = neovim-1907abb4c27{1907abb4c27857fe7f4e7394f32e130f9955a2e7}.patch
-PATCH_DIST_STRIP = -p1
-
# Neovim: Apache 2.0 + Vim License
# LuaJIT: MIT + public domain
# libluv: Apache 2.0
@@ -41,7 +35,7 @@ PERMIT_PACKAGE = Yes
DEBUG_PACKAGES = ${BUILD_PACKAGES}
-WANTLIB += c iconv intl m msgpack-c pthread termkey
+WANTLIB += c iconv intl m msgpack-c pthread
WANTLIB += tree-sitter unibilium util uv vterm
.if ${EMBED_LUAJIT} != "Yes"
@@ -65,12 +59,11 @@ BUILD_DEPENDS = ${RUN_DEPENDS} \
devel/lua-bitop
LIB_DEPENDS = devel/gettext,-runtime \
- devel/libtermkey \
devel/libuv \
- devel/libvterm \
+ devel/libvterm>=0.3.3 \
devel/msgpack \
devel/unibilium \
- textproc/tree-sitter>=0.20.8
+ textproc/tree-sitter>=0.20.9
RUN_DEPENDS += devel/libmpack/lua \
devel/libmpack/main \
@@ -80,8 +73,8 @@ RUN_DEPENDS += devel/libmpack/lua \
SEPARATE_BUILD = Yes
CONFIGURE_ARGS += -DUSE_BUNDLED=OFF \
- -DLIBLUV_INCLUDE_DIR=${STATIC_DEPS_INST}/include \
- -DLIBLUV_LIBRARY=${STATIC_DEPS_INST}/lib/libluv.a
+ -DLUV_INCLUDE_DIR=${STATIC_DEPS_INST}/include \
+ -DLUV_LIBRARY=${STATIC_DEPS_INST}/lib/libluv.a
.if ${EMBED_LUAJIT} == "Yes"
CONFIGURE_ARGS += -DLUA_PRG=${STATIC_DEPS_INST}/bin/luajit \
-DLUAJIT_INCLUDE_DIR=${STATIC_DEPS_INST}/include/luajit-2.1 \
@@ -177,8 +170,7 @@ pre-configure:
# Test_language_cmd fails due to:
# https://github.com/neovim/neovim/issues/19331
#
-# If cscope is installed, one test fails:
-# https://github.com/neovim/neovim/issues/12744
+# Test_linebreak_list test fails (test_breakindent.vim)
#
do-test:
true
Index: distinfo
===
RCS file: /cvs/ports/editors/neovim/distinfo,v
diff -u -p -r1.24 distinfo
--- distinfo 5 Feb 2024 20:37:16 - 1.24
+++ distinfo 23 May 2024 16:40:41 -
@@ -1,10 +1,8 @@
-SHA256 (LuaJIT-LuaJIT-03c31124cc3b521ef54fe398e10fa55660a5057d.tar.gz) = YdzHrj9UOuPMMOZtsGDjHip35L407mXjcMlT0RK01gw=
-SHA256 (keplerproject-lua-compat-5.3-v0.9.tar.gz) = rQVUDS2WpIclu3mh3vNc9mUqTi7CY3biYXyM4rqm9BY=
-SHA256 (luvit-luv-1.45.0-0.tar.gz) = l+iZQPnuqo37NPHBn4DdNzKZxCcZ0VIo7HkPQV1OSWU=
-SHA256 (neovim-1907abb4c27.patch) = 4fWmu97Ezx62pa0wl20dIOB4Gy5VqKu4ecv9WgHYdiU=
-SHA256 (neovim-neovim-v0.9.5.tar.gz) = /nQ2n8MKMux6CGsQE6zQ6s1nTnVw6xrMUgpmGAyelxk=
-SIZE (LuaJIT-LuaJIT-03c31124cc3b521ef54fe398e10fa55660a5057d.tar.gz) = 1073919
-SIZE (keplerproject-lua-compat-5.3-v0.9.tar.gz) = 53599
-SIZE (luvit-luv-1.45.0-0.tar.gz) = 130334
-SIZE (neovim-1907abb4c27.patch) = 3033
-SIZE (neovim-neovim-v0.9.5.tar.gz) = 11590180
+SHA256 (LuaJIT-LuaJIT-75e92777988017fe47c5eb290998021bbf972d1f.tar.gz) = D2kogZACTXMsZ2ReQO1bE31nqpUP7fD0SprQ89um1dI=
+SHA256 (keplerproject-lua-compat-5.3-v0.13.tar.gz) = 9dww57H9qFbuTTkr5FdkLB8MJZJkqbm/vLaAMCzoj8I=
+SHA256 (luvit-luv-1.48.0-2.tar.gz) = 5kzYoBl0SSiLN99soFgSDo0jCPwwX1QxYrW/PpInOgU=
+SHA256 (neovim-neovim-v0.10.0.tar.gz) = Ny6iWEsOoqWnZYRNlSBr2p5KV+qhokEqmgcmurdQ+Cg=
+SIZE (LuaJIT-LuaJIT-75e92777988017fe47c5eb290998021bbf972d1f.tar.gz) = 1081633
+SIZE (keplerproject-lua-compat-5.3-v0.13.tar.gz) =
Re: [update] editors/neovim 0.10.0
On 2024/05/23 12:37, Laurent Cheylus wrote: > > You probably have an old version of devel/msgpack port. The msgpack library > was renamed from msgpackc to msgpack-c with the last update (5.0 -> 6.0, > commit by uaa@ Tue Feb 20 2024). > Need to clean your orphan packages via 'pkg_delete -a' to remove the old > version. check for old stuff in /usr/ports/mystuff and /usr/ports/packages too.
Re: [update] editors/neovim 0.10.0
On Thu, May 23, 2024 at 12:37:31PM +0200, Laurent Cheylus wrote: > There is no option to build nvim with external sources for libtermkey (using > our devel/libtermkey port). Ah right. That being the case, yes, I agree we should leave it bundled. It's not worth the effort. > > no parser for 'vimdoc' language, see :help treesitter-parsersstack > I don't know if we must fix this error before updating editors/neovim port > for version 0.10.0. A better solution is to create an issue upstream and > fix/won't fix it after some additional debug. I don't think this will block the update, but I think we should update the testing comments, so that others can see that it's a known issue. If you could send a revised diff for that please? > You probably have an old version of devel/msgpack port. The msgpack library > was renamed from msgpackc to msgpack-c with the last update (5.0 -> 6.0, > commit by uaa@ Tue Feb 20 2024). > Need to clean your orphan packages via 'pkg_delete -a' to remove the old > version. Right, I'll try that later. Cheers -- Best Regards Edd Barrett https://www.theunixzoo.co.uk
Re: [update] editors/neovim 0.10.0
Hi Edd, - Mail original - > On Wed, May 22, 2024 at 03:22:22PM +0200, Laurent Cheylus wrote: > > - modify CONFIGURE_ARGS for LUV* variables (changes in version > > 0.10.0) > > - remove termkey in WANTLIB and LIB_DEPENDS (termkey now bundled in > > Neovim sources) > > Is this what we want? I know libtermkey is deprecated, but we have > one other port (editors/vis) consuming it, and they may as well share the dep? libtermkey source code (version 0.22) is now bundled in Neovim sources (vendored dependencies), see src/termkey/* files and MAINTAIN.md. There is no option to build nvim with external sources for libtermkey (using our devel/libtermkey port). I think that's not a good solution to revert this integration of libtermkey, needs to patch CMake files to build Neovim with devel/libtermkey files. > > Build and tests OK on current/amd64. > > Besides the known failures, I've got this additional one: > ``` > From test_breakindent.vim: > Found errors in Test_linebreak_list(): > ... > no parser for 'vimdoc' language, see :help treesitter-parsersstack > ``` > > If you run `:help treesitter-parserstack` you get: > ``` > E149: Sorry, no help for treesitter-parsersstack > ``` > > Do we need to enable something in our treesitter port perhaps? I have also this error with the old test 'Test_linebreak_list' in test_breakindent.vim. I don't find issue upstream about it. The correct message is "see :help treesitter-parsers" (missing space before "stack") and this command works correctly :) I don't know if we must fix this error before updating editors/neovim port for version 0.10.0. A better solution is to create an issue upstream and fix/won't fix it after some additional debug. > port-lib-depends-check says: > ``` > neovim-0.10.0(editors/neovim): > Missing lib: msgpackc.2 (/usr/local/bin/nvim) (NOT REACHABLE) > Extra: msgpack-c.0 > ``` > > Which confuses me, since devel/msgpack provides it, and we depend on > it. > > Is it possible we are accidentally using a bundled one or something? You probably have an old version of devel/msgpack port. The msgpack library was renamed from msgpackc to msgpack-c with the last update (5.0 -> 6.0, commit by uaa@ Tue Feb 20 2024). Need to clean your orphan packages via 'pkg_delete -a' to remove the old version. > Your treesitter and libvterm updates look good to me. OK. Thanks, Laurent
