summaryrefslogtreecommitdiff
path: root/editors/emacs
diff options
context:
space:
mode:
authorJoseph Mingrone <jrm@FreeBSD.org>2017-04-22 19:38:35 +0000
committerJoseph Mingrone <jrm@FreeBSD.org>2017-04-22 19:38:35 +0000
commitaca9927aa41516c334da793b2a3c8ad4846d8950 (patch)
tree52114194a7c0ad0096186624dc303dbe4f55089f /editors/emacs
parent- Added missing patch to fix shebangs (diff)
editors/emacs: Update to version 25.2
- Make gtk3 the default X11 toolkit since the configure script will search for that version first and upstream describes gtk2 as deprecated. - Release notes: https://www.gnu.org/software/emacs/news/NEWS.25.2 Approved by: ashish (maintainer), swills (mentor, implicit)
Notes
Notes: svn path=/head/; revision=439187
Diffstat (limited to 'editors/emacs')
-rw-r--r--editors/emacs/Makefile4
-rw-r--r--editors/emacs/distinfo6
-rw-r--r--editors/emacs/pkg-plist7
3 files changed, 11 insertions, 6 deletions
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 3be3f4ec6973..1d397ab48f11 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -20,7 +20,7 @@ CONFLICTS_INSTALL?= emacs-devel-[0-9]* emacs-nox11-[0-9]*
BROKEN_aarch64= Fails to link: missing sbrk
-EMACS_VER= 25.1
+EMACS_VER= 25.2
GNU_CONFIGURE= yes
USES= cpe gmake makeinfo ncurses pkgconfig tar:xz
# Building with GCC 4.6+ requires it; remove after 9.3 EOL
@@ -55,7 +55,7 @@ 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 \
+OPTIONS_DEFAULT?= ACL DBUS GCONF GIF GNUTLS GSETTINGS GTK3 JPEG KQUEUE \
M17N MAGICK MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \
TIFF X11 XFT XIM XML XPM
diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo
index 80416be66da0..8452866a0048 100644
--- a/editors/emacs/distinfo
+++ b/editors/emacs/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1474863458
-SHA256 (emacs-25.1.tar.xz) = 19f2798ee3bc26c95dca3303e7ab141e7ad65d6ea2b6945eeba4dbea7df48f33
-SIZE (emacs-25.1.tar.xz) = 42498944
+TIMESTAMP = 1492819467
+SHA256 (emacs-25.2.tar.xz) = 59b55194c9979987c5e9f1a1a4ab5406714e80ffcfd415cc6b9222413bc073fa
+SIZE (emacs-25.2.tar.xz) = 46900336
SHA256 (emacs25.1canna-20160919.diff.gz) = b0ef90be88e8b947d41805713735a79c6f78e2401b749d5e6d1e3fd1bc7e5f32
SIZE (emacs25.1canna-20160919.diff.gz) = 31671
diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist
index 44824f8bd242..60370c8cfd53 100644
--- a/editors/emacs/pkg-plist
+++ b/editors/emacs/pkg-plist
@@ -874,7 +874,6 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/de-refcard.tex
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/dired-ref.tex
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/emacsver.tex
-%%DATADIR%%/%%EMACS_VER%%/etc/refcards/emacsver.tex.in
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-dired-ref.tex
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-refcard.tex
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/fr-survival.tex
@@ -883,12 +882,18 @@ share/applications/emacs.desktop
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/gnus-refcard.tex
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/orgcard.tex
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/pdflayout.sty
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/pl-refcard.pdf
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/pl-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/pt-br-refcard.pdf
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/pt-br-refcard.tex
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/ru-refcard.pdf
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/ru-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-dired-ref.pdf
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-dired-ref.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-refcard.pdf
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-refcard.tex
+%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-survival.pdf
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/sk-survival.tex
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/survival.tex
%%DATADIR%%/%%EMACS_VER%%/etc/refcards/vipcard.tex