From sa2c@sa2c.net  Fri Dec 16 02:51:45 2005
Return-Path: <sa2c@sa2c.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 38B8716A424
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 16 Dec 2005 02:51:19 +0000 (GMT)
	(envelope-from sa2c@sa2c.net)
Received: from sakura.and.or.jp (sakura.and.or.jp [59.106.20.85])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CA5F943D5A
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 16 Dec 2005 02:51:18 +0000 (GMT)
	(envelope-from sa2c@sa2c.net)
Received: from sakura.and.or.jp (localhost [127.0.0.1])
	by sakura.and.or.jp (Postfix) with ESMTP id E207361C2D
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 16 Dec 2005 11:51:17 +0900 (JST)
Received: from berkeley.l.sa2c.net (berkeley.vpn.and.or.jp [10.46.49.3])
	by sakura.and.or.jp (Postfix) with ESMTP id C53BF61C2C
	for <FreeBSD-gnats-submit@freebsd.org>; Fri, 16 Dec 2005 11:51:17 +0900 (JST)
Received: by berkeley.l.sa2c.net (Postfix, from userid 3104)
	id B7D3911463; Fri, 16 Dec 2005 11:51:17 +0900 (JST)
Message-Id: <20051216025117.B7D3911463@berkeley.l.sa2c.net>
Date: Fri, 16 Dec 2005 11:51:17 +0900 (JST)
From: NIIMI Satoshi <sa2c@sa2c.net>
Reply-To: NIIMI Satoshi <sa2c@sa2c.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: editors/xemacs: does not conflict with emacs20
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         90477
>Category:       ports
>Synopsis:       editors/xemacs: does not conflict with emacs20
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    anray
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Dec 16 03:00:14 GMT 2005
>Closed-Date:    Fri Dec 16 08:11:30 GMT 2005
>Last-Modified:  Fri Dec 16 08:11:30 GMT 2005
>Originator:     NIIMI Satoshi
>Release:        FreeBSD 6.0-RELEASE i386
>Organization:
>Environment:
System: FreeBSD berkeley.l.sa2c.net 6.0-RELEASE FreeBSD 6.0-RELEASE #3: Tue Nov 8 17:05:21 JST 2005 root@berkeley.l.sa2c.net:/usr/obj/usr/src/sys/GENERIC i386


	
>Description:
editors/emacs20 was changed not to conflict with other emacsen.
	
>How-To-Repeat:
	
>Fix:

	

--- xemacs.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/xemacs/Makefile,v
retrieving revision 1.95
diff -u -r1.95 Makefile
--- Makefile	6 Dec 2005 16:15:39 -0000	1.95
+++ Makefile	16 Dec 2005 02:37:31 -0000
@@ -16,7 +16,7 @@
 MAINTAINER?=	ports@FreeBSD.org
 COMMENT?=	This port tracks the stable version of the XEmacs text editor
 
-CONFLICTS=	emacs-[0-9]* \
+CONFLICTS=	emacs-19.* emacs-21.* \
 		xemacs-devel-[0-9]* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
 
--- xemacs.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->anray 
Responsible-Changed-By: anray 
Responsible-Changed-When: Fri Dec 16 07:20:38 UTC 2005 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90477 
State-Changed-From-To: open->closed 
State-Changed-By: anray 
State-Changed-When: Fri Dec 16 08:11:26 UTC 2005 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=90477 
>Unformatted:
