Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/editors/xemacs-devel/Makefile,v
retrieving revision 1.99
diff -u -r1.99 Makefile
--- Makefile	19 Nov 2005 14:58:04 -0000	1.99
+++ Makefile	16 Dec 2005 02:37:20 -0000
@@ -18,7 +18,7 @@
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	This port tracks the development (GAMMA) version of the XEmacs text editor
 
-CONFLICTS=	emacs-[0-9]* \
+CONFLICTS=	emacs-19.* emacs-21.* \
 		xemacs-[0-9]* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*