git: e64dd94c22dc - main - bsd.port.mk: remove FORCE_POST
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Wed, 15 Jun 2022 12:53:15 UTC
The branch main has been updated by bapt:
URL: https://cgit.FreeBSD.org/ports/commit/?id=e64dd94c22dc59ad474126f79c0e4374519c0618
commit e64dd94c22dc59ad474126f79c0e4374519c0618
Author: Baptiste Daroussin <bapt@FreeBSD.org>
AuthorDate: 2022-06-15 12:44:24 +0000
Commit: Baptiste Daroussin <bapt@FreeBSD.org>
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