From nobody Wed Jun 15 12:53:15 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 C423B831DAF; Wed, 15 Jun 2022 12:53:15 +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 4LNQG352vkz3tpf; Wed, 15 Jun 2022 12:53:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655297595; 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=WvVLr6kbbR/CyAJvz7f5GblP5/PF8hL+noQo5JtIdRE=; b=laijN41AFtrJIwFUehx2eA7KLbmnE0lODT9nCIlqiZFG5EZXpe4nsMXi2yhRTY6ImdQ3hx srgyr92sQ9GbDO45srJcUIPr1gEm8DOPSIJrP+13BVeGlmkoO0ylRq+q5KrG23SI03Usgf dpe0kzSbx4Kn4hLDTx2xEjKLJgkMySwJwutWwY9mdlVrvhwGU/et+XQnFFG15YXwcgcniC Rr3xe9Vedmskh3YT1bZPAVsUwp3D80gtwEaUfL3bnMq5gwuZcIzszSLfnWdxyjsa6ZZTPE XYByU/idk0xayQ7mUALYcJTlyW824YiUBLYpzGuP84YmOqidjZanwDoPENUMng== 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 8CF241E6FF; Wed, 15 Jun 2022 12:53:15 +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 25FCrF2L068739; Wed, 15 Jun 2022 12:53:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25FCrFtW068738; Wed, 15 Jun 2022 12:53:15 GMT (envelope-from git) Date: Wed, 15 Jun 2022 12:53:15 GMT Message-Id: <202206151253.25FCrFtW068738@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Baptiste Daroussin Subject: git: e64dd94c22dc - main - bsd.port.mk: remove FORCE_POST 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: bapt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e64dd94c22dc59ad474126f79c0e4374519c0618 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655297595; 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=WvVLr6kbbR/CyAJvz7f5GblP5/PF8hL+noQo5JtIdRE=; b=fdDzLzsePLXR+FtV9qAmIQcSg1JMLVyQgbm5dJbtwk9/tvntQWABp9/mcvviBxWgLd6u8Y V+v+J2BpxUrj6vefcf9KxaYu7Pa8N3YIKRyx7nk/7hrJeLfA6IFc50ANqmFVgKdVTNx28a bJ84lVV07XE8w7i83L2oGNg/fLcR4zrY8ZrW+onzXru6jLKf8ySxpBddw4esjQbZDlchdd 4B9yD66XKzF1ZXuszr6dc/WTGih/fk4h0BO0S1j4rVok8enwbo8L7Vl1pW4rz85JIhzjCo QvpIFXJEOIe7pe01t9uSdQv5XRhAxcmKgEjdTm75u0FwV1mYBIDQlkXWnWfv2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655297595; a=rsa-sha256; cv=none; b=fY0k2w6n8szIZk9L5QvPfNe2xcX3z0jvbTf61qElZxa4Fs2yM3GlLaatNwVYyRCM84rhzS 3EHzS1keMdzKm+/1eZFyNdjhJMGAQWSFlirFIz/CwUzVjM43T08TesiBjQMWvvVkzBfRBe ruxCNlcIg7fQjtpirdrItGxwQi6SCDiTOOBoDek5hW2nlYicdB9VETE63KG5FCKOI5YZkM jrrXxa+iLSl639IDy5TYFwCZUelwTGUq50QTuTtZ+e+Lnlf0xWXrKb++tUJ0A57CW3J3im yuDd4ouw4KxdtGJ6KI8NNg0rr6wAiKyuuD+l0PSX5Y3rxPTmOKYCktV2c5VB7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/ports/commit/?id=e64dd94c22dc59ad474126f79c0e4374519c0618 commit e64dd94c22dc59ad474126f79c0e4374519c0618 Author: Baptiste Daroussin AuthorDate: 2022-06-15 12:44:24 +0000 Commit: Baptiste Daroussin CommitDate: 2022-06-15 12:52:44 +0000 bsd.port.mk: remove FORCE_POST FORCE_POST was a temporary solution when migrating from pkg_tools to pkg now that everything can directly enforce when it is executed, it is not needed anymore (and actually pkg is not looking for it anymore) --- Mk/bsd.port.mk | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 0ed05289ef76..128407c7f069 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1916,16 +1916,6 @@ PKGPOSTINSTALL?= ${PKGDIR}/pkg-post-install PKGPREDEINSTALL?= ${PKGDIR}/pkg-pre-deinstall PKGPOSTDEINSTALL?= ${PKGDIR}/pkg-post-deinstall -_FORCE_POST_PATTERNS= rmdir kldxref mkfontscale mkfontdir fc-cache \ - fonts.dir fonts.scale gtk-update-icon-cache \ - gtk-query-immodules \ - ldconfig \ - load-octave-pkg \ - ocamlfind \ - update-desktop-database update-mime-database \ - catalog.ports \ - ccache-update-links - . if defined(USE_LOCAL_MK) .include "${PORTSDIR}/Mk/bsd.local.mk" . endif @@ -3418,7 +3408,7 @@ ${PKGOLDSIGFILE}: ${PKGLATESTREPOSITORY} # from here this will become a loop for subpackages ${WRKDIR_PKGFILE}: ${TMPPLIST} create-manifest ${WRKDIR}/pkg - @if ! ${SETENV} ${PKG_ENV} FORCE_POST="${_FORCE_POST_PATTERNS}" ${PKG_CREATE} ${PKG_CREATE_ARGS} -m ${METADIR} -p ${TMPPLIST} -o ${WRKDIR}/pkg ${PKGNAME}; then \ + @if ! ${SETENV} ${PKG_ENV} ${PKG_CREATE} ${PKG_CREATE_ARGS} -m ${METADIR} -p ${TMPPLIST} -o ${WRKDIR}/pkg ${PKGNAME}; then \ cd ${.CURDIR} && eval ${MAKE} delete-package >/dev/null; \ exit 1; \ fi