git: 506b641bd5ef - main - editors/emacs-devel: Update to 2023-06-01 snapshot, 2d6ba3e

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Joseph Mingrone <jrm_at_FreeBSD.org>
Date: Fri, 02 Jun 2023 02:20:49 UTC
The branch main has been updated by jrm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=506b641bd5eff4aab568a5879ecc4cb5f9dc7123

commit 506b641bd5eff4aab568a5879ecc4cb5f9dc7123
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2023-06-01 18:45:07 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2023-06-02 02:15:47 +0000

    editors/emacs-devel: Update to 2023-06-01 snapshot, 2d6ba3e
    
    Building --with-cario results in an emacs binary that directly links to
    freetype2 and fontconfig shared libraries, so correctly set
    CAIRO_LIB_DEPENDS.
    
    Changes:        https://github.com/emacs-mirror/emacs/compare/ebf5e4c...2d6ba3e
    Sponsored by:   The FreeBSD Foundation
---
 editors/emacs-devel/Makefile  | 6 ++++--
 editors/emacs-devel/distinfo  | 6 +++---
 editors/emacs-devel/pkg-plist | 2 ++
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile
index c8fe98eb194a..1db935db88a4 100644
--- a/editors/emacs-devel/Makefile
+++ b/editors/emacs-devel/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	emacs
-DISTVERSION=	30.0.50.20230515
+DISTVERSION=	30.0.50.20230601
 PORTEPOCH=	3
 CATEGORIES=	editors
 PKGNAMESUFFIX=	-devel
@@ -24,7 +24,7 @@ USES=		autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig
 CPE_VENDOR=	gnu
 USE_GITHUB=	yes
 GH_ACCOUNT=	emacs-mirror
-GH_TAGNAME=	ebf5e4c
+GH_TAGNAME=	2d6ba3e
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--disable-build-details \
@@ -134,6 +134,8 @@ ALSA_CONFIGURE_ON=		--with-sound=alsa
 CAIRO_IMPLIES=			PNG
 CAIRO_PREVENTS=			XFT
 CAIRO_USE=			GNOME=cairo
+CAIRO_LIB_DEPENDS=		libfreetype.so:print/freetype2 \
+				libfontconfig.so:x11-fonts/fontconfig
 CAIRO_CONFIGURE_WITH=		cairo
 DBUS_LIB_DEPENDS=		libdbus-1.so:devel/dbus
 DBUS_CONFIGURE_WITH=		dbus
diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo
index d177484af18b..56d8d35d66ee 100644
--- a/editors/emacs-devel/distinfo
+++ b/editors/emacs-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1684125594
-SHA256 (emacs-mirror-emacs-30.0.50.20230515-ebf5e4c_GH0.tar.gz) = c319e79724d8c6d1ae4ea1728f7bc5e646d8ef5a55fdb37f2865a561e9f4e250
-SIZE (emacs-mirror-emacs-30.0.50.20230515-ebf5e4c_GH0.tar.gz) = 48238109
+TIMESTAMP = 1685628392
+SHA256 (emacs-mirror-emacs-30.0.50.20230601-2d6ba3e_GH0.tar.gz) = 5f416c9a0c74c7ba1c9f1e4e23de5de6a0f60afd674d23cba5edc4059fb6af07
+SIZE (emacs-mirror-emacs-30.0.50.20230601-2d6ba3e_GH0.tar.gz) = 48292947
diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist
index 2f943907cd34..2b5634c17caf 100644
--- a/editors/emacs-devel/pkg-plist
+++ b/editors/emacs-devel/pkg-plist
@@ -909,10 +909,12 @@ share/applications/emacsclient-mail.desktop
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-operandi-deuteranopia-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-operandi-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-operandi-tinted-theme.el
+%%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-operandi-tritanopia-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-themes.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-vivendi-deuteranopia-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-vivendi-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-vivendi-tinted-theme.el
+%%DATADIR%%/%%EMACS_VER%%/etc/themes/modus-vivendi-tritanopia-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/tango-dark-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/tango-theme.el
 %%DATADIR%%/%%EMACS_VER%%/etc/themes/tsdh-dark-theme.el