5 files changed, 31 insertions, 23 deletions

diff --git a/lang/nim/Makefile b/lang/nim/Makefile
index 71a5d7a01fde..3f3548a9b6f0 100644
--- a/lang/nim/Makefile
+++ b/lang/nim/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nim
-PORTVERSION=	0.15.2
+PORTVERSION=	0.16.0
 CATEGORIES=	lang
 MASTER_SITES=	http://nim-lang.org/download/
 
diff --git a/lang/nim/distinfo b/lang/nim/distinfo
index d20feed92f97..905cf8aef8f8 100644
--- a/lang/nim/distinfo
+++ b/lang/nim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1481642313
-SHA256 (nim-0.15.2.tar.xz) = 905df2316262aa2cbacae067acf45fc05c2a71c8c6fde1f2a70c927ebafcfe8a
-SIZE (nim-0.15.2.tar.xz) = 3251764
+TIMESTAMP = 1484056102
+SHA256 (nim-0.16.0.tar.xz) = 9e199823be47cba55e62dd6982f02cf0aad732f369799fec42a4d8c2265c5167
+SIZE (nim-0.16.0.tar.xz) = 2907076
diff --git a/lang/nim/files/patch-install.sh b/lang/nim/files/patch-install.sh
index 08d874a81d73..4da10abf555d 100644
--- a/lang/nim/files/patch-install.sh
+++ b/lang/nim/files/patch-install.sh
@@ -1,6 +1,6 @@
---- install.sh.orig	2016-12-13 16:08:57 UTC
-+++ install.sh
-@@ -32,48 +32,14 @@
+--- install.sh.orig	2017-01-10 13:55:39.983263000 +0000
++++ install.sh	2017-01-10 14:01:20.665343000 +0000
+@@ -15,48 +15,14 @@
      "--help"|"-h"|"help"|"h")
        echo "Nim installation script"
        echo "Usage: [sudo] sh install.sh DIR"
@@ -19,7 +19,7 @@
 -      libdir=/usr/lib/nim
 -      docdir=/usr/share/nim/doc
 -      datadir=/usr/share/nim/data
--      nimbleDir="/opt/nimble/pkgs/compiler-0.15.2"
+-      nimbleDir="/opt/nimble/pkgs/compiler-0.16.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.15.2"
+-      nimbleDir="/opt/nimble/pkgs/compiler-0.16.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.15.2"
+-      nimbleDir="/opt/nimble/pkgs/compiler-0.16.0"
 -      mkdir -p /opt/nim
 -      mkdir -p $bindir
 -      mkdir -p $configdir
@@ -54,3 +54,17 @@
        nimbleDir="$1/nim"
        mkdir -p $1/nim
        mkdir -p $bindir
+@@ -823,13 +789,6 @@
+ else
+   echo "Nim installation script"
+   echo "Usage: [sudo] sh install.sh DIR"
+-  echo "Where DIR may be:"
+-  echo "  /usr/bin"
+-  echo "  /usr/local/bin"
+-  echo "  /opt"
+-  echo "  <some other dir> (treated similar to '/opt')"
+-  echo "To deinstall, use the command:"
+-  echo "sh deinstall.sh DIR"
+   exit 1
+ fi
+ 
diff --git a/lang/nim/files/patch-lib-pure-os.nim b/lang/nim/files/patch-lib-pure-os.nim
deleted file mode 100644
index b179c5d124bc..000000000000
--- a/lang/nim/files/patch-lib-pure-os.nim
+++ /dev/null
@@ -1,12 +0,0 @@
---- lib/pure/os.nim.orig	2016-10-08 02:25:13 UTC
-+++ lib/pure/os.nim
-@@ -1450,9 +1450,6 @@ proc getAppFilename*(): string {.rtl, ex
-     elif defined(solaris):
-       result = getApplAux("/proc/" & $getpid() & "/path/a.out")
-     elif defined(freebsd):
--      result = getApplAux("/proc/" & $getpid() & "/file")
--    # little heuristic that may work on other POSIX-like systems:
--    if result.len == 0:
-       result = getApplHeuristic()
- 
- proc getApplicationFilename*(): string {.rtl, extern: "nos$1", deprecated.} =
diff --git a/lang/nim/pkg-plist b/lang/nim/pkg-plist
index 99abddd917a2..8f3da59ce1c4 100644
--- a/lang/nim/pkg-plist
+++ b/lang/nim/pkg-plist
@@ -33,6 +33,7 @@ lib/impure/rdstdin.nim
 lib/impure/re.nim
 lib/impure/ssl.nim
 lib/js/dom.nim
+lib/js/jsconsole.nim
 lib/nimbase.h
 lib/nimrtl.nim
 lib/nimrtl.nim.cfg
@@ -64,6 +65,7 @@ lib/pure/cgi.nim
 lib/pure/collections/LockFreeHash.nim
 lib/pure/collections/chains.nim
 lib/pure/collections/critbits.nim
+lib/pure/collections/deques.nim
 lib/pure/collections/heapqueue.nim
 lib/pure/collections/intsets.nim
 lib/pure/collections/lists.nim
@@ -86,6 +88,7 @@ lib/pure/cookies.nim
 lib/pure/coro.nim
 lib/pure/coro.nimcfg
 lib/pure/db_common.nim
+lib/pure/distros.nim
 lib/pure/dynlib.nim
 lib/pure/encodings.nim
 lib/pure/endians.nim
@@ -121,6 +124,7 @@ lib/pure/nativesockets.nim
 lib/pure/net.nim
 lib/pure/nimprof.nim
 lib/pure/nimprof.nim.cfg
+lib/pure/nimtracker.nim
 lib/pure/numeric.nim
 lib/pure/oids.nim
 lib/pure/options.nim
@@ -193,6 +197,7 @@ lib/system/gc_stack.nim
 lib/system/hti.nim
 lib/system/inclrtl.nim
 lib/system/jssys.nim
+lib/system/memtracker.nim
 lib/system/mmdisp.nim
 lib/system/nimscript.nim
 lib/system/osalloc.nim
@@ -274,6 +279,7 @@ nim/compiler/lowerings.nim
 nim/compiler/magicsys.nim
 nim/compiler/main.nim
 nim/compiler/mapping.txt
+nim/compiler/modulegraphs.nim
 nim/compiler/modules.nim
 nim/compiler/msgs.nim
 nim/compiler/nim.cfg
@@ -287,7 +293,6 @@ nim/compiler/nimfix/pretty.nim
 nim/compiler/nimfix/prettybase.nim
 nim/compiler/nimlexbase.nim
 nim/compiler/nimsets.nim
-nim/compiler/nimsuggest/nimsuggest.nim
 nim/compiler/nodejs.nim
 nim/compiler/nversion.nim
 nim/compiler/options.nim
@@ -332,6 +337,7 @@ 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
 nim/compiler/syntaxes.nim