- Update to 0.17.0

PR:		219381
Submitted by:	ports@nicandneal.net(maintainer)

5 files changed, 57 insertions, 21 deletions

diff --git a/lang/nim/Makefile b/lang/nim/Makefile
index 5d091ec4c13b..8b03ed939ea1 100644
--- a/lang/nim/Makefile
+++ b/lang/nim/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	nim
-PORTVERSION=	0.16.0
+PORTVERSION=	0.17.0
 CATEGORIES=	lang
 MASTER_SITES=	http://nim-lang.org/download/
 
@@ -16,13 +16,18 @@ BROKEN_mips64=		Does not build: build.sh: clang: not found
 BROKEN_powerpc64=	Does not build: build.sh: clang: not found
 BROKEN_sparc64=		Does not build: build.sh: clang: not found
 
-OPTIONS_DEFINE=	DOCS
+TOOLS_DESC=	Build and install nimgrep and nimsuggest
+
+OPTIONS_DEFINE=	DOCS TOOLS
+OPTIONS_SUB=	yes
 
 MAKE_JOBS_UNSAFE=	yes
 USES=		compiler tar:xz
 
 .include <bsd.port.pre.mk>
 
+TLIST=	nimgrep nimsuggest
+
 post-patch:
 .if ${COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e '/cc =/s/gcc/clang/' ${WRKSRC}/config/nim.cfg
@@ -36,8 +41,17 @@ do-build:
 	cd ${WRKSRC} && ./koch boot --parallelBuild=${MAKE_JOBS_NUMBER} \
 		-d:release
 
+do-build-TOOLS-on:
+	cd ${WRKSRC} && ./koch tools --parallelBuild=${MAKE_JOBS_NUMBER} \
+		-d:release
+
 do-install:
 	cd ${WRKSRC} && ${SH} install.sh ${STAGEDIR}${PREFIX}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/nim
 
+do-install-TOOLS-on:
+.for t in ${TLIST}
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${t} ${STAGEDIR}${PREFIX}/bin
+.endfor
+
 .include <bsd.port.post.mk>
diff --git a/lang/nim/distinfo b/lang/nim/distinfo
index 905cf8aef8f8..95efb9d1519e 100644
--- a/lang/nim/distinfo
+++ b/lang/nim/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1484056102
-SHA256 (nim-0.16.0.tar.xz) = 9e199823be47cba55e62dd6982f02cf0aad732f369799fec42a4d8c2265c5167
-SIZE (nim-0.16.0.tar.xz) = 2907076
+TIMESTAMP = 1495114578
+SHA256 (nim-0.17.0.tar.xz) = 36e18dd9384f6c67e6d0199b871b43e774a0af30532698184d6f5a9cc9ac7a9b
+SIZE (nim-0.17.0.tar.xz) = 25079320
diff --git a/lang/nim/files/patch-install.sh b/lang/nim/files/patch-install.sh
index 4da10abf555d..fc2f62ce337d 100644
--- a/lang/nim/files/patch-install.sh
+++ b/lang/nim/files/patch-install.sh
@@ -1,5 +1,5 @@
---- install.sh.orig	2017-01-10 13:55:39.983263000 +0000
-+++ install.sh	2017-01-10 14:01:20.665343000 +0000
+--- install.sh.orig	2017-05-17 22:06:55.000000000 +0000
++++ install.sh	2017-05-18 13:59:55.263749000 +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.16.0"
+-      nimbleDir="/opt/nimble/pkgs/compiler-0.17.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.16.0"
+-      nimbleDir="/opt/nimble/pkgs/compiler-0.17.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.16.0"
+-      nimbleDir="/opt/nimble/pkgs/compiler-0.17.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
-@@ -823,13 +789,6 @@
+@@ -848,13 +814,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
new file mode 100644
index 000000000000..199416d65203
--- /dev/null
+++ b/lang/nim/files/patch-koch.nim
@@ -0,0 +1,10 @@
+--- 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()
+-  buildNimble(latest)
+ 
+ proc nsis(args: string) =
+   bundleNimbleExe()
diff --git a/lang/nim/pkg-plist b/lang/nim/pkg-plist
index 8f3da59ce1c4..22f0fc806079 100644
--- a/lang/nim/pkg-plist
+++ b/lang/nim/pkg-plist
@@ -2,12 +2,8 @@ bin/nim
 etc/nim.cfg
 etc/nimdoc.cfg
 etc/nimdoc.tex.cfg
-lib/arch/arch.nim
-lib/arch/i386.asm
-lib/arch/ms_amd64.asm
-lib/arch/ms_i386.asm
-lib/arch/unix_amd64.asm
-lib/arch/unix_i386.asm
+lib/arch/x86/amd64.S
+lib/arch/x86/i386.S
 lib/core/locks.nim
 lib/core/macros.nim
 lib/core/rlocks.nim
@@ -21,6 +17,8 @@ lib/deprecated/pure/ftpclient.nim
 lib/deprecated/pure/parseurl.nim
 lib/deprecated/pure/rawsockets.nim
 lib/deprecated/pure/sockets.nim
+lib/genode_cpp/syslocks.h
+lib/genode_cpp/threads.h
 lib/impure/db_mysql.nim
 lib/impure/db_odbc.nim
 lib/impure/db_postgres.nim
@@ -34,6 +32,7 @@ lib/impure/re.nim
 lib/impure/ssl.nim
 lib/js/dom.nim
 lib/js/jsconsole.nim
+lib/js/jsffi.nim
 lib/nimbase.h
 lib/nimrtl.nim
 lib/nimrtl.nim.cfg
@@ -42,11 +41,16 @@ lib/packages/docutils/highlite.nim
 lib/packages/docutils/rst.nim
 lib/packages/docutils/rstast.nim
 lib/packages/docutils/rstgen.nim
+lib/packages/fsmonitor.nim
 lib/posix/epoll.nim
 lib/posix/inotify.nim
 lib/posix/kqueue.nim
 lib/posix/linux.nim
 lib/posix/posix.nim
+lib/posix/posix_linux_amd64.nim
+lib/posix/posix_linux_amd64_consts.nim
+lib/posix/posix_other.nim
+lib/posix/posix_other_consts.nim
 lib/posix/termios.nim
 lib/prelude.nim
 lib/pure/algorithm.nim
@@ -60,6 +64,7 @@ lib/pure/asyncnet.nim
 lib/pure/base64.nim
 lib/pure/basic2d.nim
 lib/pure/basic3d.nim
+lib/pure/bitops.nim
 lib/pure/browsers.nim
 lib/pure/cgi.nim
 lib/pure/collections/LockFreeHash.nim
@@ -92,10 +97,8 @@ lib/pure/distros.nim
 lib/pure/dynlib.nim
 lib/pure/encodings.nim
 lib/pure/endians.nim
-lib/pure/etcpriv.nim
 lib/pure/events.nim
 lib/pure/fenv.nim
-lib/pure/fsmonitor.nim
 lib/pure/future.nim
 lib/pure/gentabs.nim
 lib/pure/hashes.nim
@@ -104,6 +107,7 @@ lib/pure/htmlparser.nim
 lib/pure/httpclient.nim
 lib/pure/httpcore.nim
 lib/pure/httpserver.nim
+lib/pure/includes/asynccommon.nim
 lib/pure/includes/asyncfutures.nim
 lib/pure/ioselectors.nim
 lib/pure/ioselects/ioselectors_epoll.nim
@@ -148,6 +152,7 @@ lib/pure/romans.nim
 lib/pure/ropes.nim
 lib/pure/scgi.nim
 lib/pure/securehash.nim
+lib/pure/segfaults.nim
 lib/pure/selectors.nim
 lib/pure/smtp.nim
 lib/pure/smtp.nim.cfg
@@ -167,6 +172,7 @@ lib/pure/unidecode/unidecode.dat
 lib/pure/unidecode/unidecode.nim
 lib/pure/unittest.nim
 lib/pure/uri.nim
+lib/pure/volatile.nim
 lib/pure/xmldom.nim
 lib/pure/xmldomparser.nim
 lib/pure/xmlparser.nim
@@ -222,8 +228,8 @@ lib/wrappers/libsvm.nim
 lib/wrappers/libuv.nim
 lib/wrappers/linenoise/LICENSE.txt
 lib/wrappers/linenoise/README.markdown
-lib/wrappers/linenoise/clinenoise.c
-lib/wrappers/linenoise/clinenoise.h
+lib/wrappers/linenoise/linenoise.c
+lib/wrappers/linenoise/linenoise.h
 lib/wrappers/linenoise/linenoise.nim
 lib/wrappers/mysql.nim
 lib/wrappers/odbcsql.nim
@@ -282,6 +288,7 @@ nim/compiler/mapping.txt
 nim/compiler/modulegraphs.nim
 nim/compiler/modules.nim
 nim/compiler/msgs.nim
+nim/compiler/ndi.nim
 nim/compiler/nim.cfg
 nim/compiler/nim.nim
 nim/compiler/nimblecmd.nim
@@ -309,6 +316,7 @@ nim/compiler/plugins/itersgen.nim
 nim/compiler/plugins/locals/locals.nim
 nim/compiler/pluginsupport.nim
 nim/compiler/pragmas.nim
+nim/compiler/prefixmatches.nim
 nim/compiler/procfind.nim
 nim/compiler/readme.txt
 nim/compiler/renderer.nim
@@ -330,6 +338,7 @@ nim/compiler/semgnrc.nim
 nim/compiler/seminst.nim
 nim/compiler/semmacrosanity.nim
 nim/compiler/semmagic.nim
+nim/compiler/semobjconstr.nim
 nim/compiler/semparallel.nim
 nim/compiler/sempass2.nim
 nim/compiler/semstmts.nim
@@ -360,3 +369,6 @@ nim/compiler/writetracking.nim
 nim/doc/advopt.txt
 nim/doc/basicopt.txt
 %%PORTDOCS%%@dir %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/html/overview.html
+%%TOOLS%%bin/nimgrep
+%%TOOLS%%bin/nimsuggest