From nobody Fri Sep 15 12:08:17 2023 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 4RnCdG15kKz4tD2g; Fri, 15 Sep 2023 12:08:18 +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 4RnCdF6LKpz3MMr; Fri, 15 Sep 2023 12:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694779697; 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=3rJkTSbenJSkT+7f+nUDmmOx3FdQIDO+xRBRgeTT+GM=; b=nJnOXMvEdJ6Qz3pT+Q6uh498HZG5oQjTGKVQ8OVWwQI3fRboXY6pvNlLPtAm9bFE+Tub1O 3ORipa5r+Lbo+CP8KwdFL8r/g7RIYUluCRzHkI3RLQctxLjp/BnLdh+T+LuYpDI8eHnIUK x3PUuqEGfLxBNQ9wYYdTQzxPjs/4bsUjLq0QyDVpXK3JpBhEcE1R1p9qVK4l4hoA6lXYmu 02zeTwBBk23m0adcJ0qvSsyDgE3Fm8+RCshaJh70MXfAuUmeFPYNJGvh2xZoHxj9WYyHj+ D3f98synzRBLl+O6roSxy4qXzUwuN4+swgPCVDRNuu2l8krG/k58BRK9iBC1zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1694779697; a=rsa-sha256; cv=none; b=ipupaZJRWcYj2vl8tPUaoyqcF9ljzim+5OxVAYg+Luf0TM6B07TmgUyL+IqYDApMGdwA4I pWt0rltmaJpvPXHJ0BOKL0gASZmZn3qGofSz94xHKXdtfpjwSEslhYC5q3a/7TuM+gICoT 72Yj1cRJ41aYF0OtAVY3APx6IqsDGG3Irne/zC8SbQkH03FNO1OlF/XWMgx7eEVAJ8QTE9 /GGIYsgPJBIqvHYNZSUvX13RbuiALedJD12QZZtwDkcjTVbgCiDWBlpqo8+jZUM981pLIv fWgPGhlNu3RBsgnGX9+RX/Da4DdallEcNw5O7pzWgGgGyXVibWE3wHKi53jK0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1694779697; 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=3rJkTSbenJSkT+7f+nUDmmOx3FdQIDO+xRBRgeTT+GM=; b=Ifg/BbuZxQXeUqOL09zn+hQ6NCR4yWUENzYAKeixo9dhIsGrqiG+GCQGVdDkjS8SYdxla+ /PylkYJmzNGzQEZs95X0QR9PuT+JvzL3a8pwaLvIw/I7Y6kZraQBOnU7OrMh0m6RlSiAch n6xrufLc0C3uAM0xxtNl8lUvMZPNnrNxchpFUxmDhFVUasQg71CGgB80/lw24AkG/vz2C+ Iq1lmJ+y74Bz0viF8R+Ace4IEIxjeiSHke1wXOWePPmn/paRKihJNIyK8O6kwPLpbZibw3 7waBPGqLrWHi1BUFBG0VlZyn9n/0p8abnVHcnZrJHAtS1mDww6N0r0yDzz6EDw== 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 4RnCdF5Pr3z82h; Fri, 15 Sep 2023 12:08:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38FC8H8a090934; Fri, 15 Sep 2023 12:08:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38FC8HEu090931; Fri, 15 Sep 2023 12:08:17 GMT (envelope-from git) Date: Fri, 15 Sep 2023 12:08:17 GMT Message-Id: <202309151208.38FC8HEu090931@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Koichiro Iwao Subject: git: bbca8e8174da - main - ghostscript.mk: replace flavors 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: meta X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbca8e8174da13923b4adb451a7ec20596f36a74 Auto-Submitted: auto-generated The branch main has been updated by meta: URL: https://cgit.FreeBSD.org/ports/commit/?id=bbca8e8174da13923b4adb451a7ec20596f36a74 commit bbca8e8174da13923b4adb451a7ec20596f36a74 Author: Michael Osipov AuthorDate: 2023-08-31 13:18:05 +0000 Commit: Koichiro Iwao CommitDate: 2023-09-15 12:07:41 +0000 ghostscript.mk: replace flavors Flavors for GS 10 create confliciting dependencies, therefore resort to port options. PR: 272541 --- Mk/Uses/ghostscript.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Mk/Uses/ghostscript.mk b/Mk/Uses/ghostscript.mk index 6a0491245acc..9590e55308b7 100644 --- a/Mk/Uses/ghostscript.mk +++ b/Mk/Uses/ghostscript.mk @@ -79,9 +79,9 @@ _GS_SELECTED?= 9-agpl . endif . endfor -. undef _GS_FLAVORED +. undef _GS_STATIC . if empty(_GS_SELECTED:M9-agpl) -_GS_FLAVORED= yes +_GS_STATIC= yes . endif # Resolve minor version number for X11.so library. @@ -93,14 +93,14 @@ _GS_VERSION_MINOR= 9.56.1 # dependencies _GS_LIB= libgs.so -_GS_PKGNAME= ghostscript${_GS_SELECTED}${_GS_FLAVORED:?:-base} -_GS_X11_PKGNAME=ghostscript${_GS_SELECTED}-x11 -_GS_PORT= print/ghostscript${_GS_SELECTED}${_GS_FLAVORED:?:-base} -_GS_X11_PORT= print/ghostscript${_GS_SELECTED}${_GS_FLAVORED:?@:-}x11 +_GS_PKGNAME= ghostscript${_GS_SELECTED}${_GS_STATIC:?:-base} +_GS_X11_PKGNAME=ghostscript${_GS_SELECTED}${_GS_STATIC:?:-x11} +_GS_PORT= print/ghostscript${_GS_SELECTED}${_GS_STATIC:?:-base} +_GS_X11_PORT= print/ghostscript${_GS_SELECTED}${_GS_STATIC:?:-x11} . for type in BUILD LIB RUN TEST . if defined(_GS_${type}_DEP) -. if !defined(_GS_FLAVORED) || !${_GS_ARGS:Mx11} +. if !defined(_GS_STATIC) || !${_GS_ARGS:Mx11} . if ${type:MLIB} ${type}_DEPENDS+= ${_GS_LIB}:${_GS_PORT} . else