aboutsummaryrefslogtreecommitdiffstats
path: root/sysutils
diff options
context:
space:
mode:
authorume <ume@FreeBSD.org>2003-10-20 03:04:47 +0800
committerume <ume@FreeBSD.org>2003-10-20 03:04:47 +0800
commit6aca6562c4f4efa960e30f2b79c67ce65c9872b8 (patch)
tree123d3e0a3b11f23b55050ca4c70df058fb7ebbe9 /sysutils
parent1ba5776de65b76c76ba4071525f9eac28e1148f5 (diff)
downloadfreebsd-ports-gnome-6aca6562c4f4efa960e30f2b79c67ce65c9872b8.tar.gz
freebsd-ports-gnome-6aca6562c4f4efa960e30f2b79c67ce65c9872b8.tar.zst
freebsd-ports-gnome-6aca6562c4f4efa960e30f2b79c67ce65c9872b8.zip
add CONFLICTS.
PR: ports/58248 Submitted by: rushani
Diffstat (limited to 'sysutils')
-rw-r--r--sysutils/gkrellm/Makefile2
-rw-r--r--sysutils/gkrellm2/Makefile4
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]$//}