diff options
| author | Ashish SHUKLA <ashish@FreeBSD.org> | 2014-01-03 10:55:40 +0000 |
|---|---|---|
| committer | Ashish SHUKLA <ashish@FreeBSD.org> | 2014-01-03 10:55:40 +0000 |
| commit | 73c6d4b8f69cc73639b4873d47ccc63e27160c99 (patch) | |
| tree | 6c0185f8faf65ff3972d71af1eb053534befbd13 /editors/emacs23 | |
| parent | Ensure correct ownership of the licenses directory to avoid "leftovers" [1] (diff) | |
- Update CONFLICTS, in accordance with PKGNAME changes
Reported by: jgh
Notes
Notes:
svn path=/head/; revision=338536
Diffstat (limited to 'editors/emacs23')
| -rw-r--r-- | editors/emacs23/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/editors/emacs23/Makefile b/editors/emacs23/Makefile index a26e449dfac1..794c7cc6ab0e 100644 --- a/editors/emacs23/Makefile +++ b/editors/emacs23/Makefile @@ -21,10 +21,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING MAKE_JOBS_UNSAFE= yes -CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-24.* \ +CONFLICTS= emacs-19.* emacs21-* emacs22-* emacs24-* \ xemacs-[0-9]* xemacs-devel-[0-9]* \ xemacs-mule-[0-9]* xemacs-devel-mule-[0-9]* \ - emacs-nox11-[0-9]* + emacs-nox11-[0-9]* emacs-devel-* EMACS_VER= 23.4 GNU_CONFIGURE= yes |