GNU Emacs Updates

editors/emacs:
 - Update to 24.4[1]
 - Remove all upstreamed diffs[1]
 - Switch to static pkg-plist[1]
 - Add OPTIONs for ACL, file notification, LTO, ALSA, and OSS[1]
 - Reword IGNORE messages for portlint[1]
 - Add fix for a Emacs TRAMP bug
 - Update CANNA patchset[2]

editors/emacs-devel:
 - Update to bzr snapshot revision 118251
 - Add pkg-install, and pkg-deinstall file missed from r364499
 - Switch to static pkg-plist

editors/emacs-nox11:
 - Remove PLIST_DIRSTRY

Mk/bsd.emacs.mk:
 - Update Emacs version numbers
 - Remove deprecated XEmacs entries

PR:		194624[1]
Submitted by:	Joseph Mingrone <jrm at ftfl.ca>[1],
                TAKANO Yuji <takachan at running-dog.net>[2]

1 files changed, 4 insertions, 79 deletions

diff --git a/Mk/bsd.emacs.mk b/Mk/bsd.emacs.mk
index 0bc0d3b927e4..0288b1f59b7b 100644
--- a/Mk/bsd.emacs.mk
+++ b/Mk/bsd.emacs.mk
@@ -83,7 +83,7 @@ PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 # Emacs-24.x
 .elif (${EMACS_PORT_NAME} == "emacs24")
 EMACS_NAME=		emacs
-EMACS_VER=		24.3
+EMACS_VER=		24.4
 EMACS_MAJOR_VER=	24
 EMACS_LIBDIR?=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
@@ -100,8 +100,8 @@ PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 # Emacs-24.x (development version)
 .elif (${EMACS_PORT_NAME} == "emacs-devel")
 EMACS_NAME=		emacs
-EMACS_VER=		24.4.50
-EMACS_MAJOR_VER=	24
+EMACS_VER=		25.0.50
+EMACS_MAJOR_VER=	25
 EMACS_LIBDIR?=		share/${EMACS_NAME}
 EMACS_LIBDIR_WITH_VER?=	share/${EMACS_NAME}/${EMACS_VER}
 EMACS_PORTSDIR=		${PORTSDIR}/editors/emacs-devel
@@ -114,86 +114,11 @@ DESCR?=			${PKGDIR}/pkg-descr.${EMACS_PORT_NAME}
 PLIST?=			${PKGDIR}/pkg-plist.${EMACS_PORT_NAME}
 .endif
 
-# XEmacs-21.x
-.elif (${EMACS_PORT_NAME} == "xemacs21")
-EMACS_NAME=		xemacs
-EMACS_VER=		21.4.22
-EMACS_MAJOR_VER=	21
-EMACS_LIBDIR?=		lib/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
-EMACS_PORTSDIR=		${PORTSDIR}/editors/xemacs
-EMACS_COMMON_PORT=	NO
-EMACS_HAS_MULE=		NO
-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
-
-# XEmacs-21.x with Mule
-.elif (${EMACS_PORT_NAME} == "xemacs21-mule")
-EMACS_NAME=		xemacs
-EMACS_VER=		21.4.22
-EMACS_MAJOR_VER=	21
-EMACS_LIBDIR?=		lib/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
-EMACS_PORTSDIR=		${PORTSDIR}/editors/xemacs21-mule
-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
-
-# XEmacs-21 development version
-.elif (${EMACS_PORT_NAME} == "xemacs-devel")
-EMACS_NAME=		xemacs
-EMACS_VER=		21.5-b28
-EMACS_MAJOR_VER=	21
-EMACS_LIBDIR?=		lib/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
-EMACS_PORTSDIR=		${PORTSDIR}/editors/xemacs-devel
-EMACS_COMMON_PORT=	NO
-EMACS_HAS_MULE=		NO
-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
-
-# XEmacs-21 development version with Mule
-.elif (${EMACS_PORT_NAME} == "xemacs-devel-mule") || \
-	(${EMACS_PORT_NAME} == "xemacs-mule-xft")
-EMACS_NAME=		xemacs
-EMACS_VER=		21.5-b28
-EMACS_MAJOR_VER=	21
-EMACS_LIBDIR?=		lib/${EMACS_NAME}
-EMACS_LIBDIR_WITH_VER?=	lib/${EMACS_NAME}-${EMACS_VER}
-.if ${EMACS_PORT_NAME} == "xemacs-mule-xft"
-EMACS_PORTSDIR=		${PORTSDIR}/editors/xemacs-devel-mule-xft
-.else
-EMACS_PORTSDIR=		${PORTSDIR}/editors/xemacs-devel-mule
-.endif
-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
-
 .else
 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} "	XEmacs family: xemacs21 xemacs21-mule xemacs-devel"
-	@${ECHO} "	               xemacs-devel-mule xemacs-mule-xft"
 	@${FALSE}
 .endif
 
@@ -233,7 +158,7 @@ RUN_DEPENDS+=	${EMACS_CMD}:${EMACS_PORTSDIR}
 .endif
 
 # environments for build
-MAKE_ARGS+=	EMACS=${EMACS_CMD} XEMACS=${EMACS_CMD}
+MAKE_ARGS+=	EMACS=${EMACS_CMD}
 SCRIPTS_ENV+=	EMACS_LIBDIR=${EMACS_LIBDIR} \
 		EMACS_VER=${EMACS_VER} \
 		EMACS_LIBDIR_WITH_VER=${EMACS_LIBDIR_WITH_VER} \