This is my first patch to OpenBSD ports.
This updates lang/nim from 1.2.0 to 1.4.2
Version 1.2.0 on OpenBSD 6.8 fails 'make install' with a symptom similar to
what is described in https://github.com/nim-lang/Nim/issues/13645 and fixed in
https://github.com/nim-lang/Nim/pull/13692
With the upgrade to 1.4.2 Nim now compiles on OpenBSD 6.8
Thank you!
Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/nim/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- Makefile 2 May 2020 09:33:06 -0000 1.11
+++ Makefile 16 Mar 2021 06:17:09 -0000
@@ -6,7 +6,7 @@ BROKEN-i386 = hardcodes gcc; see config/
COMMENT = statically typed, imperative programming language
-VERSION = 1.2.0
+VERSION = 1.4.2
DISTNAME = nim-${VERSION}
EXTRACT_SUFX = .tar.xz
REVISION = 0
Index: distinfo
===================================================================
RCS file: /cvs/ports/lang/nim/distinfo,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 distinfo
--- distinfo 2 May 2020 09:33:06 -0000 1.5
+++ distinfo 16 Mar 2021 06:17:09 -0000
@@ -1,2 +1,2 @@
-SHA256 (nim-1.2.0.tar.xz) = TpRYOjc5ZYIYBeZl4KBfUvthCRZnbtsJFIlBQVY3xXU=
-SIZE (nim-1.2.0.tar.xz) = 5869428
+SHA256 (nim-1.4.2.tar.xz) = A6R1g3d92BOAo0B6pqeIyaqKZ99IIQJXcMmsQYYpEWE=
+SIZE (nim-1.4.2.tar.xz) = 4770616
Index: patches/patch-install_sh
===================================================================
RCS file: /cvs/ports/lang/nim/patches/patch-install_sh,v
retrieving revision 1.1
diff -u -p -u -p -r1.1 patch-install_sh
--- patches/patch-install_sh 2 May 2020 09:33:06 -0000 1.1
+++ patches/patch-install_sh 16 Mar 2021 06:17:09 -0000
@@ -1,4 +1,6 @@
---- install.sh.orig 2020-04-03 17:25:49 UTC
+$OpenBSD: patch-install_sh,v 1.4 2021/03/15 05:58:34 draychev Exp $
+Index: install.sh
+--- install.sh.orig
+++ install.sh
@@ -15,48 +15,14 @@ if [ $# -eq 1 ] ; then
"--help"|"-h"|"help"|"h")
@@ -19,7 +21,7 @@
- libdir=/usr/lib/nim
- docdir=/usr/share/nim/doc
- datadir=/usr/share/nim/data
-- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
+- nimbleDir="/opt/nimble/pkgs/compiler-1.4.2"
- ;;
- "/usr/local/bin")
- bindir=/usr/local/bin
@@ -27,7 +29,7 @@
- libdir=/usr/local/lib/nim
- docdir=/usr/local/share/nim/doc
- datadir=/usr/local/share/nim/data
-- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
+- nimbleDir="/opt/nimble/pkgs/compiler-1.4.2"
- ;;
- "/opt")
- bindir="/opt/nim/bin"
@@ -35,7 +37,7 @@
- libdir="/opt/nim/lib"
- docdir="/opt/nim/doc"
- datadir="/opt/nim/data"
-- nimbleDir="/opt/nimble/pkgs/compiler-1.2.0"
+- nimbleDir="/opt/nimble/pkgs/compiler-1.4.2"
- mkdir -p /opt/nim
- mkdir -p $bindir
- mkdir -p $configdir
@@ -54,7 +56,7 @@
nimbleDir="$1/nim"
mkdir -p $1/nim
mkdir -p $bindir
-@@ -973,13 +939,6 @@ chmod 644 $nimbleDir/compiler.nimble
+@@ -1044,13 +1010,6 @@ chmod 644 $nimbleDir/compiler.nimble
else
echo "Nim installation script"
echo "Usage: [sudo] sh install.sh DIR"
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/lang/nim/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST 2 May 2020 09:33:06 -0000 1.5
+++ pkg/PLIST 16 Mar 2021 06:17:09 -0000
@@ -27,6 +27,15 @@ lib/nim/deprecated/pure/securehash.nim
lib/nim/deprecated/pure/sharedstrings.nim
lib/nim/experimental/
lib/nim/experimental/diff.nim
+lib/nim/fusion/
+lib/nim/fusion/btreetables.nim
+lib/nim/fusion/compat.nim
+lib/nim/fusion/filepermissions.nim
+lib/nim/fusion/htmlparser/
+lib/nim/fusion/htmlparser.nim
+lib/nim/fusion/htmlparser/parsexml.nim
+lib/nim/fusion/htmlparser/xmltree.nim
+lib/nim/fusion/pools.nim
lib/nim/genode/
lib/nim/genode/alloc.nim
lib/nim/genode/env.nim
@@ -47,9 +56,11 @@ lib/nim/impure/re.nim
lib/nim/js/
lib/nim/js/asyncjs.nim
lib/nim/js/dom.nim
+lib/nim/js/dom_extensions.nim
lib/nim/js/jsconsole.nim
lib/nim/js/jscore.nim
lib/nim/js/jsffi.nim
+lib/nim/js/jsre.nim
lib/nim/nimbase.h
lib/nim/nimhcr.nim
lib/nim/nimhcr.nim.cfg
@@ -70,6 +81,8 @@ lib/nim/posix/inotify.nim
lib/nim/posix/kqueue.nim
lib/nim/posix/linux.nim
lib/nim/posix/posix.nim
+lib/nim/posix/posix_freertos_consts.nim
+lib/nim/posix/posix_haiku.nim
lib/nim/posix/posix_linux_amd64.nim
lib/nim/posix/posix_linux_amd64_consts.nim
lib/nim/posix/posix_macos_amd64.nim
@@ -138,6 +151,7 @@ lib/nim/pure/htmlparser.nim
lib/nim/pure/httpclient.nim
lib/nim/pure/httpcore.nim
lib/nim/pure/includes/
+lib/nim/pure/includes/decode_helpers.nim
lib/nim/pure/includes/osenv.nim
lib/nim/pure/includes/oserr.nim
lib/nim/pure/includes/osseps.nim
@@ -186,8 +200,10 @@ lib/nim/pure/selectors.nim
lib/nim/pure/smtp.nim
lib/nim/pure/smtp.nim.cfg
lib/nim/pure/ssl_certs.nim
+lib/nim/pure/ssl_config.nim
lib/nim/pure/stats.nim
lib/nim/pure/streams.nim
+lib/nim/pure/streamwrapper.nim
lib/nim/pure/strformat.nim
lib/nim/pure/strmisc.nim
lib/nim/pure/strscans.nim
@@ -211,9 +227,17 @@ lib/nim/std/
lib/nim/std/compilesettings.nim
lib/nim/std/decls.nim
lib/nim/std/editdistance.nim
+lib/nim/std/effecttraits.nim
+lib/nim/std/enumerate.nim
+lib/nim/std/exitprocs.nim
+lib/nim/std/isolation.nim
+lib/nim/std/jsonutils.nim
lib/nim/std/logic.nim
lib/nim/std/monotimes.nim
lib/nim/std/private/
+lib/nim/std/private/globs.nim
+lib/nim/std/private/miscdollars.nim
+lib/nim/std/private/since.nim
lib/nim/std/private/underscored_calls.nim
lib/nim/std/sha1.nim
lib/nim/std/stackframes.nim
@@ -228,6 +252,7 @@ lib/nim/system/
lib/nim/system.nim
lib/nim/system/alloc.nim
lib/nim/system/ansi_c.nim
+lib/nim/system/arc.nim
lib/nim/system/arithm.nim
lib/nim/system/arithmetics.nim
lib/nim/system/assertions.nim
@@ -235,13 +260,15 @@ lib/nim/system/assign.nim
lib/nim/system/atomics.nim
lib/nim/system/avltree.nim
lib/nim/system/basic_types.nim
+lib/nim/system/bitmasks.nim
+lib/nim/system/cellseqs_v1.nim
+lib/nim/system/cellseqs_v2.nim
lib/nim/system/cellsets.nim
lib/nim/system/cgprocs.nim
lib/nim/system/channels.nim
lib/nim/system/chcks.nim
lib/nim/system/comparisons.nim
lib/nim/system/cyclebreaker.nim
-lib/nim/system/cyclicrefs_v2.nim
lib/nim/system/deepcopy.nim
lib/nim/system/dollars.nim
lib/nim/system/dyncalls.nim
@@ -275,16 +302,18 @@ lib/nim/system/mm/malloc.nim
lib/nim/system/mm/none.nim
lib/nim/system/mmdisp.nim
lib/nim/system/nimscript.nim
+lib/nim/system/orc.nim
lib/nim/system/osalloc.nim
lib/nim/system/platforms.nim
lib/nim/system/profiler.nim
-lib/nim/system/refs_v2.nim
lib/nim/system/repr.nim
lib/nim/system/repr_v2.nim
lib/nim/system/reprjs.nim
lib/nim/system/seqs_v2.nim
+lib/nim/system/seqs_v2_reimpl.nim
lib/nim/system/setops.nim
lib/nim/system/sets.nim
+lib/nim/system/stacktraces.nim
lib/nim/system/strmantle.nim
lib/nim/system/strs_v2.nim
lib/nim/system/syslocks.nim
@@ -334,3 +363,4 @@ share/examples/nim/nimdoc.cfg
@sample ${SYSCONFDIR}/nim/nimdoc.cfg
share/examples/nim/nimdoc.tex.cfg
@sample ${SYSCONFDIR}/nim/nimdoc.tex.cfg
+share/examples/nim/rename.rules.cfg
