aboutsummaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorashish <ashish@FreeBSD.org>2016-10-02 13:07:22 +0800
committerashish <ashish@FreeBSD.org>2016-10-02 13:07:22 +0800
commit6b2048e8b3131460ba33afa60a62b2ccdf70d8de (patch)
tree30a582870dab03b1f4fd4fcfd8b9923f1972b3fe /Mk
parent702ab00e799042bc58b59f8017e00a30374c4761 (diff)
downloadfreebsd-ports-gnome-6b2048e8b3131460ba33afa60a62b2ccdf70d8de.tar.gz
freebsd-ports-gnome-6b2048e8b3131460ba33afa60a62b2ccdf70d8de.tar.zst
freebsd-ports-gnome-6b2048e8b3131460ba33afa60a62b2ccdf70d8de.zip
GNU Emacs updates
editors/emacs: - Update to 25.1[1] - Update CANNA patchset[2] - Cleanup CONFLICTS_INSTALL list[1] - Add LLDB option for lldb support (provided by 3rd party) to GUD[1] - Add various other options, and re-order options[1] - Incorporate games stuff in pkg-plist[1] - Remove outdated diffs[1] editors/emacs-nox11: - Update to 25.1[3] - Cleanup CONFLICTS_INSTALL list[3] editors/emacs-devel: - Update to git revision 25dca60d Mk/bsd.emacs.mk: - Update version numbers[4] PR: 212807 [1], 212808 [3], 212809 [4] Submitted by: Joseph Mingrone <jrm@ftfl.ca> [1][3][4] TAKANO Yuji <takachan@running-dog.net> (private email) [2]
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.emacs.mk20
1 files changed, 10 insertions, 10 deletions
diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk
index abe28249aca8..d245df098e78 100644
--- a/Mk/bsd.emacs.mk
+++ b/Mk/bsd.emacs.mk
@@ -7,7 +7,7 @@
Emacs_Include= bsd.emacs.mk
Emacs_Include_MAINTAINER= ashish@FreeBSD.org
-EMACS_PORT_NAME?= emacs24
+EMACS_PORT_NAME?= emacs25
#
# This file for ports which depend on emacs family.
@@ -63,11 +63,11 @@ EMACS_PORT_NAME?= emacs24
EMACS_MASTERDIR_PKGFILES?= NO
-# Emacs-24.x
-.if (${EMACS_PORT_NAME} == "emacs24")
+# Emacs-25.x
+.if (${EMACS_PORT_NAME} == "emacs25")
EMACS_NAME= emacs
-EMACS_VER= 24.5
-EMACS_MAJOR_VER= 24
+EMACS_VER= 25.1
+EMACS_MAJOR_VER= 25
EMACS_LIBDIR?= share/${EMACS_NAME}
EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
EMACS_PORTDIR= editors/emacs
@@ -80,10 +80,10 @@ DESCR?= ${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
.endif
-# Emacs-24.x (development version)
+# Emacs-25.x (development version)
.elif (${EMACS_PORT_NAME} == "emacs-devel")
EMACS_NAME= emacs
-EMACS_VER= 25.1
+EMACS_VER= 25.2.50
EMACS_MAJOR_VER= 25
EMACS_LIBDIR?= share/${EMACS_NAME}
EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
@@ -99,8 +99,8 @@ PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
.elif (${EMACS_PORT_NAME} == "emacs-nox11")
EMACS_NAME= emacs
-EMACS_VER= 24.5
-EMACS_MAJOR_VER= 24
+EMACS_VER= 25.1
+EMACS_MAJOR_VER= 25
EMACS_LIBDIR= share/${EMACS_NAME}
EMACS_LIBDIR_WITH_VER?= share/${EMACS_NAME}/${EMACS_VER}
EMACS_PORTDIR= editors/emacs-nox11
@@ -117,7 +117,7 @@ PLIST?= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
check-makevars::
@${ECHO} "Makefile error: Bad value of EMACS_PORT_NAME: ${EMACS_PORT_NAME}."
@${ECHO} "Valid values are:"
- @${ECHO} " Emacs family: emacs24 emacs-devel emacs-nox11"
+ @${ECHO} " Emacs family: emacs25 emacs-devel emacs-nox11"
@${FALSE}
.endif