Update to 25.2

* Add xml to default options to enable internel web browser, eww

Changelog:
* Changes in Emacs 25.2

This is mainly a bug-fix release, but there are some other changes.

** 'find-library', 'help-function-def' and 'help-variable-def' now run
'find-function-after-hook'.

** New basic face 'fixed-pitch-serif', for a fixed-width font with serifs.
The 'Info-quoted' and 'tex-verbatim' faces inherit from it by default.

** New variable 'use-default-font-for-symbols', for backward compatibility.
This variable allows you to get back pre-Emacs 25 behavior where the
font for displaying symbol and punctuation characters was always
selected according to your fontset setup.  By default, Emacs 25 tries
to use the default face's font for such characters, if it supports
them, disregarding the fontsets.  Set this variable to nil to disable
this and get back the old behavior.

** 'electric-quote-mode' is no longer suppressed in a buffer whose
coding system cannot represent curved quote characters.
Instead, users can deal with the unrepresentable characters in the
usual way when they save the buffer.

** New variable 'inhibit-compacting-font-caches'.
Set this variable to a non-nil value to speed up display of characters
using large fonts, at the price of a larger memory footprint.

** The version number of CC Mode has been changed from 5.33 to
5.32.99, although the software itself hasn't changed.  This aims to
reduce confusion with the standalone CC Mode 5.33 (available from
http://cc-mode.sourceforge.net), which is a more mature version than
the one included in Emacs 25.2.

5 files changed, 17 insertions, 13 deletions

diff --git a/editors/emacs25/Makefile b/editors/emacs25/Makefile
index 948cadb5ff0..1448233d792 100644
--- a/editors/emacs25/Makefile
+++ b/editors/emacs25/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2017/04/22 21:03:34 adam Exp $
+# $NetBSD: Makefile,v 1.8 2017/04/27 13:27:57 ryoon Exp $
 
 CONFLICTS+=	emacs25-nox11-[0-9]*
 
-PKGREVISION= 6
 .include "../../editors/emacs25/Makefile.common"
 
 .include "options.mk"
diff --git a/editors/emacs25/PLIST b/editors/emacs25/PLIST
index 479637dac95..73d840b8f0f 100644
--- a/editors/emacs25/PLIST
+++ b/editors/emacs25/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/09/21 09:22:08 wiz Exp $
+@comment $NetBSD: PLIST,v 1.3 2017/04/27 13:27:57 ryoon Exp $
 bin/ctags
 bin/ebrowse
 bin/emacs
@@ -943,7 +943,6 @@ share/emacs/${PKGVERSION}/etc/refcards/de-refcard.tex
 share/emacs/${PKGVERSION}/etc/refcards/dired-ref.pdf
 share/emacs/${PKGVERSION}/etc/refcards/dired-ref.tex
 share/emacs/${PKGVERSION}/etc/refcards/emacsver.tex
-share/emacs/${PKGVERSION}/etc/refcards/emacsver.tex.in
 share/emacs/${PKGVERSION}/etc/refcards/fr-dired-ref.pdf
 share/emacs/${PKGVERSION}/etc/refcards/fr-dired-ref.tex
 share/emacs/${PKGVERSION}/etc/refcards/fr-refcard.pdf
@@ -958,13 +957,19 @@ share/emacs/${PKGVERSION}/etc/refcards/gnus-refcard.tex
 share/emacs/${PKGVERSION}/etc/refcards/orgcard.pdf
 share/emacs/${PKGVERSION}/etc/refcards/orgcard.tex
 share/emacs/${PKGVERSION}/etc/refcards/pdflayout.sty
+share/emacs/${PKGVERSION}/etc/refcards/pl-refcard.pdf
 share/emacs/${PKGVERSION}/etc/refcards/pl-refcard.tex
+share/emacs/${PKGVERSION}/etc/refcards/pt-br-refcard.pdf
 share/emacs/${PKGVERSION}/etc/refcards/pt-br-refcard.tex
 share/emacs/${PKGVERSION}/etc/refcards/refcard.pdf
 share/emacs/${PKGVERSION}/etc/refcards/refcard.tex
+share/emacs/${PKGVERSION}/etc/refcards/ru-refcard.pdf
 share/emacs/${PKGVERSION}/etc/refcards/ru-refcard.tex
 share/emacs/${PKGVERSION}/etc/refcards/sk-dired-ref.tex
+share/emacs/${PKGVERSION}/etc/refcards/sk-dired-ref.pdf
+share/emacs/${PKGVERSION}/etc/refcards/sk-refcard.pdf
 share/emacs/${PKGVERSION}/etc/refcards/sk-refcard.tex
+share/emacs/${PKGVERSION}/etc/refcards/sk-survival.pdf
 share/emacs/${PKGVERSION}/etc/refcards/sk-survival.tex
 share/emacs/${PKGVERSION}/etc/refcards/survival.pdf
 share/emacs/${PKGVERSION}/etc/refcards/survival.tex
diff --git a/editors/emacs25/distinfo b/editors/emacs25/distinfo
index f4513186985..6208c29e701 100644
--- a/editors/emacs25/distinfo
+++ b/editors/emacs25/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.2 2016/12/13 13:40:05 wiedi Exp $
+$NetBSD: distinfo,v 1.3 2017/04/27 13:27:57 ryoon Exp $
 
-SHA1 (emacs-25.1.tar.gz) = 78fd1683bbb77bbab7453aedc2be457258bbae8c
-RMD160 (emacs-25.1.tar.gz) = d29ddba846024c7df3e1dc02ac32690f3650e7b9
-SHA512 (emacs-25.1.tar.gz) = c933483071c42a277c7b09c77b93a057cfbb68456dc90c6f4eaf881d478c0f64383330c5b9c6a2a70a008f30f8b303862e5434d442b8a9cddaa5926e54d5a251
-Size (emacs-25.1.tar.gz) = 62345581 bytes
+SHA1 (emacs-25.2.tar.gz) = 30c18fb0cd932736bb6a7232ab62f562cf89a785
+RMD160 (emacs-25.2.tar.gz) = 2b0cd1fa04abb2156fd4a33f73e9b929f97dca43
+SHA512 (emacs-25.2.tar.gz) = 3ddecdfb64fba400d82b6d44fd03799ac1a2032aa3bda6eb18a83d680465f1df3e8128b9544daaeed4b5ead0ac11955c1ad613de6a489236995def840c4d501c
+Size (emacs-25.2.tar.gz) = 64289988 bytes
 SHA1 (patch-src_inotify.c) = 1fdc6566ed57e8418f1ddc85bb03518d7d9d6bb3
diff --git a/editors/emacs25/options.mk b/editors/emacs25/options.mk
index 5b776c9f886..01032091512 100644
--- a/editors/emacs25/options.mk
+++ b/editors/emacs25/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2017/02/14 09:07:37 markd Exp $
+# $NetBSD: options.mk,v 1.3 2017/04/27 13:27:57 ryoon Exp $
 
 PKG_OPTIONS_VAR=			PKG_OPTIONS.emacs
 PKG_SUPPORTED_OPTIONS=			dbus xft2 svg xml gnutls
@@ -8,7 +8,7 @@ PKG_OPTIONS_OPTIONAL_GROUPS+=		toolkit
 PKG_OPTIONS_GROUP.toolkit=		gtk2 gtk3 motif xaw
 PKG_SUGGESTED_OPTIONS.Darwin=		nextstep
 PKG_SUGGESTED_OPTIONS.*=		x11
-PKG_SUGGESTED_OPTIONS+=			dbus svg xft2
+PKG_SUGGESTED_OPTIONS+=			dbus svg xft2 xml
 
 .include "../../mk/bsd.options.mk"
 
diff --git a/editors/emacs25/version.mk b/editors/emacs25/version.mk
index 4c1fb2c8968..770b695c385 100644
--- a/editors/emacs25/version.mk
+++ b/editors/emacs25/version.mk
@@ -1,7 +1,7 @@
-# $NetBSD: version.mk,v 1.1 2016/09/18 13:36:18 ryoon Exp $
+# $NetBSD: version.mk,v 1.2 2017/04/27 13:27:57 ryoon Exp $
 
 _EMACS_FLAVOR=	emacs
 _EMACS_REQD=	emacs25>=25.1<26
 
 _EMACS_VERSION_MAJOR=	25
-_EMACS_VERSION_MINOR=	1
+_EMACS_VERSION_MINOR=	2