From nobody Mon Nov 22 17:36:43 2021 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 0DC8E18ABC2C; Mon, 22 Nov 2021 17:36:44 +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 4HyZFl6tsLz4gSd; Mon, 22 Nov 2021 17:36:43 +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 BE38326D20; Mon, 22 Nov 2021 17:36:43 +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 1AMHah1o044806; Mon, 22 Nov 2021 17:36:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AMHahw5044805; Mon, 22 Nov 2021 17:36:43 GMT (envelope-from git) Date: Mon, 22 Nov 2021 17:36:43 GMT Message-Id: <202111221736.1AMHahw5044805@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: 2bf037d0b118 - main - editors/emacs-devel: Formatting cleanup 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: 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: 2bf037d0b1180cd0ffd73bceb30dd1a75b87f5b8 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=2bf037d0b1180cd0ffd73bceb30dd1a75b87f5b8 commit 2bf037d0b1180cd0ffd73bceb30dd1a75b87f5b8 Author: Joseph Mingrone AuthorDate: 2021-11-22 17:33:21 +0000 Commit: Joseph Mingrone CommitDate: 2021-11-22 17:36:24 +0000 editors/emacs-devel: Formatting cleanup This formatting should have been committed in 61d0935ac4. --- editors/emacs-devel/Makefile | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/editors/emacs-devel/Makefile b/editors/emacs-devel/Makefile index caa1aafd1d30..79ed4305a37b 100644 --- a/editors/emacs-devel/Makefile +++ b/editors/emacs-devel/Makefile @@ -54,10 +54,10 @@ CONFIGURE_ARGS+= --with-sound=no \ --without-rsvg \ --without-tiff \ --without-toolkit-scroll-bars \ + --without-webp \ --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 WEBP + THREADS TIFF WEBP XFT XIM XML XPM OPTIONS_GROUP= GRAPHICS -OPTIONS_GROUP_GRAPHICS= CAIRO GIF JPEG MAGICK PNG SVG TIFF XPM WEBP +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 @@ -97,8 +97,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 XAW XAW3D XFT XIM XPM \ - XWIDGETS WEBP + PNG SCROLLBARS SVG TIFF WEBP XAW XAW3D XFT XIM \ + XPM XWIDGETS .endif OPTIONS_SUB= YES @@ -186,6 +186,8 @@ SVG_CONFIGURE_WITH= rsvg THREADS_CONFIGURE_WITH= threads TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff TIFF_CONFIGURE_WITH= tiff +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 @@ -207,8 +209,6 @@ 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 .if ${PORT_OPTIONS:MNATIVECOMP} && !defined(_GCC_PORT_CHOSEN) @@ -219,7 +219,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