From ed0bda39a936d3e231a01b62bec74a55b2383a8d Mon Sep 17 00:00:00 2001 From: MANTANI Nobutaka Date: Thu, 3 May 2007 17:15:47 +0000 Subject: Add emacs-22.* to CONFLICTS. PR: ports/111814 Submitted by: NIIMI Satoshi --- 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 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]* -- cgit v1.2.3