Skip to content

Commit

Permalink
Merge remote-tracking branch 'freebsd/main'
Browse files Browse the repository at this point in the history
  • Loading branch information
ericbsd committed Aug 15, 2024
2 parents 03c0ad0 + 443de8b commit 807e0d8
Show file tree
Hide file tree
Showing 1,513 changed files with 29,551 additions and 22,124 deletions.
4 changes: 2 additions & 2 deletions GIDs
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ _wsdd:*:370:
# free: 378
# free: 379
spoofdpi:*:380:
# free: 381
hydroxide:*:381:
# free: 382
# free: 383
# free: 384
Expand Down Expand Up @@ -481,7 +481,7 @@ valkey:*:537:
# free: 538
# free: 539
# free: 540
# free: 541
ipfixcol2:*:541:
_flowd:*:542:
ejabberd:*:543:
# free: 544
Expand Down
5 changes: 4 additions & 1 deletion MOVED
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
# This file can be linted with Tools/scripts/MOVEDlint.awk
#
# Port|Moved to|Date|Why
x11/wmctrl|x11/wmctrl-fork|2024-05-18|Forked due to the upstream being no longer available; the port had no maintainer
www/wt3|www/wt|2021-01-03|Has expired: Upstream end of life, switch to www/wt instead
archivers/ecm|archivers/cmdpack|2021-01-04|ECM is now included in cmdpack
math/qhull5|math/qhull|2021-01-04|Has expired: Legacy version of port no longer required by math/octave
Expand Down Expand Up @@ -3251,6 +3250,7 @@ x11-fonts/noto-serif-basic|x11-fonts/noto-serif|2024-05-13|Remove obsoleted port
x11-fonts/noto-serif-extra|x11-fonts/noto-serif|2024-05-13|Remove obsoleted port. Use x11-fonts/noto-serif instead
sysutils/vector||2024-05-15|Has expired: Unmaintained in tree and broken for months
irc/sic||2024-05-15|Has expired: Last upstream release was in 2001 and no upstream WWW
x11/wmctrl|x11/wmctrl-fork|2024-05-18|Forked due to the upstream being no longer available; the port had no maintainer
devel/tarpaulin|devel/cargo-tarpaulin|2024-05-19|Rename port and package to reflect that this is a Cargo plugin
sysutils/uutils-coreutils|sysutils/rust-coreutils|2024-05-21|Remove duplicate
databases/foundationdb|databases/foundationdb71-server|2024-05-23|Reintegrated into databases/foundationdb71-server
Expand Down Expand Up @@ -3427,3 +3427,6 @@ science/mercantile|science/py-mercantile|2024-08-04|Move science/mercantile to s
devel/py-jsonschema417|devel/py-jsonschema|2024-08-04|Remove obsoleted port. Use devel/py-jsonschema instead
net/ns3||2024-08-07|Has expired: Outdated and unmaintained for years
games/manaplus||2024-08-07|Has expired: Fails to build with libxml2 2.13.2 (PR 279705)
dns/knot3-lib|dns/knot3|2024-08-09|Superseded by knot3 which provides the libraries
devel/py-ollama|misc/py-ollama|2024-08-10|Deduplicate
x11-toolkits/wlroots-hyprland||2024-08-11|Discontinued: use x11-toolkits/aquamarine instead
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ ${INDEXDIR}/${INDEXFILE}: .PHONY
echo; \
echo "********************************************************************"; \
echo "Before reporting this error, verify that you are running a supported"; \
echo "version of FreeBSD (see https://www.FreeBSD.org/ports/) and that you"; \
echo "version of FreeBSD (see https://ports.FreeBSD.org) and that you"; \
echo "have a complete and up-to-date ports collection. (INDEX builds are"; \
echo "not supported with partial or out-of-date ports collections."; \
echo "If that is the case, then"; \
Expand Down
2 changes: 1 addition & 1 deletion Mk/Uses/pgsql.mk
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ _INCLUDE_USES_PGSQL_MK= yes

# When adding a version, please keep the comment in
# Mk/bsd.default-versions.mk in sync.
VALID_PGSQL_VER= 12 13 14 15 16
VALID_PGSQL_VER= 12 13 14 15 16 17

# Override non-default LIBVERS like this:
#PGSQL99_LIBVER=6
Expand Down
1 change: 1 addition & 0 deletions Mk/Uses/samba.mk
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#
# When subpackages are available this can be more granular
#
# MAINTAINER: [email protected]

