svn commit: r423103 - in head: Mk editors/emacs editors/emacs-devel editors/emacs-devel/files editors/emacs-nox11 editors/emacs/files

Ashish SHUKLA ashish at FreeBSD.org
Sun Oct 2 05:07:24 UTC 2016 

Author: ashish
Date: Sun Oct  2 05:07:22 2016
New Revision: 423103
URL: https://svnweb.freebsd.org/changeset/ports/423103

Log:
  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 at ftfl.ca> [1][3][4]
  		TAKANO Yuji <takachan at running-dog.net> (private email) [2]

Added:
  head/editors/emacs-devel/files/sources.el.in   (contents, props changed)
  head/editors/emacs/files/extrapatch-lldb-gud.el   (contents, props changed)
Deleted:
  head/editors/emacs-devel/files/patch-sources.el
  head/editors/emacs/files/patch-src_unexaix.c
  head/editors/emacs/files/patch-src_unexcoff.c
  head/editors/emacs/files/patch-src_unexelf.c
  head/editors/emacs/files/pkg-install.in
  head/editors/emacs/pkg-deinstall
Modified:
  head/Mk/bsd.emacs.mk
  head/editors/emacs-devel/Makefile
  head/editors/emacs-devel/distinfo
  head/editors/emacs-devel/pkg-plist
  head/editors/emacs-nox11/Makefile
  head/editors/emacs/Makefile
  head/editors/emacs/distinfo
  head/editors/emacs/pkg-plist

Modified: head/Mk/bsd.emacs.mk
==============================================================================
--- head/Mk/bsd.emacs.mk	Sun Oct  2 02:51:55 2016	(r423102)
+++ head/Mk/bsd.emacs.mk	Sun Oct  2 05:07:22 2016	(r423103)
@@ -7,7 +7,7 @@
 Emacs_Include=			bsd.emacs.mk
 Emacs_Include_MAINTAINER=	ashish at 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_PO
 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_PO
 
 .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_PO
 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
 

Modified: head/editors/emacs-devel/Makefile
==============================================================================
--- head/editors/emacs-devel/Makefile	Sun Oct  2 02:51:55 2016	(r423102)
+++ head/editors/emacs-devel/Makefile	Sun Oct  2 05:07:22 2016	(r423103)
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	emacs
-DISTVERSION=	25.1-rc2
+DISTVERSION=	${EMACS_VER}.${EMACS_REV}
 PORTEPOCH=	2
 CATEGORIES=	editors ipv6
-MASTER_SITES=	GNU_ALPHA/emacs/pretest
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	ashish at FreeBSD.org
@@ -17,18 +16,23 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 BROKEN_sparc64=	Emacs does not currently build on sparc64
 BROKEN_ia64=	Emacs does not currently build on ia64
 
-CONFLICTS=	emacs24-[0-9]* emacs-nox11-[0-9]*
+CONFLICTS=	emacs-[0-9]* emacs-nox11-[0-9]*
 
-EMACS_VER=	${PORTVERSION:R}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${EMACS_VER}
+USE_GITHUB=	yes
+GH_ACCOUNT=	emacs-mirror
+GH_TAGNAME=	25dca60d
 
+EMACS_VER=	25.2.50
+EMACS_REV=	20161001
 GNU_CONFIGURE=	yes
-USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
+USES=		autoreconf cpe gmake makeinfo ncurses pkgconfig
 INFO_PATH=	${DATADIR_REL}/info
+WRKSRC=		${WRKDIR}/${PORTNAME}-${GH_TAGNAME}
 CPE_VENDOR=	gnu
 
-SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/\
-		${CONFIGURE_TARGET}
+SUB_FILES+=	sources.el
+SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
+SUB_LIST+=	EMACS_VER=${EMACS_VER}
 
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-gameuser=games:games
@@ -238,25 +242,22 @@ LDFLAGS+=-ltinfo
 
 post-patch:
 	@${RM} -f ${WRKSRC}/info/*
-	@${REINPLACE_CMD} -e "s/%%EMACS_VER%%/${EMACS_VER}/g" -e \
-		"s/%%DATADIR%%/${DATADIR:C/\//\\\//g}/g" ${WRKSRC}/sources.el
+
 ## stage-qa will give a warning, but don't pull in desktop-file-utils
 ## portlint -AC will give a warning about INSTALL_ICONS, but don't pull in those
 ## dependencies
-.if ! ${PORT_OPTIONS:MX11}
+post-patch-X11-off:
 	@${REINPLACE_CMD} -e 's/^Terminal=.*$$/Terminal=true/' \
 		${WRKSRC}/etc/emacs.desktop
-.endif
 
-post-install:
-.if ${PORT_OPTIONS:MSOURCES}
+pre-configure:
+	@cd ${WRKSRC} && ./autogen.sh
+
+post-install-SOURCES-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
 	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \
 		${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	${INSTALL_DATA} ${WRKSRC}/sources.el \
+	${INSTALL_DATA} ${WRKDIR}/sources.el \
 		${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
-.endif
-	@${FIND} ${STAGEDIR}${PREFIX}/${INFO_PATH} -type f -name \
-		'*.gz' -exec ${GUNZIP_CMD} '{}' \;
 
 .include <bsd.port.post.mk>

Modified: head/editors/emacs-devel/distinfo
==============================================================================
--- head/editors/emacs-devel/distinfo	Sun Oct  2 02:51:55 2016	(r423102)
+++ head/editors/emacs-devel/distinfo	Sun Oct  2 05:07:22 2016	(r423103)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1471833409
-SHA256 (emacs-25.1-rc2.tar.xz) = 5bd45f03bdff90f9d7add7224917fc828ed89716e952b3db8eb98242b7dfcec1
-SIZE (emacs-25.1-rc2.tar.xz) = 42317560
+TIMESTAMP = 1475279278
+SHA256 (emacs-mirror-emacs-25.2.50.20161001-25dca60d_GH0.tar.gz) = e7dcebce7c33ca6124220301665fcb173bca4f9d0e01f9f5ff0d157c00f7abcb
+SIZE (emacs-mirror-emacs-25.2.50.20161001-25dca60d_GH0.tar.gz) = 38532769

Added: head/editors/emacs-devel/files/sources.el.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/editors/emacs-devel/files/sources.el.in	Sun Oct  2 05:07:22 2016	(r423103)
@@ -0,0 +1,4 @@
+;;; Path to Emacs C Sources.
+(when (string-match (regexp-quote "%%EMACS_VER%%") emacs-version)
+  (setq find-function-C-source-directory
+        "%%DATADIR%%/%%EMACS_VER%%/src"))

Modified: head/editors/emacs-devel/pkg-plist
==============================================================================
--- head/editors/emacs-devel/pkg-plist	Sun Oct  2 02:51:55 2016	(r423102)
+++ head/editors/emacs-devel/pkg-plist	Sun Oct  2 05:07:22 2016	(r423103)
@@ -756,105 +756,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-in.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-out.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/zoom-out.xpm
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00000-0007F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00080-000FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00100-0017F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00180-0024F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00250-002AF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/002B0-002FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00300-0036F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00370-003FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00400-004FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00500-0052F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00530-0058F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00590-005FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00600-006FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00700-0074F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00780-007BF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00900-0097F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00980-009FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00A00-00A7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00A80-00AFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00B00-00B7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00B80-00BFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00C00-00C7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00C80-00CFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00D00-00D7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00D80-00DFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00E00-00E7F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00E80-00EFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/00F00-00FFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01000-0109F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/010A0-010FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01100-011FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01200-0137F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/013A0-013FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01400-0167F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01680-0169F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/016A0-016FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01700-0171F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01720-0173F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01740-0175F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01760-0177F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01780-017FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01800-018AF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01E00-01EFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/01F00-01FFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02000-0206F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02070-0209F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/020A0-020CF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/020D0-020FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02100-0214F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02150-0218F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02190-021FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02200-022FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02300-023FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02400-0243F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02440-0245F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02460-024FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02500-0257F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02580-0259F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/025A0-025FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02600-026FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02700-027BF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/027C0-027EF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/027F0-027FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02800-028FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02900-0297F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02980-029FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02A00-02AFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02E80-02EFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02F00-02FDF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/02FF0-02FFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03000-0303F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03040-0309F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/030A0-030FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03100-0312F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03130-0318F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03190-0319F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/031A0-031BF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/031F0-031FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03200-032FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03300-033FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/03400-04DBF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0A000-0A48F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0A490-0A4CF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FB00-0FB4F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FB50-0FDFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE00-0FE0F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE20-0FE2F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE30-0FE4F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE50-0FE6F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FE70-0FEFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FF00-0FFEF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/0FFF0-0FFFF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/10300-1032F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/10330-1034F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/10400-1044F.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/1D000-1D0FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/1D100-1D1FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/1D400-1D7FF.el
-%%DATADIR%%/%%EMACS_VER%%/etc/nxml/E0000-E007F.el
 %%DATADIR%%/%%EMACS_VER%%/etc/nxml/README
 %%DATADIR%%/%%EMACS_VER%%/etc/nxml/test-invalid.xml
 %%DATADIR%%/%%EMACS_VER%%/etc/nxml/test-valid.xml
@@ -893,22 +794,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.tex
 %%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/calccard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-dired-ref.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-refcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/cs-survival.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/de-refcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/dired-ref.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-dired-ref.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-refcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-survival.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-booklet.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-refcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.pdf
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/viperCard.pdf
 %%DATADIR%%/%%EMACS_VER%%/etc/rgb.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/README
 %%DATADIR%%/%%EMACS_VER%%/etc/schema/calstbl.rnc
@@ -1030,6 +915,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/arc-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/array.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/array.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/auth-source.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/auth-source.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/autoarg.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/autoarg.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/autoinsert.el.gz
@@ -1548,6 +1435,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/dframe.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired-aux.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired-aux.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/dired-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired-x.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/dired.el.gz
@@ -1576,6 +1464,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/ebuff-menu.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/echistory.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/echistory.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/ecomplete.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/ecomplete.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/edmacro.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/edmacro.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ehelp.el.gz
@@ -1657,6 +1547,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-custom.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-datadebug.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-opt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-speedbar.el.gz
@@ -1713,6 +1604,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pcase.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pp.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/radix-tree.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/radix-tree.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/re-builder.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/re-builder.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/regexp-opt.el.gz
@@ -1745,6 +1638,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/thunk.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer-list.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer-list.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tq.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/tq.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/trace.el.gz
@@ -1990,18 +1885,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/generic-x.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/generic-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/.dir-locals.el
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/auth-source.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/auth-source.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/canlock.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/canlock.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/compface.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/compface.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/deuglify.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/deuglify.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ecomplete.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ecomplete.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/flow-fill.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/flow-fill.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gmm-utils.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gmm-utils.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-agent.el.gz
@@ -2036,8 +1923,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-dup.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-eform.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-eform.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-ems.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-ems.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-fun.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-fun.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-gravatar.el.gz
@@ -2068,6 +1953,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-picon.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-range.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-range.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rfc1843.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rfc1843.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-registry.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-registry.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-salt.el.gz
@@ -2084,8 +1971,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-start.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sum.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sum.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sync.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-sync.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-topic.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-topic.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-undo.el.gz
@@ -2100,28 +1985,14 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-win.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gravatar.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gravatar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gssapi.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gssapi.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/html2text.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/html2text.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ietf-drums.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/ietf-drums.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/legacy-gnus-agent.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/legacy-gnus-agent.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-parse.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-parse.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-prsvr.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-prsvr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-source.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mail-source.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mailcap.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mailcap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/message.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/message.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/messcompat.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/messcompat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mm-archive.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mm-archive.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/mm-bodies.el.gz
@@ -2204,32 +2075,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnvirtual.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnweb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/nnweb.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/plstore.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/plstore.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/pop3.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/pop3.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/qp.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/qp.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/registry.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/registry.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc1843.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc1843.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2045.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2045.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2047.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2047.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2231.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rfc2231.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rtree.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/rtree.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/score-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/score-mode.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-manage.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-manage.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-mode.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve-mode.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/sieve.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/smiley.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/smiley.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/smime.el.gz
@@ -2242,12 +2089,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam-wash.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/spam.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/starttls.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/starttls.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/utf7.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/utf7.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/yenc.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/yenc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/help-at-pt.el.gz
@@ -2276,12 +2117,14 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/hl-line.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-ext.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuf-macs.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/ibuffer-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/icomplete.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ido.el.gz
@@ -2298,6 +2141,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/image-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/image.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/image.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/image/compface.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/image/compface.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/image/gravatar.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/image/gravatar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/imenu.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/imenu.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/indent.el.gz
@@ -2358,6 +2205,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/ogonek.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/quail.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/quail.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/rfc1843.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/rfc1843.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/robin.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/robin.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/titdic-cnv.el.gz
@@ -2381,6 +2230,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/uni-uppercase.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/utf-7.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/utf-7.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/utf7.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/utf7.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearch.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearch.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/isearchb.el.gz
@@ -2620,14 +2471,22 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/emacsbug.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/feedmail.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/feedmail.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/flow-fill.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/flow-fill.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/footnote.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/footnote.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/hashcash.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/hashcash.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/ietf-drums.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/ietf-drums.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-extr.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-extr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-hist.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-hist.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-parse.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-parse.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-prsvr.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-prsvr.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-utils.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mail-utils.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mailabbrev.el.gz
@@ -2642,12 +2501,21 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/metamail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mspools.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/mspools.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/qp.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/qp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/reporter.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/reporter.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2045.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2045.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2047.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2047.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2231.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2231.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2368.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc2368.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rfc822.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-spam-filter.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail-spam-filter.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/rmail.el.gz
@@ -2680,6 +2548,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/unrmail.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/uudecode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/mail/uudecode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/yenc.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/mail/yenc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/makesum.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/makesum.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/man.el.gz
@@ -2798,12 +2668,16 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-def.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-md5.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/hmac-md5.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/html2text.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/html2text.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/imap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/imap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ldap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ldap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/mairix.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/mairix.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/mailcap.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/mailcap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/net-utils.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/net-utils.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/netrc.el.gz
@@ -2828,6 +2702,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ntlm.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/pinentry.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/pinentry.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/pop3.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/pop3.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/puny.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/puny.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/quickurl.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/quickurl.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/rcirc.el.gz
@@ -2852,6 +2730,12 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/shr-color.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/shr.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/shr.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve-manage.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve-manage.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve-mode.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve-mode.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/sieve.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/snmp-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/snmp-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/soap-client.el.gz
@@ -2860,6 +2744,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/soap-inspect.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/socks.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/socks.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/starttls.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/starttls.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/telnet.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/telnet.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tls.el.gz
@@ -2901,8 +2787,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/novice.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-enc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-enc.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-glyph.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-glyph.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-maint.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-maint.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-mode.el.gz
@@ -2915,8 +2799,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-parse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-rap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-rap.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-uchnm.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-uchnm.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-util.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/nxml-util.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/nxml/rng-cmpct.el.gz
@@ -2953,8 +2835,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/abbrevlist.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/assoc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/assoc.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/awk-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/bruce.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/cc-compat.el.gz
@@ -2975,16 +2855,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/fast-lock.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/gulp.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-acc.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-acc.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-insert.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-insert.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-swed.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iso-swed.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iswitchb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/iswitchb.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/keyswap.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/keyswap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/landmark.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/landmark.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/lazy-lock.el.gz
@@ -3003,6 +2875,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mailpost.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/meese.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/meese.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/messcompat.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mouse-sel.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/mouse-sel.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/old-emacs-lock.el.gz
@@ -3033,22 +2906,12 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/pgg.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rcompile.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/rcompile.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/resume.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/resume.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/s-region.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/s-region.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/scribe.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/scribe.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/spell.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/spell.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sregex.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sregex.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sup-mouse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sup-mouse.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/swedish.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/swedish.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sym-comp.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/sym-comp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/terminal.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/obsolete/tpu-edt.el.gz
@@ -3348,6 +3211,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/tetris.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/zone.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/zone.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/plstore.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/plstore.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/printing.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/printing.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/proced.el.gz
@@ -3536,6 +3401,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-mule.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-print.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/ps-print-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-samp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/recentf.el.gz
@@ -3544,6 +3410,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/rect.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/register.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/register.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/registry.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/registry.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/repeat.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/repeat.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/replace.el.gz
@@ -3556,6 +3424,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/rfn-eshadow.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/rot13.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/rot13.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/rtree.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/rtree.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ruler-mode.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ruler-mode.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/savehist.el.gz
@@ -3597,6 +3467,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/subdirs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/subr.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/subr.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/svg.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/svg.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/t-mouse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/t-mouse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tabify.el.gz
@@ -3708,6 +3580,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-global.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-index.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-index.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-parse.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-parse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/textmodes/reftex-ref.el.gz
@@ -4080,6 +3953,7 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/scroll.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/search.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sheap.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sound.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syntax.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syntax.h

Modified: head/editors/emacs-nox11/Makefile
==============================================================================
--- head/editors/emacs-nox11/Makefile	Sun Oct  2 02:51:55 2016	(r423102)
+++ head/editors/emacs-nox11/Makefile	Sun Oct  2 05:07:22 2016	(r423103)
@@ -1,15 +1,15 @@
 # Created by: phoffman at proper.com
 # $FreeBSD$
 
-PKGNAMESUFFIX=	-nox11
+PKGNAMESUFFIX=		-nox11
 
-CONFLICTS_INSTALL=	emacs[0-9]*
+CONFLICTS_INSTALL=	emacs-[0-9]* emacs-devel-[0-9]*
 
-OPTIONS_EXCLUDE=GCONF GIF JPEG OTF M17N PNG SVG TIFF SYNC_INPUT GTK2 GTK3 \
-		SCROLLBARS XFT XIM XPM MAGICK GSETTINGS X11 CANNA \
-		XAW XAW3D MOTIF
-OPTIONS_DEFAULT?=SOURCES GNUTLS XML
+OPTIONS_EXCLUDE=	CAIRO GCONF GIF GSETTINGS GTK2 GTK3 JPEG M17N MAGICK    \
+			MOTIF OTF PNG SCROLLBARS SVG TIFF X11 XAW XAW3D XFT XIM \
+			XPM XWIDGETS
+OPTIONS_DEFAULT=	GNUTLS MODULES SOURCES XML
 
-MASTERDIR=	${.CURDIR}/../emacs
+MASTERDIR=		${.CURDIR}/../emacs
 
 .include "${MASTERDIR}/Makefile"

Modified: head/editors/emacs/Makefile
==============================================================================
--- head/editors/emacs/Makefile	Sun Oct  2 02:51:55 2016	(r423102)
+++ head/editors/emacs/Makefile	Sun Oct  2 05:07:22 2016	(r423103)
@@ -3,13 +3,11 @@
 
 PORTNAME=	emacs
 PORTVERSION=	${EMACS_VER}
-PORTREVISION=	3
 PORTEPOCH=	3
 CATEGORIES=	editors ipv6
 MASTER_SITES=	GNU
-PKGNAMESUFFIX?= 24
+1PKGNAMESUFFIX?=	25
 
-PATCH_SITE_SUBDIR+=	ashish
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	ashish at FreeBSD.org
@@ -18,199 +16,183 @@ COMMENT=	GNU editing macros
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-BROKEN_ia64=	Emacs 24.X does not currently build on ia64
+CONFLICTS_INSTALL?=	emacs-devel-[0-9]* emacs-nox11-[0-9]*
 
-CONFLICTS_INSTALL?=	emacs-nox11-[0-9]*
-CONFLICTS_INSTALL+=	\
-		emacs-19.* emacs21-[0-9]* emacs22-[0-9]* emacs23-[0-9]* \
-		xemacs-[0-9]* xemacs-devel-[0-9]* xemacs-mule-[0-9]* \
-		xemacs-devel-mule-[0-9]* \
-		emacs-devel-[0-9]*
-
-EMACS_VER=	24.5
+EMACS_VER=	25.1
 GNU_CONFIGURE=	yes
-USES=		cpe gmake localbase makeinfo ncurses pkgconfig shebangfix tar:xz
-# Building with GCC 4.6+ requires it
+USES=		cpe gmake makeinfo ncurses pkgconfig tar:xz
+# Building with GCC 4.6+ requires it; remove after 9.3 EOL
 LDFLAGS+=	${ncurses_ARGS:Mport:C/.+/-ltinfo/}
 INFO_PATH=	${DATADIR_REL}/info
 CPE_VENDOR=	gnu
 
-SUB_FILES=	pkg-install sources.el
+SUB_FILES=	sources.el
 SUB_LIST+=	ARCHLIBDIR=${PREFIX}/libexec/emacs/${EMACS_VER}/${CONFIGURE_TARGET}
 SUB_LIST+=	EMACS_VER=${EMACS_VER} # sources.el
-SHEBANG_FILES=	lib-src/grep-changelog
 
-CONFIGURE_ARGS=	--localstatedir=/var
+CONFIGURE_ARGS=	--localstatedir=/var \
+		--with-gameuser=games:games
 
 PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
 
 MAKE_ENV=	LC_ALL=C
 
-INFO=		ada-mode auth autotype bovine calc ccmode cl dbus dired-x \
-		ebrowse ede ediff edt efaq eieio eintr elisp emacs-gnutls \
-		emacs-mime emacs epa erc ert eshell eudc eww flymake forms \
-		gnus htmlfontify idlwave ido info mairix-el message mh-e \
-		newsticker nxml-mode octave-mode org pcl-cvs pgg rcirc reftex \
-		remember sasl sc semantic ses sieve smtpmail speedbar srecode \
-		todo-mode tramp url vip viper widget wisent woman
-
-OPTIONS_DEFINE=	CANNA X11 ACL DBUS GCONF GIF JPEG M17N OTF PNG SOUND SOURCES SVG TIFF SCROLLBARS \
-		XFT XIM XML XPM MAGICK GNUTLS GSETTINGS LTO FILENOTIFY
-
-OPTIONS_RADIO=	X11 SOUND
-
-CANNA_DESC=		Canna support
-ACL_DESC=		ACL support
-GSETTINGS_DESC=		GSettings support
-SCROLLBARS_DESC=	Toolkit scroll-bars
-SOUND_DESC=		Sound support
-SOURCES_DESC=		Install sources
-XAW_DESC=		Athena widgets
-XAW3D_DESC=		Athena3D widgets
-XIM_DESC=		X Input Method Support
-M17N_DESC=		M17N support for text-shaping
-OTF_DESC=		Opentype fonts suport
-FILENOTIFY_DESC=	File notification support
-LTO_DESC=		Enable link-time optimization (requires GCC 4.6+)
-
-OPTIONS_RADIO_X11=	GTK2 GTK3 XAW XAW3D MOTIF
-OPTIONS_RADIO_SOUND=	ALSA OSS
-
-OPTIONS_DEFAULT?=	DBUS GCONF GIF GTK2 JPEG M17N OTF PNG SOURCES SVG TIFF \
-			SCROLLBARS XFT XIM XML XPM MAGICK GNUTLS GSETTINGS OSS
-
-OPTIONS_SUB=		SOURCES
-
-CANNA_CONFIGURE_ON=	--with-canna \
-			--with-canna-includes=${LOCALBASE}/include \
-			--with-canna-libraries=${LOCALBASE}/lib
-CANNA_PATCH_SITES=	http://distfiles.pirateparty.in/%SUBDIR%/ LOCAL
-CANNA_PATCHFILES=	emacs24.4canna-20141030.diff.gz
-CANNA_LIB_DEPENDS=	libcanna.so:japanese/canna-lib
+INFO=	ada-mode auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede	\
+	ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime epa erc	\
+	ert eshell eudc eww flymake forms gnus htmlfontify idlwave ido info	\
+	mairix-el message mh-e newsticker nxml-mode octave-mode org pcl-cvs pgg	\
+	rcirc reftex remember sasl sc semantic ses sieve smtpmail speedbar	\
+	srecode todo-mode tramp url vhdl-mode vip viper widget wisent woman
+
+OPTIONS_DEFINE=	ACL CANNA DBUS GNUTLS LLDB MODULES SOURCES X11 XML
+
+OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
+OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
+OPTIONS_RADIO_SOUND=		ALSA OSS
+OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 MOTIF XAW XAW3D
+OPTIONS_GROUP=			GRAPHICS NEEDX11
+OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
+OPTIONS_GROUP_NEEDX11=		GCONF GSETTINGS M17N OTF SCROLLBARS XFT XIM     \
+				XWIDGETS
+
+OPTIONS_DEFAULT?=	ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK2 JPEG KQUEUE    \
+			M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG  \
+			TIFF X11 XFT XIM XML XPM
+
+ACL_DESC=	Access control list support
+CAIRO_DESC=	Experimental Cairo library support     (implies PNG, XFT)
+CANNA_DESC=	Japanese input support
+FILENOTIFY_DESC=File notification support
+GFILE_DESC=	File notification via gfile
+GRAPHICS_DESC=	Graphics support (each implies X11)
+GSETTINGS_DESC=	GSettings API for application settings
+KQUEUE_DESC=	File notification via kqueue
+LLDB_DESC=	LLDB support for GUD
+#LTO_DESC=	Enable link-time optimization
+MAGICK_DESC=	ImageMagick image processing support
+M17N_DESC=	M17N for text-shaping                  (implies XFT)
+MODULES_DESC=	Dynamic modules support
+NEEDX11_DESC=	Other X11-dependent (each implies X11)
+OTF_DESC=	Opentype fonts                         (implies XFT)
+SCROLLBARS_DESC=Toolkit scroll-bars
+SOURCES_DESC=	Install sources
+SVG_DESC=	Scalable vector graphics support       (implies PNG)
+X11_DESC=	X window system support
+X11TOOLKIT_DESC=X11 toolkit (each implies X11)
+XAW3D_DESC=	Athena3D widgets
+XAW_DESC=	Athena widgets
+XIM_DESC=	X Input Method
+XWIDGETS_DESC=	GTK widgets in Emacs buffers           (requires GTK3)
+
+OPTIONS_SUB=		YES
 
-SOUND_CONFIGURE_OFF=	--with-sound=no
+ACL_CONFIGURE_ENABLE=	acl
 ALSA_CONFIGURE_ON=	--with-sound=alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
-ALSA_IMPLIES=		SOUND
-OSS_CONFIGURE_ON=	--with-sound=oss
-OSS_IMPLIES=		SOUND
-
+CAIRO_USE=		GNOME=cairo
+CAIRO_CONFIGURE_WITH=	cairo
+CAIRO_IMPLIES=		PNG XFT X11
+CANNA_CONFIGURE_WITH=	canna
+CANNA_PATCH_SITES=	http://www.gentei.org/~yuuji/software/emacs25canna/ \
+			http://distfiles.pirateparty.in/ashish/ \
+			LOCAL/ashish
+CANNA_PATCHFILES=	emacs25.1canna-20160919.diff.gz
+CANNA_LIB_DEPENDS=	libcanna.so:japanese/canna-lib
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=	dbus
-
+GCONF_USE=		GNOME=gconf2
+GCONF_CONFIGURE_WITH=	gconf
+GCONF_IMPLIES=		X11
+GFILE_CONFIGURE_ON=	--with-file-notification=gfile
+GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
+GIF_CONFIGURE_WITH=	gif
+GIF_IMPLIES=		X11
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
-
-XML_USE=		GNOME=libxml2
-XML_CONFIGURE_WITH=	xml2
-
-SVG_USE=		GNOME=librsvg2
-SVG_CONFIGURE_WITH=	rsvg
-SVG_IMPLIES=		X11
-
-X11_CONFIGURE_WITH=	x
-X11_USE=		XORG=x11
-X11_USES=		desktop-file-utils
-X11_VARS=		INSTALLS_ICONS=yes
-
-GTK2_USE=		GNOME=gtk20
+GSETTINGS_USE=		GNOME=glib20
+GSETTINGS_CONFIGURE_WITH=gsettings
+GSETTINGS_IMPLIES=	DBUS X11
+GTK2_USE=		GNOME=cairo,gtk20
+GTK2_USES=		gettext-runtime
 GTK2_CONFIGURE_ON=	--with-x-toolkit=gtk2
 GTK2_IMPLIES=		X11
-
-GTK3_USE=		GNOME=gtk30
+GTK2_LIB_DEPENDS=	libfreetype.so:print/freetype2 \
+			libfontconfig.so:x11-fonts/fontconfig
+GTK3_USE=		GNOME=cairo,gtk30
+GTK3_USES=		gettext-runtime
 GTK3_CONFIGURE_ON=	--with-x-toolkit=gtk3
 GTK3_IMPLIES=		X11
-
-XAW3D_LIB_DEPENDS=	libXaw3d.so:x11-toolkits/Xaw3d
-XAW3D_CONFIGURE_ON=	--with-x-toolkit=athena
-XAW3D_IMPLIES=		X11
-
-XAW_USE=		XORG=xaw
-XAW_CONFIGURE_ON+=	--with-x-toolkit=athena --without-xaw3d
-XAW_IMPLIES=		X11
-
-MOTIF_USES=		motif
-MOTIF_CONFIGURE_ON+=	--with-x-toolkit=motif
-MOTIF_IMPLIES=		X11
-
-SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
-SCROLLBARS_IMPLIES=	X11
-
 JPEG_USES=		jpeg
 JPEG_CONFIGURE_WITH=	jpeg
 JPEG_IMPLIES=		X11
-
-TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
-TIFF_CONFIGURE_WITH=	tiff
-TIFF_IMPLIES=		X11
-
-GIF_LIB_DEPENDS=	libgif.so:graphics/giflib
-GIF_CONFIGURE_WITH=	gif
-GIF_IMPLIES=		X11
-
-PNG_LIB_DEPENDS+=	libpng.so:graphics/png
-PNG_CONFIGURE_WITH=	png
-PNG_IMPLIES=		X11

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list