diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile index d4bbdcd1fcd3..8064f8a682e6 100644 --- a/ports-mgmt/pkg/Makefile +++ b/ports-mgmt/pkg/Makefile @@ -1,64 +1,63 @@ PORTNAME= pkg -DISTVERSION= 2.8.1 -PORTREVISION= 1 +DISTVERSION= 2.8.2 _PKG_VERSION= ${DISTVERSION} CATEGORIES= ports-mgmt MAINTAINER= pkg@FreeBSD.org COMMENT= Package manager WWW= https://github.com/freebsd/pkg LICENSE= BSD2CLAUSE USE_GITHUB= yes GH_ACCOUNT= freebsd USE_LDCONFIG= ${PREFIX}/lib/compat/pkg HAS_CONFIGURE= yes PORTDOCS= NEWS PORTSCOUT= ignore:1 CONFIGURE_ARGS= --prefix="${PREFIX}" \ --mandir="${PREFIX}/share/man" CONFIGURE_ENV= CC_FOR_BUILD="${CC}" # Use a submake as 'deinstall install' needs to reevaluate PKG_REGISTER # so that pkg-static is used from the wrkdir USE_SUBMAKE= yes OPTIONS_DEFINE= DOCS .if !exists(/usr/include/jail.h) EXTRA_PATCHES= ${FILESDIR}/extra-patch-docs_pkg.8 .endif .include .if defined(WITH_DEBUG) MAKE_ARGS+= DEBUG_FLAGS="${DEBUG_FLAGS}" .endif .if defined(WITH_PKG) .if ${WITH_PKG} == devel IGNORE= WITH_PKG is defined to 'devel', this version is the stable one .endif .endif #define PKG_DEPENDS to nothing to avoid infinite loop looking for pkg :) PKG_DEPENDS= .undef INSTALLS_DEPENDS # Use the internal pkg instead, generally, unless this is a cross-build, # in which case that won't work. Hope for the best then. .if !defined(CROSS_TOOLCHAIN) PKG_BIN= ${WRKSRC}/src/pkg-static .endif post-install: ${INSTALL_DATA} ${WRKSRC}/src/pkg.conf.sample ${STAGEDIR}${PREFIX}/etc/ @${MKDIR} ${STAGEDIR}${PREFIX}/lib/compat/pkg post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS .include diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo index 461584fa8650..fcca697db0fe 100644 --- a/ports-mgmt/pkg/distinfo +++ b/ports-mgmt/pkg/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1784627675 -SHA256 (freebsd-pkg-2.8.1_GH0.tar.gz) = bdd051f9eb23846f916fbebda4a2c87cf7627992c72cddd7ac5d0e9b65b4488c -SIZE (freebsd-pkg-2.8.1_GH0.tar.gz) = 12279695 +TIMESTAMP = 1786361851 +SHA256 (freebsd-pkg-2.8.2_GH0.tar.gz) = 173cc7bbf24f971f83e08d53cd54e04913e23566f42a4bb9d985971572de7887 +SIZE (freebsd-pkg-2.8.2_GH0.tar.gz) = 12293323 diff --git a/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c b/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c deleted file mode 100644 index 719706e9e5f8..000000000000 --- a/ports-mgmt/pkg/files/patch-libpkg_pkg__jobs.c +++ /dev/null @@ -1,12 +0,0 @@ ---- libpkg/pkg_jobs.c.orig 2026-07-21 09:50:31 UTC -+++ libpkg/pkg_jobs.c -@@ -925,7 +925,8 @@ pkg_jobs_find_upgrade(struct pkg_jobs *j, const char * - "remote repo", pattern); - rc = pkg_jobs_universe_add_pkg(j->universe, p, &unit); - if (rc == EPKG_END) { -- pkg_free(p); -+ if (!pkg_in_universe(j->universe, p)) -+ pkg_free(p); - rc = EPKG_OK; - } - }