Update to 2.46. Remove patch-array.c which was properly fixed elsewhere a few

months ago, and add patch-func.c from cvs, to deal with a crash in GC with
malloc debugging on (i.e. -current).

4 files changed, 25 insertions, 25 deletions

diff --git a/lang/nickle/Makefile b/lang/nickle/Makefile
index c736df47d772..539b59c7ca37 100644
--- a/lang/nickle/Makefile
+++ b/lang/nickle/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	nickle
-PORTVERSION=	2.45
+PORTVERSION=	2.46
 CATEGORIES=	lang
 MASTER_SITES=	http://www.nickle.org/release/
 
diff --git a/lang/nickle/distinfo b/lang/nickle/distinfo
index 070fef100415..2718ac90c2f7 100644
--- a/lang/nickle/distinfo
+++ b/lang/nickle/distinfo
@@ -1,2 +1,2 @@
-MD5 (nickle-2.45.tar.gz) = 8ab45439a9375d0f71a36575d93c0a48
-SIZE (nickle-2.45.tar.gz) = 384554
+MD5 (nickle-2.46.tar.gz) = 8ebf7a95ea568da6f06c6bb4ca412999
+SIZE (nickle-2.46.tar.gz) = 384882
diff --git a/lang/nickle/files/patch-array.c b/lang/nickle/files/patch-array.c
deleted file mode 100644
index c89768329f16..000000000000
--- a/lang/nickle/files/patch-array.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- array.c.orig	Sat Oct 16 18:02:07 2004
-+++ array.c	Sat Oct 16 18:02:10 2004
-@@ -223,12 +223,14 @@
- NewBoxVector (int nvalues, TypePtr type)
- {
-     ENTER ();
--    BoxVectorPtr    bv = ALLOCATE (&BoxVectorType, 
--				   sizeof (BoxVector) +
--				   nvalues * sizeof (BoxPtr));
-+    BoxVectorPtr    bv;
-     int		    i;
--    BoxPtr	    *boxes = BoxVectorBoxes (bv);
--    
-+    BoxPtr	    *boxes;
-+
-+    bv = ALLOCATE (&BoxVectorType, sizeof (BoxVector) +
-+		   nvalues * sizeof (BoxPtr));
-+    boxes = BoxVectorBoxes (bv);
-+
-     bv->nvalues = nvalues;
-     bv->type = type;
-     for (i = 0; i < nvalues; i++)
diff --git a/lang/nickle/files/patch-func.c b/lang/nickle/files/patch-func.c
new file mode 100644
index 000000000000..4be7ae9f660d
--- /dev/null
+++ b/lang/nickle/files/patch-func.c
@@ -0,0 +1,22 @@
+Index: func.c
+===================================================================
+RCS file: /cvs/keithp/nickle/func.c,v
+retrieving revision 1.25
+retrieving revision 1.26
+diff -u -u -r1.25 -r1.26
+--- func.c	9 Jul 2004 18:48:35 -0000	1.25
++++ func.c	25 Feb 2005 03:23:06 -0000	1.26
+@@ -1,4 +1,4 @@
+-/* $Header: /cvs/keithp/nickle/func.c,v 1.25 2004/07/09 18:48:35 keithp Exp $ */
++/* $Header: /cvs/keithp/nickle/func.c,v 1.26 2005/02/25 03:23:06 keithp Exp $ */
+ 
+ /*
+  * Copyright © 1988-2004 Keith Packard and Bart Massey.
+@@ -99,6 +99,7 @@
+     bc->base.args = args;
+     bc->base.name = 0;
+     bc->base.previous = 0;
++    bc->base.func = 0;
+     bc->base.doc = doc ? NewStrString (doc) : Void;
+     
+     bc->builtin.needsNext = needsNext;