From nobody Wed Jun 08 14:06:34 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 DA35D844C7A; Wed, 8 Jun 2022 14:06:35 +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 4LJ8Ct5hPnz3vCg; Wed, 8 Jun 2022 14:06:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654697195; 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=3yesw04nUuSqC8YE9oDRmMWrKjpBjWeviH+hToOOb3U=; b=i3Kvz0TrtAQNiYJKIvKD5pMXy+JtrNJYIq2W0cM4zMHhQlSJpOsQbkTBPtAdeVxVhX4jGQ Sz1D9JW8x0u0tw4wMPE97rxNXIGOl+x1MDzve+hIkufVmEmk7OoBLo7Fkp060LUUb3pg02 wKZZP+RrnXCDRqLMiIvja/Qug2K+Gn+G/L1wixo1sxAsgJ4G2ItqbpE8k5uVXumdBfIVUj uyCC57WUjVau0ygkkuB7PakDrwQHRMw2QHEDBggUKIo33VUFuSyN+hho4KUFmH4iASh/80 m54sWSvZPWeOmlQddSvjjBXZYHwZeRr7cZoFThjWbWurVkt7qD70L3zyUY/C0w== 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 68EA610F4A; Wed, 8 Jun 2022 14:06:34 +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 258E6YHC045527; Wed, 8 Jun 2022 14:06:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 258E6Yj0045526; Wed, 8 Jun 2022 14:06:34 GMT (envelope-from git) Date: Wed, 8 Jun 2022 14:06:34 GMT Message-Id: <202206081406.258E6Yj0045526@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: 00f1472c6af6 - main - pidgin: drop gconf references entirely 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00f1472c6af6516e19438c32226a49525860bda2 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1654697195; 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=3yesw04nUuSqC8YE9oDRmMWrKjpBjWeviH+hToOOb3U=; b=xUUoHyQJDebhZCw3uMh3hWTOfgRrSfcfmNS1cz/tYMPj3VaEr5u7Orha1ciP2PTxTy03S/ ajK1JqHDmM46ryrd1ADTBelrCa7BbrwJXeI6uAQpMsgLxyFotcDuBSObn1KcV28EkTeWzN TUNePTwYWMQ65CLCKnbS5993v72eSFlO/48Et4XeOVsfbGD2fauqlSknUMhgpJRPfGeA/r F7gMBNr7jbaWIPl9XWqT60gb3Zdrr9oeOiXoHCrcsXxLACa/2SvUi8TavK6FcZWHAZCAks pwbM8/5UIcdplOECi5Mf5TaOOe0p5pjS0UH9BPJWtpUNJuGR8lV4MbJPKoHTVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1654697195; a=rsa-sha256; cv=none; b=GrFI9Ab2VjgQOYyT6sgWkRlEI+A5U+f+2FIaGw+ZZogXZTRU3jIYuiqbHEv6nDEYHNEYaB qM50RnoHEGrhqWlEgCczWix4T/WUsZTS8p+3L0pvZDp98DX4EMz1oiMbcjfH948JBDm23Z L3d/PNLoBRvEhIAPEArU9EintCtZa9jo/WOf/4Y6MWnwUu5sE1r9DCgYWsIfHxMkADk4fL CSWptb6m9Ag4Sxhh1jY3/bNgH5obJJOSV8B6b2UnZR+3jg1GSKD1QQUnLEqo04N1Z9Q7WW 8bdT//UfuH7uJXeV8d2g6WkSmfaU66j8VhmQAkUp5O5g8PEUSoz4p0HJYLtmJg== 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=00f1472c6af6516e19438c32226a49525860bda2 commit 00f1472c6af6516e19438c32226a49525860bda2 Author: Baptiste Daroussin AuthorDate: 2022-06-08 13:59:06 +0000 Commit: Baptiste Daroussin CommitDate: 2022-06-08 14:06:25 +0000 pidgin: drop gconf references entirely Given how the port evolved USE_GNOME=gconf2 was never set anyway, just remove it entirely, and add the configure argument to ensure it will never come back even by accident --- net-im/finch/Makefile | 1 + net-im/libpurple/Makefile | 10 ++-------- net-im/pidgin/Makefile | 1 + 3 files changed, 4 insertions(+), 8 deletions(-) diff --git a/net-im/finch/Makefile b/net-im/finch/Makefile index 02441c64bca1..35307f456a27 100644 --- a/net-im/finch/Makefile +++ b/net-im/finch/Makefile @@ -23,6 +23,7 @@ CPE_PRODUCT= pidgin CPPFLAGS+= -DNCURSES_WIDECHAR -D_XOPEN_SOURCE_EXTENDED USE_LDCONFIG= yes CONFIGURE_ARGS= --disable-gtkui \ + --disable-schemas-install \ --disable-nm \ --with-dynamic_prpls=${PRPL_MODULES:S/,$//} diff --git a/net-im/libpurple/Makefile b/net-im/libpurple/Makefile index fb7118836367..126894c0b5f0 100644 --- a/net-im/libpurple/Makefile +++ b/net-im/libpurple/Makefile @@ -21,7 +21,8 @@ CONFIGURE_ARGS?=--disable-gtkui \ --with-dynamic-prpls=${PRPL_MODULES:S/,$//} \ --enable-static \ --disable-nm \ - --with-system-ssl-certs=/usr/share/certs/trusted + --with-system-ssl-certs=/usr/share/certs/trusted \ + --disable-schemas-install INSTALL_TARGET= install-strip .if !defined(PIDGIN_SLAVE) @@ -114,11 +115,6 @@ PLIST_SUB+= PERL:="@comment not installed: " \ PERLMAN:="@comment not installed: " .endif -.if defined(WITH_GTKUI) && !defined(PIDGIN_SLAVE) -USE_GNOME+= gconf2 -GCONF_SCHEMAS= purple.schemas -.endif - .if defined(WITH_GTKUI) USE_GNOME+= evolutiondataserver3 PLIST_SUB+= EVO="" @@ -296,8 +292,6 @@ post-patch: .if defined(PIDGIN_SLAVE) @${FIND} ${BUILD_WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \ 's|$$(top_builddir)/libpurple/libpurple.la|-lpurple|' - @${REINPLACE_CMD} -e 's|gconftool-2|gconftool-disabled|g' \ - ${WRKSRC}/configure .endif .if !defined(PIDGIN_SLAVE) && ${PORT_OPTIONS:MPERL} diff --git a/net-im/pidgin/Makefile b/net-im/pidgin/Makefile index 82f6f09f5bc1..b565a5a00b52 100644 --- a/net-im/pidgin/Makefile +++ b/net-im/pidgin/Makefile @@ -25,6 +25,7 @@ USE_XORG= xscrnsaver sm CONFIGURE_ARGS= --disable-consoleui \ --disable-nm \ --enable-screensaver \ + --disable-schemas-install --with-dynamic_prpls=${PRPL_MODULES:S/,$//} post-install-PERL-on: