Flavorize and modernize Emacs ports

- Convert USE_EMACS to USES=emacs
- Remove editors/emacs-nox11 (refer to nox flavors of editors/emacs and
  editors/emacs-devel)
- Permit default Emacs flavor to be specified in make.conf
- Rename japanese/migemo-emacs23 to japanese/migemo-emacs
- Update and simplify audio/emms and fix build on FreeBSD 10 [1]
- Update databases/bbdd and fix build on FreeBSD 10 [1]
- Update editors/emacs-devel
- Ensure Makefile shell commands that change directory are executed in a
  subshell
- Silence some portlint warnings

[1] By not depending on base texinfo

PR:		225404
Reviewed by:	antoine
Approved by:	portmgr (mat) ashish (maintainer)
Differential Revision:	https://reviews.freebsd.org/D13506

3 files changed, 83 insertions, 63 deletions

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 5a316f9c0901..2f67eb8765ad 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -7,24 +7,30 @@ PORTEPOCH=	2
 CATEGORIES=	editors ipv6
 PKGNAMESUFFIX=	-devel
 
-MAINTAINER=	ashish@FreeBSD.org
+MAINTAINER=	emacs@FreeBSD.org
 COMMENT=	GNU editing macros
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	emacs25-[0-9]* emacs-nox11-[0-9]*
+CONFLICTS_INSTALL=	emacs emacs-canna emacs-nox
 
+FLAVORS=		full nox
+full_CONFLICTS_INSTALL=	emacs-devel_nox
+full_PKGNAMESUFFIX=	-devel
+nox_CONFLICTS_INSTALL=	emacs-devel
+nox_PKGNAMESUFFIX=	-devel_nox
+
+USES=		autoreconf:build cpe gmake makeinfo ncurses pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	6b8e9b7
+GH_TAGNAME=	b3fb0d4
 
+CPE_VENDOR=	gnu
 EMACS_VER=	27.0.50
-EMACS_REV=	20171118
+EMACS_REV=	20180122
 GNU_CONFIGURE=	yes
-USES=		autoreconf:build cpe gmake makeinfo ncurses pkgconfig
 INFO_PATH=	${DATADIR_REL}/info
-CPE_VENDOR=	gnu
 
 SUB_FILES=	sources.el
 SUB_LIST=	EMACS_VER=${EMACS_VER}
@@ -33,33 +39,29 @@ CONFIGURE_ARGS=	--with-gameuser=games:games
 
 PLIST_SUB=	EMACS_VER=${EMACS_VER} GNU_HOST=${CONFIGURE_TARGET}
 
-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	\
+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
 
-MAKE_JOBS_UNSAFE=	yes
-
 OPTIONS_DEFINE=	ACL DBUS GNUTLS LCMS2 LLDB MODULES SOURCES THREADS X11 XML
-
-OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
+OPTIONS_DEFAULT=	ACL DBUS FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK3 \
+			JPEG KQUEUE LCMS2 M17N MAGICK MODULES OSS OTF PNG \
+			SCROLLBARS SOURCES SVG THREADS TIFF X11 XFT XIM XML XPM
+OPTIONS_SUB=	YES
+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_RADIO=	FILENOTIFY SOUND X11TOOLKIT
 OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
-OPTIONS_RADIO_SOUND=		ALSA OSS
+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 FREEDESKTOP GCONF GIF GNUTLS GSETTINGS GTK2    \
-			JPEG KQUEUE LCMS2 M17N MAGICK MODULES OSS OTF PNG SCROLLBARS  \
-			SOURCES SVG THREADS TIFF X11 XFT XIM XML XPM
 
 ACL_DESC=	Access control list support
 CAIRO_DESC=	Experimental Cairo support    (implies PNG, XFT)
-FILENOTIFY_DESC=File notification support
+FILENOTIFY_DESC=	File notification support
 GCONF_DESC=	GConf configuration support
 GFILE_DESC=	File notification via gfile
 GRAPHICS_DESC=	Graphics support (each implies X11)
@@ -83,8 +85,6 @@ XAW_DESC=	Athena widgets
 XIM_DESC=	X Input Method Support
 XWIDGETS_DESC=	GTK widgets in Emacs buffers  (requires GTK3)
 
