aboutsummaryrefslogtreecommitdiffstats
path: root/editors/emacs
diff options
context:
space:
mode:
authornobutaka <nobutaka@FreeBSD.org>2007-05-04 01:15:47 +0800
committernobutaka <nobutaka@FreeBSD.org>2007-05-04 01:15:47 +0800
commit832a619c8e763f950d486e0f10c84bf9efe5cb1f (patch)
treebf76ecd42a9291bacb8de59eba1a43f64245260a /editors/emacs
parent7bf38f4a04353605a4b06e0db38803081e2c165f (diff)
downloadfreebsd-ports-gnome-832a619c8e763f950d486e0f10c84bf9efe5cb1f.tar.gz
freebsd-ports-gnome-832a619c8e763f950d486e0f10c84bf9efe5cb1f.tar.zst
freebsd-ports-gnome-832a619c8e763f950d486e0f10c84bf9efe5cb1f.zip
Add emacs-22.* to CONFLICTS.
PR: ports/111814 Submitted by: NIIMI Satoshi <sa2c@sa2c.net>
Diffstat (limited to 'editors/emacs')
-rw-r--r--editors/emacs/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 9d46f22c41d6..e4cdc948fe90 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= ${PORTNAME}
MAINTAINER= nobutaka@FreeBSD.org
COMMENT= GNU editing macros
-CONFLICTS= emacs-19.* \
+CONFLICTS= emacs-19.* emacs-22.* \
xemacs-[0-9]* xemacs-devel-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*