git: 61d0935ac4c0 - main - editors/emacs-devel: Update to 2021-11-15 commit, d9e91da

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Joseph Mingrone <jrm_at_FreeBSD.org>
Date: Mon, 15 Nov 2021 15:21:02 UTC
The branch main has been updated by jrm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=61d0935ac4c0e2ad581519506d53ba0ae8d38a14

commit 61d0935ac4c0e2ad581519506d53ba0ae8d38a14
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2021-11-15 12:52:58 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2021-11-15 15:20:11 +0000

    editors/emacs-devel: Update to 2021-11-15 commit, d9e91da
    
    - Add a knob for webp image support.
---
 editors/emacs-devel/Makefile  | 15 ++++++++-------
 editors/emacs-devel/distinfo  |  6 +++---
 editors/emacs-devel/pkg-plist |  7 +++++++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index 6713c3a0afa3..caa1aafd1d30 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -1,8 +1,7 @@
 # Created by: Kenneth Vestergaard Schmidt <kvs@pil.dk>
 
 PORTNAME=	emacs
-DISTVERSION=	29.0.50.20211031
-PORTREVISION=	1
+DISTVERSION=	29.0.50.20211115
 PORTEPOCH=	2
 CATEGORIES=	editors
 PKGNAMESUFFIX=	-devel
@@ -26,7 +25,7 @@ USES=		autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig
 CPE_VENDOR=	gnu
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	90bd80d
+GH_TAGNAME=	d9e91da
 
 .if ${FLAVOR:U} != nox
 USES+=		desktop-file-utils gnome xorg
@@ -58,6 +57,7 @@ CONFIGURE_ARGS+=	--with-sound=no \
 			--without-x \
 			--without-xim \
 			--without-xpm \
+			--without-webp \
 			--without-xwidgets
 .else
 CONFIGURE_ARGS+=	--with-x
@@ -87,9 +87,9 @@ OPTIONS_DEFINE=			ACL DBUS GCONF GNUTLS GSETTINGS HARFBUZZ JSON \
 OPTIONS_DEFAULT=		ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \
 				HARFBUZZ JPEG JSON KQUEUE LCMS2 M17N MAILUTILS \
 				MODULES OSS OTF PNG SCROLLBARS SOURCES SVG \
-				THREADS TIFF XFT XIM XML XPM
+				THREADS TIFF XFT XIM XML XPM WEBP
 OPTIONS_GROUP=			GRAPHICS
-OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM
+OPTIONS_GROUP_GRAPHICS=		CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM WEBP
 OPTIONS_RADIO=			FILENOTIFY SOUND X11TOOLKIT
 OPTIONS_RADIO_FILENOTIFY=	GFILE KQUEUE
 OPTIONS_RADIO_SOUND=		ALSA OSS
@@ -98,7 +98,7 @@ OPTIONS_RADIO_X11TOOLKIT=	GTK2 GTK3 XAW XAW3D
 OPTIONS_EXCLUDE=		ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 \
 				GTK3 HARFBUZZ JPEG LCMS2 M17N MAGICK OSS OTF \
 				PNG SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM \
-				XWIDGETS
+				XWIDGETS WEBP
 .endif
 OPTIONS_SUB=			YES
 
@@ -207,7 +207,8 @@ XWIDGETS_LIB_DEPENDS=		libsoup-2.4.so:devel/libsoup \
 				libwebkit2gtk-4.0.so:www/webkit2-gtk3
 XWIDGETS_USE=			XORG=xcomposite
 XWIDGETS_CONFIGURE_WITH=	xwidgets
-
+WEBP_LIB_DEPENDS=		libwebp.so:graphics/webp
+WEBP_CONFIGURE_WITH=		webp
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MNATIVECOMP} && !defined(_GCC_PORT_CHOSEN)
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index 304e1ab993b0..73e544806e15 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1635679341
-SHA256 (emacs-mirror-emacs-29.0.50.20211031-90bd80d_GH0.tar.gz) = 2dbc1d06f399f7318cd727c03fa2beb11b452e2bd55cad325be87ce77f039c40
-SIZE (emacs-mirror-emacs-29.0.50.20211031-90bd80d_GH0.tar.gz) = 43373342
+TIMESTAMP = 1636941888
+SHA256 (emacs-mirror-emacs-29.0.50.20211115-d9e91da_GH0.tar.gz) = 3e2ef35ef023db4eac72d7172e88a8c49eaadb868848afa80cdef80813a68bcd
+SIZE (emacs-mirror-emacs-29.0.50.20211115-d9e91da_GH0.tar.gz) = 43488467
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 982744b29f8f..861b71d1ac25 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -221,6 +221,8 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/images/checked.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/close.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/close.xpm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/connect-to-url.pbm
+%%DATADIR%%/%%EMACS_VER%%/etc/images/connect-to-url.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/connect.pbm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/connect.xpm
 %%DATADIR%%/%%EMACS_VER%%/etc/images/contact.pbm
@@ -2234,8 +2236,11 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/charscript.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/cp51932.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/cp51932.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/emoji-labels.el
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/emoji-zwj.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/emoji-zwj.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/emoji.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/international/emoji.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/eucjp-ms.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/eucjp-ms.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/international/fontset.el.gz
@@ -3992,6 +3997,8 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/lisp/xt-mouse.elc
 %%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.el.gz
 %%DATADIR%%/%%EMACS_VER%%/lisp/xwidget.elc
+%%DATADIR%%/%%EMACS_VER%%/lisp/yank-media.el.gz
+%%DATADIR%%/%%EMACS_VER%%/lisp/yank-media.elc
 %%DATADIR%%/%%EMACS_VER%%/site-lisp/subdirs.el
 %%DATADIR%%/site-lisp/subdirs.el
 %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/site-lisp/site-start.el