svn commit: r338536 - in head/editors: emacs emacs-devel emacs21 emacs22 emacs23

[Ashish SHUKLA]

Author: ashish
Date: Fri Jan  3 10:55:40 2014
New Revision: 338536
URL: http://svnweb.freebsd.org/changeset/ports/338536

Log:
  - Update CONFLICTS, in accordance with PKGNAME changes
  
  Reported by:	jgh

Modified:
  head/editors/emacs-devel/Makefile
  head/editors/emacs/Makefile
  head/editors/emacs21/Makefile
  head/editors/emacs22/Makefile
  head/editors/emacs23/Makefile

Modified: head/editors/emacs-devel/Makefile
==============================================================================
--- head/editors/emacs-devel/Makefile	Fri Jan  3 10:38:51 2014	(r338535)
+++ head/editors/emacs-devel/Makefile	Fri Jan  3 10:55:40 2014	(r338536)
@@ -16,8 +16,8 @@ COMMENT=	GNU editing macros
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-23.* \
-		xemacs-[0-9]* xemacs-devel-[0-9]* \
+CONFLICTS=	emacs-19.* emacs21-* emacs22-* emacs23-* \
+		emacs24-* xemacs-[0-9]* xemacs-devel-[0-9]* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
 		emacs-nox11-[0-9]*
 

Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile	Fri Jan  3 10:38:51 2014	(r338535)
+++ head/editors/emacs/Makefile	Fri Jan  3 10:55:40 2014	(r338536)
@@ -21,9 +21,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 MAKE_JOBS_SAFE=	yes
 
-CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-23.* \
+CONFLICTS=	emacs-19.* emacs21-* emacs22-* emacs23-* \
 		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_VER=	24.3
 GNU_CONFIGURE=	yes

Modified: head/editors/emacs21/Makefile
==============================================================================
--- head/editors/emacs21/Makefile	Fri Jan  3 10:38:51 2014	(r338535)
+++ head/editors/emacs21/Makefile	Fri Jan  3 10:55:40 2014	(r338536)
@@ -18,9 +18,10 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	ashish at FreeBSD.org
 COMMENT=	GNU editing macros
 
-CONFLICTS=	emacs-19.* emacs-22.* emacs-23.* emacs-24.* \
+CONFLICTS=	emacs-19.* emacs22-* 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-*
 
 SSP_UNSAFE=	yes
 

Modified: head/editors/emacs22/Makefile
==============================================================================
--- head/editors/emacs22/Makefile	Fri Jan  3 10:38:51 2014	(r338535)
+++ head/editors/emacs22/Makefile	Fri Jan  3 10:55:40 2014	(r338536)
@@ -23,9 +23,10 @@ LIB_DEPENDS+=	jpeg:${PORTSDIR}/graphics/
 		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

Modified: head/editors/emacs23/Makefile
==============================================================================
--- head/editors/emacs23/Makefile	Fri Jan  3 10:38:51 2014	(r338535)
+++ head/editors/emacs23/Makefile	Fri Jan  3 10:55:40 2014	(r338536)
@@ -21,10 +21,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 MAKE_JOBS_UNSAFE=	yes
 
-CONFLICTS=	emacs-19.* emacs-21.* emacs-22.* emacs-24.* \
+CONFLICTS=	emacs-19.* emacs21-* emacs22-* emacs24-* \
 		xemacs-[0-9]* xemacs-devel-[0-9]* \
 		xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \
-		emacs-nox11-[0-9]*
+		emacs-nox11-[0-9]* emacs-devel-*
 
 EMACS_VER=	23.4
 GNU_CONFIGURE=	yes