From nobody Tue May 7 01:47:06 2024 X-Original-To: dev-commits-ports-all@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 4VYLk25fv3z5Jsdn; Tue, 07 May 2024 01:47: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 4VYLk256Ptz4nKc; Tue, 7 May 2024 01:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715046426; 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=CfXUMxsvgW7jGDf1n1Cc8R223vuWiAPkmOQX7eJGlrY=; b=sh0Hl8WOUf9ftI6tAOFcQgAyDfMfX4Zq4nS1QqyrShWq8/IFskVO9vlXxCeW8K3ItiYsJZ 05GN9F4COQkKEaxnouzscmnBbdmb7mhaHmJfTNCNKTlClhnr1174Dwm5hqn6+GzgbbUZgS 5+ypMNOkyII+lUIT5Kfyxn3rdZc0Y3hCrEczl5+2QJXn467nxAGy3x9ejxkTunOam1FtZS VVCTSCc670PW3DMDNdao5Z795WOttmvBvhconlCZwmrZNCC09ccPv2KlwVCsfRsBoU9b4E kjQS8BVThzpdpuIJrsX0iB5h0NjZ5RFmyw4SwItfzlCo2WeLVgwijsmKM4v+vg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1715046426; a=rsa-sha256; cv=none; b=PNUpVRw99FNwrDo/Al2Qo6+STtJyzdk4FF5pkku2gS/1HStqMIugyArZbLe2LMRIfSs/R0 ApStm+u3abmp2F4gs+mAhjd0tYxtwVC7US71O4QPW9VXeRzIZzDH2ts7u1E6Bl2KrEFs/G YgMogQIzn9DVTXwU8uf0S65VCMMI0IwdDx5kyMhvD4gU1DJVBa8liMtC0jfPeihf7soGaW 3MZe76lCI1A7oKggWwrL50iG0CBV44AKSqc3WCvJmIp7ZzHaK7IcNpocmETVAlRiPrB/Bc CMzgSyrlr2ASTyZCrVi7BBuJm59JaKJCyLin9uu8+veqMp6PVewzFw0LdzXnOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1715046426; 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=CfXUMxsvgW7jGDf1n1Cc8R223vuWiAPkmOQX7eJGlrY=; b=ZYv0YNXPCWrZlKOkNG+T7JBFKMxLm6nndH+8ZWCmG6SEqdEVcpE/qPoSo4Wgre/siVUipH C2b7hK184l7DikQp1QDX3k/44+ZYqmA9xRwWoR7TiSta/zcLMJQZpMiVEwQ2nAUhPL52eB MMmacUwp/Rjb7LszZ4RE6vtWp9V317mRusZNR7nh+lzwuOf9pz9fBmW6iG0EjoBSWT/Bjd vi+WIiGwdQnOa3g0vwCzKWmC4mXMr/HHvrTBPUswNhfMxq+nTuhG1k0zqQ1YIK6cM2vq8g 7wi2lRwoZ011047FFB2NvKCk4xXLzbPZjvArpCmHHoT/gPm8ZO47qOSv7G705g== 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 4VYLk24K7ZzM3G; Tue, 7 May 2024 01:47: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 4471l61N090351; Tue, 7 May 2024 01:47:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4471l6tD090348; Tue, 7 May 2024 01:47:06 GMT (envelope-from git) Date: Tue, 7 May 2024 01:47:06 GMT Message-Id: <202405070147.4471l6tD090348@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: 604adf973a51 - main - Emacs: Add new wayland flavor List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@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: 604adf973a514f8fc8dc550ebd884ae5ce9a6e82 Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=604adf973a514f8fc8dc550ebd884ae5ce9a6e82 commit 604adf973a514f8fc8dc550ebd884ae5ce9a6e82 Author: Joseph Mingrone AuthorDate: 2024-04-23 17:11:39 +0000 Commit: Joseph Mingrone CommitDate: 2024-05-07 01:42:21 +0000 Emacs: Add new wayland flavor Emacs requires mutually exclusive build parameters depending on whether the user is running under X11 or Wayland. Rather than require either set of users to build a custom package, create a new wayland flavor, and use default options appropriate for users running under X. PR: 278167 Reviewed by: ashish, jbeich Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D44917 --- Mk/Uses/emacs.mk | 2 +- editors/emacs/Makefile | 31 ++++++++++++++++++++----------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/Mk/Uses/emacs.mk b/Mk/Uses/emacs.mk index d601390f0569..8161e980491b 100644 --- a/Mk/Uses/emacs.mk +++ b/Mk/Uses/emacs.mk @@ -79,7 +79,7 @@ _EMACS_RUN_DEP= yes # Only set FLAVORS when... . if defined(_EMACS_RUN_DEP) && !defined(_EMACS_NOFLAVORS) -FLAVORS= full canna nox devel_full devel_nox +FLAVORS= full canna nox wayland devel_full devel_nox # Sort the default to be first . if defined(EMACS_DEFAULT) FLAVORS:= ${EMACS_DEFAULT} ${FLAVORS:N${EMACS_DEFAULT}} diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index c360b176d7e5..ce8aaac2ea4f 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,6 +1,6 @@ PORTNAME= emacs DISTVERSION= 29.3 -PORTREVISION= 1 +PORTREVISION= 2 PORTEPOCH= 3 CATEGORIES= editors MASTER_SITES= GNU @@ -15,20 +15,23 @@ COMMENT= GNU editing macros ${COMMENT_${FLAVOR}} WWW= https://www.gnu.org/software/emacs/ COMMENT_nox= (No X flavor) COMMENT_canna= (Canna Japanese input flavor) +COMMENT_wayland= (Wayland flavor) LICENSE= GPLv3+ LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libgmp.so:math/gmp -FLAVORS= full canna nox +FLAVORS= full canna nox wayland canna_PKGNAMESUFFIX= -canna canna_LIB_DEPENDS= libcanna.so:japanese/canna-lib -canna_CONFLICTS_INSTALL= emacs emacs-nox +canna_CONFLICTS_INSTALL= emacs emacs-nox emacs-wayland canna_DESCR= ${.CURDIR}/pkg-descr-canna -full_CONFLICTS_INSTALL= emacs-canna emacs-nox +full_CONFLICTS_INSTALL= emacs-canna emacs-nox emacs-wayland nox_PKGNAMESUFFIX= -nox -nox_CONFLICTS_INSTALL= emacs emacs-canna +nox_CONFLICTS_INSTALL= emacs emacs-canna emacs-wayland +wayland_PKGNAMESUFFIX= -wayland +wayland_CONFLICTS_INSTALL= emacs emacs-canna emacs-nox USES= cpe gmake localbase:ldflags ncurses pkgconfig tar:xz CPE_VENDOR= gnu @@ -42,8 +45,7 @@ CONFIGURE_ARGS= --disable-build-details \ --without-selinux .if ${FLAVOR:U} == canna CONFIGURE_ARGS+= --with-canna -.endif -.if ${FLAVOR:U} == nox +.elif ${FLAVOR:U} == nox CONFIGURE_ARGS+= --with-sound=no \ --with-x-toolkit=no \ --without-cairo \ @@ -66,6 +68,8 @@ CONFIGURE_ARGS+= --with-sound=no \ --without-xim \ --without-xpm \ --without-xwidgets +.elif ${FLAVOR:U} == wayland +CONFIGURE_ARGS+= --without-x .else CONFIGURE_ARGS+= --with-x .endif @@ -102,16 +106,21 @@ OPTIONS_DEFINE= ACL DBUS GNUTLS GSETTINGS HARFBUZZ JSON LCMS2 \ XFT XIM XML XWIDGETS OPTIONS_DEFAULT= ACL CAIRO DBUS GIF GNUTLS GSETTINGS GTK3 \ HARFBUZZ JPEG JSON KQUEUE LCMS2 MAILUTILS \ - MODULES OSS SCROLLBARS SOURCES SQLITE3 SVG \ - THREADS TIFF TREESITTER WEBP XML + MODULES OSS PNG SCROLLBARS SOURCES SQLITE3 SVG \ + THREADS TIFF TREESITTER WEBP XIM XML OPTIONS_GROUP= GRAPHICS 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 OPTIONS_RADIO_X11TOOLKIT= GTK2 GTK3 MOTIF XAW XAW3D -.if ${FLAVOR:U} == nox -OPTIONS_EXCLUDE= ALSA CAIRO DBUS GFILE GIF GSETTINGS GTK2 GTK3 \ +.if ${FLAVOR:U} == wayland +OPTIONS_EXCLUDE+= GTK2 MOTIF XAW XAW3D XIM ${PGTK_PREVENTS} \ + ${PGTK_IMPLIES:@i@${${i}_PREVENTS}@} +OPTIONS_SLAVE+= PGTK ${PGTK_IMPLIES} \ + ${PGTK_IMPLIES:@i@${${i}_IMPLIES}@} +.elif ${FLAVOR:U} == nox +OPTIONS_EXCLUDE+= ALSA CAIRO DBUS GFILE GIF GSETTINGS GTK2 GTK3 \ HARFBUZZ JPEG LCMS2 M17N MAGICK MOTIF OSS OTF \ PGTK PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT \ XIM XPM XWIDGETS