Upgrade to version 1.86.

6 files changed, 38 insertions, 32 deletions

diff --git a/misc/ytree/Makefile b/misc/ytree/Makefile
index 43d646696a14..7bcd5c927df4 100644
--- a/misc/ytree/Makefile
+++ b/misc/ytree/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	ytree
-PORTVERSION=	1.78
+PORTVERSION=	1.86
 CATEGORIES=	misc
 MASTER_SITES=	http://www.han.de/~werner/
 
diff --git a/misc/ytree/distinfo b/misc/ytree/distinfo
index a9fd736aa861..fd726b769bdc 100644
--- a/misc/ytree/distinfo
+++ b/misc/ytree/distinfo
@@ -1,2 +1,3 @@
-MD5 (ytree-1.78.tar.gz) = 41ca232efa31af0098c5b11b1e2f002b
-SIZE (ytree-1.78.tar.gz) = 96098
+MD5 (ytree-1.86.tar.gz) = dd5205dd593639b9fa75f7048656c1ec
+SHA256 (ytree-1.86.tar.gz) = 1880aad0b5b814f15a73d6da00747914452ad3df7f94fa278a78753b6f60752c
+SIZE (ytree-1.86.tar.gz) = 112339
diff --git a/misc/ytree/files/patch-aa b/misc/ytree/files/patch-aa
index 8c75570d0cf0..c801ce3890b1 100644
--- a/misc/ytree/files/patch-aa
+++ b/misc/ytree/files/patch-aa
@@ -1,5 +1,8 @@
---- Makefile.orig	Sat Jun 16 23:12:10 2001
-+++ Makefile	Sat Jun 16 23:13:07 2001
+
+$FreeBSD$
+
+--- Makefile.orig
++++ Makefile
 @@ -6,7 +6,7 @@
  #
  ############################################################################
@@ -9,28 +12,25 @@
  
  #
  # ADD_CFLAGS: Add -DVI_KEYS if you want vi-cursor-keys
-@@ -27,10 +27,10 @@
- ###########################
- # LINUX (testet with ncurses 5.2)
- ###########################
--COLOR       = -DCOLOR_SUPPORT 
-+#COLOR       = -DCOLOR_SUPPORT 
+@@ -32,8 +32,8 @@
+ COLOR       = -DCOLOR_SUPPORT 
  #CLOCK	    = -DCLOCK_SUPPORT # Experimental!
--CFLAGS      = $(ADD_CFLAGS) $(COLOR) $(CLOCK)
--LIBS        = -lncurses
-+#CFLAGS      = $(ADD_CFLAGS) $(COLOR) $(CLOCK)
-+#LIBS        = -lncurses
+ READLINE    = -DREADLINE_SUPPORT
+-CFLAGS      = -D_GNU_SOURCE $(ADD_CFLAGS) $(COLOR) $(CLOCK) $(READLINE)
+-LIBS        = -lncurses -lreadline
++#CFLAGS      = -D_GNU_SOURCE $(ADD_CFLAGS) $(COLOR) $(CLOCK) $(READLINE)
++#LIBS        = -lncurses -lreadline
  
  ###########################
- # LINUX (X11 using PDCurses) thanks to  Mark Hessling
-@@ -54,8 +54,8 @@
+ # LINUX with Wide character support (testet with ncurses 5.4)
+@@ -87,8 +87,8 @@
  ###########################
  # FreeBSD (Thanks to Peter Brevik)
  ###########################
 -#CFLAGS      = -DCOLOR_SUPPORT -DNCURSES
 -#LIBS        = -lncurses -lmytinfo -lcompat
 +CFLAGS      = -DCOLOR_SUPPORT -DNCURSES
-+LIBS        = -lncurses -lmytinfo -lcompat
++LIBS        = -lreadline -lncurses -lmytinfo -lcompat
  
  ###########################
- # DOS/Windows with DJGPP
+ # MAC OS X
diff --git a/misc/ytree/files/patch-ab b/misc/ytree/files/patch-ab
index 272eb3d1ef87..c0584d56c70c 100644
--- a/misc/ytree/files/patch-ab
+++ b/misc/ytree/files/patch-ab
@@ -1,5 +1,8 @@
---- freesp.c.orig	Sat Jun 16 23:20:49 2001
-+++ freesp.c	Sat Jun 16 23:20:55 2001
+
+$FreeBSD$
+
+--- freesp.c.orig
++++ freesp.c
 @@ -9,7 +9,7 @@
  
  #include "ytree.h"
diff --git a/misc/ytree/files/patch-af b/misc/ytree/files/patch-af
deleted file mode 100644
index 77e6917955de..000000000000
--- a/misc/ytree/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- dirwin.c.orig	Sat Jun 16 23:15:01 2001
-+++ dirwin.c	Sat Jun 16 23:15:08 2001
-@@ -168,7 +168,7 @@
-                                  modify_time
-                                  );
- #else
--                 (void) strcpy( format, "%10s %3d %7d %12s");
-+                 (void) strcpy( format, "%10s %3d %7qd %12s");
-                  (void) sprintf( line_buffer, format, attributes,
-                                  de_ptr->stat_struct.st_nlink,
-                                  de_ptr->stat_struct.st_size,
diff --git a/misc/ytree/files/patch-ytree.h b/misc/ytree/files/patch-ytree.h
new file mode 100644
index 000000000000..aa07504fb992
--- /dev/null
+++ b/misc/ytree/files/patch-ytree.h
@@ -0,0 +1,13 @@
+
+$FreeBSD$
+
+--- ytree.h.orig
++++ ytree.h
+@@ -14,6 +14,7 @@
+ #include <stdio.h>
+ #include <ctype.h>
+ #include <math.h>
++#include <locale.h>
+ 
+ #ifdef XCURSES
+ #include <xcurses.h>