From 1a9d3421c57e8756112835d4e401c5b297ad55c1 Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish@FreeBSD.org>
Date: Wed, 28 Jul 2010 12:26:55 +0000
Subject: - Add CONFLICTS to conflict with 23.x and 24.x.

Approved by:	tabthorpe (mentor)
---
 editors/emacs22/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'editors/emacs22')

diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index 6b0b16d44491..2a538e092c6b 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS+=	jpeg.11:${PORTSDIR}/graphics/jpeg \
 		png.6:${PORTSDIR}/graphics/png
 .endif
 
-CONFLICTS=	emacs-19.* emacs-21.* \
+CONFLICTS=	emacs-19.* emacs-21.* emacs-23.* emacs-24.* \
 		xemacs-[0-9]* xemacs-devel-[0-9]* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
 
-- 
cgit v1.2.3