-OPTIONS_SUB=		YES
-
 ACL_CONFIGURE_ENABLE=	acl
 ALSA_CONFIGURE_ON=	--with-sound=alsa
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
@@ -103,7 +103,7 @@ GIF_IMPLIES=		X11
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
 GNUTLS_CONFIGURE_WITH=	gnutls
 GSETTINGS_USE=		GNOME=glib20
-GSETTINGS_CONFIGURE_WITH=gsettings
+GSETTINGS_CONFIGURE_WITH=	gsettings
 GSETTINGS_IMPLIES=	DBUS X11
 GTK2_USE=		GNOME=cairo,gtk20
 GTK2_USES=		gettext
@@ -141,7 +141,7 @@ OTF_IMPLIES=		X11 XFT
 PNG_LIB_DEPENDS=	libpng.so:graphics/png
 PNG_CONFIGURE_WITH=	png
 PNG_IMPLIES=		X11
-SCROLLBARS_CONFIGURE_WITH=toolkit-scroll-bars
+SCROLLBARS_CONFIGURE_WITH=	toolkit-scroll-bars
 SCROLLBARS_IMPLIES=	X11
 SVG_USE=		GNOME=cairo,librsvg2
 SVG_CONFIGURE_WITH=	rsvg
@@ -176,10 +176,24 @@ XPM_USE=		XORG=xpm
 XPM_CONFIGURE_WITH=	xpm
 XPM_IMPLIES=		X11
 XWIDGETS_USE=		XORG=xcomposite
-XWIDGETS_CONFIGURE_WITH=xwidgets
+XWIDGETS_CONFIGURE_WITH=	xwidgets
 XWIDGETS_LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
 XWIDGETS_IMPLIES=	GTK3
 
+.if ${FLAVOR:U} == nox
+OPTIONS_EXCLUDE=	ALSA CAIRO DBUS GCONF GIF GSETTINGS GTK2 GTK3 JPEG \
+			LCMS2 M17N MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF \
+			XAW XAW3D X11 XFT XIM XPM XWIDGETS
+CONFIGURE_ARGS+=	--with-sound=no --without-cairo --without-dbus \
+			--without-gconf --without-gif --without-gsettings \
+			--with-x-toolkit=no --without-jpeg --without-lcms2 \
+			--without-m17n-flt --without-imagemagick \
+			--without-libotf --without-png \
+			--without-toolkit-scroll-bars --without-rsvg \
+			--without-tiff --without-xim --without-xpm \
+			--without-xwidgets
+.endif
+
 .include <bsd.port.options.mk>
 
 # has graphics/ImageMagick been compiled with OPENMP?
@@ -203,7 +217,9 @@ post-patch-X11-off:
 
 post-install-SOURCES-on:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] ${STAGEDIR}${DATADIR}/${EMACS_VER}/src
