From 8470d04a0f99435c4df3c71d608209a22ee6fc72 Mon Sep 17 00:00:00 2001
From: agc <agc@pkgsrc.org>
Date: Fri, 27 Sep 2002 12:08:06 +0000
Subject: Install the various components of this package as proctree, rather
 than pstree (pstree conflicts with the contents of the sysutils/psmisc
 package).

Remove the CONFLICTS definition.

Bump PKGREVISION.
---
 sysutils/pstree/Makefile | 11 +++++------
 sysutils/pstree/PLIST    |  8 ++++----
 2 files changed, 9 insertions(+), 10 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/pstree/Makefile b/sysutils/pstree/Makefile
index af3fbfef9a1..fff3636770a 100644
--- a/sysutils/pstree/Makefile
+++ b/sysutils/pstree/Makefile
@@ -1,23 +1,22 @@
-# $NetBSD: Makefile,v 1.8 2001/05/02 15:37:21 jtb Exp $
+# $NetBSD: Makefile,v 1.9 2002/09/27 12:08:06 agc Exp $
 #
 
 DISTNAME=	pstree-2.16
 CATEGORIES=	sysutils
+PKGREVISION=	1
 MASTER_SITES=	http://www.go.dlr.de/fresh/unix/src/misc/
 
 MAINTAINER=	packages@netbsd.org
 COMMENT=	Display processes in a tree
 
-CONFLICTS+=	psmisc-[0-9]*
-
 WRKSRC=		${WRKDIR}
 
 do-build:
 		cd ${WRKSRC}; ${CC} ${CFLAGS} -o pstree pstree.c
 
 do-install:
-		${INSTALL_PROGRAM} ${WRKSRC}/pstree ${PREFIX}/bin
-		${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pstree
-		${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/pstree
+		${INSTALL_PROGRAM} ${WRKSRC}/pstree ${PREFIX}/bin/proctree
+		${INSTALL_DATA_DIR} ${PREFIX}/share/doc/proctree
+		${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/proctree
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/pstree/PLIST b/sysutils/pstree/PLIST
index 6d59f8d78cc..fbb082b0abf 100644
--- a/sysutils/pstree/PLIST
+++ b/sysutils/pstree/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 22:53:39 zuntum Exp $
-bin/pstree
-share/doc/pstree/README
-@dirrm share/doc/pstree
+@comment $NetBSD: PLIST,v 1.2 2002/09/27 12:08:06 agc Exp $
+bin/proctree
+share/doc/proctree/README
+@dirrm share/doc/proctree
-- 
cgit v1.2.3