diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2003-10-19 19:04:47 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2003-10-19 19:04:47 +0000 |
| commit | 56e4d78134ba4f25fbf44472d422c80e7b0eab22 (patch) | |
| tree | 28507661d9802c3e0999069da78294b33a0eebb0 /sysutils | |
| parent | Update to 2.4.1.1. (diff) | |
add CONFLICTS.
PR: ports/58248
Submitted by: rushani
Notes
Notes:
svn path=/head/; revision=91690
Diffstat (limited to 'sysutils')
| -rw-r--r-- | sysutils/gkrellm/Makefile | 2 | ||||
| -rw-r--r-- | sysutils/gkrellm2/Makefile | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile index 092a151438a2..fc458d69fd82 100644 --- a/sysutils/gkrellm/Makefile +++ b/sysutils/gkrellm/Makefile @@ -16,6 +16,8 @@ MASTER_SITE_SUBDIR= ume MAINTAINER= ume@FreeBSD.org COMMENT= A GTK based system monitor +CONFLICTS= gkrellm-2.* + USE_BZIP2= yes USE_X_PREFIX= yes USE_GNOME= imlib diff --git a/sysutils/gkrellm2/Makefile b/sysutils/gkrellm2/Makefile index 60afba777c9a..4b3279c966ac 100644 --- a/sysutils/gkrellm2/Makefile +++ b/sysutils/gkrellm2/Makefile @@ -16,6 +16,10 @@ MASTER_SITE_SUBDIR= ume MAINTAINER= ume@FreeBSD.org COMMENT= A GTK based system monitor +.if !defined(GKRELLM_SERVER_ONLY) +CONFLICTS= gkrellm-1.* +.endif + USE_RC_SUBR= YES WRKSRC= ${WRKDIR}/${DISTNAME:C/[a-z]$//} |