ports/58248: [PATCH] sysutils/gkrellm{,2}: Utilize CONFLICTS

[Hideyuki KURASHINA]

>Number:         58248
>Category:       ports
>Synopsis:       [PATCH] sysutils/gkrellm{,2}: Utilize CONFLICTS
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun Oct 19 11:10:14 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     Hideyuki KURASHINA
>Release:        FreeBSD 5.1-RELEASE-p10 i386
>Organization:
>Environment:

	System: FreeBSD ***.*******.jp 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #0: Sun Oct  5 19:20:19 JST 2003

>Description:

	Installed files (GKrellM binary and translated catalog, etc.) from
	sysutils/gkrellm conflicts with sysutils/gkrellm2 if install
	sysutils/gkrellm after installing sysutils/gkrellm2 and	vice versa
	when GKRELLM_SERVER_ONLY is not defined for sysutils/gkrellm2.

>How-To-Repeat:
	
	# portinstall sysutils/gkrellm
	# portinstall sysutils/gkrellm2
	# pkg_deinstall gkrellm-1.\*

>Fix:

	Following patch solves this problem, I think.

Index: gkrellm/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/gkrellm/Makefile,v
retrieving revision 1.53
diff -u -r1.53 Makefile
--- gkrellm/Makefile	20 Apr 2003 19:43:30 -0000	1.53
+++ gkrellm/Makefile	19 Oct 2003 18:02:09 -0000
@@ -25,6 +25,8 @@
 MAN1=		gkrellm.1
 DOCS=		COPYRIGHT README Themes.html
 
+CONFLICTS=	gkrellm-2.*
+
 # If you want to support LM78/79 feature, set this to `yes'.  You
 # should aware that GKrellM must be setuid root to obtain
 # temperatures.  Furthermore, this causes problem on some
Index: gkrellm2/Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/gkrellm2/Makefile,v
retrieving revision 1.86
diff -u -r1.86 Makefile
--- gkrellm2/Makefile	13 Oct 2003 06:32:19 -0000	1.86
+++ gkrellm2/Makefile	19 Oct 2003 18:02:09 -0000
@@ -25,6 +25,7 @@
 INSTALL_WRKSRC=	${WRKSRC}/server
 USE_GNOME=	glib12
 .else
+CONFLICTS=	gkrellm-1.*
 USE_GNOME=	gtk20
 USE_XLIB=	yes
 .endif
>Release-Note:
>Audit-Trail:
>Unformatted: