diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index 2b1abd1d506e..c255a3ddcc29 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	pkg
-DISTVERSION=	2.7.5
+DISTVERSION=	2.8.0
 _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}"
+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
-CFLAGS+=	-Wno-error
 
 OPTIONS_DEFINE=	DOCS
 
 .if !exists(/usr/include/jail.h)
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-docs_pkg.8
 .endif
 
 .include <bsd.port.pre.mk>
 
 .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
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpkg.so ${STAGEDIR}${PREFIX}/sbin/pkg*
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS ${STAGEDIR}${DOCSDIR}/NEWS
 
 .include <bsd.port.post.mk>
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index b8207735dcc1..f22a3690fb17 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1777461622
-SHA256 (freebsd-pkg-2.7.5_GH0.tar.gz) = 51d726f52ad750fcde14d5f041d43df5b12ea4a6f143777c6b02ed7df16ceb39
-SIZE (freebsd-pkg-2.7.5_GH0.tar.gz) = 12347555
+TIMESTAMP = 1784538459
+SHA256 (freebsd-pkg-2.8.0_GH0.tar.gz) = 4e91a5d0e2f487dabbae6493784cc3dd16f1f07017c2cadd6d4dc2bf388d278d
+SIZE (freebsd-pkg-2.8.0_GH0.tar.gz) = 12278833
diff --git a/ports-mgmt/pkg/files/patch-src_Makefile.autosetup b/ports-mgmt/pkg/files/patch-src_Makefile.autosetup
deleted file mode 100644
index 4c3991975e7f..000000000000
--- a/ports-mgmt/pkg/files/patch-src_Makefile.autosetup
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/Makefile.autosetup.orig	2022-12-11 18:22:41 UTC
-+++ src/Makefile.autosetup
-@@ -93,7 +93,7 @@ pkg-static: $(OBJS) $(top_builddir)/libpkg/libpkg_flat
- install: install-static
- 
- pkg-static: $(OBJS) $(top_builddir)/libpkg/libpkg_flat.a
--	$(CC) -o $@ $(OBJS) $(STATIC_ARG) $(LDFLAGS) $(STATIC_LDFLAGS)
-+	$(CC) -o $@ $(OBJS) $(STATIC_ARG) $(STATIC_LDFLAGS)
- 
- install-static: pkg-static
- 	install -d -m 755 $(DESTDIR)$(sbindir)
diff --git a/ports-mgmt/pkg/pkg-plist b/ports-mgmt/pkg/pkg-plist
index 8f3ca495cb16..b3c37a629d8d 100644
--- a/ports-mgmt/pkg/pkg-plist
+++ b/ports-mgmt/pkg/pkg-plist
@@ -1,68 +1,70 @@
 etc/bash_completion.d/_pkg.bash
 etc/periodic/daily/411.pkg-backup
 etc/periodic/daily/490.status-pkg-changes
 etc/periodic/security/405.pkg-base-audit
 etc/periodic/security/410.pkg-audit
 etc/periodic/security/460.pkg-checksum
+etc/periodic/security/470.pkg-dependencies
 etc/periodic/weekly/400.status-pkg
 @sample etc/pkg.conf.sample
 include/pkg.h
 include/pkg/audit.h
+include/pkg/checksum.h
 include/pkg/vec.h
 lib/libpkg.a
 lib/libpkg.so
 lib/libpkg.so.4
 libdata/pkgconfig/pkg.pc
 sbin/pkg
 sbin/pkg-static
 share/man/man3/pkg_create.3.gz
 share/man/man3/pkg_printf.3.gz
 share/man/man3/pkg_repo_create.3.gz
 share/man/man3/pkg_repos.3.gz
 share/man/man5/pkg-keywords.5.gz
 share/man/man5/pkg-lua-script.5.gz
 share/man/man5/pkg-repository.5.gz
 share/man/man5/pkg-script.5.gz
 share/man/man5/pkg-triggers.5.gz
 share/man/man5/pkg.conf.5.gz
 share/man/man8/pkg-add.8.gz
 share/man/man8/pkg-alias.8.gz
 share/man/man8/pkg-annotate.8.gz
 share/man/man8/pkg-audit.8.gz
 share/man/man8/pkg-autoremove.8.gz
 share/man/man8/pkg-check.8.gz
 share/man/man8/pkg-clean.8.gz
 share/man/man8/pkg-config.8.gz
 share/man/man8/pkg-create.8.gz
 share/man/man8/pkg-delete.8.gz
 share/man/man8/pkg-fetch.8.gz
 share/man/man8/pkg-help.8.gz
 share/man/man8/pkg-info.8.gz
 share/man/man8/pkg-install.8.gz
 share/man/man8/pkg-key.8.gz
 share/man/man8/pkg-lock.8.gz
 share/man/man8/pkg-plugins.8.gz
 share/man/man8/pkg-query.8.gz
 share/man/man8/pkg-register.8.gz
 share/man/man8/pkg-remove.8.gz
 share/man/man8/pkg-repo.8.gz
 share/man/man8/pkg-repositories.8.gz
 share/man/man8/pkg-rquery.8.gz
 share/man/man8/pkg-search.8.gz
 share/man/man8/pkg-set.8.gz
 share/man/man8/pkg-shell.8.gz
 share/man/man8/pkg-shlib.8.gz
 share/man/man8/pkg-ssh.8.gz
 share/man/man8/pkg-static.8.gz
 share/man/man8/pkg-stats.8.gz
 share/man/man8/pkg-triggers.8.gz
 share/man/man8/pkg-unlock.8.gz
 share/man/man8/pkg-unregister.8.gz
 share/man/man8/pkg-update.8.gz
 share/man/man8/pkg-updating.8.gz
 share/man/man8/pkg-upgrade.8.gz
 share/man/man8/pkg-version.8.gz
 share/man/man8/pkg-which.8.gz
 share/man/man8/pkg.8.gz
 share/zsh/site-functions/_pkg
 @dir lib/compat/pkg