summaryrefslogtreecommitdiff
path: root/editors/emacs22
diff options
context:
space:
mode:
authorMANTANI Nobutaka <nobutaka@FreeBSD.org>2007-05-03 17:15:47 +0000
committerMANTANI Nobutaka <nobutaka@FreeBSD.org>2007-05-03 17:15:47 +0000
commited0bda39a936d3e231a01b62bec74a55b2383a8d (patch)
tree3b0b5f4847a03ac688b57246868cabd445ab6ded /editors/emacs22
parentAdd gnat-gcc42, The GNU Ada Compiler system. (diff)
Add emacs-22.* to CONFLICTS.
PR: ports/111814 Submitted by: NIIMI Satoshi <sa2c@sa2c.net>
Notes
Notes: svn path=/head/; revision=191486
Diffstat (limited to 'editors/emacs22')
-rw-r--r--editors/emacs22/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 9d46f22c41d6..e4cdc948fe90 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/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]*