From nobody Wed Feb 15 00:17:12 2023 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 4PGdtc55VJz3qSJt; Wed, 15 Feb 2023 00:17:12 +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 4PGdtc4Q6Kz4Sd9; Wed, 15 Feb 2023 00:17:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676420232; 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=wLWez9fTCfcpXU7G2nvq3tB280PbD2ZiuEF9eKmin8w=; b=ci75Vt8sC7Bz/kmi/23JZgF9S3kxUzAeQ/scLzv8gDEk1gyyoXl/Vb1PlZ8dMlTuER89PL MLhtOePur7x8I3xB83O8r5vfvrM/jqkxC1eOLTd5SDBbsAHJop11FA54UqKn0ZPCGGX2Ot 9t8/C23Hw1baRwSVdxFUJYW4OKAkqwxWwO/m88zulvwHLPhdsOodIzORpM1lTN9OkFJK4c 8kGzjhrX9dCSpgi33vuBecYru3Euaaj3ssCA77jg9czKWxd+twBugRjumYvQMdbKp9GhlS y7lpwQejHjGuerjhsqZRFC9pmNmdvdq3NzEXIJJwJDWRUPh0sas8XcZxVPrgUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1676420232; 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=wLWez9fTCfcpXU7G2nvq3tB280PbD2ZiuEF9eKmin8w=; b=mfmqz2ObTCOiCSMYvG+WL+zliASJmwBaFx8mFhlrQC+YqBd+OvXQqEAc7WUo4nmHjAM8Hf vH7tiaweEZAgh96U8cVC0XAq+x/Wulv4Mpnwj/DHhJQ+eFvVchwSeL/iC7QCV4h9S4N7a9 Is9qrJ4fA6YnCzzfXR8DXxwdakKyBFuIL1WGvwtZBiPO9+U6IJA6Za7TzPYZ+m6zpSDqgy a3MnXF3hdp3bKWIVRHYabPx87sGsaoAdwTzbXXAa8d9kwi/hAfKT43AvWbpw6FFkU/k6vZ HNuzDyy8hV+Y76EvqXM5KhTd3pHgz853QWMVGehHc5b2dOX3Qyw/cRXT8Tcg5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1676420232; a=rsa-sha256; cv=none; b=cz1ILikhSTXYa+MvMoDwmxOZIuPXY9OmyIPpd1TAFf5nKrNJ2ImhvMJXxeMQ6SaLT5SMFD /jQ4mw049l8epwlIVvqdf6vnlBXWfHHmO02gePpDTQqXtih5H3LmIi6bpVE99UTtgWdYAJ f3gyaDxcYqyXognnnNY0wLwViAQ7SvitRWm80716Uho+VHPMIYWuXK+VSZY8+x03PpPltu VClW/yFvLSUZi0RHkP3kVdOjJkwvGMqTFL5VyUr+vmSQiuYvBv6STd/RRc9ZamJqhmWcUZ LRsebBko3kQKETEYoFu6MB9DAHOxmFvkH+vZxY6b0f8qZiqSAUSyZAEkhtixVA== 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 4PGdtc3S00z1J0d; Wed, 15 Feb 2023 00:17:12 +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 31F0HCkl091216; Wed, 15 Feb 2023 00:17:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31F0HCLN091215; Wed, 15 Feb 2023 00:17:12 GMT (envelope-from git) Date: Wed, 15 Feb 2023 00:17:12 GMT Message-Id: <202302150017.31F0HCLN091215@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 9fa9c4322901 - main - graphics/gifsicle: flavorize (x11 as default and nox11) 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: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fa9c432290140ad4668da46934b93767a53bf07 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=9fa9c432290140ad4668da46934b93767a53bf07 commit 9fa9c432290140ad4668da46934b93767a53bf07 Author: Hiroki Tagato AuthorDate: 2023-02-15 00:11:06 +0000 Commit: Hiroki Tagato CommitDate: 2023-02-15 00:17:05 +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 --- 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}