From nobody Sat Jan 01 03:27:37 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 3A87E191D7FA; Sat, 1 Jan 2022 03:27:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JQnWY6f11z3rbv; Sat, 1 Jan 2022 03:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BC74D17652; Sat, 1 Jan 2022 03:27:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2013RbLJ081848; Sat, 1 Jan 2022 03:27:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2013RbFw081847; Sat, 1 Jan 2022 03:27:37 GMT (envelope-from git) Date: Sat, 1 Jan 2022 03:27:37 GMT Message-Id: <202201010327.2013RbFw081847@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: 08fc743190ff - main - editors/emacs-devel: Update to 2022-01-01 commit, 4d1968b List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 08fc743190ff920939d8f8ab1f44bf68343d07ef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1641007657; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zyiNnUNPmr8lmUPyCKZiv+HaRwgi2g94bwHstNJ4wmg=; b=PszNqQ24kUHSL93eHA2rnLN0NpfzZhdYKximuA1Ce2nO+B28bBPd51cdK7EsamW64ok2O+ UCNGwBxKf69Zzs6hXKAhHVwitZawlPi1NdjnBWp8cYQ9m5JIG7CYdDR+4twuZQRvf3zfh0 SnG1/UQLwsRb7eth0OtIokCCnFNEoGS4f+Yxz6GE83A4x/q6VCcIv3av1LsyA8ydjMqI0/ JNfGDxPWHC6NSzuQtpquMBOUxe5Lkq2gEYWUO883B8xOoqN653siCUGZnGopJJ4nfs2dlA 1ZSFdMhqVRgGzHsoCmTfod9aHrComCxBeW95422gbPZmBLvfmRFJyFLRmPpvhA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1641007657; a=rsa-sha256; cv=none; b=cltNu47fGCiB4c4M8evud730x3XsMJKzw/ScbG781C8hWeUk1tyYYgDOz6bjEhLbuh/H0k z89dfoI2qoXlaR9XovWP3f2gLZ+WmIF3swJBTwlzZkgyuoTr7Vt08JUg1FsaSi4QZKagK6 sp29+ZiBcpMlQpRf/It5sFj7QKuMpzpjzwXGFB0dgB2pqMZdebvBLQYbKOLQ4Q5bshwsYj WNw8wn880PH7F+IP3z2niG3w1TOO40CQT0Zx+rRXXurDIUSHRHW5oGXxfnrbnysfnCA1Gq lCuO14uOnbMOk7MKZsgatO35soDs3sfAneQnxtYWv5CUX0sT0t6v3rN6UXYBoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=08fc743190ff920939d8f8ab1f44bf68343d07ef commit 08fc743190ff920939d8f8ab1f44bf68343d07ef Author: Joseph Mingrone AuthorDate: 2021-12-21 19:42:08 +0000 Commit: Joseph Mingrone CommitDate: 2022-01-01 03:26:48 +0000 editors/emacs-devel: Update to 2022-01-01 commit, 4d1968b This commit introduces a new OPTION, pgtk, which builds a pure GTK implementation of Emacs. Sponsored by: The FreeBSD Foundation --- editors/emacs-devel/Makefile | 23 ++++++++++++++--------- editors/emacs-devel/distinfo | 6 +++--- editors/emacs-devel/pkg-plist | 19 +++++++++++++++++-- 3 files changed, 34 insertions(+), 14 deletions(-) diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index e14f540a2b98..3b2750799092 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -1,7 +1,7 @@ # Created by: Kenneth Vestergaard Schmidt PORTNAME= emacs -DISTVERSION= 29.0.50.20211215 +DISTVERSION= 29.0.50.20220101 PORTEPOCH= 2 CATEGORIES= editors PKGNAMESUFFIX= -devel @@ -25,7 +25,7 @@ USES= autoreconf:build cpe gmake localbase:ldflags ncurses pkgconfig CPE_VENDOR= gnu USE_GITHUB= yes GH_ACCOUNT= emacs-mirror -GH_TAGNAME= 5a057f6 +GH_TAGNAME= 4d1968b .if ${FLAVOR:U} != nox USES+= desktop-file-utils gnome xorg @@ -83,11 +83,12 @@ PLIST_SUB= EMACS_VER=${DISTVERSION:R} \ OPTIONS_DEFINE= ACL DBUS GCONF GNUTLS GSETTINGS HARFBUZZ JSON \ LCMS2 M17N MAILUTILS MODULES NATIVECOMP OTF \ - SCROLLBARS SOURCES SQLITE3 THREADS XFT XIM XML XWIDGETS + PGTK SCROLLBARS SOURCES SQLITE3 THREADS XFT XIM \ + XML XWIDGETS OPTIONS_DEFAULT= ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \ HARFBUZZ JPEG JSON KQUEUE LCMS2 M17N MAILUTILS \ - MODULES OSS OTF PNG SCROLLBARS SOURCES SQLITE3 SVG \ - THREADS TIFF WEBP XFT XIM XML XPM + MODULES OSS OTF PNG SCROLLBARS SOURCES SQLITE3 \ + SVG THREADS TIFF WEBP XFT XIM XML XPM OPTIONS_GROUP= GRAPHICS OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF WEBP XPM OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT @@ -97,8 +98,8 @@ OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 XAW XAW3D .if ${FLAVOR:U} == nox OPTIONS_EXCLUDE= ALSA CAIRO DBUS GCONF GFILE GIF GSETTINGS GTK2 \ GTK3 HARFBUZZ JPEG LCMS2 M17N MAGICK OSS OTF \ - PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT XIM \ - XPM XWIDGETS + PNG PGTK SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT \ + XIM XPM XWIDGETS .endif OPTIONS_SUB= YES @@ -116,6 +117,7 @@ MAILUTILS_DESC= Mail framework via GNU Mailutils MODULES_DESC= Dynamic modules support NATIVECOMP_DESC= Emacs Lisp native compiler support OTF_DESC= Opentype fonts [implies XFT] +PGTK_DESC= Pure GTK GUI [implies CAIRO, GTK3] SCROLLBARS_DESC= Toolkit scroll-bars SOURCES_DESC= Install sources SVG_DESC= Scalable vector graphics support [implies PNG] @@ -177,6 +179,8 @@ OSS_CONFIGURE_ON= --with-sound=oss OTF_IMPLIES= XFT OTF_LIB_DEPENDS= libotf.so:print/libotf OTF_CONFIGURE_WITH= libotf +PGTK_IMPLIES= CAIRO GTK3 +PGTK_CONFIGURE_WITH= pgtk PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_WITH= png SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars @@ -211,6 +215,7 @@ XWIDGETS_LIB_DEPENDS= libsoup-2.4.so:devel/libsoup \ libwebkit2gtk-4.0.so:www/webkit2-gtk3 XWIDGETS_USE= XORG=xcomposite XWIDGETS_CONFIGURE_WITH= xwidgets + .include .if ${PORT_OPTIONS:MNATIVECOMP} && !defined(_GCC_PORT_CHOSEN) @@ -221,8 +226,8 @@ _GCC_PORT!= ${BSDMAKE} -V_GCC_PORT USE_GCC=11+ _GCC_PORT_CHOSEN=yes USE_GCC= yes .endif -.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MXAW} && \ - !${PORT_OPTIONS:MXAW3D} +.if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && \ + !${PORT_OPTIONS:MXAW} && !${PORT_OPTIONS:MXAW3D} CONFIGURE_ARGS+= --with-x-toolkit=no .endif diff --git a/editors/emacs-devel/distinfo b/editors/emacs-devel/distinfo index 7a0cf05577c3..20a75ef91245 100644 --- a/editors/emacs-devel/distinfo +++ b/editors/emacs-devel/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1639580430 -SHA256 (emacs-mirror-emacs-29.0.50.20211215-5a057f6_GH0.tar.gz) = dd8303bad13c46396bb78079f46dd859143bf762994f76e3c3855a2d61e9aa20 -SIZE (emacs-mirror-emacs-29.0.50.20211215-5a057f6_GH0.tar.gz) = 44572491 +TIMESTAMP = 1641004289 +SHA256 (emacs-mirror-emacs-29.0.50.20220101-4d1968b_GH0.tar.gz) = b4a8cfaee14298cfeb4fe1abc04724cbb9d3a20d0cdf2907d7b0802b5e1ae4a0 +SIZE (emacs-mirror-emacs-29.0.50.20220101-4d1968b_GH0.tar.gz) = 44706883 diff --git a/editors/emacs-devel/pkg-plist b/editors/emacs-devel/pkg-plist index ede743cf1f26..ec8b8260a4d2 100644 --- a/editors/emacs-devel/pkg-plist +++ b/editors/emacs-devel/pkg-plist @@ -779,6 +779,8 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/etc/nxml/README %%DATADIR%%/%%EMACS_VER%%/etc/nxml/test-invalid.xml %%DATADIR%%/%%EMACS_VER%%/etc/nxml/test-valid.xml +%%PGTK%%%%DATADIR%%/%%EMACS_VER%%/etc/org.gnu.emacs.defaults.gschema.valid +%%DATADIR%%/%%EMACS_VER%%/etc/org.gnu.emacs.defaults.gschema.xml %%DATADIR%%/%%EMACS_VER%%/etc/org/OrgOdtContentTemplate.xml %%DATADIR%%/%%EMACS_VER%%/etc/org/OrgOdtStyles.xml %%DATADIR%%/%%EMACS_VER%%/etc/org/README @@ -1585,8 +1587,6 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/edebug.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-base.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-base.elc -%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-compat.el.gz -%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-compat.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-core.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-core.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/eieio-custom.el.gz @@ -1646,6 +1646,8 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map-ynp.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/map.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/multisession.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/multisession.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/nadvice.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/nadvice.elc %%DATADIR%%/%%EMACS_VER%%/lisp/emacs-lisp/package-x.el.gz @@ -2023,6 +2025,8 @@ share/applications/emacsclient-mail.desktop %%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-rmail.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/gnus/gnus-rmail.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 @@ -3665,6 +3669,8 @@ share/applications/emacsclient-mail.desktop %%DATADIR%%/%%EMACS_VER%%/lisp/term/ns-win.elc %%DATADIR%%/%%EMACS_VER%%/lisp/term/pc-win.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/term/pc-win.elc +%%DATADIR%%/%%EMACS_VER%%/lisp/term/pgtk-win.el.gz +%%DATADIR%%/%%EMACS_VER%%/lisp/term/pgtk-win.elc %%DATADIR%%/%%EMACS_VER%%/lisp/term/rxvt.el.gz %%DATADIR%%/%%EMACS_VER%%/lisp/term/rxvt.elc %%DATADIR%%/%%EMACS_VER%%/lisp/term/screen.el.gz @@ -4149,6 +4155,14 @@ share/applications/emacsclient-mail.desktop %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/nsxwidget.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pdumper.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pdumper.h +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkfns.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkgui.h +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkim.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkmenu.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkselect.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkselect.h +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkterm.c +%%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/pgtkterm.h %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/print.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/process.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/process.h @@ -4249,6 +4263,7 @@ share/applications/emacsclient-mail.desktop %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.c %%SOURCES%%%%DATADIR%%/%%EMACS_VER%%/src/xwidget.h include/emacs-module.h +%%PGTK%%share/glib-2.0/schemas/org.gnu.emacs.defaults.gschema.xml share/icons/hicolor/128x128/apps/emacs.png share/icons/hicolor/16x16/apps/emacs.png share/icons/hicolor/24x24/apps/emacs.png