Update to 2.25. This version correctly handles zombie processes and no

need to be patched.

PR:		68809
Submitted by:	Kimura Fuyuki <fuyuki@hadaly.org>

sysutils/pstree/Makefile

@@ -6,16 +6,17 @@
 #
 
 PORTNAME=	pstree
-PORTVERSION=	2.21
+PORTVERSION=	2.25
 CATEGORIES=	sysutils
-MASTER_SITES=	http://fresh.t-systems-sfr.com/unix/src/misc/
+MASTER_SITES=	ftp://ftp.thp.uni-duisburg.de/pub/source/ \
+		http://fresh.t-systems-sfr.com/unix/src/misc/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	List processes as a tree
 
 NO_WRKSUBDIR=	yes
 
-CONFLICTS=	psmisc-*
+CONFLICTS=	psmisc-[0-9]*
 
 PLIST_FILES=	bin/pstree
 

sysutils/pstree/distinfo

@@ -1,2 +1,2 @@
-MD5 (pstree-2.21.tar.gz) = d091946ea76b89ec74216d9ccd7b0702
-SIZE (pstree-2.21.tar.gz) = 8436
+MD5 (pstree-2.25.tar.gz) = 2d0e3a0e80c033e81f781fe718f1cfe8
+SIZE (pstree-2.25.tar.gz) = 9106

sysutils/pstree/files/patch-pstree.c

@@ -1,14 +0,0 @@
---- pstree.c.orig
-+++ pstree.c
-@@ -655,8 +655,9 @@
-   sprintf(nhead, "%s%s ", head,
- 	  head[0] == '\0' ? "" : EXIST(P[idx].sister) ? C->bar : " ");
-   
--  for (child = P[idx].child; EXIST(child); child = P[child].sister)
--    PrintTree(child, nhead);
-+  if (P[idx].pid)
-+    for (child = P[idx].child; EXIST(child); child = P[child].sister)
-+      PrintTree(child, nhead);
- }
- 
- void Usage(void) {