.if !defined(_INCLUDE_USES_SAMBA_MK)
_INCLUDE_USES_SAMBA_MK= yes
Expand Down
8 changes: 0 additions & 8 deletions Mk/bsd.port.mk
Original file line number Diff line number Diff line change
Expand Up @@ -1875,15 +1875,7 @@ PKG_DEPENDS+= ${LOCALBASE}/sbin/pkg:${PKG_ORIGIN}
. if defined(LLD_UNSAFE) && ${/usr/bin/ld:L:tA} == /usr/bin/ld.lld
LDFLAGS+= -fuse-ld=bfd
BINARY_ALIAS+= ld=${LD}
. if !defined(USE_BINUTILS)
. if exists(/usr/bin/ld.bfd)
LD= /usr/bin/ld.bfd
CONFIGURE_ENV+= LD=${LD}
MAKE_ENV+= LD=${LD}
. else
USE_BINUTILS= yes
. endif
. endif
. endif

. if defined(USE_BINUTILS) && !defined(DISABLE_BINUTILS)
Expand Down
2 changes: 1 addition & 1 deletion README
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
This is the FreeBSD Ports Collection. For an easy to use
WEB-based interface to it, please see:

https://www.FreeBSD.org/ports
https://ports.FreeBSD.org

For general information on the Ports Collection, please see the
FreeBSD Handbook ports section which is available from:
Expand Down
4 changes: 2 additions & 2 deletions UIDs
Original file line number Diff line number Diff line change
Expand Up @@ -326,7 +326,7 @@ _wsdd:*:370:370::0:0:Web Service Discovery Daemon:/nonexistent:/usr/sbin/nologin
# free: 378
# free: 379
spoofdpi:*:380:380::0:0:SpoofDPI Daemon:/nonexistent:/usr/sbin/nologin
# free: 381
hydroxide:*:381:381::0:0:Hydroxide Daemon:/nonexistent:/usr/sbin/nologin
# free: 382
# free: 383
# free: 384
Expand Down Expand Up @@ -486,7 +486,7 @@ valkey:*:537:537::0:0:Valkey Daemon:/nonexistent:/usr/sbin/nologin
# free: 538
# free: 539
# free: 540
# free: 541
ipfixcol2:*:541:541::0:0:IPFIXcol2 User:/var/empty:/usr/sbin/nologin
_flowd:*:542:542::0:0:flowd privilege separation user:/var/empty:/usr/sbin/nologin
ejabberd:*:543:543::0:0:ejabberd pseudo user:/var/spool/ejabberd:/bin/sh
# free: 544
Expand Down
22 changes: 22 additions & 0 deletions UPDATING
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,28 @@ they are unavoidable.
You should get into the habit of checking this file for changes each time
you update your ports collection, before attempting any port upgrades.

20240815:
AFFECTS: users of devel/subversion-lts and devel/subversion
AUTHOR: [email protected]

The port option STATIC has been broken since 2022-01 because textproc/utf8proc
does not provide an archive with CMake. Therefore, it has been removed.

20240809:
AFFECTS: sysutils/amavisd-new
AUTHOR: netchildFreeBSD.org

The start scripts of amavisd have been renamed to amavisd_snmp and
amavis_p0fanalyzer for improved compatibility with other parts of the
system. The automatic start at boot (rc.conf variable settings) is
not affected, but if you have some other automatism you may want to
change
".../etc/rc.d/amavisd-snmp" to ".../etc/rc.d/amavisd_snmp"
".../etc/rc.d/amavis-p0fanalyzer" to ".../etc/rc.d/amavis-p0fanalyzer"
or
"service amavisd-snmp ..." to "service amavisd_snmp ..."
"service amavis-p0fanalyzer ..." to "service amavis_p0fanalyzer ..."

20240727:
AFFECTS: lang/php8[13]
AUTHOR: netchildFreeBSD.org
Expand Down
2 changes: 1 addition & 1 deletion accessibility/darkman/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PORTNAME= darkman
DISTVERSIONPREFIX= v
DISTVERSION= 2.0.1
PORTREVISION= 2
PORTREVISION= 3
CATEGORIES= accessibility wayland

MAINTAINER= [email protected]
Expand Down
7 changes: 0 additions & 7 deletions archivers/c-blosc2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,6 @@ PLIST_SUB= PORTVERSION=${PORTVERSION}
GH_ACCOUNT= Blosc
USE_GITHUB= yes

