Attachment 241643 Details for Bug 270989 – bring ghostscript10 onto USES

[patch] bring ghostscript10 onto USES

ghostscript10.patch (text/plain), 5.96 KB, created by Chad Jacob Milios on 2023-04-21 21:51:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Chad Jacob Milios

Created: 2023-04-21 21:51:22 UTC

Size: 5.96 KB

patch

obsolete

>diff --git a/Mk/Uses/ghostscript.mk b/Mk/Uses/ghostscript.mk
>index ea76af70ef47..bea57ce47741 100644
>--- a/Mk/Uses/ghostscript.mk
>+++ b/Mk/Uses/ghostscript.mk
>@@ -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=	7 8 9 agpl
>+_GS_VERSION=	7 8 9 agpl 10
> 
> _GS_ARGS=		${ghostscript_ARGS}
> 
>-.  if ${_GS_ARGS:N[789]:Nagpl:Nx11:Nbuild:Nrun:Ntest}
>+.  if ${_GS_ARGS:N[789]:Nagpl:N10:Nx11:Nbuild:Nrun:Ntest}
> IGNORE?=	Unknown ghostscript argument ${_GS_ARGS}
> .  endif
> 
>-.  if ${GHOSTSCRIPT_DEFAULT:N[789]:Nagpl}
>+.  if ${GHOSTSCRIPT_DEFAULT:N[789]:Nagpl:N10}
> IGNORE?=	Invalid GHOSTSCRIPT_DEFAULT value: ${GHOSTSCRIPT_DEFAULT}, please select one of ${_GS_VERSION}
> .  endif
> 
>@@ -67,7 +67,9 @@ _GS_RUN_DEP=	yes
> .undef _GS_SELECTED
> .  for V in ${_GS_ARGS} ${GHOSTSCRIPT_DEFAULT}
> _V=${V}
>-.    if ${_V:M9}
>+.    if ${_V:M10}
>+_GS_SELECTED?=		10
>+.    elif ${_V:M9}
> _GS_SELECTED?=		9
> .    elif ${_V:Magpl}
> _GS_SELECTED?=		9-agpl
>@@ -78,8 +80,16 @@ _GS_SELECTED?=		7
> .    endif
> .  endfor
> 
>+
>+.undef _GS_FLAVORED
>+.  if empty(_GS_SELECTED:M[789]*)
>+_GS_FLAVORED=	yes
>+.  endif
>+
> # Resolve minor version number for X11.so library.
>-.  if !empty(_GS_SELECTED:M9-agpl)
>+.  if !empty(_GS_SELECTED:M10)
>+_GS_VERSION_MINOR=	10.01.1_1
>+.  elif !empty(_GS_SELECTED:M9-agpl)
> _GS_VERSION_MINOR=	9.16_2
> .  elif !empty(_GS_SELECTED:M9)
> _GS_VERSION_MINOR=	9.06_11
>@@ -90,14 +100,16 @@ _GS_VERSION_MINOR=	7.07_32
> .  endif
> 
> # dependencies
>-_GS_PORT=	ghostscript${_GS_SELECTED}-base
>-_GS_X11_PORT=	ghostscript${_GS_SELECTED}-x11
>+_GS_PKGBASE=	ghostscript${_GS_SELECTED}-base
>+_GS_X11_PKGBASE=	ghostscript${_GS_SELECTED}-x11
>+_GS_PORT=	ghostscript${_GS_SELECTED}${_GS_FLAVORED:?@:-}base
>+_GS_X11_PORT=	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}
>+${type}_DEPENDS+=	${_GS_PKGBASE}>=${_GS_VERSION_MINOR}:print/${_GS_PORT}
> .      if ${_GS_ARGS:Mx11}
>-${type}_DEPENDS+=	${_GS_X11_PORT}>=${_GS_VERSION_MINOR}:print/${_GS_X11_PORT}
>+${type}_DEPENDS+=	${_GS_X11_PKGBASE}>=${_GS_VERSION_MINOR}:print/${_GS_X11_PORT}
> .      endif
> .    endif
> .  endfor
>diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk
>index 918791917d77..10a9c4b8e99e 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: 7, 8, 9, agpl
>+# Possible values: 7, 8, 9, agpl, 10
> GHOSTSCRIPT_DEFAULT?=	agpl
> # Possible values: mesa-libs, mesa-devel
> GL_DEFAULT?=		mesa-libs
>diff --git a/print/ghostscript10/Makefile b/print/ghostscript10/Makefile
>index 15294e4fa350..f094f1f29150 100644
>--- a/print/ghostscript10/Makefile
>+++ b/print/ghostscript10/Makefile
>@@ -3,6 +3,7 @@ DISTVERSION=	10.01.1
> PORTREVISION=	1
> CATEGORIES=	print
> MASTER_SITES=	https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${DISTVERSION:S/.//g}/
>+PKGNAMESUFFIX=  ${PORTVERSION:C/\..*//}-${FLAVOR}
> 
> MAINTAINER=	michael.osipov@siemens.com
> COMMENT=	PostScript and PDF interpreter
>@@ -11,6 +12,9 @@ WWW=		https://ghostscript.com/
> LICENSE=	AGPLv3
> LICENSE_FILE=	${WRKSRC}/LICENSE
> 
>+FLAVORS=	base x11
>+FLAVOR?=	${FLAVORS:[1]}
>+
> LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
> 		libfreetype.so:print/freetype2 \
> 		libidn.so:dns/libidn \
>@@ -48,7 +52,6 @@ GNU_CONFIGURE=	yes
> CONFIGURE_ARGS=	--disable-compile-inits \
> 		--disable-dbus \
> 		--disable-gtk \
>-		--disable-dynamic \
> 		--enable-contrib \
> 		--enable-fontconfig \
> 		--enable-freetype \
>@@ -58,8 +61,11 @@ CONFIGURE_ARGS=	--disable-compile-inits \
> 		--with-libiconv=maybe \
> 		--with-libidn \
> 		--with-libpaper \
>-		--with-system-libtiff \
>-		--without-x
>+		--with-system-libtiff
>+
>+
>+GS_VERSION=	${DISTVERSION:S/./ /g:tw:[1..2]:tW:S/ /./}
>+PLIST_SUB=	GS_VERSION=${GS_VERSION}
> 
> OPTIONS_DEFINE=	CUPS IJS TESSERACT
> OPTIONS_DEFAULT=CUPS
>@@ -78,12 +84,37 @@ TESSERACT_CONFIGURE_WITH=	tesseract
> # No TESSERACT_LIB_DEPENDS=	libtesseract.so:graphics/tesseract
> # See https://bugs.ghostscript.com/show_bug.cgi?id=706490
> 
>-post-patch:
>+.if !empty(FLAVOR:Mx11)
>+USES+=		xorg
>+USE_XORG=	ice sm x11 xext xt
>+CONFIGURE_ARGS+=	--with-x \
>+                --disable-hidden-visibility \
>+		--enable-dynamic
>+ALL_TARGET=	./obj/X11.so
>+PLIST_FILES=	lib/ghostscript/${DISTVERSION}/X11.so
>+PLIST=
>+INSTALL_TARGET=	install-shared
>+.elif !empty(FLAVOR:Mbase)
>+CONFIGURE_ARGS+=	--without-x \
>+		--disable-dynamic
>+ALL_TARGET=	so
>+INSTALL_TARGET=	soinstall
>+.endif
>+
>+post-patch: post-patch-${FLAVOR}
>+post-install: post-install-${FLAVOR}
>+
>+post-patch-base:
> 	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
> 		${PATCH_WRKSRC}/man/gs.1
> 
>-post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gs
>+post-patch-x11:
>+	@:
>+
>+post-install-base:
>+	${MV} ${STAGEDIR}${PREFIX}/bin/gsc ${STAGEDIR}${PREFIX}/bin/gs
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/gs ${STAGEDIR}${PREFIX}/bin/gsx \
>+		${STAGEDIR}${PREFIX}/lib/libgs.so.${GS_VERSION}
> 	${RM} ${STAGEDIR}${PREFIX}/bin/lprsetup.sh
> 	${RM} ${STAGEDIR}${PREFIX}/bin/unix-lpr.sh
> 	${MKDIR} ${STAGEDIR}${PREFIX}/share/color/icc
>@@ -99,4 +130,7 @@ post-install:
> 	${RLN} ${STAGEDIR}${PREFIX}/share/cmap \
> 		${STAGEDIR}${DATADIR}/Resource/CMap
> 
>+post-install-x11:
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ghostscript/${DISTVERSION}/X11.so
>+
> .include <bsd.port.mk>
>diff --git a/print/ghostscript10/pkg-plist b/print/ghostscript10/pkg-plist
>index 861f38d4d3e3..70b34f742f47 100644
>--- a/print/ghostscript10/pkg-plist
>+++ b/print/ghostscript10/pkg-plist
>@@ -1,6 +1,7 @@
> bin/dvipdf
> bin/eps2eps
> bin/gs
>+bin/gsx
> bin/gsbj
> bin/gsdj
> bin/gsdj500
>@@ -22,6 +23,13 @@ bin/ps2pdf14
> bin/ps2pdfwr
> bin/ps2ps
> bin/ps2ps2
>+include/ghostscript/gdevdsp.h
>+include/ghostscript/gserrors.h
>+include/ghostscript/iapi.h
>+include/ghostscript/ierrors.h
>+lib/libgs.so
>+lib/libgs.so.10
>+lib/libgs.so.%%GS_VERSION%%
> man/man1/dvipdf.1.gz
> man/man1/eps2eps.1.gz
> man/man1/gs.1.gz

Flags:

milios: maintainer-approval? (michael.osipov)

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