diff --git a/.portsignore b/.portsignore index eace0ab54c15..bd1a56dd62dd 100644 --- a/.portsignore +++ b/.portsignore @@ -7513,6 +7513,7 @@ sysutils/nix sysutils/nut-devel sysutils/nvclock sysutils/opensbi +sysutils/pacman sysutils/passwordsafe sysutils/pc-networkmanager sysutils/pear-Horde_Log diff --git a/sysutils/Makefile b/sysutils/Makefile index 6eb6b23f2bca..6da6e3f59f59 100644 --- a/sysutils/Makefile +++ b/sysutils/Makefile @@ -763,7 +763,6 @@ SUBDIR += p5-reslog SUBDIR += packer SUBDIR += packmule - SUBDIR += pacman SUBDIR += paicc SUBDIR += paladin SUBDIR += pam_xdg diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile deleted file mode 100644 index 844dae7e78e8..000000000000 --- a/sysutils/pacman/Makefile +++ /dev/null @@ -1,78 +0,0 @@ -PORTNAME= pacman -DISTVERSION= 7.0.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 -FLAVORS_SUB= yes - -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 DOCS GPGME EXAMPLES NLS -OPTIONS_DEFAULT=CURL DOCS GPGME -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 - -DOCS_MESON_ENABLED= doc -DOCS_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 -.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 deleted file mode 100644 index f7f588f24d9c..000000000000 --- a/sysutils/pacman/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1746376035 -SHA256 (pacman-7.0.0.tar.xz) = 61cbd445d1381b4b184bc7c4e2791f07a79f0f2807b7c600399d0d08e8cd28cf -SIZE (pacman-7.0.0.tar.xz) = 903060 diff --git a/sysutils/pacman/files/patch-doc_meson.build b/sysutils/pacman/files/patch-doc_meson.build deleted file mode 100644 index 1d8a040e6e59..000000000000 --- a/sysutils/pacman/files/patch-doc_meson.build +++ /dev/null @@ -1,11 +0,0 @@ ---- doc/meson.build.orig 2021-05-20 03:38:45 UTC -+++ doc/meson.build -@@ -101,7 +101,7 @@ foreach page: manpages + sitepages - endforeach - - run_target('html', -- command : ['/bin/true'], -+ command : ['/usr/bin/true'], - depends : html_targets) - - custom_target( diff --git a/sysutils/pacman/files/patch-etc_makepkg.conf.in b/sysutils/pacman/files/patch-etc_makepkg.conf.in deleted file mode 100644 index 55a0c77f7047..000000000000 --- a/sysutils/pacman/files/patch-etc_makepkg.conf.in +++ /dev/null @@ -1,28 +0,0 @@ ---- etc/makepkg.conf.in.orig 2024-03-04 03:07:58 UTC -+++ etc/makepkg.conf.in -@@ -9,17 +9,17 @@ - # - #-- The download utilities that makepkg should use to acquire sources - # Format: 'protocol::agent' --DLAGENTS=('file::/usr/bin/curl -qgC - -o %o %u' -- 'ftp::/usr/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' -- 'http::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' -- 'https::/usr/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' -- 'rsync::/usr/bin/rsync --no-motd -z %u %o' -+DLAGENTS=('file::@PREFIX@/bin/curl -qgC - -o %o %u' -+ 'ftp::@PREFIX@/bin/curl -qgfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' -+ 'http::@PREFIX@/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' -+ 'https::@PREFIX@/bin/curl -qgb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' -+ 'rsync::@PREFIX@/bin/rsync --no-motd -z %u %o' - 'scp::/usr/bin/scp -C %u %o') - - # Other common tools: --# /usr/bin/snarf --# /usr/bin/lftpget -c --# /usr/bin/wget -+# @PREFIX@/bin/snarf -+# @PREFIX@/bin/lftpget -c -+# @PREFIX@/bin/wget - - #-- The package required by makepkg to download VCS sources - # Format: 'protocol::package' diff --git a/sysutils/pacman/files/patch-etc_pacman.conf.in b/sysutils/pacman/files/patch-etc_pacman.conf.in deleted file mode 100644 index 04086511ff61..000000000000 --- a/sysutils/pacman/files/patch-etc_pacman.conf.in +++ /dev/null @@ -1,13 +0,0 @@ ---- etc/pacman.conf.in.orig 2024-03-04 03:07:58 UTC -+++ etc/pacman.conf.in -@@ -16,8 +16,8 @@ HoldPkg = pacman glibc - #GPGDir = @sysconfdir@/pacman.d/gnupg/ - #HookDir = @sysconfdir@/pacman.d/hooks/ - HoldPkg = pacman glibc --#XferCommand = /usr/bin/curl -L -C - -f -o %o %u --#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u -+#XferCommand = @PREFIX@/bin/curl -L -C - -f -o %o %u -+#XferCommand = @PREFIX@/bin/wget --passive-ftp -c -O %o %u - #CleanMethod = KeepInstalled - Architecture = auto - diff --git a/sysutils/pacman/files/patch-meson.build b/sysutils/pacman/files/patch-meson.build deleted file mode 100644 index b4b546714d07..000000000000 --- a/sysutils/pacman/files/patch-meson.build +++ /dev/null @@ -1,41 +0,0 @@ ---- meson.build.orig 2024-03-04 03:07:58 UTC -+++ meson.build -@@ -197,7 +197,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( - - 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/')) - - configure_file( - input : 'etc/pacman.conf.in', -- output : 'pacman.conf', -+ output : 'pacman.conf.sample', - configuration : substs, - install_dir : SYSCONFDIR) - diff --git a/sysutils/pacman/files/patch-scripts_meson.build b/sysutils/pacman/files/patch-scripts_meson.build deleted file mode 100644 index 7ceb0f8ccb6c..000000000000 --- a/sysutils/pacman/files/patch-scripts_meson.build +++ /dev/null @@ -1,11 +0,0 @@ ---- scripts/meson.build.orig 2020-12-03 11:37:30 UTC -+++ scripts/meson.build -@@ -66,7 +66,7 @@ configure_file( - configuration : { 'libmakepkgdir': LIBMAKEPKGDIR, 'PACKAGE_VERSION': PACKAGE_VERSION }, - input : 'libmakepkg.pc.in', - output : '@BASENAME@', -- install_dir : join_paths(DATAROOTDIR, 'pkgconfig')) -+ install_dir : join_paths(get_option('prefix'), 'libdata', 'pkgconfig')) - - custom_target( - 'bash_completion', diff --git a/sysutils/pacman/files/patch-src_pacman_conf.c b/sysutils/pacman/files/patch-src_pacman_conf.c deleted file mode 100644 index 89d05db6de12..000000000000 --- a/sysutils/pacman/files/patch-src_pacman_conf.c +++ /dev/null @@ -1,10 +0,0 @@ ---- src/pacman/conf.c.orig 2020-12-03 11:37:30 UTC -+++ src/pacman/conf.c -@@ -23,6 +23,7 @@ - #include /* setlocale */ - #include /* open */ - #include -+#include - #include - #include - #include /* strdup */ diff --git a/sysutils/pacman/files/pkg-deinstall.in b/sysutils/pacman/files/pkg-deinstall.in deleted file mode 100644 index 0c6269364ac1..000000000000 --- a/sysutils/pacman/files/pkg-deinstall.in +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/sh - -case $2 in -POST-DEINSTALL) - if find %%PACMAN_ROOT%% -type f 2>/dev/null | head -1 | grep -q ''; then - echo "" - echo "To completely remove the port, please remove the following" - echo "directories and the content manually if it's no longer needed:" - echo "" - echo " %%PACMAN_ROOT%%" - echo " %%PACMAN_ROOT%%/var/cache/pacman" - echo " %%PACMAN_ROOT%%/var/lib/pacman" - echo "" - fi - ;; -esac diff --git a/sysutils/pacman/files/pkg-message.in b/sysutils/pacman/files/pkg-message.in deleted file mode 100644 index 0dc8b136c2c2..000000000000 --- a/sysutils/pacman/files/pkg-message.in +++ /dev/null @@ -1,25 +0,0 @@ -[ -{ type: install - message: <