From 74c29b769e443f5aa277460c1e54ef971fb403e6 Mon Sep 17 00:00:00 2001
From: ashish <ashish@FreeBSD.org>
Date: Fri, 3 Jan 2014 10:55:40 +0000
Subject: - Update CONFLICTS, in accordance with PKGNAME changes

Reported by:	jgh
---
 editors/emacs22/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'editors/emacs22')

diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile
index bcdaf22b215d..4fc40509d20b 100644
--- a/editors/emacs22/Makefile
+++ b/editors/emacs22/Makefile
@@ -23,9 +23,10 @@ LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/jpeg \
 		png15:${PORTSDIR}/graphics/png
 .endif
 
-CONFLICTS=	emacs-19.* emacs-21.* emacs-23.* emacs-24.* \
+CONFLICTS=	emacs-19.* emacs21-* emacs23-* emacs24-* \
 		xemacs-[0-9]* xemacs-devel-[0-9]* \
-		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]*
+		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
+		emacs-devel-* emacs-nox11-*
 
 EMACS_VER=	22.3
 GNU_CONFIGURE=	yes
-- 
cgit