From 536545d7f793762ca88a02e3ddbb1b4b4b273041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Juhani=20Krekel=C3=A4?= <juhani@krekelä.fi>
Date: Sat, 28 Aug 2021 18:43:25 +0300
Subject: [PATCH] Sortix patches

---
 Makefile.in  | 2 --
 af_unix.c    | 2 ++
 configure    | 4 ++--
 os_dep.c     | 8 ++++++++
 tixbuildinfo | 6 ++++++
 5 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 tixbuildinfo

diff --git a/Makefile.in b/Makefile.in
index a8aff73..6316782 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -35,8 +35,6 @@ mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
 
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
diff --git a/af_unix.c b/af_unix.c
index 8600135..d1c9ef5 100644
--- a/af_unix.c
+++ b/af_unix.c
@@ -205,6 +205,7 @@ int bind_to_af_unix(unsigned char *name)
 #endif
 	EINTRLOOP(rs, bind(s_unix_fd, &s_unix.s, s_unix_l));
 	if (rs) {
+attempt_connect:
 		/*debug("bind: %d, %s", errno, strerror(errno));*/
 		if (af == PF_INET && errno == EADDRNOTAVAIL) {
 			/* do not try to connect if the user has not configured loopback interface */
@@ -255,6 +256,7 @@ retry_unlink:
 	}
 	EINTRLOOP(rs, listen(s_unix_fd, 100));
 	if (rs) {
+		if (errno == EADDRINUSE) goto attempt_connect;
 		error("ERROR: listen failed: %d", errno);
 		close_and_fail:
 		EINTRLOOP(rs, close(s_unix_fd));
diff --git a/configure b/configure
index 2ff8ec4..76331bf 100755
--- a/configure
+++ b/configure
@@ -118,7 +118,7 @@ libdir='${exec_prefix}/lib'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 infodir='${prefix}/info'
-mandir='${prefix}/man'
+mandir='${prefix}/share/man'
 
 # Initialize some other variables.
 subdirs=
@@ -235,7 +235,7 @@ Directory and file names:
   --includedir=DIR        C header files in DIR [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc in DIR [/usr/include]
   --infodir=DIR           info documentation in DIR [PREFIX/info]
-  --mandir=DIR            man documentation in DIR [PREFIX/man]
+  --mandir=DIR            man documentation in DIR [PREFIX/share/man]
   --srcdir=DIR            find the sources in DIR [configure dir or ..]
   --program-prefix=PREFIX prepend PREFIX to installed program names
   --program-suffix=SUFFIX append SUFFIX to installed program names
diff --git a/os_dep.c b/os_dep.c
index 8ebf95c..4222b67 100644
--- a/os_dep.c
+++ b/os_dep.c
@@ -3434,6 +3434,14 @@ int os_default_charset(void)
 	return 0;
 }
 
+// PATCH: Always use UTF-8 instead of language-specific terminal charsets
+#elif defined(__sortix__)
+
+int os_default_charset(void)
+{
+	return utf8_table;
+}
+
 #elif !defined(DOS)
 
 int os_default_charset(void)
diff --git a/tixbuildinfo b/tixbuildinfo
new file mode 100644
index 0000000..ec55952
--- /dev/null
+++ b/tixbuildinfo
@@ -0,0 +1,6 @@
+tix.version=1
+tix.class=srctix
+pkg.name=links
+pkg.build-libraries=libssl libz libevent? xz?
+pkg.build-system=configure
+pkg.location-independent=true