Attachment 243261 Details for Bug 270989 – Fix graphics/graphviz

[patch] Fix graphics/graphviz

0004-graphics-graphviz-make-proper-use-of-ghostcript.mk-U.patch (text/plain), 1.88 KB, created by Michael Osipov on 2023-07-05 08:48:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2023-07-05 08:48:38 UTC

Size: 1.88 KB

patch

obsolete

>From 95973db41e3ccc1f00bf5be9ae867c05c5860e79 Mon Sep 17 00:00:00 2001
>From: Michael Osipov <michael.osipov@siemens.com>
>Date: Wed, 5 Jul 2023 10:44:13 +0200
>Subject: [PATCH 4/4] graphics/graphviz: make proper use of ghostcript.mk
> (USES=ghostscript:...)
>
>This properly merges ghostscript args instead of overriding them. The ports
>system does not support merging of USES args.
>---
> graphics/graphviz/Makefile | 16 +++++++++++++---
> 1 file changed, 13 insertions(+), 3 deletions(-)
>
>diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
>index 6f7fe8668fb4..135cca7a76cf 100644
>--- a/graphics/graphviz/Makefile
>+++ b/graphics/graphviz/Makefile
>@@ -90,7 +90,6 @@ GTK2_USES=	gnome xorg
> GTK2_USE=	XORG=sm,ice,xext,xinerama,xi,xrandr,xcursor,xfixes GNOME=gtk20
> SMYRNA_USES=	gnome gl
> SMYRNA_USE=	GNOME=libglade2,pangox-compat,gdkpixbuf2 GL=glut,glu,gl
>-GHOSTSCRIPT_USES=ghostscript
> PERL_USES=	perl5
> PHP_USES=	php:build gnome
> PHP_USE=	GNOME=libxml2
>@@ -100,7 +99,7 @@ RUBY_USES=	ruby
> LUA_USES=	lua
> TK_USES=	tk:build
> GO_USES=	go:no_targets
>-DOCS_USES=	ghostscript:build groff
>+DOCS_USES=	groff
> 
> POPPLER_LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
> ANN_LIB_DEPENDS=	libann.so:math/ann
>@@ -112,7 +111,6 @@ GUILE_LIB_DEPENDS=	libguile-2.2.so:lang/guile2 \
> 			libgc-threaded.so:devel/boehm-gc-threaded
> PHP_LIB_DEPENDS=	libpcre.so:devel/pcre \
> 			libargon2.so:security/libargon2
>-GHOSTSCRIPT_LIB_DEPENDS=	libgs.so:${_GS_PORT}
> 
> XPM_CONFIGURE_WITH=		x
> XPM_CONFIGURE_ENV=		ac_cv_header_sys_inotify_h=no
>@@ -225,6 +223,18 @@ CONFIGURE_ARGS+=	--disable-swig
> CONFIGURE_ENV+=		SWIG="/nonexistent"
> .endif
> 
>+.if ${PORT_OPTIONS:MGHOSTSCRIPT}
>+USES_GHOSTSCRIPT_ARGS+=	lib
>+.endif
>+
>+.if ${PORT_OPTIONS:MDOCS}
>+USES_GHOSTSCRIPT_ARGS+=	build
>+.endif
>+
>+.if defined(USES_GHOSTSCRIPT_ARGS)
>+USES+=	ghostscript:${USES_GHOSTSCRIPT_ARGS:ts,}
>+.endif
>+
> .include <bsd.port.pre.mk>
> 
> post-patch:
>-- 
>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