-	${INSTALL_DATA} ${WRKDIR}/sources.el ${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
+	${INSTALL_DATA} ${WRKSRC}/src/*.[ch] \
+		${STAGEDIR}${DATADIR}/${EMACS_VER}/src
+	${INSTALL_DATA} ${WRKDIR}/sources.el \
+		${STAGEDIR}${DATADIR}/${EMACS_VER}/site-lisp/site-start.el
 
 .include <bsd.port.mk>
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 62b1c98cd0a8..ca5ed042b4dc 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1510982076
-SHA256 (emacs-mirror-emacs-27.0.50.20171118-6b8e9b7_GH0.tar.gz) = 8b52b9a2e6c6a2f6c4cc37ed093f42656dc19541e91f207fc7a2735597349309
-SIZE (emacs-mirror-emacs-27.0.50.20171118-6b8e9b7_GH0.tar.gz) = 39857493
+TIMESTAMP = 1516592732
+SHA256 (emacs-mirror-emacs-27.0.50.20180122-b3fb0d4_GH0.tar.gz) = fd8eeb871e5044bb92050b870c9cfc507d6ad1eee62e3b4990cb34248bc63987
+SIZE (emacs-mirror-emacs-27.0.50.20180122-b3fb0d4_GH0.tar.gz) = 39977340
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 65fbfe4497ac..ab1903df5029 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -17,6 +17,11 @@ man/man1/emacsclient.1.gz
 man/man1/etags.1.gz
 share/appdata/emacs.appdata.xml
 share/applications/emacs.desktop
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%-buffer.gdb
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.appdata.xml
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.desktop
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.icon
+%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.service
 %%DATADIR%%/%%EMACS_VER%%/etc/AUTHORS
 %%DATADIR%%/%%EMACS_VER%%/etc/CALC-NEWS
 %%DATADIR%%/%%EMACS_VER%%/etc/CENSORSHIP
@@ -196,11 +201,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color
 %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color.ti
 %%DATADIR%%/%%EMACS_VER%%/etc/edt-user.el
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%-buffer.gdb
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.appdata.xml
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.desktop
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.icon
-%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.service
 %%DATADIR%%/%%EMACS_VER%%/etc/enriched.txt
 %%DATADIR%%/%%EMACS_VER%%/etc/forms/README
 %%DATADIR%%/%%EMACS_VER%%/etc/forms/forms-d2.dat
@@ -1617,8 +1617,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/package.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pcase.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/pcase.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/pixel-scroll.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/pixel-scroll.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
@@ -1655,10 +1653,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/testcover.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/thunk.el.gz
 %%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/timer.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/timer.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
@@ -1751,6 +1749,7 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-lang.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-list.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-list.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-loaddefs.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-log.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-log.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/erc/erc-match.el.gz
@@ -1972,10 +1971,10 @@ 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-rfc1843.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rfc1843.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-salt.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-salt.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-score.el.gz
@@ -2132,16 +2131,16 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/hippie-exp.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/hl-line.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/hl-line.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/htmlfontify-loaddefs.el
 %%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-loaddefs.el
 %%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
@@ -2663,6 +2662,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dig.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/dns.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-export.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-hotlist.el.gz
@@ -2673,8 +2674,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-bbdb.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/net/eudc-bob.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-ldap.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/eudcb-mab.el.gz
@@ -2693,10 +2692,10 @@ share/applications/emacs.desktop
 %%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/mairix.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/mairix.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
@@ -2719,8 +2718,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/nsm.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/ntlm.el.gz
 %%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
@@ -2771,6 +2768,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tls.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-adb.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-adb.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-archive.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-archive.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-cache.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-cache.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/net/tramp-cmds.el.gz
@@ -3210,6 +3209,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/pcmpl-x.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/pcomplete.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/pcomplete.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/pixel-scroll.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/pixel-scroll.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/5x5.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/5x5.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/play/animate.el.gz
@@ -3352,10 +3353,10 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/executable.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/f90.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/f90.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-proc.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake-proc.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/flymake.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/fortran.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/fortran.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/progmodes/gdb-mi.el.gz
@@ -3450,9 +3451,9 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-def.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-mule.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/ps-mule.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/ps-print-loaddefs.el
 %%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
@@ -3563,6 +3564,8 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/screen.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/sun.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/sun.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/tmux.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/term/tmux.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/tty-colors.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/tty-colors.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/term/tvi970.el.gz
@@ -3686,8 +3689,6 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/timezone.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tmm.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/tmm.elc
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/tmux.el.gz
-%%DATADIR%%/%%EMACS_VER%%/lisp/term/tmux.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tool-bar.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/tool-bar.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/tooltip.el.gz
@@ -3893,6 +3894,9 @@ share/applications/emacs.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc
 %%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
+%%DATADIR%%/%%EMACS_VER%%/src/json.c
+%%DATADIR%%/%%EMACS_VER%%/src/ptr-bounds.h
+%%DATADIR%%/%%EMACS_VER%%/src/w32cygwinx.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/alloc.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/atimer.c
@@ -4025,10 +4029,10 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sysselect.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syssignal.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/sysstdio.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systime.h
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systty.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systhread.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systhread.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systime.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/systty.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/syswait.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/term.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/termcap.c
@@ -4053,8 +4057,6 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexsol.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/unexw32.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/vm-limit.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
-%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w16select.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/w32.h
@@ -4099,6 +4101,8 @@ share/applications/emacs.desktop
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xsmfns.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xterm.c
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xterm.h
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c
+%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h
 %%DATADIR%%/site-lisp/subdirs.el
 share/icons/hicolor/128x128/apps/emacs.png
 share/icons/hicolor/16x16/apps/emacs.png