aboutsummaryrefslogtreecommitdiff
path: root/editors
diff options
context:
space:
mode:
authorAshish SHUKLA <ashish@FreeBSD.org>2016-10-02 13:33:53 +0000
committerAshish SHUKLA <ashish@FreeBSD.org>2016-10-02 13:33:53 +0000
commit3477ba2967d235f29e073c56f654a0a9c6a577e5 (patch)
tree714f35e0a4a0af8ee5fa396abd0e29324da5091e /editors
parentcb28d911bb3ffb3c0b0e12d90da6d803235697f7 (diff)
downloadports-3477ba2967d235f29e073c56f654a0a9c6a577e5.tar.gz
ports-3477ba2967d235f29e073c56f654a0a9c6a577e5.zip
Notes
Diffstat (limited to 'editors')
-rw-r--r--editors/emacs-devel/Makefile2
-rw-r--r--editors/emacs/Makefile2
2 files changed, 2 insertions, 2 deletions
diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 023d1e8d1da8..728e80193387 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -16,7 +16,7 @@ LICENSE_FILE= ${WRKSRC}/COPYING
BROKEN_sparc64= Emacs does not currently build on sparc64
BROKEN_ia64= Emacs does not currently build on ia64
-CONFLICTS= emacs-[0-9]* emacs-nox11-[0-9]*
+CONFLICTS= emacs25-[0-9]* emacs-nox11-[0-9]*
USE_GITHUB= yes
GH_ACCOUNT= emacs-mirror
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 39e7ee46e171..5c874e1ba274 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -6,7 +6,7 @@ PORTVERSION= ${EMACS_VER}
PORTEPOCH= 3
CATEGORIES= editors ipv6
MASTER_SITES= GNU
-1PKGNAMESUFFIX?= 25
+PKGNAMESUFFIX?= 25
PATCH_DIST_STRIP= -p1