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/emacs22 | |
| 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/emacs22')
| -rw-r--r-- | editors/emacs22/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/editors/emacs22/Makefile b/editors/emacs22/Makefile index bcdaf22b215d..4fc40509d20b 100644 --- a/editors/emacs22/Makefile +++ b/editors/emacs22/Makefile @@ -23,9 +23,10 @@ LIB_DEPENDS+= jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png .endif -CONFLICTS= emacs-19.* emacs-21.* emacs-23.* emacs-24.* \ +CONFLICTS= emacs-19.* emacs21-* emacs23-* emacs24-* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ - xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* + xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \ + emacs-devel-* emacs-nox11-* EMACS_VER= 22.3 GNU_CONFIGURE= yes |