From d63d9c1d054a702d22635c31e8bf6b396fe0b64c Mon Sep 17 00:00:00 2001
From: ashish <ashish@FreeBSD.org>
Date: Mon, 27 Apr 2015 10:28:00 +0000
Subject: GNU Emacs Updates

editors/emacs:
 - Update to 24.5
 - Remove dependency on GCC for i386 platform, if the bug is fixed
   in the version in use
 - Remove upstreamed diff

editors/emacs-devel:
 - Update to git snapshot def0df01
 - Remove git revision from PORTVERSION, rather encode it in
   DISTNAME
 - Remove dependency on GCC for i386 platform, if the bug is fixed
   in the version in use
 - Fix portlint warnings

Mk/bsd.emacs.mk:
 - Update version number for editors/emacs
 - Remove deprecated block for emacs23

PR:		199553
---
 Mk/bsd.emacs.mk | 23 +++--------------------
 1 file changed, 3 insertions(+), 20 deletions(-)

(limited to 'Mk')

diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk
index 0288b1f59b7b..543fbeda2280 100644
--- a/Mk/bsd.emacs.mk
+++ b/Mk/bsd.emacs.mk
@@ -63,27 +63,10 @@ EMACS_PORT_NAME?=	emacs24
 
 EMACS_MASTERDIR_PKGFILES?=	NO
 
-# Emacs-23.x
-.if (${EMACS_PORT_NAME} == "emacs23")
-EMACS_NAME=		emacs
-EMACS_VER=		23.4
-EMACS_MAJOR_VER=	23
-EMACS_LIBDIR?=		share/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
-EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs
-EMACS_COMMON_PORT=	NO
-EMACS_HAS_MULE=		YES
-EMACS_NO_SUBDIRSEL=	NO
-.if (${EMACS_MASTERDIR_PKGFILES} == "YES")
-COMMENTFILE?=		${PKGDIR}/pkg-comment.${EMACS_PORT_NAME}
-DESCR?=			${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
-PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
-.endif
-
 # Emacs-24.x
-.elif (${EMACS_PORT_NAME} == "emacs24")
+.if (${EMACS_PORT_NAME} == "emacs24")
 EMACS_NAME=		emacs
-EMACS_VER=		24.4
+EMACS_VER=		24.5
 EMACS_MAJOR_VER=	24
 EMACS_LIBDIR?=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
@@ -118,7 +101,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: emacs23 emacs24 emacs-devel"
+	@${ECHO} "	Emacs  family: emacs24 emacs-devel"
 	@${FALSE}
 .endif
 
-- 
cgit