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]*