From nobody Tue Jan 16 07:55:53 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4TDhCF3FYpz574Jk; Tue, 16 Jan 2024 07:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4TDhCF2hFTz4HBw; Tue, 16 Jan 2024 07:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705391753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=24KDOkyqYP83mB54j+uraM2lQ17gFXsYJK7uJUG8aM4=; b=TGt5TPhOI7cXwWzd1MiahUVf7KbD5HprvJeV4CsFRFTOuX4JtSCHoPYuaXxrEPLlqJtH+P XIi/jnAq2c11erDClyFRgwtr1QeKpqgEos/wDvzJyX7JwJzHp6xpqidchu7Cl9CKqVZoJW jA3AxkMN61D996t8Ch2XW/fBKRQWj0G9qyqk0f18G++tmZM++WxlYaAFNE0qMFZMG0zd6P n+PL+T0wpoZnIyW1+3dR33pCXxTWzb5lA4zKyUR4KXHViqbTZ8vWkv5X9Onew+MSvL0LCX IAMzbvbpf5+p9/O1honGTRPVGfvPcNt3B9f7sxMc73JMUMsPww3w95Y10S3Kxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1705391753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=24KDOkyqYP83mB54j+uraM2lQ17gFXsYJK7uJUG8aM4=; b=cxyjNHjkcJYIy0UgtFqpnGJet2hPk5ApYolFk+Ea4XiZ9KO6z43kwchqZX7xUpe9qB3jbO rZLqtC4fJDUshUj1BceuN8gOmkLTXmfBi+mv1ZsUstzyriUydRnWVLWutc75A6fagqrevh GTKs/380dtWmxPG75btB/1Q9MUPzODDRTgOyxLDcdXbV4CwxDLvrQRaSttbF6e5H3U8uas DjoFPSvdP74cGJpazBX8XOf9DAG2O34jYhXoSiM3lrKtvaJZuHF7Ba/IWDoKIct1UkpfHu mEK8T7qT8bMIyhA3oOVsKbfKpHh04Wo89IAHsPPueGZh0MBnYEwxu5DPK1QaHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1705391753; a=rsa-sha256; cv=none; b=li4L30NIr0A0yq3vaDt7KO+iVKXgv81+K4x7pUr50sZRt55Us+UzWJOpia4FS5D4uCFX5F sSzATu38OZGacjFqlALhWoUI8SaewYjXY7zIS/kBkTcnWUXr+szLx+6MxsukjSgCR42SC2 L6vP60F29iVQziiRMLundZ/Tt+jhuIp6blcJI2cMLkecjGU0vYUeLNx1Ov5TfDuxXzn+ug P30+3nEZ0lJqQfQpHNODt0Lkhr1nidUYajMMQT4/qZs1GUOgtVa/VGgJrDeJ+5cpKwVhtr wEfSucAUSmGIkKalQ2ajNrzYM1Wea0sBIyNq9J/z0zzvk0mrXiBHzDmXaXlAag== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4TDhCF1lzpzXvp; Tue, 16 Jan 2024 07:55:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40G7trrT078741; Tue, 16 Jan 2024 07:55:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40G7trN1078738; Tue, 16 Jan 2024 07:55:53 GMT (envelope-from git) Date: Tue, 16 Jan 2024 07:55:53 GMT Message-Id: <202401160755.40G7trN1078738@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: c93c7dfb0a57 - main - graphics/ImageMagick7: Fix MagickWand-config. List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c93c7dfb0a57d84933aa7eaa9a25044e44912ed9 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c93c7dfb0a57d84933aa7eaa9a25044e44912ed9 commit c93c7dfb0a57d84933aa7eaa9a25044e44912ed9 Author: Gleb Popov AuthorDate: 2024-01-16 07:54:12 +0000 Commit: Gleb Popov 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)