Attachment 244822 Details for Bug 272541 – Update ghostscript.mk (Git-formatted patch)

[patch] Update ghostscript.mk (Git-formatted patch)

0002-ghostscript.mk-replace-flavors.patch (text/plain), 1.63 KB, created by Michael Osipov on 2023-09-14 07:19:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2023-09-14 07:19:06 UTC

Size: 1.63 KB

patch

obsolete

>From 0f6907c0780dea3de85a3f582e4bfa36f742804c Mon Sep 17 00:00:00 2001
>From: Michael Osipov <michael.osipov@siemens.com>
>Date: Thu, 31 Aug 2023 15:18:05 +0200
>Subject: [PATCH 2/2] ghostscript.mk: replace flavors
>
>Flavors for GS 10 create confliciting dependencies, therefore resort to
>port options.
>---
> 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
>-- 
>2.41.0
>

Flags:

michael.osipov: maintainer-approval+

Actions: View | Diff

Attachments on bug 272541: 244520 | 244521 | 244821 | 244822