git: c93c7dfb0a57 - main - graphics/ImageMagick7: Fix MagickWand-config.

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Gleb Popov <arrowd_at_FreeBSD.org>
Date: Tue, 16 Jan 2024 07:55:53 UTC

The branch main has been updated by arrowd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c93c7dfb0a57d84933aa7eaa9a25044e44912ed9

commit c93c7dfb0a57d84933aa7eaa9a25044e44912ed9
Author:     Gleb Popov <arrowd@FreeBSD.org>
AuthorDate: 2024-01-16 07:54:12 +0000
Commit:     Gleb Popov <arrowd@FreeBSD.org>
CommitDate: 2024-01-16 07:55:35 +0000

    graphics/ImageMagick7: Fix MagickWand-config.
    
    Make it not override PKG_CONFIG_LIBDIR passed from the environment.
    
    PR:             276360
    Fixes:  c6cb95d84055ddff74d65ffbfc928ca94a9cf8a7
---
 graphics/ImageMagick7/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index 422a43bec913..f4a8a402ccdb 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	ImageMagick
 DISTVERSION=	7.1.1-26
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	https://ftp.acc.umu.se/mirror/imagemagick.org/ftp/releases/ \
 		https://mirror.dogado.de/imagemagick/releases/ \
@@ -331,6 +332,7 @@ post-patch:
 		${WRKSRC}/MagickCore/ImageMagick.pc.in \
 		${WRKSRC}/MagickWand/MagickWand-config.in \
 		${WRKSRC}/MagickWand/MagickWand.pc.in
+	@${REINPLACE_CMD} -e '/^export PKG_CONFIG_LIBDIR/d' ${WRKSRC}/MagickWand/MagickWand-config.in
 
 pre-configure:
 .if defined(_IMAGEMAGICK_THREADS_PERL_MSG)