diff options
| author | Kirill Ponomarev <krion@FreeBSD.org> | 2003-10-11 14:59:12 +0000 |
|---|---|---|
| committer | Kirill Ponomarev <krion@FreeBSD.org> | 2003-10-11 14:59:12 +0000 |
| commit | a145641ea2d893cfe3ecd8f31505af92a6c947f0 (patch) | |
| tree | 974bd88c681aff5d8904c06b722186d6709f4cd5 /sysutils | |
| parent | - Add CONFLICTS, because of the same item in pkg-plist (diff) | |
- Add CONFLICTS, because of the same item in pkg-plist
Submitted by: Oliver Eikemeier <eikemeier@fillmore-labs.com>
Notes
Notes:
svn path=/head/; revision=90853
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/psmisc/Makefile | 4 | ||||
| -rw-r--r-- | sysutils/pstree/Makefile | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sysutils/psmisc/Makefile b/sysutils/psmisc/Makefile index 04531190c7fd..4b7601af2d15 100644 --- a/sysutils/psmisc/Makefile +++ b/sysutils/psmisc/Makefile @@ -11,9 +11,11 @@ CATEGORIES= sysutils MASTER_SITES= ftp://ftp.uni-bremen.de/pub/mirrors/sunsite/system/status/ps/ \ ftp://ftp.tu-darmstadt.de/pub/os/Linux/distributions/slackware/slackware-3.6/source/a/procps/ -MAINTAINER= ports@FreeBSD.Org +MAINTAINER= ports@FreeBSD.org COMMENT= A port of the Linux pstree, killall and pidof commands +CONFLICTS= pstree-2.* + INSTALL_TARGET= install-all MAN1= pidof.1 pstree.1 killall.1 WRKSRC= ${WRKDIR}/psmisc diff --git a/sysutils/pstree/Makefile b/sysutils/pstree/Makefile index cbcee892b14c..54a4aa2b363b 100644 --- a/sysutils/pstree/Makefile +++ b/sysutils/pstree/Makefile @@ -15,6 +15,8 @@ COMMENT= List processes as a tree NO_WRKSUBDIR= yes +CONFLICTS= psmisc-* + do-build: cd ${WRKDIR} && ${CC} ${CFLAGS} -o pstree pstree.c |