ports/90477: editors/xemacs: does not conflict with emacs20

[NIIMI Satoshi]

>Number:         90477
>Category:       ports
>Synopsis:       editors/xemacs: does not conflict with emacs20
>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:   Fri Dec 16 03:00:14 GMT 2005
>Closed-Date:
>Last-Modified:
>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 at 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 at 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:
>Unformatted: