diff options
author | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2005-05-06 08:56:30 +0000 |
---|---|---|
committer | Jean-Yves Lefort <jylefort@FreeBSD.org> | 2005-05-06 08:56:30 +0000 |
commit | b61258b495c6bdbf4ecb4857cd9a520c429ab24f (patch) | |
tree | d3cc728dae56eb069ec7bd5c80bf69f91cd61f3e /editors | |
parent | - add mediawiki 1.3 as www/mediawiki13 for people who don't want to upgrade (diff) |
Add CONFLICTS variable, since this port conflicts with other
emacs/xemacs ports.
Approved by: nobutaka (maintainer)
Notes
Notes:
svn path=/head/; revision=134689
Diffstat (limited to 'editors')
-rw-r--r-- | editors/emacs/Makefile | 4 | ||||
-rw-r--r-- | editors/emacs22/Makefile | 4 | ||||
-rw-r--r-- | editors/emacs23/Makefile | 4 |
3 files changed, 12 insertions, 0 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 17ffb6e815ea..fd1b9b207f77 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -15,6 +15,10 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= nobutaka@FreeBSD.org COMMENT= GNU editing macros +CONFLICTS= emacs-19.* emacs-20.* \ + xemacs-[0-9]* xemacs-devel-[0-9]* \ + xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* + .if !defined(WITHOUT_X11) LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ jpeg.9:${PORTSDIR}/graphics/jpeg \ diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile index 17ffb6e815ea..fd1b9b207f77 100644 --- a/editors/emacs22/Makefile +++ b/editors/emacs22/Makefile @@ -15,6 +15,10 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= nobutaka@FreeBSD.org COMMENT= GNU editing macros +CONFLICTS= emacs-19.* emacs-20.* \ + xemacs-[0-9]* xemacs-devel-[0-9]* \ + xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* + .if !defined(WITHOUT_X11) LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ jpeg.9:${PORTSDIR}/graphics/jpeg \ diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index 17ffb6e815ea..fd1b9b207f77 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/Makefile @@ -15,6 +15,10 @@ MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= nobutaka@FreeBSD.org COMMENT= GNU editing macros +CONFLICTS= emacs-19.* emacs-20.* \ + xemacs-[0-9]* xemacs-devel-[0-9]* \ + xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* + .if !defined(WITHOUT_X11) LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d \ jpeg.9:${PORTSDIR}/graphics/jpeg \ |