Revert "Update to perl-5.39.5."

This reverts commit 781ff8880f3e2d29e31460427bccf50cc1ec436e.

File/Spec was no longer being installed when --all-static, breaking
texinfo.

Makefile

@@ -499,15 +499,18 @@ $(LIVE_INITRD): sysroot
 
 .PHONY: $(OVERLAY_INITRD)
 $(OVERLAY_INITRD): sysroot
+	mkdir -p `dirname $(OVERLAY_INITRD)`
 	test ! -d "$(SYSROOT_OVERLAY)" || \
 	LC_ALL=C ls -A "$(SYSROOT_OVERLAY)" | \
 	tar -cf $(OVERLAY_INITRD) -C "$(SYSROOT_OVERLAY)" --numeric-owner --owner=0 --group=0 -T -
 
 $(SRC_INITRD): sysroot
+	mkdir -p `dirname $(SRC_INITRD)`
 	sed -E 's,^/,,' "$(SYSROOT)/tix/manifest/src" | \
 	tar -cf $(SRC_INITRD) -C "$(SYSROOT)" --numeric-owner --owner=0 --group=0 --no-recursion -T - tix/manifest/src
 
 $(SYSTEM_INITRD): sysroot
+	mkdir -p `dirname $(SYSTEM_INITRD)`
 	sed -E 's,^/,,' "$(SYSROOT)/tix/manifest/system" | \
 	tar -cf $(SYSTEM_INITRD) -C "$(SYSROOT)" --numeric-owner --owner=0 --group=0 --no-recursion -T - tix/manifest/system tix/tixinfo/system
 

build-aux/build-ports.sh

@@ -101,7 +101,7 @@ if [ "$OPERATION" = build ]; then
      DEPENDENCIES="$(PACKAGES="$PACKAGES" \
                      "$(dirname -- "$0")"/list-packages.sh \
                      --dependencies $PACKAGE)"
-     echo "$PACKAGE: $(echo "$DEPENDENCIES" | tr '\n' ' ' | sed -E 's/ +$/\n/')"
+     echo "$PACKAGE: $(echo "$DEPENDENCIES" | tr '\n' ' ')"
      echo "	@echo $PACKAGE"
    done;
    printf ".PHONY:"

build-aux/manhtml.sh

@@ -359,7 +359,7 @@ for section in $SECTIONS; do
 done
 
 (find . -name '*.html' | while read FILE; do
-   grep -Eoh 'href=\"../man[[:digit:]]/[^/]+\.html\"' "$FILE" || true
+   grep -Eoh 'href="../man[[:digit:]]/[^/]+\.html"' "$FILE" || true
  done) | sort -u | grep -Eo 'man[[:digit:]]/[^/]+\.html' | sed 's/\.html$//' |
 while read manpage; do
   if ! [ -e "$manpage" ]; then

disked/disked.c

@@ -1497,7 +1497,12 @@ static char* display_area_format(void* ctx, size_t row, size_t column)
 		{
 		case FILESYSTEM_ERROR_NONE: return strdup("(no error)");
 		case FILESYSTEM_ERROR_ABSENT: return strdup("none");
-		case FILESYSTEM_ERROR_UNRECOGNIZED: return strdup("unrecognized");
+		case FILESYSTEM_ERROR_UNRECOGNIZED:
+		{
+			char uuid[UUID_STRING_LENGTH + 1];
+			uuid_to_string(area->p->gpt_type_guid, uuid);
+			return strdup(uuid);
+		}
 		case FILESYSTEM_ERROR_ERRNO: return strdup("(error)");
 		}
 		return strdup("(unknown error)");

fat/fatfs.cpp

@@ -264,9 +264,6 @@ int main(int argc, char* argv[])
 	if ( !fs ) // TODO: Use operator new nothrow!
 		err(1, "malloc");
 
-	// TODO: Remove this debug stuff.
-	printf("Mounted FAT data_offset=%u, data_sectors=%u, cluster_count=%u, sectors_per_cluster=%u, fat_type=%i\n", data_offset, data_sectors, cluster_count, bpb.sectors_per_cluster, fat_type);
-
 	if ( !mount_path )
 		return 0;
 

kernel/include/sortix/ucontext.h

@@ -72,7 +72,7 @@ enum
 #define REG_CR2 REG_CR2
 	REG_FSBASE,
 #define REG_FSBASE REG_FSBASE
-	REG_GSBASE,
+	REG_GSBASE
 #define REG_GSBASE REG_GSBASE
 };
 #endif
@@ -126,7 +126,7 @@ enum
 #define REG_CR2 REG_CR2
 	REG_FSBASE,
 #define REG_FSBASE REG_FSBASE
-	REG_GSBASE,
+	REG_GSBASE
 #define REG_GSBASE REG_GSBASE
 };
 #endif

libc/ifaddrs/getifaddrs.c

@@ -66,6 +66,7 @@ int getifaddrs(struct ifaddrs** ifas_ptr)
 			freeifaddrs(ifas);
 			return -1;
 		}
+		struct if_status status;
 		struct if_config cfg;
 		if ( ioctl(fd, NIOC_GETCONFIG, &cfg) < 0 )
 		{
@@ -89,7 +90,7 @@ int getifaddrs(struct ifaddrs** ifas_ptr)
 			ifas = &ifa->pub;
 			strlcpy(ifa->name, netif->if_name, sizeof(ifa->name));
 			ifa->pub.ifa_name = ifa->name;
-			ifa->pub.ifa_flags = 0;
+			ifa->pub.ifa_flags = status.flags & IF_STATUS_FLAGS_UP ? IFF_UP : 0;
 			ifa->addr.in.sin_family = AF_INET;
 			memcpy(&ifa->addr.in.sin_addr, &cfg.inet.address,
 			       sizeof(struct in_addr));

libc/include/ifaddrs.h

@@ -24,6 +24,8 @@
 
 #include <sys/__/types.h>
 
+#define IFF_UP (1 << 0)
+
 #ifndef __socklen_t_defined
 #define __socklen_t_defined
 typedef __socklen_t socklen_t;

libmount/include/mount/fat.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2023 Jonas 'Sortie' Termansen.
+ * Copyright (c) 2023, 2024 Jonas 'Sortie' Termansen.
  *
  * Permission to use, copy, modify, and distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -23,7 +23,7 @@
 #include <mount/filesystem.h>
 
 #define BDP_GPT_TYPE_UUID "EBD0A0A2-B9E5-4433-87C0-68B6B72699C7"
-#define ESP_GPT_TYPE_UUID "C12A7328-F81F-11D2-BA4B-00A0C93EC93B"
+#define ESP_GPT_TYPE_UUID "28732ac1-1ff8-d211-ba4b-00a0c93ec93b"
 
 #if defined(__cplusplus)
 extern "C" {

login/graphical.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2015, 2016 Jonas 'Sortie' Termansen.
+ * Copyright (c) 2014, 2015, 2016, 2024 Jonas 'Sortie' Termansen.
  * Copyright (c) 2021 Juhani 'nortti' Krekelä.
  * Copyright (c) 2023 dzwdz.
  *
@@ -96,6 +96,8 @@ struct glogin
 	struct check chk;
 	int fd_mouse;
 	struct dispmsg_crtc_mode mode;
+	struct framebuffer wallpaper;
+	size_t wallpaper_size;
 	struct framebuffer fade_from_fb;
 	struct timespec fade_from_begin;
 	struct timespec fade_from_end;
@@ -200,14 +202,8 @@ void render_right_text_if_needed(struct framebuffer fb, const char* str, uint32_
 
 union c { struct { uint8_t b; uint8_t g; uint8_t r; }; uint32_t v; };
 
-static void render_background(struct framebuffer fb)
+static void wallpaper(struct framebuffer fb)
 {
-#if 0
-	uint32_t bg_color = make_color(0x89 * 2/3, 0xc7 * 2/3, 0xff * 2/3);
-	for ( size_t y = 0; y < fb.yres; y++ )
-		for ( size_t x = 0; x < fb.xres; x++ )
-			framebuffer_set_pixel(fb, x, y, bg_color);
-#endif
 	static uint32_t s;
 	static uint32_t t;
 	static bool seeded = false;
@@ -256,6 +252,19 @@ static void render_background(struct framebuffer fb)
 	}
 }
 
+static void render_background(struct framebuffer fb)
+{
+#if 0
+	uint32_t bg_color = make_color(0x89 * 2/3, 0xc7 * 2/3, 0xff * 2/3);
+	for ( size_t y = 0; y < damage_rect.height; y++ )
+		for ( size_t x = 0; x < damage_rect.width; x++ )
+			framebuffer_set_pixel(fb, damage_rect.left + x, damage_rect.top + y,
+			                      bg_color);
+#endif
+
+	framebuffer_copy_to_framebuffer(fb, state.wallpaper);
+}
+
 static void render_pointer(struct framebuffer fb)
 {
 	int p_hwidth = arrow_framebuffer.xres / 2;
@@ -576,6 +585,20 @@ static bool begin_render(struct glogin* state, struct framebuffer* fb)
 	fb->yres = state->mode.view_yres;
 	fb->pitch = state->mode.view_xres;
 	size_t size = sizeof(uint32_t) * fb->xres * fb->yres;
+	if ( state->wallpaper_size != size )
+	{
+		if ( !(state->wallpaper.buffer =
+		       realloc(state->wallpaper.buffer, size)) )
+		{
+			warn("malloc");
+			return false;
+		}
+		state->wallpaper.xres = state->mode.view_xres;
+		state->wallpaper.yres = state->mode.view_yres;
+		state->wallpaper.pitch = state->mode.view_xres;
+		state->wallpaper_size = size;
+		wallpaper(state->wallpaper);
+	}
 	fb->buffer = (uint32_t*) glogin_malloc_fb_buffer(state, size);
 	if ( !fb->buffer )
 	{

ports/ag/ag.port

@@ -7,7 +7,7 @@ ARCHIVE=$DISTNAME.$COMPRESSION
 SHA256SUM=8ca680399df5ee8846a509c8a67c10ee1d5fc1a94456806a0ff9dd913b961db3
 UPSTREAM_SITE=https://geoff.greer.fm/ag/releases
 UPSTREAM_ARCHIVE=$ARCHIVE
-RUNTIME_PROGRAMS=git
+RUNTIME_DEPS=git
 BUILD_SYSTEM=configure
 CONFIGURE_ARGS=
 MAKE_VARS='V=1'

ports/diffutils/diffutils.port

@@ -1,11 +1,12 @@
 NAME=diffutils
 BUILD_LIBRARIES='libiconv? libintl?'
-VERSION=3.8
+VERSION=3.10
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=a6bdd7d1b31266d11c4f4de6c1b748d4607ab0231af5188fc2533d0ae2438fec
+SHA256SUM=90e5e93cc724e4ebe12ede80df1634063c7a855692685919bfe60b556c9bd09e
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/diffutils
 UPSTREAM_ARCHIVE=$ARCHIVE
+LICENSE=GPL-3.0-or-later
 BUILD_SYSTEM=configure
 MAKE_VARS='V=1'

ports/dosfstools/dosfstools.port

@@ -9,4 +9,3 @@ UPSTREAM_SITE=https://github.com/dosfstools/dosfstools/releases/download/v$VERSI
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE=GPL-3.0-or-later
 BUILD_SYSTEM=configure
-DEVELOPMENT=true

ports/e2fsprogs/e2fsprogs.patch

@@ -1,3 +1,48 @@
+diff -Paur --no-dereference -- e2fsprogs.upstream/MCONFIG.in e2fsprogs/MCONFIG.in
+--- e2fsprogs.upstream/MCONFIG.in
++++ e2fsprogs/MCONFIG.in
+@@ -138,7 +138,7 @@
+ LIBUUID = @LIBUUID@ @SOCKET_LIB@
+ LIBMAGIC = @MAGIC_LIB@
+ LIBFUSE = @FUSE_LIB@
+-LIBSUPPORT = $(LIBINTL) $(LIB)/libsupport@STATIC_LIB_EXT@
++LIBSUPPORT = $(LIB)/libsupport@STATIC_LIB_EXT@ $(LIBINTL)
+ LIBBLKID = @LIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
+ LIBINTL = @LIBINTL@
+ SYSLIBS = @LIBS@ @PTHREAD_LIBS@
+@@ -154,7 +154,7 @@
+ STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@
+ STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@
+ STATIC_LIBUUID = @STATIC_LIBUUID@ @SOCKET_LIB@
+-STATIC_LIBSUPPORT = $(LIBINTL) $(LIBSUPPORT)
++STATIC_LIBSUPPORT = $(LIBSUPPORT) $(LIBINTL)
+ STATIC_LIBBLKID = @STATIC_LIBBLKID@ $(STATIC_LIBUUID)
+ DEPSTATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
+ DEPSTATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@
+@@ -167,7 +167,7 @@
+ PROFILED_LIBE2P = $(LIB)/libe2p@PROFILED_LIB_EXT@
+ PROFILED_LIBEXT2FS = $(LIB)/libext2fs@PROFILED_LIB_EXT@
+ PROFILED_LIBUUID = @PROFILED_LIBUUID@ @SOCKET_LIB@
+-PROFILED_LIBSUPPORT = $(LIBINTL) $(LIB)/libsupport@PROFILED_LIB_EXT@
++PROFILED_LIBSUPPORT = $(LIB)/libsupport@PROFILED_LIB_EXT@ $(LIBINTL)
+ PROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(PROFILED_LIBUUID)
+ DEPPROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@
+ DEPPROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@
+diff -Paur --no-dereference -- e2fsprogs.upstream/Makefile.in e2fsprogs/Makefile.in
+--- e2fsprogs.upstream/Makefile.in
++++ e2fsprogs/Makefile.in
+@@ -135,6 +135,11 @@
+ 	$(RM) -rf autom4te.cache ext2ed/Makefile po/stamp-po \
+ 		asm_types.h config.log public_config.h parse-types.log
+ 	$(MAKE) distclean-local 
++	$(RM) -f parse-types.log
++	$(RM) -f public_config.h
++	$(RM) -f util/install-symlink
++	$(RM) -f asm_types.h
++	$(RM) -f scrub/Makefile
+ 
+ realclean: realclean-recursive realclean-local
+ 
 diff -Paur --no-dereference -- e2fsprogs.upstream/config/parse-types.sh e2fsprogs/config/parse-types.sh
 --- e2fsprogs.upstream/config/parse-types.sh
 +++ e2fsprogs/config/parse-types.sh
@@ -23,7 +68,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/config/parse-types.sh e2fsprog
 diff -Paur --no-dereference -- e2fsprogs.upstream/debugfs/debugfs.c e2fsprogs/debugfs/debugfs.c
 --- e2fsprogs.upstream/debugfs/debugfs.c
 +++ e2fsprogs/debugfs/debugfs.c
-@@ -1818,7 +1818,11 @@
+@@ -1816,7 +1816,11 @@
  	if (argc != nr)
  		goto usage;
  
@@ -57,17 +102,17 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/e2fsck/journal.c e2fsprogs/e2f
  #include <sys/mount.h>
  #define MNT_FL (MS_MGC_VAL | MS_RDONLY)
  #endif
-@@ -635,11 +634,11 @@
+@@ -634,11 +633,11 @@
  	       val + sizeof(struct ext4_fc_dentry_info),
  	       darg->dname_len);
  	darg->dname[darg->dname_len] = 0;
--	jbd_debug(1, "%s: %s, ino %lu, parent %lu\n",
+-	jbd_debug(1, "%s: %s, ino %u, parent %u\n",
 +	jbd_debug(1, "%s: %s, ino %ju, parent %ju\n",
- 		tag == EXT4_FC_TAG_CREAT ? "create" :
- 		(tag == EXT4_FC_TAG_LINK ? "link" :
- 		(tag == EXT4_FC_TAG_UNLINK ? "unlink" : "error")),
--		darg->dname, darg->ino, darg->parent_ino);
-+		darg->dname, (uintmax_t) darg->ino, (uintmax_t) darg->parent_ino);
+ 		  le16_to_cpu(tl->fc_tag) == EXT4_FC_TAG_CREAT ? "create" :
+ 		  (le16_to_cpu(tl->fc_tag) == EXT4_FC_TAG_LINK ? "link" :
+ 		   (le16_to_cpu(tl->fc_tag) == EXT4_FC_TAG_UNLINK ? "unlink" :
+-		    "error")), darg->dname, darg->ino, darg->parent_ino);
++		    "error")), darg->dname, (uintmax_t)darg->ino, (uintmax_t)darg->parent_ino);
  	return 0;
  }
  
@@ -166,7 +211,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/e2fsck/sigcatcher.c e2fsprogs/
 diff -Paur --no-dereference -- e2fsprogs.upstream/e2fsck/unix.c e2fsprogs/e2fsck/unix.c
 --- e2fsprogs.upstream/e2fsck/unix.c
 +++ e2fsprogs/e2fsck/unix.c
-@@ -290,7 +290,7 @@
+@@ -291,7 +291,7 @@
  {
  	FILE	*f;
  	DIR	*d;
@@ -175,7 +220,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/e2fsck/unix.c e2fsprogs/e2fsck
  	unsigned int	acflag;
  	struct dirent*	de;
  
-@@ -604,8 +604,6 @@
+@@ -605,8 +605,6 @@
  	return 0;
  }
  
@@ -184,7 +229,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/e2fsck/unix.c e2fsprogs/e2fsck
  /*
   * Make sure 0,1,2 file descriptors are open, so that we don't open
   * the filesystem using the same file descriptor as stdout or stderr.
-@@ -1129,21 +1127,21 @@
+@@ -1130,21 +1128,21 @@
  	if (cflag) {
  		char *oldpath = getenv("PATH");
  		char *newpath;
@@ -223,7 +268,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/e2fsck/util.c e2fsprogs/e2fsck
  	gettimeofday(&track->time_start, 0);
  #ifdef HAVE_GETRUSAGE
  #ifdef sun
-@@ -442,7 +442,7 @@
+@@ -451,7 +451,7 @@
  	} else
  #endif
  	log_out(ctx, _("Memory used: %lluk, "),
@@ -420,51 +465,6 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/lib/blkid/devname.c e2fsprogs/
  /*
   * Find a dev struct in the cache by device name, if available.
   *
-diff -Paur --no-dereference -- e2fsprogs.upstream/lib/e2p/fgetversion.c e2fsprogs/lib/e2p/fgetversion.c
---- e2fsprogs.upstream/lib/e2p/fgetversion.c
-+++ e2fsprogs/lib/e2p/fgetversion.c
-@@ -65,8 +65,6 @@
- 	rc = syscall(SYS_fsctl, name, EXT2_IOC_GETVERSION, &ver, 0);
- # endif /* !APPLE_DARWIN */
- #else /* ! HAVE_EXT2_IOCTLS */
--	extern int errno;
--
- 	errno = EOPNOTSUPP;
- #endif /* ! HAVE_EXT2_IOCTLS */
- 	if (rc == 0)
-diff -Paur --no-dereference -- e2fsprogs.upstream/lib/e2p/fsetversion.c e2fsprogs/lib/e2p/fsetversion.c
---- e2fsprogs.upstream/lib/e2p/fsetversion.c
-+++ e2fsprogs/lib/e2p/fsetversion.c
-@@ -65,7 +65,6 @@
-    return syscall(SYS_fsctl, name, EXT2_IOC_SETVERSION, &ver, 0);
- #endif
- #else /* ! HAVE_EXT2_IOCTLS */
--	extern int errno;
- 	errno = EOPNOTSUPP;
- 	return -1;
- #endif /* ! HAVE_EXT2_IOCTLS */
-diff -Paur --no-dereference -- e2fsprogs.upstream/lib/e2p/getversion.c e2fsprogs/lib/e2p/getversion.c
---- e2fsprogs.upstream/lib/e2p/getversion.c
-+++ e2fsprogs/lib/e2p/getversion.c
-@@ -35,7 +35,6 @@
- 	*version = ver;
- 	return r;
- #else /* ! HAVE_EXT2_IOCTLS */
--	extern int errno;
- 	errno = EOPNOTSUPP;
- 	return -1;
- #endif /* ! HAVE_EXT2_IOCTLS */
-diff -Paur --no-dereference -- e2fsprogs.upstream/lib/e2p/setversion.c e2fsprogs/lib/e2p/setversion.c
---- e2fsprogs.upstream/lib/e2p/setversion.c
-+++ e2fsprogs/lib/e2p/setversion.c
-@@ -34,7 +34,6 @@
- 	ver = (int) version;
- 	return ioctl (fd, EXT2_IOC_SETVERSION, &ver);
- #else /* ! HAVE_EXT2_IOCTLS */
--	extern int errno;
- 	errno = EOPNOTSUPP;
- 	return -1;
- #endif /* ! HAVE_EXT2_IOCTLS */
 diff -Paur --no-dereference -- e2fsprogs.upstream/lib/ext2fs/bitmaps.c e2fsprogs/lib/ext2fs/bitmaps.c
 --- e2fsprogs.upstream/lib/ext2fs/bitmaps.c
 +++ e2fsprogs/lib/ext2fs/bitmaps.c
@@ -779,8 +779,8 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/lib/ext2fs/tdb.c e2fsprogs/lib
 diff -Paur --no-dereference -- e2fsprogs.upstream/lib/ss/help.c e2fsprogs/lib/ss/help.c
 --- e2fsprogs.upstream/lib/ss/help.c
 +++ e2fsprogs/lib/ss/help.c
-@@ -24,9 +24,7 @@
- extern int errno;
+@@ -22,9 +22,7 @@
+ #include <errno.h>
  #endif
  #include <fcntl.h>
 -#include <sys/param.h>
@@ -803,7 +803,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/lib/ss/listen.c e2fsprogs/lib/
 diff -Paur --no-dereference -- e2fsprogs.upstream/lib/ss/pager.c e2fsprogs/lib/ss/pager.c
 --- e2fsprogs.upstream/lib/ss/pager.c
 +++ e2fsprogs/lib/ss/pager.c
-@@ -27,7 +27,6 @@
+@@ -25,7 +25,6 @@
  #include "ss_internal.h"
  #include <stdio.h>
  #include <sys/types.h>
@@ -825,7 +825,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/lib/support/quotaio.c e2fsprog
 diff -Paur --no-dereference -- e2fsprogs.upstream/lib/uuid/gen_uuid.c e2fsprogs/lib/uuid/gen_uuid.c
 --- e2fsprogs.upstream/lib/uuid/gen_uuid.c
 +++ e2fsprogs/lib/uuid/gen_uuid.c
-@@ -101,9 +101,22 @@
+@@ -96,9 +96,22 @@
  #include "uuidP.h"
  #include "uuidd.h"
  
@@ -851,8 +851,8 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/lib/uuid/gen_uuid.c e2fsprogs/
  #endif
  
  #ifdef TLS
-@@ -138,94 +151,13 @@
- #endif
+@@ -112,94 +125,13 @@
+ THREAD_LOCAL unsigned short jrand_seed[3];
  #endif
  
 -static int get_random_fd(void)
@@ -947,7 +947,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/lib/uuid/gen_uuid.c e2fsprogs/
  }
  
  /*
-@@ -238,7 +170,9 @@
+@@ -212,7 +144,9 @@
   */
  static int get_node_id(unsigned char *node_id)
  {
@@ -958,7 +958,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/lib/uuid/gen_uuid.c e2fsprogs/
  	int 		sd;
  	struct ifreq 	ifr, *ifrp;
  	struct ifconf 	ifc;
-@@ -695,14 +629,10 @@
+@@ -669,14 +603,10 @@
  
  /*
   * This is the generic front-end to uuid_generate_random and
@@ -979,7 +979,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/lib/uuid/gen_uuid.c e2fsprogs/
 diff -Paur --no-dereference -- e2fsprogs.upstream/lib/uuid/tst_uuid.c e2fsprogs/lib/uuid/tst_uuid.c
 --- e2fsprogs.upstream/lib/uuid/tst_uuid.c
 +++ e2fsprogs/lib/uuid/tst_uuid.c
-@@ -143,9 +143,9 @@
+@@ -137,9 +137,9 @@
  	tv.tv_sec = 0;
  	tv.tv_usec = 0;
  	time_reg = uuid_time(buf, &tv);
@@ -995,7 +995,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/lib/uuid/tst_uuid.c e2fsprogs/
 diff -Paur --no-dereference -- e2fsprogs.upstream/lib/uuid/uuid_time.c e2fsprogs/lib/uuid/uuid_time.c
 --- e2fsprogs.upstream/lib/uuid/uuid_time.c
 +++ e2fsprogs/lib/uuid/uuid_time.c
-@@ -165,7 +165,7 @@
+@@ -159,7 +159,7 @@
  		printf("Warning: not a time-based UUID, so UUID time "
  		       "decoding will likely not work!\n");
  	}
@@ -1004,132 +1004,6 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/lib/uuid/uuid_time.c e2fsprogs
  	       ctime(&time_reg));
  
  	return 0;
-diff -Paur --no-dereference -- e2fsprogs.upstream/Makefile.in e2fsprogs/Makefile.in
---- e2fsprogs.upstream/Makefile.in
-+++ e2fsprogs/Makefile.in
-@@ -135,6 +135,11 @@
- 	$(RM) -rf autom4te.cache ext2ed/Makefile po/stamp-po \
- 		asm_types.h config.log public_config.h parse-types.log
- 	$(MAKE) distclean-local 
-+	$(RM) -f parse-types.log
-+	$(RM) -f public_config.h
-+	$(RM) -f util/install-symlink
-+	$(RM) -f asm_types.h
-+	$(RM) -f scrub/Makefile
- 
- realclean: realclean-recursive realclean-local
- 
-diff -Paur --no-dereference -- e2fsprogs.upstream/MCONFIG.in e2fsprogs/MCONFIG.in
---- e2fsprogs.upstream/MCONFIG.in
-+++ e2fsprogs/MCONFIG.in
-@@ -137,7 +137,7 @@
- LIBUUID = @LIBUUID@ @SOCKET_LIB@
- LIBMAGIC = @MAGIC_LIB@
- LIBFUSE = @FUSE_LIB@
--LIBSUPPORT = $(LIBINTL) $(LIB)/libsupport@STATIC_LIB_EXT@
-+LIBSUPPORT = $(LIB)/libsupport@STATIC_LIB_EXT@ $(LIBINTL)
- LIBBLKID = @LIBBLKID@ @PRIVATE_LIBS_CMT@ $(LIBUUID)
- LIBINTL = @LIBINTL@
- SYSLIBS = @LIBS@ @PTHREAD_LIBS@
-@@ -153,7 +153,7 @@
- STATIC_LIBE2P = $(LIB)/libe2p@STATIC_LIB_EXT@
- STATIC_LIBEXT2FS = $(LIB)/libext2fs@STATIC_LIB_EXT@
- STATIC_LIBUUID = @STATIC_LIBUUID@ @SOCKET_LIB@
--STATIC_LIBSUPPORT = $(LIBINTL) $(LIBSUPPORT)
-+STATIC_LIBSUPPORT = $(LIBSUPPORT) $(LIBINTL)
- STATIC_LIBBLKID = @STATIC_LIBBLKID@ $(STATIC_LIBUUID)
- DEPSTATIC_LIBSS = $(LIB)/libss@STATIC_LIB_EXT@
- DEPSTATIC_LIBCOM_ERR = $(LIB)/libcom_err@STATIC_LIB_EXT@
-@@ -166,7 +166,7 @@
- PROFILED_LIBE2P = $(LIB)/libe2p@PROFILED_LIB_EXT@
- PROFILED_LIBEXT2FS = $(LIB)/libext2fs@PROFILED_LIB_EXT@
- PROFILED_LIBUUID = @PROFILED_LIBUUID@ @SOCKET_LIB@
--PROFILED_LIBSUPPORT = $(LIBINTL) $(LIB)/libsupport@PROFILED_LIB_EXT@
-+PROFILED_LIBSUPPORT = $(LIB)/libsupport@PROFILED_LIB_EXT@ $(LIBINTL)
- PROFILED_LIBBLKID = @PROFILED_LIBBLKID@ $(PROFILED_LIBUUID)
- DEPPROFILED_LIBSS = $(LIB)/libss@PROFILED_LIB_EXT@
- DEPPROFILED_LIBCOM_ERR = $(LIB)/libcom_err@PROFILED_LIB_EXT@
-diff -Paur --no-dereference -- e2fsprogs.upstream/misc/badblocks.c e2fsprogs/misc/badblocks.c
---- e2fsprogs.upstream/misc/badblocks.c
-+++ e2fsprogs/misc/badblocks.c
-@@ -331,7 +331,7 @@
- 
- 	if (pattern == (unsigned int) ~0) {
- 		for (ptr = buffer; ptr < buffer + n; ptr++) {
--			(*ptr) = random() % (1 << (8 * sizeof(char)));
-+			(*ptr) = arc4random_uniform(1 << (8 * sizeof(char)));
- 		}
- 		if (s_flag | v_flag)
- 			fputs(_("Testing with random pattern: "), stderr);
-@@ -1076,7 +1076,6 @@
- 	textdomain(NLS_CAT_NAME);
- 	set_com_err_gettext(gettext);
- #endif
--	srandom((unsigned int)time(NULL));  /* simple randomness is enough */
- 	test_func = test_ro;
- 
- 	/* Determine the system page size if possible */
-diff -Paur --no-dereference -- e2fsprogs.upstream/misc/chattr.c e2fsprogs/misc/chattr.c
---- e2fsprogs.upstream/misc/chattr.c
-+++ e2fsprogs/misc/chattr.c
-@@ -31,7 +31,6 @@
- #ifdef HAVE_ERRNO_H
- #include <errno.h>
- #endif
--#include <sys/param.h>
- #include <sys/stat.h>
- #include "ext2fs/ext2_fs.h"
- 
-diff -Paur --no-dereference -- e2fsprogs.upstream/misc/create_inode.c e2fsprogs/misc/create_inode.c
---- e2fsprogs.upstream/misc/create_inode.c
-+++ e2fsprogs/misc/create_inode.c
-@@ -310,6 +310,7 @@
- 	inode.i_atime = inode.i_ctime = inode.i_mtime =
- 		fs->now ? fs->now : time(0);
- 
-+#ifndef __sortix__
- 	if (filetype != S_IFIFO) {
- 		devmajor = major(st_rdev);
- 		devminor = minor(st_rdev);
-@@ -323,6 +324,7 @@
- 					   ((devminor & ~0xff) << 12);
- 		}
- 	}
-+#endif
- 	inode.i_links_count = 1;
- 
- 	retval = ext2fs_write_new_inode(fs, ino, &inode);
-diff -Paur --no-dereference -- e2fsprogs.upstream/misc/e2fuzz.c e2fsprogs/misc/e2fuzz.c
---- e2fsprogs.upstream/misc/e2fuzz.c
-+++ e2fsprogs/misc/e2fuzz.c
-@@ -171,7 +171,7 @@
- 	uint8_t *px = (uint8_t *)&x;
- 
- 	for (i = 0; i < sizeof(x); i++)
--		px[i] = random();
-+		px[i] = arc4random() & 0xff;
- 
- 	return min + (uint64_t)((double)(max - min) *
- 				(x / ((double) UINT64_MAX + 1.0)));
-@@ -259,7 +259,6 @@
- 		perror(fsname);
- 		goto fail;
- 	}
--	srandom(getseed());
- 	hsize = fs->blocksize * ext2fs_blocks_count(fs->super);
- 	if (user_corrupt_bytes > 0)
- 		count = user_corrupt_bytes;
-diff -Paur --no-dereference -- e2fsprogs.upstream/misc/lsattr.c e2fsprogs/misc/lsattr.c
---- e2fsprogs.upstream/misc/lsattr.c
-+++ e2fsprogs/misc/lsattr.c
-@@ -36,7 +36,6 @@
- #include <unistd.h>
- #include <stdlib.h>
- #include <string.h>
--#include <sys/param.h>
- #include <sys/stat.h>
- 
- #include "ext2fs/ext2_fs.h"
 diff -Paur --no-dereference -- e2fsprogs.upstream/misc/Makefile.in e2fsprogs/misc/Makefile.in
 --- e2fsprogs.upstream/misc/Makefile.in
 +++ e2fsprogs/misc/Makefile.in
@@ -1186,6 +1060,87 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/misc/Makefile.in e2fsprogs/mis
  
  install-strip: install
  	$(Q) for i in $(SPROGS); do \
+diff -Paur --no-dereference -- e2fsprogs.upstream/misc/badblocks.c e2fsprogs/misc/badblocks.c
+--- e2fsprogs.upstream/misc/badblocks.c
++++ e2fsprogs/misc/badblocks.c
+@@ -331,7 +331,7 @@
+ 
+ 	if (pattern == (unsigned int) ~0) {
+ 		for (ptr = buffer; ptr < buffer + n; ptr++) {
+-			(*ptr) = random() % (1 << (8 * sizeof(char)));
++			(*ptr) = arc4random_uniform(1 << (8 * sizeof(char)));
+ 		}
+ 		if (s_flag | v_flag)
+ 			fputs(_("Testing with random pattern: "), stderr);
+@@ -1079,7 +1079,6 @@
+ 	textdomain(NLS_CAT_NAME);
+ 	set_com_err_gettext(gettext);
+ #endif
+-	srandom((unsigned int)time(NULL));  /* simple randomness is enough */
+ 	test_func = test_ro;
+ 
+ 	/* Determine the system page size if possible */
+diff -Paur --no-dereference -- e2fsprogs.upstream/misc/chattr.c e2fsprogs/misc/chattr.c
+--- e2fsprogs.upstream/misc/chattr.c
++++ e2fsprogs/misc/chattr.c
+@@ -31,7 +31,6 @@
+ #ifdef HAVE_ERRNO_H
+ #include <errno.h>
+ #endif
+-#include <sys/param.h>
+ #include <sys/stat.h>
+ #include "ext2fs/ext2_fs.h"
+ 
+diff -Paur --no-dereference -- e2fsprogs.upstream/misc/create_inode.c e2fsprogs/misc/create_inode.c
+--- e2fsprogs.upstream/misc/create_inode.c
++++ e2fsprogs/misc/create_inode.c
+@@ -312,6 +312,7 @@
+ 	inode.i_atime = inode.i_ctime = inode.i_mtime =
+ 		fs->now ? fs->now : time(0);
+ 
++#ifndef __sortix__
+ 	if (filetype != S_IFIFO) {
+ 		devmajor = major(st_rdev);
+ 		devminor = minor(st_rdev);
+@@ -325,6 +326,7 @@
+ 					   ((devminor & ~0xff) << 12);
+ 		}
+ 	}
++#endif
+ 	inode.i_links_count = 1;
+ 
+ 	retval = ext2fs_write_new_inode(fs, ino, &inode);
+diff -Paur --no-dereference -- e2fsprogs.upstream/misc/e2fuzz.c e2fsprogs/misc/e2fuzz.c
+--- e2fsprogs.upstream/misc/e2fuzz.c
++++ e2fsprogs/misc/e2fuzz.c
+@@ -171,7 +171,7 @@
+ 	uint8_t *px = (uint8_t *)&x;
+ 
+ 	for (i = 0; i < sizeof(x); i++)
+-		px[i] = random();
++		px[i] = arc4random() & 0xff;
+ 
+ 	return min + (uint64_t)((double)(max - min) *
+ 				(x / ((double) UINT64_MAX + 1.0)));
+@@ -259,7 +259,6 @@
+ 		perror(fsname);
+ 		goto fail;
+ 	}
+-	srandom(getseed());
+ 	hsize = fs->blocksize * ext2fs_blocks_count(fs->super);
+ 	if (user_corrupt_bytes > 0)
+ 		count = user_corrupt_bytes;
+diff -Paur --no-dereference -- e2fsprogs.upstream/misc/lsattr.c e2fsprogs/misc/lsattr.c
+--- e2fsprogs.upstream/misc/lsattr.c
++++ e2fsprogs/misc/lsattr.c
+@@ -36,7 +36,6 @@
+ #include <unistd.h>
+ #include <stdlib.h>
+ #include <string.h>
+-#include <sys/param.h>
+ #include <sys/stat.h>
+ 
+ #include "ext2fs/ext2_fs.h"
 diff -Paur --no-dereference -- e2fsprogs.upstream/misc/mke2fs.c e2fsprogs/misc/mke2fs.c
 --- e2fsprogs.upstream/misc/mke2fs.c
 +++ e2fsprogs/misc/mke2fs.c
