4 files changed, 32 insertions, 21 deletions
diff --git a/math/nickle/Makefile b/math/nickle/Makefile
index 191a500a752..7ff6acb8426 100644
--- a/math/nickle/Makefile
+++ b/math/nickle/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.17 2017/11/23 16:15:23 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2018/12/02 06:49:24 wiz Exp $
 
-DISTNAME=	nickle-2.81
+DISTNAME=	nickle-2.84
 CATEGORIES=	math lang
 MASTER_SITES=	http://nickle.org/release/
 
@@ -16,5 +16,7 @@ CONFIGURE_ENV+=	ac_cv_path_DOCBOOK2PDF=
 
 TEST_TARGET=	check
 
-.include "../../mk/readline.buildlink3.mk"
+# rl_reset_after_signal, rl_echo_signal_char are missing in libedit as of 2018/12/02
+#.include "../../mk/readline.buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/nickle/PLIST b/math/nickle/PLIST
index 13acf1db9f7..fcf63aff305 100644
--- a/math/nickle/PLIST
+++ b/math/nickle/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2017/03/20 13:13:51 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/12/02 06:49:24 wiz Exp $
 bin/nickle
 include/nickle/builtin-namespaces.h
 include/nickle/builtin.h
@@ -68,3 +68,21 @@ share/nickle/socket.5c
 share/nickle/sort.5c
 share/nickle/string.5c
 share/nickle/svg.5c
+share/nickle/test/arraytest.5c
+share/nickle/test/datetest.5c
+share/nickle/test/factorial.5c
+share/nickle/test/gcdtest.5c
+share/nickle/test/hashtest.5c
+share/nickle/test/inttest.5c
+share/nickle/test/is_type.5c
+share/nickle/test/jsontest.5c
+share/nickle/test/math-tables.5c
+share/nickle/test/math.5c
+share/nickle/test/modtest.5c
+share/nickle/test/optest.5c
+share/nickle/test/orderofoptest.5c
+share/nickle/test/rattest.5c
+share/nickle/test/reftest.5c
+share/nickle/test/round.5c
+share/nickle/test/scanf.5c
+share/nickle/test/signal.5c
diff --git a/math/nickle/distinfo b/math/nickle/distinfo
index 7cf9b3d1be1..db85cdadf06 100644
--- a/math/nickle/distinfo
+++ b/math/nickle/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.13 2018/01/03 12:12:07 jperkin Exp $
+$NetBSD: distinfo,v 1.14 2018/12/02 06:49:24 wiz Exp $
 
-SHA1 (nickle-2.81.tar.gz) = ef9c6de7ad2a544a3245657fbfd46dbfa9675476
-RMD160 (nickle-2.81.tar.gz) = 03c8ffbebfd0104b3cd54f748f702de7e6f999f5
-SHA512 (nickle-2.81.tar.gz) = b11755f824b3abf74f104db7bfaf58f52fef0b76e194ffd8c562693d5497f9de69121f9ce98777fb0366a7e02be7b32e7d800a31be03f5a5921b9d8bc3502aca
-Size (nickle-2.81.tar.gz) = 579140 bytes
+SHA1 (nickle-2.84.tar.gz) = ce346b5ba0cd0085dfd1a1351d03ffa8faeb3368
+RMD160 (nickle-2.84.tar.gz) = 4c34eaa038dbae546467c652a02953dccaa128de
+SHA512 (nickle-2.84.tar.gz) = ded33c3b2e6f8234e48148b2590db4a48653f3e85ec8ae7d94f63a6d0a7e03b2990af2ccdbd0982b92a980cecf68f016775f6d6f583918add3ca34d9fa0e7d62
+Size (nickle-2.84.tar.gz) = 810473 bytes
 SHA1 (patch-aa) = 4cbb563244883f6c9f7a3594875052f8d9a9e9b3
-SHA1 (patch-builtin-date.c) = ca55181a501cfbe3437d38728398852e96b0111a
+SHA1 (patch-builtin-date.c) = 1aa792b5a91f4b808208e73ee38bd539ab0c12fb
 SHA1 (patch-lex.c) = f9d5f3f282f97a94195730062525e9f6310bb316
diff --git a/math/nickle/patches/patch-builtin-date.c b/math/nickle/patches/patch-builtin-date.c
index b7ff81f3edd..e75ed17a609 100644
--- a/math/nickle/patches/patch-builtin-date.c
+++ b/math/nickle/patches/patch-builtin-date.c
@@ -1,9 +1,9 @@
-$NetBSD: patch-builtin-date.c,v 1.1 2018/01/03 12:12:07 jperkin Exp $
+$NetBSD: patch-builtin-date.c,v 1.2 2018/12/02 06:49:24 wiz Exp $
 
 Fix missing tm_zone on SunOS.
 Pull in upstream fix for missing timelocal().
 
---- builtin-date.c.orig	2017-11-14 10:30:06.000000000 +0000
+--- builtin-date.c.orig	2018-09-24 21:43:45.000000000 +0000
 +++ builtin-date.c
 @@ -76,7 +76,11 @@ to_date(struct tm *tm)
      BoxValueSet (box, 6, int_value(tm->tm_wday));
@@ -27,12 +27,3 @@ Pull in upstream fix for missing timelocal().
  }
  
  static Value
-@@ -143,7 +149,7 @@ do_Date_timelocal(Value v)
-     time_t	seconds;
- 
-     from_date(v, &tm);
--    seconds = timelocal(&tm);
-+    seconds = mktime(&tm);
-     RETURN(Reduce(NewSignedDigitInteger((signed_digit) seconds)));
- }
-