diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile index d6712d66b5ab..d4a06aff1b9f 100644 --- a/sysutils/pacman/Makefile +++ b/sysutils/pacman/Makefile @@ -1,91 +1,88 @@ PORTNAME= pacman -DISTVERSION= 7.0.0 -PORTREVISION= 1 +DISTVERSION= 7.1.0 CATEGORIES= sysutils MASTER_SITES= https://gitlab.archlinux.org/${PORTNAME}/${PORTNAME}/-/releases/v${DISTVERSION}/downloads/ MAINTAINER= vishwin@FreeBSD.org COMMENT= Package manager from Arch Linux WWW= https://pacman.archlinux.page/ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= bash:shells/bash RUN_DEPENDS= bash:shells/bash FLAVORS= default archlinux FLAVORS_SUB= yes default_CONFLICTS_INSTALL= archlinux-pacman archlinux_PKGNAMEPREFIX= archlinux- archlinux_CONFLICTS_INSTALL= pacman USES= cpe libarchive localbase meson perl5 pkgconfig python:build shebangfix ssl \ tar:xz CPE_VENDOR= ${PORTNAME}_project SHEBANG_FILES= ${WRKSRC}/scripts/makepkg-template.pl.in \ ${WRKSRC}/scripts/libmakepkg/lint_config.sh.in BINARY_ALIAS= python3=${PYTHON_CMD} MESON_ARGS= -Droot-dir=${PACMAN_ROOT} \ --localstatedir=${PACMAN_ROOT}/var \ -Dsysconfdir=${PREFIX}/etc \ -Dcrypto=openssl USE_LDCONFIG= yes SUB_FILES= pkg-message pkg-deinstall SUB_LIST= PACMAN_ROOT="${PACMAN_ROOT}" PREFIX="${PREFIX}" PLIST_SUB= PACMAN_ROOT="${PACMAN_ROOT:C,^${PREFIX}/,,}" PORTEXAMPLES= * PKGMESSAGE= ${PKGDIR}/pkg-message-${FLAVOR:U} OPTIONS_DEFINE= CURL EXAMPLES GPGME MANPAGES NLS OPTIONS_DEFAULT=CURL GPGME MANPAGES OPTIONS_EXCLUDE=NLS # XXX: meson cannot find ngettext(3) despite gettext-runtime OPTIONS_SUB= yes CURL_DESC= Use libcurl fetcher instead of external curl/wget CURL_MESON_ENABLED= curl CURL_LIB_DEPENDS= libcurl.so:ftp/curl MANPAGES_MESON_ENABLED= doc MANPAGES_BUILD_DEPENDS= a2x:textproc/asciidoc GPGME_DESC= Use GPGME for PGP signature verification GPGME_MESON_ENABLED= gpgme GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme NLS_USES= gettext-runtime gettext-tools NLS_MESON_TRUE= i18n -.if ${FLAVOR:U} == default -PACMAN_ROOT= ${PREFIX}/pacman -.elif ${FLAVOR:U} == archlinux +.if ${FLAVOR:U} == archlinux ONLY_FOR_ARCHS= amd64 ONLY_FOR_ARCHS_REASON= Arch Linux itself only supports amd64 PACMAN_ROOT= /compat/archlinux -PLIST_DIRS+= %%PACMAN_ROOT%%/var/cache \ - %%PACMAN_ROOT%%/var \ - /compat +PLIST_DIRS+= /compat +.else +PACMAN_ROOT= ${PREFIX}/pacman .endif .include post-patch: .if ${ARCH} == "i386" @${REINPLACE_CMD} -e '/^Architecture/ s|auto|i686|' ${WRKSRC}/etc/pacman.conf.in .endif .if ${ARCH} == "amd64" @${REINPLACE_CMD} -e '/^Architecture/ s|auto|x86_64|' ${WRKSRC}/etc/pacman.conf.in .endif post-install: @${MKDIR} ${STAGEDIR}${PREFIX}/etc/pacman.d post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_DATA} ${WRKSRC}/doc/PKGBUILD-example.txt ${STAGEDIR}${EXAMPLESDIR}/ .include diff --git a/sysutils/pacman/distinfo b/sysutils/pacman/distinfo index f7f588f24d9c..382d11cfec18 100644 --- a/sysutils/pacman/distinfo +++ b/sysutils/pacman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1746376035 -SHA256 (pacman-7.0.0.tar.xz) = 61cbd445d1381b4b184bc7c4e2791f07a79f0f2807b7c600399d0d08e8cd28cf -SIZE (pacman-7.0.0.tar.xz) = 903060 +TIMESTAMP = 1767489450 +SHA256 (pacman-7.1.0.tar.xz) = 530e50d7edbb2a22581c6d6707d2113240276c1bec4ee39a99488e1243c32171 +SIZE (pacman-7.1.0.tar.xz) = 932540 diff --git a/sysutils/pacman/files/patch-meson.build b/sysutils/pacman/files/patch-meson.build index b4b546714d07..433a28f2cb1d 100644 --- a/sysutils/pacman/files/patch-meson.build +++ b/sysutils/pacman/files/patch-meson.build @@ -1,41 +1,43 @@ ---- meson.build.orig 2024-03-04 03:07:58 UTC +--- meson.build.orig 2025-11-01 11:05:29 UTC +++ meson.build -@@ -197,7 +197,7 @@ if conf.has('HAVE_GETMNTINFO') +@@ -198,7 +198,7 @@ if conf.has('HAVE_GETMNTINFO') else conf.set('FSSTATSTYPE', 'struct statfs') endif -elif conf.has('HAVE_STRUCT_STATVFS_F_FLAG') +elif conf.has('HAVE_STRUCT_STATVFS_F_FLAG') and not host_machine.system().contains('freebsd') conf.set('FSSTATSTYPE', 'struct statvfs') elif conf.has('HAVE_STRUCT_STATFS_F_FLAGS') conf.set('FSSTATSTYPE', 'struct statfs') -@@ -416,25 +416,25 @@ configure_file( +@@ -417,19 +417,19 @@ configure_file( configure_file( input : 'etc/makepkg.conf.in', - output : 'makepkg.conf', + output : 'makepkg.conf.sample', configuration : substs, install_dir : SYSCONFDIR) configure_file( input : 'etc/makepkg.conf.d/fortran.conf.in', - output : 'fortran.conf', + output : 'fortran.conf.sample', configuration : substs, install_dir : join_paths(SYSCONFDIR, 'makepkg.conf.d/')) configure_file( input : 'etc/makepkg.conf.d/rust.conf.in', - output : 'rust.conf', + output : 'rust.conf.sample', configuration : substs, install_dir : join_paths(SYSCONFDIR, 'makepkg.conf.d/')) +@@ -437,7 +437,7 @@ configure_file( + configure_file( input : 'etc/pacman.conf.in', - output : 'pacman.conf', + output : 'pacman.conf.sample', configuration : substs, install_dir : SYSCONFDIR) diff --git a/sysutils/pacman/pkg-plist b/sysutils/pacman/pkg-plist index c90e4b174627..d9575fdbcd39 100644 --- a/sysutils/pacman/pkg-plist +++ b/sysutils/pacman/pkg-plist @@ -1,269 +1,275 @@ bin/makepkg bin/makepkg-template bin/pacman bin/pacman-conf bin/pacman-db-upgrade bin/pacman-key bin/repo-add bin/repo-elephant bin/repo-remove bin/testpkg bin/vercmp @sample etc/makepkg.conf.d/fortran.conf.sample @sample etc/makepkg.conf.d/rust.conf.sample @sample etc/makepkg.conf.sample +@dir etc/makepkg.d @sample etc/pacman.conf.sample @dir %%ETCDIR%%.d include/alpm.h include/alpm_list.h lib/libalpm.so -lib/libalpm.so.15 -lib/libalpm.so.15.0.0 +lib/libalpm.so.16 +lib/libalpm.so.16.0.0 libdata/pkgconfig/libalpm.pc libdata/pkgconfig/libmakepkg.pc share/bash-completion/completions/makepkg share/bash-completion/completions/pacman share/bash-completion/completions/pacman-key %%NLS%%share/locale/ar/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/ar/LC_MESSAGES/pacman.mo %%NLS%%share/locale/ast/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/ast/LC_MESSAGES/pacman.mo %%NLS%%share/locale/bg/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/bg/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/bg/LC_MESSAGES/pacman.mo %%NLS%%share/locale/br/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/br/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/br/LC_MESSAGES/pacman.mo %%NLS%%share/locale/ca/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/ca/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/ca/LC_MESSAGES/pacman.mo %%NLS%%share/locale/cs/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/cs/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/cs/LC_MESSAGES/pacman.mo %%NLS%%share/locale/da/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/da/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/da/LC_MESSAGES/pacman.mo %%NLS%%share/locale/de/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/de/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/de/LC_MESSAGES/pacman.mo %%NLS%%share/locale/el/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/el/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/el/LC_MESSAGES/pacman.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/en_GB/LC_MESSAGES/pacman.mo %%NLS%%share/locale/eo/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/eo/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/eo/LC_MESSAGES/pacman.mo %%NLS%%share/locale/es/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/es/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/es/LC_MESSAGES/pacman.mo %%NLS%%share/locale/es_419/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/es_419/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/es_419/LC_MESSAGES/pacman.mo %%NLS%%share/locale/eu/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/eu/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/eu/LC_MESSAGES/pacman.mo %%NLS%%share/locale/eu_ES/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/eu_ES/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/eu_ES/LC_MESSAGES/pacman.mo %%NLS%%share/locale/fi/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/fi/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/fi/LC_MESSAGES/pacman.mo %%NLS%%share/locale/fr/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/fr/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/fr/LC_MESSAGES/pacman.mo %%NLS%%share/locale/gl/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/gl/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/gl/LC_MESSAGES/pacman.mo %%NLS%%share/locale/hr/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/hr/LC_MESSAGES/pacman.mo %%NLS%%share/locale/hu/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/hu/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/hu/LC_MESSAGES/pacman.mo %%NLS%%share/locale/id/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/id/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/id/LC_MESSAGES/pacman.mo %%NLS%%share/locale/it/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/it/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/it/LC_MESSAGES/pacman.mo %%NLS%%share/locale/ja/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/ja/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/ja/LC_MESSAGES/pacman.mo %%NLS%%share/locale/kk/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/kk/LC_MESSAGES/pacman.mo %%NLS%%share/locale/ko/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/ko/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/ko/LC_MESSAGES/pacman.mo %%NLS%%share/locale/lt/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/lt/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/lt/LC_MESSAGES/pacman.mo %%NLS%%share/locale/nb/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/nb/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/nb/LC_MESSAGES/pacman.mo %%NLS%%share/locale/nl/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/nl/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/nl/LC_MESSAGES/pacman.mo %%NLS%%share/locale/pl/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/pl/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/pl/LC_MESSAGES/pacman.mo %%NLS%%share/locale/pt/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/pt/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/pt/LC_MESSAGES/pacman.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/pacman.mo %%NLS%%share/locale/ro/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/ro/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/ro/LC_MESSAGES/pacman.mo %%NLS%%share/locale/ru/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/ru/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/ru/LC_MESSAGES/pacman.mo %%NLS%%share/locale/sk/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/sk/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/sk/LC_MESSAGES/pacman.mo %%NLS%%share/locale/sl/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/sl/LC_MESSAGES/pacman.mo %%NLS%%share/locale/sr/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/sr/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/sr/LC_MESSAGES/pacman.mo %%NLS%%share/locale/sr@latin/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/sr@latin/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/sr@latin/LC_MESSAGES/pacman.mo %%NLS%%share/locale/sv/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/sv/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/sv/LC_MESSAGES/pacman.mo %%NLS%%share/locale/tr/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/tr/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/tr/LC_MESSAGES/pacman.mo %%NLS%%share/locale/uk/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/uk/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/uk/LC_MESSAGES/pacman.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/zh_CN/LC_MESSAGES/pacman.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/libalpm.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/pacman-scripts.mo %%NLS%%share/locale/zh_TW/LC_MESSAGES/pacman.mo share/makepkg/autodep.sh share/makepkg/autodep/library_depends.sh share/makepkg/autodep/library_provides.sh share/makepkg/buildenv.sh share/makepkg/buildenv/buildflags.sh share/makepkg/buildenv/compiler.sh share/makepkg/buildenv/debugflags.sh share/makepkg/buildenv/fortran.sh share/makepkg/buildenv/lto.sh share/makepkg/buildenv/makeflags.sh share/makepkg/buildenv/rust.sh share/makepkg/executable.sh share/makepkg/executable/ccache.sh share/makepkg/executable/checksum.sh share/makepkg/executable/debugedit.sh share/makepkg/executable/distcc.sh share/makepkg/executable/fakeroot.sh share/makepkg/executable/gpg.sh share/makepkg/executable/gzip.sh share/makepkg/executable/pacman.sh share/makepkg/executable/strip.sh share/makepkg/executable/sudo.sh share/makepkg/executable/vcs.sh share/makepkg/integrity.sh share/makepkg/integrity/generate_checksum.sh share/makepkg/integrity/generate_signature.sh share/makepkg/integrity/verify_checksum.sh share/makepkg/integrity/verify_signature.sh share/makepkg/lint_config.sh +share/makepkg/lint_config/buildenv.sh share/makepkg/lint_config/ext.sh +share/makepkg/lint_config/nproc.sh +share/makepkg/lint_config/packager.sh share/makepkg/lint_config/paths.sh share/makepkg/lint_config/source_date_epoch.sh share/makepkg/lint_config/variable.sh share/makepkg/lint_package.sh share/makepkg/lint_package/build_references.sh share/makepkg/lint_package/dotfiles.sh share/makepkg/lint_package/file_names.sh share/makepkg/lint_package/missing_backup.sh share/makepkg/lint_pkgbuild.sh share/makepkg/lint_pkgbuild/arch.sh share/makepkg/lint_pkgbuild/arch_specific.sh share/makepkg/lint_pkgbuild/backup.sh share/makepkg/lint_pkgbuild/changelog.sh share/makepkg/lint_pkgbuild/checkdepends.sh share/makepkg/lint_pkgbuild/conflicts.sh share/makepkg/lint_pkgbuild/depends.sh share/makepkg/lint_pkgbuild/epoch.sh share/makepkg/lint_pkgbuild/fullpkgver.sh share/makepkg/lint_pkgbuild/install.sh share/makepkg/lint_pkgbuild/makedepends.sh share/makepkg/lint_pkgbuild/optdepends.sh share/makepkg/lint_pkgbuild/options.sh share/makepkg/lint_pkgbuild/package_function.sh share/makepkg/lint_pkgbuild/package_function_variable.sh share/makepkg/lint_pkgbuild/pkgbase.sh -share/makepkg/lint_pkgbuild/pkglist.sh share/makepkg/lint_pkgbuild/pkgname.sh share/makepkg/lint_pkgbuild/pkgrel.sh share/makepkg/lint_pkgbuild/pkgver.sh share/makepkg/lint_pkgbuild/provides.sh share/makepkg/lint_pkgbuild/source.sh share/makepkg/lint_pkgbuild/util.sh share/makepkg/lint_pkgbuild/variable.sh +share/makepkg/lint_pkgbuild/xdata.sh share/makepkg/reproducible.sh -share/makepkg/reproducible/python.sh +share/makepkg/reproducible/source_date_epoch.sh share/makepkg/source.sh share/makepkg/source/bzr.sh share/makepkg/source/file.sh share/makepkg/source/fossil.sh share/makepkg/source/git.sh share/makepkg/source/hg.sh share/makepkg/source/local.sh share/makepkg/source/svn.sh share/makepkg/srcinfo.sh share/makepkg/tidy.sh -share/makepkg/tidy/docs.sh -share/makepkg/tidy/emptydirs.sh -share/makepkg/tidy/libtool.sh -share/makepkg/tidy/purge.sh -share/makepkg/tidy/staticlibs.sh -share/makepkg/tidy/strip.sh -share/makepkg/tidy/zipman.sh +share/makepkg/tidy/10-docs.sh +share/makepkg/tidy/10-libtool.sh +share/makepkg/tidy/10-staticlibs.sh +share/makepkg/tidy/50-purge.sh +share/makepkg/tidy/50-strip.sh +share/makepkg/tidy/50-zipman.sh +share/makepkg/tidy/90-emptydirs.sh share/makepkg/util.sh share/makepkg/util/compress.sh share/makepkg/util/config.sh share/makepkg/util/dirsize.sh share/makepkg/util/error.sh share/makepkg/util/message.sh share/makepkg/util/option.sh share/makepkg/util/parseopts.sh share/makepkg/util/pkgbuild.sh share/makepkg/util/schema.sh share/makepkg/util/source.sh share/makepkg/util/util.sh %%MANPAGES%%share/man/man1/makepkg-template.1.gz %%MANPAGES%%share/man/man5/BUILDINFO.5.gz %%MANPAGES%%share/man/man5/PKGBUILD.5.gz %%MANPAGES%%share/man/man5/alpm-hooks.5.gz %%MANPAGES%%share/man/man5/makepkg.conf.5.gz %%MANPAGES%%share/man/man5/pacman-hooks.5.gz %%MANPAGES%%share/man/man5/pacman.conf.5.gz %%MANPAGES%%share/man/man8/makepkg.8.gz %%MANPAGES%%share/man/man8/pacman-conf.8.gz %%MANPAGES%%share/man/man8/pacman-db-upgrade.8.gz %%MANPAGES%%share/man/man8/pacman-key.8.gz %%MANPAGES%%share/man/man8/pacman.8.gz %%MANPAGES%%share/man/man8/repo-add.8.gz %%MANPAGES%%share/man/man8/repo-remove.8.gz %%MANPAGES%%share/man/man8/testpkg.8.gz %%MANPAGES%%share/man/man8/vercmp.8.gz %%DATADIR%%/PKGBUILD-split.proto %%DATADIR%%/PKGBUILD-vcs.proto %%DATADIR%%/PKGBUILD.proto %%DATADIR%%/proto.install share/zsh/site-functions/_pacman @dir share/libalpm/hooks @dir share/makepkg-template -@dir %%PACMAN_ROOT%% @dir %%PACMAN_ROOT%%/var/cache/pacman/pkg @dir %%PACMAN_ROOT%%/var/cache/pacman +@dir %%PACMAN_ROOT%%/var/cache @dir %%PACMAN_ROOT%%/var/lib/pacman @dir %%PACMAN_ROOT%%/var/lib +@dir %%PACMAN_ROOT%%/var +@dir %%PACMAN_ROOT%%