@@ -1207,7 +1162,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/misc/mke2fs.c e2fsprogs/misc/m
  #include <blkid/blkid.h>
  
  #include "ext2fs/ext2_fs.h"
-@@ -709,7 +713,7 @@
+@@ -711,7 +715,7 @@
  	       100.0 *  ext2fs_r_blocks_count(s) / ext2fs_blocks_count(s));
  	printf(_("First data block=%u\n"), s->s_first_data_block);
  	if (root_uid != 0 || root_gid != 0)
@@ -1216,7 +1171,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/misc/mke2fs.c e2fsprogs/misc/m
  	if (s->s_reserved_gdt_blocks)
  		printf(_("Maximum filesystem blocks=%lu\n"),
  		       (s->s_reserved_gdt_blocks + fs->desc_blocks) *
-@@ -792,8 +796,6 @@
+@@ -794,8 +798,6 @@
  	return 1;
  }
  
@@ -1225,7 +1180,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/misc/mke2fs.c e2fsprogs/misc/m
  static void parse_extended_opts(struct ext2_super_block *param,
  				const char *opts)
  {
-@@ -1196,6 +1198,8 @@
+@@ -1220,6 +1222,8 @@
  
  static const char *config_fn[] = { ROOT_SYSCONFDIR "/mke2fs.conf", 0 };
  
@@ -1234,7 +1189,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/misc/mke2fs.c e2fsprogs/misc/m
  static void edit_feature(const char *str, __u32 *compat_array)
  {
  	if (!str)
-@@ -1578,27 +1582,27 @@
+@@ -1603,27 +1607,27 @@
  	int		fs_features_size = 0;
  	int		use_bsize;
  	char		*newpath;
@@ -1267,7 +1222,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/misc/mke2fs.c e2fsprogs/misc/m
  
  	/* Determine the system page size if possible */
  #ifdef HAVE_SYSCONF
-@@ -1616,6 +1620,8 @@
+@@ -1644,6 +1648,8 @@
  		config_fn[0] = tmp;
  	profile_set_syntax_err_cb(syntax_err_report);
  	retval = profile_init(config_fn, &profile);
@@ -1301,7 +1256,18 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/misc/mklost+found.c e2fsprogs/
 diff -Paur --no-dereference -- e2fsprogs.upstream/misc/tune2fs.c e2fsprogs/misc/tune2fs.c
 --- e2fsprogs.upstream/misc/tune2fs.c
 +++ e2fsprogs/misc/tune2fs.c
-@@ -3118,7 +3118,7 @@
+@@ -97,6 +97,10 @@
+ #define EXT4_IOC_SETFSUUID	_IOW('f', 44, struct fsuuid)
+ #endif
+ 
++#ifndef PATH_MAX
++#define PATH_MAX 4096
++#endif
++
+ extern int ask_yn(const char *string, int def);
+ 
+ const char *program_name = "tune2fs";
+@@ -3363,7 +3367,7 @@
  	if (c_flag) {
  		if (max_mount_count == 65536)
  			max_mount_count = EXT2_DFL_MAX_MNT_COUNT +
@@ -1409,7 +1375,7 @@ diff -Paur --no-dereference -- e2fsprogs.upstream/resize/resource_track.c e2fspr
  	gettimeofday(&track->time_start, 0);
  #ifdef HAVE_GETRUSAGE
  #ifdef sun
-@@ -85,7 +85,7 @@
+@@ -92,7 +92,7 @@
  		kbytes(malloc_info.uordblks), kbytes(malloc_info.fordblks));
  #else
  	printf("Memory used: %lu, ",

ports/e2fsprogs/e2fsprogs.port

@@ -1,11 +1,11 @@
 NAME=e2fsprogs
 # Requires gettext (otherwise bundled copy is used)
 BUILD_LIBRARIES='libiconv libintl'
-VERSION=1.46.5
+VERSION=1.47.0
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=2f16c9176704cf645dc69d5b15ff704ae722d665df38b2ed3cfc249757d8d81e
+SHA256SUM=144af53f2bbd921cef6f8bea88bb9faddca865da3fbc657cc9b4d2001097d5db
 UPSTREAM_SITE=https://kernel.org/pub/linux/kernel/people/tytso/e2fsprogs/v$VERSION
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE=GPL-2.0-only

ports/gawk/gawk.patch

@@ -1,7 +1,7 @@
 diff -Paur --no-dereference -- gawk.upstream/builtin.c gawk/builtin.c
 --- gawk.upstream/builtin.c
 +++ gawk/builtin.c
-@@ -1192,10 +1192,18 @@
+@@ -1249,10 +1249,18 @@
  			 * Use snprintf return value to tell if there
  			 * is enough room in the buffer or not.
  			 */
@@ -23,7 +23,7 @@ diff -Paur --no-dereference -- gawk.upstream/builtin.c gawk/builtin.c
 diff -Paur --no-dereference -- gawk.upstream/extension/filefuncs.c gawk/extension/filefuncs.c
 --- gawk.upstream/extension/filefuncs.c
 +++ gawk/extension/filefuncs.c
-@@ -414,8 +414,12 @@
+@@ -418,8 +418,12 @@
  	/* for block and character devices, add rdev, major and minor numbers */
  	if (S_ISBLK(sbuf->st_mode) || S_ISCHR(sbuf->st_mode)) {
  		array_set_numeric(array, "rdev", sbuf->st_rdev);
@@ -51,7 +51,7 @@ diff -Paur --no-dereference -- gawk.upstream/io.c gawk/io.c
 diff -Paur --no-dereference -- gawk.upstream/main.c gawk/main.c
 --- gawk.upstream/main.c
 +++ gawk/main.c
-@@ -984,13 +984,7 @@
+@@ -1063,13 +1063,7 @@
  	update_PROCINFO_num("api_minor", GAWK_API_MINOR_VERSION);
  #endif
  
@@ -69,7 +69,7 @@ diff -Paur --no-dereference -- gawk.upstream/main.c gawk/main.c
 diff -Paur --no-dereference -- gawk.upstream/node.c gawk/node.c
 --- gawk.upstream/node.c
 +++ gawk/node.c
-@@ -860,6 +860,8 @@
+@@ -1005,6 +1005,8 @@
  	n->flags &= ~WSTRCUR;
  }
  
@@ -78,7 +78,7 @@ diff -Paur --no-dereference -- gawk.upstream/node.c gawk/node.c
  static void __attribute__ ((unused))
  dump_wstr(FILE *fp, const wchar_t *str, size_t len)
  {
-@@ -869,6 +871,7 @@
+@@ -1014,6 +1016,7 @@
  	for (; len--; str++)
  		putwc(*str, fp);
  }
@@ -89,7 +89,7 @@ diff -Paur --no-dereference -- gawk.upstream/node.c gawk/node.c
 diff -Paur --no-dereference -- gawk.upstream/support/getopt.c gawk/support/getopt.c
 --- gawk.upstream/support/getopt.c
 +++ gawk/support/getopt.c
-@@ -55,18 +55,9 @@
+@@ -56,18 +56,9 @@
  #ifndef ELIDE_CODE
  
  

ports/gawk/gawk.port

@@ -1,11 +1,12 @@
 NAME=gawk
 BUILD_LIBRARIES='libiconv? libintl? libgmp? libmpfr? libreadline?'
-VERSION=4.2.0
+VERSION=5.3.0
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=d4f3cd31c001fd0ed52832d4fbfbdfeaa38ad541c182f80ff8fdf87324a6a9f2
+SHA256SUM=ca9c16d3d11d0ff8c69d79dc0b47267e1329a69b39b799895604ed447d3ca90b
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/gawk
 UPSTREAM_ARCHIVE=$ARCHIVE
+LICENSE=GPL-3.0-or-later
 BUILD_SYSTEM=configure
 POST_INSTALL=tix-eradicate-libtool-la

ports/git/git.patch

@@ -1,7 +1,76 @@
+diff -Paur --no-dereference -- git.upstream/Makefile git/Makefile
+--- git.upstream/Makefile
++++ git/Makefile
+@@ -646,7 +646,9 @@
+ MSGCAT = msgcat
+ MSGFMT = msgfmt
+ MSGMERGE = msgmerge
+-CURL_CONFIG = curl-config
++# PATCH: Always use pkg-config instead of the cross unsafe curl-config.
++PKG_CONFIG ?= pkg-config
++CURL_CONFIG = $(PKG_CONFIG) libcurl
+ GCOV = gcov
+ STRIP = strip
+ SPATCH = spatch
+@@ -2843,8 +2845,9 @@
+ doc: man-perl
+ 	$(MAKE) -C Documentation all
+ 
+-man: man-perl
+-	$(MAKE) -C Documentation man
++# PATCH: Build manual pages if asciidoc and xmlto are installed.
++man: man
++	if which asciidoc 1>/dev/null 2>/dev/null && which xmlto 1>/dev/null 2>/dev/null; then $(MAKE) -C Documentation man; fi
+ 
+ man-perl: perl/build/man/man3/Git.3pm
+ 
+@@ -3444,7 +3447,7 @@
+ 
+ INSTALL_STRIP =
+ 
+-install: all
++install: all install-man
+ 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
+ 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+ 	$(INSTALL) $(INSTALL_STRIP) $(PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
+@@ -3540,8 +3543,9 @@
+ install-doc: install-man-perl
+ 	$(MAKE) -C Documentation install
+ 
+-install-man: install-man-perl
+-	$(MAKE) -C Documentation install-man
++# PATCH: Build manual pages if asciidoc and xmlto are installed.
++install-man:
++	if which asciidoc 1>/dev/null 2>/dev/null && which xmlto 1>/dev/null 2>/dev/null; then $(MAKE) -C Documentation install-man; fi
+ 
+ install-man-perl: man-perl
+ 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(mandir_SQ)/man3'
+@@ -3648,8 +3652,8 @@
+ 
+ ### Cleaning rules
+ 
++# PATCH: Don't delete configure when making distclean because it is in the dist.
+ distclean: clean
+-	$(RM) configure
+ 	$(RM) config.log config.status config.cache
+ 	$(RM) config.mak.autogen config.mak.append
+ 	$(RM) -r autom4te.cache
+diff -Paur --no-dereference -- git.upstream/builtin/gc.c git/builtin/gc.c
+--- git.upstream/builtin/gc.c
++++ git/builtin/gc.c
+@@ -1771,7 +1771,7 @@
+ 
+ static char *launchctl_get_uid(void)
+ {
+-	return xstrfmt("gui/%d", getuid());
++	return xstrfmt("gui/%jd", (intmax_t)getuid());
+ }
+ 
+ static int launchctl_boot_plist(int enable, const char *filename)
 diff -Paur --no-dereference -- git.upstream/builtin/log.c git/builtin/log.c
 --- git.upstream/builtin/log.c
 +++ git/builtin/log.c
-@@ -249,7 +249,12 @@
+@@ -395,7 +395,12 @@
  	fprintf(rev->diffopt.file, _("Final output: %d %s\n"), nr, stage);
  }
  
@@ -14,7 +83,7 @@ diff -Paur --no-dereference -- git.upstream/builtin/log.c git/builtin/log.c
  
  static void log_show_early(struct rev_info *revs, struct commit_list *list)
  {
-@@ -297,9 +302,18 @@
+@@ -444,9 +449,18 @@
  	 * trigger every second even if we're blocked on a
  	 * reader!
  	 */
@@ -32,10 +101,10 @@ diff -Paur --no-dereference -- git.upstream/builtin/log.c git/builtin/log.c
 +#endif
  }
  
- static void early_output(int signal)
-@@ -309,6 +323,13 @@
+ static void early_output(int signal UNUSED)
+@@ -456,6 +470,13 @@
  
- static void setup_early_output(struct rev_info *rev)
+ static void setup_early_output(void)
  {
 +#if defined(__sortix__) && !defined(__SORTIX_HAS_RESTARTABLE_SYSCALLS__)
 +	/* TODO: Sortix doesn't have restartable system calls at the moment and this
@@ -47,7 +116,7 @@ diff -Paur --no-dereference -- git.upstream/builtin/log.c git/builtin/log.c
  	struct sigaction sa;
  
  	/*
-@@ -331,13 +352,37 @@
+@@ -478,13 +499,37 @@
  	 *
  	 * This is a one-time-only trigger.
  	 */
@@ -82,7 +151,7 @@ diff -Paur --no-dereference -- git.upstream/builtin/log.c git/builtin/log.c
 +#if defined(__sortix__)
 +	timer_delete(early_output_timer);
 +#endif
- 	int n = estimate_commit_count(rev, rev->commits);
+ 	int n = estimate_commit_count(rev->commits);
  	signal(SIGALRM, SIG_IGN);
  	show_early_header(rev, "done", n);
 diff -Paur --no-dereference -- git.upstream/compat/hstrerror.c git/compat/hstrerror.c
@@ -107,7 +176,7 @@ diff -Paur --no-dereference -- git.upstream/compat/hstrerror.c git/compat/hstrer
 diff -Paur --no-dereference -- git.upstream/config.mak.uname git/config.mak.uname
 --- git.upstream/config.mak.uname
 +++ git/config.mak.uname
-@@ -17,6 +17,8 @@
+@@ -40,6 +40,8 @@
  # because maintaining the nesting to match is a pain.  If
  # we had "elif" things would have been much nicer...
  
@@ -116,29 +185,47 @@ diff -Paur --no-dereference -- git.upstream/config.mak.uname git/config.mak.unam
  ifeq ($(uname_S),OSF1)
  	# Need this for u_short definitions et al
  	BASIC_CFLAGS += -D_OSF_SOURCE
+@@ -60,10 +62,12 @@
+ 	HAVE_SYNC_FILE_RANGE = YesPlease
+ 	HAVE_GETDELIM = YesPlease
+ 	FREAD_READS_DIRECTORIES = UnfortunatelyYes
+-	BASIC_CFLAGS += -DHAVE_SYSINFO
+-	PROCFS_EXECUTABLE_PATH = /proc/self/exe
+-	HAVE_PLATFORM_PROCINFO = YesPlease
+-	COMPAT_OBJS += compat/linux/procinfo.o
++	# PATCH: Unfortunately this whole system isn't cross safe and isn't fully
++	#        overriden by config.mak.autogen.
++	#BASIC_CFLAGS += -DHAVE_SYSINFO
++	#PROCFS_EXECUTABLE_PATH = /proc/self/exe
++	#HAVE_PLATFORM_PROCINFO = YesPlease
++	#COMPAT_OBJS += compat/linux/procinfo.o
+ 	# centos7/rhel7 provides gcc 4.8.5 and zlib 1.2.7.
+ 	ifneq ($(findstring .el7.,$(uname_R)),)
+ 		BASIC_CFLAGS += -std=c99
 diff -Paur --no-dereference -- git.upstream/configure git/configure
 --- git.upstream/configure
 +++ git/configure
-@@ -5315,7 +5315,7 @@
-   $as_echo_n "(cached) " >&6
- else
+@@ -5466,7 +5466,7 @@
+   printf %s "(cached) " >&6
+ else $as_nop
    ac_check_lib_save_LIBS=$LIBS
 -LIBS="-lcurl  $LIBS"
 +LIBS="-lcurl -lssl -lcrypto -lz $LIBS"
  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
  
-@@ -5364,52 +5364,13 @@
+@@ -5516,49 +5516,7 @@
  
  if test -z "$NO_CURL"; then
  
 -# Extract the first word of "curl-config", so it can be a program name with args.
 -set dummy curl-config; ac_word=$2
--{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
--$as_echo_n "checking for $ac_word... " >&6; }
--if ${ac_cv_prog_CURL_CONFIG+:} false; then :
--  $as_echo_n "(cached) " >&6
--else
+-{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-printf %s "checking for $ac_word... " >&6; }
+-if test ${ac_cv_prog_CURL_CONFIG+y}
+-then :
+-  printf %s "(cached) " >&6
+-else $as_nop
 -  if test -n "$CURL_CONFIG"; then
 -  ac_cv_prog_CURL_CONFIG="$CURL_CONFIG" # Let the user override the test.
 -else
@@ -146,11 +233,15 @@ diff -Paur --no-dereference -- git.upstream/configure git/configure
 -for as_dir in $PATH
 -do
 -  IFS=$as_save_IFS
--  test -z "$as_dir" && as_dir=.
+-  case $as_dir in #(((
+-    '') as_dir=./ ;;
+-    */) ;;
+-    *) as_dir=$as_dir/ ;;
+-  esac
 -    for ac_exec_ext in '' $ac_executable_extensions; do
--  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-  if as_fn_executable_p "$as_dir$ac_word$ac_exec_ext"; then
 -    ac_cv_prog_CURL_CONFIG="curl-config"
--    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    printf "%s\n" "$as_me:${as_lineno-$LINENO}: found $as_dir$ac_word$ac_exec_ext" >&5
 -    break 2
 -  fi
 -done
@@ -162,61 +253,60 @@ diff -Paur --no-dereference -- git.upstream/configure git/configure
 -fi
 -CURL_CONFIG=$ac_cv_prog_CURL_CONFIG
 -if test -n "$CURL_CONFIG"; then
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CURL_CONFIG" >&5
--$as_echo "$CURL_CONFIG" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $CURL_CONFIG" >&5
+-printf "%s\n" "$CURL_CONFIG" >&6; }
 -else
--  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
--$as_echo "no" >&6; }
+-  { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-printf "%s\n" "no" >&6; }
 -fi
 -
 -
--
--if test $CURL_CONFIG != no; then
-+# PATCH: pkg-config must be used instead of the bad curl-config.
++# PATCH: Do not use the cross unsafe curl-config.
  
