From nobody Wed Feb 15 00:18:29 2023 X-Original-To: dev-commits-ports-branches@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 4PGdw61TWnz3qSK2; Wed, 15 Feb 2023 00:18:30 +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 4PGdw60v0Hz4Sjv; Wed, 15 Feb 2023 00:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676420310; 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=D8rdORiPtEkenYJZwbd6ckjI3ITdGx83+tPZ+zi3qgc=; b=U/JF+F6JeEvVsTkE59Wph0I8fM3J3v9O6V1oTdLLFI8YGi3VQhR8v8m60mREGvkuujC11t dXvjuqwC5TuPpQlT4xhzAyjF42kEWvIFqnQiKDDB/mYvVmpdw9qrH9+nbAEQ+zKOzEyevN /X3SFxhARTyxQ5kU/m0BYTuLaMO7rdhI9vL5eeFcziLKyctOLGdRjL+o0NasmcTDrQY0Yv QhDiMvqUyjAwiOLMqs96clEsttcKTkV6I+PrFMOeXEK1W7x5RYs/q+I5NRTC0/QvbHzPlg rhaAs9lB66U1XwR/UP5U0y+ZQYbkLmLjOWzHS8MyqH+TUDujn2exuHE2CY2MrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676420310; 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=D8rdORiPtEkenYJZwbd6ckjI3ITdGx83+tPZ+zi3qgc=; b=mUYvoDOaTRHj3QxWMfEjCaqrrvEX5Y+qJ9BmRbnILvu53hcuXmiVTrWihlX+D72EwS1AKd K3J9Xw5V7VWl9WmOyQNJfjsS0Js5iAp6rMBt62YOHiDTYSELyEn3iMyiCpGsVjWCBGcifS wWosdjsa4KCj8RZ5nwXXT6lAILrv7On3s8M7vlf1CYe1G7Vp/jkIP6fkmkj9rrLdsNYvHe S0Ik0UB261hWMmw9WYVa3ytAha/d3jGyU6tonVAL6dJSyR5M2e8aQ3jMMdJmrH5QslxMjD vII62uSkyJ52HlRTCMF7nPUcsYcfY7TROMjx72mWJT1Ad96zc5jFePLDJaABHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676420310; a=rsa-sha256; cv=none; b=UG1/nuQvowaAcp8a/0+t22PqpB+2gom/teWpC65EVWv2xZpajkJoMv5AQfBY3hoPiiOZWU PPWaCciTBH0bKWWLbbmeZiucy0w4ol24xsi0BFC/pnuVBgYMVHsdTbEa0GcGg5V4R7n+PK vabkfCiIJHlIwhAng/VaQT82gCik/IL4+Ufi5GPUnpQ7O4VfkCCC8yJL04DAc7ZsEkwYW0 3W96WLZbx5ILRZZsPANqOESCBF9fleiZ/q5wa4bn+uLKcyNBR1+I2FS2xS2mkO5Qlidvp6 gUFkas0R04leXkJJnWkSFIymDQoYk+rLdWb1cEAqeAFBcRhbkF7OwJE+7Jaseg== 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 4PGdw56kSPz1JVr; Wed, 15 Feb 2023 00:18:29 +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 31F0ITLg091515; Wed, 15 Feb 2023 00:18:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31F0ITJP091514; Wed, 15 Feb 2023 00:18:29 GMT (envelope-from git) Date: Wed, 15 Feb 2023 00:18:29 GMT Message-Id: <202302150018.31F0ITJP091514@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Hiroki Tagato Subject: git: 246d74ac73f9 - 2023Q1 - graphics/gifsicle: flavorize (x11 as default and nox11) List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q1 X-Git-Reftype: branch X-Git-Commit: 246d74ac73f92320514e87bb3c0d77ba21ed58fd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=246d74ac73f92320514e87bb3c0d77ba21ed58fd commit 246d74ac73f92320514e87bb3c0d77ba21ed58fd Author: Hiroki Tagato AuthorDate: 2023-02-15 00:11:06 +0000 Commit: Hiroki Tagato CommitDate: 2023-02-15 00:18:22 +0000 graphics/gifsicle: flavorize (x11 as default and nox11) It turns out there are conflicting interests between desktop and server users of this port. Flavoring the port will solve the issue by creating packages with x11 dependency and without. PR: 259715, 269274 Reported by: kennedy.greg@gmail.com, 0mp Reviewed by: 0mp MFH: 2023Q1 (cherry picked from commit 9fa9c432290140ad4668da46934b93767a53bf07) --- graphics/gifsicle/Makefile | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/graphics/gifsicle/Makefile b/graphics/gifsicle/Makefile index 04df2b73d050..b136a88d4440 100644 --- a/graphics/gifsicle/Makefile +++ b/graphics/gifsicle/Makefile @@ -1,8 +1,8 @@ PORTNAME= gifsicle PORTVERSION= 1.93 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= graphics -MASTER_SITES= http://www.lcdf.org/gifsicle/ +MASTER_SITES= https://www.lcdf.org/gifsicle/ MAINTAINER= tagattie@FreeBSD.org COMMENT= Manipulates GIF images and animations @@ -14,6 +14,10 @@ LICENSE_FILE= ${WRKSRC}/COPYING BROKEN_mips= fails to build: undefined reference to '__sync_add_and_fetch_4' BROKEN_mips64= fails to build: undefined reference to '__sync_add_and_fetch_4' +FLAVORS= x11 nox11 +FLAVOR?= ${FLAVORS:[1]} +nox11_PKGNAMESUFFIX= -nox11 + USES= cpe CPE_VENDOR= gifsicle_project @@ -24,14 +28,19 @@ PORTDOCS= NEWS.md README.md PLIST_FILES= bin/gifdiff bin/gifsicle \ man/man1/gifdiff.1.gz man/man1/gifsicle.1.gz -OPTIONS_DEFINE= DOCS X11 -OPTIONS_DEFAULT= X11 - -X11_USES= xorg -X11_USE= xorg=x11 -X11_CONFIGURE_ENABLE= gifview -X11_CONFIGURE_WITH= x -X11_PLIST_FILES= bin/gifview man/man1/gifview.1.gz +.if ${FLAVOR} == x11 +USES+= xorg +USE_XORG= x11 +CONFIGURE_ARGS= --enable-gifview \ + --with-x +PLIST_FILES+= bin/gifview \ + man/man1/gifview.1.gz +CONFLICTS_INSTALL= gifsicle-nox11 +.else +CONFLICTS_INSTALL= gifsicle +.endif + +OPTIONS_DEFINE= DOCS post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR}