Attachment 198180 Details for Bug 232290 – Patch to update to 0.19

[patch] Patch to update to 0.19

nim-0.19.0.diff (text/plain), 10.67 KB, created by Neal Nelson on 2018-10-15 15:41:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Neal Nelson

Created: 2018-10-15 15:41:06 UTC

Size: 10.67 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 482157)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	nim
>-PORTVERSION=	0.18.0
>+PORTVERSION=	0.19.0
> CATEGORIES=	lang
> MASTER_SITES=	https://nim-lang.org/download/
> 
>Index: distinfo
>===================================================================
>--- distinfo	(revision 482157)
>+++ distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1521039574
>-SHA256 (nim-0.18.0.tar.xz) = 45c74adb35f08dfa9add1112ae17330e5d902ebb4a36e7046caee8b79e6f3bd0
>-SIZE (nim-0.18.0.tar.xz) = 4415048
>+TIMESTAMP = 1539012209
>+SHA256 (nim-0.19.0.tar.xz) = a1996347253c590de42f6e36e33bd1d5ec7479c0aa013769b92deef802df3c2e
>+SIZE (nim-0.19.0.tar.xz) = 3321644
>Index: files/patch-build.sh
>===================================================================
>--- files/patch-build.sh	(revision 482157)
>+++ files/patch-build.sh	(nonexistent)
>@@ -1,13 +0,0 @@
>---- build.sh.orig	2016-12-13 16:14:36 UTC
>-+++ build.sh
>-@@ -26,10 +26,6 @@
>-   esac
>- done
>- 
>--CC="gcc"
>--LINKER="gcc"
>--COMP_FLAGS="${CPPFLAGS:-} ${CFLAGS:-} -w -O3 -fno-strict-aliasing$extraBuildArgs"
>--LINK_FLAGS="${LDFLAGS:-} "
>- PS4=""
>- # platform detection
>- ucpu=`uname -m`
>
>Property changes on: files/patch-build.sh
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-compiler-nimconf.nim
>===================================================================
>--- files/patch-compiler-nimconf.nim	(revision 482157)
>+++ files/patch-compiler-nimconf.nim	(nonexistent)
>@@ -1,14 +0,0 @@
>---- compiler/nimconf.nim.orig	2016-10-08 02:17:21 UTC
>-+++ compiler/nimconf.nim
>-@@ -221,9 +221,8 @@ proc getSystemConfigPath(filename: strin
>-   # the UNIX way)
>-   let p = getPrefixDir()
>-   result = joinPath([p, "config", filename])
>--  when defined(unix):
>--    if not existsFile(result): result = joinPath([p, "etc", filename])
>--    if not existsFile(result): result = "/etc/" & filename
>-+  if not existsFile(result): result = joinPath([p, "etc", filename])
>-+  if not existsFile(result): result = "/etc/" & filename
>- 
>- proc loadConfigs*(cfg: string) =
>-   setDefaultLibpath()
>
>Property changes on: files/patch-compiler-nimconf.nim
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-config-nim.cfg
>===================================================================
>--- files/patch-config-nim.cfg	(revision 482157)
>+++ files/patch-config-nim.cfg	(working copy)
>@@ -1,10 +1,19 @@
>---- config/nim.cfg.orig	2017-09-18 14:38:15.184686000 +0000
>-+++ config/nim.cfg	2017-09-18 14:39:25.862654000 +0000
>-@@ -74,12 +74,6 @@
>+--- config/nim.cfg.orig	2018-10-08 18:40:28.240513000 +0200
>++++ config/nim.cfg	2018-10-08 18:42:30.824954000 +0200
>+@@ -8,7 +8,7 @@
>+ # Environment variables can be accessed like so:
>+ #  gcc.path %= "$CC_PATH"
>+ 
>+-cc = gcc
>++cc = clang
>+ 
>+ # additional options always passed to the compiler:
>+ --parallel_build: "0" # 0 to auto-detect number of processors
>+@@ -82,12 +82,6 @@
>      clang.cpp.options.linker = "-ldl"
>      tcc.options.linker = "-ldl"
>    @end
>--  @if bsd or haiku:
>+-  @if bsd:
> -    # BSD got posix_spawn only recently, so we deactivate it for osproc:
> -    define:useFork
> -    # at least NetBSD has problems with thread local storage:
>@@ -11,5 +20,5 @@
> -    tlsEmulation:on
> -  @end
>    @if haiku:
>-     # -fopenmp
>-     gcc.options.linker = "-lroot -lnetwork"
>+     # Haiku currently have problems with TLS
>+     # https://dev.haiku-os.org/ticket/14342
>Index: files/patch-install.sh
>===================================================================
>--- files/patch-install.sh	(revision 482157)
>+++ files/patch-install.sh	(working copy)
>@@ -1,5 +1,5 @@
>---- install.sh.orig	2018-03-14 15:03:07.246974000 +0000
>-+++ install.sh	2018-03-14 15:08:43.631474000 +0000
>+--- install.sh.orig	2018-10-08 18:45:36.608723000 +0200
>++++ install.sh	2018-10-08 18:51:00.101929000 +0200
> @@ -15,48 +15,14 @@
>      "--help"|"-h"|"help"|"h")
>        echo "Nim installation script"
>@@ -15,19 +15,19 @@
>        ;;
> -    "/usr/bin")
> -      bindir=/usr/bin
>--      configdir=/etc
>+-      configdir=/etc/nim
> -      libdir=/usr/lib/nim
> -      docdir=/usr/share/nim/doc
> -      datadir=/usr/share/nim/data
>--      nimbleDir="/opt/nimble/pkgs/compiler-0.18.0"
>+-      nimbleDir="/opt/nimble/pkgs/compiler-0.19.0"
> -      ;;
> -    "/usr/local/bin")
> -      bindir=/usr/local/bin
>--      configdir=/etc
>+-      configdir=/etc/nim
> -      libdir=/usr/local/lib/nim
> -      docdir=/usr/local/share/nim/doc
> -      datadir=/usr/local/share/nim/data
>--      nimbleDir="/opt/nimble/pkgs/compiler-0.18.0"
>+-      nimbleDir="/opt/nimble/pkgs/compiler-0.19.0"
> -      ;;
> -    "/opt")
> -      bindir="/opt/nim/bin"
>@@ -35,7 +35,7 @@
> -      libdir="/opt/nim/lib"
> -      docdir="/opt/nim/doc"
> -      datadir="/opt/nim/data"
>--      nimbleDir="/opt/nimble/pkgs/compiler-0.18.0"
>+-      nimbleDir="/opt/nimble/pkgs/compiler-0.19.0"
> -      mkdir -p /opt/nim
> -      mkdir -p $bindir
> -      mkdir -p $configdir
>@@ -47,7 +47,7 @@
> -      docdir="$1/nim/doc"
> -      datadir="$1/nim/data"
> +      bindir="$1/bin"
>-+      configdir="$1/etc"
>++      configdir="$1/etc/nim"
> +      libdir="$1/lib"
> +      docdir="$1/share/doc/nim"
> +      datadir="$1/share/nim"
>@@ -54,7 +54,7 @@
>        nimbleDir="$1/nim"
>        mkdir -p $1/nim
>        mkdir -p $bindir
>-@@ -866,13 +832,6 @@
>+@@ -899,13 +865,6 @@
>  else
>    echo "Nim installation script"
>    echo "Usage: [sudo] sh install.sh DIR"
>Index: pkg-plist
>===================================================================
>--- pkg-plist	(revision 482157)
>+++ pkg-plist	(working copy)
>@@ -1,11 +1,12 @@
> bin/nim
>-etc/nim.cfg
>-etc/nimdoc.cfg
>-etc/nimdoc.tex.cfg
>+etc/nim/nim.cfg
>+etc/nim/nimdoc.cfg
>+etc/nim/nimdoc.tex.cfg
> lib/arch/x86/amd64.S
> lib/arch/x86/i386.S
> lib/core/allocators.nim
> lib/core/locks.nim
>+lib/core/macrocache.nim
> lib/core/macros.nim
> lib/core/refs.nim
> lib/core/rlocks.nim
>@@ -22,6 +23,8 @@
> lib/deprecated/pure/parseurl.nim
> lib/deprecated/pure/rawsockets.nim
> lib/deprecated/pure/sockets.nim
>+lib/genode/alloc.nim
>+lib/genode/env.nim
> lib/genode_cpp/syslocks.h
> lib/genode_cpp/threads.h
> lib/impure/db_mysql.nim
>@@ -38,11 +41,13 @@
> lib/js/asyncjs.nim
> lib/js/dom.nim
> lib/js/jsconsole.nim
>+lib/js/jscore.nim
> lib/js/jsffi.nim
> lib/nimbase.h
> lib/nimrtl.nim
> lib/nimrtl.nim.cfg
>-lib/packages/docutils/docutils.babel
>+lib/nintendoswitch/switch_memory.nim
>+lib/packages/docutils/docutils.nimble
> lib/packages/docutils/highlite.nim
> lib/packages/docutils/rst.nim
> lib/packages/docutils/rstast.nim
>@@ -55,6 +60,8 @@
> lib/posix/posix.nim
> lib/posix/posix_linux_amd64.nim
> lib/posix/posix_linux_amd64_consts.nim
>+lib/posix/posix_nintendoswitch.nim
>+lib/posix/posix_nintendoswitch_consts.nim
> lib/posix/posix_other.nim
> lib/posix/posix_other_consts.nim
> lib/posix/termios.nim
>@@ -145,6 +152,7 @@
> lib/pure/oswalkdir.nim
> lib/pure/parsecfg.nim
> lib/pure/parsecsv.nim
>+lib/pure/parsejson.nim
> lib/pure/parseopt.nim
> lib/pure/parseopt2.nim
> lib/pure/parsesql.nim
>@@ -169,6 +177,7 @@
> lib/pure/strtabs.nim
> lib/pure/strutils.nim
> lib/pure/subexes.nim
>+lib/pure/sugar.nim
> lib/pure/terminal.nim
> lib/pure/times.nim
> lib/pure/typetraits.nim
>@@ -184,6 +193,7 @@
> lib/pure/xmlparser.nim
> lib/pure/xmltree.nim
> lib/std/sha1.nim
>+lib/std/varints.nim
> lib/stdlib.nimble
> lib/system.nim
> lib/system/alloc.nim
>@@ -207,10 +217,11 @@
> lib/system/gc_common.nim
> lib/system/gc_ms.nim
> lib/system/gc_regions.nim
>-lib/system/genodealloc.nim
>+lib/system/helpers.nim
> lib/system/hti.nim
> lib/system/inclrtl.nim
> lib/system/jssys.nim
>+lib/system/memory.nim
> lib/system/memtracker.nim
> lib/system/mmdisp.nim
> lib/system/nimscript.nim
>@@ -220,6 +231,7 @@
> lib/system/repr.nim
> lib/system/reprjs.nim
> lib/system/sets.nim
>+lib/system/strmantle.nim
> lib/system/sysio.nim
> lib/system/syslocks.nim
> lib/system/sysspawn.nim
>@@ -247,9 +259,11 @@
> nim/compiler/ast.nim
> nim/compiler/astalgo.nim
> nim/compiler/bitsets.nim
>+nim/compiler/btrees.nim
> nim/compiler/canonicalizer.nim
> nim/compiler/ccgcalls.nim
> nim/compiler/ccgexprs.nim
>+nim/compiler/ccgliterals.nim
> nim/compiler/ccgmerge.nim
> nim/compiler/ccgstmts.nim
> nim/compiler/ccgthreadvars.nim
>@@ -259,8 +273,11 @@
> nim/compiler/cgen.nim
> nim/compiler/cgendata.nim
> nim/compiler/cgmeth.nim
>+nim/compiler/closureiters.nim
>+nim/compiler/cmdlinehelper.nim
> nim/compiler/commands.nim
> nim/compiler/condsyms.nim
>+nim/compiler/configuration.nim
> nim/compiler/debuginfo.nim
> nim/compiler/depends.nim
> nim/compiler/destroyer.nim
>@@ -279,16 +296,21 @@
> nim/compiler/idents.nim
> nim/compiler/idgen.nim
> nim/compiler/importer.nim
>+nim/compiler/incremental.nim
> nim/compiler/installer.ini
> nim/compiler/jsgen.nim
> nim/compiler/jstypes.nim
> nim/compiler/lambdalifting.nim
>+nim/compiler/layouter.nim
> nim/compiler/lexer.nim
> nim/compiler/liftlocals.nim
>+nim/compiler/lineinfos.nim
>+nim/compiler/linter.nim
> nim/compiler/lists.nim
> nim/compiler/llstream.nim
> nim/compiler/lookups.nim
> nim/compiler/lowerings.nim
>+nim/compiler/macrocacheimpl.nim
> nim/compiler/magicsys.nim
> nim/compiler/main.nim
> nim/compiler/mapping.txt
>@@ -304,7 +326,6 @@
> nim/compiler/nimeval.nim
> nim/compiler/nimfix/nimfix.nim
> nim/compiler/nimfix/nimfix.nim.cfg
>-nim/compiler/nimfix/pretty.nim
> nim/compiler/nimfix/prettybase.nim
> nim/compiler/nimlexbase.nim
> nim/compiler/nimsets.nim
>@@ -316,12 +337,12 @@
> nim/compiler/parser.nim
> nim/compiler/passaux.nim
> nim/compiler/passes.nim
>+nim/compiler/pathutils.nim
> nim/compiler/patterns.nim
>-nim/compiler/pbraces.nim
> nim/compiler/platform.nim
> nim/compiler/plugins/active.nim
> nim/compiler/plugins/itersgen.nim
>-nim/compiler/plugins/locals/locals.nim
>+nim/compiler/plugins/locals.nim
> nim/compiler/pluginsupport.nim
> nim/compiler/pragmas.nim
> nim/compiler/prefixmatches.nim
>@@ -331,9 +352,7 @@
> nim/compiler/reorder.nim
> nim/compiler/rod.nim
> nim/compiler/rodimpl.nim
>-nim/compiler/rodread.nim
> nim/compiler/rodutils.nim
>-nim/compiler/rodwrite.nim
> nim/compiler/ropes.nim
> nim/compiler/saturate.nim
> nim/compiler/scriptconfig.nim
>@@ -355,7 +374,6 @@
> nim/compiler/semtempl.nim
> nim/compiler/semtypes.nim
> nim/compiler/semtypinst.nim
>-nim/compiler/service.nim
> nim/compiler/sighashes.nim
> nim/compiler/sigmatch.nim
> nim/compiler/suggest.nim
>@@ -378,6 +396,5 @@
> nim/doc/advopt.txt
> nim/doc/basicopt.txt
> %%PORTDOCS%%@dir %%DOCSDIR%%
>-%%PORTDOCS%%%%DOCSDIR%%/html/overview.html
> %%TOOLS%%bin/nimgrep
> %%TOOLS%%bin/nimsuggest

Actions: View | Diff

Attachments on bug 232290: 198180