From nobody Wed Jul 06 18:24:11 2022 X-Original-To: dev-commits-ports-main@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 C101C1CF91D8; Wed, 6 Jul 2022 18:24:11 +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 4LdScC4cTYz3gxn; Wed, 6 Jul 2022 18:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657131851; 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=9BGre9y6zp1IyshLLhsGzsLfmtaZ1De5ic7slI/OssM=; b=yONgx6sRCRuYsxCO8JOM6n7AhiZjfgGqIcXf7gnT88BgP0a98WyvUXhVt76lhM10uni9Em czXKPC+HOOSPjVGhjtmwmgAZ+murOLtTi6FPQ+51hv4HKl86SQ1lpFPlRYistnLp0Dae7p 0Sm1K1Rs9rYOYpYgWjS213mNF9lvFe0X+u3LTq555zjnb0SCGczyCmMJip4USB8Zr4drm1 bHBcqgvEqFZGFb44qEBbq67nUxEWkiZvFQdfjvvhdCNUiY3GIkASNi9KfJelpQ8/0SWVJ9 jZBni7ZMhBHq2Y/QkVusGlaUDKLyPQmq1iq1qmcXIucoxHgtwYef9BA8lpMIbA== 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 7D3EC1F85D; Wed, 6 Jul 2022 18:24:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 266IOBme092797; Wed, 6 Jul 2022 18:24:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 266IOBQu092796; Wed, 6 Jul 2022 18:24:11 GMT (envelope-from git) Date: Wed, 6 Jul 2022 18:24:11 GMT Message-Id: <202207061824.266IOBQu092796@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: "Tobias C. Berner" Subject: git: cd3b7e7e2c94 - main - graphics/poppler: fix build in unclean environment List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tcberner X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd3b7e7e2c9442aeeec9c489aa83efa626410d63 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657131851; 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=9BGre9y6zp1IyshLLhsGzsLfmtaZ1De5ic7slI/OssM=; b=N/Spb99at609WExs1AHz+yZroZlTzaclDdKLrAYjqX86Rlr6UDM1GMC80tbERrPurGZRfz +S/1swnbdTa6+2oh5wNjJMuHthJySqZvT6R5OqWPCS5VwiCyjJbOhFwc1KwSBYL+FPwGPG lXJTiU9TIjm3kS0faGRlb/2KnqIVdpk6OuuZWUSUA56axaD5WhgBQ1/xTEV+2wwvHrONc9 qpVdv4uT/1XfMHtvoHxMLNBMqYdL4KuqHDqHr3KBILdrVx8TTG8Ii4chMf5hmnp8sgQ6TM IoGp0tsxCWP3Nx2NEqpz7KOQEB/WXz/fv/yv28VYQVlZ9OYv4GxXFVEfE2ykFQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657131851; a=rsa-sha256; cv=none; b=RQOZxsjC0Hm7Oe51/VhAcPwr7CM+Lndnz9mGMpem9AxNrfgIcmcJ55FYEGFSdiWSMEme5f yoC6Q+gxmPqeqebdvk0vGW6lqgb3agn7D8sYiekYchYoVJv/OrUi4zmzV58VhOKbngwlZv flNLdUpr2lPsP2BmXqkTd4M8jt73lydxRCTN6rs2rOaq7TQH0pSrjs4JgqhnrG3X5Q26Np wF+MuBTQMHaAYgb8eHNuiN/D74QCqZYR8Lt3w4hxw3qCmem01XiM4Y9kz7TGpRyfq/4Lx3 ow7UHpAI/zFetVSIs88OsHBpOHaOgy26Jjlg5EnkCD4PNSf10N0rlLIvu8Fcjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by tcberner: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd3b7e7e2c9442aeeec9c489aa83efa626410d63 commit cd3b7e7e2c9442aeeec9c489aa83efa626410d63 Author: Tobias C. Berner AuthorDate: 2022-07-06 17:53:29 +0000 Commit: Tobias C. Berner CommitDate: 2022-07-06 18:23:47 +0000 graphics/poppler: fix build in unclean environment poppler will run gperf, when it is present which may be the case in an unclean environment. To make this consistent, always pull in gperf, and use gsed to work around sed/gsed differences. Reported by: VVD --- graphics/poppler/Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile index 7aa604f204eb..7ddf93fda852 100644 --- a/graphics/poppler/Makefile +++ b/graphics/poppler/Makefile @@ -18,10 +18,11 @@ LIB_DEPENDS= libnspr4.so:devel/nspr \ libfreetype.so:print/freetype2 \ libnss3.so:security/nss \ libfontconfig.so:x11-fonts/fontconfig -BUILD_DEPENDS= ${LOCALBASE}/include/boost/container/small_vector.hpp:devel/boost-libs +BUILD_DEPENDS= ${LOCALBASE}/include/boost/container/small_vector.hpp:devel/boost-libs \ + gsed:textproc/gsed RUN_DEPENDS= poppler-data>0:graphics/poppler-data -USES= cmake:insource compiler:c++17-lang cpe gnome jpeg libtool \ +USES= cmake:insource compiler:c++17-lang cpe gnome gperf jpeg libtool \ localbase pathfix pkgconfig tar:xz CPE_VENDOR= freedesktop USE_GNOME= cairo libxml2 @@ -44,6 +45,9 @@ CMAKE_ARGS+= -DCMAKE_IGNORE_PATH:PATH=${PREFIX}/lib/openjpeg-1.5 _POPPLER_SLAVES= library glib qt5 utils _SLAVE_PORT?= library +BINARY_ALIAS= gperf=${GPERF} \ + sed=${LOCALBASE}/bin/gsed + # Activate the wanted module, and deactivate the others. CMAKE_ON+= ENABLE_${_SLAVE_PORT:tu} CMAKE_OFF+= ${_POPPLER_SLAVES:N${_SLAVE_PORT}:tu:S/^/ENABLE_/}