From 342608db0c65191251da75020eba42afd30d6c70 Mon Sep 17 00:00:00 2001
From: Mikhail Sobolev <mss@mawhrin.net>
Date: Mon, 12 Jan 2015 11:16:52 +0200
Subject: [PATCH 1/7] make FreeBSD's compiler clang

* there's not much documentation about what's in nim.cfg file
* the build.sh template was updated based on darwin
---
 config/nim.cfg             | 2 +-
 tools/niminst/buildsh.tmpl | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/config/nim.cfg b/config/nim.cfg
index 018e21b17..54c77e573 100644
--- a/config/nim.cfg
+++ b/config/nim.cfg
@@ -100,7 +100,7 @@ hint[LineTooLong]=off
   @end
 @end
 
-@if macosx:
+@if macosx or freebsd:
   cc = clang
   tlsEmulation:on
   gcc.options.always = "-w -fasm-blocks"
diff --git a/tools/niminst/buildsh.tmpl b/tools/niminst/buildsh.tmpl
index 4966af07a..d9508f515 100644
--- a/tools/niminst/buildsh.tmpl
+++ b/tools/niminst/buildsh.tmpl
@@ -54,10 +54,16 @@ case $uos in
     myos="linux" 
     LINK_FLAGS="$LINK_FLAGS -ldl -lm"
     ;;
-  *freebsd* | *dragonfly* ) 
+  *dragonfly* )
     myos="freebsd"
     LINK_FLAGS="$LINK_FLAGS -lm"
     ;;
+  *freebsd* )
+    myos="freebsd"
+    CC="clang"
+    LINKER="clang"
+    LINK_FLAGS="$LINK_FLAGS -ldl -lm"
+    ;;
   *openbsd* )
     myos="openbsd" 
     LINK_FLAGS="$LINK_FLAGS -lm"

From ff941fd489e7340a2138550756572b01774f11ef Mon Sep 17 00:00:00 2001
From: Dustin Lacewell <dlacewell@gmail.com>
Date: Mon, 12 Jan 2015 10:53:02 -0800
Subject: [PATCH 2/7] Add named anchor links to procs in the documentation
 index

---
 lib/packages/docutils/rstgen.nim | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/packages/docutils/rstgen.nim b/lib/packages/docutils/rstgen.nim
index 09373ac9e..811ca1c6e 100644
--- a/lib/packages/docutils/rstgen.nim
+++ b/lib/packages/docutils/rstgen.nim
@@ -417,8 +417,10 @@ proc generateSymbolIndex(symbols: seq[TIndexEntry]): string =
   result = ""
   var i = 0
   while i < symbols.len:
-    result.addf("<dt><span>$1:</span></dt><ul class=\"simple\"><dd>\n",
-                [symbols[i].keyword])
+    let keyword= symbols[i].keyword
+    let cleaned_keyword = keyword[1..keyword.high - 1]
+    result.addf("<dt><a name=\"$2\" href=\"#$2\"><span>$1:</span></a></dt><ul class=\"simple\"><dd>\n",
+                [symbols[i].keyword, cleaned_keyword])
     var j = i
     while j < symbols.len and symbols[i].keyword == symbols[j].keyword:
       let

From 9e4ee03c2c903875213ee66f35ad08185dc1331f Mon Sep 17 00:00:00 2001
From: Dustin Lacewell <dlacewell@gmail.com>
Date: Mon, 12 Jan 2015 11:20:26 -0800
Subject: [PATCH 3/7] Replace other common expressions with defined variable

---
 lib/packages/docutils/rstgen.nim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/packages/docutils/rstgen.nim b/lib/packages/docutils/rstgen.nim
index 811ca1c6e..14614b2ed 100644
--- a/lib/packages/docutils/rstgen.nim
+++ b/lib/packages/docutils/rstgen.nim
@@ -420,9 +420,9 @@ proc generateSymbolIndex(symbols: seq[TIndexEntry]): string =
     let keyword= symbols[i].keyword
     let cleaned_keyword = keyword[1..keyword.high - 1]
     result.addf("<dt><a name=\"$2\" href=\"#$2\"><span>$1:</span></a></dt><ul class=\"simple\"><dd>\n",
-                [symbols[i].keyword, cleaned_keyword])
+                [keyword, cleaned_keyword])
     var j = i
-    while j < symbols.len and symbols[i].keyword == symbols[j].keyword:
+    while j < symbols.len and keyword == symbols[j].keyword:
       let
         url = symbols[j].link
         text = if not symbols[j].linkTitle.isNil: symbols[j].linkTitle else: url

