netbird/FreeBSD-ports
0
0
Fork 0
mirror of https://github.com/netbirdio/FreeBSD-ports.git synced 2026-05-22 18:42:42 -07:00
Code Issues Packages Projects Releases Wiki Activity

sysutils/pacman: update to 6.1.0

Browse Source 
Update MASTER_SITES and WWW

Event: BSDCan 2024
Event: SouthEast LinuxFest 2024
Event: ARRL/RAC Field Day 2024
This commit is contained in:
Charlie Li
2024-06-23 14:07:32 -04:00
parent d5181454c8
commit 6872d78497
6 changed files with 72 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sysutils/pacman/Makefile
+6 -7
View File
@@ -1,12 +1,11 @@
PORTNAME= pacman
DISTVERSION= 6.0.2
PORTREVISION= 1
DISTVERSION= 6.1.0
CATEGORIES= sysutils
MASTER_SITES= https://sources.archlinux.org/other/${PORTNAME}/
MASTER_SITES= https://gitlab.archlinux.org/${PORTNAME}/${PORTNAME}/-/releases/v${DISTVERSION}/downloads/
MAINTAINER= vishwin@vishwin.info
COMMENT= Package manager from Arch Linux
WWW= https://archlinux.org/pacman/
WWW= https://pacman.archlinux.page/
LICENSE= GPLv2+
LICENSE_FILE= ${WRKSRC}/COPYING
@@ -36,7 +35,7 @@ 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}//}"
PLIST_SUB= PACMAN_ROOT="${PACMAN_ROOT:C,^${PREFIX}/,,}"
PORTEXAMPLES= *
PKGMESSAGE= ${PKGDIR}/pkg-message-${FLAVOR:U}
@@ -71,7 +70,7 @@ PLIST_DIRS+= %%PACMAN_ROOT%%/var/cache \
/compat
.endif
.include <bsd.port.options.mk>
.include <bsd.port.pre.mk>
post-patch:
.if ${ARCH} == "i386"
@@ -88,4 +87,4 @@ post-install-EXAMPLES-on:
@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
${INSTALL_DATA} ${WRKSRC}/doc/PKGBUILD-example.txt ${STAGEDIR}${EXAMPLESDIR}/
.include <bsd.port.mk>
.include <bsd.port.post.mk>
sysutils/pacman/distinfo
+3 -3
View File
@@ -1,3 +1,3 @@
TIMESTAMP = 1686368450
SHA256 (pacman-6.0.2.tar.xz) = 7d8e3e8c5121aec0965df71f59bedf46052c6cf14f96365c4411ec3de0a4c1a5
SIZE (pacman-6.0.2.tar.xz) = 880868
TIMESTAMP = 1717093084
SHA256 (pacman-6.1.0.tar.xz) = 5a60ac6e6bf995ba6140c7d038c34448df1f3daa4ae7141d2cad88eeb5f1f9d9
SIZE (pacman-6.1.0.tar.xz) = 895640
sysutils/pacman/files/patch-etc_makepkg.conf.in
+13 -13
View File
@@ -1,28 +1,28 @@
--- etc/makepkg.conf.in.orig 2020-12-03 11:37:30 UTC
--- 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 -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'
-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 -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'
+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
+# @PREFIX@/bin/snarf
+# @PREFIX@/bin/lftpget -c
+# @PREFIX@/bin/wget
#-- The package required by makepkg to download VCS sources
# Format: 'protocol::package'
sysutils/pacman/files/patch-etc_pacman.conf.in
+4 -4
View File
@@ -1,13 +1,13 @@
--- etc/pacman.conf.in.orig 2020-12-03 11:37:30 UTC
--- etc/pacman.conf.in.orig 2024-03-04 03:07:58 UTC
+++ etc/pacman.conf.in
@@ -16,8 +16,8 @@
@@ -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
+#XferCommand = @PREFIX@/bin/curl -L -C - -f -o %o %u
+#XferCommand = @PREFIX@/bin/wget --passive-ftp -c -O %o %u
#CleanMethod = KeepInstalled
Architecture = auto
sysutils/pacman/files/patch-meson.build
+21 -7
View File
@@ -1,15 +1,15 @@
--- meson.build.orig 2020-12-03 11:37:30 UTC
--- meson.build.orig 2024-03-04 03:07:58 UTC
+++ meson.build
@@ -175,7 +175,7 @@ foreach type : [
@@ -197,7 +197,7 @@ if conf.has('HAVE_GETMNTINFO')
else
conf.set('FSSTATSTYPE', 'struct statfs')
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')
-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')
@@ -386,13 +386,13 @@ endforeach
@@ -416,25 +416,25 @@ configure_file(
configure_file(
input : 'etc/makepkg.conf.in',
@@ -18,6 +18,20 @@
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',
sysutils/pacman/pkg-plist
+25 -16
View File
@@ -9,30 +9,18 @@ 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
@sample etc/pacman.conf.sample
@dir %%ETCDIR%%.d
include/alpm.h
include/alpm_list.h
lib/libalpm.so
lib/libalpm.so.13
lib/libalpm.so.13.0.2
lib/libalpm.so.14
lib/libalpm.so.14.0.0
libdata/pkgconfig/libalpm.pc
libdata/pkgconfig/libmakepkg.pc
%%PORTDOCS%%share/man/man1/makepkg-template.1.gz
%%PORTDOCS%%share/man/man5/BUILDINFO.5.gz
%%PORTDOCS%%share/man/man5/PKGBUILD.5.gz
%%PORTDOCS%%share/man/man5/alpm-hooks.5.gz
%%PORTDOCS%%share/man/man5/makepkg.conf.5.gz
%%PORTDOCS%%share/man/man5/pacman-hooks.5.gz
%%PORTDOCS%%share/man/man5/pacman.conf.5.gz
%%PORTDOCS%%share/man/man8/makepkg.8.gz
%%PORTDOCS%%share/man/man8/pacman-conf.8.gz
%%PORTDOCS%%share/man/man8/pacman-key.8.gz
%%PORTDOCS%%share/man/man8/pacman.8.gz
%%PORTDOCS%%share/man/man8/repo-add.8.gz
%%PORTDOCS%%share/man/man8/repo-remove.8.gz
%%PORTDOCS%%share/man/man8/vercmp.8.gz
share/bash-completion/completions/makepkg
share/bash-completion/completions/pacman
share/bash-completion/completions/pacman-key
@@ -157,15 +145,20 @@ share/bash-completion/completions/pacman-key
%%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/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
@@ -245,6 +238,22 @@ share/makepkg/util/pkgbuild.sh
share/makepkg/util/schema.sh
share/makepkg/util/source.sh
share/makepkg/util/util.sh
%%DOCS%%share/man/man1/makepkg-template.1.gz
%%DOCS%%share/man/man5/BUILDINFO.5.gz
%%DOCS%%share/man/man5/PKGBUILD.5.gz
%%DOCS%%share/man/man5/alpm-hooks.5.gz
%%DOCS%%share/man/man5/makepkg.conf.5.gz
%%DOCS%%share/man/man5/pacman-hooks.5.gz
%%DOCS%%share/man/man5/pacman.conf.5.gz
%%DOCS%%share/man/man8/makepkg.8.gz
%%DOCS%%share/man/man8/pacman-conf.8.gz
%%DOCS%%share/man/man8/pacman-db-upgrade.8.gz
%%DOCS%%share/man/man8/pacman-key.8.gz
%%DOCS%%share/man/man8/pacman.8.gz
%%DOCS%%share/man/man8/repo-add.8.gz
%%DOCS%%share/man/man8/repo-remove.8.gz
%%DOCS%%share/man/man8/testpkg.8.gz
%%DOCS%%share/man/man8/vercmp.8.gz
%%DATADIR%%/PKGBUILD-split.proto
%%DATADIR%%/PKGBUILD-vcs.proto
%%DATADIR%%/PKGBUILD.proto