From nobody Sat Jun 10 07:12:27 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QdTfg2Gxbz4cHy7; Sat, 10 Jun 2023 07:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QdTfg26QBz3rR4; Sat, 10 Jun 2023 07:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686381147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=utUNxB4/Q1YTcTAQr/+44+490+6KUmHp8HhoZPKRP+s=; b=QK4sLJIU7UM4C9USRQIj6uoaUG50ALSweQg0lnIXcN4odmp3gnnySqAjPpoENFWPI2FTD2 r9+/y6wiv8NrZq30mgwhhZS3fr6orJtK1zcVI98XWGfP11ElREvFBfSbI9A2LOOPbvTDvy bDLM4S+XaRFmWCefuYp5olBcaVLCMuZaWC+fA3byOiUF3+ofqqh5O8B3+uGRx4HoDr1v43 PymEbzDGjE7awN8+eJKC2uG3L+QBWOCc5KSXpYXn03uE83ypnPJzNwECSoHyRX+aUFv014 lV7uaKzj+O+i7l6ltocAqppuF4AcwUaMB3IRlP4SWOsMi7V4Mgsnl5ch/d9wGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686381147; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=utUNxB4/Q1YTcTAQr/+44+490+6KUmHp8HhoZPKRP+s=; b=vgGvtLIv4T+hodD6jgF1W/BAUdFmIvWWBLvhQBK7L+Emz4fJysjo8riELDfgLsNZ4TSQ53 3KJIMd4ADxZu4+nrJ9Of0KnyqJs1Hp9Vhxc+xebJZW34qPg9DtFqqNinPoH6mx2mnlUdWY 0cDd8pXsVquovY/dQoniEZVjcmoFw6BRvbE4X2Ovs6ZpYHAZgMssi6egnjvtYRJR7Dc1Pa 9r75OsM3hItxyjq3XNRZ7BLaZRo8+KOzScg0nV9LpbAps0ylDe3HsKk5O8cRFPOrLguows hXY2mP2BhyIfUkKeiLv7yAIBqgl3tY264OaVD57lhfY6uXk6NdSgIeTuCpPdbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686381147; a=rsa-sha256; cv=none; b=ha9+DmaHv8WAtojD8Ha/4cvkn/ZhgsVRKyWTcHJcTl+ztZNPSXZRASQo1LQeJryPYvc3aY idPJErAQk3BBhIInkk8x0/qex5yHySm4n2fJHOzfmCGc2xsj4e+t17Urh/0KH1rJxexGn0 U9eAHEn7k3w7qvUItP83D8Ysb3kQhfMR93pR+wALkjiiTZuK2Z55P8oWSMLfa80VMqGYoP Kcy5xZRjKQkC5iilsyHGfmpEiAGXWVPYeK31IY1WQ4Ga1iWHNq+gzKMtT9TNlOpQPBGoVJ XeXEHPrRZPkPhouXFqA6CIbkUfzsP2aIcmzw2Yq5yYL9kfeY/eu1pjNaeT9xoQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QdTfg19LBz17Vm; Sat, 10 Jun 2023 07:12:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35A7CR1m094015; Sat, 10 Jun 2023 07:12:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35A7CRt3094014; Sat, 10 Jun 2023 07:12:27 GMT (envelope-from git) Date: Sat, 10 Jun 2023 07:12:27 GMT Message-Id: <202306100712.35A7CRt3094014@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 9e436cd0e537 - main - sysutils/pacman: update to 6.0.2 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e436cd0e5370197f40938bb9b19c2a39e441087 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e436cd0e5370197f40938bb9b19c2a39e441087 commit 9e436cd0e5370197f40938bb9b19c2a39e441087 Author: Charlie Li AuthorDate: 2023-06-10 07:00:34 +0000 Commit: Charlie Li CommitDate: 2023-06-10 07:00:34 +0000 sysutils/pacman: update to 6.0.2 New to this version is the archlinux FLAVOR to manage an Arch Linux userland for the Linuxulator. It installs into/manages /compat/archlinux to not conflict with the linux-c7 ports, similar to sysutils/debootstrap. Reviewed by: fluffy, trasz Event: BSDCan 2022 Event: SouthEast LinuxFest 2022 Event: SouthEast LinuxFest 2023 Differential Revision: https://reviews.freebsd.org/D33652 --- sysutils/pacman/Makefile | 81 ++++++++++++---------- sysutils/pacman/distinfo | 6 +- sysutils/pacman/files/patch-doc_meson.build | 11 +++ sysutils/pacman/files/patch-etc_makepkg.conf.in | 28 ++++++++ sysutils/pacman/files/patch-etc_pacman.conf.in | 13 ++++ .../pacman/files/patch-lib_libalpm_diskspace.c | 11 +++ sysutils/pacman/files/patch-lib_libalpm_util.c | 19 ----- sysutils/pacman/files/patch-meson.build | 27 ++++++++ sysutils/pacman/files/patch-scripts_meson.build | 11 +++ sysutils/pacman/files/patch-src_pacman_conf.c | 10 +++ sysutils/pacman/files/pkg-deinstall.in | 8 +-- sysutils/pacman/files/pkg-message.in | 20 ++++-- sysutils/pacman/pkg-plist | 77 +++++++++++++------- 13 files changed, 231 insertions(+), 91 deletions(-) diff --git a/sysutils/pacman/Makefile b/sysutils/pacman/Makefile index 98b8fd5fdb19..d32c243fcb64 100644 --- a/sysutils/pacman/Makefile +++ b/sysutils/pacman/Makefile @@ -1,66 +1,77 @@ PORTNAME= pacman -PORTVERSION= 5.1.3 -PORTREVISION= 1 +DISTVERSION= 6.0.2 CATEGORIES= sysutils MASTER_SITES= https://sources.archlinux.org/other/${PORTNAME}/ -MAINTAINER= ports@FreeBSD.org -COMMENT= Package manager from ArchLinux -WWW= https://www.archlinux.org/pacman/ +MAINTAINER= vishwin@vishwin.info +COMMENT= Package manager from Arch Linux LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_FreeBSD_14= gpgme >= 1.3.0 is needed for GPG signature support - -BUILD_DEPENDS= asciidoc:textproc/asciidoc \ - bash:shells/bash +BUILD_DEPENDS= bash:shells/bash RUN_DEPENDS= bash:shells/bash -LIB_DEPENDS= libarchive.so:archivers/libarchive -USES= cpe gmake libtool localbase:ldflags pathfix perl5 pkgconfig shebangfix ssl +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 -GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-root-dir="${PACMAN_ROOT}" \ - --localstatedir=/var -CONFIGURE_ENV= LIBSSL_CFLAGS="-I${OPENSSLINC}" \ - LIBSSL_LIBS="-L${OPENSSLLIB} -lcrypto" +BINARY_ALIAS= python3=${PYTHON_CMD} +MESON_ARGS= -Droot-dir=${PACMAN_ROOT} \ + -Dlocalstatedir=${PACMAN_ROOT}/var \ + -Dsysconfdir=${PREFIX}/etc \ + -Dcrypto=openssl USE_LDCONFIG= yes -BINARY_WRAPPERS= gm4 SUB_FILES= pkg-message pkg-deinstall SUB_LIST= PACMAN_ROOT="${PACMAN_ROOT}" PREFIX="${PREFIX}" PLIST_SUB= PACMAN_ROOT="${PACMAN_ROOT:C/^${PREFIX}//}" -PACMAN_ROOT?= ${PREFIX}/pacman - PORTEXAMPLES= * +PKGMESSAGE= ${PKGDIR}/pkg-message-${FLAVOR:U} -OPTIONS_DEFINE= CURL GPGME EXAMPLES NLS -OPTIONS_DEFAULT=CURL GPGME +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_CONFIGURE_WITH= libcurl=${LOCALBASE} +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_CONFIGURE_WITH= gpgme +GPGME_MESON_ENABLED= gpgme GPGME_LIB_DEPENDS= libgpgme.so:security/gpgme -NLS_USES= gettext -NLS_CONFIGURE_ENABLE= nls + +NLS_USES= gettext-runtime gettext-tools +NLS_MESON_TRUE= i18n + +.if ${FLAVOR:U} == default +PACMAN_ROOT= ${PREFIX}/pacman +.elif ${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 +.endif .include post-patch: - @${REINPLACE_CMD} -e 's|m4|gm4|' ${WRKSRC}/scripts/Makefile.in - @${REINPLACE_CMD} -e '2 s/.*/exit 0/' ${WRKSRC}/build-aux/missing - @${REINPLACE_CMD} -e '/INSTALL_DATA.*sysconfdir/ d' ${WRKSRC}/etc/Makefile.in -.for tool in curl wget rsync lftpget - @${REINPLACE_CMD} -e 's|/usr/bin/${tool}|${LOCALBASE}/bin/${tool}|' \ - ${WRKSRC}/etc/pacman.conf.in ${WRKSRC}/etc/makepkg.conf.in -.endfor .if ${ARCH} == "i386" @${REINPLACE_CMD} -e '/^Architecture/ s|auto|i686|' ${WRKSRC}/etc/pacman.conf.in .endif @@ -69,11 +80,7 @@ post-patch: .endif post-install: -.for f in makepkg.conf pacman.conf - ${INSTALL_DATA} ${WRKSRC}/etc/${f} ${STAGEDIR}${PREFIX}/etc/${f}.sample -.endfor - @${MKDIR} ${STAGEDIR}${PACMAN_ROOT} - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libalpm.so + @${MKDIR} ${STAGEDIR}${PREFIX}/etc/pacman.d post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} diff --git a/sysutils/pacman/distinfo b/sysutils/pacman/distinfo index 4dd42534ac1c..5f2836076271 100644 --- a/sysutils/pacman/distinfo +++ b/sysutils/pacman/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1552322023 -SHA256 (pacman-5.1.3.tar.gz) = 10db61a0928d619871340c3f93a677d1541d6c52353c516aec4f8d96e830d4eb -SIZE (pacman-5.1.3.tar.gz) = 3358848 +TIMESTAMP = 1686368450 +SHA256 (pacman-6.0.2.tar.xz) = 7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5 +SIZE (pacman-6.0.2.tar.xz) = 880868 diff --git a/sysutils/pacman/files/patch-doc_meson.build b/sysutils/pacman/files/patch-doc_meson.build new file mode 100644 index 000000000000..1d8a040e6e59 --- /dev/null +++ b/sysutils/pacman/files/patch-doc_meson.build @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..8ead8b12ac53 --- /dev/null +++ b/sysutils/pacman/files/patch-etc_makepkg.conf.in @@ -0,0 +1,28 @@ +--- etc/makepkg.conf.in.orig 2020-12-03 11:37:30 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 -gqC - -o %o %u' +- 'ftp::/usr/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' +- 'http::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' +- 'https::/usr/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' +- 'rsync::/usr/bin/rsync --no-motd -z %u %o' ++DLAGENTS=('file::@prefix@/bin/curl -gqC - -o %o %u' ++ 'ftp::@prefix@/bin/curl -gqfC - --ftp-pasv --retry 3 --retry-delay 3 -o %o %u' ++ 'http::@prefix@/bin/curl -gqb "" -fLC - --retry 3 --retry-delay 3 -o %o %u' ++ 'https::@prefix@/bin/curl -gqb "" -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 new file mode 100644 index 000000000000..7cca8e444cb3 --- /dev/null +++ b/sysutils/pacman/files/patch-etc_pacman.conf.in @@ -0,0 +1,13 @@ +--- etc/pacman.conf.in.orig 2020-12-03 11:37:30 UTC ++++ etc/pacman.conf.in +@@ -16,8 +16,8 @@ + #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-lib_libalpm_diskspace.c b/sysutils/pacman/files/patch-lib_libalpm_diskspace.c new file mode 100644 index 000000000000..a1dceb9cc61e --- /dev/null +++ b/sysutils/pacman/files/patch-lib_libalpm_diskspace.c @@ -0,0 +1,11 @@ +--- lib/libalpm/diskspace.c.orig 2020-12-03 11:37:30 UTC ++++ lib/libalpm/diskspace.c +@@ -71,7 +71,7 @@ static void mount_point_list_free(alpm_list_t *mount_p + + static int mount_point_load_fsinfo(alpm_handle_t *handle, alpm_mountpoint_t *mountpoint) + { +-#if defined(HAVE_GETMNTENT) ++#if HAVE_GETMNTENT + /* grab the filesystem usage */ + if(statvfs(mountpoint->mount_dir, &(mountpoint->fsp)) != 0) { + _alpm_log(handle, ALPM_LOG_WARNING, diff --git a/sysutils/pacman/files/patch-lib_libalpm_util.c b/sysutils/pacman/files/patch-lib_libalpm_util.c deleted file mode 100644 index 615da764b81b..000000000000 --- a/sysutils/pacman/files/patch-lib_libalpm_util.c +++ /dev/null @@ -1,19 +0,0 @@ ---- lib/libalpm/util.c.orig 2018-11-19 01:25:18 UTC -+++ lib/libalpm/util.c -@@ -33,6 +33,7 @@ - #include - #include - #include -+#include - - /* libarchive */ - #include -@@ -556,7 +557,7 @@ static void _alpm_reset_signals(void) - int *i, signals[] = { - SIGABRT, SIGALRM, SIGBUS, SIGCHLD, SIGCONT, SIGFPE, SIGHUP, SIGILL, - SIGINT, SIGKILL, SIGPIPE, SIGQUIT, SIGSEGV, SIGSTOP, SIGTERM, SIGTSTP, -- SIGTTIN, SIGTTOU, SIGUSR1, SIGUSR2, SIGPOLL, SIGPROF, SIGSYS, SIGTRAP, -+ SIGTTIN, SIGTTOU, SIGUSR1, SIGUSR2, SIGIO, SIGPROF, SIGSYS, SIGTRAP, - SIGURG, SIGVTALRM, SIGXCPU, SIGXFSZ, - 0 - }; diff --git a/sysutils/pacman/files/patch-meson.build b/sysutils/pacman/files/patch-meson.build new file mode 100644 index 000000000000..a68f82b00345 --- /dev/null +++ b/sysutils/pacman/files/patch-meson.build @@ -0,0 +1,27 @@ +--- meson.build.orig 2020-12-03 11:37:30 UTC ++++ meson.build +@@ -175,7 +175,7 @@ foreach type : [ + endif + endforeach + +-if conf.has('HAVE_STRUCT_STATVFS_F_FLAG') ++if 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') +@@ -386,13 +386,13 @@ endforeach + + configure_file( + input : 'etc/makepkg.conf.in', +- output : 'makepkg.conf', ++ output : 'makepkg.conf.sample', + configuration : substs, + install_dir : SYSCONFDIR) + + 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 new file mode 100644 index 000000000000..7ceb0f8ccb6c --- /dev/null +++ b/sysutils/pacman/files/patch-scripts_meson.build @@ -0,0 +1,11 @@ +--- 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 new file mode 100644 index 000000000000..89d05db6de12 --- /dev/null +++ b/sysutils/pacman/files/patch-src_pacman_conf.c @@ -0,0 +1,10 @@ +--- 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 index 4f05ea6b40cf..0c6269364ac1 100644 --- a/sysutils/pacman/files/pkg-deinstall.in +++ b/sysutils/pacman/files/pkg-deinstall.in @@ -2,14 +2,14 @@ case $2 in POST-DEINSTALL) - if find /var/lib/pacman /var/cache/pacman %%PACMAN_ROOT%% -type f 2>/dev/null | head -1 | grep -q ''; then + 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 manualy if its no longer needed:" + echo "directories and the content manually if it's no longer needed:" echo "" echo " %%PACMAN_ROOT%%" - echo " /var/cache/pacman" - echo " /var/lib/pacman" + echo " %%PACMAN_ROOT%%/var/cache/pacman" + echo " %%PACMAN_ROOT%%/var/lib/pacman" echo "" fi ;; diff --git a/sysutils/pacman/files/pkg-message.in b/sysutils/pacman/files/pkg-message.in index 73494fa72d84..0dc8b136c2c2 100644 --- a/sysutils/pacman/files/pkg-message.in +++ b/sysutils/pacman/files/pkg-message.in @@ -1,13 +1,25 @@ [ { type: install message: <