.include <bsd.port.options.mk>

.if ${ARCH:Mpowerpc64*}
USES+= compiler:gcc-c++11-lib
USE_CSTD= c11
.endif

post-patch:
# Clean up bundled libraries
@${RM} -r ${WRKSRC}/internal-complibs/
Expand Down
221 changes: 221 additions & 0 deletions archivers/c-blosc2/files/patch-blosc_bitshuffle-altivec.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,221 @@
--- blosc/bitshuffle-altivec.c.orig 2024-08-12 12:46:55 UTC
+++ blosc/bitshuffle-altivec.c
@@ -40,15 +40,15 @@
#include <stdio.h>
#include <string.h>

-static void helper_print(__vector uint8_t v, char* txt){
+static void helper_print(__vector unsigned char v, char* txt){
printf("%s %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x\n",txt,
v[0], v[1], v[2], v[3], v[4], v[5], v[6], v[7], v[8], v[9], v[10], v[11], v[12], v[13], v[14], v[15]);
}
#endif


-static inline __vector uint8_t gen_save_mask(size_t offset){
- __vector uint8_t mask;
+static inline __vector unsigned char gen_save_mask(size_t offset){
+ __vector unsigned char mask;
size_t k;
for (k = 0; k < 16; k++)
mask[k] = (k<offset)?0:0xFF;
@@ -57,8 +57,8 @@ static inline __vector uint8_t gen_save_mask(size_t of


// Build and return a bit-permutation mask
-static __vector uint8_t make_bitperm_mask(int type_size, int bit) {
- __vector uint8_t result;
+static __vector unsigned char make_bitperm_mask(int type_size, int bit) {
+ __vector unsigned char result;
if (type_size == 1) {
// data_type is 8 bits long
for (int i = 0; i < 16; i++)
@@ -93,29 +93,29 @@ bitunshuffle1_altivec(void* _src, void* dest, const si
size_t nbyte_row = size / 8;

// working vectors
- __vector uint8_t xmm0[8], xmm1[8], masks[8];
+ __vector unsigned char xmm0[8], xmm1[8], masks[8];
// Vector masks
- static const __vector uint8_t lo01 = (const __vector uint8_t) {
+ static const __vector unsigned char lo01 = (const __vector unsigned char) {
0x00, 0x01, 0x04, 0x05, 0x08, 0x09, 0x0c, 0x0d,
0x10, 0x11, 0x14, 0x15, 0x18, 0x19, 0x1c, 0x1d};
- static const __vector uint8_t hi01 = (const __vector uint8_t) {
+ static const __vector unsigned char hi01 = (const __vector unsigned char) {
0x02, 0x03, 0x06, 0x07, 0x0a, 0x0b, 0x0e, 0x0f,
0x12, 0x13, 0x16, 0x17, 0x1a, 0x1b, 0x1e, 0x1f};
- static const __vector uint8_t lo02 = (const __vector uint8_t) {
+ static const __vector unsigned char lo02 = (const __vector unsigned char) {
0x00, 0x01, 0x08, 0x09, 0x10, 0x11, 0x18, 0x19,
0x02, 0x03, 0x0a, 0x0b, 0x12, 0x13, 0x1a, 0x1b};
- static const __vector uint8_t hi02 = (const __vector uint8_t) {
+ static const __vector unsigned char hi02 = (const __vector unsigned char) {
0x04, 0x05, 0x0c, 0x0d, 0x14, 0x15, 0x1c, 0x1d,
0x06, 0x07, 0x0e, 0x0f, 0x16, 0x17, 0x1e, 0x1f};
- static const __vector uint8_t epi64_low = (const __vector uint8_t) {
+ static const __vector unsigned char epi64_low = (const __vector unsigned char) {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17};
- static const __vector uint8_t epi64_hi = (const __vector uint8_t) {
+ static const __vector unsigned char epi64_hi = (const __vector unsigned char) {
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f};

for (kk = 0; kk < 8; kk++){
- __vector uint8_t msk;
+ __vector unsigned char msk;
for (ii = 0; ii < 8; ii++){
msk[ii] = 127-(16*ii+2*kk);
msk[ii+8] = 127-(16*ii+2*kk+1);
@@ -164,13 +164,13 @@ bitunshuffle1_altivec(void* _src, void* dest, const si

// At this stage each vector xmm1 contains the data from 16 adjacent bytes
for (int ll = 0; ll < 8; ll++){
- __vector uint8_t xmm = xmm1[ll];
+ __vector unsigned char xmm = xmm1[ll];
//helper_print(xmm, "vector transposed");
for (kk = 0; kk < 8; kk++) {
- __vector uint16_t tmp;
- tmp = (__vector uint16_t) vec_bperm(xmm, masks[kk]);
+ __vector unsigned short tmp;
+ tmp = (__vector unsigned short) vec_bperm(xmm, masks[kk]);
//printf("%d %d\n", vp, tmp[4]);
- //helper_print((__vector uint8_t)tmp, "tmp");
+ //helper_print((__vector unsigned char)tmp, "tmp");
out_s[vp++] = tmp[4];
}
}
@@ -182,7 +182,7 @@ int64_t bshuf_trans_byte_elem_16(const void* in, void*
/* Transpose bytes within elements for 16 bit elements. */
int64_t bshuf_trans_byte_elem_16(const void* in, void* out, const size_t size) {
static const uint8_t bytesoftype = 2;
- __vector uint8_t xmm0[2];
+ __vector unsigned char xmm0[2];

for (size_t i = 0; i + 15 < size; i += 16) {
for (int j = 0; j < bytesoftype; j++)
@@ -202,7 +202,7 @@ int64_t bshuf_trans_byte_elem_32(const void* in, void*
/* Transpose bytes within elements for 32 bit elements. */
int64_t bshuf_trans_byte_elem_32(const void* in, void* out, const size_t size) {
static const uint8_t bytesoftype = 4;
- __vector uint8_t xmm0[4];
+ __vector unsigned char xmm0[4];

for (size_t i = 0; i + 15 < size; i += 16) {
for (int j = 0; j < bytesoftype; j++)
@@ -222,7 +222,7 @@ int64_t bshuf_trans_byte_elem_64(const void* in, void*
/* Transpose bytes within elements for 64 bit elements. */
int64_t bshuf_trans_byte_elem_64(const void* in, void* out, const size_t size) {
static const uint8_t bytesoftype = 8;
- __vector uint8_t xmm0[8];
+ __vector unsigned char xmm0[8];

for (size_t i = 0; i + 15 < size; i += 16) {
for (int j = 0; j < bytesoftype; j++)
@@ -242,7 +242,7 @@ int64_t bshuf_trans_byte_elem_128(const void* in, void
/* Transpose bytes within elements for 128 bit elements. */
int64_t bshuf_trans_byte_elem_128(const void* in, void* out, const size_t size) {
static const uint8_t bytesoftype = 16;
- __vector uint8_t xmm0[16];
+ __vector unsigned char xmm0[16];

for (size_t i = 0; i + 15 < size; i += 16) {
for (int j = 0; j < bytesoftype; j++)
@@ -297,7 +297,7 @@ int64_t bshuf_trans_byte_elem_altivec(const void* in,

if ((elem_size % 16) == 0) {
nchunk_elem = elem_size / 16;
- TRANS_ELEM_TYPE(in, out, size, nchunk_elem, __vector uint8_t);
+ TRANS_ELEM_TYPE(in, out, size, nchunk_elem, __vector unsigned char);
count = bshuf_trans_byte_elem_128(out, tmp_buf,
size * nchunk_elem);
bshuf_trans_elem(tmp_buf, out, 16, nchunk_elem, size);
@@ -334,7 +334,7 @@ int64_t bshuf_trans_bit_byte_altivec(const void* in, v
uint8_t* out_b = (uint8_t*)out;
int64_t count;
size_t nbyte = elem_size * size;
- __vector uint8_t data, masks[8];
+ __vector unsigned char data, masks[8];
size_t ii, kk;

CHECK_MULT_EIGHT(nbyte);
@@ -347,9 +347,9 @@ int64_t bshuf_trans_bit_byte_altivec(const void* in, v
for (ii = 0; ii + 15 < nbyte; ii += 16) {
data = vec_xl(ii, in_b);
for (kk = 0; kk < 8; kk++) {
- __vector uint16_t tmp;
+ __vector unsigned short tmp;
uint16_t* oui16;
- tmp = (__vector uint16_t) vec_bperm(data, masks[kk]);
+ tmp = (__vector unsigned short) vec_bperm(data, masks[kk]);
oui16 = (uint16_t*)&out_b[(ii + kk*nbyte) >> 3];
*oui16 = tmp[4];
}
@@ -387,28 +387,28 @@ int64_t bshuf_trans_byte_bitrow_altivec(const void* in
* the bytes. */
int64_t bshuf_trans_byte_bitrow_altivec(const void* in, void* out, const size_t size,
const size_t elem_size) {
- static const __vector uint8_t epi8_low = (const __vector uint8_t) {
+ static const __vector unsigned char epi8_low = (const __vector unsigned char) {
0x00, 0x10, 0x01, 0x11, 0x02, 0x12, 0x03, 0x13,
0x04, 0x14, 0x05, 0x15, 0x06, 0x16, 0x07, 0x17};
- static const __vector uint8_t epi8_hi = (const __vector uint8_t) {
+ static const __vector unsigned char epi8_hi = (const __vector unsigned char) {
0x08, 0x18, 0x09, 0x19, 0x0a, 0x1a, 0x0b, 0x1b,
0x0c, 0x1c, 0x0d, 0x1d, 0x0e, 0x1e, 0x0f, 0x1f};
- static const __vector uint8_t epi16_low = (const __vector uint8_t) {
+ static const __vector unsigned char epi16_low = (const __vector unsigned char) {
0x00, 0x01, 0x10, 0x11, 0x02, 0x03, 0x12, 0x13,
0x04, 0x05, 0x14, 0x15, 0x06, 0x07, 0x16, 0x17};
- static const __vector uint8_t epi16_hi = (const __vector uint8_t) {
+ static const __vector unsigned char epi16_hi = (const __vector unsigned char) {
0x08, 0x09, 0x18, 0x19, 0x0a, 0x0b, 0x1a, 0x1b,
0x0c, 0x0d, 0x1c, 0x1d, 0x0e, 0x0f, 0x1e, 0x1f};
- static const __vector uint8_t epi32_low = (const __vector uint8_t) {
+ static const __vector unsigned char epi32_low = (const __vector unsigned char) {
0x00, 0x01, 0x02, 0x03, 0x10, 0x11, 0x12, 0x13,
0x04, 0x05, 0x06, 0x07, 0x14, 0x15, 0x16, 0x17};
- static const __vector uint8_t epi32_hi = (const __vector uint8_t) {
+ static const __vector unsigned char epi32_hi = (const __vector unsigned char) {
0x08, 0x09, 0x0a, 0x0b, 0x18, 0x19, 0x1a, 0x1b,
0x0c, 0x0d, 0x0e, 0x0f, 0x1c, 0x1d, 0x1e, 0x1f};
- static const __vector uint8_t epi64_low = (const __vector uint8_t) {
+ static const __vector unsigned char epi64_low = (const __vector unsigned char) {
0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17};
- static const __vector uint8_t epi64_hi = (const __vector uint8_t) {
+ static const __vector unsigned char epi64_hi = (const __vector unsigned char) {
0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f};

@@ -416,7 +416,7 @@ int64_t bshuf_trans_byte_bitrow_altivec(const void* in
uint8_t* out_b = (uint8_t*)out;
size_t nrows = 8 * elem_size;
size_t nbyte_row = size / 8;
- __vector uint8_t xmm0[16], xmm1[16];
+ __vector unsigned char xmm0[16], xmm1[16];

CHECK_MULT_EIGHT(size);

@@ -543,7 +543,7 @@ int64_t bshuf_shuffle_bit_eightelem_altivec(const void
const uint8_t* in_b = (const uint8_t*)in;
uint8_t* out_b = (uint8_t*)out;
size_t nbyte = elem_size * size;
- __vector uint8_t masks[8], data;
+ __vector unsigned char masks[8], data;

CHECK_MULT_EIGHT(size);

@@ -560,9 +560,9 @@ int64_t bshuf_shuffle_bit_eightelem_altivec(const void
for (size_t jj = 0; jj + 15 < 8 * elem_size; jj += 16) {
data = vec_xl(ii + jj, in_b);
for (size_t kk = 0; kk < 8; kk++) {
- __vector uint16_t tmp;
+ __vector unsigned short tmp;
uint16_t* oui16;
- tmp = (__vector uint16_t) vec_bperm(data, masks[kk]);
+ tmp = (__vector unsigned short) vec_bperm(data, masks[kk]);
oui16 = (uint16_t*)&out_b[ii + (jj>>3) + kk * elem_size];
*oui16 = tmp[4];
}
Loading

0 comments on commit 807e0d8

Please sign in to comment.