From 12593eed7d1063f76f5cf5f710c7b1c899c48b44 Mon Sep 17 00:00:00 2001
From: def <dennis@felsin9.de>
Date: Mon, 12 Jan 2015 23:04:53 +0100
Subject: [PATCH 4/7] Make nimeval compile

---
 compiler/nimeval.nim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/nimeval.nim b/compiler/nimeval.nim
index 5693cbe91..197e8bf86 100644
--- a/compiler/nimeval.nim
+++ b/compiler/nimeval.nim
@@ -24,7 +24,7 @@ proc execute*(program: string) =
   when hasFFI: defineSymbol("nimffi")
   registerPass(verbosePass)
   registerPass(semPass)
-  registerPass(vmPass)
+  registerPass(evalPass)
 
   appendStr(searchPaths, options.libpath)
   compileSystemModule()

From 519ec304e44ba79c7a1bb82006a497876adb3d55 Mon Sep 17 00:00:00 2001
From: def <dennis@felsin9.de>
Date: Mon, 12 Jan 2015 23:16:57 +0100
Subject: [PATCH 5/7] Fix: Only handle EPOLLERR as an error event

When an EPOLLRDHUP is received with epoll_ctl, there can still be data
to be read. So we shouldn't immediately close the socket and abort.
---
 lib/pure/selectors.nim | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/pure/selectors.nim b/lib/pure/selectors.nim
index dfad644ab..29f6cd3ab 100644
--- a/lib/pure/selectors.nim
+++ b/lib/pure/selectors.nim
@@ -157,8 +157,6 @@ elif defined(linux):
     
       var evSet: set[Event] = {}
       if (s.events[i].events and EPOLLERR) != 0: evSet = evSet + {EvError}
-      if (s.events[i].events and EPOLLHUP) != 0: evSet = evSet + {EvError}
-      if (s.events[i].events and EPOLLRDHUP) != 0: evSet = evSet + {EvError}
       if (s.events[i].events and EPOLLIN) != 0: evSet = evSet + {EvRead}
       if (s.events[i].events and EPOLLOUT) != 0: evSet = evSet + {EvWrite}
       let selectorKey = s.fds[fd]

From 2b56335e1d5c72b92b71ddf19d7e96344d9c490e Mon Sep 17 00:00:00 2001
From: ReneSac <reneduani@yahoo.com.br>
Date: Mon, 12 Jan 2015 22:37:10 -0200
Subject: [PATCH 6/7] Added missing windows wrappers to the lib.html doc

---
 doc/lib.txt | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/doc/lib.txt b/doc/lib.txt
index 57107b0db..b7c94b505 100644
--- a/doc/lib.txt
+++ b/doc/lib.txt
@@ -468,12 +468,16 @@ Windows specific
 
 * `windows <windows.html>`_
   Contains a wrapper for the Win32 API.
+* `winlean <winlean.html>`_
+  Contains a wrapper for a small subset of the Win32 API.
 * `shellapi <shellapi.html>`_
   Contains a wrapper for the ``shellapi.h`` header.
 * `shfolder <shfolder.html>`_
   Contains a wrapper for the ``shfolder.h`` header.
 * `mmsystem <mmsystem.html>`_
   Contains a wrapper for the ``mmsystem.h`` header.
+* `psapi <psapi.html>`_
+  Contains a wrapper for the ``psapi.h`` header.
 * `nb30 <nb30.html>`_
   This module contains the definitions for portable NetBIOS 3.0 support.
 

From 5b9557c228e6b13cc6c2dcbcaf2ace0203b8b930 Mon Sep 17 00:00:00 2001
From: Simon Hafner <hafnersimon@gmail.com>
Date: Tue, 13 Jan 2015 01:13:34 -0600
Subject: [PATCH 7/7] TSlice -> Slice in the tut1

---
 doc/tut1.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/tut1.txt b/doc/tut1.txt
index 5901dd02a..4e419d19f 100644
--- a/doc/tut1.txt
+++ b/doc/tut1.txt
@@ -1313,9 +1313,9 @@ Slices
 ------
 
 Slices look similar to subranges types in syntax but are used in a different
-context. A slice is just an object of type TSlice which contains two bounds,
+context. A slice is just an object of type Slice which contains two bounds,
 `a` and `b`. By itself a slice is not very useful, but other collection types
-define operators which accept TSlice objects to define ranges.
+define operators which accept Slice objects to define ranges.
 
 .. code-block:: nim