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 | |
| 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')
| -rw-r--r-- | editors/emacs-devel/Makefile | 4 | ||||
| -rw-r--r-- | editors/emacs/Makefile | 5 | ||||
| -rw-r--r-- | editors/emacs21/Makefile | 5 | ||||
| -rw-r--r-- | editors/emacs22/Makefile | 5 | ||||
| -rw-r--r-- | editors/emacs23/Makefile | 4 |
5 files changed, 13 insertions, 10 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]* diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 35a52cac9669..078a87db68c7 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -21,9 +21,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING MAKE_JOBS_SAFE= yes -CONFLICTS= emacs-19.* emacs-21.* emacs-22.* emacs-23.* \ +CONFLICTS= emacs-19.* emacs21-* emacs22-* emacs23-* \ 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_VER= 24.3 GNU_CONFIGURE= yes diff --git a/editors/emacs21/Makefile b/editors/emacs21/Makefile index e92261812e54..a19c2e743ee2 100644 --- a/editors/emacs21/Makefile +++ b/editors/emacs21/Makefile @@ -18,9 +18,10 @@ PATCH_DIST_STRIP= -p1 MAINTAINER= ashish@FreeBSD.org COMMENT= GNU editing macros -CONFLICTS= emacs-19.* emacs-22.* emacs-23.* emacs-24.* \ +CONFLICTS= emacs-19.* emacs22-* 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-* SSP_UNSAFE= yes 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 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 |