tmux: use preferred Haiku config path (#5544)

app-misc/tmux/patches/tmux-3.1c.patchset

@@ -1,4 +1,4 @@
-From ebdeb6ca50c64027beed7f55a6a9ec0e71d3e5f1 Mon Sep 17 00:00:00 2001
+From 1f2ce2f48932145f0875d9a951242359de667eed Mon Sep 17 00:00:00 2001
 From: Sergei Reznikov <diver@gelios.net>
 Date: Fri, 7 Jul 2017 16:23:59 +0300
 Subject: Add initial Haiku support based on hpux
@@ -98,10 +98,22 @@ index 0000000..6960ee4
 +	return (-1);
 +}
 diff --git a/configure.ac b/configure.ac
-index 2d9fad7..5cce1d9 100644
+index bb702f9..b4b61ce 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -621,6 +621,10 @@ case "$host_os" in
+@@ -291,9 +291,9 @@ AC_TRY_LINK(
+ if test "x$found_b64_ntop" = xno; then
+ 	AC_MSG_RESULT(no)
+ 
+-	AC_MSG_CHECKING(for b64_ntop with -lresolv)
++	AC_MSG_CHECKING(for b64_ntop with -lnetwork)
+ 	OLD_LIBS="$LIBS"
+-	LIBS="$LIBS -lresolv"
++	LIBS="$LIBS -lnetwork"
+ 	AC_TRY_LINK(
+ 		[
+ 			#include <sys/types.h>
+@@ -589,6 +589,10 @@ case "$host_os" in
  				;;
  		esac
  		;;
@@ -160,10 +172,10 @@ index 0000000..a6d75f9
 +	return (event_init());
 +}
 diff --git a/tty.c b/tty.c
-index 4d54353..34f1a23 100644
+index 8efe57b..8cecb8a 100644
 --- a/tty.c
 +++ b/tty.c
-@@ -281,7 +281,11 @@ tty_start_tty(struct tty *tty)
+@@ -307,7 +307,11 @@ tty_start_tty(struct tty *tty)
  		event_add(&tty->event_in, NULL);
  
  		memcpy(&tio, &tty->tio, sizeof tio);
@@ -176,22 +188,41 @@ index 4d54353..34f1a23 100644
  		tio.c_iflag |= IGNBRK;
  		tio.c_oflag &= ~(OPOST|ONLCR|OCRNL|ONLRET);
  		tio.c_lflag &= ~(IEXTEN|ICANON|ECHO|ECHOE|ECHONL|ECHOCTL|
-diff --git a/configure.ac b/configure.ac
-index 5cce1d9..32ec9c0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -284,9 +284,9 @@ AC_TRY_LINK(
- if test "x$found_b64_ntop" = xno; then
- 	AC_MSG_RESULT(no)
- 
--	AC_MSG_CHECKING(for b64_ntop with -lresolv)
-+	AC_MSG_CHECKING(for b64_ntop with -lnetwork)
- 	OLD_LIBS="$LIBS"
--	LIBS="$LIBS -lresolv"
-+	LIBS="$LIBS -lnetwork"
- 	AC_TRY_LINK(
- 		[
- 			#include <sys/types.h>
 -- 
-2.19.1
+2.30.0
+
+
+From ac099e2b8976b9ef36f82f5e24ac0c3fcabfed9d Mon Sep 17 00:00:00 2001
+From: Zach Dykstra <dykstra.zachary@gmail.com>
+Date: Mon, 11 Jan 2021 18:56:17 -0600
+Subject: tmux: use preferred Haiku config path
+
+
+diff --git a/Makefile.am b/Makefile.am
+index 082a467..a331d45 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -13,7 +13,7 @@ dist_EXTRA_tmux_SOURCES = compat/*.[ch]
+ # Preprocessor flags.
+ AM_CPPFLAGS += @XOPEN_DEFINES@ \
+ 	-DTMUX_VERSION="\"@VERSION@\"" \
+-	-DTMUX_CONF="\"$(sysconfdir)/tmux.conf:~/.tmux.conf:~/.config/tmux/tmux.conf\""
++	-DTMUX_CONF="\"$(sysconfdir)/tmux.conf:$(shell finddir B_USER_SETTINGS_DIRECTORY)/tmux.conf:~/.tmux.conf:~/.config/tmux/tmux.conf\""
+ 
+ # Additional object files.
+ LDADD = $(LIBOBJS)
+@@ -198,8 +198,9 @@ endif
+ # Install tmux.1 in the right format.
+ install-exec-hook:
+ 	if test x@MANFORMAT@ = xmdoc; then \
+-		sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1 \
+-			>$(srcdir)/tmux.1.mdoc; \
++		sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" \
++		-e "s|~/\.|$(shell finddir B_USER_SETTINGS_DIRECTORY)/|g" \
++		$(srcdir)/tmux.1 > $(srcdir)/tmux.1.mdoc; \
+ 	else \
+ 		sed -e "s|@SYSCONFDIR@|$(sysconfdir)|g" $(srcdir)/tmux.1| \
+ 			$(AWK) -f $(srcdir)/mdoc2man.awk >$(srcdir)/tmux.1.man; \
+-- 
+2.30.0
 

app-misc/tmux/tmux-3.1c.recipe

@@ -6,7 +6,7 @@ such as GNU screen."
 HOMEPAGE="http://tmux.github.io/"
 COPYRIGHT="2015 tmux team"
 LICENSE="ISC"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://github.com/tmux/tmux/releases/download/$portVersion/tmux-$portVersion.tar.gz"
 CHECKSUM_SHA256="918f7220447bef33a1902d4faff05317afd9db4ae1c9971bef5c787ac6c88386"
 PATCHES="tmux-$portVersion.patchset"