diff options
| author | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2005-12-18 21:39:42 +0800 |
|---|---|---|
| committer | MANTANI Nobutaka <nobutaka@FreeBSD.org> | 2005-12-18 21:39:42 +0800 |
| commit | 4c39fff95c8b945ba1101ea736017458f29e8a82 (patch) | |
| tree | d1c43fd570fa06c7284b6c7c835d00fcecca31d7 /editors | |
| parent | dcdad3e2a9a2bc96b5e1138c4b528a55cc8f1368 (diff) | |
| download | freebsd-ports-gnome-4c39fff95c8b945ba1101ea736017458f29e8a82.tar.gz freebsd-ports-gnome-4c39fff95c8b945ba1101ea736017458f29e8a82.tar.zst freebsd-ports-gnome-4c39fff95c8b945ba1101ea736017458f29e8a82.zip | |
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 00713861161a..fd0d1c0e4327 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 00713861161a..fd0d1c0e4327 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 00713861161a..fd0d1c0e4327 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]* |