diff options
| author | jlam <jlam> | 2001-02-20 19:36:30 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-02-20 19:36:30 +0000 |
| commit | e1f8d00aaa41b54a0cde666bb92b4dcd77e95b3c (patch) | |
| tree | 1e41990ea7ff290bb9abd4183b27f59a0d5a79a1 | |
| parent | b73fb1153bdcac34db389b23b5551e14a7f0c70f (diff) | |
| download | pkgsrc-e1f8d00aaa41b54a0cde666bb92b4dcd77e95b3c.tar.gz | |
Note CONFLICTS with each other.
| -rw-r--r-- | sysutils/psmisc/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/pstree/Makefile | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile index 1c00eabc4cf..3e93a9db7b4 100644 --- a/sysutils/psmisc/Makefile +++ b/sysutils/psmisc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2001/02/17 17:42:17 wiz Exp $ +# $NetBSD: Makefile,v 1.5 2001/02/20 19:36:30 jlam Exp $ # DISTNAME= psmisc-19 @@ -9,6 +9,8 @@ MASTER_SITES= ftp://lrcftp.epfl.ch/pub/linux/local/psmisc/ \ MAINTAINER= packages@netbsd.org COMMENT= miscellaneous proc FS tools: killall, pidof, and pstree +CONFLICTS+= pstree-[0-9]* + WRKSRC= ${WRKDIR}/psmisc do-install: diff --git a/sysutils/pstree/Makefile b/sysutils/pstree/Makefile index a8c9fe55ff1..03644c7c8ad 100644 --- a/sysutils/pstree/Makefile +++ b/sysutils/pstree/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2001/02/17 17:42:17 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2001/02/20 19:36:30 jlam Exp $ # DISTNAME= pstree-2.16 @@ -8,7 +8,7 @@ MASTER_SITES= http://www.go.dlr.de/fresh/unix/src/misc/ MAINTAINER= packages@netbsd.org COMMENT= Display processes in a tree -CONFLICTS+= psmisc-* +CONFLICTS+= psmisc-[0-9]* WRKSRC= ${WRKDIR} |