diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2018-03-18 20:04:06 +0000 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2018-03-18 20:04:06 +0000 |
| commit | cdb5710eacb9be3ee2dcb96eccd2346b5f48e3bd (patch) | |
| tree | 92795256fab0dae7911e859c9c2759c9b0b7d530 /lang/nim/files | |
| parent | sysutils/DTraceToolkit: Unbreak by fixing shebang (diff) | |
Update to upstream version 0.18.0
PR: 226607
Submitted by: ports@nicandneal.net (maintainer)
Diffstat (limited to 'lang/nim/files')
| -rw-r--r-- | lang/nim/files/patch-install.sh | 12 | ||||
| -rw-r--r-- | lang/nim/files/patch-koch.nim | 14 |
2 files changed, 14 insertions, 12 deletions
diff --git a/lang/nim/files/patch-install.sh b/lang/nim/files/patch-install.sh index 9ef931155c7e..a7c4b86d7414 100644 --- a/lang/nim/files/patch-install.sh +++ b/lang/nim/files/patch-install.sh @@ -1,5 +1,5 @@ ---- install.sh.orig 2017-09-07 18:45:41.000000000 +0000 -+++ install.sh 2017-09-18 14:47:39.284096000 +0000 +--- install.sh.orig 2018-03-14 15:03:07.246974000 +0000 ++++ install.sh 2018-03-14 15:08:43.631474000 +0000 @@ -15,48 +15,14 @@ "--help"|"-h"|"help"|"h") echo "Nim installation script" @@ -19,7 +19,7 @@ - libdir=/usr/lib/nim - docdir=/usr/share/nim/doc - datadir=/usr/share/nim/data -- nimbleDir="/opt/nimble/pkgs/compiler-0.17.2" +- nimbleDir="/opt/nimble/pkgs/compiler-0.18.0" - ;; - "/usr/local/bin") - bindir=/usr/local/bin @@ -27,7 +27,7 @@ - libdir=/usr/local/lib/nim - docdir=/usr/local/share/nim/doc - datadir=/usr/local/share/nim/data -- nimbleDir="/opt/nimble/pkgs/compiler-0.17.2" +- nimbleDir="/opt/nimble/pkgs/compiler-0.18.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.17.2" +- nimbleDir="/opt/nimble/pkgs/compiler-0.18.0" - mkdir -p /opt/nim - mkdir -p $bindir - mkdir -p $configdir @@ -54,7 +54,7 @@ nimbleDir="$1/nim" mkdir -p $1/nim mkdir -p $bindir -@@ -854,13 +820,6 @@ +@@ -866,13 +832,6 @@ else echo "Nim installation script" echo "Usage: [sudo] sh install.sh DIR" diff --git a/lang/nim/files/patch-koch.nim b/lang/nim/files/patch-koch.nim index 199416d65203..9c1c074e6106 100644 --- a/lang/nim/files/patch-koch.nim +++ b/lang/nim/files/patch-koch.nim @@ -1,10 +1,12 @@ ---- koch.nim.orig 2017-05-18 14:19:21.268379000 +0000 -+++ koch.nim 2017-05-18 14:21:26.248851000 +0000 -@@ -257,7 +257,6 @@ - let nimgrepExe = "bin/nimgrep".exe - nimexec "c -o:" & nimgrepExe & " tools/nimgrep.nim" - when defined(windows): buildVccTool() +--- koch.nim.orig 2018-03-14 15:15:05.712810000 +0000 ++++ koch.nim 2018-03-14 15:15:42.575087000 +0000 +@@ -265,7 +265,8 @@ + + #nimexec "c -o:" & ("bin/nimresolve".exe) & " tools/nimresolve.nim" + - buildNimble(latest) ++ # Don't build Nimble here. Use the port instead. ++ #buildNimble(latest) proc nsis(args: string) = bundleNimbleExe() |