From nobody Sun Jul 2 18:43:34 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 4QvHxy2xgPz4lQHm; Sun, 2 Jul 2023 18:43:34 +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 4QvHxy2Pgpz4KFY; Sun, 2 Jul 2023 18:43:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688323414; 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=9ZTXSMjdcLr//hmnRGD68r8u3iH13YS/Z8tirlx9p+4=; b=L0eoFlcOANd+NuaV9Tav9VAIFo8d+eLDcl2K5buJDGACytD1gjye83pGS586WZ74x4KHER 5k57dDtOmDNW8i8DixlZDDVD9p+1lOwRb/zrTcbq8itzYcUpRKU/aLiqYKnxBHEHswHXIo Tv8YCg3IY54CjsVDbkNiKMqONt76xj4hHcfdzOq7qy3RJvga6XKtPoNaQkZy6w2yTNPwJ0 YCWRPG0Qq0hmWyPIKRkxlX2d0gTJlQ9RytJOoRg8Sl2lNNDd+VJdi20oxffo5JphrxnitL 13pcNrC80bRcz5Nkjt/9UmML3dJUGJlZodWC8jc05X9w/Zhz9v9SccXLAcOuVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688323414; 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=9ZTXSMjdcLr//hmnRGD68r8u3iH13YS/Z8tirlx9p+4=; b=vqtNd7pFOGSRUBtXewkYpF+iSh+GtEndPPcLO4P5zaLzNDEn+kJyk5cGk3x9Are93/KmGi o3sTVbwqF+tvgrp2gDpKtYs2W20107e+Muly6TTBFvBEFtyjB65maXSA2lAsojhTpAK/UZ wakD1SF+BvC3niOGRIRjbjnOIVfUmbN0ecQbEFHUi6Lj8uSiSMyRg9vIjI1nKs0jgd3XHS wtf3KnLroSHjjTVGFoLvswdrO0pMouxJPYdGBuDYYO0nkaKDDoM2qv7piiZ8JnpyQYL2Wj uiOpXRK0ynBTWU9zL8rA369braoIZ4OB3czsFjJamZwffwc8Qmesw96whaW+Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688323414; a=rsa-sha256; cv=none; b=S/RaGoaoStwOInU4fLnygam9bqjGx1vOYRUKtAI8NYDFegjyM+tCo7xDuxNIztaP/EZxwy HUgeO1XUFtEcO7TDxO2kOoSyZgDEmA1NR4iGl1cTf5yQHqii0I4QCd71QjvgZFzU2HzJh8 IQG7ph0zdbdPVF7r0krg+YJXHs9yVZ7KvS3FRMudpY4IQWsx2mCTCuRLQYyZ7zOb4J20hX b7zLuWUL1eYhufwFRIMnvn6ywcQ69+hlnHvoRdi5JJ6yXw1Ms+dJ3pws/uXVLLV4uk1PZQ 8+SbF//QJJ6MJpyxCCxbGOBz3jew5M3631KueYWHC6qpxDqc6WFD5+d80QfxfA== 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 4QvHxy1TdlzK2N; Sun, 2 Jul 2023 18:43:34 +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 362IhYlm083381; Sun, 2 Jul 2023 18:43:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 362IhYsj083380; Sun, 2 Jul 2023 18:43:34 GMT (envelope-from git) Date: Sun, 2 Jul 2023 18:43:34 GMT Message-Id: <202307021843.362IhYsj083380@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rene Ladan Subject: git: afa132c39bad - 2023Q3 - Mk: ghostscript: modernize 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: rene X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: afa132c39bad7dc75f8f8bcb2e7051434643afd7 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by rene: URL: https://cgit.FreeBSD.org/ports/commit/?id=afa132c39bad7dc75f8f8bcb2e7051434643afd7 commit afa132c39bad7dc75f8f8bcb2e7051434643afd7 Author: Rene Ladan AuthorDate: 2023-07-02 10:11:36 +0000 Commit: Rene Ladan CommitDate: 2023-07-02 18:43:17 +0000 Mk: ghostscript: modernize - add support for GhostScript 10 - bump versions for dependency lines - 9 and agpl are synonymous, represent this in the Makefile PR: 270989 (point 3 + 5) Reported by: Chad Jacob Milios (original) Continued work: Michael Osipov Reviewed by: diizzy MFH: 2023Q3 (cherry picked from commit dd152219f70da0465ee12edb1feeae5e2f802c51) --- Mk/Uses/ghostscript.mk | 43 +++++++++++++++++++++++++++---------------- Mk/bsd.default-versions.mk | 2 +- 2 files changed, 28 insertions(+), 17 deletions(-) diff --git a/Mk/Uses/ghostscript.mk b/Mk/Uses/ghostscript.mk index af38582e8384..8e5010986ccd 100644 --- a/Mk/Uses/ghostscript.mk +++ b/Mk/Uses/ghostscript.mk @@ -4,8 +4,8 @@ # Usage: USES=ghostscript or USES=ghostscript:args # Valid ARGS: , build, run, test, x11 # -# version The chooseable versions are 9 and agpl. If no version is -# specified version agpl is selected. +# version The chooseable versions are 9, agpl and 10. If no version is +# specified version agpl is selected. 9 and agpl are synonymous. # # USES=ghostscript:9 # Use Ghostscript 9 # USES=ghostscript:run # Use the set default Ghostscript as a run dependency @@ -30,15 +30,15 @@ _INCLUDE_USES_GHOSTSCRIPT_MK= yes # allowed versions # When adding a version, please keep the comment in # Mk/bsd.default-versions.mk in sync. -_GS_VERSION= 9 agpl +_GS_VERSION= 9 agpl 10 -_GS_ARGS= ${ghostscript_ARGS} +_GS_ARGS= ${ghostscript_ARGS} -. if ${_GS_ARGS:N[9]:Nagpl:Nx11:Nbuild:Nrun:Ntest} +. if ${_GS_ARGS:N9:N10:Nagpl:Nx11:Nbuild:Nrun:Ntest} IGNORE?= Unknown ghostscript argument ${_GS_ARGS} . endif -. if ${GHOSTSCRIPT_DEFAULT:N[9]:Nagpl} +. if ${GHOSTSCRIPT_DEFAULT:N9:Nagpl:N10} IGNORE?= Invalid GHOSTSCRIPT_DEFAULT value: ${GHOSTSCRIPT_DEFAULT}, please select one of ${_GS_VERSION} . endif @@ -67,29 +67,40 @@ _GS_RUN_DEP= yes .undef _GS_SELECTED . for V in ${_GS_ARGS} ${GHOSTSCRIPT_DEFAULT} _V=${V} -. if ${_V:M9} -_GS_SELECTED?= 9 +. if ${_V:M10} +_GS_SELECTED?= 10 +. elif ${_V:M9} +_GS_SELECTED?= 9-agpl . elif ${_V:Magpl} _GS_SELECTED?= 9-agpl . endif . endfor +. undef _GS_FLAVORED +. if empty(_GS_SELECTED:M9-agpl) +_GS_FLAVORED= yes +. endif + # Resolve minor version number for X11.so library. -. if !empty(_GS_SELECTED:M9-agpl) -_GS_VERSION_MINOR= 9.16_2 -. elif !empty(_GS_SELECTED:M9) -_GS_VERSION_MINOR= 9.06_11 +. if !empty(_GS_SELECTED:M10) +_GS_VERSION_MINOR= 10.01.2 +. elif !empty(_GS_SELECTED:M9-agpl) +_GS_VERSION_MINOR= 9.56.1 . endif # dependencies -_GS_PORT= ghostscript${_GS_SELECTED}-base -_GS_X11_PORT= ghostscript${_GS_SELECTED}-x11 +_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 . for type in BUILD RUN TEST . if defined(_GS_${type}_DEP) -${type}_DEPENDS+= ${_GS_PORT}>=${_GS_VERSION_MINOR}:print/${_GS_PORT} +. if defined(_GS_FLAVORED) || !${_GS_ARGS:Mx11} +${type}_DEPENDS+= ${_GS_PKGNAME}>=${_GS_VERSION_MINOR}:${_GS_PORT} +. endif . if ${_GS_ARGS:Mx11} -${type}_DEPENDS+= ${_GS_X11_PORT}>=${_GS_VERSION_MINOR}:print/${_GS_X11_PORT} +${type}_DEPENDS+= ${_GS_X11_PKGNAME}>=${_GS_VERSION_MINOR}:${_GS_X11_PORT} . endif . endif . endfor diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index e3fac4c45918..3cf846195760 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -53,7 +53,7 @@ GCC_DEFAULT?= 8 . else GCC_DEFAULT?= 12 . endif -# Possible values: 9, agpl +# Possible values: 9, agpl, 10 GHOSTSCRIPT_DEFAULT?= agpl # Possible values: mesa-libs, mesa-devel GL_DEFAULT?= mesa-libs