Attachment 243151 Details for Bug 270989 – Patch for point 3 + 5

[patch] Patch for point 3 + 5

0001-ghostscript.mk-clean-up-and-update.patch (text/plain), 3.73 KB, created by Michael Osipov on 2023-07-02 17:38:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2023-07-02 17:38:15 UTC

Size: 3.73 KB

patch

obsolete

>From 89b69f5038c17c535a2c6557c4e946eac18b4793 Mon Sep 17 00:00:00 2001
>From: Chad Jacob Milios <milios@ccsys.com>
>Date: Mon, 24 Apr 2023 21:12:13 +0200
>Subject: [PATCH] ghostscript.mk: clean up and update
>
>* Remove all dead ports before version 9
>* Add version 10
>* Make 9 and agpl synonymous
>
>Co-authored-by: Michael Osipov <michael.osipov@siemens.com>
>---
> Mk/Uses/ghostscript.mk     | 45 ++++++++++++++++++++++++--------------
> Mk/bsd.default-versions.mk |  2 +-
> 2 files changed, 29 insertions(+), 18 deletions(-)
>
>diff --git a/Mk/Uses/ghostscript.mk b/Mk/Uses/ghostscript.mk
>index af38582e8384..bf6d311a8fa4 100644
>--- a/Mk/Uses/ghostscript.mk
>+++ b/Mk/Uses/ghostscript.mk
>@@ -4,8 +4,8 @@
> # Usage:	USES=ghostscript or USES=ghostscript:args
> # Valid ARGS:	<version>, 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
>+_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.1_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
>-- 
>2.40.1
>

Actions: View | Diff

Attachments on bug 270989: 241643 | 241701 | 241702 | 241703 | 241705 | 241706 | 241707 | 241733 | 241823 | 241824 | 242786 | 242787 | 242788 | 242846 | 242848 | 242939 | 242946 | 243151 | 243258 | 243259 | 243260 | 243261