--- a/components/tree/Makefile	Thu Mar 10 23:00:13 2016 -0800
+++ b/components/tree/Makefile	Fri Mar 11 05:27:56 2016 -0800
@@ -19,22 +19,22 @@
 # CDDL HEADER END
 
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=		tree
-COMPONENT_VERSION=	1.5.3
+COMPONENT_VERSION=	1.7.0
 COMPONENT_SRC=		$(COMPONENT_NAME)-$(COMPONENT_VERSION)
 COMPONENT_ARCHIVE=	$(COMPONENT_SRC).tgz
 COMPONENT_ARCHIVE_HASH=	\
-    sha256:1128755ea9455615188212bb04319cf103114fb78f687aa887ce29ef184ffb8d
+    sha256:6957c20e82561ac4231638996e74f4cfa4e6faabc5a2f511f0b4e3940e8f7b12
 COMPONENT_PROJECT_URL=	http://mama.indstate.edu/users/ice/tree/
 COMPONENT_ARCHIVE_URL=	$(COMPONENT_PROJECT_URL)src/$(COMPONENT_ARCHIVE)
 COMPONENT_BUGDB=	utility/tree
 
-TPNO=			9095
+TPNO=			27186
 
 include $(WS_MAKE_RULES)/prep.mk
 include $(WS_MAKE_RULES)/justmake.mk
@@ -53,8 +53,6 @@
 COMPONENT_INSTALL_ARGS += BINDIR=$(PROTOUSRBINDIR)
 COMPONENT_INSTALL_ARGS += MANDIR=$(PROTOUSRSHAREMAN1DIR)
 
-# common targets
-
 build:		$(BUILD_64)
 
 install:	$(INSTALL_64)

--- a/components/tree/patches/Makefile.patch	Thu Mar 10 23:00:13 2016 -0800
+++ b/components/tree/patches/Makefile.patch	Fri Mar 11 05:27:56 2016 -0800
@@ -7,14 +7,14 @@
 # The rest (CC, CFLAGS, LDFLAGS, MANDIR) need to be set by the Userland build
 # environment to get the correct values.
 
---- tree-1.5.3/Makefile	Mon Oct 19 11:56:28 2009
-+++ tree-1.5.3/Makefile.new	Mon Dec  1 12:35:08 2014
-@@ -32,7 +32,7 @@
+--- tree-1.7.0/Makefile.orig	2016-03-02 16:39:19.874601327 -0800
++++ tree-1.7.0/Makefile	2016-03-02 16:36:53.954602502 -0800
+@@ -43,7 +43,7 @@
  #CC=cc
  #CFLAGS=-xO0 -v
  #LDFLAGS=
--#XOBJS=strverscmp.o
-+XOBJS=strverscmp.o
+-#OBJS+=strverscmp.o
++OBJS+=strverscmp.o
  #MANDIR=${prefix}/share/man/man1
  
  # Uncomment for Cygwin:

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/tree/patches/tree.c.patch	Fri Mar 11 05:27:56 2016 -0800
@@ -0,0 +1,15 @@
+Fix S_ISDOOR/S_IFDOOR spelling mistake.
+
+This fix has been sent upstream.
+
+--- tree-1.7.0/tree.c.orig	2016-03-03 06:04:25.447097615 -0800
++++ tree-1.7.0/tree.c	2016-03-03 06:04:49.600428587 -0800
+@@ -1258,7 +1258,7 @@
+   else if (m == S_IFIFO) return '|';
+   else if (m == S_IFLNK) return '@'; /* Here, but never actually used though. */
+ #ifdef S_IFDOOR
+-  else if (m == S_ISDOOR) return '>';
++  else if (m == S_IFDOOR) return '>';
+ #endif
+   else if ((m == S_IFREG) && (mode & (S_IXUSR | S_IXGRP | S_IXOTH))) return '*';
+   return 0;