From nobody Wed Jun 08 14:13:49 2022 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 00C14845D67; Wed, 8 Jun 2022 14:13:50 +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 4LJ8NF6KHsz3w8t; Wed, 8 Jun 2022 14:13:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654697629; 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=dwPjNo6EzeTzpC4but+jKyeT1spRKVWWCxAL5YujSuM=; b=lPXKqAmfT8WT5+wWRSo1Yn++AUgNfXlwS4FRPIE5MNgHnCmuueziZFXZKBY0xJCto+0ju8 1Wuv2DM2FzMvFUP5h2+nBevOFQYfOrYe4Z/+nUzKXQjxw67cmZamtXYBVkY6NNWhpHuCEU CpqP7TQcAcQYEPys1GwW5F8YJ1R4f0VuThicuSzQCH9urzrCcwegZDzrZsR05NNEKXSp9x m7QNqqubewGZa6VRvxF2AeULobqFYjSbx6ZkQY81TYFXn/sUUVvUlqT8HHZbfslBMYsVHs OA0NFDdg5u+IMwxkNQbShJs5T/jz34eH2UcIkp7mPDvbqXW4AwcUdC8vO8DmAA== 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 B0CE21153B; Wed, 8 Jun 2022 14:13:49 +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 258EDnJs058681; Wed, 8 Jun 2022 14:13:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 258EDnen058680; Wed, 8 Jun 2022 14:13:49 GMT (envelope-from git) Date: Wed, 8 Jun 2022 14:13:49 GMT Message-Id: <202206081413.258EDnen058680@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: 36c95c1ea027 - main - editors/emacs: remove GCONF option 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 36c95c1ea027480641a9c34155b90edfa9032e26 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654697629; 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=dwPjNo6EzeTzpC4but+jKyeT1spRKVWWCxAL5YujSuM=; b=bdLlHdYSE6MSYEUfh3AcaAIZJrayH1dV4dcHkxr39LQ9LgcdgqfMWwvQytdvQN5oh+mnv1 9+3rse3/OtekP7DaxpynIn01CdWPraPg8KLggB1oV8GYfs49ZKUUg9BJLlcfIUjLw467ne gLvJ/fH0Z/zAQ4JY0hb75OW/WVEDV14kV44qPjA/aqjwiT+33YELg8KNC53O0ibH3KN/1r oxtmlfj/4Kac8/kAwISEn/ULjeZ9mB0WcpUZpS+rPRtsBsrxs1e9mcjBK2K0umFnhovWL0 dGqIyOzcW20IiWsVwmd93XrCpxHesn7y5TEUkIT78JdJbe5kNRlAmiz+PBMDeQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654697629; a=rsa-sha256; cv=none; b=Zegyk2J/z4TC2TpxJJ9IjfFlC93LV6DOYMAdDToBepjFL26yKO7pyYdNVi+zN8ptpkUWUU lmeE3FcQ+jHu1tg8OE9+rM0zTqU4W0wy6jNe+3setVP3Nbma+NSBU7NmU1oU8k2D53MQag FmLOT7RJ2it5HOOrfEDzfw9Acj5CXlAvn5KO6kayK3DoRmhn461qao8yFGMyu5TGCHIr4k be+6dyZixjW2L3rLOju2fszSawofWHGTXfto1WQGsF2RYOD2k5iGwa+Z7r3Fz7CAAqIc1O Rn5qMoms/yFWZqXPy5XfQBLEs79hvJs0w7AgnE5GLFf61/EDJ44JRCivNrA6FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=36c95c1ea027480641a9c34155b90edfa9032e26 commit 36c95c1ea027480641a9c34155b90edfa9032e26 Author: Baptiste Daroussin AuthorDate: 2022-06-08 14:10:15 +0000 Commit: Baptiste Daroussin CommitDate: 2022-06-08 14:10:15 +0000 editors/emacs: remove GCONF option --- editors/emacs/Makefile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 4cdec7031954..482693883c3a 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -42,6 +42,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-build-details \ --localstatedir=/var \ --without-libsystemd \ + --without-gconf \ --without-selinux .if ${FLAVOR:U} == canna CONFIGURE_ARGS+= --with-canna @@ -51,7 +52,6 @@ CONFIGURE_ARGS+= --with-sound=no \ --with-x-toolkit=no \ --without-cairo \ --without-dbus \ - --without-gconf \ --without-gif \ --without-gsettings \ --without-imagemagick \ @@ -96,7 +96,7 @@ PLIST_FILES+= ${DATADIR}/${DISTVERSION}/lisp/canna.el.gz \ PLIST_SUB= EMACS_VER=${DISTVERSION} \ GNU_HOST=${CONFIGURE_TARGET} -OPTIONS_DEFINE= ACL DBUS FCITXPATCH GCONF GNUTLS GSETTINGS \ +OPTIONS_DEFINE= ACL DBUS FCITXPATCH GNUTLS GSETTINGS \ HARFBUZZ JSON LCMS2 M17N MAILUTILS MODULES \ NATIVECOMP OTF SCROLLBARS SOURCES THREADS XFT \ XIM XML XWIDGETS @@ -111,7 +111,7 @@ 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 FCITXPATCH GCONF GFILE GIF \ +OPTIONS_EXCLUDE= ALSA CAIRO DBUS FCITXPATCH GFILE GIF \ GSETTINGS GTK2 GTK3 HARFBUZZ JPEG LCMS2 M17N \ MAGICK MOTIF OSS OTF PNG SCROLLBARS SVG TIFF \ XAW XAW3D XFT XIM XPM XWIDGETS @@ -151,8 +151,6 @@ CAIRO_CONFIGURE_WITH= cairo DBUS_LIB_DEPENDS= libdbus-1.so:devel/dbus DBUS_CONFIGURE_WITH= dbus FCITXPATCH_EXTRA_PATCHES= ${PATCHDIR}/extra-patch-src_xfns.c -GCONF_USE= GNOME=gconf2 -GCONF_CONFIGURE_WITH= gconf GFILE_USE= GNOME=glib20 GFILE_CONFIGURE_ON= --with-file-notification=gfile GIF_LIB_DEPENDS= libgif.so:graphics/giflib