- config_appended_defs="$config_appended_defs${newline}CURL_CONFIG=${CURL_CONFIG}"
-     if test -z "${NO_OPENSSL}"; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Curl supports SSL" >&5
- $as_echo_n "checking if Curl supports SSL... " >&6; }
--      if test $(curl-config --features|grep SSL) = SSL; then
-+      if test -n "$(${PKG_CONFIG:-pkg-config} libcurl --variable=supported_features|grep SSL)"; then
-          NEEDS_SSL_WITH_CURL=YesPlease
-          { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
-@@ -5423,8 +5384,6 @@
-     fi
- fi
+ if test $CURL_CONFIG != no; then
  
--fi
--
+@@ -6240,10 +6198,8 @@
  
- #
- # Define NO_EXPAT if you do not have expat installed.  git-http-push is
+ if test "$cross_compiling" = yes
+ then :
+-  { { printf "%s\n" "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-printf "%s\n" "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "cannot run test program while cross compiling
+-See \`config.log' for more details" "$LINENO" 5; }
++# PATCH: Guess iconv does not omit the BOM.
++ac_cv_iconv_omits_bom=no
+ else $as_nop
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
 diff -Paur --no-dereference -- git.upstream/git-compat-util.h git/git-compat-util.h
 --- git.upstream/git-compat-util.h
 +++ git/git-compat-util.h
-@@ -325,6 +325,10 @@
+@@ -429,7 +429,14 @@
  typedef uintmax_t timestamp_t;
  #define PRItime PRIuMAX
  #define parse_timestamp strtoumax
-+/* PATCH: Avoid conflicting Sortix macro. */
++/* PATCH: Avoid conflicting Sortix macros. */
 +#ifdef TIME_MAX
 +#undef TIME_MAX
 +#endif
  #define TIME_MAX UINTMAX_MAX
++#ifdef TIME_MIN
++#undef TIME_MIN
++#endif
+ #define TIME_MIN 0
  
  #ifndef PATH_SEP
 diff -Paur --no-dereference -- git.upstream/lockfile.c git/lockfile.c
 --- git.upstream/lockfile.c
 +++ git/lockfile.c
-@@ -105,16 +105,10 @@
+@@ -107,16 +107,10 @@
  	int n = 1;
  	int multiplier = 1;
  	long remaining_ms = 0;
 -	static int random_initialized = 0;
  
  	if (timeout_ms == 0)
- 		return lock_file(lk, path, flags);
+ 		return lock_file(lk, path, flags, mode);
  
 -	if (!random_initialized) {
 -		srand((unsigned int)getpid());
@@ -226,7 +316,7 @@ diff -Paur --no-dereference -- git.upstream/lockfile.c git/lockfile.c
  	if (timeout_ms > 0)
  		remaining_ms = timeout_ms;
  
-@@ -133,7 +127,8 @@
+@@ -135,7 +129,8 @@
  
  		backoff_ms = multiplier * INITIAL_BACKOFF_MS;
  		/* back off for between 0.75*backoff_ms and 1.25*backoff_ms */
@@ -236,100 +326,11 @@ diff -Paur --no-dereference -- git.upstream/lockfile.c git/lockfile.c
  		sleep_millisec(wait_ms);
  		remaining_ms -= wait_ms;
  
-diff -Paur --no-dereference -- git.upstream/Makefile git/Makefile
---- git.upstream/Makefile
-+++ git/Makefile
-@@ -1176,9 +1176,7 @@
- 	endif
- 	ifdef NEEDS_SSL_WITH_CURL
- 		CURL_LIBCURL += -lssl
--		ifdef NEEDS_CRYPTO_WITH_SSL
--			CURL_LIBCURL += -lcrypto
--		endif
-+		CURL_LIBCURL += -lcrypto
- 	endif
- 	ifdef NEEDS_IDN_WITH_CURL
- 		CURL_LIBCURL += -lidn
-@@ -1252,6 +1250,12 @@
- 	LIB_4_CRYPTO += -framework Security -framework CoreFoundation
- endif
- endif
-+# PATCH: Link with libintl first so it can statically link with libiconv.
-+ifndef NO_GETTEXT
-+ifndef LIBC_CONTAINS_LIBINTL
-+	EXTLIBS += -lintl
-+endif
-+endif
- ifdef NEEDS_LIBICONV
- 	ifdef ICONVDIR
- 		BASIC_CFLAGS += -I$(ICONVDIR)/include
-@@ -1259,19 +1263,11 @@
- 	else
- 		ICONV_LINK =
- 	endif
--	ifdef NEEDS_LIBINTL_BEFORE_LIBICONV
--		ICONV_LINK += -lintl
--	endif
- 	EXTLIBS += $(ICONV_LINK) -liconv
- endif
- ifdef NEEDS_LIBGEN
- 	EXTLIBS += -lgen
- endif
--ifndef NO_GETTEXT
--ifndef LIBC_CONTAINS_LIBINTL
--	EXTLIBS += -lintl
--endif
--endif
- ifdef NEEDS_SOCKET
- 	EXTLIBS += -lsocket
- endif
-@@ -2184,8 +2180,10 @@
- doc:
- 	$(MAKE) -C Documentation all
- 
-+# PATCH: Build manual pages if asciidoc and xmlto are installed.
-+all:: man
- man:
--	$(MAKE) -C Documentation man
-+	if which asciidoc 1>/dev/null 2>/dev/null && which xmlto 1>/dev/null 2>/dev/null; then $(MAKE) -C Documentation man; fi
- 
- html:
- 	$(MAKE) -C Documentation html
-@@ -2502,7 +2500,7 @@
- profile-fast-install: profile-fast
- 	$(MAKE) install
- 
--install: all
-+install: all install-man
- 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(bindir_SQ)'
- 	$(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
- 	$(INSTALL) $(ALL_PROGRAMS) '$(DESTDIR_SQ)$(gitexec_instdir_SQ)'
-@@ -2570,8 +2568,9 @@
- install-doc:
- 	$(MAKE) -C Documentation install
- 
-+# PATCH: Install manual pages if asciidoc and xmlto are installed.
- install-man:
--	$(MAKE) -C Documentation install-man
-+	if which asciidoc 1>/dev/null 2>/dev/null && which xmlto 1>/dev/null 2>/dev/null; then $(MAKE) -C Documentation install-man; fi
- 
- install-html:
- 	$(MAKE) -C Documentation install-html
-@@ -2638,8 +2637,8 @@
- 
- ### Cleaning rules
- 
-+# PATCH: Don't delete configure when making distclean because it is in the dist.
- distclean: clean
--	$(RM) configure
- 	$(RM) config.log config.status config.cache
- 	$(RM) config.mak.autogen config.mak.append
- 	$(RM) -r autom4te.cache
 diff -Paur --no-dereference -- git.upstream/progress.c git/progress.c
 --- git.upstream/progress.c
 +++ git/progress.c
-@@ -39,6 +39,10 @@
- 	uint64_t start_ns;
+@@ -47,6 +47,10 @@
+ 	int split;
  };
  
 +/* PATCH: Sortix does not have obsolescent XSI itimers. */
@@ -338,8 +339,8 @@ diff -Paur --no-dereference -- git.upstream/progress.c git/progress.c
 +#endif
  static volatile sig_atomic_t progress_update;
  
- static void progress_interval(int signum)
-@@ -48,8 +52,19 @@
+ /*
+@@ -68,8 +72,19 @@
  
  static void set_progress_signal(void)
  {
@@ -357,9 +358,9 @@ diff -Paur --no-dereference -- git.upstream/progress.c git/progress.c
  	struct itimerval v;
 +#endif
  
- 	progress_update = 0;
- 
-@@ -59,16 +74,39 @@
+ 	if (progress_testing)
+ 		return;
+@@ -82,20 +97,43 @@
  	sa.sa_flags = SA_RESTART;
  	sigaction(SIGALRM, &sa, NULL);
  
@@ -390,10 +391,14 @@ diff -Paur --no-dereference -- git.upstream/progress.c git/progress.c
 +	return;
 +#endif
 +
+ 	struct itimerval v = {{0,},};
+ 
+ 	if (progress_testing)
+ 		return;
+ 
 +#if defined(__sortix__)
 +	timer_delete(progress_timer);
 +#else
- 	struct itimerval v = {{0,},};
  	setitimer(ITIMER_REAL, &v, NULL);
 +#endif
  	signal(SIGALRM, SIG_IGN);
@@ -402,28 +407,28 @@ diff -Paur --no-dereference -- git.upstream/progress.c git/progress.c
 diff -Paur --no-dereference -- git.upstream/run-command.c git/run-command.c
 --- git.upstream/run-command.c
 +++ git/run-command.c
-@@ -491,9 +491,12 @@
+@@ -515,9 +515,12 @@
  #else
- 	bug_die(pthread_sigmask(SIG_SETMASK, &all, &as->old),
+ 	CHECK_BUG(pthread_sigmask(SIG_SETMASK, &all, &as->old),
  		"blocking all signals");
 +/* PATCH: Sortix doesn't have pthread cancelation. */
 +#ifdef PTHREAD_CANCEL_DISABLE
- 	bug_die(pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &as->cs),
+ 	CHECK_BUG(pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &as->cs),
  		"disabling cancellation");
  #endif
 +#endif
  }
  
  static void atfork_parent(struct atfork_state *as)
-@@ -502,8 +505,11 @@
+@@ -526,8 +529,11 @@
  	if (sigprocmask(SIG_SETMASK, &as->old, NULL))
  		die_errno("sigprocmask");
  #else
 +/* PATCH: Sortix doesn't have pthread cancelation. */
 +#ifdef PTHREAD_CANCEL_DISABLE
- 	bug_die(pthread_setcancelstate(as->cs, NULL),
+ 	CHECK_BUG(pthread_setcancelstate(as->cs, NULL),
  		"re-enabling cancellation");
 +#endif
- 	bug_die(pthread_sigmask(SIG_SETMASK, &as->old, NULL),
+ 	CHECK_BUG(pthread_sigmask(SIG_SETMASK, &as->old, NULL),
  		"restoring signal mask");
  #endif

ports/git/git.port

@@ -1,10 +1,10 @@
 NAME=git
 BUILD_LIBRARIES='libiconv libz libcurl? libexpat? libintl? libpcre? libssl?'
-VERSION=2.14.3
+VERSION=2.43.0
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=5330960dd52467f6e5bf1931b9fd42b76d3f8ce9bc75150b54ecfb57d407151d
+SHA256SUM=5446603e73d911781d259e565750dcd277a42836c8e392cac91cf137aa9b76ec
 UPSTREAM_SITE=https://www.kernel.org/pub/software/scm/git
 UPSTREAM_ARCHIVE=$ARCHIVE
 BUILD_PROGRAMS='asciidoc? dblatex? docbook2x? xmlto?'

ports/grep/grep.patch

@@ -1,15 +1,3 @@
-diff -Paur --no-dereference -- grep.upstream/build-aux/config.sub grep/build-aux/config.sub
---- grep.upstream/build-aux/config.sub
-+++ grep/build-aux/config.sub
-@@ -1360,7 +1360,7 @@
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* | -aros* \
-+	      | -aos* | -aros* | -sortix* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
 diff -Paur --no-dereference -- grep.upstream/configure grep/configure
 --- grep.upstream/configure
 +++ grep/configure
@@ -134,5 +122,5 @@ diff -Paur --no-dereference -- grep.upstream/configure grep/configure
 +export gl_cv_func_getcwd_null=yes # Only if the OS actually supports this, Sortix does.
 +export gl_cv_struct_dirent_d_ino=yes # Only if the OS actually supports this, Sortix does.
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.69.117-1717 for GNU grep 2.20.
+ # Generated by GNU Autoconf 2.72c.20-9c018 for GNU grep 3.11.
  #

ports/grep/grep.port

@@ -1,11 +1,12 @@
 NAME=grep
 BUILD_LIBRARIES='libiconv? libintl?'
-VERSION=2.20
+VERSION=3.11
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=f0af452bc0d09464b6d089b6d56a0a3c16672e9ed9118fbe37b0b6aeaf069a65
+SHA256SUM=1db2aedde89d0dea42b16d9528f894c8d15dae4e190b59aecc78f5a951276eab
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/grep
 UPSTREAM_ARCHIVE=$ARCHIVE
+LICENSE=GPL-3.0-or-later
 BUILD_SYSTEM=configure
 MAKE_VARS='V=1'

ports/grub-i386-efi/grub-i386-efi.port

@@ -2,6 +2,7 @@ NAME=grub-i386-efi
 EDITION=2
 BUILD_LIBRARIES='libiconv? libintl? libfreetype? liblzma?'
 SOURCE_PORT=grub
+LICENSE=GPL-3.0-or-later
 BUILD_SYSTEM=configure
 CONFIGURE_ARGS='--disable-werror --program-prefix= --with-platform=efi --target=i686-sortix'
 MAKE_ARGS='-C grub-core'

ports/grub-i386-pc/grub-i386-pc.port

@@ -3,6 +3,7 @@ EDITION=2
 RENAMES="grub@1: grub-i386-pc@2"
 BUILD_LIBRARIES='libiconv? libintl? libfreetype? liblzma?'
 SOURCE_PORT=grub
+LICENSE=GPL-3.0-or-later
 BUILD_SYSTEM=configure
 CONFIGURE_ARGS='--disable-werror --program-prefix= --with-platform=pc'
 MAKE_ARGS='-C grub-core'

ports/grub-x86_64-efi/grub-x86_64-efi.port

@@ -2,6 +2,7 @@ NAME=grub-x86_64-efi
 EDITION=2
 BUILD_LIBRARIES='libiconv? libintl? libfreetype? liblzma?'
 SOURCE_PORT=grub
+LICENSE=GPL-3.0-or-later
 BUILD_SYSTEM=configure
 # TODO: Unfortunately 32-bit sortix gcc fails due to no 64-bit support.
 CONFIGURE_ARGS='--disable-werror --program-prefix= --with-platform=efi --target=x86_64-sortix'

ports/grub/grub.patch

@@ -843,7 +843,39 @@ diff -Paur --no-dereference -- grub.upstream/util/grub-install.c grub/util/grub-
      }
  
    if (!grub_install_source_directory)
-@@ -1803,6 +1806,7 @@
+@@ -923,12 +926,20 @@
+       break;
+     }
+ 
++  if (!bootdir)
++    bootdir = grub_util_path_concat (3, "/", rootdir, GRUB_BOOT_DIR_NAME);
++
+   switch (platform)
+     {
+     case GRUB_INSTALL_PLATFORM_I386_PC:
+     case GRUB_INSTALL_PLATFORM_SPARC64_IEEE1275:
+       if (!install_device)
+-	grub_util_error ("%s", _("install device isn't specified"));
++	{
++	  grub_devices = grub_guess_root_devices (bootdir);
++	  if (!grub_devices || !grub_devices[0] ||
++	      !(install_device = grub_util_get_os_disk (grub_devices[0])))
++	    grub_util_error ("%s", _("install device isn't specified"));
++	}
+       break;
+     case GRUB_INSTALL_PLATFORM_POWERPC_IEEE1275:
+       if (install_device)
+@@ -961,9 +972,6 @@
+       break;
+     }
+ 
+-  if (!bootdir)
+-    bootdir = grub_util_path_concat (3, "/", rootdir, GRUB_BOOT_DIR_NAME);
+-
+   {
+     char * t = grub_util_path_concat (2, bootdir, GRUB_DIR_NAME);
+     grub_install_mkdir_p (t);
+@@ -1803,6 +1811,7 @@
        break;
  
      case GRUB_INSTALL_PLATFORM_I386_EFI:
@@ -851,7 +883,7 @@ diff -Paur --no-dereference -- grub.upstream/util/grub-install.c grub/util/grub-
        if (!efidir_is_mac)
  	{
  	  char *dst = grub_util_path_concat (2, efidir, "grub.efi");
-@@ -1810,6 +1814,7 @@
+@@ -1810,6 +1819,7 @@
  	  grub_install_copy_file (imgfile, dst, 1);
  	  free (dst);
  	}

ports/grub/grub.port

@@ -9,6 +9,7 @@ ARCHIVE=$DISTNAME.$COMPRESSION
 SHA256SUM=82ac8faf257fb3476969a0b79a0b5fd53d4cdefb2e2aa5941381477e38c5f9c5
 UPSTREAM_SITE=https://pub.sortix.org/sortix/toolchain
 UPSTREAM_ARCHIVE=$ARCHIVE
+LICENSE=GPL-3.0-or-later
 BUILD_SYSTEM=configure
 CONFIGURE_ARGS='--disable-werror --program-prefix= --with-platform=none'
 POST_INSTALL=../grub.post-install

ports/gzip/gzip.patch

@@ -1,214 +1,11 @@
-diff -Paur --no-dereference -- gzip.upstream/build-aux/config.sub gzip/build-aux/config.sub
---- gzip.upstream/build-aux/config.sub
-+++ gzip/build-aux/config.sub
-@@ -1348,7 +1348,7 @@
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* | -aros* \
-+	      | -aos* | -aros* | -sortix* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-diff -Paur --no-dereference -- gzip.upstream/gunzip.in gzip/gunzip.in
---- gzip.upstream/gunzip.in
-+++ gzip/gunzip.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!sh
- # Uncompress files.  This is the inverse of gzip.
- 
- # Copyright (C) 2007 Free Software Foundation
-diff -Paur --no-dereference -- gzip.upstream/gzexe.in gzip/gzexe.in
---- gzip.upstream/gzexe.in
-+++ gzip/gzexe.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!sh
- # gzexe: compressor for Unix executables.
- # Use this only for binaries that you do not use frequently.
- #
-diff -Paur --no-dereference -- gzip.upstream/lib/fcntl.c gzip/lib/fcntl.c
---- gzip.upstream/lib/fcntl.c
-+++ gzip/lib/fcntl.c
-@@ -181,7 +181,7 @@
-         result = dupfd (fd, target, 0);
-         break;
-       }
--#elif FCNTL_DUPFD_BUGGY || REPLACE_FCHDIR
-+#elif (FCNTL_DUPFD_BUGGY || REPLACE_FCHDIR) && !defined(__sortix__)
-     case F_DUPFD:
-       {
-         int target = va_arg (arg, int);
-diff -Paur --no-dereference -- gzip.upstream/lib/freadahead.c gzip/lib/freadahead.c
---- gzip.upstream/lib/freadahead.c
-+++ gzip/lib/freadahead.c
-@@ -22,6 +22,10 @@
- #include <stdlib.h>
- #include "stdio-impl.h"
- 
-+#if defined __sortix__
-+#include <FILE.h>
-+#endif
-+
- size_t
- freadahead (FILE *fp)
- {
-@@ -84,6 +88,10 @@
-   if (fp->state == 4 /* WR */ || fp->rp >= fp->wp)
-     return 0;
-   return fp->wp - fp->rp;
-+#elif defined __sortix__
-+  if ( !(fp->flags & _FILE_LAST_READ) )
-+    return 0;
-+  return fp->amount_input_buffered - fp->offset_input_buffer;
- #elif defined SLOW_BUT_NO_HACKS     /* users can define this */
-   abort ();
-   return 0;
-diff -Paur --no-dereference -- gzip.upstream/lib/fseeko.c gzip/lib/fseeko.c
---- gzip.upstream/lib/fseeko.c
-+++ gzip/lib/fseeko.c
-@@ -99,6 +99,8 @@
- #elif defined EPLAN9                /* Plan9 */
-   if (fp->rp == fp->buf
-       && fp->wp == fp->buf)
-+#elif defined __sortix__
-+  if (0) /* wtf is this shit - sortix handles fseeko just fine. */
- #else
-   #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib."
- #endif
-diff -Paur --no-dereference -- gzip.upstream/lib/fseterr.c gzip/lib/fseterr.c
---- gzip.upstream/lib/fseterr.c
-+++ gzip/lib/fseterr.c
-@@ -23,6 +23,10 @@
- 
- #include "stdio-impl.h"
- 
-+#if defined __sortix__
-+#include <FILE.h>
-+#endif
-+
- void
- fseterr (FILE *fp)
- {
-@@ -48,6 +52,8 @@
- #elif defined EPLAN9                /* Plan9 */
-   if (fp->state != 0 /* CLOSED */)
-     fp->state = 5 /* ERR */;
-+#elif defined __sortix__
-+  fp->flags |= _FILE_STATUS_ERROR;
- #elif 0                             /* unknown  */
-   /* Portable fallback, based on an idea by Rich Felker.
-      Wow! 6 system calls for something that is just a bit operation!
-diff -Paur --no-dereference -- gzip.upstream/Makefile.am gzip/Makefile.am
---- gzip.upstream/Makefile.am
-+++ gzip/Makefile.am
-@@ -82,7 +82,6 @@
- SUFFIXES = .in
- .in:
- 	$(AM_V_GEN)sed \
--		-e 's|/bin/sh|$(SHELL)|g' \
- 		-e 's|[@]bindir@|'\''$(bindir)'\''|g' \
- 		-e 's|[@]VERSION@|$(VERSION)|g' \
- 		$(srcdir)/$@.in >$@-t \
 diff -Paur --no-dereference -- gzip.upstream/Makefile.in gzip/Makefile.in
 --- gzip.upstream/Makefile.in
 +++ gzip/Makefile.in
-@@ -2102,7 +2102,6 @@
- 	$(AM_V_GEN)./gzip < $(srcdir)/gzip.doc >$@-t && mv $@-t $@
+@@ -2499,7 +2499,6 @@
  .in:
- 	$(AM_V_GEN)sed \
+ 	$(AM_V_GEN)rm -f $@-t $@ \
+ 	  && sed \
 -		-e 's|/bin/sh|$(SHELL)|g' \
- 		-e 's|[@]bindir@|'\''$(bindir)'\''|g' \
- 		-e 's|[@]VERSION@|$(VERSION)|g' \
- 		$(srcdir)/$@.in >$@-t \
-diff -Paur --no-dereference -- gzip.upstream/zcat.in gzip/zcat.in
---- gzip.upstream/zcat.in
-+++ gzip/zcat.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!sh
- # Uncompress files to standard output.
- 
- # Copyright (C) 2007 Free Software Foundation
-diff -Paur --no-dereference -- gzip.upstream/zcmp.in gzip/zcmp.in
---- gzip.upstream/zcmp.in
-+++ gzip/zcmp.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!sh
- # Compare the uncompressed contents of compressed files, byte by byte.
- 
- # Copyright (C) 2007, 2010-2012 Free Software Foundation, Inc.
-diff -Paur --no-dereference -- gzip.upstream/zdiff.in gzip/zdiff.in
---- gzip.upstream/zdiff.in
-+++ gzip/zdiff.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!sh
- # sh is buggy on RS/6000 AIX 3.2. Replace above line with #!/bin/ksh
- 
- # Copyright (C) 1998, 2002, 2006, 2007, 2009 Free Software Foundation
-diff -Paur --no-dereference -- gzip.upstream/zegrep.in gzip/zegrep.in
---- gzip.upstream/zegrep.in
-+++ gzip/zegrep.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!sh
- bindir=@bindir@
- case $1 in
- --__bindir) bindir=${2?}; shift; shift;;
-diff -Paur --no-dereference -- gzip.upstream/zfgrep.in gzip/zfgrep.in
---- gzip.upstream/zfgrep.in
-+++ gzip/zfgrep.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!sh
- bindir=@bindir@
- case $1 in
- --__bindir) bindir=${2?}; shift; shift;;
-diff -Paur --no-dereference -- gzip.upstream/zforce.in gzip/zforce.in
---- gzip.upstream/zforce.in
-+++ gzip/zforce.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!sh
- # zforce: force a gz extension on all gzip files so that gzip will not
- # compress them twice.
- #
-diff -Paur --no-dereference -- gzip.upstream/zgrep.in gzip/zgrep.in
---- gzip.upstream/zgrep.in
-+++ gzip/zgrep.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!sh
- 
- # zgrep -- a wrapper around a grep program that decompresses files as needed
- # Adapted from a version sent by Charles Levert <charles@comm.polymtl.ca>
-diff -Paur --no-dereference -- gzip.upstream/zless.in gzip/zless.in
---- gzip.upstream/zless.in
-+++ gzip/zless.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!sh
- 
- # Copyright (C) 1998, 2002, 2006, 2007 Free Software Foundation
- 
-diff -Paur --no-dereference -- gzip.upstream/zmore.in gzip/zmore.in
---- gzip.upstream/zmore.in
-+++ gzip/zmore.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!sh
- 
- # Copyright (C) 2001, 2002, 2007, 2010 Free Software Foundation
- # Copyright (C) 1992, 1993 Jean-loup Gailly
-diff -Paur --no-dereference -- gzip.upstream/znew.in gzip/znew.in
---- gzip.upstream/znew.in
-+++ gzip/znew.in
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!sh
- 
- # Copyright (C) 1998, 2002, 2004, 2007, 2010 Free Software Foundation
- # Copyright (C) 1993 Jean-loup Gailly
+ 		-e 's|[@]GREP@|$(GREP)|g' \
+ 		-e "s|'gzip'|$(GZIP_TRANSFORMED)|g" \
+ 		-e "s|'zdiff'|$(ZDIFF_TRANSFORMED)|g" \

ports/gzip/gzip.port

@@ -1,12 +1,12 @@
 NAME=gzip
 BUILD_LIBRARIES=libz
-VERSION=1.5
+VERSION=1.13
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=9ac20a3841a1246a8bedd800ea1fb93ef76521535d89cb59397d267026b6a173
+SHA256SUM=7454eb6935db17c6655576c2e1b0fabefd38b4d0936e0f87f48cd062ce91a057
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/gzip
 UPSTREAM_ARCHIVE=$ARCHIVE
+LICENSE=GPL-3.0-or-later
 BUILD_SYSTEM=configure
 MAKE_VARS='V=1'
-CONFIGURE_VARS='gt_cv_locale_fr=false gt_cv_locale_ja=false gt_cv_locale_fr_utf8=false gt_cv_locale_ja_utf8=false gt_cv_locale_tr_utf8=false gt_cv_locale_zh_CN=false'

ports/hello/hello.patch

@@ -1,12 +1,24 @@
-diff -Paur --no-dereference -- hello.upstream/build-aux/config.sub hello/build-aux/config.sub
---- hello.upstream/build-aux/config.sub
-+++ hello/build-aux/config.sub
-@@ -1342,7 +1342,7 @@
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* | -aros* \
-+	      | -aos* | -aros* | -sortix* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+diff -Paur --no-dereference -- hello.upstream/Makefile.in hello/Makefile.in
+--- hello.upstream/Makefile.in
++++ hello/Makefile.in
+@@ -1773,7 +1773,7 @@
+ # Subdirectories to descend into.
+ SUBDIRS = po
+ hello_SOURCES = src/hello.c src/system.h
+-hello_LDADD = $(LIBINTL) $(top_builddir)/lib/lib$(PACKAGE).a
++hello_LDADD = $(top_builddir)/lib/lib$(PACKAGE).a $(LIBINTL)
+ CLEANFILES = $(am__append_2) lib/configmake.h lib/configmake.h-t
+ MAINTAINERCLEANFILES = lib/iconv_open-aix.h lib/iconv_open-hpux.h \
+ 	lib/iconv_open-irix.h lib/iconv_open-osf.h \
+diff -Paur --no-dereference -- hello.upstream/src/hello.c hello/src/hello.c
+--- hello.upstream/src/hello.c
++++ hello/src/hello.c
+@@ -163,7 +163,7 @@
+     error (EXIT_FAILURE, errno, _("conversion to a multibyte string failed"));
+ 
+   /* Print greeting message and exit. */
+-  wprintf (L"%ls\n", mb_greeting);
++  printf ("%ls\n", mb_greeting);
+   free(mb_greeting);
+ 
+   exit (EXIT_SUCCESS);

ports/hello/hello.port

@@ -1,11 +1,11 @@
 NAME=hello
 BUILD_LIBRARIES='libiconv? libintl?'
-VERSION=2.8
+VERSION=2.12.1
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=e6b77f81f7cf7daefad4a9f5b65de6cae9c3f13b8cfbaea8cb53bb5ea5460d73
+SHA256SUM=8d99142afd92576f30b0cd7cb42a8dc6809998bc5d607d88761f512e26c7db20
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/hello
 UPSTREAM_ARCHIVE=$ARCHIVE
+LICENSE=GPL-3.0-or-later
 BUILD_SYSTEM=configure
-CONFIGURE_VARS='gt_cv_locale_fr=false gt_cv_locale_ja=false gt_cv_locale_fr_utf8=false gt_cv_locale_ja_utf8=false gt_cv_locale_tr_utf8=false gt_cv_locale_zh_CN=false'

ports/libcairo/libcairo.port

@@ -1,6 +1,6 @@
 NAME=libcairo
 BUILD_LIBRARIES='libz libbz2 libpng libfreetype libfontconfig? librsvg? libexpat? libpixman libglib?'
-VERSION=1.16.0
+VERSION=1.16.0 # Update blocked by meson adoption
 DISTNAME=cairo-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION

ports/libcurl/libcurl.patch

@@ -1,7 +1,32 @@
+diff -Paur --no-dereference -- libcurl.upstream/Makefile.in libcurl/Makefile.in
+--- libcurl.upstream/Makefile.in
++++ libcurl/Makefile.in
+@@ -659,7 +659,7 @@
+  $(VC14_SRCVCXPROJ) $(VC14_10_LIBVCXPROJ) $(VC14_10_SRCVCXPROJ)              \
+  $(VC14_30_LIBVCXPROJ) $(VC14_30_SRCVCXPROJ)
+ 
+-bin_SCRIPTS = curl-config
++bin_SCRIPTS =
+ SUBDIRS = lib src
+ DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs
+ pkgconfigdir = $(libdir)/pkgconfig
+@@ -1593,6 +1593,12 @@
+ distclean: distclean-recursive
+ 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
+ 	-rm -f Makefile
++	-rm -f docs/cmdline-opts/Makefile
++	-rm -rf docs/examples/.deps
++	-rm -f docs/examples/Makefile
++	-rm -f docs/libcurl/Makefile
++	-rm -f docs/libcurl/opts/Makefile
++	-rm -f docs/Makefile
+ distclean-am: clean-am distclean-generic distclean-libtool \
+ 	distclean-tags
+ 
 diff -Paur --no-dereference -- libcurl.upstream/configure libcurl/configure
 --- libcurl.upstream/configure
 +++ libcurl/configure
-@@ -22313,9 +22313,7 @@
+@@ -23303,9 +23303,7 @@
  
  fi
  
@@ -12,7 +37,7 @@ diff -Paur --no-dereference -- libcurl.upstream/configure libcurl/configure
  
  
  curl_includes_winsock2="\
-@@ -37552,11 +37550,8 @@
+@@ -37520,11 +37518,8 @@
  
  int main (void)
  {
@@ -25,121 +50,10 @@ diff -Paur --no-dereference -- libcurl.upstream/configure libcurl/configure
  }
  
  
-@@ -49364,107 +49359,9 @@
- 
- 
- 
--## ---------------------------------- ##
--##  Start of distclean amending code  ##
--## ---------------------------------- ##
--
--for xc_subdir in lib src tests/unit tests/server tests/libtest docs/examples
--do
--
--if test ! -f "$xc_subdir/Makefile"; then
--  echo "$xc_msg_err $xc_subdir/Makefile file not found. $xc_msg_abrt" >&2
--  exit 1
--fi
--
--# Fetch dependency tracking file list from Makefile include lines.
--
--xc_inc_lines=`grep '^include .*(DEPDIR)' "$xc_subdir/Makefile" 2>/dev/null`
--xc_cnt_words=`echo "$xc_inc_lines" | wc -w | tr -d "$xc_space$xc_tab"`
--
--# --disable-dependency-tracking might have been used, consequently
--# there is nothing to amend without a dependency tracking file list.
--
--if test $xc_cnt_words -gt 0; then
--
--{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: amending $xc_subdir/Makefile" >&5
--printf "%s\n" "$as_me: amending $xc_subdir/Makefile" >&6;}
--
--# Build Makefile specific patch hunk.
--
--xc_p="$xc_subdir/xc_patch.tmp"
--
--xc_rm_depfiles=`echo "$xc_inc_lines" \
--  | $SED 's%include%	-rm -f%' 2>/dev/null`
--
--xc_dep_subdirs=`echo "$xc_inc_lines" \
--  | $SED 's%include[ ][ ]*%%' 2>/dev/null \
--  | $SED 's%(DEPDIR)/.*%(DEPDIR)%' 2>/dev/null \
--  | sort | uniq`
--
--echo "$xc_rm_depfiles" >$xc_p
--
--for xc_dep_dir in $xc_dep_subdirs; do
--  echo "${xc_tab}@xm_dep_cnt=\`ls $xc_dep_dir | wc -l 2>/dev/null\`; \\"            >>$xc_p
--  echo "${xc_tab}if test \$\$xm_dep_cnt -eq 0 && test -d $xc_dep_dir; then \\"      >>$xc_p
--  echo "${xc_tab}  rm -rf $xc_dep_dir; \\"                                          >>$xc_p
--  echo "${xc_tab}fi"                                                                >>$xc_p
--done
--
--# Build Makefile patching sed scripts.
--
--xc_s1="$xc_subdir/xc_script_1.tmp"
--xc_s2="$xc_subdir/xc_script_2.tmp"
--xc_s3="$xc_subdir/xc_script_3.tmp"
--
--cat >$xc_s1 <<\_EOT
--/^distclean[ ]*:/,/^[^	][^	]*:/{
--  s/^.*(DEPDIR)/___xc_depdir_line___/
--}
--/^maintainer-clean[ ]*:/,/^[^	][^	]*:/{
--  s/^.*(DEPDIR)/___xc_depdir_line___/
--}
--_EOT
--
--cat >$xc_s2 <<\_EOT
--/___xc_depdir_line___$/{
--  N
--  /___xc_depdir_line___$/D
--}
--_EOT
--
--cat >$xc_s3 <<_EOT
--/^___xc_depdir_line___/{
--  r $xc_p
--  d
--}
--_EOT
--
--# Apply patch to Makefile and cleanup.
--
--$SED -f "$xc_s1" "$xc_subdir/Makefile"      >"$xc_subdir/Makefile.tmp1"
--$SED -f "$xc_s2" "$xc_subdir/Makefile.tmp1" >"$xc_subdir/Makefile.tmp2"
--$SED -f "$xc_s3" "$xc_subdir/Makefile.tmp2" >"$xc_subdir/Makefile.tmp3"
--
--if test -f "$xc_subdir/Makefile.tmp3"; then
--  mv -f "$xc_subdir/Makefile.tmp3" "$xc_subdir/Makefile"
--fi
--
--test -f "$xc_subdir/Makefile.tmp1" && rm -f "$xc_subdir/Makefile.tmp1"
--test -f "$xc_subdir/Makefile.tmp2" && rm -f "$xc_subdir/Makefile.tmp2"
--test -f "$xc_subdir/Makefile.tmp3" && rm -f "$xc_subdir/Makefile.tmp3"
--
--test -f "$xc_p"  && rm -f "$xc_p"
--test -f "$xc_s1" && rm -f "$xc_s1"
--test -f "$xc_s2" && rm -f "$xc_s2"
--test -f "$xc_s3" && rm -f "$xc_s3"
--
--fi
--
--done
--
--## -------------------------------- ##
--##  End of distclean amending code  ##
--## -------------------------------- ##
-+# PATCH: Removed cursed distclean patching logic that somehow produces distclean
-+#        targets for me with hundreds of thousands of duplicate rm -f commands.
-+#        The build seems to work fine without it.
- 
- 
- 
 diff -Paur --no-dereference -- libcurl.upstream/docs/Makefile.in libcurl/docs/Makefile.in
 --- libcurl.upstream/docs/Makefile.in
 +++ libcurl/docs/Makefile.in
-@@ -479,10 +479,10 @@
+@@ -484,10 +484,10 @@
  # but distribute it (using the relative file name) in the next variable
  man_MANS = $(abs_builddir)/curl.1
  noinst_man_MANS = curl.1 mk-ca-bundle.1
@@ -157,7 +71,7 @@ diff -Paur --no-dereference -- libcurl.upstream/docs/Makefile.in libcurl/docs/Ma
 diff -Paur --no-dereference -- libcurl.upstream/include/curl/curl.h libcurl/include/curl/curl.h
 --- libcurl.upstream/include/curl/curl.h
 +++ libcurl/include/curl/curl.h
-@@ -67,17 +67,7 @@
+@@ -75,18 +75,7 @@
  #endif
  #endif
  
@@ -165,15 +79,16 @@ diff -Paur --no-dereference -- libcurl.upstream/include/curl/curl.h libcurl/incl
 -   libc5-based Linux systems. Only include it on systems that are known to
 -   require it! */
 -#if defined(_AIX) || defined(__NOVELL_LIBC__) || defined(__NetBSD__) || \
--    defined(__minix) || defined(__SYMBIAN32__) || defined(__INTEGRITY) || \
+-    defined(__minix) || defined(__INTEGRITY) || \
 -    defined(ANDROID) || defined(__ANDROID__) || defined(__OpenBSD__) || \
 -    defined(__CYGWIN__) || defined(AMIGA) || defined(__NuttX__) || \
 -   (defined(__FreeBSD_version) && (__FreeBSD_version < 800000)) || \
--   (defined(__MidnightBSD_version) && (__MidnightBSD_version < 100000))
+-   (defined(__MidnightBSD_version) && (__MidnightBSD_version < 100000)) || \
+-    defined(__sun__) || defined(__serenity__) || defined(__vxworks__)
  #include <sys/select.h>
 -#endif
  
- #if !defined(CURL_WIN32) && !defined(_WIN32_WCE)
+ #if !defined(_WIN32) && !defined(_WIN32_WCE)
  #include <sys/socket.h>
 diff -Paur --no-dereference -- libcurl.upstream/lib/curl_addrinfo.h libcurl/lib/curl_addrinfo.h
 --- libcurl.upstream/lib/curl_addrinfo.h
@@ -195,28 +110,3 @@ diff -Paur --no-dereference -- libcurl.upstream/lib/curl_addrinfo.h libcurl/lib/
  struct Curl_addrinfo *
  Curl_he2ai(const struct hostent *he, int port);
  
-diff -Paur --no-dereference -- libcurl.upstream/Makefile.in libcurl/Makefile.in
---- libcurl.upstream/Makefile.in
-+++ libcurl/Makefile.in
-@@ -676,7 +676,7 @@
-  $(VC14_SRCVCXPROJ) $(VC14_10_LIBVCXPROJ) $(VC14_10_SRCVCXPROJ)              \
-  $(VC14_30_LIBVCXPROJ) $(VC14_30_SRCVCXPROJ)
- 
--bin_SCRIPTS = curl-config
-+bin_SCRIPTS =
- SUBDIRS = lib src
- DIST_SUBDIRS = $(SUBDIRS) tests packages scripts include docs
- pkgconfigdir = $(libdir)/pkgconfig
-@@ -1581,6 +1581,12 @@
- distclean: distclean-recursive
- 	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
- 	-rm -f Makefile
-+	-rm -f docs/cmdline-opts/Makefile
-+	-rm -rf docs/examples/.deps
-+	-rm -f docs/examples/Makefile
-+	-rm -f docs/libcurl/Makefile
-+	-rm -f docs/libcurl/opts/Makefile
-+	-rm -f docs/Makefile
- distclean-am: clean-am distclean-generic distclean-libtool \
- 	distclean-tags
- 

ports/libcurl/libcurl.port

@@ -1,10 +1,10 @@
 NAME=libcurl
 BUILD_LIBRARIES='libssl libidn? libz? libbrotli? libssh2? librtmp? libmetalink? libpsl? libzstd?'
-VERSION=7.84.0
+VERSION=8.5.0
 DISTNAME=curl-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=2d118b43f547bfe5bae806d8d47b4e596ea5b25a6c1f080aef49fbcd817c5db8
+SHA256SUM=42ab8db9e20d8290a3b633e7fbb3cec15db34df65fd1015ef8ac1e4723750eeb
 UPSTREAM_SITE=https://curl.se/download
 UPSTREAM_ARCHIVE=$ARCHIVE
 BUILD_SYSTEM=configure

ports/libdbus/libdbus.patch

@@ -1,7 +1,28 @@
+diff -Paur --no-dereference -- libdbus.upstream/bus/Makefile.in libdbus/bus/Makefile.in
+--- libdbus.upstream/bus/Makefile.in
++++ libdbus/bus/Makefile.in
+@@ -604,7 +604,8 @@
+ 	sysusers.d/meson.build tmpfiles.d/dbus.conf.in \
+ 	tmpfiles.d/meson.build $(NULL)
+ dbusdata_DATA = session.conf $(am__append_1)
+-legacydbusdata_DATA = legacy-config/session.conf $(am__append_2)
++# PATCH: Don't install empty removable configuration files in /etc.
++legacydbusdata_DATA =
+ examplesdir = ${docdir}/examples
+ examples_DATA = \
+ 	example-system-enable-stats.conf	\
+@@ -1469,7 +1470,6 @@
+ install-data-hook:
+ 	$(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/session.d
+ 	$(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/services
+-@DBUS_UNIX_TRUE@	$(mkinstalldirs) $(DESTDIR)$(runstatedir)/dbus
+ @DBUS_UNIX_TRUE@	$(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/system.d
+ @DBUS_UNIX_TRUE@	$(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/system-services
+ # Install dbus.socket as default implementation of a D-Bus stack.
 diff -Paur --no-dereference -- libdbus.upstream/bus/activation-helper.c libdbus/bus/activation-helper.c
 --- libdbus.upstream/bus/activation-helper.c
 +++ libdbus/bus/activation-helper.c
-@@ -46,6 +46,10 @@
+@@ -48,6 +48,10 @@
  #include <dbus/dbus-marshal-validate.h>
  #include <dbus/dbus-sysdeps-unix.h>
  
@@ -12,7 +33,7 @@ diff -Paur --no-dereference -- libdbus.upstream/bus/activation-helper.c libdbus/
  static BusDesktopFile *
  desktop_file_for_name (BusConfigParser *parser,
                         const char *name,
-@@ -318,7 +322,7 @@
+@@ -320,7 +324,7 @@
    if (setgid (pw->pw_gid))
      {
        dbus_set_error (error, DBUS_ERROR_SPAWN_SETUP_FAILED,
@@ -21,7 +42,7 @@ diff -Paur --no-dereference -- libdbus.upstream/bus/activation-helper.c libdbus/
        return FALSE;
      }
  
-@@ -326,7 +330,7 @@
+@@ -328,7 +332,7 @@
    if (setuid (pw->pw_uid) < 0)
      {
        dbus_set_error (error, DBUS_ERROR_SPAWN_SETUP_FAILED,
@@ -30,31 +51,10 @@ diff -Paur --no-dereference -- libdbus.upstream/bus/activation-helper.c libdbus/
        return FALSE;
      }
  #endif
-diff -Paur --no-dereference -- libdbus.upstream/bus/Makefile.in libdbus/bus/Makefile.in
---- libdbus.upstream/bus/Makefile.in
-+++ libdbus/bus/Makefile.in
-@@ -598,7 +598,8 @@
- 	systemd-user/dbus.socket.in sysusers.d/dbus.conf.in \
- 	tmpfiles.d/dbus.conf.in $(NULL)
- dbusdata_DATA = session.conf $(am__append_1)
--legacydbusdata_DATA = legacy-config/session.conf $(am__append_2)
-+# PATCH: Don't install empty removable configuration files in /etc.
-+legacydbusdata_DATA =
- examplesdir = ${docdir}/examples
- examples_DATA = \
- 	example-system-enable-stats.conf	\
-@@ -1463,7 +1464,6 @@
- install-data-hook:
- 	$(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/session.d
- 	$(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/services
--@DBUS_UNIX_TRUE@	$(mkinstalldirs) $(DESTDIR)$(localstatedir)/run/dbus
- @DBUS_UNIX_TRUE@	$(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/system.d
- @DBUS_UNIX_TRUE@	$(mkinstalldirs) $(DESTDIR)$(dbusdatadir)/system-services
- # Install dbus.socket as default implementation of a D-Bus stack.
 diff -Paur --no-dereference -- libdbus.upstream/dbus/dbus-sysdeps-unix.c libdbus/dbus/dbus-sysdeps-unix.c
 --- libdbus.upstream/dbus/dbus-sysdeps-unix.c
 +++ libdbus/dbus/dbus-sysdeps-unix.c
-@@ -2210,9 +2210,13 @@
+@@ -2234,9 +2234,13 @@
     * we need these assertions to fail as soon as we're wrong about
     * it so we can do the porting fixups
     */
@@ -71,7 +71,7 @@ diff -Paur --no-dereference -- libdbus.upstream/dbus/dbus-sysdeps-unix.c libdbus
  
    uid_read = DBUS_UID_UNSET;
    primary_gid_read = DBUS_GID_UNSET;
-@@ -2945,9 +2949,9 @@
+@@ -2969,9 +2973,9 @@
     * we need these assertions to fail as soon as we're wrong about
     * it so we can do the porting fixups
     */
@@ -87,7 +87,7 @@ diff -Paur --no-dereference -- libdbus.upstream/dbus/dbus-sysdeps-unix.c libdbus
 diff -Paur --no-dereference -- libdbus.upstream/dbus/dbus-sysdeps-util-unix.c libdbus/dbus/dbus-sysdeps-util-unix.c
 --- libdbus.upstream/dbus/dbus-sysdeps-util-unix.c
 +++ libdbus/dbus/dbus-sysdeps-util-unix.c
-@@ -68,6 +68,10 @@
+@@ -67,6 +67,10 @@
  #define O_BINARY 0
  #endif
  
@@ -101,7 +101,7 @@ diff -Paur --no-dereference -- libdbus.upstream/dbus/dbus-sysdeps-util-unix.c li
 diff -Paur --no-dereference -- libdbus.upstream/test/Makefile.in libdbus/test/Makefile.in
 --- libdbus.upstream/test/Makefile.in
 +++ libdbus/test/Makefile.in
-@@ -2971,6 +2971,9 @@
+@@ -3163,6 +3163,9 @@
  	-rm -f internals/$(DEPDIR)/sysdeps.Po
  	-rm -f internals/$(DEPDIR)/syslog.Po
  	-rm -f internals/$(DEPDIR)/variant.Po
@@ -114,7 +114,7 @@ diff -Paur --no-dereference -- libdbus.upstream/test/Makefile.in libdbus/test/Ma
 diff -Paur --no-dereference -- libdbus.upstream/tools/dbus-launch.c libdbus/tools/dbus-launch.c
 --- libdbus.upstream/tools/dbus-launch.c
 +++ libdbus/tools/dbus-launch.c
-@@ -756,18 +756,15 @@
+@@ -758,18 +758,15 @@
             int binary_syntax,
             int argc, char **argv, int remaining_args)
  {
@@ -134,7 +134,7 @@ diff -Paur --no-dereference -- libdbus.upstream/tools/dbus-launch.c libdbus/tool
          goto oom;
  
        args[0] = xstrdup (runprog);
-@@ -787,9 +784,7 @@
+@@ -789,9 +786,7 @@
          }
        args[i] = NULL;
  
@@ -145,7 +145,7 @@ diff -Paur --no-dereference -- libdbus.upstream/tools/dbus-launch.c libdbus/tool
  
        execvp (runprog, args);
        fprintf (stderr, "Couldn't exec %s: %s\n", runprog, strerror (errno));
-@@ -808,9 +803,6 @@
+@@ -810,9 +805,6 @@
    close (2);
    exit (0);
  oom:
@@ -158,7 +158,7 @@ diff -Paur --no-dereference -- libdbus.upstream/tools/dbus-launch.c libdbus/tool
 diff -Paur --no-dereference -- libdbus.upstream/tools/dbus-print-message.c libdbus/tools/dbus-print-message.c
 --- libdbus.upstream/tools/dbus-print-message.c
 +++ libdbus/tools/dbus-print-message.c
-@@ -30,7 +30,7 @@
+@@ -31,7 +31,7 @@
  #include <sys/un.h>
  #include <unistd.h>
  #include <netinet/in.h>

ports/libdbus/libdbus.port

@@ -1,10 +1,10 @@
 NAME=libdbus
 BUILD_LIBRARIES=libexpat
-VERSION=1.14.0
+VERSION=1.15.6
 DISTNAME=dbus-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=ccd7cce37596e0a19558fd6648d1272ab43f011d80c8635aea8fd0bad58aebd4
+SHA256SUM=f97f5845f9c4a5a1fb3df67dfa9e16b5a3fd545d348d6dc850cb7ccc9942bd8c
 UPSTREAM_SITE=https://dbus.freedesktop.org/releases/dbus
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE='AFL-2.1 OR GPL-2.0-or-later'

ports/libexpat/libexpat.port

@@ -1,13 +1,13 @@
 NAME=libexpat
 BUILD_LIBRARIES=
 VERSION_MAJOR=2
-VERSION_MINOR=4
-VERSION_PATCH=8
+VERSION_MINOR=5
+VERSION_PATCH=0
 VERSION=$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH
 DISTNAME=expat-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=f79b8f904b749e3e0d20afeadecf8249c55b2e32d4ebb089ae378df479dcaf25
+SHA256SUM=ef2420f0232c087801abf705e89ae65f6257df6b7931d37846a193ef2e8cdcbe
 UPSTREAM_SITE=https://github.com/libexpat/libexpat/releases/download/R_${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_PATCH}
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE=MIT

ports/libffi/libffi.patch

@@ -1,7 +1,7 @@
 diff -Paur --no-dereference -- libffi.upstream/configure libffi/configure
 --- libffi.upstream/configure
 +++ libffi/configure
-@@ -20938,7 +20938,7 @@
+@@ -22146,7 +22146,7 @@
        eval "${MAKE-make} -f $tmp/conftemp.mk 2>/dev/null >/dev/null"
        if grep '^REMOVED,,,' "$ac_top_srcdir/Makefile" >/dev/null
        then rm $ac_top_srcdir/Makefile ; fi
@@ -9,8 +9,8 @@ diff -Paur --no-dereference -- libffi.upstream/configure libffi/configure
 +      #cp $tmp/conftemp.mk $ac_top_srcdir/makefiles.mk~      ## DEBUGGING
      fi
      if test ! -f "$ac_top_srcdir/Makefile" ; then
-       { $as_echo "$as_me:${as_lineno-$LINENO}: create top_srcdir/Makefile guessed from local Makefile" >&5
-@@ -21023,7 +21023,7 @@
+       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: create top_srcdir/Makefile guessed from local Makefile" >&5
+@@ -22231,7 +22231,7 @@
  	; echo "\$\$i" | grep "^../" > /dev/null && continue \\\\\\
  	; echo "rm -r \$\$i"; (rm -r "\$\$i") ; done ; rm Makefile
  _EOF
@@ -18,8 +18,8 @@ diff -Paur --no-dereference -- libffi.upstream/configure libffi/configure
 +      #cp "$tmp/conftemp.sed" "$ac_top_srcdir/makefile.sed~"            ## DEBUGGING
        $ax_enable_builddir_sed -f $tmp/conftemp.sed Makefile >$ac_top_srcdir/Makefile
        if test -f "$ac_top_srcdir/Makefile.mk" ; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: extend top_srcdir/Makefile with top_srcdir/Makefile.mk" >&5
-@@ -21044,8 +21044,8 @@
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: extend top_srcdir/Makefile with top_srcdir/Makefile.mk" >&5
+@@ -22252,8 +22252,8 @@
        # echo "/^$xxxx *$ax_enable_builddir_host /d" >$tmp/conftemp.sed
        echo "s!^$xxxx [^|]* | *$ax_enable_builddir *\$!$xxxx ...... $ax_enable_builddir!" >$tmp/conftemp.sed
        $ax_enable_builddir_sed -f "$tmp/conftemp.sed" "$ac_top_srcdir/Makefile" >$tmp/mkfile.tmp
@@ -28,5 +28,5 @@ diff -Paur --no-dereference -- libffi.upstream/configure libffi/configure
 +        #cp "$tmp/conftemp.sed" "$ac_top_srcdir/makefiles.sed~"         ## DEBUGGING
 +        #cp "$tmp/mkfile.tmp"   "$ac_top_srcdir/makefiles.out~"         ## DEBUGGING
        if cmp -s "$ac_top_srcdir/Makefile" "$tmp/mkfile.tmp" 2>/dev/null ; then
-         { $as_echo "$as_me:${as_lineno-$LINENO}: keeping top_srcdir/Makefile from earlier configure" >&5
- $as_echo "$as_me: keeping top_srcdir/Makefile from earlier configure" >&6;}
+         { printf "%s\n" "$as_me:${as_lineno-$LINENO}: keeping top_srcdir/Makefile from earlier configure" >&5
+ printf "%s\n" "$as_me: keeping top_srcdir/Makefile from earlier configure" >&6;}

ports/libffi/libffi.port

@@ -1,10 +1,10 @@
 NAME=libffi
 BUILD_LIBRARIES=
-VERSION=3.3
+VERSION=3.4.3
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=72fba7922703ddfa7a028d513ac15a85c8d54c8d67f55fa5a4802885dc652056
+SHA256SUM=4416dd92b6ae8fcb5b10421e711c4d3cb31203d77521a77d85d0102311e6c3b8
 UPSTREAM_SITE=https://sourceware.org/pub/libffi
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE=MIT

ports/libfontconfig/libfontconfig.patch

@@ -1,7 +1,19 @@
+diff -Paur --no-dereference -- libfontconfig.upstream/Makefile.in libfontconfig/Makefile.in
+--- libfontconfig.upstream/Makefile.in
++++ libfontconfig/Makefile.in
+@@ -511,6 +511,8 @@
+ @ENABLE_CACHE_BUILD_TRUE@RUN_FC_CACHE_TEST = test -z "$(DESTDIR)"
+ FC_CONFIGDIR = $(subst $(BASECONFIGDIR)/,,$(CONFIGDIR))
+ DISTCHECK_CONFIGURE_FLAGS = 
++BASECONFIGDIR_ADMIN := $(BASECONFIGDIR)
++BASECONFIGDIR := $(BASECONFIGDIR:/fonts=/default/fonts)
+ all: config.h
+ 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+ 
 diff -Paur --no-dereference -- libfontconfig.upstream/conf.d/Makefile.in libfontconfig/conf.d/Makefile.in
 --- libfontconfig.upstream/conf.d/Makefile.in
 +++ libfontconfig/conf.d/Makefile.in
-@@ -451,6 +451,8 @@
+@@ -458,6 +458,8 @@
  	80-delicious.conf		\
  	90-synthetic.conf
  
@@ -13,7 +25,7 @@ diff -Paur --no-dereference -- libfontconfig.upstream/conf.d/Makefile.in libfont
 diff -Paur --no-dereference -- libfontconfig.upstream/configure libfontconfig/configure
 --- libfontconfig.upstream/configure
 +++ libfontconfig/configure
-@@ -15154,7 +15154,8 @@
+@@ -15296,7 +15296,8 @@
  
  
  
@@ -23,7 +35,7 @@ diff -Paur --no-dereference -- libfontconfig.upstream/configure libfontconfig/co
  
    acl_save_prefix="$prefix"
    prefix="$acl_final_prefix"
-@@ -16065,7 +16066,7 @@
+@@ -16207,7 +16208,7 @@
  
  
  
@@ -42,17 +54,60 @@ diff -Paur --no-dereference -- libfontconfig.upstream/fontconfig.pc.in libfontco
 -Libs.private: @ICONV_LIBS@ @PKG_EXPAT_LIBS@
 +Libs.private: @LTLIBINTL@ @ICONV_LIBS@ @PKG_EXPAT_LIBS@
  Cflags: -I${includedir} @ICONV_CFLAGS@ @PKG_EXPAT_CFLAGS@
-diff -Paur --no-dereference -- libfontconfig.upstream/Makefile.in libfontconfig/Makefile.in
---- libfontconfig.upstream/Makefile.in
-+++ libfontconfig/Makefile.in
-@@ -509,6 +509,8 @@
- @ENABLE_CACHE_BUILD_TRUE@RUN_FC_CACHE_TEST = test -z "$(DESTDIR)"
- FC_CONFIGDIR = $(subst $(BASECONFIGDIR)/,,$(CONFIGDIR))
- DISTCHECK_CONFIGURE_FLAGS = 
+diff -Paur --no-dereference -- libfontconfig.upstream/src/Makefile.in libfontconfig/src/Makefile.in
+--- libfontconfig.upstream/src/Makefile.in
++++ libfontconfig/src/Makefile.in
+@@ -465,6 +465,10 @@
+ @OS_WIN32_FALSE@fontconfig_def_dependency = 
+ @OS_WIN32_TRUE@fontconfig_def_dependency = fontconfig.def
+ 
++# PATCH: Install fallback default configuration in /etc/default.
 +BASECONFIGDIR_ADMIN := $(BASECONFIGDIR)
 +BASECONFIGDIR := $(BASECONFIGDIR:/fonts=/default/fonts)
- all: config.h
- 	$(MAKE) $(AM_MAKEFLAGS) all-recursive
++
+ # Microsoft import library install/uninstall
+ @MS_LIB_AVAILABLE_TRUE@noinst_DATA = fontconfig.lib
+ AM_CPPFLAGS = \
+@@ -477,7 +481,7 @@
+ 	$(WARN_CFLAGS)					\
+ 	-DFC_CACHEDIR='"$(FC_CACHEDIR)"'                \
+ 	-DCONFIGDIR='"$(CONFIGDIR)"'			\
+-	-DFONTCONFIG_PATH='"$(BASECONFIGDIR)"'		\
++	-DFONTCONFIG_PATH='"$(BASECONFIGDIR_ADMIN):$(BASECONFIGDIR)"'		\
+ 	-DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"'
+ 
+ LDADD = $(LIBINTL)
+@@ -487,7 +491,7 @@
+ 	../fc-case/fccase.h \
+ 	../fc-lang/fclang.h \
+ 	stamp-fcstdint \
+-	$(builddir)/fcobjshash.h \
++	fcobjshash.h \
+ 	fcobjshash.gperf
+ 
+ libfontconfig_la_SOURCES = \
+@@ -543,7 +547,6 @@
+ CLEANFILES = \
+ 	$(ALIAS_FILES)	\
+ 	fontconfig.def	\
+-	$(builddir)/fcobjshash.h
+ 
+ DISTCLEANFILES = \
+ 	stamp-fcstdint	\
+@@ -1028,9 +1031,11 @@
+ 	' - > $@.tmp && \
+ 	mv -f $@.tmp fcobjshash.gperf && touch $@ || ( $(RM) $@.tmp && false )
+ 
+-$(builddir)/fcobjshash.h: Makefile fcobjshash.gperf
+-	$(AM_V_GEN) $(GPERF) --pic -m 100 fcobjshash.gperf > $@.tmp && \
+-	mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
++# PATCH: Sortix doesn't have gperf at the moment, so this file has been prebuilt
++#        on another operating system.
++#fcobjshash.h: Makefile fcobjshash.gperf
++#	$(AM_V_GEN) $(GPERF) --pic -m 100 fcobjshash.gperf > $@.tmp && \
++#	mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
+ 
+ @ENABLE_SHARED_TRUE@install-data-local: install-ms-import-lib install-libtool-import-lib
  
 diff -Paur --no-dereference -- libfontconfig.upstream/src/fccache.c libfontconfig/src/fccache.c
 --- libfontconfig.upstream/src/fccache.c
@@ -104,7 +159,7 @@ diff -Paur --no-dereference -- libfontconfig.upstream/src/fccache.c libfontconfi
  	{
  	    fprintf (stderr, "Unable to revert mtime: %s\n", d);
  	}
-@@ -1642,7 +1645,11 @@
+@@ -1639,7 +1642,11 @@
  #if defined(_WIN32)
  	    if (_locking (fd, _LK_LOCK, 1) == -1)
  		goto bail;
@@ -117,7 +172,7 @@ diff -Paur --no-dereference -- libfontconfig.upstream/src/fccache.c libfontconfi
  	    struct flock fl;
  
  	    fl.l_type = F_WRLCK;
-@@ -1652,17 +1659,21 @@
+@@ -1649,17 +1656,21 @@
  	    fl.l_pid = getpid ();
  	    if (fcntl (fd, F_SETLKW, &fl) == -1)
  		goto bail;
@@ -139,7 +194,7 @@ diff -Paur --no-dereference -- libfontconfig.upstream/src/fccache.c libfontconfi
  }
  
  void
-@@ -1672,7 +1683,10 @@
+@@ -1669,7 +1680,10 @@
      {
  #if defined(_WIN32)
  	_locking (fd, _LK_UNLCK, 1);
@@ -154,7 +209,7 @@ diff -Paur --no-dereference -- libfontconfig.upstream/src/fccache.c libfontconfi
 diff -Paur --no-dereference -- libfontconfig.upstream/src/fccompat.c libfontconfig/src/fccompat.c
 --- libfontconfig.upstream/src/fccompat.c
 +++ libfontconfig/src/fccompat.c
-@@ -182,69 +182,8 @@
+@@ -182,70 +182,8 @@
  int32_t
  FcRandom(void)
  {
@@ -204,8 +259,9 @@ diff -Paur --no-dereference -- libfontconfig.upstream/src/fccompat.c libfontconf
 -#elif HAVE_LRAND48
 -    result = lrand48 ();
 -#elif HAVE_RAND_R
--    static unsigned int seed = time (NULL);
+-    static unsigned int seed;
 -
+-    seed = time (NULL);
 -    result = rand_r (&seed);
 -#elif HAVE_RAND
 -    static FcBool initialized = FcFalse;
@@ -511,58 +567,3 @@ diff -Paur --no-dereference -- libfontconfig.upstream/src/fcobjshash.h libfontco
 +    }
 +  return 0;
 +}
-diff -Paur --no-dereference -- libfontconfig.upstream/src/Makefile.in libfontconfig/src/Makefile.in
---- libfontconfig.upstream/src/Makefile.in
-+++ libfontconfig/src/Makefile.in
-@@ -463,6 +463,10 @@
- @OS_WIN32_FALSE@fontconfig_def_dependency = 
- @OS_WIN32_TRUE@fontconfig_def_dependency = fontconfig.def
- 
-+# PATCH: Install fallback default configuration in /etc/default.
-+BASECONFIGDIR_ADMIN := $(BASECONFIGDIR)
-+BASECONFIGDIR := $(BASECONFIGDIR:/fonts=/default/fonts)
-+
- # Microsoft import library install/uninstall
- @MS_LIB_AVAILABLE_TRUE@noinst_DATA = fontconfig.lib
- AM_CPPFLAGS = \
-@@ -475,7 +479,7 @@
- 	$(WARN_CFLAGS)					\
- 	-DFC_CACHEDIR='"$(FC_CACHEDIR)"'                \
- 	-DCONFIGDIR='"$(CONFIGDIR)"'			\
--	-DFONTCONFIG_PATH='"$(BASECONFIGDIR)"'		\
-+	-DFONTCONFIG_PATH='"$(BASECONFIGDIR_ADMIN):$(BASECONFIGDIR)"'		\
- 	-DFC_TEMPLATEDIR='"$(TEMPLATEDIR)"'
- 
- LDADD = $(LIBINTL)
-@@ -485,7 +489,7 @@
- 	../fc-case/fccase.h \
- 	../fc-lang/fclang.h \
- 	stamp-fcstdint \
--	$(builddir)/fcobjshash.h \
-+	fcobjshash.h \
- 	fcobjshash.gperf
- 
- libfontconfig_la_SOURCES = \
-@@ -541,7 +545,6 @@
- CLEANFILES = \
- 	$(ALIAS_FILES)	\
- 	fontconfig.def	\
--	$(builddir)/fcobjshash.h
- 
- DISTCLEANFILES = \
- 	stamp-fcstdint	\
-@@ -1026,9 +1029,11 @@
- 	' - > $@.tmp && \
- 	mv -f $@.tmp fcobjshash.gperf && touch $@ || ( $(RM) $@.tmp && false )
- 
--$(builddir)/fcobjshash.h: Makefile fcobjshash.gperf
--	$(AM_V_GEN) $(GPERF) --pic -m 100 fcobjshash.gperf > $@.tmp && \
--	mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
-+# PATCH: Sortix doesn't have gperf at the moment, so this file has been prebuilt
-+#        on another operating system.
-+#fcobjshash.h: Makefile fcobjshash.gperf
-+#	$(AM_V_GEN) $(GPERF) --pic -m 100 fcobjshash.gperf > $@.tmp && \
-+#	mv -f $@.tmp $@ || ( $(RM) $@.tmp && false )
- 
- @ENABLE_SHARED_TRUE@install-data-local: install-ms-import-lib install-libtool-import-lib
- 

ports/libfontconfig/libfontconfig.port

@@ -1,10 +1,10 @@
 NAME=libfontconfig
 BUILD_LIBRARIES='libiconv libexpat libfreetype libintl? libjson-c?'
-VERSION=2.14.0
+VERSION=2.15.0
 DISTNAME=fontconfig-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=dcbeb84c9c74bbfdb133d535fe1c7bedc9f2221a8daf3914b984c44c520e9bac
+SHA256SUM=63a0658d0e06e0fa886106452b58ef04f21f58202ea02a94c39de0d3335d7c0e
 UPSTREAM_SITE=https://www.freedesktop.org/software/fontconfig/release
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE=HPND-sell-variant

ports/libgmp/libgmp.patch

@@ -1,7 +1,7 @@
 diff -Paur --no-dereference -- libgmp.upstream/gmp-h.in libgmp/gmp-h.in
 --- libgmp.upstream/gmp-h.in
 +++ libgmp/gmp-h.in
-@@ -250,6 +250,7 @@
+@@ -253,6 +253,7 @@
  /* For reference, "defined(EOF)" cannot be used here.  In g++ 2.95.4,
     <iostream> defines EOF but not FILE.  */
  #if defined (FILE)                                              \

ports/libgmp/libgmp.port

@@ -1,10 +1,10 @@
 NAME=libgmp
 BUILD_LIBRARIES=libstdc++
-VERSION=6.2.1
+VERSION=6.3.0
 DISTNAME=gmp-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=fd4829912cddd12f84181c3451cc752be224643e87fac497b69edddadc49b4f2
+SHA256SUM=a3c2b80201b89e68616f4ad30bc66aee4927c3ce50e33929ca819d5c43538898
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/gmp
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE='GPL-2.0-or-later OR LGPL-3.0-or-later'

ports/libgmp/libgmp.rmpatch

@@ -0,0 +1,2 @@
+rm -rf -- 'tests/devel/test-add_ssaaaa.c'
+rm -rf -- 'tests/devel/test-sub_ddmmss.c'

ports/libidn/libidn.patch

@@ -1,7 +1,7 @@
 diff -Paur --no-dereference -- libidn.upstream/Makefile.in libidn/Makefile.in
 --- libidn.upstream/Makefile.in
 +++ libidn/Makefile.in
-@@ -1955,6 +1955,8 @@
+@@ -2020,6 +2020,8 @@
  distclean: distclean-recursive
  	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
  	-rm -f Makefile
@@ -10,3 +10,14 @@ diff -Paur --no-dereference -- libidn.upstream/Makefile.in libidn/Makefile.in
  distclean-am: clean-am distclean-generic distclean-hdr \
  	distclean-libtool distclean-tags
  
+diff -Paur --no-dereference -- libidn.upstream/doc/Makefile.in libidn/doc/Makefile.in
+--- libidn.upstream/doc/Makefile.in
++++ libidn/doc/Makefile.in
+@@ -2211,6 +2211,7 @@
+ 
+ distclean: distclean-recursive
+ 	-rm -f Makefile
++	-rm -f libidn.info
+ distclean-am: clean-am distclean-generic distclean-tags
+ 
+ dvi: dvi-recursive

ports/libidn/libidn.port

@@ -1,10 +1,10 @@
 NAME=libidn
 BUILD_LIBRARIES='libiconv? libintl?'
-VERSION=1.41
+VERSION=1.42
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=884d706364b81abdd17bee9686d8ff2ae7431c5a14651047c68adf8b31fd8945
+SHA256SUM=d6c199dcd806e4fe279360cb4b08349a0d39560ed548ffd1ccadda8cdecb4723
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/libidn
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE='GPL-2.0-or-later OR LGPL-3.0-or-later'

ports/libidn/libidn.rmpatch

@@ -1,4 +1,5 @@
 rm -rf -- 'contrib/doxygen/Doxyfile.orig'
+rm -rf -- 'doc/libidn.info'
 rm -rf -- 'doc/man'
 rm -rf -- 'doc/reference/html'
 rm -rf -- 'doc/reference/libidn-overrides.txt'

ports/libjpeg/libjpeg.port

@@ -1,10 +1,10 @@
 NAME=libjpeg
 BUILD_LIBRARIES=
-VERSION=9e
+VERSION=9f
 DISTNAME=jpegsrc.v$VERSION
 COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=4077d6a6a75aeb01884f708919d25934c93305e49f7e3f36db9129320e6f4f3d
+SHA256SUM=04705c110cb2469caa79fb71fba3d7bf834914706e9641a4589485c1f832565b
 UPSTREAM_SITE=https://ijg.org/files
 UPSTREAM_ARCHIVE=$ARCHIVE
 BUILD_SYSTEM=configure

ports/liblzma/liblzma.port

@@ -1,6 +1,7 @@
 NAME=liblzma
 BUILD_LIBRARIES='libiconv? libintl?'
 SOURCE_PORT=xz
+LICENSE=PUBLIC-DOMAIN
 BUILD_SYSTEM=configure
 CONFIGURE_ARGS='--disable-lzmadec --disable-lzmainfo --disable-lzma-links --disable-xz --disable-xzdec --disable-scripts --disable-doc'
 POST_INSTALL=tix-eradicate-libtool-la

ports/libmpc/libmpc.port

@@ -1,10 +1,10 @@
 NAME=libmpc
 BUILD_LIBRARIES='libgmp libmpfr'
-VERSION=1.2.1
+VERSION=1.3.1
 DISTNAME=mpc-$VERSION
 COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=17503d2c395dfcf106b622dc142683c1199431d095367c6aacba6eec30340459
+SHA256SUM=ab642492f5cf882b74aa0cb730cd410a81edcdbec895183ce930e706c1c759b8
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/mpc
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE=LGPL-3.0-or-later

ports/libmpfr/libmpfr.port

@@ -1,10 +1,10 @@
 NAME=libmpfr
 BUILD_LIBRARIES='libstdc++ libgmp'
-VERSION=4.1.0
+VERSION=4.2.1
 DISTNAME=mpfr-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=0c98a3f1732ff6ca4ea690552079da9c597872d30e96ec28414ee23c95558a7f
+SHA256SUM=277807353a6726978996945af13e52829e3abd7a9a5b7fb2793894e18f1fcbb2
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/mpfr
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE=LGPL-3.0-or-later

ports/libpixman/libpixman.port

@@ -1,10 +1,10 @@
 NAME=libpixman
 BUILD_LIBRARIES='libpng?'
-VERSION=0.40.0
+VERSION=0.42.2 # Update blocked by meson adoption
 DISTNAME=pixman-$VERSION
 COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=6d200dec3740d9ec4ec8d1180e25779c00bc749f94278c8b9021f5534db223fc
+SHA256SUM=ea1480efada2fd948bc75366f7c349e1c96d3297d09a3fe62626e38e234a625e
 UPSTREAM_SITE=https://www.cairographics.org/releases
 UPSTREAM_ARCHIVE=$ARCHIVE
 BUILD_SYSTEM=configure

ports/libpng/libpng.patch

@@ -1,22 +1,7 @@
-diff -Paur --no-dereference -- libpng.upstream/contrib/libtests/pngvalid.c libpng/contrib/libtests/pngvalid.c
---- libpng.upstream/contrib/libtests/pngvalid.c
-+++ libpng/contrib/libtests/pngvalid.c
-@@ -18,10 +18,7 @@
-  *   transformations performed by libpng.
-  */
- 
--#define _POSIX_SOURCE 1
--#define _ISOC99_SOURCE 1 /* For floating point */
--#define _GNU_SOURCE 1 /* For the floating point exception extension */
--#define _BSD_SOURCE 1 /* For the floating point exception extension */
-+/* PATCH: Get feenableexcept without any feature macros. */
- 
- #include <signal.h>
- #include <stdio.h>
 diff -Paur --no-dereference -- libpng.upstream/contrib/libtests/timepng.c libpng/contrib/libtests/timepng.c
 --- libpng.upstream/contrib/libtests/timepng.c
 +++ libpng/contrib/libtests/timepng.c
-@@ -22,6 +22,10 @@
+@@ -21,6 +21,10 @@
  #include <errno.h>
  #include <limits.h>
  
@@ -30,7 +15,7 @@ diff -Paur --no-dereference -- libpng.upstream/contrib/libtests/timepng.c libpng
 diff -Paur --no-dereference -- libpng.upstream/contrib/tools/pngcp.c libpng/contrib/tools/pngcp.c
 --- libpng.upstream/contrib/tools/pngcp.c
 +++ libpng/contrib/tools/pngcp.c
-@@ -70,6 +70,10 @@
+@@ -73,6 +73,10 @@
  #include <limits.h>
  #include <assert.h>
  

ports/libpng/libpng.port

@@ -1,10 +1,10 @@
 NAME=libpng
 BUILD_LIBRARIES=libz
-VERSION=1.6.37
+VERSION=1.6.40
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=505e70834d35383537b6491e7ae8641f1a4bed1876dbfe361201fc80868d88ca
+SHA256SUM=535b479b2467ff231a3ec6d92a525906fb8ef27978be4f66dbe05d3f3a01b3a1
 UPSTREAM_SITE=https://download.sourceforge.net/libpng
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE=Libpng

ports/libreadline/libreadline.patch

@@ -1,24 +1,3 @@
-diff -Paur --no-dereference -- libreadline.upstream/configure libreadline/configure
---- libreadline.upstream/configure
-+++ libreadline/configure
-@@ -2628,8 +2628,6 @@
-     i[3456]86-*-beos*)
-         cross_cache=${srcdir}/cross-build/x86-beos.cache
-         ;;
--    *)  echo "configure: cross-compiling for $host is not supported" >&2
--        ;;
-     esac
-     if test -n "${cross_cache}" && test -r "${cross_cache}"; then
-         echo "loading cross-build cache file ${cross_cache}"
-@@ -5412,7 +5410,7 @@
-   if test "$cross_compiling" = yes; then :
-   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot check for sigsetjmp/siglongjmp if cross-compiling -- defaulting to missing" >&5
- $as_echo "$as_me: WARNING: cannot check for sigsetjmp/siglongjmp if cross-compiling -- defaulting to missing" >&2;}
--     bash_cv_func_sigsetjmp=missing
-+     bash_cv_func_sigsetjmp=yes
- 
- else
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 diff -Paur --no-dereference -- libreadline.upstream/Makefile.in libreadline/Makefile.in
 --- libreadline.upstream/Makefile.in
 +++ libreadline/Makefile.in
@@ -32,3 +11,27 @@ diff -Paur --no-dereference -- libreadline.upstream/Makefile.in libreadline/Make
  # Programs to make tags files.
  ETAGS = etags
  CTAGS = ctags -w
+diff -Paur --no-dereference -- libreadline.upstream/configure libreadline/configure
+--- libreadline.upstream/configure
++++ libreadline/configure
+@@ -3075,8 +3075,6 @@
+     i[3456]86-*-beos*)
+         cross_cache=${srcdir}/cross-build/x86-beos.cache
+         ;;
+-    *)  echo "configure: cross-compiling for $host is not supported" >&2
+-        ;;
+     esac
+     if test -n "${cross_cache}" && test -r "${cross_cache}"; then
+         echo "loading cross-build cache file ${cross_cache}"
+diff -Paur --no-dereference -- libreadline.upstream/input.c libreadline/input.c
+--- libreadline.upstream/input.c
++++ libreadline/input.c
+@@ -805,7 +805,7 @@
+   int result;
+   unsigned char c;
+   int fd;
+-#if defined (HAVE_PSELECT)
++#if defined (HAVE_PSELECT) || defined (HAVE_SELECT)
+   sigset_t empty_set;
+   fd_set readfds;
+ #endif

ports/libreadline/libreadline.port

@@ -1,10 +1,10 @@
 NAME=libreadline
 BUILD_LIBRARIES=libcurses
-VERSION=8.1.2
+VERSION=8.2
 DISTNAME=readline-$VERSION
 COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=7589a2381a8419e68654a47623ce7dfcb756815c8fee726b98f90bf668af7bc6
+SHA256SUM=3feb7171f16a84ee82ca18a36d7b9be109a52c04f492a053331d7d1095007c35
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/readline
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE=GPL-3.0-or-later

ports/libssl/libssl.patch

@@ -26,7 +26,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  			unix_dg_tmp_socket = unix_dg_tmp_socket_buf;
  		}
  	}
-@@ -1385,7 +1392,8 @@
+@@ -1391,7 +1398,8 @@
  	memset(&cmsgbuf, 0, sizeof(cmsgbuf));
  	memset(&iov, 0, sizeof(iov));
  
@@ -36,7 +36,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  	mh.msg_controllen = sizeof(cmsgbuf.buf);
  	cmsg = CMSG_FIRSTHDR(&mh);
  	cmsg->cmsg_len = CMSG_LEN(sizeof(int));
-@@ -1422,6 +1430,7 @@
+@@ -1428,6 +1436,7 @@
  void
  atelnet(int nfd, unsigned char *buf, unsigned int size)
  {
@@ -44,7 +44,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  	unsigned char *p, *end;
  	unsigned char obuf[4];
  
-@@ -1447,6 +1456,9 @@
+@@ -1453,6 +1462,9 @@
  		if (atomicio(vwrite, nfd, obuf, 3) != 3)
  			warn("Write Error!");
  	}
@@ -54,7 +54,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  }
  
  int
-@@ -1590,16 +1602,20 @@
+@@ -1596,16 +1608,20 @@
  			err(1, NULL);
  	}
  	if (Tflag != -1) {
@@ -77,7 +77,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  			errno = ENOPROTOOPT;
  			err(1, "set IPv6 traffic class not supported");
  		}
-@@ -1617,13 +1633,16 @@
+@@ -1623,13 +1639,16 @@
  	}
  
  	if (ttl != -1) {
@@ -96,7 +96,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  	}
  
  	if (minttl != -1) {
-@@ -1661,7 +1680,9 @@
+@@ -1667,7 +1686,9 @@
  		{ "af41",		IPTOS_DSCP_AF41 },
  		{ "af42",		IPTOS_DSCP_AF42 },
  		{ "af43",		IPTOS_DSCP_AF43 },
@@ -106,7 +106,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/nc/netcat.c libssl/apps/nc/n
  		{ "cs0",		IPTOS_DSCP_CS0 },
  		{ "cs1",		IPTOS_DSCP_CS1 },
  		{ "cs2",		IPTOS_DSCP_CS2 },
-@@ -1671,11 +1692,21 @@
+@@ -1677,11 +1698,21 @@
  		{ "cs6",		IPTOS_DSCP_CS6 },
  		{ "cs7",		IPTOS_DSCP_CS7 },
  		{ "ef",			IPTOS_DSCP_EF },
@@ -217,7 +217,7 @@ diff -Paur --no-dereference -- libssl.upstream/apps/openssl/s_socket.c libssl/ap
 diff -Paur --no-dereference -- libssl.upstream/configure libssl/configure
 --- libssl.upstream/configure
 +++ libssl/configure
-@@ -11779,6 +11779,10 @@
+@@ -12178,6 +12178,10 @@
  		HOST_OS=midipix
  		CPPFLAGS="$CPPFLAGS -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_SOURCE -D_GNU_SOURCE"
  		;;
@@ -228,6 +228,19 @@ diff -Paur --no-dereference -- libssl.upstream/configure libssl/configure
  	*netbsd*)
  		HOST_OS=netbsd
  		HOST_ABI=elf
+diff -Paur --no-dereference -- libssl.upstream/crypto/Makefile.in libssl/crypto/Makefile.in
+--- libssl.upstream/crypto/Makefile.in
++++ libssl/crypto/Makefile.in
+@@ -1640,7 +1640,8 @@
+ CC = @CC@
+ CCAS = @CCAS@
+ CCASDEPMODE = @CCASDEPMODE@
+-CCASFLAGS = @CCASFLAGS@
++# TODO: sortix-binutils-1.1-rc3 is too old for endbr64.
++CCASFLAGS = @CCASFLAGS@ -Dendbr64=
+ CCDEPMODE = @CCDEPMODE@
+ CFLAGS = @CFLAGS@
+ CPPFLAGS = @CPPFLAGS@
 diff -Paur --no-dereference -- libssl.upstream/crypto/bio/b_sock.c libssl/crypto/bio/b_sock.c
 --- libssl.upstream/crypto/bio/b_sock.c
 +++ libssl/crypto/bio/b_sock.c
@@ -307,8 +320,8 @@ diff -Paur --no-dereference -- libssl.upstream/include/compat/sys/types.h libssl
 diff -Paur --no-dereference -- libssl.upstream/include/compat/unistd.h libssl/include/compat/unistd.h
 --- libssl.upstream/include/compat/unistd.h
 +++ libssl/include/compat/unistd.h
-@@ -64,9 +64,10 @@
- #endif
+@@ -69,9 +69,10 @@
+ #include "getopt.h"
  #endif
  
 -#ifndef HAVE_GETPAGESIZE
@@ -324,7 +337,7 @@ diff -Paur --no-dereference -- libssl.upstream/include/compat/unistd.h libssl/in
 diff -Paur --no-dereference -- libssl.upstream/tls/tls_config.c libssl/tls/tls_config.c
 --- libssl.upstream/tls/tls_config.c
 +++ libssl/tls/tls_config.c
-@@ -721,8 +721,11 @@
+@@ -722,8 +722,11 @@
  	}
  
  	if (sb.st_uid != getuid()) {

ports/libssl/libssl.port

@@ -1,10 +1,10 @@
 NAME=libssl
 BUILD_LIBRARIES=
-VERSION=3.7.2
+VERSION=3.8.2
 DISTNAME=libressl-$VERSION
 COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=b06aa538fefc9c6b33c4db4931a09a5f52d9d2357219afcbff7d93fe12ebf6f7
+SHA256SUM=6d4b8d5bbb25a1f8336639e56ec5088052d43a95256697a85c4ce91323c25954
 UPSTREAM_SITE=https://ftp.openbsd.org/pub/OpenBSD/LibreSSL
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE=OpenSSL

ports/libxml2/libxml2.patch

@@ -1,104 +1,16 @@
-diff -Paur --no-dereference -- libxml2.upstream/dict.c libxml2/dict.c
---- libxml2.upstream/dict.c
-+++ libxml2/dict.c
-@@ -139,15 +139,6 @@
-  */
- static int xmlDictInitialized = 0;
- 
--#ifdef DICT_RANDOMIZATION
--#ifdef HAVE_RAND_R
--/*
-- * Internal data for random function, protected by xmlDictMutex
-- */
--static unsigned int rand_seed = 0;
--#endif
--#endif
--
- /**
-  * xmlInitializeDict:
-  *
-@@ -181,14 +172,6 @@
-         return(0);
-     xmlRMutexLock(xmlDictMutex);
- 
--#ifdef DICT_RANDOMIZATION
--#ifdef HAVE_RAND_R
--    rand_seed = time(NULL);
--    rand_r(& rand_seed);
--#else
--    srand(time(NULL));
--#endif
--#endif
-     xmlDictInitialized = 1;
-     xmlRMutexUnlock(xmlDictMutex);
-     return(1);
-@@ -196,19 +179,7 @@
- 
- #ifdef DICT_RANDOMIZATION
- int __xmlRandom(void) {
--    int ret;
--
--    if (xmlDictInitialized == 0)
--        __xmlInitializeDict();
--
--    xmlRMutexLock(xmlDictMutex);
--#ifdef HAVE_RAND_R
--    ret = rand_r(& rand_seed);
--#else
--    ret = rand();
--#endif
--    xmlRMutexUnlock(xmlDictMutex);
--    return(ret);
-+    return(arc4random_uniform(INT_MAX));
- }
- #endif
- 
 diff -Paur --no-dereference -- libxml2.upstream/Makefile.in libxml2/Makefile.in
 --- libxml2.upstream/Makefile.in
 +++ libxml2/Makefile.in
-@@ -444,7 +444,7 @@
- am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \
- 	$(srcdir)/libxml-2.0-uninstalled.pc.in \
- 	$(srcdir)/libxml-2.0.pc.in $(srcdir)/libxml.spec.in \
--	$(srcdir)/libxml2-config.cmake.in $(srcdir)/xml2-config.in \
-+	$(srcdir)/libxml2-config.cmake.in \
- 	COPYING NEWS TODO compile config.guess config.sub depcomp \
- 	install-sh ltmain.sh missing
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -728,7 +728,7 @@
+@@ -688,7 +688,7 @@
+ SUBDIRS = include . doc example xstc $(am__append_1) $(am__append_2)
  DIST_SUBDIRS = include . doc example fuzz python xstc
- AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include
- AM_CFLAGS = $(EXTRA_CFLAGS) $(THREAD_CFLAGS) $(Z_CFLAGS) $(LZMA_CFLAGS)
+ AM_CPPFLAGS = -I$(top_builddir)/include -I$(srcdir)/include -DSYSCONFDIR='"$(sysconfdir)"'
 -bin_SCRIPTS = xml2-config
 +bin_SCRIPTS =
  lib_LTLIBRARIES = libxml2.la
- libxml2_la_LIBADD = $(ICU_LIBS) $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
- @USE_VERSION_SCRIPT_FALSE@LIBXML2_VERSION_SCRIPT = 
-@@ -756,7 +756,7 @@
- 
- DEPS = $(top_builddir)/libxml2.la
- LDADDS = $(STATIC_BINARIES) $(top_builddir)/libxml2.la $(THREAD_LIBS) $(Z_LIBS) $(LZMA_LIBS) $(ICONV_LIBS) $(M_LIBS) $(WIN32_EXTRA_LIBADD)
--man_MANS = xml2-config.1 libxml.3
-+man_MANS = libxml.3
- m4datadir = $(datadir)/aclocal
- m4data_DATA = libxml.m4
- runtest_SOURCES = runtest.c
-@@ -851,11 +851,11 @@
- runxmlconf_LDFLAGS = 
- runxmlconf_DEPENDENCIES = $(DEPS)
- runxmlconf_LDADD = $(LDADDS)
--CLEANFILES = runxmlconf.log test.out xml2Conf.sh *.gcda *.gcno *.res
-+CLEANFILES = runxmlconf.log test.out *.gcda *.gcno *.res
- DISTCLEANFILES = COPYING missing.lst
- confexecdir = $(libdir)
--confexec_DATA = xml2Conf.sh
--EXTRA_DIST = xml2-config.in xml2Conf.sh.in libxml.spec.in libxml2.spec \
-+confexec_DATA =
-+EXTRA_DIST = libxml.spec.in libxml2.spec \
-              libxml.m4 Copyright check-xml-test-suite.py gentest.py \
- 	     check-relaxng-test-suite.py check-relaxng-test-suite2.py \
- 	     check-xsddata-test-suite.py check-xinclude-test-suite.py \
-@@ -947,8 +947,6 @@
+ libxml2_la_CFLAGS = $(AM_CFLAGS) $(XML_PRIVATE_CFLAGS)
+ libxml2_la_LIBADD = $(XML_PRIVATE_LIBS)
+@@ -852,8 +852,6 @@
  	cd $(top_builddir) && $(SHELL) ./config.status $@
  libxml2-config.cmake: $(top_builddir)/config.status $(srcdir)/libxml2-config.cmake.in
  	cd $(top_builddir) && $(SHELL) ./config.status $@
@@ -107,27 +19,105 @@ diff -Paur --no-dereference -- libxml2.upstream/Makefile.in libxml2/Makefile.in
  install-binPROGRAMS: $(bin_PROGRAMS)
  	@$(NORMAL_INSTALL)
  	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
-@@ -3109,15 +3107,6 @@
- rpm: cleanup cleantar
- 	@(unset CDPATH ; $(MAKE) dist-source dist && rpmbuild -ta $(distdir).tar.gz)
+diff -Paur --no-dereference -- libxml2.upstream/dict.c libxml2/dict.c
+--- libxml2.upstream/dict.c
++++ libxml2/dict.c
+@@ -20,6 +20,7 @@
+ #include "libxml.h"
  
--xml2Conf.sh: xml2Conf.sh.in Makefile
--	sed -e 's?\@XML_LIBDIR\@?$(XML_LIBDIR)?g' \
--	    -e 's?\@XML_INCLUDEDIR\@?$(XML_INCLUDEDIR)?g' \
--	    -e 's?\@VERSION\@?$(VERSION)?g' \
--	    -e 's?\@XML_LIBS\@?$(XML_LIBS)?g' \
--	    -e 's?\@XML_PRIVATE_LIBS\@?$(XML_PRIVATE_LIBS)?g' \
--	       < $(srcdir)/xml2Conf.sh.in > xml2Conf.tmp \
--	&& mv xml2Conf.tmp xml2Conf.sh
+ #include <limits.h>
++#include <stdlib.h>
+ #include <string.h>
+ #include <time.h>
+ 
+@@ -904,69 +905,17 @@
+  * Pseudo-random generator
+  */
+ 
+-static xmlMutex xmlRngMutex;
 -
- install-data-local: 
- 	$(MKDIR_P) $(DESTDIR)$(docdir)
- 	-$(INSTALL) -m 0644 $(srcdir)/Copyright $(DESTDIR)$(docdir)
+-static unsigned globalRngState[2];
+-
+-#ifdef XML_THREAD_LOCAL
+-static XML_THREAD_LOCAL int localRngInitialized = 0;
+-static XML_THREAD_LOCAL unsigned localRngState[2];
+-#endif
+-
+ ATTRIBUTE_NO_SANITIZE_INTEGER
+ void
+ xmlInitRandom(void) {
+-    int var;
+-
+-    xmlInitMutex(&xmlRngMutex);
+-
+-    /* TODO: Get seed values from system PRNG */
+-
+-    globalRngState[0] = (unsigned) time(NULL) ^
+-                        HASH_ROL((unsigned) (size_t) &xmlInitRandom, 8);
+-    globalRngState[1] = HASH_ROL((unsigned) (size_t) &xmlRngMutex, 16) ^
+-                        HASH_ROL((unsigned) (size_t) &var, 24);
+ }
+ 
+ void
+ xmlCleanupRandom(void) {
+-    xmlCleanupMutex(&xmlRngMutex);
+-}
+-
+-ATTRIBUTE_NO_SANITIZE_INTEGER
+-static unsigned
+-xoroshiro64ss(unsigned *s) {
+-    unsigned s0 = s[0];
+-    unsigned s1 = s[1];
+-    unsigned result = HASH_ROL(s0 * 0x9E3779BB, 5) * 5;
+-
+-    s1 ^= s0;
+-    s[0] = HASH_ROL(s0, 26) ^ s1 ^ (s1 << 9);
+-    s[1] = HASH_ROL(s1, 13);
+-
+-    return(result & 0xFFFFFFFF);
+ }
+ 
+ unsigned
+ xmlRandom(void) {
+-#ifdef XML_THREAD_LOCAL
+-    if (!localRngInitialized) {
+-        xmlMutexLock(&xmlRngMutex);
+-        localRngState[0] = xoroshiro64ss(globalRngState);
+-        localRngState[1] = xoroshiro64ss(globalRngState);
+-        localRngInitialized = 1;
+-        xmlMutexUnlock(&xmlRngMutex);
+-    }
+-
+-    return(xoroshiro64ss(localRngState));
+-#else
+-    unsigned ret;
+-
+-    xmlMutexLock(&xmlRngMutex);
+-    ret = xoroshiro64ss(globalRngState);
+-    xmlMutexUnlock(&xmlRngMutex);
+-
+-    return(ret);
+-#endif
++    return(arc4random());
+ }
+ 
+diff -Paur --no-dereference -- libxml2.upstream/doc/Makefile.in libxml2/doc/Makefile.in
+--- libxml2.upstream/doc/Makefile.in
++++ libxml2/doc/Makefile.in
+@@ -476,7 +476,7 @@
+ 	xmlcatalog.html \
+ 	xmllint.html
+ 
+-dist_man_MANS = xml2-config.1 xmllint.1 xmlcatalog.1
++dist_man_MANS = xmllint.1 xmlcatalog.1
+ EXTRA_DIST = \
+ 	apibuild.py \
+ 	libxml2-api.xml \
 diff -Paur --no-dereference -- libxml2.upstream/nanoftp.c libxml2/nanoftp.c
 --- libxml2.upstream/nanoftp.c
 +++ libxml2/nanoftp.c
-@@ -60,6 +60,18 @@
- #include <strings.h>
+@@ -51,6 +51,18 @@
+ #include <sys/socket.h>
  #endif
  
 +#if defined(__sortix__)
@@ -145,15 +135,3 @@ diff -Paur --no-dereference -- libxml2.upstream/nanoftp.c libxml2/nanoftp.c
  #include <libxml/xmlmemory.h>
  #include <libxml/parser.h>
  #include <libxml/xmlerror.h>
-diff -Paur --no-dereference -- libxml2.upstream/nanohttp.c libxml2/nanohttp.c
---- libxml2.upstream/nanohttp.c
-+++ libxml2/nanohttp.c
-@@ -1124,7 +1124,7 @@
- #if defined(HAVE_GETADDRINFO) && defined(SUPPORT_IP6) && !defined(_WIN32)
-     else
- #endif
--#if !defined(HAVE_GETADDRINFO) || !defined(_WIN32)
-+#if !defined(HAVE_GETADDRINFO) || (!defined(_WIN32) && !defined(__sortix__))
-     {
-         struct hostent *h;
-         struct in_addr ia;

ports/libxml2/libxml2.port

@@ -1,13 +1,13 @@
 NAME=libxml2
 BUILD_LIBRARIES='libiconv? libicu? liblzma? libz?'
 VERSION_MAJOR=2
-VERSION_MINOR=9
-VERSION_PATCH=14
+VERSION_MINOR=12
+VERSION_PATCH=4
 VERSION=$VERSION_MAJOR.$VERSION_MINOR.$VERSION_PATCH
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=60d74a257d1ccec0475e749cba2f21559e48139efba6ff28224357c7c798dfee
+SHA256SUM=497360e423cf0bd99eacdb7c6215dea92e6d6e89ee940393c2bae0e77cb9b7d0
 UPSTREAM_SITE=https://download.gnome.org/sources/libxml2/$VERSION_MAJOR.$VERSION_MINOR
 UPSTREAM_ARCHIVE=$ARCHIVE
 RELEASE_SEARCH_PAGE=https://download.gnome.org/sources/libxml2/cache.json

ports/libxml2/libxml2.rmpatch

@@ -1,4 +0,0 @@
-rm -rf -- 'COPYING'
-rm -rf -- 'include/libxml/xmlversion.h'
-rm -rf -- 'libxml2.spec'
-rm -rf -- 'python/setup.py'

ports/lua/lua.patch

@@ -25,24 +25,19 @@ diff -Paur --no-dereference -- lua.upstream/Makefile lua/Makefile
  
  # How to install. If your install program does not support "-p", then
  # you may have to run ranlib on the installed liblua.a.
-@@ -49,29 +52,31 @@
- R= $V.4
+@@ -49,26 +52,28 @@
+ R= $V.6
  
  # Targets start here.
 -all:	$(PLAT)
 +all:
 +	cd src && $(MAKE) posix LMODDIR=$(LMODDIR) CMODDIR=$(CMODDIR)
-+
+ 
+-$(PLATS) help test clean:
+-	@cd src && $(MAKE) $@
 +lib:
 +	cd src && $(MAKE) posix-lib LMODDIR=$(LMODDIR) CMODDIR=$(CMODDIR)
  
- $(PLATS) clean:
--	cd src && $(MAKE) $@
-+	cd src && $(MAKE) $@ LMODDIR=$(LMODDIR) CMODDIR=$(CMODDIR)
- 
- test:	dummy
- 	src/lua -v
- 
 -install: dummy
 -	cd src && $(MKDIR) $(INSTALL_BIN) $(INSTALL_INC) $(INSTALL_LIB) $(INSTALL_MAN) $(INSTALL_LMOD) $(INSTALL_CMOD)
 -	cd src && $(INSTALL_EXEC) $(TO_BIN) $(INSTALL_BIN)
@@ -55,7 +50,9 @@ diff -Paur --no-dereference -- lua.upstream/Makefile lua/Makefile
 -	cd src && cd $(INSTALL_INC) && $(RM) $(TO_INC)
 -	cd src && cd $(INSTALL_LIB) && $(RM) $(TO_LIB)
 -	cd doc && cd $(INSTALL_MAN) && $(RM) $(TO_MAN)
--
++$(PLATS) help test clean:
++	cd src && $(MAKE) $@ LMODDIR=$(LMODDIR) CMODDIR=$(CMODDIR)
+ 
 -local:
 -	$(MAKE) install INSTALL_TOP=../install
 +install: all
@@ -72,8 +69,93 @@ diff -Paur --no-dereference -- lua.upstream/Makefile lua/Makefile
 +	$(MKDIR) $(DESTDIR)$(LIBDIR)
 +	cd src && $(INSTALL_DATA) $(TO_LIB) $(DESTDIR)$(LIBDIR)
  
- none:
- 	@echo "Please do 'make PLATFORM' where PLATFORM is one of these:"
+ # make may get confused with install/ if it does not support .PHONY.
+ dummy:
+diff -Paur --no-dereference -- lua.upstream/src/Makefile lua/src/Makefile
+--- lua.upstream/src/Makefile
++++ lua/src/Makefile
+@@ -6,23 +6,20 @@
+ # Your platform. See PLATS for possible values.
+ PLAT= guess
+ 
+-CC= gcc -std=gnu99
+-CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_3 $(SYSCFLAGS) $(MYCFLAGS)
+-LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
+-LIBS= -lm $(SYSLIBS) $(MYLIBS)
++CC?= gcc
++CFLAGS?= -O2
++LDFLAGS?=
++LIBS?=
++
++CFLAGS+= -std=gnu99 -Wall -Wextra -DLUA_COMPAT_5_3 \
++         -DLUA_LDIR=\"$(LMODDIR)\" -DLUA_CDIR=\"$(CMODDIR)\" $(SYSCFLAGS)
++LIBS+= -llua -lm $(SYSLIBS)
+ 
+-AR= ar rcu
+-RANLIB= ranlib
++AR?= ar
++RANLIB?= ranlib
+ RM= rm -f
+ UNAME= uname
+ 
+-SYSCFLAGS=
+-SYSLDFLAGS=
+-SYSLIBS=
+-
+-MYCFLAGS=
+-MYLDFLAGS=
+-MYLIBS=
+ MYOBJS=
+ 
+ # Special flags for compiler modules; -Os reduces code size.
+@@ -44,7 +41,7 @@
+ LUAC_O=	luac.o
+ 
+ ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
+-ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
++ALL_T= $(LUA_T) $(LUAC_T)
+ ALL_A= $(LUA_A)
+ 
+ # Targets start here.
+@@ -57,20 +54,20 @@
+ a:	$(ALL_A)
+ 
+ $(LUA_A): $(BASE_O)
+-	$(AR) $@ $(BASE_O)
++	$(AR) rcu $@ $(BASE_O)
+ 	$(RANLIB) $@
+ 
+-$(LUA_T): $(LUA_O) $(LUA_A)
+-	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
++$(LUA_T): $(LUA_O)
++	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LIBS)
+ 
+-$(LUAC_T): $(LUAC_O) $(LUA_A)
+-	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
++$(LUAC_T): $(LUAC_O)
++	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LIBS)
+ 
+ test:
+ 	./$(LUA_T) -v
+ 
+ clean:
+-	$(RM) $(ALL_T) $(ALL_O)
++	$(RM) $(ALL_T) $(ALL_A) $(ALL_O)
+ 
+ depend:
+ 	@$(CC) $(CFLAGS) -MM l*.c
+@@ -138,7 +135,10 @@
+ 	$(MAKE) "LUAC_T=luac.exe" luac.exe
+ 
+ posix:
+-	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX"
++	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_READLINE" SYSLIBS="-lreadline -lterminfo"
++
++posix-lib:
++	$(MAKE) $(ALL_A) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_READLINE" SYSLIBS="-lreadline -lterminfo"
+ 
+ SunOS solaris:
+ 	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_REENTRANT" SYSLIBS="-ldl"
 diff -Paur --no-dereference -- lua.upstream/src/ldo.c lua/src/ldo.c
 --- lua.upstream/src/ldo.c
 +++ lua/src/ldo.c
@@ -99,23 +181,11 @@ diff -Paur --no-dereference -- lua.upstream/src/ldo.c lua/src/ldo.c
  
  #endif							/* } */
  
-diff -Paur --no-dereference -- lua.upstream/src/lmathlib.c lua/src/lmathlib.c
---- lua.upstream/src/lmathlib.c
-+++ lua/src/lmathlib.c
-@@ -24,7 +24,7 @@
- 
- 
- #if !defined(l_rand)		/* { */
--#if defined(LUA_USE_POSIX)
-+#if defined(LUA_USE_XSI)
- #define l_rand()	random()
- #define l_srand(x)	srandom(x)
- #define L_RANDMAX	2147483647	/* (2^31 - 1), following POSIX */
 diff -Paur --no-dereference -- lua.upstream/src/luac.c lua/src/luac.c
 --- lua.upstream/src/luac.c
 +++ lua/src/luac.c
-@@ -265,7 +265,7 @@
-   case LUA_TNUMFLT:
+@@ -308,7 +308,7 @@
+   case LUA_VNUMFLT:
  	{
  	char buff[100];
 -	sprintf(buff,LUA_NUMBER_FMT,fltvalue(o));
@@ -126,94 +196,14 @@ diff -Paur --no-dereference -- lua.upstream/src/luac.c lua/src/luac.c
 diff -Paur --no-dereference -- lua.upstream/src/luaconf.h lua/src/luaconf.h
 --- lua.upstream/src/luaconf.h
 +++ lua/src/luaconf.h
-@@ -200,9 +200,6 @@
+@@ -223,10 +223,6 @@
  
  #else			/* }{ */
  
 -#define LUA_ROOT	"/usr/local/"
 -#define LUA_LDIR	LUA_ROOT "share/lua/" LUA_VDIR "/"
 -#define LUA_CDIR	LUA_ROOT "lib/lua/" LUA_VDIR "/"
+-
+ #if !defined(LUA_PATH_DEFAULT)
  #define LUA_PATH_DEFAULT  \
  		LUA_LDIR"?.lua;"  LUA_LDIR"?/init.lua;" \
- 		LUA_CDIR"?.lua;"  LUA_CDIR"?/init.lua;" \
-diff -Paur --no-dereference -- lua.upstream/src/Makefile lua/src/Makefile
---- lua.upstream/src/Makefile
-+++ lua/src/Makefile
-@@ -6,22 +6,19 @@
- # Your platform. See PLATS for possible values.
- PLAT= none
- 
--CC= gcc -std=gnu99
--CFLAGS= -O2 -Wall -Wextra -DLUA_COMPAT_5_2 $(SYSCFLAGS) $(MYCFLAGS)
--LDFLAGS= $(SYSLDFLAGS) $(MYLDFLAGS)
--LIBS= -lm $(SYSLIBS) $(MYLIBS)
-+CC?= gcc
-+CFLAGS?= -O2
-+LDFLAGS?=
-+LIBS?=
-+
-+CFLAGS+= -std=c99 -Wall -Wextra -DLUA_COMPAT_5_2 \
-+         -DLUA_LDIR=\"$(LMODDIR)\" -DLUA_CDIR=\"$(CMODDIR)\" $(SYSCFLAGS)
-+LIBS+= -llua -lm $(SYSLIBS)
- 
--AR= ar rcu
--RANLIB= ranlib
-+AR?= ar
-+RANLIB?= ranlib
- RM= rm -f
- 
--SYSCFLAGS=
--SYSLDFLAGS=
--SYSLIBS=
--
--MYCFLAGS=
--MYLDFLAGS=
--MYLIBS=
- MYOBJS=
- 
- # == END OF USER SETTINGS -- NO NEED TO CHANGE ANYTHING BELOW THIS LINE =======
-@@ -43,7 +40,7 @@
- LUAC_O=	luac.o
- 
- ALL_O= $(BASE_O) $(LUA_O) $(LUAC_O)
--ALL_T= $(LUA_A) $(LUA_T) $(LUAC_T)
-+ALL_T= $(LUA_T) $(LUAC_T)
- ALL_A= $(LUA_A)
- 
- # Targets start here.
-@@ -56,17 +53,17 @@
- a:	$(ALL_A)
- 
- $(LUA_A): $(BASE_O)
--	$(AR) $@ $(BASE_O)
-+	$(AR) rcu $@ $(BASE_O)
- 	$(RANLIB) $@
- 
--$(LUA_T): $(LUA_O) $(LUA_A)
--	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LUA_A) $(LIBS)
-+$(LUA_T): $(LUA_O)
-+	$(CC) -o $@ $(LDFLAGS) $(LUA_O) $(LIBS)
- 
--$(LUAC_T): $(LUAC_O) $(LUA_A)
--	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LUA_A) $(LIBS)
-+$(LUAC_T): $(LUAC_O)
-+	$(CC) -o $@ $(LDFLAGS) $(LUAC_O) $(LIBS)
- 
- clean:
--	$(RM) $(ALL_T) $(ALL_O)
-+	$(RM) $(ALL_T) $(ALL_A) $(ALL_O)
- 
- depend:
- 	@$(CC) $(CFLAGS) -MM l*.c
-@@ -119,7 +116,10 @@
- 	$(MAKE) "LUAC_T=luac.exe" luac.exe
- 
- posix:
--	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX"
-+	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_READLINE" SYSLIBS="-lreadline -lterminfo"
-+
-+posix-lib:
-+	$(MAKE) $(ALL_A) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_READLINE" SYSLIBS="-lreadline -lterminfo"
- 
- solaris:
- 	$(MAKE) $(ALL) SYSCFLAGS="-DLUA_USE_POSIX -DLUA_USE_DLOPEN -D_REENTRANT" SYSLIBS="-ldl"

ports/lua/lua.port

@@ -1,10 +1,11 @@
 NAME=lua
 BUILD_LIBRARIES='libreadline liblua'
-VERSION=5.3.4
+VERSION=5.4.6
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=f681aa518233bc407e23acf0f5887c884f17436f000d453b2491a9f11a52400c
+SHA256SUM=7d5ea1b9cb6aa0b59ca3dde1c6adcb57ef83a1ba8e5432c0ecd06bf439b3ad88
 UPSTREAM_SITE=https://www.lua.org/ftp
 UPSTREAM_ARCHIVE=$ARCHIVE
+LICENSE=MIT
 BUILD_SYSTEM=makefile

ports/m4/m4.patch

@@ -1,40 +1,9 @@
-diff -Paur --no-dereference -- m4.upstream/build-aux/config.sub m4/build-aux/config.sub
---- m4.upstream/build-aux/config.sub
-+++ m4/build-aux/config.sub
-@@ -1305,7 +1305,7 @@
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* | -aros* \
-+	      | -aos* | -aros* | -sortix* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-diff -Paur --no-dereference -- m4.upstream/lib/fcntl.c m4/lib/fcntl.c
---- m4.upstream/lib/fcntl.c
-+++ m4/lib/fcntl.c
-@@ -178,7 +178,7 @@
-         result = dupfd (fd, target, 0);
-         break;
-       }
--#elif FCNTL_DUPFD_BUGGY || REPLACE_FCHDIR
-+#elif (FCNTL_DUPFD_BUGGY || REPLACE_FCHDIR) && !defined(__sortix__)
-     case F_DUPFD:
-       {
-         int target = va_arg (arg, int);
 diff -Paur --no-dereference -- m4.upstream/lib/freadahead.c m4/lib/freadahead.c
 --- m4.upstream/lib/freadahead.c
 +++ m4/lib/freadahead.c
-@@ -1,5 +1,5 @@
- /* Retrieve information about a FILE stream.
--   Copyright (C) 2007-2011 Free Software Foundation, Inc.
-+   Copyright (C) 2007-2012 Free Software Foundation, Inc.
- 
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -22,6 +22,10 @@
- #include <stdlib.h>
- #include "stdio-impl.h"
+@@ -30,6 +30,10 @@
+ /* This file is not used on systems that have the __freadahead function,
+    namely musl libc.  */
  
 +#if defined(__sortix__)
 +#include <FILE.h>
@@ -43,25 +12,10 @@ diff -Paur --no-dereference -- m4.upstream/lib/freadahead.c m4/lib/freadahead.c
  size_t
  freadahead (FILE *fp)
  {
-@@ -48,6 +52,10 @@
-   /* equivalent to
-      (fp->_ungetc_count == 0 ? fp->_rcount : fp->_ungetc_count - fp->_rcount) */
-   return (fp->_rcount > 0 ? fp->_rcount : fp->_ungetc_count - fp->_rcount);
-+#elif defined __minix               /* Minix */
-+  if ((fp_->_flags & _IOWRITING) != 0)
-+    return 0;
-+  return fp_->_count;
- #elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
-   if ((fp_->_flag & _IOWRT) != 0)
+@@ -94,6 +98,10 @@
+   if (fp->state == 4 /* WR */ || fp->rp >= fp->wp)
      return 0;
-@@ -76,6 +84,14 @@
-   return (fp->__pushed_back
-           ? fp->__get_limit - fp->__pushback_bufp + 1
-           : fp->__get_limit - fp->__bufp);
-+#elif defined EPLAN9                /* Plan9 */
-+  if (fp->state == 4 /* WR */ || fp->rp >= fp->wp)
-+    return 0;
-+  return fp->wp - fp->rp;
+   return fp->wp - fp->rp;
 +#elif defined __sortix__
 +  if ( !(fp->flags & _FILE_LAST_READ) )
 +    return 0;
@@ -69,122 +23,6 @@ diff -Paur --no-dereference -- m4.upstream/lib/freadahead.c m4/lib/freadahead.c
  #elif defined SLOW_BUT_NO_HACKS     /* users can define this */
    abort ();
    return 0;
-diff -Paur --no-dereference -- m4.upstream/lib/fseeko.c m4/lib/fseeko.c
---- m4.upstream/lib/fseeko.c
-+++ m4/lib/fseeko.c
-@@ -1,5 +1,5 @@
- /* An fseeko() function that, together with fflush(), is POSIX compliant.
--   Copyright (C) 2007-2011 Free Software Foundation, Inc.
-+   Copyright (C) 2007-2012 Free Software Foundation, Inc.
- 
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-@@ -12,8 +12,7 @@
-    GNU General Public License for more details.
- 
-    You should have received a copy of the GNU General Public License along
--   with this program; if not, write to the Free Software Foundation,
--   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
-+   with this program; if not, see <http://www.gnu.org/licenses/>.  */
- 
- #include <config.h>
- 
-@@ -32,6 +31,14 @@
- # undef fseek
- # define fseeko fseek
- #endif
-+#if _GL_WINDOWS_64_BIT_OFF_T
-+# undef fseeko
-+# if HAVE__FSEEKI64 /* msvc, mingw64 */
-+#  define fseeko _fseeki64
-+# else /* mingw */
-+#  define fseeko fseeko64
-+# endif
-+#endif
- {
- #if LSEEK_PIPE_BROKEN
-   /* mingw gives bogus answers rather than failure on non-seekable files.  */
-@@ -69,6 +76,9 @@
-       && fp->_rcount == 0
-       && fp->_wcount == 0
-       && fp->_ungetc_count == 0)
-+#elif defined __minix               /* Minix */
-+  if (fp_->_ptr == fp_->_buf
-+      && (fp_->_ptr == NULL || fp_->_count == 0))
- #elif defined _IOERR                /* AIX, HP-UX, IRIX, OSF/1, Solaris, OpenServer, mingw, NonStop Kernel */
-   if (fp_->_ptr == fp_->_base
-       && (fp_->_ptr == NULL || fp_->_cnt == 0))
-@@ -86,18 +96,19 @@
-       && fp->__get_limit == fp->__bufp
-       && fp->__put_limit == fp->__bufp
-       && !fp->__pushed_back)
-+#elif defined EPLAN9                /* Plan9 */
-+  if (fp->rp == fp->buf
-+      && fp->wp == fp->buf)
-+#elif defined __sortix__
-+  if (0) /* wtf is this shit - sortix handles fseeko just fine. */
- #else
-   #error "Please port gnulib fseeko.c to your platform! Look at the code in fpurge.c, then report this to bug-gnulib."
- #endif
-     {
--      /* We get here when an fflush() call immediately preceded this one.  We
--         know there are no buffers.
--         POSIX requires us to modify the file descriptor's position.
--         But we cannot position beyond end of file here.  */
--      off_t pos =
--        lseek (fileno (fp),
--               whence == SEEK_END && offset > 0 ? 0 : offset,
--               whence);
-+      /* We get here when an fflush() call immediately preceded this one (or
-+         if ftell() has created buffers but no I/O has occurred on a
-+         newly-opened stream).  We know there are no buffers.  */
-+      off_t pos = lseek (fileno (fp), offset, whence);
-       if (pos == -1)
-         {
- #if defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
-@@ -108,6 +119,7 @@
- 
- #if defined _IO_ftrylockfile || __GNU_LIBRARY__ == 1 /* GNU libc, BeOS, Haiku, Linux libc5 */
-       fp->_flags &= ~_IO_EOF_SEEN;
-+      fp->_offset = pos;
- #elif defined __sferror || defined __DragonFly__ /* FreeBSD, NetBSD, OpenBSD, DragonFly, MacOS X, Cygwin */
- # if defined __CYGWIN__
-       /* fp_->_offset is typed as an integer.  */
-@@ -137,10 +149,7 @@
-       fp->__offset = pos;
-       fp->__eof = 0;
- #endif
--      /* If we were not requested to position beyond end of file, we're
--         done.  */
--      if (!(whence == SEEK_END && offset > 0))
--        return 0;
-+      return 0;
-     }
-   return fseeko (fp, offset, whence);
- }
-diff -Paur --no-dereference -- m4.upstream/lib/sigaction.c m4/lib/sigaction.c
---- m4.upstream/lib/sigaction.c
-+++ m4/lib/sigaction.c
-@@ -19,6 +19,7 @@
- 
- /* Specification.  */
- #include <signal.h>
-+#define NSIG SIG_MAX_NUM
- 
- #include <errno.h>
- #include <stdint.h>
-@@ -51,9 +52,11 @@
-    with this module should stick with only sigaction().  */
- 
- /* Check some of our assumptions.  */
-+#if !defined(__sortix__)
- #if defined SIGCHLD || defined HAVE_SIGALTSTACK || defined HAVE_SIGINTERRUPT
- # error "Revisit the assumptions made in the sigaction module"
- #endif
-+#endif
- 
- /* Out-of-range substitutes make a good fallback for uncatchable
-    signals.  */
 diff -Paur --no-dereference -- m4.upstream/lib/spawn_faction_addclose.c m4/lib/spawn_faction_addclose.c
 --- m4.upstream/lib/spawn_faction_addclose.c
 +++ m4/lib/spawn_faction_addclose.c
@@ -216,8 +54,8 @@ diff -Paur --no-dereference -- m4.upstream/lib/spawn_faction_adddup2.c m4/lib/sp
 diff -Paur --no-dereference -- m4.upstream/lib/spawn_faction_addopen.c m4/lib/spawn_faction_addopen.c
 --- m4.upstream/lib/spawn_faction_addopen.c
 +++ m4/lib/spawn_faction_addopen.c
-@@ -22,7 +22,9 @@
- #include <errno.h>
+@@ -24,7 +24,9 @@
+ #include <string.h>
  #include <unistd.h>
  
 -#if !_LIBC
@@ -230,7 +68,7 @@ diff -Paur --no-dereference -- m4.upstream/lib/spawn_faction_addopen.c m4/lib/sp
 diff -Paur --no-dereference -- m4.upstream/lib/spawni.c m4/lib/spawni.c
 --- m4.upstream/lib/spawni.c
 +++ m4/lib/spawni.c
-@@ -223,16 +223,20 @@
+@@ -808,16 +808,20 @@
      }
  #endif
  
@@ -251,20 +89,3 @@ diff -Paur --no-dereference -- m4.upstream/lib/spawni.c m4/lib/spawni.c
  
    /* Execute the file actions.  */
    if (file_actions != NULL)
-diff -Paur --no-dereference -- m4.upstream/lib/stdio.in.h m4/lib/stdio.in.h
---- m4.upstream/lib/stdio.in.h
-+++ m4/lib/stdio.in.h
-@@ -158,11 +158,13 @@
-                  "use gnulib module fflush for portable POSIX compliance");
- #endif
- 
-+#if !defined(__sortix__)
- /* It is very rare that the developer ever has full control of stdin,
-    so any use of gets warrants an unconditional warning.  Assume it is
-    always declared, since it is required by C89.  */
- #undef gets
- _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
-+#endif
- 
- #if @GNULIB_FOPEN@
- # if @REPLACE_FOPEN@

ports/m4/m4.port

@@ -1,11 +1,12 @@
 NAME=m4
 BUILD_LIBRARIES='libiconv? libintl?'
-VERSION=1.4.16
+VERSION=1.4.19
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=d5b5d51cf8f5b18f3bac39bc2f6b1e61f34d400136ae1a87d075e26a38028d5d
+SHA256SUM=63aede5c6d33b6d9b13511cd0be2cac046f2e70fd0a07aa9573a04a82783af96
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/m4
 UPSTREAM_ARCHIVE=$ARCHIVE
 BUILD_SYSTEM=configure
-CONFIGURE_VARS='gt_cv_locale_fr=false gt_cv_locale_ja=false gt_cv_locale_fr_utf8=false gt_cv_locale_ja_utf8=false gt_cv_locale_tr_utf8=false gt_cv_locale_zh_CN=false'
+LICENSE=GPL-3.0-or-later
+MAKE_VARS=V=1

ports/make/make.patch

@@ -1,40 +1,28 @@
-diff -Paur --no-dereference -- make.upstream/config/config.sub make/config/config.sub
---- make.upstream/config/config.sub
-+++ make/config/config.sub
-@@ -1356,7 +1356,7 @@
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* | -aros* \
-+	      | -aos* | -aros* | -sortix* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-diff -Paur --no-dereference -- make.upstream/dir.c make/dir.c
---- make.upstream/dir.c
-+++ make/dir.c
-@@ -19,6 +19,8 @@
- #include "filedef.h"
+diff -Paur --no-dereference -- make.upstream/src/dir.c make/src/dir.c
+--- make.upstream/src/dir.c
++++ make/src/dir.c
+@@ -20,6 +20,8 @@
  #include "dep.h"
+ #include "debug.h"
  
 +#include <stddef.h>
 +
  #ifdef  HAVE_DIRENT_H
  # include <dirent.h>
  # define NAMLEN(dirent) strlen((dirent)->d_name)
-@@ -1142,7 +1144,7 @@
+@@ -1253,7 +1255,7 @@
            /* The glob interface wants a 'struct dirent', so mock one up.  */
            struct dirent *d;
-           unsigned int len = df->length + 1;
--          unsigned int sz = sizeof (*d) - sizeof (d->d_name) + len;
-+          unsigned int sz = offsetof(struct dirent, d_name) + len;
+           size_t len = df->length + 1;
+-          size_t sz = sizeof (*d) - sizeof (d->d_name) + len;
++          size_t sz = offsetof(struct dirent, d_name) + len;
            if (sz > bufsz)
              {
                bufsz *= 2;
-diff -Paur --no-dereference -- make.upstream/function.c make/function.c
---- make.upstream/function.c
-+++ make/function.c
-@@ -2095,27 +2095,23 @@
+diff -Paur --no-dereference -- make.upstream/src/function.c make/src/function.c
+--- make.upstream/src/function.c
++++ make/src/function.c
+@@ -2279,36 +2279,23 @@
            char *rp;
            struct stat st;
            PATH_VAR (in);
@@ -45,6 +33,15 @@ diff -Paur --no-dereference -- make.upstream/function.c make/function.c
  
 -#ifdef HAVE_REALPATH
 -          ENULLLOOP (rp, realpath (in, out));
+-# if defined _AIX
+-          /* AIX realpath() doesn't remove trailing slashes correctly.  */
+-          if (rp)
+-            {
+-              char *ep = rp + strlen (rp) - 1;
+-              while (ep > rp && ep[0] == '/')
+-                *(ep--) = '\0';
+-            }
+-# endif
 -#else
 -          rp = abspath (in, out);
 -#endif
@@ -66,40 +63,25 @@ diff -Paur --no-dereference -- make.upstream/function.c make/function.c
              }
          }
      }
-diff -Paur --no-dereference -- make.upstream/getloadavg.c make/getloadavg.c
---- make.upstream/getloadavg.c
-+++ make/getloadavg.c
-@@ -78,9 +78,11 @@
- /* Both the Emacs and non-Emacs sections want this.  Some
-    configuration files' definitions for the LOAD_AVE_CVT macro (like
-    sparc.h's) use macros like FSCALE, defined here.  */
-+#ifdef HAVE_SYS_PARAM_H
- #if defined (unix) || defined (__unix)
- # include <sys/param.h>
+diff -Paur --no-dereference -- make.upstream/src/job.c make/src/job.c
+--- make.upstream/src/job.c
++++ make/src/job.c
+@@ -74,6 +74,11 @@
+ # define VMS_POSIX_EXIT_MASK (C_FACILITY_NO | 0xA000)
  #endif
-+#endif
- 
- 
- /* Exclude all the code except the test program at the end
-diff -Paur --no-dereference -- make.upstream/job.c make/job.c
---- make.upstream/job.c
-+++ make/job.c
-@@ -67,6 +67,11 @@
- char default_shell[] = "";
- int batch_mode_shell = 0;
  
 +#elif defined (__sortix__)
 +
-+char default_shell[] = "sh";
++char const *default_shell = "sh";
 +int batch_mode_shell = 0;
 +
  #else
  
- char default_shell[] = "/bin/sh";
-diff -Paur --no-dereference -- make.upstream/main.c make/main.c
---- make.upstream/main.c
-+++ make/main.c
-@@ -2393,9 +2393,9 @@
+ const char *default_shell = "/bin/sh";
+diff -Paur --no-dereference -- make.upstream/src/main.c make/src/main.c
+--- make.upstream/src/main.c
++++ make/src/main.c
+@@ -2768,9 +2768,9 @@
            if (restarts)
              {
                char *b = alloca (40);
@@ -111,10 +93,10 @@ diff -Paur --no-dereference -- make.upstream/main.c make/main.c
              }
  
            fflush (stdout);
-diff -Paur --no-dereference -- make.upstream/misc.c make/misc.c
---- make.upstream/misc.c
-+++ make/misc.c
-@@ -710,6 +710,9 @@
+diff -Paur --no-dereference -- make.upstream/src/misc.c make/src/misc.c
+--- make.upstream/src/misc.c
++++ make/src/misc.c
+@@ -877,6 +877,9 @@
  unsigned int
  get_path_max (void)
  {
@@ -124,46 +106,46 @@ diff -Paur --no-dereference -- make.upstream/misc.c make/misc.c
    static unsigned int value;
  
    if (value == 0)
-@@ -722,5 +725,6 @@
+@@ -889,6 +892,7 @@
      }
  
    return value;
 +#endif
  }
  #endif
-diff -Paur --no-dereference -- make.upstream/output.c make/output.c
---- make.upstream/output.c
-+++ make/output.c
-@@ -278,6 +278,10 @@
- static void *
- acquire_semaphore (void)
- {
-+#if defined(__sortix__)
-+  static int foo;
-+  return &foo;
-+#else
-   static struct flock fl;
  
-   fl.l_type = F_WRLCK;
-@@ -288,16 +292,21 @@
-     return &fl;
-   perror ("fcntl()");
-   return NULL;
+diff -Paur --no-dereference -- make.upstream/src/posixos.c make/src/posixos.c
+--- make.upstream/src/posixos.c
++++ make/src/posixos.c
+@@ -722,6 +722,7 @@
+ {
+   if (osync_enabled())
+     {
++#ifdef F_SETLKW
+       struct flock fl;
+ 
+       fl.l_type = F_WRLCK;
+@@ -734,6 +735,7 @@
+           perror ("fcntl()");
+           return 0;
+         }
 +#endif
+     }
+ 
+   return 1;
+@@ -744,6 +746,7 @@
+ {
+   if (osync_enabled())
+     {
++#ifdef F_SETLKW
+       struct flock fl;
+ 
+       fl.l_type = F_UNLCK;
+@@ -753,6 +756,7 @@
+       /* We don't want to keep waiting on EINTR.  */
+       if (fcntl (osync_handle, F_SETLKW, &fl) == -1)
+         perror ("fcntl()");
++#endif
+     }
  }
  
- /* Release the lock for writing output.  */
- static void
- release_semaphore (void *sem)
- {
-+#if defined(__sortix__)
-+  (void) sem;
-+#else
-   struct flock *flp = (struct flock *)sem;
-   flp->l_type = F_UNLCK;
-   if (fcntl (sync_handle, F_SETLKW, flp) == -1)
-     perror ("fcntl()");
-+#endif
- }
- 
- /* Returns a file descriptor to a temporary file.  The file is automatically

ports/make/make.port

@@ -1,11 +1,12 @@
 NAME=make
 BUILD_LIBRARIES='libiconv? libintl?'
-VERSION=4.0
+VERSION=4.4.1
 DISTNAME=$NAME-$VERSION
-COMPRESSION=tar.bz2
+COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=e60686c7afede62cc8c86ad3012cf081ea4887daf9d223ce7115703b2bb2dbdb
+SHA256SUM=dd16fb1d67bfab79a72f5e8390735c49e3e8e70b4945a15ab1f81ddb78658fb3
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/make
 UPSTREAM_ARCHIVE=$ARCHIVE
 BUILD_SYSTEM=configure
+LICENSE=GPL-3.0-or-later
 POST_INSTALL=../make.post-install

ports/nano/nano.patch

@@ -1,18 +1,19 @@
 diff -Paur --no-dereference -- nano.upstream/configure nano/configure
 --- nano.upstream/configure
 +++ nano/configure
-@@ -43510,6 +43510,7 @@
+@@ -41989,6 +41989,8 @@
    # Extract the first word of "${ac_tool_prefix}ncursesw5-config", so it can be a program name with args.
  set dummy ${ac_tool_prefix}ncursesw5-config; ac_word=$2
- { printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++# PATCH: pkg-config must be used instead of the cross unsafe ncursesw5-config.
 +ac_cv_prog_NCURSESW_CONFIG=false
- printf %s "checking for $ac_word... " >&6; }
- if test ${ac_cv_prog_NCURSESW_CONFIG+y}
- then :
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if ${ac_cv_prog_NCURSESW_CONFIG+:} false; then :
+   $as_echo_n "(cached) " >&6
 diff -Paur --no-dereference -- nano.upstream/src/files.c nano/src/files.c
 --- nano.upstream/src/files.c
 +++ nano/src/files.c
-@@ -1422,8 +1422,10 @@
+@@ -1455,8 +1455,10 @@
  	if (env_dir != NULL)
  		tempdir = check_writable_directory(env_dir);
  
@@ -35,7 +36,7 @@ diff -Paur --no-dereference -- nano.upstream/src/nano.c nano/src/nano.c
  	} else
  		plainname = copy_of(filename);
  
-@@ -2076,8 +2076,7 @@
+@@ -2105,8 +2105,7 @@
  	}
  
  	/* Curses needs TERM; if it is unset, try falling back to a VT220. */
@@ -48,7 +49,7 @@ diff -Paur --no-dereference -- nano.upstream/src/nano.c nano/src/nano.c
 diff -Paur --no-dereference -- nano.upstream/src/rcfile.c nano/src/rcfile.c
 --- nano.upstream/src/rcfile.c
 +++ nano/src/rcfile.c
-@@ -577,6 +577,11 @@
+@@ -575,6 +575,11 @@
   * null-terminate it, and return a pointer to the succeeding text. */
  char *parse_next_regex(char *ptr)
  {
@@ -60,7 +61,7 @@ diff -Paur --no-dereference -- nano.upstream/src/rcfile.c nano/src/rcfile.c
  	char *starting_point = ptr;
  
  	if (*(ptr - 1) != '"') {
-@@ -584,11 +589,28 @@
+@@ -582,11 +587,28 @@
  		return NULL;
  	}
  
@@ -93,7 +94,7 @@ diff -Paur --no-dereference -- nano.upstream/src/rcfile.c nano/src/rcfile.c
  
  	if (*ptr == '\0') {
  		jot_error(N_("Regex strings must begin and end with a \" character"));
-@@ -601,7 +623,8 @@
+@@ -599,7 +621,8 @@
  	}
  
  	/* Null-terminate the regex and skip until the next non-blank. */

ports/nano/nano.port

@@ -1,10 +1,10 @@
 NAME=nano
 BUILD_LIBRARIES='libiconv? libintl? libcurses libmagic? libz?'
-VERSION=6.3
+VERSION=7.2
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=eb532da4985672730b500f685dbaab885a466d08fbbf7415832b95805e6f8687
+SHA256SUM=86f3442768bd2873cec693f83cdf80b4b444ad3cc14760b74361474fc87a4526
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/nano
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE=GPL-3.0-or-later

ports/nasm/nasm.patch

@@ -1,31 +1,45 @@
-diff -Paur --no-dereference -- nasm.upstream/Makefile.in nasm/Makefile.in
---- nasm.upstream/Makefile.in
-+++ nasm/Makefile.in
-@@ -201,12 +201,12 @@
- manpages: nasm.1 ndisasm.1
+diff -Paur --no-dereference -- nasm.upstream/doc/Makefile nasm/doc/Makefile
+--- nasm.upstream/doc/Makefile
++++ nasm/doc/Makefile
+@@ -7,8 +7,8 @@
+ top_srcdir	= ..
+ srcdir		= .
  
- install: nasm$(X) ndisasm$(X)
--	$(MKDIR) -p $(INSTALLROOT)$(bindir)
--	$(INSTALL_PROGRAM) nasm$(X) $(INSTALLROOT)$(bindir)/nasm$(X)
--	$(INSTALL_PROGRAM) ndisasm$(X) $(INSTALLROOT)$(bindir)/ndisasm$(X)
--	$(MKDIR) -p $(INSTALLROOT)$(mandir)/man1
--	$(INSTALL_DATA) $(srcdir)/nasm.1 $(INSTALLROOT)$(mandir)/man1/nasm.1
--	$(INSTALL_DATA) $(srcdir)/ndisasm.1 $(INSTALLROOT)$(mandir)/man1/ndisasm.1
-+	$(MKDIR) -p $(DESTDIR)$(bindir)
-+	$(INSTALL_PROGRAM) nasm$(X) $(DESTDIR)$(bindir)/nasm$(X)
-+	$(INSTALL_PROGRAM) ndisasm$(X) $(DESTDIR)$(bindir)/ndisasm$(X)
-+	$(MKDIR) -p $(DESTDIR)$(mandir)/man1
-+	$(INSTALL_DATA) $(srcdir)/nasm.1 $(DESTDIR)$(mandir)/man1/nasm.1
-+	$(INSTALL_DATA) $(srcdir)/ndisasm.1 $(DESTDIR)$(mandir)/man1/ndisasm.1
+-prefix		= /usr/local
+-exec_prefix	= ${prefix}
++prefix		= 
++exec_prefix	= 
+ bindir		= ${exec_prefix}/bin
+ mandir		= ${datarootdir}/man
+ docdir		= ${datarootdir}/doc/${PACKAGE}
+@@ -16,7 +16,7 @@
+ infodir		= ${datarootdir}/info
+ datarootdir	= ${prefix}/share
  
- clean:
- 	$(RM) -f *.$(O) *.s *.i
-@@ -218,7 +218,7 @@
+-INSTALL		= /bin/install -c
++INSTALL		= /usr/bin/install -c
+ INSTALL_PROGRAM	= ${INSTALL}
+ INSTALL_DATA	= ${INSTALL} -m 644
  
- distclean: clean
- 	$(RM) -f config.h config.log config.status
--	$(RM) -f Makefile *~ *.bak *.lst *.bin
-+	$(RM) -f Makefile doc/Makefile *~ *.bak *.lst *.bin
- 	$(RM) -f output/*~ output/*.bak
- 	$(RM) -f test/*.lst test/*.bin test/*.$(O) test/*.bin
- 	$(RM) -rf autom4te*.cache
+@@ -24,7 +24,7 @@
+ 
+ PDFOPT		= 
+ 
+-MKDIR_P		= /bin/mkdir -p
++MKDIR_P		= /usr/bin/mkdir -p
+ RM_F		= rm -f
+ RM_RF		= rm -rf
+ CP_F		= cp -f
+diff -Paur --no-dereference -- nasm.upstream/include/compiler.h nasm/include/compiler.h
+--- nasm.upstream/include/compiler.h
++++ nasm/include/compiler.h
+@@ -412,4 +412,9 @@
+ # define default case BOGUS_CASE: default
+ #endif
+ 
++/* PATCH: Sortix doesn't have FILENAME_MAX at this time. */
++#if !defined(FILENAME_MAX) && defined(__sortix__)
++#define FILENAME_MAX 256
++#endif
++
+ #endif	/* NASM_COMPILER_H */

ports/nasm/nasm.port

@@ -1,10 +1,10 @@
 NAME=nasm
 BUILD_LIBRARIES=
-VERSION=2.11.02
+VERSION=2.16.01
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=233c574f2c068c0256f9b3653220ceb247c72b671085595259529156c6cfa55d
+SHA256SUM=c77745f4802375efeee2ec5c0ad6b7f037ea9c87c92b149a9637ff099f162558
 UPSTREAM_SITE=https://www.nasm.us/pub/nasm/releasebuilds/$VERSION
 UPSTREAM_ARCHIVE=$ARCHIVE
 BUILD_SYSTEM=configure

ports/nasm/nasm.rmpatch

@@ -1 +0,0 @@
-rm -rf -- 'doc/Makefile'

ports/nginx/nginx.patch

@@ -175,7 +175,7 @@ diff -Paur --no-dereference -- nginx.upstream/auto/options nginx/auto/options
  CC=${CC:-cc}
  CPP=
  NGX_OBJS=objs
-@@ -188,6 +194,8 @@
+@@ -194,6 +200,8 @@
  
          --prefix=)                       NGX_PREFIX="!"             ;;
          --prefix=*)                      NGX_PREFIX="$value"        ;;
@@ -184,7 +184,7 @@ diff -Paur --no-dereference -- nginx.upstream/auto/options nginx/auto/options
          --sbin-path=*)                   NGX_SBIN_PATH="$value"     ;;
          --modules-path=*)                NGX_MODULES_PATH="$value"  ;;
          --conf-path=*)                   NGX_CONF_PATH="$value"     ;;
-@@ -199,9 +207,13 @@
+@@ -205,9 +213,13 @@
  
          --crossbuild=*)                  NGX_PLATFORM="$value"      ;;
  
@@ -199,7 +199,7 @@ diff -Paur --no-dereference -- nginx.upstream/auto/options nginx/auto/options
          --with-select_module)            EVENT_SELECT=YES           ;;
          --without-select_module)         EVENT_SELECT=NONE          ;;
          --with-poll_module)              EVENT_POLL=YES             ;;
-@@ -596,6 +608,12 @@
+@@ -608,6 +620,12 @@
      exit 1
  fi
  
@@ -212,7 +212,7 @@ diff -Paur --no-dereference -- nginx.upstream/auto/options nginx/auto/options
  
  if [ ".$NGX_PLATFORM" = ".win32" ]; then
      NGX_WINE=$WINE
-@@ -606,6 +624,8 @@
+@@ -618,6 +636,8 @@
  NGX_MODULES_PATH=${NGX_MODULES_PATH:-modules}
  NGX_CONF_PATH=${NGX_CONF_PATH:-conf/nginx.conf}
  NGX_CONF_PREFIX=`dirname $NGX_CONF_PATH`
@@ -266,7 +266,7 @@ diff -Paur --no-dereference -- nginx.upstream/auto/types/sizeof nginx/auto/types
 diff -Paur --no-dereference -- nginx.upstream/auto/unix nginx/auto/unix
 --- nginx.upstream/auto/unix
 +++ nginx/auto/unix
-@@ -803,15 +803,15 @@
+@@ -851,15 +851,15 @@
  . auto/feature
  
  
@@ -418,7 +418,7 @@ diff -Paur --no-dereference -- nginx.upstream/configure nginx/configure
  
      echo " + $NGX_SYSTEM $NGX_RELEASE $NGX_MACHINE"
  
-@@ -83,6 +90,7 @@
+@@ -84,6 +91,7 @@
  
  have=NGX_SBIN_PATH value="\"$NGX_SBIN_PATH\"" . auto/define
  have=NGX_CONF_PATH value="\"$NGX_CONF_PATH\"" . auto/define
@@ -520,7 +520,7 @@ diff -Paur --no-dereference -- nginx.upstream/sites-available/default nginx/site
 diff -Paur --no-dereference -- nginx.upstream/src/core/nginx.c nginx/src/core/nginx.c
 --- nginx.upstream/src/core/nginx.c
 +++ nginx/src/core/nginx.c
-@@ -359,7 +359,7 @@
+@@ -360,7 +360,7 @@
  
  #endif
  
@@ -529,7 +529,7 @@ diff -Paur --no-dereference -- nginx.upstream/src/core/nginx.c nginx/src/core/ng
          return 1;
      }
  
-@@ -939,6 +939,7 @@
+@@ -991,6 +991,7 @@
  {
      u_char  *p;
      size_t   len;
@@ -537,7 +537,7 @@ diff -Paur --no-dereference -- nginx.upstream/src/core/nginx.c nginx/src/core/ng
  
      if (ngx_prefix) {
          len = ngx_strlen(ngx_prefix);
-@@ -999,14 +1000,18 @@
+@@ -1051,14 +1052,18 @@
          cycle->conf_file.data = ngx_conf_file;
  
      } else {
@@ -558,7 +558,7 @@ diff -Paur --no-dereference -- nginx.upstream/src/core/nginx.c nginx/src/core/ng
           p > cycle->conf_file.data;
           p--)
      {
-@@ -1088,7 +1093,7 @@
+@@ -1140,7 +1145,7 @@
  {
      ngx_core_conf_t  *ccf = conf;
  
@@ -690,7 +690,7 @@ diff -Paur --no-dereference -- nginx.upstream/src/core/ngx_cycle.h nginx/src/cor
 diff -Paur --no-dereference -- nginx.upstream/src/event/ngx_event.c nginx/src/event/ngx_event.c
 --- nginx.upstream/src/event/ngx_event.c
 +++ nginx/src/event/ngx_event.c
-@@ -681,7 +681,8 @@
+@@ -699,7 +699,8 @@
  
      if (ngx_timer_resolution && !(ngx_event_flags & NGX_USE_TIMER_EVENT)) {
          struct sigaction  sa;
@@ -700,7 +700,7 @@ diff -Paur --no-dereference -- nginx.upstream/src/event/ngx_event.c nginx/src/ev
  
          ngx_memzero(&sa, sizeof(struct sigaction));
          sa.sa_handler = ngx_timer_signal_handler;
-@@ -693,15 +694,16 @@
+@@ -711,15 +712,16 @@
              return NGX_ERROR;
          }
  
@@ -723,7 +723,7 @@ diff -Paur --no-dereference -- nginx.upstream/src/event/ngx_event.c nginx/src/ev
      }
  
      if (ngx_event_flags & NGX_USE_FD_EVENT) {
-@@ -713,6 +715,11 @@
+@@ -731,6 +733,11 @@
              return NGX_ERROR;
          }
  

ports/nginx/nginx.port

@@ -1,10 +1,10 @@
 NAME=nginx
 BUILD_LIBRARIES='libpcre libssl'
-VERSION=1.23.3
+VERSION=1.25.3
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=75cb5787dbb9fae18b14810f91cc4343f64ce4c24e27302136fb52498042ba54
+SHA256SUM=64c5b975ca287939e828303fa857d22f142b251f17808dfe41733512d9cded86
 UPSTREAM_SITE=https://nginx.org/download/
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE=BSD-2-Clause

ports/patch/patch.patch

@@ -1,15 +1,3 @@
-diff -Paur --no-dereference -- patch.upstream/build-aux/config.sub patch/build-aux/config.sub
---- patch.upstream/build-aux/config.sub
-+++ patch/build-aux/config.sub
-@@ -1373,7 +1373,7 @@
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* | -aros* | -cloudabi* \
-+	      | -aos* | -aros* | -cloudabi* | -sortix* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
 diff -Paur --no-dereference -- patch.upstream/configure patch/configure
 --- patch.upstream/configure
 +++ patch/configure
@@ -135,7 +123,7 @@ diff -Paur --no-dereference -- patch.upstream/configure patch/configure
 +export gl_cv_func_getcwd_null=yes # Only if the OS actually supports this, Sortix does.
 +export gl_cv_struct_dirent_d_ino=yes # Only if the OS actually supports this, Sortix does.
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.69 for GNU patch 2.7.5.
+ # Generated by GNU Autoconf 2.69 for GNU patch 2.7.6.
  #
 diff -Paur --no-dereference -- patch.upstream/lib/getgroups.c patch/lib/getgroups.c
 --- patch.upstream/lib/getgroups.c
@@ -152,7 +140,7 @@ diff -Paur --no-dereference -- patch.upstream/lib/getgroups.c patch/lib/getgroup
 diff -Paur --no-dereference -- patch.upstream/src/safe.c patch/src/safe.c
 --- patch.upstream/src/safe.c
 +++ patch/src/safe.c
-@@ -97,6 +97,8 @@
+@@ -101,6 +101,8 @@
    max_cached_fds = 8;
    if (getrlimit (RLIMIT_NOFILE, &nofile) == 0)
      max_cached_fds = MAX (nofile.rlim_cur / 4, max_cached_fds);
@@ -161,7 +149,7 @@ diff -Paur --no-dereference -- patch.upstream/src/safe.c patch/src/safe.c
  
    cached_dirfds = hash_initialize (max_cached_fds,
  				   NULL,
-@@ -225,7 +227,8 @@
+@@ -229,7 +231,8 @@
  
    /* Actually get the new directory file descriptor. Don't follow
       symbolic links. */

ports/patch/patch.port

@@ -1,11 +1,12 @@
 NAME=patch
 BUILD_LIBRARIES=
-VERSION=2.7.5
+VERSION=2.7.6
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=fd95153655d6b95567e623843a0e77b81612d502ecf78a489a4aed7867caa299
+SHA256SUM=ac610bda97abe0d9f6b7c963255a11dcb196c25e337c61f94e4778d632f1d8fd
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/patch
 UPSTREAM_ARCHIVE=$ARCHIVE
 BUILD_SYSTEM=configure
+LICENSE=GPL-3.0-or-later
 MAKE_VARS='V=1'

ports/sed/sed.patch

@@ -1,12 +0,0 @@
-diff -Paur --no-dereference -- sed.upstream/build-aux/config.sub sed/build-aux/config.sub
---- sed.upstream/build-aux/config.sub
-+++ sed/build-aux/config.sub
-@@ -1264,7 +1264,7 @@
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- 	      | -kopensolaris* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* | -aros* \
-+	      | -aos* | -aros* | -sortix* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \

ports/sed/sed.port

@@ -1,11 +1,11 @@
 NAME=sed
 BUILD_LIBRARIES='libiconv?'
-VERSION=4.2
+VERSION=4.9
 DISTNAME=$NAME-$VERSION
-COMPRESSION=tar.bz2
+COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=ee7755e3ab038e7deecebdf44fd43ad65a96890962c3b44206cce672368b45c8
+SHA256SUM=6e226b732e1cd739464ad6862bd1a1aba42d7982922da7a53519631d24975181
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/sed
 UPSTREAM_ARCHIVE=$ARCHIVE
 BUILD_SYSTEM=configure
-CONFIGURE_VARS='gt_cv_locale_fr=false gt_cv_locale_ja=false gt_cv_locale_fr_utf8=false gt_cv_locale_ja_utf8=false gt_cv_locale_tr_utf8=false gt_cv_locale_zh_CN=false'
+LICENSE=GPL-3.0-or-later

ports/sed/sed.rmpatch

@@ -1 +0,0 @@
-rm -rf -- 'bootstrap.sh'

ports/signify/signify.port

@@ -7,5 +7,6 @@ ARCHIVE=$DISTNAME.$COMPRESSION
 SHA256SUM=0b423119a27a69d417bb67cd38ccfb03d2a7387706911ee04e5d3c3f50e3619b
 UPSTREAM_SITE=https://pub.sortix.org/fork/signify
 UPSTREAM_ARCHIVE=$ARCHIVE
+LICENSE=ISC
 BUILD_SYSTEM=makefile
 VERSION_REGEX='([0-9]{4}-[0-9]{2}-[0-9]{2})'

ports/ssh/ssh.port

@@ -1,10 +1,10 @@
 NAME=ssh
 BUILD_LIBRARIES='libz libssl'
-VERSION=9.3p1
+VERSION=9.6p1
 DISTNAME=openssh-$VERSION
 COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=e9baba7701a76a51f3d85a62c383a3c9dcd97fa900b859bc7db114c1868af8a8
+SHA256SUM=910211c07255a8c5ad654391b40ee59800710dd8119dd5362de09385aa7a777c
 UPSTREAM_SITE=https://ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable
 UPSTREAM_ARCHIVE=$ARCHIVE
 LICENSE='SSH-OpenSSH AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MIT'

ports/tar/tar.patch

@@ -1,15 +1,3 @@
-diff -Paur --no-dereference -- tar.upstream/build-aux/config.sub tar/build-aux/config.sub
---- tar.upstream/build-aux/config.sub
-+++ tar/build-aux/config.sub
-@@ -1356,7 +1356,7 @@
- 	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \
- 	      | -sym* | -kopensolaris* | -plan9* \
- 	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
--	      | -aos* | -aros* \
-+	      | -aos* | -aros* | -sortix* \
- 	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
- 	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
- 	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
 diff -Paur --no-dereference -- tar.upstream/configure tar/configure
 --- tar.upstream/configure
 +++ tar/configure
@@ -135,26 +123,37 @@ diff -Paur --no-dereference -- tar.upstream/configure tar/configure
 +export gl_cv_func_getcwd_null=yes # Only if the OS actually supports this, Sortix does.
 +export gl_cv_struct_dirent_d_ino=yes # Only if the OS actually supports this, Sortix does.
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.69 for GNU tar 1.28.
+ # Generated by GNU Autoconf 2.71 for GNU tar 1.35.
  #
 diff -Paur --no-dereference -- tar.upstream/gnu/getgroups.c tar/gnu/getgroups.c
 --- tar.upstream/gnu/getgroups.c
 +++ tar/gnu/getgroups.c
-@@ -32,7 +32,7 @@
+@@ -30,7 +30,7 @@
  /* Provide a stub that fails with ENOSYS, since there is no group
     information available on mingw.  */
  int
--getgroups (int n _GL_UNUSED, GETGROUPS_T *groups _GL_UNUSED)
-+getgroups (int n _GL_UNUSED, gid_t *groups _GL_UNUSED)
+-getgroups (_GL_UNUSED int n, _GL_UNUSED GETGROUPS_T *groups)
++getgroups (_GL_UNUSED int n, _GL_UNUSED gid_t *groups)
  {
    errno = ENOSYS;
    return -1;
 diff -Paur --no-dereference -- tar.upstream/lib/rtapelib.c tar/lib/rtapelib.c
 --- tar.upstream/lib/rtapelib.c
 +++ tar/lib/rtapelib.c
-@@ -424,8 +424,10 @@
- 	}
-   }
+@@ -367,8 +367,10 @@
+ 
+   if (!pw)
+     return "getpwuid";
++#if !defined(__sortix__) || defined(__SORTIX_HAS_INITGROUPS__)
+   if (initgroups (pw->pw_name, gid) != 0 && errno != EPERM)
+     return "initgroups";
++#endif
+   if (gid != getegid () && setgid (gid) != 0 && errno != EPERM)
+     return "setgid";
+   if (uid != geteuid () && setuid (uid) != 0 && errno != EPERM)
+@@ -452,8 +454,10 @@
+ 
+   assume (remote_file);
  
 +#if !defined(__sortix__)
    /* FIXME: Should somewhat validate the decoding, here.  */
@@ -163,28 +162,10 @@ diff -Paur --no-dereference -- tar.upstream/lib/rtapelib.c tar/lib/rtapelib.c
      error (EXIT_ON_EXEC_ERROR, 0, _("Cannot connect to %s: resolve failed"),
  	   remote_host);
  
-diff -Paur --no-dereference -- tar.upstream/lib/xattr-at.c tar/lib/xattr-at.c
---- tar.upstream/lib/xattr-at.c
-+++ tar/lib/xattr-at.c
-@@ -31,6 +31,8 @@
- 
- #include "openat-priv.h"
- 
-+#if defined(HAVE_XATTRS) && !(defined(__sortix__) && __has_include(<sys/xattr.h>))
-+
- /* setxattrat */
- #define AT_FUNC_NAME setxattrat
- #define AT_FUNC_F1 setxattr
-@@ -108,3 +110,5 @@
- #undef AT_FUNC_RESULT
- #undef AT_FUNC_POST_FILE_PARAM_DECLS
- #undef AT_FUNC_POST_FILE_ARGS
-+
-+#endif
 diff -Paur --no-dereference -- tar.upstream/lib/xattr-at.h tar/lib/xattr-at.h
 --- tar.upstream/lib/xattr-at.h
 +++ tar/lib/xattr-at.h
-@@ -30,6 +30,7 @@
+@@ -31,6 +31,7 @@
  # define ENOATTR ENODATA        /* No such attribute */
  #endif
  
@@ -192,10 +173,52 @@ diff -Paur --no-dereference -- tar.upstream/lib/xattr-at.h tar/lib/xattr-at.h
  /* These are the dir-fd-relative variants of the functions without the
     "at" suffix.  For example, setxattrat (AT_FDCWD, path, name, value, size,
     flags &c) is usually equivalent to setxattr (file, name, value, size,
-@@ -70,5 +71,6 @@
+@@ -71,5 +72,6 @@
     except when DIR_FD and FILE specify a symlink:  llistxattr operates on the
     symlink, while the listxattrat operates on the referent of the symlink.  */
  ssize_t llistxattrat (int dir_fd, const char *path, char *list, size_t size);
 +#endif
  
  #endif /* XATTRS_AT_H */
+diff -Paur --no-dereference -- tar.upstream/src/Makefile.in tar/src/Makefile.in
+--- tar.upstream/src/Makefile.in
++++ tar/src/Makefile.in
+@@ -1263,7 +1263,7 @@
+ LIBOBJS = @LIBOBJS@
+ LIBPMULTITHREAD = @LIBPMULTITHREAD@
+ LIBPTHREAD = @LIBPTHREAD@
+-LIBS = @LIBS@
++LIBS = @LIBS@ @INTLLIBS@
+ LIBUNISTRING_UNICASE_H = @LIBUNISTRING_UNICASE_H@
+ LIBUNISTRING_UNICTYPE_H = @LIBUNISTRING_UNICTYPE_H@
+ LIBUNISTRING_UNINORM_H = @LIBUNISTRING_UNINORM_H@
+diff -Paur --no-dereference -- tar.upstream/src/checkpoint.c tar/src/checkpoint.c
+--- tar.upstream/src/checkpoint.c
++++ tar/src/checkpoint.c
+@@ -136,12 +136,15 @@
+     }
+   else if (strcmp (str, "totals") == 0)
+     alloc_action (cop_totals);
++/* PATCH: Sortix doesn't have sigwait yet.  */
++#if !defined(__sortix__) || defined(__SORTIX_HAS_SIGWAIT__)
+   else if (strncmp (str, "wait=", 5) == 0)
+     {
+       act = alloc_action (cop_wait);
+       act->v.signal = decode_signal (str + 5);
+       sigaddset (&sigs, act->v.signal);
+     }
++#endif
+   else
+     FATAL_ERROR ((0, 0, _("%s: unknown checkpoint action"), str));
+ }
+@@ -428,8 +431,10 @@
+ 
+ 	case cop_wait:
+ 	  {
++#if !defined(__sortix__) || defined(__SORTIX_HAS_SIGWAIT__)
+ 	    int n;
+ 	    sigwait (&sigs, &n);
++#endif
+ 	  }
+ 	}
+     }

ports/tar/tar.port

@@ -1,11 +1,12 @@
 NAME=tar
 BUILD_LIBRARIES='libiconv? libintl?'
-VERSION=1.28
+VERSION=1.35
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=64ee8d88ec1b47a0961033493f919d27218c41b580138fd6802327462aff22f2
+SHA256SUM=4d62ff37342ec7aed748535323930c7cf94acf71c3591882b26a7ea50f3edc16
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/tar
 UPSTREAM_ARCHIVE=$ARCHIVE
+LICENSE=GPL-3.0-or-later
 BUILD_SYSTEM=configure
 MAKE_VARS='V=1'

ports/video-player/video-player.patch

@@ -1,7 +1,7 @@
 diff -Paur --no-dereference -- video-player.upstream/Makefile video-player/Makefile
 --- video-player.upstream/Makefile
 +++ video-player/Makefile
-@@ -0,0 +1,36 @@
+@@ -0,0 +1,29 @@
 +include ../../../build-aux/compiler.mak
 +include ../../../build-aux/version.mak
 +include ../../../build-aux/dirs.mak
@@ -9,28 +9,21 @@ diff -Paur --no-dereference -- video-player.upstream/Makefile video-player/Makef
 +PKG_CONFIG?=pkg-config
 +
 +OPTLEVEL?=-g -O2
-+CXXFLAGS?=$(OPTLEVEL)
++CFLAGS?=$(OPTLEVEL)
 +
 +CPPFLAGS:=$(CPPFLAGS)
-+CXXFLAGS:=$(CXXFLAGS) -Wall -Wextra -fno-exceptions -fno-rtti
++CFLAGS:=$(CFLAGS) -Wall -Wextra
 +
 +BINARY:=video-player
 +LIBS!=$(PKG_CONFIG) --libs libavcodec libavformat libswscale
-+
-+DISPLAY:=$(shell $(LD) -ldisplay -o /dev/null 2>/dev/null && echo 1)
-+ifeq ($(DISPLAY),1)
 +LIBS:=$(LIBS) -ldisplay
-+CPPFLAGS:=$(CPPFLAGS) -DDISPLAY
-+else
-+LIBS:=$(LIBS) -ldispd
-+endif
 +
 +all: $(BINARY)
 +
 +.PHONY: all install clean
 +
-+%: %.cpp
-+	$(CXX) -std=gnu++11 $(CXXFLAGS) $(CPPFLAGS) $< -o $@ $(LIBS)
++%: %.c
++	$(CC) -std=gnu11 $(CFLAGS) $(CPPFLAGS) $< -o $@ $(LIBS)
 +
 +install: all
 +	mkdir -p $(DESTDIR)$(BINDIR)
@@ -38,16 +31,32 @@ diff -Paur --no-dereference -- video-player.upstream/Makefile video-player/Makef
 +
 +clean:
 +	rm -f $(BINARY)
-diff -Paur --no-dereference -- video-player.upstream/video-player.cpp video-player/video-player.cpp
---- video-player.upstream/video-player.cpp
-+++ video-player/video-player.cpp
-@@ -0,0 +1,302 @@
-+#define __STDC_CONSTANT_MACROS
-+#define __STDC_LIMIT_MACROS
+diff -Paur --no-dereference -- video-player.upstream/video-player.c video-player/video-player.c
+--- video-player.upstream/video-player.c
++++ video-player/video-player.c
+@@ -0,0 +1,317 @@
++/*
++ * Copyright (c) 2016, 2021, 2022, 2024 Jonas 'Sortie' Termansen.
++ *
++ * Permission to use, copy, modify, and distribute this software for any
++ * purpose with or without fee is hereby granted, provided that the above
++ * copyright notice and this permission notice appear in all copies.
++ *
++ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
++ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
++ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
++ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
++ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
++ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
++ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
++ *
++ * video-player.c
++ * Play videos.
++ */
 +
 +#include <assert.h>
++#include <err.h>
 +#include <errno.h>
-+#include <error.h>
 +#include <stdint.h>
 +#include <stdio.h>
 +#include <stdlib.h>
@@ -55,110 +64,111 @@ diff -Paur --no-dereference -- video-player.upstream/video-player.cpp video-play
 +#include <timespec.h>
 +#include <unistd.h>
 +
-+#ifdef DISPLAY
 +#include <display.h>
-+#else
-+#include <dispd.h>
-+#endif
 +
-+extern "C" {
 +#include <libavcodec/avcodec.h>
 +#include <libavformat/avformat.h>
 +#include <libswscale/swscale.h>
-+} // extern "C"
 +
-+uint32_t WINDOW_ID = 0;
-+uint32_t WINDOW_WIDTH = 0;
-+uint32_t WINDOW_HEIGHT = 0;
++static uint32_t WINDOW_ID = 0;
++static uint32_t WINDOW_WIDTH = 0;
++static uint32_t WINDOW_HEIGHT = 0;
 +
-+bool need_show = true;
-+bool need_exit = false;
++static int force_width = 0;
++static int force_height = 0;
++static int zoom = 100;
 +
-+uint32_t* framebuffer = NULL;
-+size_t framebuffer_size = 0;
++static bool need_show = true;
++static bool need_exit = false;
 +
-+void on_disconnect(void*)
++static uint32_t* framebuffer = NULL;
++static size_t framebuffer_size = 0;
++
++static void on_disconnect(void* ctx)
 +{
 +	need_exit = true;
 +}
 +
-+void on_quit(void*, uint32_t window_id)
++static void on_quit(void* ctx, uint32_t window_id)
 +{
 +	if ( window_id != WINDOW_ID )
 +		return;
 +	need_exit = true;
 +}
 +
-+void on_resize(void*, uint32_t window_id, uint32_t width, uint32_t height)
++static void on_resize(void* ctx, uint32_t window_id, uint32_t width,
++                      uint32_t height)
 +{
 +	if ( window_id != WINDOW_ID )
 +		return;
 +	WINDOW_WIDTH = width;
 +	WINDOW_HEIGHT = height;
++	force_width = width;
++	force_height = height;
++	zoom = 100;
 +}
 +
-+void on_keyboard(void*, uint32_t window_id, uint32_t)
++static void on_keyboard(void* ctx, uint32_t window_id, uint32_t codepoint)
 +{
 +	if ( window_id != WINDOW_ID )
 +		return;
 +}
 +
-+#ifdef DISPLAY
-+static void DisplayVideoFrame(AVFrame* frame, struct display_connection* connection)
-+#else
-+static void DisplayVideoFrame(AVFrame* frame, struct dispd_window* window)
-+#endif
++static void display_video_frame(AVFrame* frame,
++                                struct display_connection* connection)
 +{
-+#ifdef DISPLAY
++	if ( need_show )
++	{
++		WINDOW_WIDTH =
++			force_width ? force_width : (frame->width * zoom) / 100;
++		WINDOW_HEIGHT =
++			force_height ? force_height : (frame->height * zoom) / 100;
++		display_resize_window(connection, WINDOW_ID, WINDOW_WIDTH,
++		                      WINDOW_HEIGHT);
++	}
++
++	if ( !WINDOW_WIDTH || !WINDOW_HEIGHT )
++		return;
++
 +	size_t framebuffer_needed = sizeof(uint32_t) * WINDOW_WIDTH * WINDOW_HEIGHT;
 +	if ( framebuffer_size != framebuffer_needed )
 +	{
-+		framebuffer = (uint32_t*) realloc(framebuffer, framebuffer_size = framebuffer_needed);
++		framebuffer =
++			(uint32_t*) realloc(framebuffer,
++			                    framebuffer_size = framebuffer_needed);
 +		memset(framebuffer, 255, framebuffer_needed);
 +	}
 +	uint32_t width = WINDOW_WIDTH;
 +	uint32_t height = WINDOW_HEIGHT;
-+#else
-+	struct dispd_framebuffer* window_fb = dispd_begin_render(window);
-+	uint32_t width = dispd_get_framebuffer_width(window_fb);
-+	uint32_t height = dispd_get_framebuffer_height(window_fb);
-+	uint32_t* framebuffer = (uint32_t*) dispd_get_framebuffer_data(window_fb);
-+#endif
 +
-+	SwsContext* sws_ctx = sws_getContext(frame->width, frame->height,
-+	                                     (AVPixelFormat) frame->format, width,
-+	                                     height, AV_PIX_FMT_RGB32, SWS_BILINEAR,
-+	                                     NULL, NULL, NULL);
++	struct SwsContext* sws_ctx =
++		sws_getContext(frame->width, frame->height,
++		               (enum AVPixelFormat) frame->format, width, height,
++		               AV_PIX_FMT_RGB32, SWS_BILINEAR, NULL, NULL, NULL);
 +	assert(sws_ctx);
 +
 +	uint8_t* data_arr[1] = { (uint8_t*) framebuffer };
 +	int stride_arr[1] = { (int) (sizeof(framebuffer[0]) * width) };
-+	sws_scale(sws_ctx, frame->data, frame->linesize, 0, frame->height, data_arr,
-+	          stride_arr);
++
++	sws_scale(sws_ctx, (const uint8_t * const*) frame->data, frame->linesize, 0,
++	          frame->height, data_arr, stride_arr);
 +
 +	sws_freeContext(sws_ctx);
 +
-+#ifdef DISPLAY
-+	display_render_window(connection, WINDOW_ID, 0, 0, WINDOW_WIDTH, WINDOW_HEIGHT, framebuffer);
++	display_render_window(connection, WINDOW_ID, 0, 0, WINDOW_WIDTH,
++	                      WINDOW_HEIGHT, framebuffer);
 +
-+	struct display_event_handlers handlers;
-+	memset(&handlers, 0, sizeof(handlers));
-+	handlers.disconnect_handler = on_disconnect;
-+	handlers.quit_handler = on_quit;
-+	handlers.resize_handler = on_resize;
-+	handlers.keyboard_handler = on_keyboard;
-+	while ( display_poll_event(connection, &handlers) == 0 );
-+#else
-+	dispd_finish_render(window_fb);
-+#endif
++	if ( need_show )
++	{
++		display_show_window(connection, WINDOW_ID);
++		need_show = false;
++	}
 +}
 +
-+#ifdef DISPLAY
-+bool PlayVideo(const char* path, struct display_connection* connection)
-+#else
-+bool PlayVideo(const char* path, struct dispd_window* connection)
-+#endif
++bool play_video(const char* path, struct display_connection* connection)
 +{
++	need_show = true;
++
 +	bool ret = false;
 +	int av_error;
 +	AVFormatContext* format_ctx = NULL;
@@ -176,13 +186,13 @@ diff -Paur --no-dereference -- video-player.upstream/video-player.cpp video-play
 +
 +	if ( (av_error = avformat_open_input(&format_ctx, path, NULL, NULL)) < 0 )
 +	{
-+		error(0, 0, "%s: cannot open: %i\n", path, av_error);
++		warnx("%s: cannot open: %i\n", path, av_error);
 +		goto cleanup_done;
 +	}
 +
 +	if ( (av_error = avformat_find_stream_info(format_ctx, NULL)) < 0 )
 +	{
-+		error(0, 0, "%s: avformat_find_stream_info: %i\n", path, av_error);
++		warnx("%s: avformat_find_stream_info: %i\n", path, av_error);
 +		goto cleanup_input;
 +	}
 +
@@ -198,23 +208,28 @@ diff -Paur --no-dereference -- video-player.upstream/video-player.cpp video-play
 +
 +	if ( !video_stream )
 +	{
-+		error(0, 0, "%s: no video stream found\n", path);
++		warnx("%s: no video stream found\n", path);
 +		goto cleanup_input;
 +	}
 +
-+	if ( video_codec && !(video_codec_ctx = avcodec_alloc_context3(video_codec)))
++	if ( video_codec &&
++	     !(video_codec_ctx = avcodec_alloc_context3(video_codec)))
 +		goto cleanup_input;
-+	if ( audio_codec && !(audio_codec_ctx = avcodec_alloc_context3(audio_codec)))
++	if ( audio_codec &&
++	     !(audio_codec_ctx = avcodec_alloc_context3(audio_codec)))
 +		goto cleanup_video_codec_ctx;
 +
-+
 +	if ( video_codec_ctx )
 +	{
++		video_codec_ctx->extradata = video_stream->codecpar->extradata;
++		video_codec_ctx->extradata_size = video_stream->codecpar->extradata_size;
 +		if ( (av_error = avcodec_open2(video_codec_ctx, NULL, NULL)) < 0 )
 +			goto cleanup_audio_codec_ctx;
 +	}
 +	if ( audio_codec_ctx )
 +	{
++		audio_codec_ctx->extradata = audio_stream->codecpar->extradata;
++		audio_codec_ctx->extradata_size = audio_stream->codecpar->extradata_size;
 +		if ( (av_error = avcodec_open2(audio_codec_ctx, NULL, NULL)) < 0 )
 +			goto cleanup_audio_codec_ctx;
 +	}
@@ -247,12 +262,21 @@ diff -Paur --no-dereference -- video-player.upstream/video-player.cpp video-play
 +					clock_gettime(CLOCK_MONOTONIC, &now);
 +				}
 +
-+				DisplayVideoFrame(video_frame, connection);
++				display_video_frame(video_frame, connection);
 +
 +				uintmax_t usecs = video_codec_ctx->ticks_per_frame * 1000000 *
 +					              video_codec_ctx->time_base.num /
 +					              video_codec_ctx->time_base.den;
-+				next_frame_at = timespec_add(next_frame_at, timespec_make(0, usecs * 1000));
++				next_frame_at =
++					timespec_add(next_frame_at, timespec_make(0, usecs * 1000));
++
++				struct display_event_handlers handlers;
++				memset(&handlers, 0, sizeof(handlers));
++				handlers.disconnect_handler = on_disconnect;
++				handlers.quit_handler = on_quit;
++				handlers.resize_handler = on_resize;
++				handlers.keyboard_handler = on_keyboard;
++				while ( display_poll_event(connection, &handlers) == 0 );
 +			}
 +			if ( av_error != AVERROR(EAGAIN) && av_error != AVERROR_EOF )
 +				goto break_decode_loop;
@@ -280,12 +304,14 @@ diff -Paur --no-dereference -- video-player.upstream/video-player.cpp video-play
 +cleanup_audio_codec_ctx:
 +	if ( audio_codec_ctx )
 +	{
++		audio_codec_ctx->extradata = NULL;
 +		avcodec_close(audio_codec_ctx);
 +		av_free(audio_codec_ctx);
 +	}
 +cleanup_video_codec_ctx:
 +	if ( video_codec_ctx )
 +	{
++		video_codec_ctx->extradata = NULL;
 +		avcodec_close(video_codec_ctx);
 +		av_free(video_codec_ctx);
 +	}
@@ -297,50 +323,32 @@ diff -Paur --no-dereference -- video-player.upstream/video-player.cpp video-play
 +
 +int main(int argc, char* argv[])
 +{
-+#ifdef DISPLAY
++	int opt;
++	while ( (opt = getopt(argc, argv, "h:w:z:")) != -1 )
++	{
++		switch ( opt )
++		{
++		case 'h': force_height = atoi(optarg); break;
++		case 'w': force_width = atoi(optarg); break;
++		case 'z': zoom = atoi(optarg); break;
++		default: return 1;
++		}
++	}
++
 +	struct display_connection* connection = display_connect_default();
 +	if ( !connection )
-+		error(1, errno, "Could not connect to display server");
-+#else
-+	if ( !isatty(0) )
-+		error(1, errno, "standard input");
-+	if ( !dispd_initialize(&argc, &argv) )
-+		error(1, 0, "couldn't initialize dispd library");
-+	struct dispd_session* session = dispd_attach_default_session();
-+	if ( !session )
-+		error(1, 0, "couldn't attach to dispd default session");
-+	if ( !dispd_session_setup_game_rgba(session) )
-+		error(1, 0, "couldn't setup dispd rgba session");
-+	struct dispd_window* window = dispd_create_window_game_rgba(session);
-+	if ( !window )
-+		error(1, 0, "couldn't create dispd rgba window");
-+	struct dispd_window* connection = window;
-+#endif
-+
-+#ifdef DISPLAY
-+	WINDOW_WIDTH = 800;
-+	WINDOW_HEIGHT = 450;
++		err(1, "Could not connect to display server");
 +
 +	display_create_window(connection, WINDOW_ID);
-+	display_resize_window(connection, WINDOW_ID, WINDOW_WIDTH, WINDOW_HEIGHT);
-+	display_show_window(connection, WINDOW_ID);
-+#endif
 +
-+	for ( int i = 1; i < argc; i++ )
++	for ( int i = optind; i < argc; i++ )
 +	{
-+#ifdef DISPLAY
 +		display_title_window(connection, WINDOW_ID, argv[i]);
-+#endif
-+		if ( !PlayVideo(argv[i], connection) )
++		if ( !play_video(argv[i], connection) )
 +			return 1;
 +	}
 +
-+#ifdef DISPLAY
 +	display_disconnect(connection);
-+#else
-+	dispd_destroy_window(window);
-+	dispd_detach_session(session);
-+#endif
 +
 +	return 0;
 +}

ports/video-player/video-player.port

@@ -1,3 +1,4 @@
 NAME=video-player
 BUILD_LIBRARIES=libavcodec
 BUILD_SYSTEM=sortix-usual-makefile
+LICENSE=ISC

ports/vim/vim.patch

@@ -1,7 +1,19 @@
+diff -Paur --no-dereference -- vim.upstream/src/Makefile vim/src/Makefile
+--- vim.upstream/src/Makefile
++++ vim/src/Makefile
+@@ -2342,6 +2342,8 @@
+ # install targets
+ 
+ install: $(GUI_INSTALL)
++	ln -s ../../etc/vimrc $(DEST_VIM)/vimrc
++	ln -s ../../etc/gvimrc $(DEST_VIM)/gvimrc
+ 
+ install_normal: installvim installtools $(INSTALL_LANGS) install-icons
+ 
 diff -Paur --no-dereference -- vim.upstream/src/auto/configure vim/src/auto/configure
 --- vim.upstream/src/auto/configure
 +++ vim/src/auto/configure
-@@ -10140,7 +10140,9 @@
+@@ -10739,7 +10739,9 @@
  
      if test "$cross_compiling" = yes; then :
  
@@ -12,7 +24,7 @@ diff -Paur --no-dereference -- vim.upstream/src/auto/configure vim/src/auto/conf
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11362,7 +11364,7 @@
+@@ -11961,7 +11963,7 @@
  
      if test "x$olibs" != "x$LIBS"; then
                          if test "$cross_compiling" = yes; then :
@@ -21,18 +33,7 @@ diff -Paur --no-dereference -- vim.upstream/src/auto/configure vim/src/auto/conf
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-@@ -11405,6 +11407,10 @@
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-+#ifdef HAVE_TERMCAP_H
-+# include <termcap.h>
-+#endif
-+
- int
- main ()
- {
-@@ -11433,7 +11439,8 @@
+@@ -12033,7 +12035,8 @@
  
      if test "$cross_compiling" = yes; then :
  
@@ -42,26 +43,17 @@ diff -Paur --no-dereference -- vim.upstream/src/auto/configure vim/src/auto/conf
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11486,7 +11493,8 @@
+@@ -12085,7 +12088,8 @@
  
-       if test "$cross_compiling" = yes; then :
+     if test "$cross_compiling" = yes; then :
  
--	as_fn_error $? "failed to compile test program." "$LINENO" 5
-+	#as_fn_error $? "failed to compile test program." "$LINENO" 5
-+	vim_cv_tgent=zero
+-      as_fn_error $? "failed to compile test program." "$LINENO" 5
++      #as_fn_error $? "failed to compile test program." "$LINENO" 5
++      vim_cv_tgetent=zero
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -11715,6 +11723,8 @@
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
- /* end confdefs.h.  */
- 
-+#include <stdlib.h>
-+
- int
- main ()
- {
-@@ -11957,7 +11967,8 @@
+@@ -12453,7 +12457,8 @@
  
      if test "$cross_compiling" = yes; then :
  
@@ -71,17 +63,17 @@ diff -Paur --no-dereference -- vim.upstream/src/auto/configure vim/src/auto/conf
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -12324,7 +12335,8 @@
+@@ -13115,7 +13120,8 @@
  
      if test "$cross_compiling" = yes; then :
  
 -      as_fn_error $? "cross-compiling: please set 'vim_cv_stat_ignores_slash'" "$LINENO" 5
 +      #as_fn_error $? "cross-compiling: please set 'vim_cv_stat_ignores_slash'" "$LINENO" 5
-+      vim_cv_stat_ignores_slash=no
++      vim_cv_getcwd_broken=no
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-@@ -13325,8 +13337,8 @@
+@@ -14270,8 +14276,8 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking uint32_t is 32 bits" >&5
  $as_echo_n "checking uint32_t is 32 bits... " >&6; }
  if test "$cross_compiling" = yes; then :
@@ -92,15 +84,7 @@ diff -Paur --no-dereference -- vim.upstream/src/auto/configure vim/src/auto/conf
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
  /* end confdefs.h.  */
-@@ -13337,6 +13349,7 @@
- #ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
- #endif
-+#include <stdlib.h>
- main() {
-   uint32_t nr1 = (uint32_t)-1;
-   uint32_t nr2 = (uint32_t)0xffffffffUL;
-@@ -13386,7 +13399,8 @@
+@@ -14331,7 +14337,8 @@
  
      if test "$cross_compiling" = yes; then :
  
@@ -110,66 +94,42 @@ diff -Paur --no-dereference -- vim.upstream/src/auto/configure vim/src/auto/conf
  
  else
    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-diff -Paur --no-dereference -- vim.upstream/src/Makefile vim/src/Makefile
---- vim.upstream/src/Makefile
-+++ vim/src/Makefile
-@@ -2202,6 +2202,8 @@
- # install targets
+@@ -14801,6 +14808,10 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
- install: $(GUI_INSTALL)
-+	ln -s ../../etc/vimrc $(DEST_VIM)/vimrc
-+	ln -s ../../etc/gvimrc $(DEST_VIM)/gvimrc
- 
- install_normal: installvim installtools $(INSTALL_LANGS) install-icons
++#ifdef HAVE_TERMCAP_H
++# include <termcap.h>
++#endif
++
+ int
+ main ()
+ {
+@@ -14923,6 +14934,8 @@
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
  
++#include <stdlib.h>
++
+ int
+ main ()
+ {
 diff -Paur --no-dereference -- vim.upstream/src/memfile.c vim/src/memfile.c
 --- vim.upstream/src/memfile.c
 +++ vim/src/memfile.c
-@@ -613,7 +613,7 @@
- 	    /* OpenNT is strictly POSIX (Benzinger) */
- 	    /* Tandem/Himalaya NSK-OSS doesn't have sync() */
- 	    /* No sync() on Stratus VOS */
+@@ -593,7 +593,7 @@
+ 	    // OpenNT is strictly POSIX (Benzinger)
+ 	    // Tandem/Himalaya NSK-OSS doesn't have sync()
+ 	    // No sync() on Stratus VOS
 -# if defined(__OPENNT) || defined(__TANDEM) || defined(__VOS__)
-+# if defined(__OPENNT) || defined(__TANDEM) || defined(__VOS__) || defined(__sortix__)
++# if defined(__OPENNT) || defined(__TANDEM) || defined(__VOS__) || (defined(__sortix__) && !defined(__SORTIX_HAS_SYNC__))
  	    fflush(NULL);
  # else
  	    sync();
-diff -Paur --no-dereference -- vim.upstream/src/regexp.c vim/src/regexp.c
---- vim.upstream/src/regexp.c
-+++ vim/src/regexp.c
-@@ -189,6 +189,7 @@
- #define KWORD		25	/*	Match keyword char */
- #define SKWORD		26	/*	Match word char but no digit */
- #define FNAME		27	/*	Match file name char */
-+#undef SFNAME /* <sortix/fork.h> namespace issue */
- #define SFNAME		28	/*	Match file name char but no digit */
- #define PRINT		29	/*	Match printable char */
- #define SPRINT		30	/*	Match printable char but no digit */
 diff -Paur --no-dereference -- vim.upstream/src/sha256.c vim/src/sha256.c
 --- vim.upstream/src/sha256.c
 +++ vim/src/sha256.c
-@@ -380,20 +380,6 @@
-     return failures > 0 ? FAIL : OK;
- }
- 
--    static unsigned int
--get_some_time(void)
--{
--# ifdef HAVE_GETTIMEOFDAY
--    struct timeval tv;
--
--    /* Using usec makes it less predictable. */
--    gettimeofday(&tv, NULL);
--    return (unsigned int)(tv.tv_sec + tv.tv_usec);
--# else
--    return (unsigned int)time(NULL);
--# endif
--}
--
- /*
-  * Fill "header[header_len]" with random_data.
-  * Also "salt[salt_len]" when "salt" is not NULL.
-@@ -410,10 +396,7 @@
+@@ -406,10 +406,7 @@
      char_u	     sha256sum[32];
      context_sha256_T ctx;
  

ports/vim/vim.port

@@ -1,10 +1,10 @@
 NAME=vim
 BUILD_LIBRARIES=libcurses
-VERSION=8.0.002
+VERSION=9.0
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.bz2
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=acab24b07d9e87a1c1581cf5ecfe0439562ff7e111d0d2dbd274260490cb64e8
+SHA256SUM=a6456bc154999d83d0c20d968ac7ba6e7df0d02f3cb6427fb248660bacfb336e
 UPSTREAM_SITE=http://ftp.vim.org/pub/vim/unix
 UPSTREAM_ARCHIVE=$ARCHIVE
 BUILD_SYSTEM=configure

ports/wget/wget.patch

@@ -124,30 +124,21 @@ diff -Paur --no-dereference -- wget.upstream/configure wget/configure
 +export gl_cv_struct_dirent_d_ino=yes # Only if the OS actually supports this, Sortix does.
 +export ac_cv_func_realloc_0_nonnull=yes # TODO: Investigate this, found in flex.
  # Guess values for system-dependent variables and create Makefiles.
- # Generated by GNU Autoconf 2.69 for wget 1.18.
+ # Generated by GNU Autoconf 2.71 for wget 1.21.4.
  #
-@@ -39179,6 +39299,8 @@
+@@ -65572,6 +65692,8 @@
  esac
  fi
  GPGME_CONFIG=$ac_cv_path_GPGME_CONFIG
 +# PATCH: Not cross-compile safe.
 +GPGME_CONFIG=no
  if test -n "$GPGME_CONFIG"; then
-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GPGME_CONFIG" >&5
- $as_echo "$GPGME_CONFIG" >&6; }
-@@ -39841,7 +39963,7 @@
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_idn_stringprep_check_version" >&5
- $as_echo "$ac_cv_lib_idn_stringprep_check_version" >&6; }
- if test "x$ac_cv_lib_idn_stringprep_check_version" = xyes; then :
--  iri=yes LIBS="${LIBS} -lidn"
-+  iri=yes LIBS="${LIBS} -lidn $LIBINTL"
- else
-   iri=no
- fi
+   { printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $GPGME_CONFIG" >&5
+ printf "%s\n" "$GPGME_CONFIG" >&6; }
 diff -Paur --no-dereference -- wget.upstream/lib/flock.c wget/lib/flock.c
 --- wget.upstream/lib/flock.c
 +++ wget/lib/flock.c
-@@ -211,6 +211,16 @@
+@@ -215,6 +215,16 @@
    return r;
  }
  
@@ -164,25 +155,22 @@ diff -Paur --no-dereference -- wget.upstream/lib/flock.c wget/lib/flock.c
  # else /* !HAVE_STRUCT_FLOCK_L_TYPE */
  
  #  error "This platform lacks flock function, and Gnulib doesn't provide a replacement. This is a bug in Gnulib."
-diff -Paur --no-dereference -- wget.upstream/src/hsts.c wget/src/hsts.c
---- wget.upstream/src/hsts.c
-+++ wget/src/hsts.c
-@@ -325,9 +325,9 @@
-       struct hsts_kh *kh = (struct hsts_kh *) it.key;
-       struct hsts_kh_info *khi = (struct hsts_kh_info *) it.value;
- 
--      if (fprintf (fp, "%s\t%d\t%d\t%lu\t%lu\n",
-+      if (fprintf (fp, "%s\t%d\t%d\t%lli\t%lli\n",
-                    kh->host, kh->explicit_port, khi->include_subdomains,
--                   khi->created, khi->max_age) < 0)
-+                   (long long)khi->created, (long long)khi->max_age) < 0)
-         {
-           logprintf (LOG_ALWAYS, "Could not write the HSTS database correctly.\n");
-           break;
+diff -Paur --no-dereference -- wget.upstream/lib/getgroups.c wget/lib/getgroups.c
+--- wget.upstream/lib/getgroups.c
++++ wget/lib/getgroups.c
+@@ -30,7 +30,7 @@
+ /* Provide a stub that fails with ENOSYS, since there is no group
+    information available on mingw.  */
+ int
+-getgroups (_GL_UNUSED int n, _GL_UNUSED GETGROUPS_T *groups)
++getgroups (_GL_UNUSED int n, _GL_UNUSED gid_t *groups)
+ {
+   errno = ENOSYS;
+   return -1;
 diff -Paur --no-dereference -- wget.upstream/src/init.c wget/src/init.c
 --- wget.upstream/src/init.c
 +++ wget/src/init.c
-@@ -39,13 +39,6 @@
+@@ -38,13 +38,6 @@
  #include <string.h>
  #include <errno.h>
  #include <limits.h>
@@ -195,11 +183,23 @@ diff -Paur --no-dereference -- wget.upstream/src/init.c wget/src/init.c
 -#endif
  
  #include <regex.h>
- #ifdef HAVE_LIBPCRE
+ 
+diff -Paur --no-dereference -- wget.upstream/src/log.c wget/src/log.c
+--- wget.upstream/src/log.c
++++ wget/src/log.c
+@@ -981,7 +981,7 @@
+     {
+       pid_t foreground_pgrp = tcgetpgrp (STDIN_FILENO);
+ 
+-      if (foreground_pgrp != -1 && foreground_pgrp != getpgrp () && !opt.quiet)
++      if (foreground_pgrp != -1 && foreground_pgrp != getpgid (0) && !opt.quiet)
+         {
+           /* Process backgrounded */
+           redirect_output (true,NULL);
 diff -Paur --no-dereference -- wget.upstream/src/progress.c wget/src/progress.c
 --- wget.upstream/src/progress.c
 +++ wget/src/progress.c
-@@ -311,9 +311,15 @@
+@@ -352,9 +352,15 @@
      if (dp->rows == dp->initial_length / ROW_BYTES)
        bytes_this_row -= dp->initial_length % ROW_BYTES;
      rate = calc_rate (bytes_this_row, dltime - dp->last_timer_value, &units);
@@ -215,7 +215,7 @@ diff -Paur --no-dereference -- wget.upstream/src/progress.c wget/src/progress.c
      dp->last_timer_value = dltime;
    }
  
-@@ -1093,8 +1099,14 @@
+@@ -1250,8 +1256,14 @@
        wgint dlquant = hist->total_bytes + bp->recent_bytes;
        double dltime = hist->total_time + (dl_total_time - bp->recent_start);
        double dlspeed = calc_rate (dlquant, dltime, &units);
@@ -233,26 +233,28 @@ diff -Paur --no-dereference -- wget.upstream/src/progress.c wget/src/progress.c
 diff -Paur --no-dereference -- wget.upstream/src/retr.c wget/src/retr.c
 --- wget.upstream/src/retr.c
 +++ wget/src/retr.c
-@@ -634,9 +634,15 @@
+@@ -783,10 +783,16 @@
    double dlrate = calc_rate (bytes, secs, &units);
    /* Use more digits for smaller numbers (regardless of unit used),
       e.g. "1022", "247", "12.5", "2.38".  */
-+#if defined(__sortix__)
++#if defined(__sortix__) && !defined(__SORTIX_HAS_FORMAT_FLOAT__)
 +  /* PATCH: HACK: Sortix doesn't support floating point printf right now. */
-+  sprintf (res, "%lli %s", (long long)dlrate,
++  snprintf (res, sizeof(res), "%lli %s",
++           (long long)dlrate,
 +           !opt.report_bps ? rate_names[units]: rate_names_bits[units]);
 +#else
-   sprintf (res, "%.*f %s",
+   snprintf (res, sizeof(res), "%.*f %s",
             dlrate >= 99.95 ? 0 : dlrate >= 9.995 ? 1 : 2,
             dlrate, !opt.report_bps ? rate_names[units]: rate_names_bits[units]);
+-
 +#endif
- 
    return res;
  }
+ 
 diff -Paur --no-dereference -- wget.upstream/src/utils.c wget/src/utils.c
 --- wget.upstream/src/utils.c
 +++ wget/src/utils.c
-@@ -505,7 +505,9 @@
+@@ -504,7 +504,9 @@
      }
  
    /* child: give up the privileges and keep running. */
@@ -262,7 +264,7 @@ diff -Paur --no-dereference -- wget.upstream/src/utils.c wget/src/utils.c
    if (freopen ("/dev/null", "r", stdin) == NULL)
      DEBUGP (("Failed to redirect stdin to /dev/null.\n"));
    if (freopen ("/dev/null", "w", stdout) == NULL)
-@@ -1583,8 +1585,13 @@
+@@ -1708,8 +1710,13 @@
            double val = n / 1024.0;
            /* Print values smaller than the accuracy level (acc) with (decimal)
             * decimal digits, and others without any decimals.  */
@@ -276,7 +278,7 @@ diff -Paur --no-dereference -- wget.upstream/src/utils.c wget/src/utils.c
            return buf;
          }
        n /= 1024;
-@@ -1843,9 +1850,11 @@
+@@ -1952,9 +1959,11 @@
  #endif /* neither TIOCGWINSZ nor WINDOWS */
  }
  
@@ -288,7 +290,7 @@ diff -Paur --no-dereference -- wget.upstream/src/utils.c wget/src/utils.c
  
  /* Return a random number between 0 and MAX-1, inclusive.
  
-@@ -1862,7 +1871,9 @@
+@@ -1971,7 +1980,9 @@
  int
  random_number (int max)
  {
@@ -299,7 +301,7 @@ diff -Paur --no-dereference -- wget.upstream/src/utils.c wget/src/utils.c
    if (!rnd_seeded)
      {
        srandom ((long) time (NULL) ^ (long) getpid ());
-@@ -2444,6 +2455,10 @@
+@@ -2629,6 +2640,10 @@
    static char buf[32];
    double n = number >= 0 ? number : -number;
  
@@ -310,7 +312,7 @@ diff -Paur --no-dereference -- wget.upstream/src/utils.c wget/src/utils.c
    if (n >= 9.95)
      /* Cut off at 9.95 because the below %.1f would round 9.96 to
         "10.0" instead of "10".  OTOH 9.94 will print as "9.9".  */
-@@ -2458,6 +2473,7 @@
+@@ -2643,6 +2658,7 @@
    else
      /* print numbers close to 0 as 0, not 0.000 */
      strcpy (buf, "0");

ports/wget/wget.port

@@ -1,12 +1,13 @@
 NAME=wget
 BUILD_LIBRARIES='libz libiconv? libintl? libssl libpsl? libmetalink? libuuid? libpcre? libidn?'
-VERSION=1.18
+VERSION=1.21.4
 DISTNAME=$NAME-$VERSION
-COMPRESSION=tar.xz
+COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=b5b55b75726c04c06fe253daec9329a6f1a3c0c1878e3ea76ebfebc139ea9cc1
+SHA256SUM=81542f5cefb8faacc39bbbc6c82ded80e3e4a88505ae72ea51df27525bcde04c
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/wget
 UPSTREAM_ARCHIVE=$ARCHIVE
+LICENSE=GPL-3.0-or-later
 BUILD_SYSTEM=configure
 CONFIGURE_ARGS='--with-ssl=openssl'
 MAKE_VARS='V=1'

ports/wget/wget.rmpatch

@@ -1,4 +1,8 @@
 rm -rf -- 'doc/stamp-vti'
+rm -rf -- 'gnulib_po/stamp-po'
+rm -rf -- 'po/stamp-po'
 rm -rf -- 'src/build_info.c'
 rm -rf -- 'src/css.c'
 rm -rf -- 'src/css_.c'
+rm -rf -- 'tests/certs/interca.conf'
+rm -rf -- 'tests/certs/rootca.conf'

ports/xorriso/xorriso.patch

@@ -10,17 +10,6 @@ diff -Paur --no-dereference -- xorriso.upstream/config.sub xorriso/config.sub
  	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
  	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
  	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-diff -Paur --no-dereference -- xorriso.upstream/configure xorriso/configure
---- xorriso.upstream/configure
-+++ xorriso/configure
-@@ -6166,7 +6166,6 @@
- #include <limits.h>
- #include <iconv.h>
- #include <locale.h>
--#include <langinfo.h>
- #include <unistd.h>
- int
- main ()
 diff -Paur --no-dereference -- xorriso.upstream/libburn/async.c xorriso/libburn/async.c
 --- xorriso.upstream/libburn/async.c
 +++ xorriso/libburn/async.c
@@ -32,311 +21,32 @@ diff -Paur --no-dereference -- xorriso.upstream/libburn/async.c xorriso/libburn/
  #include <pthread.h>
  #include <sys/types.h>
  #include <unistd.h>
-@@ -718,9 +719,11 @@
- 	pthread_sigmask(SIG_SETMASK, &sigset, &oldset);
- #endif /* Libburn_protect_fifo_threaD */
+diff -Paur --no-dereference -- xorriso.upstream/libisofs/rockridge.h xorriso/libisofs/rockridge.h
+--- xorriso.upstream/libisofs/rockridge.h
++++ xorriso/libisofs/rockridge.h
+@@ -39,6 +39,9 @@
+ #ifndef LIBISO_ROCKRIDGE_H
+ #define LIBISO_ROCKRIDGE_H
  
-+#if !defined(__sortix__)
- 	pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old);
- 	pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &old);
- 		/* Note: Only burn_fifo_abort() shall cancel the fifo thread */
-+#endif
++/* PATCH: Get ssize_t. */
++#include <sys/types.h>
++
+ #include "ecma119.h"
  
- 	burn_fifo_source_shoveller(w->u.fifo.source, w->u.fifo.flag);
- 	remove_worker(pthread_self());
-@@ -775,7 +778,11 @@
  
- 	pt= *((pthread_t *) fs->thread_handle);
- 	remove_worker(pt);
-+#if !defined(__sortix__)
- 	ret = pthread_cancel(pt);
-+#else
-+	ret = (errno = ENOSYS, -1);
-+#endif
- 	return (ret == 0);
- }
- 
-diff -Paur --no-dereference -- xorriso.upstream/libburn/libdax_msgs.c xorriso/libburn/libdax_msgs.c
---- xorriso.upstream/libburn/libdax_msgs.c
-+++ xorriso/libburn/libdax_msgs.c
-@@ -34,14 +34,13 @@
-  int ret;
-  struct libdax_msgs_item *o;
-  struct timeval tv;
-- struct timezone tz;
- 
-  (*item)= o= 
-         (struct libdax_msgs_item *) calloc(1, sizeof(struct libdax_msgs_item));
-  if(o==NULL)
-    return(-1);
-  o->timestamp= 0.0;
-- ret= gettimeofday(&tv,&tz);
-+ ret= gettimeofday(&tv,NULL);
-  if(ret==0)
-    o->timestamp= tv.tv_sec+0.000001*tv.tv_usec;
-  o->process_id= getpid();
-diff -Paur --no-dereference -- xorriso.upstream/libburn/mmc.c xorriso/libburn/mmc.c
---- xorriso.upstream/libburn/mmc.c
-+++ xorriso/libburn/mmc.c
-@@ -739,7 +739,6 @@
- {
- 	int usec= 0, need, reported_3s = 0, first_wait = 1;
- 	struct timeval t0,tnow;
--	struct timezone dummy_tz;
- 	double max_fac, min_fac, waiting;
- 
- /* Enable to get reported waiting activities and total time.
-@@ -776,7 +775,7 @@
- 	/* There is need to inquire the buffer fill */
- 	d->pessimistic_writes++;
- 	min_fac = ((double) d->wfb_min_percent) / 100.0;
--	gettimeofday(&t0, &dummy_tz);
-+	gettimeofday(&t0, NULL);
- #ifdef Libburn_mmc_wfb_debuG
- 	sleeplist[0]= 0;
- 	sprintf(sleeplist,"(%d%s %d)",
-@@ -797,7 +796,7 @@
- 			(d->pbf_altered ? "? -" : " -"),
- 			(int) ((1.0 - min_fac) * d->progress.buffer_capacity));
- #endif
--		gettimeofday(&tnow,&dummy_tz);
-+		gettimeofday(&tnow,NULL);
- 		waiting = (tnow.tv_sec - t0.tv_sec) +
- 			  ((double) (tnow.tv_usec - t0.tv_usec)) / 1.0e6;
- 		if (d->pessimistic_buffer_free - buf->bytes >=
-diff -Paur --no-dereference -- xorriso.upstream/libburn/write.c xorriso/libburn/write.c
---- xorriso.upstream/libburn/write.c
-+++ xorriso/libburn/write.c
-@@ -2744,16 +2744,15 @@
- 			 int amount, int flag)
- {
- 	struct timeval tnow;
--	struct timezone dummy_tz;
- 	double to_wait;
- 
- 	if (flag & 1) {
--		gettimeofday(prev_time, &dummy_tz);
-+		gettimeofday(prev_time, NULL);
- 		return 1;
- 	}
- 	if(d->nominal_write_speed <= 0)
- 		return 2;
--	gettimeofday(&tnow, &dummy_tz);
-+	gettimeofday(&tnow, NULL);
- 	to_wait = ( ((double) amount) / (double) d->nominal_write_speed ) - 
- 		(double) ( tnow.tv_sec - prev_time->tv_sec ) -
- 		(double) ( tnow.tv_usec - prev_time->tv_usec ) / 1.0e6
-@@ -2761,7 +2760,7 @@
- 	if (to_wait >= 0.0001) {
- 		usleep((int) (to_wait * 1000000.0));
- 	}
--	gettimeofday(prev_time, &dummy_tz);
-+	gettimeofday(prev_time, NULL);
- 	return 1;
- }
- 
-diff -Paur --no-dereference -- xorriso.upstream/libisofs/ecma119.c xorriso/libisofs/ecma119.c
---- xorriso.upstream/libisofs/ecma119.c
-+++ xorriso/libisofs/ecma119.c
-@@ -39,7 +39,6 @@
- #include <time.h>
- #include <string.h>
- #include <locale.h>
--#include <langinfo.h>
- #include <stdio.h>
- 
- #ifdef Xorriso_standalonE
-diff -Paur --no-dereference -- xorriso.upstream/libisofs/fs_image.c xorriso/libisofs/fs_image.c
---- xorriso.upstream/libisofs/fs_image.c
-+++ xorriso/libisofs/fs_image.c
-@@ -31,7 +31,6 @@
- #include <stdlib.h>
- #include <string.h>
- #include <locale.h>
--#include <langinfo.h>
- #include <limits.h>
- #include <stdio.h>
- 
-diff -Paur --no-dereference -- xorriso.upstream/libisofs/libiso_msgs.c xorriso/libisofs/libiso_msgs.c
---- xorriso.upstream/libisofs/libiso_msgs.c
-+++ xorriso/libisofs/libiso_msgs.c
-@@ -30,19 +30,22 @@
- static int libiso_msgs_item_new(struct libiso_msgs_item **item,
-                          struct libiso_msgs_item *link, int flag)
- {
-+#if 0
-  int ret;
-+#endif
-  struct libiso_msgs_item *o;
-  struct timeval tv;
-- struct timezone tz;
- 
-  (*item)= o= 
-            (struct libiso_msgs_item *) malloc(sizeof(struct libiso_msgs_item));
-  if(o==NULL)
-    return(-1);
-  o->timestamp= 0.0;
-- ret= gettimeofday(&tv,&tz);
-+#if 0
-+ ret= gettimeofday(&tv,NULL);
-  if(ret==0)
-    o->timestamp= tv.tv_sec+0.000001*tv.tv_usec;
-+#endif
-  o->process_id= getpid();
-  o->origin= -1;
-  o->severity= LIBISO_MSGS_SEV_ALL;
-diff -Paur --no-dereference -- xorriso.upstream/libisofs/make_isohybrid_mbr.c xorriso/libisofs/make_isohybrid_mbr.c
---- xorriso.upstream/libisofs/make_isohybrid_mbr.c
-+++ xorriso/libisofs/make_isohybrid_mbr.c
-@@ -146,7 +146,6 @@
- 
-     /* For generating a weak random number */
-     struct timeval tv;
--    struct timezone tz;
- 
-     if (bin_lba < 0 || bin_lba >= (1 << 29))
-         return (0); /* 1 TB limit of signed 32 bit addressing of 512 byte blocks */
-@@ -201,7 +200,7 @@
-      from. An environment variable ?
-      125: Whatever, i use some 32-bit random value with no crypto strength.
-      */
--    gettimeofday(&tv, &tz);
-+    gettimeofday(&tv, NULL);
-     id = 0xffffffff & (tv.tv_sec ^ (tv.tv_usec * 2000));
- 
-     /*
-@@ -572,7 +571,6 @@
-     int gpt_count = 0, gpt_idx[128], apm_count = 0, gpt_cursor;
-     /* For generating a weak random number */
-     struct timeval tv;
--    struct timezone tz;
- 
-     hd_img_blocks = ((off_t) *img_blocks) * (off_t) 4;
- 
-@@ -608,7 +606,7 @@
-        (here some 32-bit random value with no crypto strength)
-     */
-     if (flag & 1) {
--        gettimeofday(&tv, &tz);
-+        gettimeofday(&tv, NULL);
-         id = 0xffffffff & (tv.tv_sec ^ (tv.tv_usec * 2000));
-         lsb_to_buf(&wpt, id, 32, 0);
-     } else {
-diff -Paur --no-dereference -- xorriso.upstream/libisofs/system_area.c xorriso/libisofs/system_area.c
---- xorriso.upstream/libisofs/system_area.c
-+++ xorriso/libisofs/system_area.c
-@@ -2061,7 +2061,6 @@
-     static uint8_t uuid_urandom[16];
-     uint32_t rnd, salt;
-     struct timeval tv;
--    struct timezone tz;
-     pid_t pid;
-     static int counter = 0, use_urandom = 0;
-     int i, ret, fd;
-@@ -2111,7 +2110,7 @@
-        per day.
-     */
-     memcpy(u, uuid_template, 16);
--    gettimeofday(&tv, &tz);
-+    gettimeofday(&tv, NULL);
-     for (i = 0; i < 4; i++)
-         u[i] = (salt >> (8 * i)) & 0xff;
-     for (i = 0; i < 2; i++)
-diff -Paur --no-dereference -- xorriso.upstream/libisofs/util.c xorriso/libisofs/util.c
---- xorriso.upstream/libisofs/util.c
-+++ xorriso/libisofs/util.c
-@@ -28,7 +28,6 @@
- #include <limits.h>
- #include <iconv.h>
- #include <locale.h>
--#include <langinfo.h>
- 
- #include <unistd.h>
- 
-@@ -186,7 +185,11 @@
- {
-    if(libisofs_local_charset[0])
-      return libisofs_local_charset;
-+#if defined(__sortix__)
-+   return "UTF-8";
-+#else
-    return nl_langinfo(CODESET);
-+#endif
- }
- 
- int strconv(const char *str, const char *icharset, const char *ocharset,
-@@ -1574,7 +1577,7 @@
- #else
-     if (tm.tm_isdst < 0)
-         tm.tm_isdst = 0;
--    tzoffset = ( - timezone / 60 / 15 ) + 4 * tm.tm_isdst;
-+    tzoffset = ( - 0 / 60 / 15 ) + 4 * tm.tm_isdst;
- #endif
- 
-     if (tzoffset > 52 || tzoffset < -48 || always_gmt) {
-@@ -1620,7 +1623,7 @@
- #else
-     if (tm.tm_isdst < 0)
-         tm.tm_isdst = 0;
--    tzoffset = ( - timezone / 60 / 15 ) + 4 * tm.tm_isdst;
-+    tzoffset = ( - 0 / 60 / 15 ) + 4 * tm.tm_isdst;
- #endif
- 
-     if (tzoffset > 52 || tzoffset < -48 || always_gmt) {
 diff -Paur --no-dereference -- xorriso.upstream/libjte/checksum.c xorriso/libjte/checksum.c
 --- xorriso.upstream/libjte/checksum.c
 +++ xorriso/libjte/checksum.c
-@@ -327,7 +327,9 @@
+@@ -328,7 +328,9 @@
          if (a->thread)
          {
              void *ret;
-+#if !defined(__sortix__)
++#if !defined(__sortix__) || defined(__SORTIX_HAS_PTHREAD_CANCEL__)
              pthread_cancel(a->thread);
 +#endif
              pthread_join(a->thread, &ret);
              a->thread = 0;
          }
-diff -Paur --no-dereference -- xorriso.upstream/xorriso/iso_manip.c xorriso/xorriso/iso_manip.c
---- xorriso.upstream/xorriso/iso_manip.c
-+++ xorriso/xorriso/iso_manip.c
-@@ -23,6 +23,12 @@
- #include <time.h>
- #include <errno.h>
- 
-+#ifndef S_ISGID
-+#define S_ISGID 02000
-+#endif
-+#ifndef S_ISUID
-+#define S_ISUID 04000
-+#endif
- 
- #include "xorriso.h"
- #include "xorriso_private.h"
-diff -Paur --no-dereference -- xorriso.upstream/xorriso/lib_mgt.c xorriso/xorriso/lib_mgt.c
---- xorriso.upstream/xorriso/lib_mgt.c
-+++ xorriso/xorriso/lib_mgt.c
-@@ -35,7 +35,9 @@
- 
- /* for -charset */
- #include <iconv.h>
-+#if !defined(__sortix__)
- #include <langinfo.h>
-+#endif
- 
- #ifdef Xorriso_standalonE
- 
-@@ -471,7 +473,11 @@
-  char *nl_charset;
-  iconv_t iconv_ret= (iconv_t) -1;
- 
-+#if defined(__sortix__)
-+ nl_charset= "UTF-8";
-+#else
-  nl_charset= nl_langinfo(CODESET);
-+#endif
-  if(name == NULL)
-    name= nl_charset;
- 
 diff -Paur --no-dereference -- xorriso.upstream/xorriso/misc_funct.c xorriso/xorriso/misc_funct.c
 --- xorriso.upstream/xorriso/misc_funct.c
 +++ xorriso/xorriso/misc_funct.c
@@ -348,50 +58,10 @@ diff -Paur --no-dereference -- xorriso.upstream/xorriso/misc_funct.c xorriso/xor
  
  
  #include "sfile.h"
-@@ -644,7 +645,7 @@
- #else
-      if(result_tm.tm_isdst < 0)
-        result_tm.tm_isdst = 0;
--     seconds-= timezone - result_tm.tm_isdst * 3600;
-+     seconds-= 0 - result_tm.tm_isdst * 3600;
- #endif
- 
-    }
-diff -Paur --no-dereference -- xorriso.upstream/xorriso/opts_a_c.c xorriso/xorriso/opts_a_c.c
---- xorriso.upstream/xorriso/opts_a_c.c
-+++ xorriso/xorriso/opts_a_c.c
-@@ -26,7 +26,6 @@
- 
- /* for -charset */
- #include <iconv.h>
--#include <langinfo.h>
- #include <locale.h>
- 
- 
 diff -Paur --no-dereference -- xorriso.upstream/xorriso/parse_exec.c xorriso/xorriso/parse_exec.c
 --- xorriso.upstream/xorriso/parse_exec.c
 +++ xorriso/xorriso/parse_exec.c
-@@ -2045,9 +2045,8 @@
-  char **argv= NULL;
-  double tdiff;
-  struct timeval tv;
-- struct timezone tz;
- 
-- gettimeofday(&tv,&tz);
-+ gettimeofday(&tv,NULL);
-  Xorriso_reset_counters(xorriso,0);
-  xorriso->idle_time= 0.0;
-  tdiff= tv.tv_sec+(1.e-6*(double) tv.tv_usec);
-@@ -2064,7 +2063,7 @@
-  ret= Xorriso_interpreter(xorriso, argc, argv, &idx, flag&0xffff);
-  if(ret<0)
-    goto ex;
-- gettimeofday(&tv,&tz);
-+ gettimeofday(&tv,NULL);
-  tdiff= tv.tv_sec+(1.e-6*(double) tv.tv_usec)-tdiff-xorriso->idle_time;
-  if(tdiff<0.001)
-    tdiff= 0.001;
-@@ -2814,7 +2813,7 @@
+@@ -2988,7 +2988,7 @@
  
   Xorriso_alloc_meM(prog, char, 5 * SfileadrL);
  
@@ -403,11 +73,11 @@ diff -Paur --no-dereference -- xorriso.upstream/xorriso/parse_exec.c xorriso/xor
 diff -Paur --no-dereference -- xorriso.upstream/xorriso/read_run.c xorriso/xorriso/read_run.c
 --- xorriso.upstream/xorriso/read_run.c
 +++ xorriso/xorriso/read_run.c
-@@ -721,7 +721,11 @@
+@@ -1139,7 +1139,11 @@
       Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, errno, "FAILURE", 0);
       ret= 0; goto ex;
     }
-+#if defined(__sortix__)
++#if defined(__sortix__) && !defined(__SORTIX_HAS_MKNOD__)
 +   ret= (errno = ENOSYS, -1);
 +#else
     ret= mknod(disk_path, mode, dev);
@@ -415,11 +85,11 @@ diff -Paur --no-dereference -- xorriso.upstream/xorriso/read_run.c xorriso/xorri
     l_errno= errno;
  
   } else if(LIBISO_ISBLK(node)) {
-@@ -734,13 +738,21 @@
+@@ -1152,13 +1156,21 @@
       goto ex;
     if(dev == (dev_t) 1)
       goto probably_damaged;
-+#if defined(__sortix__)
++#if defined(__sortix__) && !defined(__SORTIX_HAS_MKNOD__)
 +   ret= (errno = ENOSYS, -1);
 +#else
     ret= mknod(disk_path, mode, dev);
@@ -429,7 +99,7 @@ diff -Paur --no-dereference -- xorriso.upstream/xorriso/read_run.c xorriso/xorri
   } else if(LIBISO_ISFIFO(node)) {
     what= "named pipe";
     mode= S_IFIFO | 0777;
-+#if defined(__sortix__)
++#if defined(__sortix__) && !defined(__SORTIX_HAS_MKNOD__)
 +   ret= (errno = ENOSYS, -1);
 +#else
     ret= mknod(disk_path, mode, dev);
@@ -437,96 +107,14 @@ diff -Paur --no-dereference -- xorriso.upstream/xorriso/read_run.c xorriso/xorri
     l_errno= errno;
  
   } else if(LIBISO_ISSOCK(node)) {
-diff -Paur --no-dereference -- xorriso.upstream/xorriso/sfile.c xorriso/xorriso/sfile.c
---- xorriso.upstream/xorriso/sfile.c
-+++ xorriso/xorriso/sfile.c
-@@ -206,11 +206,16 @@
- 
- int Sfile_being_group_member(struct stat *stbuf, int flag)
- {
-+#if !defined(__sortix__)
-  int i, suppl_groups;
-  gid_t *suppl_glist;
-+#endif
- 
-  if (getegid()==stbuf->st_gid)
-    return(1);
-+#if defined(__sortix__)
-+ return(0);
-+#else
-  suppl_groups= getgroups(0, NULL);
-  suppl_glist= (gid_t *) malloc((suppl_groups + 1) * sizeof(gid_t));
-  if (suppl_glist==NULL)
-@@ -224,6 +229,7 @@
-  }
-  free((char *) suppl_glist);
-  return(0);
-+#endif
- }
- 
- 
-@@ -879,8 +885,8 @@
- double Sfile_microtime(int flag)
- {
-  struct timeval tv;
-- struct timezone tz;
-- gettimeofday(&tv,&tz);
-+ /*struct timezone tz;*/
-+ gettimeofday(&tv,NULL);
-  return((double) (tv.tv_sec+1.0e-6*tv.tv_usec));
- }
- 
 diff -Paur --no-dereference -- xorriso.upstream/xorriso/text_io.c xorriso/xorriso/text_io.c
 --- xorriso.upstream/xorriso/text_io.c
 +++ xorriso/xorriso/text_io.c
-@@ -29,7 +29,9 @@
- 
- /* for -charset */
- #include <iconv.h>
-+#if !defined(__sortix__)
- #include <langinfo.h>
-+#endif
- #include <locale.h>
- 
- 
-@@ -327,10 +329,9 @@
- #endif /* Xorriso_with_line_editoR */
-  double tdiff;
-  struct timeval tv;
-- struct timezone tz;
-  struct Xorriso_lsT *next_lst;
- 
-- gettimeofday(&tv,&tz);
-+ gettimeofday(&tv,NULL);
-  tdiff= tv.tv_sec+(1.e-6*(double) tv.tv_usec);
- 
-  fflush(stdout);
-@@ -475,7 +476,7 @@
- ex:;
-  if(cpt!=NULL)
-    free(cpt);
-- gettimeofday(&tv,&tz);
-+ gettimeofday(&tv,NULL);
-  xorriso->idle_time+= tv.tv_sec+(1.e-6*(double) tv.tv_usec)-tdiff;
-  return(ret);
- }
-@@ -3484,7 +3485,11 @@
-    Xorriso_status_result(xorriso,filter,fp,flag&2);
- 
-  Xorriso_get_local_charset(xorriso, &local_charset, 0);
-+#if defined(__sortix__)
-+ nl_charset= "UTF-8";
-+#else
-  nl_charset= nl_langinfo(CODESET);
-+#endif
-  is_default= (strcmp(local_charset, nl_charset) == 0);
-  sprintf(line, "-local_charset %s\n", Text_shellsafe(local_charset, sfe, 0));
-  if(!(is_default && no_defaults))
-@@ -4126,8 +4131,12 @@
+@@ -4397,8 +4397,12 @@
         adrpt= reply_pipe_adr;
       ret= stat(adrpt, &stbuf);
       if(ret == -1) {
-+#if defined(__sortix__)
++#if defined(__sortix__) && !defined(__SORTIX_HAS_MKNOD__)
 +       ret= (errno = ENOSYS, -1);
 +#else
         ret= mknod(adrpt, S_IFIFO | S_IRWXU | S_IRWXG | S_IRWXO | S_IRWXO,

ports/xorriso/xorriso.port

@@ -1,10 +1,10 @@
 NAME=xorriso
 BUILD_LIBRARIES='libiconv libz? libbz2? libreadline?'
-VERSION=1.3.8
+VERSION=1.5.6
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.gz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=901204634651533f7cbd105eab560534702458258529aac4b2f0fc946992107e
+SHA256SUM=d4b6b66bd04c49c6b358ee66475d806d6f6d7486e801106a47d331df1f2f8feb
 UPSTREAM_SITE=https://ftp.gnu.org/gnu/xorriso
 UPSTREAM_ARCHIVE=$ARCHIVE
 BUILD_SYSTEM=configure

ports/xorriso/xorriso.rmpatch

@@ -1,2 +0,0 @@
-rm -rf -- 'config.status'
-rm -rf -- 'libtool'

ports/xz/xz.patch

@@ -1,7 +1,7 @@
 diff -Paur --no-dereference -- xz.upstream/configure xz/configure
 --- xz.upstream/configure
 +++ xz/configure
-@@ -16527,7 +16527,7 @@
+@@ -17845,7 +17845,7 @@
  
  
  
@@ -10,7 +10,7 @@ diff -Paur --no-dereference -- xz.upstream/configure xz/configure
  
    acl_save_prefix="$prefix"
    prefix="$acl_final_prefix"
-@@ -17470,7 +17470,7 @@
+@@ -18798,7 +18798,7 @@
  
  
  
@@ -19,7 +19,7 @@ diff -Paur --no-dereference -- xz.upstream/configure xz/configure
  
    acl_save_prefix="$prefix"
    prefix="$acl_final_prefix"
-@@ -19269,6 +19269,7 @@
+@@ -20750,6 +20750,7 @@
  
  #if defined(_WIN32) || defined(__CYGWIN__) || defined(__OS2__) \
  		|| defined(__DJGPP__) || defined(__VMS) \
@@ -42,7 +42,7 @@ diff -Paur --no-dereference -- xz.upstream/src/common/tuklib_physmem.c xz/src/co
  #endif
  
  
-@@ -210,6 +215,10 @@
+@@ -228,6 +233,10 @@
  	struct sysinfo si;
  	if (sysinfo(&si) == 0)
  		ret = (uint64_t)si.totalram * si.mem_unit;

ports/xz/xz.port

@@ -1,12 +1,13 @@
 NAME=xz
 BUILD_LIBRARIES='liblzma libiconv? libintl?'
-VERSION=5.2.5
+VERSION=5.4.5
 DISTNAME=$NAME-$VERSION
 COMPRESSION=tar.xz
 ARCHIVE=$DISTNAME.$COMPRESSION
-SHA256SUM=3e1e518ffc912f86608a8cb35e4bd41ad1aec210df2a47aaa1f95e7f5576ef56
+SHA256SUM=da9dec6c12cf2ecf269c31ab65b5de18e8e52b96f35d5bcd08c12b43e6878803
 UPSTREAM_SITE=https://tukaani.org/xz
 UPSTREAM_ARCHIVE=$ARCHIVE
 BUILD_SYSTEM=configure
+LICENSE=GPL-2.0-or-later
 CONFIGURE_ARGS='--disable-lzmadec --disable-lzmainfo --disable-lzma-links'
 POST_INSTALL=../xz.post-install

share/man/man5/port.5

@@ -281,9 +281,6 @@ and then the replacement package
 .It Sy RUNTIME_DEPS
 Space delimited list of libraries (ports) needed at run time.
 Unsupported.
-.It Sy RUNTIME_PROGRAMS
-Space delimited list of programs (ports) needed at run time.
-Unsupported.
 .It Sy SHA256SUM
 .Xr sha256sum 1
 of the upstream release.

share/man/man5/upgrade.conf.5

@@ -41,7 +41,6 @@ It is possible to disable any upgrading whatsoever.
 If you do this, except the new source code is installed, then you can upgrade to
 the new system manually as described in
 .Xr development 7 .
-Upgrading to the next release from source is not supported.
 .Sh FORMAT
 The file is read line by line.
 The # character starts a comment and the rest of the line is ignored.

share/man/man7/installation.7

@@ -36,7 +36,7 @@ installation.
 .It
 ATA or AHCI harddisk with at least 1 GiB of unpartitioned space.
 .It
-BIOS firmware, or UEFI firmware in legacy mode.
+BIOS or EFI firmware.
 .It
 PS/2 keyboard/mouse firmware emulation to use those devices.
 .It
@@ -68,6 +68,9 @@ or
 to copy the release physically onto a USB portable storage device.
 If the target machine has a cdrom drive, you can burn the release to a cdrom.
 Insert the installation medium in the computer and power it on.
+If you have EFI firmware, you need to disable secure boot.
+EFI boot is preferred over the legacy BIOS boot, but you can use whatever method
+you prefer if your firmware supports it.
 If needed, change the boot order in the firmware to prefer the installation
 medium over any existing operating system installations.
 .Pp
@@ -241,14 +244,28 @@ The answer will default to yes if no existing partitions are found, or if an
 existing Sortix installation is found that uses the provided bootloader; and
 will otherwise default to no.
 .Pp
-The bootloader will be installed on the boot harddisk, which is the harddisk
-containing the
+On
+.Sy EFI ,
+the bootloader will be installed onto the EFI System Partition that you
+mount as
+.Pa /boot/efi .
+EFI installations should accept the bootloader and then pick the default
+bootloader through the firmware.
+TODO: The bootloader is currently installed as the fallback
+.Pa EFI/BOOT/BOOTX64.EFI
+or
+.Pa EFI/BOOT/BOOTIA32.EFI
+paths which doesn't dual-boot very well with other operating systems.
+.Pp
+On
+.Sy BIOS,
+the bootloader will be installed on the boot harddisk, which is the
+harddisk containing the
 .Pa /boot
 partition if any, and otherwise the harddisk containing the root filesystem.
-.Pp
-Single-boot configurations should use the offered bootloader.
-Dual-boot configurations should refuse it and arrange for bootloading by other
-means.
+Single-boot BIOS configurations should use the offered bootloader.
+Dual-boot BIOS configurations should refuse it and arrange for bootloading by
+other means.
 The installer will generate
 .Pa /etc/grub.d/10_sortix.cache
 which is a fragment of GRUB configuration that offers the menu option of running
@@ -304,15 +321,17 @@ You can view all devices with the
 command.
 .Pp
 If the current device does not already have a partition table, you can create a
-.Xr mbr 7
-or
 .Xr gpt 7
+or
+.Xr mbr 7
 partition table using the
 .Sy mktable
 command.
 .Xr gpt 7
 is the preferred choice for new partition tables as
 .Xr mbr 7 has unfortunate limitations.
+EFI installations should use
+.Xr gpt 7 .
 If you are dissatisfied with the current partition table, you can use
 the
 .Sy rmtable
@@ -336,17 +355,44 @@ The
 command removes a partition table entry and effectively deletes all data on the
 partition.
 .Pp
-If you accepted the included bootloader, it will be installed on the boot
-harddisk, which is the harddisk containing the
-.Pa /boot
-partition if any, and otherwise the harddisk containing the root filesystem.
-If the boot harddisk uses the
-.Xr gpt 7
-partitioning scheme, then you must create a
+If you accepted the included bootloader:
+.Bl -bullet
+.It
+On
+.Sy EFI
+you need an
+.Sy EFI System Partition
+mounted at
+.Pa /boot/efi .
+It should be at least 16 MB to provide room for growth in future versions of the
+operating system.
+The partition is shared with other operating systems, enlargen it as required
+if you wish to dual-boot other operating systems.
+The minimum size is 1 MB, however this size is unsupported for operating system
+upgrades and doesn't leave room for other operating systems.
+.It
+On
+.Sy BIOS
+with
+.Sy GPT
+you need a
 .Sy biosboot
-partition on the boot harddisk which is where the bootloader will be installed.
+partition on the harddisk containing the
+.Pa /boot
+directory.
 It should be at the start of the boot harddisk and a size of 1 MiB will be more
 than sufficient.
+.It
+On
+.Sy BIOS
+with
+.Sy MBR
+you don't need any bootloader partition.
+However, the bootloader will be installed unprotected in the unpartitioned
+space before the first partition on the harddisk containing the
+.Pa /boot
+directory.
+.El
 .Pp
 You need to make a partition containing the root filesystem mounted at
 .Pa / .

sysinstall/grub

@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2023 Jonas 'Sortie' Termansen.
+# Copyright (c) 2023, 2024 Jonas 'Sortie' Termansen.
 #
 # Permission to use, copy, modify, and distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -24,6 +24,14 @@
 
 set -e
 
+# If the new system root doesn't contain the grub port, use the old 10_sortix
+# script instead since we're not upgrading to a new version of the bootloader.
+if [ ! -e /sysmerge/etc/default/grub.d/10_sortix -a \
+     -e /etc/default/grub.d/10_sortix ]; then
+  mkdir -p /sysmerge/etc/default/grub.d
+  cp /etc/default/grub.d/10_sortix /sysmerge/etc/default/grub.d/10_sortix
+fi
+
 # The old system has copied the new kernel and initrd files from /sysmerge/boot
 # to /boot/sysmerge and we need to configure grub to boot them.
 /sysmerge/etc/default/grub.d/10_sortix --sysmerge

sysinstall/sysmerge.c

@@ -225,7 +225,7 @@ int main(int argc, char* argv[])
 	if ( !conf_path )
 		err(2, "malloc");
 	if ( !conf_load(&conf, conf_path) && errno != ENOENT )
-		err(2, conf_path);
+		err(2, "%s", conf_path);
 
 	bool did_cancel = false;
 	if ( !no_cancel && has_pending_upgrade(target) )
@@ -523,6 +523,10 @@ int main(int argc, char* argv[])
 
 		if ( conf.grub )
 		{
+			// TODO: After releasing Sortix 1.1, remove the boot device operand.
+			//       It's kept for now to allow a mixed port environment with a
+			//       new base system and old grub when bootstrapping Sortix 1.1
+			//       on Sortix 1.0.
 			char* boot_path = join_paths(target, "boot");
 			if ( !boot_path )
 				err(2, "malloc");
@@ -534,12 +538,11 @@ int main(int argc, char* argv[])
 				err(2, "Failed to find device of filesystem: %s", boot_path);
 			close(boot_fd);
 			free(boot_path);
-			// TODO: A better design for finding the parent block device.
 			if ( is_partition_name(boot_device) )
 				*strrchr(boot_device, 'p') = '\0';
 			printf(" - Installing bootloader...\n");
 			execute((const char*[]) { "grub-install", boot_device,
-				                      NULL }, "ceqQ", target);
+			                          NULL }, "ceqQ", target);
 			free(boot_device);
 		}