aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorAshish SHUKLA <ashish@FreeBSD.org>2010-07-28 12:25:22 +0000
committerAshish SHUKLA <ashish@FreeBSD.org>2010-07-28 12:25:22 +0000
commit8ce865b2190bcfdbca050d088e0c7322587e8931 (patch)
tree1ff80dc4ea87599c539af02e22a1259dd5732997 /editors
parentab1642fb0a92f0118a96081aefe92c48ce165546 (diff)
downloadports-8ce865b2190bcfdbca050d088e0c7322587e8931.tar.gz
ports-8ce865b2190bcfdbca050d088e0c7322587e8931.zip
Notes
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs21/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile
index 5c6135fdbbcd..8a3d0a73d173 100644
--- a/editors/emacs21/Makefile
+++ b/editors/emacs21/Makefile
@@ -18,10 +18,10 @@ PATCHFILES= emacs-21.1-fontset.patch emacs-21.2-menu-encode.patch
PATCH_DIST_STRIP= -p1
.endif
-MAINTAINER= ports@FreeBSD.org
+MAINTAINER= ashish@FreeBSD.org
COMMENT= GNU editing macros
-CONFLICTS= emacs-19.* emacs-22.* \
+CONFLICTS= emacs-19.* emacs-22.* emacs-23.* emacs-24.* \
xemacs-[0-9]* xemacs-devel-[0-9]* \
xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*