diff options
| author | nobutaka <nobutaka@FreeBSD.org> | 2005-12-18 13:39:42 +0000 |
|---|---|---|
| committer | nobutaka <nobutaka@FreeBSD.org> | 2005-12-18 13:39:42 +0000 |
| commit | fbdf0c28ca35ce463459ff73774a078e00e327c6 (patch) | |
| tree | ada8a4472f7a20468468c2c4ece2698aa6dee993 /editors | |
| parent | f11e488d5baa22e49eafddd809889b4da7eb2b39 (diff) | |
| download | FreeBSD-ports-fbdf0c28ca35ce463459ff73774a078e00e327c6.zip FreeBSD-ports-fbdf0c28ca35ce463459ff73774a078e00e327c6.tar.gz | |
Remove emacs20 from CONFLICTS.
PR: ports/90475
Submitted by: NIIMI Satoshi <sa2c@sa2c.net>
Diffstat (limited to 'editors')
| -rw-r--r-- | editors/emacs/Makefile | 2 | ||||
| -rw-r--r-- | editors/emacs22/Makefile | 2 | ||||
| -rw-r--r-- | editors/emacs23/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 0071386..fd0d1c0 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.* emacs-20.* \ +CONFLICTS= emacs-19.* \ 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 0071386..fd0d1c0 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.* emacs-20.* \ +CONFLICTS= emacs-19.* \ 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 0071386..fd0d1c0 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.* emacs-20.* \ +CONFLICTS= emacs-19.* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* |
