diff options
| -rw-r--r-- | editors/emacs/Makefile | 2 | ||||
| -rw-r--r-- | editors/emacs19/Makefile | 2 | ||||
| -rw-r--r-- | editors/emacs22/Makefile | 2 | ||||
| -rw-r--r-- | editors/emacs23/Makefile | 2 | ||||
| -rw-r--r-- | editors/xemacs-devel/Makefile | 2 | ||||
| -rw-r--r-- | editors/xemacs/Makefile | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 9d46f22c41d6..e4cdc948fe90 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/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]* diff --git a/editors/emacs19/Makefile b/editors/emacs19/Makefile index 191d5e03ee1d..d4aa53a63702 100644 --- a/editors/emacs19/Makefile +++ b/editors/emacs19/Makefile @@ -15,7 +15,7 @@ MASTER_SITE_SUBDIR= emacs MAINTAINER= ports@FreeBSD.org COMMENT= GNU editing macros -CONFLICTS= emacs-21.* \ +CONFLICTS= emacs-21.* emacs-22.* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* 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]* diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index 9d46f22c41d6..e4cdc948fe90 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/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]* diff --git a/editors/xemacs-devel/Makefile b/editors/xemacs-devel/Makefile index eb5a109bbf6e..36a28ec4d504 100644 --- a/editors/xemacs-devel/Makefile +++ b/editors/xemacs-devel/Makefile @@ -18,7 +18,7 @@ DIST_SUBDIR= xemacs MAINTAINER= ports@FreeBSD.org COMMENT= This port tracks the development (GAMMA) version of the XEmacs text editor -CONFLICTS= emacs-19.* emacs-21.* \ +CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \ xemacs-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* diff --git a/editors/xemacs/Makefile b/editors/xemacs/Makefile index 94e0bf590646..2eed362f95ca 100644 --- a/editors/xemacs/Makefile +++ b/editors/xemacs/Makefile @@ -17,7 +17,7 @@ DIST_SUBDIR= xemacs MAINTAINER?= ports@FreeBSD.org COMMENT?= This port tracks the stable version of the XEmacs text editor -CONFLICTS= emacs-19.* emacs-21.* \ +CONFLICTS= emacs-19.* emacs-21.* emacs-22.* \ xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* |