aboutsummaryrefslogtreecommitdiffstats
path: root/editors/xemacs
diff options
context:
space:
mode:
authoranray <anray@FreeBSD.org>2005-12-16 16:10:54 +0800
committeranray <anray@FreeBSD.org>2005-12-16 16:10:54 +0800
commit18f90369393a3d1f852324c5fdebc3a38293d774 (patch)
treef6c3fe14f3d51d194d991ce0571a60f50f91c984 /editors/xemacs
parent177120ba9802b6d96fc27904d4259deae315c106 (diff)
downloadfreebsd-ports-gnome-18f90369393a3d1f852324c5fdebc3a38293d774.tar.gz
freebsd-ports-gnome-18f90369393a3d1f852324c5fdebc3a38293d774.tar.zst
freebsd-ports-gnome-18f90369393a3d1f852324c5fdebc3a38293d774.zip
editors/emacs20 was changed not to conflict with other emacsen.
PR: ports/90477 Submitted by: NIIMI Satoshi <sa2c@sa2c.net> Approved by: sem(mentor)
Diffstat (limited to 'editors/xemacs')
-rw-r--r--editors/xemacs/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile
index 0c3f2e0787a6..1254b3ae0a8a 100644
--- a/editors/xemacs/Makefile
+++ b/editors/xemacs/Makefile
@@ -16,7 +16,7 @@ DIST_SUBDIR= xemacs
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]*