diff options
| author | ashish <ashish@FreeBSD.org> | 2014-01-03 18:55:40 +0800 |
|---|---|---|
| committer | ashish <ashish@FreeBSD.org> | 2014-01-03 18:55:40 +0800 |
| commit | 74c29b769e443f5aa277460c1e54ef971fb403e6 (patch) | |
| tree | 6c0185f8faf65ff3972d71af1eb053534befbd13 /editors/emacs-devel | |
| parent | b2143b8f8179ecba810622483b9ccbf9f0660545 (diff) | |
| download | freebsd-ports-gnome-74c29b769e443f5aa277460c1e54ef971fb403e6.tar.gz freebsd-ports-gnome-74c29b769e443f5aa277460c1e54ef971fb403e6.tar.zst freebsd-ports-gnome-74c29b769e443f5aa277460c1e54ef971fb403e6.zip | |
- Update CONFLICTS, in accordance with PKGNAME changes
Reported by: jgh
Diffstat (limited to 'editors/emacs-devel')
| -rw-r--r-- | editors/emacs-devel/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index 194a59692e6b..25568db31378 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -16,8 +16,8 @@ COMMENT= GNU editing macros LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING -CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-23.* \ - xemacs-[0-9]* xemacs-devel-[0-9]* \ +CONFLICTS= emacs-19.* emacs21-* emacs22-* emacs23-* \ + emacs24-* xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \ emacs-nox11-[0-9]* |