From nobody Sun Aug 20 00:55:06 2023 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 4RSxwV6psTz4qSTq; Sun, 20 Aug 2023 00:55:06 +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 4RSxwV6WW3z3fkm; Sun, 20 Aug 2023 00:55:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692492906; 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=l0q6cI5qxxiuIVGp1AiITcIVXdXu1KWrcqTa6Hind1I=; b=HApUvPFnbB9C6RL03roKqKDHaGIalGZvOhHprKwWeFo9BnTeqWfqtW3xtYWLIlttLSWpJt qV38sGGfrMtM8rAXOfQWvaGMC55d6fARp1OGHxD0rUcDZnG/xMobsyr/IeAuziB6yVgs5Q Zc0WWOzRGtx2G+pzO5AF+vXeyKudMduOsY/aF5TX/slZ+ci7uPeIAjo/y9SdpCdA9We3H4 KOZP5FyLHBK8AXv0r+wm87Hyz5Fb4Bouk6zlPhDT05vMCt1hYKra63YWZTCuo2A6xU29J2 a3fUjEF5yWLvgW+iip1vgq/PstKDta7yfsp+yWHazRDLjXbEpxSdJipR9zGTpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692492906; 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=l0q6cI5qxxiuIVGp1AiITcIVXdXu1KWrcqTa6Hind1I=; b=kMikVw9yUXmOcGd5pWU2mxzNHxMgMfJY9Hu/U8r5DHXjlMmLtS7qalVT6oiek6qj4wyFq6 VFKnZ0tXAecBmN7s7GoZt4OWOTdsjzSFggSobmCto5vzY92pW32g+tsZA+xq+DGSQHOOxj 35XdTp02gLApyf9w+gpRnKxVTgY4HCxEMzJx+w0a20UsCzgCHsO0Sj+3wUVidFW7xgdsn/ lCHYKlilJ1UwwUcqQdg//fk2gOGJxUHfJ9IaoguWr+XH0Syamr36HBHwxwjDO4lEw7LONk r++atGZYho4ZzoiWkEdaiIDo80/wKu29F8jmpCu0/xN2cpoTGSGti3XyzwChtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692492906; a=rsa-sha256; cv=none; b=PHzWxGkS/yvNwthrjKcKNgxYUo2q6Er4V7TYhBEImmEC7GS1IHr07656MXAnnU7p3252sr cIKF9wDfa+9Fen4YVEtxNTTPvsyrfRrc3bhRHjgxv8RSvb3PTcutsebG+ve7XTej6M7vob YFnYCK/vRE/7nh1rzFt+xTqc5pniK/S5hDXzLNMRLVp/bUvBSSIz0hJt/JjEa6ZP85Y1bX AYH9WUNK9Ko849nwLmIN4Yu07IoGVX1bJ/CXODHlikwYtafZDkK4vJ6rewwVzavmtn2vC3 W6ir6K0Ibf2NJgO4Ub+2MXdBP+EctWW2YbbGu+OUuxTYF4BZoz0hykThgRTehQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RSxwV5ZLtz4BD; Sun, 20 Aug 2023 00:55:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37K0t6R8081979; Sun, 20 Aug 2023 00:55:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37K0t6hn081976; Sun, 20 Aug 2023 00:55:06 GMT (envelope-from git) Date: Sun, 20 Aug 2023 00:55:06 GMT Message-Id: <202308200055.37K0t6hn081976@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yasuhiro Kimura Subject: git: ba4eb3a50e90 - main - editors/emacs: Update to 29.1 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: yasu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ba4eb3a50e909d902a6e031e4c3477ed369799d2 Auto-Submitted: auto-generated The branch main has been updated by yasu: URL: https://cgit.FreeBSD.org/ports/commit/?id=ba4eb3a50e909d902a6e031e4c3477ed369799d2 commit ba4eb3a50e909d902a6e031e4c3477ed369799d2 Author: Yasuhiro Kimura AuthorDate: 2023-07-23 17:25:39 +0000 Commit: Yasuhiro Kimura CommitDate: 2023-08-20 00:53:11 +0000 editors/emacs: Update to 29.1 * Update Canna patch to the one for Emacs 29. * Add new options PGTK, SQLITE3, TREESITTER and WEBP. SQLITE3 and TREESITTER are ON by default. PGTK and WEBP options are excluded from nox flavor. * CARGO option doesn't imply XFT but prevents it. It is caused as a result of adding pure GTK support (PGTK option). * OTK options doesn't imply XTF any more. It is also caused as a result of adding pure GTK support. * Update NATIVECOMP option so it specifies ahead-of-time compilation via the configure argument. * Remove "experimental" from NATIVECOMP_DESC. * Add print/freetype2 and x11-fonts/fontconfig to CAIRO_LIB_DEPENDS and GTK3_LIB_DEPENDS. Necessary to link emacs binary with shared libraries. * When PGTK option is ON and SCROLLBARS is OFF, configure fails as following ---------------------------------------------------------------------- checking for gnutls >= 2.12.2... yes checking for jansson >= 2.7... yes checking for tree-sitter >= 0.20.2... yes checking for libkqueue... no checking for library containing kqueue... none required configure: error: Non-toolkit scroll bars are not implemented for your system ---------------------------------------------------------------------- So add SCROLLBARS to PGTK_IMPLIES to avoid such options setting. * When MODULES option is OFF and TREESITTER is ON, link error happens as following. ---------------------------------------------------------------------- cc -o temacs.tmp \ -Demacs -I. -I. -I../lib -I../lib -I/usr/local/include -I/usr/local/include/librsvg-2.0 -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include -I/usr/local/include/gdk-pixbuf-2.0 -pthread -I/usr/local/include/cairo -I/usr/local/include/pixman-1 -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -D_THREAD_SAFE -I/usr/local/include/libpng16 -I/usr/local/include/libxml2 -I/usr/local/include/dbus-1.0 -I/usr/local/lib/dbus-1.0/include -I/usr/local/include -D_THREAD_SAFE -I/usr/local/include -D_THREAD_SAFE -I/usr/local/include -D_THREAD_SAFE -I/usr/local/include -D_THREAD_SAFE -I/usr/local/include -I/usr/local/include/webp -I/usr/local/include -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -pthread -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -I/usr/local/include -I/usr/local/include -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -I/usr/local/include/harfbuzz -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -MMD -MF deps/.d -MP -I/usr/local/include -I/usr/local/include -I/usr/local/include -I/usr/local/include/p11-kit-1 -I/usr/local/include/cairo -I/usr/local/include -I/usr/local/include/glib-2.0 -I/usr/local/lib/glib-2.0/include -I/usr/local/include/pixman-1 -I/usr/local/include/freetype2 -I/usr/local/include/libpng16 -D_THREAD_SAFE -Wno-switch -Wno-pointer-sign -Wno-string-plus-int -Wno-unknown-attributes -Wno-unknown-pragmas -Wno-initializer-overrides -Wno-tautological-compare -Wno-tautological-constant-out-of-range-compare -O2 -pipe -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing -O2 -pipe -fstack-protector-strong -isystem /usr/local/include -fno-strict-aliasing -isystem /usr/local/include -fstack-prote ctor-strong -L/usr/local/lib -L/usr/local/l! ib \ dispnew.o frame.o scroll.o xdisp.o menu.o xmenu.o window.o charset.o coding.o category.o ccl.o character.o chartab.o bidi.o cm.o term.o terminal.o xfaces.o xterm.o xfns.o xselect.o xrdb.o xsmfns.o xsettings.o dbusbind.o emacs.o keyboard.o macros.o keymap.o sysdep.o bignum.o buffer.o filelock.o insdel.o marker.o minibuf.o fileio.o dired.o cmds.o casetab.o casefiddle.o indent.o search.o regex-emacs.o undo.o alloc.o pdumper.o data.o doc.o editfns.o callint.o eval.o floatfns.o fns.o sort.o font.o print.o lread.o syntax.o bytecode.o comp.o process.o gnutls.o callproc.o region-cache.o sound.o timefns.o atimer.o doprnt.o intervals.o textprop.o composite.o xml.o lcms.o kqueue.o profiler.o decompress.o thread.o systhread.o sqlite.o treesit.o itree.o xfont.o ftfont.o ftcrfont.o hbfont.o fontset.o fringe.o image.o xgselect.o json.o terminfo.o lastfile.o ../lib/libgnu.a ../oldXMenu/libXMenu11.a -ltiff -ljpeg -L/usr/local/lib -lpng16 -lgif -L/usr/local/lib - lwebpdemux -lwebpdecoder -lSM -lICE -lX11 -lXrender -L/usr/local/lib -lrsvg-2 -lm -lgio-2.0 -lgdk_pixbuf-2.0 -lgobject-2.0 -lglib-2.0 -lintl -lcairo -lrt -L/usr/local/lib -ldbus-1 -lexecinfo -L/usr/local/lib -lXrandr -L/usr/local/lib -lXinerama -L/usr/local/lib -lXfixes -lXext -lXext -L/usr/local/lib -lxml2 -lutil -L/usr/local/lib -lcairo -lncurses -L/usr/local/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0 -lintl -L/usr/local/lib -lgobject-2.0 -lglib-2.0 -lintl -L/usr/local/lib -lfreetype -L/usr/local/lib -lfontconfig -lfreetype -L/usr/local/lib -lharfbuzz -L/usr/local/lib -lgnutls -lpthread -L/usr/local/lib -llcms2 -llcms2_fast_float -llcms2_threaded -lm -lz -L/usr/local/lib -ljansson -lgmp -L/usr/local/lib -lXi -L/usr/local/lib -ltree-sitter -lsqlite3 -lXcomposite -lXext ld: error: undefined symbol: dynlib_error >>> referenced by treesit.c >>> treesit.o:(treesit_load_language) >>> referenced by treesit.c >>> treesit.o:(treesit_load_language) >>> referenced by treesit.c >>> treesit.o:(treesit_load_language) >>> referenced 1 more times ld: error: undefined symbol: dynlib_sym >>> referenced by treesit.c >>> treesit.o:(treesit_load_language) ld: error: undefined symbol: dynlib_open >>> referenced by treesit.c >>> treesit.o:(treesit_load_language) cc: error: linker command failed with exit code 1 (use -v to see invocation) ---------------------------------------------------------------------- So add MODULES to TREESITTER_IMPLIES to avoid such options setting. * Bump PORTREVISION of ports that use "USES=emacs". ChangeLog: https://git.savannah.gnu.org/cgit/emacs.git/tree/etc/NEWS?h=emacs-29.1 Reviewed by: ashish, jrm Differential Revision: https://reviews.freebsd.org/D41444 --- Mk/Uses/emacs.mk | 2 +- audio/emms/Makefile | 2 +- cad/dinotrace/Makefile | 2 +- cad/verilog-mode.el/Makefile | 2 +- databases/bbdb/Makefile | 2 +- databases/closql-devel/Makefile | 1 + databases/closql/Makefile | 2 +- databases/emacs-sqlite3-api/Makefile | 1 + databases/emacsql-devel/Makefile | 1 + databases/emacsql/Makefile | 2 +- databases/gnats4/Makefile | 2 +- databases/pg.el/Makefile | 2 +- deskutils/howm/Makefile | 2 +- devel/cask/Makefile | 2 +- devel/clojure-cider/Makefile | 2 +- devel/dash.el/Makefile | 2 +- devel/distel/Makefile | 2 +- devel/epl.el/Makefile | 2 +- devel/forge-devel/Makefile | 1 + devel/forge/Makefile | 1 + devel/gettext-po-mode/Makefile | 2 +- devel/ghub-devel/Makefile | 1 + devel/ghub/Makefile | 1 + devel/git-modes/Makefile | 1 + devel/libegit2/Makefile | 2 +- devel/lua-mode/Makefile | 2 +- devel/magit-devel/Makefile | 1 + devel/magit/Makefile | 2 +- devel/p5-Sepia/Makefile | 2 +- devel/pkg-info.el/Makefile | 2 +- devel/psvn/Makefile | 2 +- devel/tablist/Makefile | 2 +- devel/transient-devel/Makefile | 1 + devel/transient/Makefile | 1 + devel/treepy.el/Makefile | 2 +- devel/xcscope.el/Makefile | 2 +- editors/apel/Makefile | 2 +- editors/emacs/Makefile | 104 ++++++--- editors/emacs/distinfo | 20 +- editors/emacs/pkg-plist | 426 +++++++++++++++++++++++----------- editors/flim/Makefile | 1 + editors/paredit-mode.el/Makefile | 2 +- editors/psgml/Makefile | 2 +- editors/semi/Makefile | 1 + editors/slime/Makefile | 2 +- editors/sly-asdf/Makefile | 1 + editors/sly-named-readtables/Makefile | 2 +- editors/sly-quicklisp/Makefile | 1 + editors/sly/Makefile | 1 + editors/tamago/Makefile | 2 +- editors/web-mode/Makefile | 2 +- editors/with-editor-devel/Makefile | 1 + editors/with-editor/Makefile | 1 + irc/riece/Makefile | 2 +- japanese/boiled-mozc/Makefile | 2 +- japanese/cp5022x-el/Makefile | 2 +- japanese/ddskk/Makefile | 2 +- japanese/lookup/Makefile | 2 +- japanese/migemo.el/Makefile | 2 +- japanese/mozc-server/Makefile | 2 +- japanese/navi2ch/Makefile | 2 +- japanese/yc.el/Makefile | 2 +- lang/alchemist.el/Makefile | 2 +- lang/clojure-mode.el/Makefile | 2 +- lang/csharp-mode.el/Makefile | 2 +- lang/elixir-mode.el/Makefile | 2 +- lang/haskell-mode.el/Makefile | 2 +- lang/php-mode.el/Makefile | 1 + lang/tuareg-mode.el/Makefile | 2 +- mail/c-sig/Makefile | 2 +- mail/mailest/Makefile | 2 +- mail/mew-devel/Makefile | 1 + mail/mew/Makefile | 2 +- mail/mu4e-maildirs/Makefile | 2 +- mail/mu4e/Makefile | 2 +- mail/notmuch-emacs/Makefile | 2 +- mail/wanderlust/Makefile | 1 + mail/x-face-e21/Makefile | 2 +- mail/xcite/Makefile | 2 +- math/coq/Makefile | 2 +- math/ess/Makefile | 2 +- misc/compat.el/Makefile | 1 + misc/elscreen/Makefile | 2 +- print/a2ps/Makefile | 1 + print/auctex/Makefile | 2 +- print/hyperlatex/Makefile | 2 +- print/pdf-tools/Makefile | 1 + print/yatex/Makefile | 2 +- security/starttls/Makefile | 2 +- sysutils/lr/Makefile | 1 + sysutils/puppet-mode.el/Makefile | 2 +- textproc/adoc-mode.el/Makefile | 1 + textproc/dictem/Makefile | 2 +- textproc/dictionary/Makefile | 2 +- textproc/doc-mode.el/Makefile | 2 +- textproc/markdown-mode.el/Makefile | 2 +- textproc/muse/Makefile | 2 +- textproc/uim-el/Makefile | 2 +- textproc/xml-lite.el/Makefile | 2 +- textproc/yaml-mode.el/Makefile | 2 +- textproc/yaml.el/Makefile | 2 +- www/emacs-w3m/Makefile | 1 + 102 files changed, 459 insertions(+), 262 deletions(-) diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk index e0df6e00d936..f1f5ed023a93 100644 --- a/Mk/Uses/emacs.mk +++ b/Mk/Uses/emacs.mk @@ -108,7 +108,7 @@ EMACS_FLAVOR= full EMACS_VER= 30.0.50 EMACS_PORTDIR= editors/emacs-devel . else -EMACS_VER= 28.2 +EMACS_VER= 29.1 EMACS_PORTDIR= editors/emacs . endif diff --git a/audio/emms/Makefile b/audio/emms/Makefile index bc8c89f0f574..5ed886df9efe 100644 --- a/audio/emms/Makefile +++ b/audio/emms/Makefile @@ -1,6 +1,6 @@ PORTNAME= emms DISTVERSION= 5.0 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= audio elisp MASTER_SITES= GNU PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile index 3e668c785b1a..686a6c4e4ab3 100644 --- a/cad/dinotrace/Makefile +++ b/cad/dinotrace/Makefile @@ -1,6 +1,6 @@ PORTNAME= dinotrace PORTVERSION= 9.4f -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= cad MASTER_SITES= http://www.veripool.org/ftp/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/cad/verilog-mode.el/Makefile b/cad/verilog-mode.el/Makefile index 0ce7c567f540..f92449dae879 100644 --- a/cad/verilog-mode.el/Makefile +++ b/cad/verilog-mode.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= verilog-mode.el PORTVERSION= 801 -PORTREVISION= 17 +PORTREVISION= 18 CATEGORIES= cad elisp MASTER_SITES= http://www.veripool.org/ftp/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/databases/bbdb/Makefile b/databases/bbdb/Makefile index fd5752216058..ac574c4f40ac 100644 --- a/databases/bbdb/Makefile +++ b/databases/bbdb/Makefile @@ -1,7 +1,7 @@ PORTNAME= bbdb DISTVERSIONPREFIX= v DISTVERSION= 3.2.2a -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/databases/closql-devel/Makefile b/databases/closql-devel/Makefile index de1eeb19f110..8f221d728ed8 100644 --- a/databases/closql-devel/Makefile +++ b/databases/closql-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= closql DISTVERSIONPREFIX= v DISTVERSION= 1.2.1-26 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g85ac7b8 CATEGORIES= databases elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/databases/closql/Makefile b/databases/closql/Makefile index 132434bffe77..032daac97922 100644 --- a/databases/closql/Makefile +++ b/databases/closql/Makefile @@ -1,7 +1,7 @@ PORTNAME= closql DISTVERSIONPREFIX= v DISTVERSION= 1.2.1 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/databases/emacs-sqlite3-api/Makefile b/databases/emacs-sqlite3-api/Makefile index 04347f68d103..95e4aa53faaa 100644 --- a/databases/emacs-sqlite3-api/Makefile +++ b/databases/emacs-sqlite3-api/Makefile @@ -1,6 +1,7 @@ PORTNAME= emacs-sqlite3-api DISTVERSIONPREFIX= v DISTVERSION= 0.17 +PORTREVISION= 1 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/databases/emacsql-devel/Makefile b/databases/emacsql-devel/Makefile index e27cf43eef3a..f6e485e2c85f 100644 --- a/databases/emacsql-devel/Makefile +++ b/databases/emacsql-devel/Makefile @@ -1,5 +1,6 @@ PORTNAME= emacsql DISTVERSION= 3.1.1-42 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g6401226 CATEGORIES= databases elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/databases/emacsql/Makefile b/databases/emacsql/Makefile index 1ea8caba745d..9b93491b3f15 100644 --- a/databases/emacsql/Makefile +++ b/databases/emacsql/Makefile @@ -1,6 +1,6 @@ PORTNAME= emacsql DISTVERSION= 3.1.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/databases/gnats4/Makefile b/databases/gnats4/Makefile index 0e7a5f28d14a..34874731cc04 100644 --- a/databases/gnats4/Makefile +++ b/databases/gnats4/Makefile @@ -1,6 +1,6 @@ PORTNAME= gnats PORTVERSION= 4.1.0 -PORTREVISION= 18 +PORTREVISION= 19 CATEGORIES= databases devel MASTER_SITES= GNU PKGNAMESUFFIX= 4 diff --git a/databases/pg.el/Makefile b/databases/pg.el/Makefile index dff7e7136774..a0dfbffa43fb 100644 --- a/databases/pg.el/Makefile +++ b/databases/pg.el/Makefile @@ -1,7 +1,7 @@ PORTNAME= pg.el DISTVERSIONPREFIX= v DISTVERSION= 0.20 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= databases elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/deskutils/howm/Makefile b/deskutils/howm/Makefile index dacef8acbf29..cae3617cfd4e 100644 --- a/deskutils/howm/Makefile +++ b/deskutils/howm/Makefile @@ -1,6 +1,6 @@ PORTNAME= howm PORTVERSION= 1.4.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= deskutils MASTER_SITES= http://howm.sourceforge.jp/a/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/cask/Makefile b/devel/cask/Makefile index 9c64ba738642..0b9511f4864e 100644 --- a/devel/cask/Makefile +++ b/devel/cask/Makefile @@ -1,7 +1,7 @@ PORTNAME= cask PORTVERSION= 0.8.3 DISTVERSIONPREFIX= v -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/clojure-cider/Makefile b/devel/clojure-cider/Makefile index 11a169106ff8..1719edc550d0 100644 --- a/devel/clojure-cider/Makefile +++ b/devel/clojure-cider/Makefile @@ -1,6 +1,6 @@ PORTNAME= clojure-cider PORTVERSION= 1.7.0 -PORTREVISION= 5 +PORTREVISION= 6 DISTVERSIONPREFIX= v CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/dash.el/Makefile b/devel/dash.el/Makefile index 3c67808e6765..8e01bdf71faa 100644 --- a/devel/dash.el/Makefile +++ b/devel/dash.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= dash.el DISTVERSION= 2.19.1 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/distel/Makefile b/devel/distel/Makefile index 203bfec1a8b3..ad4c51c48dd4 100644 --- a/devel/distel/Makefile +++ b/devel/distel/Makefile @@ -1,6 +1,6 @@ PORTNAME= distel PORTVERSION= 4.1.1 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/epl.el/Makefile b/devel/epl.el/Makefile index c4a35c18a2cd..0243ab85c77a 100644 --- a/devel/epl.el/Makefile +++ b/devel/epl.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= epl.el PORTVERSION= 0.8 -PORTREVISION= 13 +PORTREVISION= 14 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/forge-devel/Makefile b/devel/forge-devel/Makefile index c1124d525fc3..7027af706f70 100644 --- a/devel/forge-devel/Makefile +++ b/devel/forge-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= forge DISTVERSIONPREFIX= v DISTVERSION= 0.3.2-120 +PORTREVISION= 1 DISTVERSIONSUFFIX= -gecbcce9 CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/devel/forge/Makefile b/devel/forge/Makefile index e1840a459e5c..4ec79e3873e3 100644 --- a/devel/forge/Makefile +++ b/devel/forge/Makefile @@ -1,6 +1,7 @@ PORTNAME= forge DISTVERSIONPREFIX= v DISTVERSION= 0.3.2 +PORTREVISION= 1 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/gettext-po-mode/Makefile b/devel/gettext-po-mode/Makefile index b169d3740659..575478e4afad 100644 --- a/devel/gettext-po-mode/Makefile +++ b/devel/gettext-po-mode/Makefile @@ -1,5 +1,5 @@ PORTNAME= gettext-po-mode -PORTREVISION= 3 +PORTREVISION= 4 MAINTAINER= mandree@FreeBSD.org COMMENT= GNU gettext po-mode for emacs diff --git a/devel/ghub-devel/Makefile b/devel/ghub-devel/Makefile index 651da25360dc..7e121162c077 100644 --- a/devel/ghub-devel/Makefile +++ b/devel/ghub-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= ghub DISTVERSIONPREFIX= v DISTVERSION= 3.6.0 +PORTREVISION= 1 DISTVERSIONSUFFIX= CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/devel/ghub/Makefile b/devel/ghub/Makefile index 5aaddb4c9896..b2cd42459d03 100644 --- a/devel/ghub/Makefile +++ b/devel/ghub/Makefile @@ -1,6 +1,7 @@ PORTNAME= ghub DISTVERSIONPREFIX= v DISTVERSION= 3.6.0 +PORTREVISION= 1 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/git-modes/Makefile b/devel/git-modes/Makefile index aea07ed6d9fa..06e17e918b19 100644 --- a/devel/git-modes/Makefile +++ b/devel/git-modes/Makefile @@ -1,5 +1,6 @@ PORTNAME= git-modes DISTVERSION= 1.4.1 +PORTREVISION= 1 PORTEPOCH= 1 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/libegit2/Makefile b/devel/libegit2/Makefile index 853df6aa8bb3..ba897c82afa6 100644 --- a/devel/libegit2/Makefile +++ b/devel/libegit2/Makefile @@ -1,6 +1,6 @@ PORTNAME= libegit2 DISTVERSION= g20200515 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/lua-mode/Makefile b/devel/lua-mode/Makefile index 72af023b0ffb..fb2b44e8bcd3 100644 --- a/devel/lua-mode/Makefile +++ b/devel/lua-mode/Makefile @@ -1,6 +1,6 @@ PORTNAME= lua-mode PORTVERSION= 20210802 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONPREFIX=v CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/magit-devel/Makefile b/devel/magit-devel/Makefile index 146102de45fd..9a5dffd0c6a6 100644 --- a/devel/magit-devel/Makefile +++ b/devel/magit-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= magit DISTVERSIONPREFIX= v DISTVERSION= 3.3.0-704 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g6d300bfe CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/devel/magit/Makefile b/devel/magit/Makefile index 2966c9f7af45..4aa9fdbd006b 100644 --- a/devel/magit/Makefile +++ b/devel/magit/Makefile @@ -1,7 +1,7 @@ PORTNAME= magit DISTVERSIONPREFIX= v DISTVERSION= 3.3.0 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/p5-Sepia/Makefile b/devel/p5-Sepia/Makefile index 698d5a374dd4..c9e507465f5c 100644 --- a/devel/p5-Sepia/Makefile +++ b/devel/p5-Sepia/Makefile @@ -1,6 +1,6 @@ PORTNAME= Sepia PORTVERSION= 0.992 -PORTREVISION= 23 +PORTREVISION= 24 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/devel/pkg-info.el/Makefile b/devel/pkg-info.el/Makefile index 3625b667c53f..d8817f8550e0 100644 --- a/devel/pkg-info.el/Makefile +++ b/devel/pkg-info.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= pkg-info.el PORTVERSION= 0.6 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/psvn/Makefile b/devel/psvn/Makefile index 65cdace1c8ec..f37b943a3960 100644 --- a/devel/psvn/Makefile +++ b/devel/psvn/Makefile @@ -1,6 +1,6 @@ PORTNAME= psvn PORTVERSION= 20150720.214200 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= devel elisp MASTER_SITES= http://www.xsteve.at/prg/emacs/ PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/tablist/Makefile b/devel/tablist/Makefile index a9999d1e5403..2e2376d10618 100644 --- a/devel/tablist/Makefile +++ b/devel/tablist/Makefile @@ -1,7 +1,7 @@ PORTNAME= tablist DISTVERSIONPREFIX= v DISTVERSION= 1.0-13 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONSUFFIX= -gfaab7a0 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/transient-devel/Makefile b/devel/transient-devel/Makefile index 93725c169329..d155b6c36773 100644 --- a/devel/transient-devel/Makefile +++ b/devel/transient-devel/Makefile @@ -1,6 +1,7 @@ PORTNAME= transient DISTVERSIONPREFIX= v DISTVERSION= 0.4.1-2 +PORTREVISION= 1 DISTVERSIONSUFFIX= -g323d6b6 CATEGORIES= devel elisp PKGNAMESUFFIX= -devel${EMACS_PKGNAMESUFFIX} diff --git a/devel/transient/Makefile b/devel/transient/Makefile index ee3d139f1092..9d3c9d998bcd 100644 --- a/devel/transient/Makefile +++ b/devel/transient/Makefile @@ -1,6 +1,7 @@ PORTNAME= transient DISTVERSIONPREFIX= v DISTVERSION= 0.4.1 +PORTREVISION= 1 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/treepy.el/Makefile b/devel/treepy.el/Makefile index 8af6b562ec7a..620b0eb35c91 100644 --- a/devel/treepy.el/Makefile +++ b/devel/treepy.el/Makefile @@ -1,6 +1,6 @@ PORTNAME= treepy.el DISTVERSION= 0.1.2 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= devel elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/devel/xcscope.el/Makefile b/devel/xcscope.el/Makefile index 1a6975da1cce..c29e024423d0 100644 --- a/devel/xcscope.el/Makefile +++ b/devel/xcscope.el/Makefile @@ -1,7 +1,7 @@ PORTNAME= xcscope.el DISTVERSIONPREFIX= v DISTVERSION= 1.5 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel MAINTAINER= jhb@FreeBSD.org diff --git a/editors/apel/Makefile b/editors/apel/Makefile index 05fc7392f2ca..e1a40ddeba0c 100644 --- a/editors/apel/Makefile +++ b/editors/apel/Makefile @@ -1,6 +1,6 @@ PORTNAME= apel PORTVERSION= 10.8.${SNAPDATE} -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= editors elisp PKGNAMESUFFIX= ${EMACS_PKGNAMESUFFIX} diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 576685b934bb..242cf336a8db 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,20 +1,12 @@ PORTNAME= emacs -DISTVERSION= 28.2 -PORTREVISION= 7 +DISTVERSION= 29.1 PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= GNU -PATCH_SITES= https://github.com/emacs-mirror/emacs/commit/:github -PATCHFILES= d48bb4874bc6cd3e69c7a15fc3c91cc141025c51.patch:-p1:github \ - 01a4035c869b91c153af9a9132c87adb7669ea1c.patch:-p1:github \ - 9a3b08061feea14d6f37685ca1ab8801758bfd1c.patch:-p1:github \ - 1b4dc4691c1f87fc970fbe568b43869a15ad0d4c.patch:-p1:github \ - ed1a24b4b2e39498e4c4448365e1d5f0149e5fc6.patch:-p1:github - .if ${FLAVOR:U} == canna -PATCH_SITES+= https://www.gentei.org/~yuuji/software/emacs28canna/:canna -PATCHFILES+= emacs28.1-canna-20220406b.diff.gz:-p1:canna +PATCH_SITES+= https://www.gentei.org/~yuuji/software/emacs29canna/:canna +PATCHFILES+= emacs29.1-canna-20230730.diff.xz:-p1:canna .endif MAINTAINER= emacs@FreeBSD.org @@ -39,10 +31,6 @@ nox_CONFLICTS_INSTALL= emacs emacs-canna USES= cpe gmake localbase:ldflags makeinfo ncurses pkgconfig tar:xz CPE_VENDOR= gnu -.if ${FLAVOR:U} != nox -USES+= desktop-file-utils gnome xorg -USE_XORG= ice sm x11 xcb xext xfixes xinerama xmu xrandr xt -.endif GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-build-details \ @@ -58,6 +46,7 @@ CONFIGURE_ARGS+= --with-sound=no \ --with-x-toolkit=no \ --without-cairo \ --without-dbus \ + --without-gconf \ --without-gif \ --without-gsettings \ --without-imagemagick \ @@ -65,10 +54,12 @@ CONFIGURE_ARGS+= --with-sound=no \ --without-lcms2 \ --without-libotf \ --without-m17n-flt \ + --without-pgtk \ --without-png \ --without-rsvg \ --without-tiff \ --without-toolkit-scroll-bars \ + --without-webp \ --without-x \ --without-xim \ --without-xpm \ @@ -85,13 +76,13 @@ SUB_FILES= sources.el SUB_LIST= EMACS_VER=${DISTVERSION} INFO= auth autotype bovine calc ccmode cl dbus dired-x ebrowse ede \ - ediff edt efaq eieio eintr elisp emacs emacs-gnutls emacs-mime \ - epa erc ert eshell eudc eww flymake forms gnus htmlfontify \ - idlwave ido info mairix-el message mh-e modus-themes newsticker \ - nxml-mode octave-mode org pcl-cvs pgg rcirc reftex remember \ - sasl sc semantic ses sieve smtpmail speedbar srecode todo-mode \ - tramp transient url vhdl-mode vip viper widget wisent woman - + ediff edt efaq eglot eieio eintr elisp emacs emacs-gnutls \ + emacs-mime epa erc ert eshell eudc eww flymake forms gnus \ + htmlfontify idlwave ido info mairix-el message mh-e \ + modus-themes newsticker nxml-mode octave-mode org pcl-cvs pgg \ + rcirc reftex remember sasl sc semantic ses sieve smtpmail \ + speedbar srecode todo-mode tramp transient url use-package \ + vhdl-mode vip viper vtable widget wisent woman INFO_PATH= ${DATADIR_REL}/info .if ${FLAVOR:U} == canna PLIST_FILES+= ${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \ @@ -103,14 +94,15 @@ PLIST_SUB= EMACS_VER=${DISTVERSION} \ GNU_HOST=${CONFIGURE_TARGET} OPTIONS_DEFINE= ACL DBUS GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 \ - M17N MAILUTILS MODULES NATIVECOMP OTF \ - SCROLLBARS SOURCES THREADS XFT XIM XML XWIDGETS + M17N MAILUTILS MODULES NATIVECOMP OTF PGTK \ + SCROLLBARS SOURCES SQLITE3 THREADS TREESITTER \ + 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 SVG \ - THREADS TIFF XFT XIM XML XPM + HARFBUZZ JPEG JSON KQUEUE LCMS2 MAILUTILS \ + MODULES OSS SCROLLBARS SOURCES SQLITE3 SVG \ + THREADS TIFF TREESITTER WEBP XML OPTIONS_GROUP= GRAPHICS -OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM +OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF WEBP XPM OPTIONS_RADIO= FILENOTIFY SOUND X11TOOLKIT OPTIONS_RADIO_FILENOTIFY= GFILE KQUEUE OPTIONS_RADIO_SOUND= ALSA OSS @@ -118,13 +110,13 @@ OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D .if ${FLAVOR:U} == nox OPTIONS_EXCLUDE= ALSA CAIRO DBUS GFILE GIF GSETTINGS GTK2 GTK3 \ HARFBUZZ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF \ - PNG SCROLLBARS SVG TIFF XAW XAW3D XFT XIM XPM \ - XWIDGETS + PGTK PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT \ + XIM XPM XWIDGETS .endif OPTIONS_SUB= YES ACL_DESC= Access control list support -CAIRO_DESC= Cairo graphics library support [implies PNG, XFT] +CAIRO_DESC= Cairo graphics library support [implies PNG, prevents XFT] FILENOTIFY_DESC= File notification support GFILE_DESC= File notification via gfile GRAPHICS_DESC= Graphics support @@ -135,11 +127,13 @@ M17N_DESC= M17N support for text-shaping [implies XFT] MAGICK_DESC= ImageMagick image processing support (deprecated) MAILUTILS_DESC= Mail framework via GNU Mailutils MODULES_DESC= Dynamic modules support -NATIVECOMP_DESC= Emacs Lisp native compiler support (experimental) -OTF_DESC= Opentype fonts [implies XFT] +NATIVECOMP_DESC= Emacs Lisp native compiler support +OTF_DESC= Opentype fonts +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] +TREESITTER_DESC= tree-sitter support X11TOOLKIT_DESC= X11 toolkit XAW3D_DESC= Athena3D widgets XAW_DESC= Athena widgets @@ -149,7 +143,10 @@ XWIDGETS_DESC= Experimental GTK widgets [implies GTK3] ACL_CONFIGURE_ENABLE= acl ALSA_LIB_DEPENDS= libasound.so:audio/alsa-lib ALSA_CONFIGURE_ON= --with-sound=alsa -CAIRO_IMPLIES= PNG XFT +CAIRO_IMPLIES= PNG +CAIRO_PREVENTS= XFT +CAIRO_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 CAIRO_USE= GNOME=cairo CAIRO_CONFIGURE_WITH= cairo DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus @@ -166,6 +163,8 @@ GTK2_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 GTK2_USE= GNOME=cairo,gtk20 GTK2_CONFIGURE_ON= --with-x-toolkit=gtk2 +GTK3_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 GTK3_USE= GNOME=cairo,gtk30 GTK3_CONFIGURE_ON= --with-x-toolkit=gtk3 HARFBUZZ_LIB_DEPENDS= libharfbuzz.so:print/harfbuzz @@ -191,24 +190,33 @@ MODULES_CONFIGURE_WITH= modules MOTIF_USES= motif MOTIF_CONFIGURE_ON= --with-x-toolkit=motif NATIVECOMP_USE= GCC=yes -NATIVECOMP_CONFIGURE_WITH= native-compilation -NATIVECOMP_MAKE_ARGS= NATIVE_FULL_AOT=1 +NATIVECOMP_CONFIGURE_WITH= native-compilation=aot OSS_CONFIGURE_ON= --with-sound=oss -OTF_IMPLIES= XFT OTF_LIB_DEPENDS= libotf.so:print/libotf OTF_CONFIGURE_WITH= libotf +PGTK_IMPLIES= CAIRO GTK3 SCROLLBARS +PGTK_PREVENTS= M17N XFT XPM +PGTK_CATEGORIES= wayland +PGTK_CONFIGURE_WITH= pgtk PNG_LIB_DEPENDS= libpng.so:graphics/png PNG_CONFIGURE_WITH= png SCROLLBARS_CONFIGURE_WITH= toolkit-scroll-bars .if ${FLAVOR:U} == canna SOURCES_PLIST_FILES= ${DATADIR}/${DISTVERSION}/src/canna.c .endif +SQLITE3_USES= sqlite:3 +SQLITE3_CONFIGURE_WITH= sqlite3 SVG_IMPLIES= PNG SVG_USE= GNOME=cairo,librsvg2 SVG_CONFIGURE_WITH= rsvg THREADS_CONFIGURE_WITH= threads TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_WITH= tiff +TREESITTER_IMPLIES= MODULES +TREESITTER_LIB_DEPENDS= libtree-sitter.so:devel/tree-sitter +TREESITTER_CONFIGURE_WITH= tree-sitter +WEBP_LIB_DEPENDS= libwebp.so:graphics/webp +WEBP_CONFIGURE_WITH= webp XAW3D_LIB_DEPENDS= libXaw3d.so:x11-toolkits/Xaw3d XAW3D_CONFIGURE_ON= --with-x-toolkit=athena XAW_USE= XORG=xaw @@ -233,11 +241,30 @@ XWIDGETS_CONFIGURE_WITH= xwidgets .include +.if ${ARCH:Mpowerpc64*} +USE_GCC= yes +.endif + +.if ${FLAVOR:U} != nox +USES+= desktop-file-utils gnome +.if !${PORT_OPTIONS:MPGTK} +USES+= xorg +USE_XORG+= ice sm x11 xcb xcomposite xext xfixes xi xinerama xmu xrandr \ + xrender xt +.endif +.endif + .if !${PORT_OPTIONS:MGTK2} && !${PORT_OPTIONS:MGTK3} && !${PORT_OPTIONS:MMOTIF} && \ !${PORT_OPTIONS:MXAW} && !${PORT_OPTIONS:MXAW3D} CONFIGURE_ARGS+= --with-x-toolkit=no .endif +# Schema generation is dependent on both PGTK, and GSETTINGS options +# as per https://git.savannah.gnu.org/cgit/emacs.git/commit/?id=183936ee8e5 +.if ${PORT_OPTIONS:MGSETTINGS} && ${PORT_OPTIONS:MPGTK} +GLIB_SCHEMAS+= org.gnu.emacs.defaults.gschema.xml +.endif + .if ${FLAVOR} == nox # With a desktop entry stage-qa will give a warning about requiring # desktop-file-utils and portlint -C will give a warning about INSTALLS_ICONS, @@ -248,6 +275,7 @@ post-patch: post-install: @${RM} -r ${STAGEDIR}${PREFIX}/lib/systemd + @(cd ${STAGEDIR}${PREFIX} && ${FIND} libexec/emacs/${DISTVERSION}/${CONFIGURE_TARGET}/ -name emacs-*.pdmp >> ${TMPPLIST}) post-install-MAILUTILS-on: ${LN} -sf ${PREFIX}/bin/movemail \ @@ -257,7 +285,7 @@ post-install-MAILUTILS-on: # these files to the plist after the build. post-install-NATIVECOMP-on: @(cd ${WRKSRC} && ${FIND} native-lisp -type f | ${SED} -e 's,^,lib/emacs/${DISTVERSION}/,') >> ${TMPPLIST} -# @${FIND} ${STAGEDIR}${PREFIX}/lib/emacs/${DISTVERSION:R}/native-lisp/ -name '*.eln*' -exec ${STRIP_CMD} {} + + @${FIND} ${STAGEDIR}${PREFIX}/lib/emacs/${DISTVERSION}/native-lisp/ -name '*.eln*' -exec ${STRIP_CMD} {} + post-install-SOURCES-on: @${MKDIR} ${STAGEDIR}${DATADIR}/${DISTVERSION}/src diff --git a/editors/emacs/distinfo b/editors/emacs/distinfo index 2233664a344c..367ea3cc8917 100644 --- a/editors/emacs/distinfo +++ b/editors/emacs/distinfo @@ -1,15 +1,5 @@ -TIMESTAMP = 1683873995 -SHA256 (emacs-28.2.tar.xz) = ee21182233ef3232dc97b486af2d86e14042dbb65bbc535df562c3a858232488 -SIZE (emacs-28.2.tar.xz) = 47722600 -SHA256 (d48bb4874bc6cd3e69c7a15fc3c91cc141025c51.patch) = 6331f8676afa68a0f96b1461c1d75bbfb4f2d99177935f362ced0fef8b72e52d -SIZE (d48bb4874bc6cd3e69c7a15fc3c91cc141025c51.patch) = 552711 -SHA256 (01a4035c869b91c153af9a9132c87adb7669ea1c.patch) = c391d6d87a20e0477b301bf6c090392c7423897899fa34908234459f64c494ef -SIZE (01a4035c869b91c153af9a9132c87adb7669ea1c.patch) = 3271 -SHA256 (9a3b08061feea14d6f37685ca1ab8801758bfd1c.patch) = 37fba7d6e2ee9ed90b3203b8043b2154f8c6d3c2f589b8dbb233e4bdd5fca439 -SIZE (9a3b08061feea14d6f37685ca1ab8801758bfd1c.patch) = 1007 -SHA256 (1b4dc4691c1f87fc970fbe568b43869a15ad0d4c.patch) = 9747b316708f07db7b2aecd874e0732169e0f2b3d7e43964b59fbed5207220da -SIZE (1b4dc4691c1f87fc970fbe568b43869a15ad0d4c.patch) = 987 -SHA256 (ed1a24b4b2e39498e4c4448365e1d5f0149e5fc6.patch) = 0c0659fa405e4cab469754db86556f7374f00a126071e802f6dc883b9586b465 -SIZE (ed1a24b4b2e39498e4c4448365e1d5f0149e5fc6.patch) = 1430 -SHA256 (emacs28.1-canna-20220406b.diff.gz) = a57b7ca032229ce4d1eb2b2e59458db40e9ffc371a15e833699f3ce7caf05684 -SIZE (emacs28.1-canna-20220406b.diff.gz) = 30564 +TIMESTAMP = 1690728367 +SHA256 (emacs-29.1.tar.xz) = d2f881a5cc231e2f5a03e86f4584b0438f83edd7598a09d24a21bd8d003e2e01 +SIZE (emacs-29.1.tar.xz) = 52081008 +SHA256 (emacs29.1-canna-20230730.diff.xz) = 03741d173d86823409e42906f47cbd3c924cf88ec25cc3e228c4827a96243125 +SIZE (emacs29.1-canna-20230730.diff.xz) = 26852 diff --git a/editors/emacs/pkg-plist b/editors/emacs/pkg-plist index 8128eb1b01b0..b4f922e724ef 100644 --- a/editors/emacs/pkg-plist +++ b/editors/emacs/pkg-plist @@ -7,7 +7,6 @@ bin/etags include/emacs-module.h libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/hexl libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/movemail -libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/emacs.pdmp libexec/emacs/%%EMACS_VER%%/%%GNU_HOST%%/rcs2log man/man1/ctags.1.gz man/man1/ebrowse.1.gz @@ -25,6 +24,7 @@ share/metainfo/emacs.metainfo.xml %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.icon %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.metainfo.xml %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%.service +%%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%_lldb.py %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%client-mail.desktop %%DATADIR%%/%%EMACS_VER%%/%%ETCDIR%%client.desktop %%DATADIR%%/%%EMACS_VER%%/etc/AUTHORS @@ -34,6 +34,7 @@ share/metainfo/emacs.metainfo.xml %%DATADIR%%/%%EMACS_VER%%/etc/DEVEL.HUMOR %%DATADIR%%/%%EMACS_VER%%/etc/DISTRIB %%DATADIR%%/%%EMACS_VER%%/etc/DOC +%%DATADIR%%/%%EMACS_VER%%/etc/EGLOT-NEWS %%DATADIR%%/%%EMACS_VER%%/etc/ERC-NEWS %%DATADIR%%/%%EMACS_VER%%/etc/ETAGS.EBNF %%DATADIR%%/%%EMACS_VER%%/etc/ETAGS.README @@ -54,6 +55,7 @@ share/metainfo/emacs.metainfo.xml %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.25 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.26 %%DATADIR%%/%%EMACS_VER%%/etc/NEWS.27 +%%DATADIR%%/%%EMACS_VER%%/etc/NEWS.28 %%DATADIR%%/%%EMACS_VER%%/etc/NEXTSTEP %%DATADIR%%/%%EMACS_VER%%/etc/NXML-NEWS %%DATADIR%%/%%EMACS_VER%%/etc/ORG-NEWS @@ -197,6 +199,7 @@ share/metainfo/emacs.metainfo.xml %%DATADIR%%/%%EMACS_VER%%/etc/e/README %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color %%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-color.ti +%%DATADIR%%/%%EMACS_VER%%/etc/e/eterm-direct %%DATADIR%%/%%EMACS_VER%%/etc/edt-user.el %%DATADIR%%/%%EMACS_VER%%/etc/enriched.txt %%DATADIR%%/%%EMACS_VER%%/etc/forms/README @@ -222,6 +225,8 @@ share/metainfo/emacs.metainfo.xml %%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 @@ -311,70 +316,26 @@ share/metainfo/emacs.metainfo.xml %%DATADIR%%/%%EMACS_VER%%/etc/images/fwd-arrow.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/README -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/catchup.pbm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/catchup.xpm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/cu-exit.pbm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/cu-exit.xpm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/describe-group.pbm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/describe-group.xpm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/exit-gnus.pbm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/exit-gnus.xpm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/exit-summ.pbm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/exit-summ.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/followup.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/followup.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/fuwo.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/fuwo.xpm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/get-news.pbm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/get-news.xpm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnntg.pbm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnntg.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus-pointer.xbm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus-pointer.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus.png %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus.svg %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus.xbm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/gnus.xpm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/important.pbm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/important.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/kill-group.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/kill-group.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/mail-reply.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/mail-reply.xpm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/mail-send.pbm %%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/mail-send.xpm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/next-ur.pbm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/next-ur.xpm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/post.pbm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/post.xpm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/prev-ur.pbm -%%DATADIR%%/%%EMACS_VER%%/etc/images/gnus/prev-ur.xpm *** 1965 LINES SKIPPED ***