Make tmux build on Darwin/amd64.

Patches from tmux Subversion Revisions 2565 and 2568.

3 files changed, 237 insertions, 3 deletions

diff --git a/misc/tmux/distinfo b/misc/tmux/distinfo
index 8e5e0a5266f..e3671b77876 100644
--- a/misc/tmux/distinfo
+++ b/misc/tmux/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.14 2011/08/17 16:57:19 jmmv Exp $
+$NetBSD: distinfo,v 1.15 2011/09/16 05:18:57 minskim Exp $
 
 SHA1 (tmux-1.5.tar.gz) = e26132f02f344f8d6d06ae87d11f6a7aad880f67
 RMD160 (tmux-1.5.tar.gz) = 08eec02bcbd91b3c37a36a05167f3758e7911973
 Size (tmux-1.5.tar.gz) = 374093 bytes
-SHA1 (patch-aa) = e50976effc9fa43044d45055aabd86a69d9d9047
-SHA1 (patch-ab) = 35dc1e7e8d0cd1bac40c2def39fbaed76d80b3c5
+SHA1 (patch-configure) = 86974baa9f2e51d46dda93f78ea6f60ba78d0eeb
+SHA1 (patch-configure.ac) = 2b9b076f184f73ed00e509fc96f5da7e7358a710
diff --git a/misc/tmux/patches/patch-configure b/misc/tmux/patches/patch-configure
new file mode 100644
index 00000000000..d717bad725e
--- /dev/null
+++ b/misc/tmux/patches/patch-configure
@@ -0,0 +1,181 @@
+$NetBSD: patch-configure,v 1.1 2011/09/16 05:18:58 minskim Exp $
+
+Compatibility for b64_ntop.  SVN Revisions 2565 and 2568.
+
+--- configure.orig	2011-07-09 16:12:35.000000000 +0000
++++ configure
+@@ -637,6 +637,8 @@ NO_FORKPTY_TRUE
+ NO_IMSG_FALSE
+ NO_IMSG_TRUE
+ XOPEN_DEFINES
++NO_B64_NTOP_FALSE
++NO_B64_NTOP_TRUE
+ IS_GLIBC_FALSE
+ IS_GLIBC_TRUE
+ IS_SUNCC_FALSE
+@@ -4605,119 +4607,83 @@ if test "x$found_curses" = xno; then
+     as_fn_error "\"curses not found\"" "$LINENO" 5
+ fi
+ 
+-# Look for networking libraries.
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing b64_ntop" >&5
+-$as_echo_n "checking for library containing b64_ntop... " >&6; }
+-if test "${ac_cv_search_b64_ntop+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
++# Check for b64_ntop.
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for b64_ntop" >&5
++$as_echo_n "checking for b64_ntop... " >&6; }
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char b64_ntop ();
++		#include <sys/types.h>
++		#include <netinet/in.h>
++		#include <resolv.h>
++
+ int
+ main ()
+ {
+-return b64_ntop ();
++b64_ntop(NULL, 0, NULL, 0);
+   ;
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' resolv; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search_b64_ntop=$ac_res
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if test "${ac_cv_search_b64_ntop+set}" = set; then :
+-  break
+-fi
+-done
+-if test "${ac_cv_search_b64_ntop+set}" = set; then :
+-
++if ac_fn_c_try_link "$LINENO"; then :
++  found_b64_ntop=yes
+ else
+-  ac_cv_search_b64_ntop=no
+-fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_b64_ntop" >&5
+-$as_echo "$ac_cv_search_b64_ntop" >&6; }
+-ac_res=$ac_cv_search_b64_ntop
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
++  found_b64_ntop=no
+ 
+ fi
++rm -f core conftest.err conftest.$ac_objext \
++    conftest$ac_exeext conftest.$ac_ext
++if test "x$found_b64_ntop" = xno; then
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
+ 
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing __b64_ntop" >&5
+-$as_echo_n "checking for library containing __b64_ntop... " >&6; }
+-if test "${ac_cv_search___b64_ntop+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  ac_func_search_save_LIBS=$LIBS
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for b64_ntop with -lresolv" >&5
++$as_echo_n "checking for b64_ntop with -lresolv... " >&6; }
++	LIBS="$LIBS -lresolv"
++	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ 
+-/* Override any GCC internal prototype to avoid an error.
+-   Use char because int might match the return type of a GCC
+-   builtin and then its argument prototype would still apply.  */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char __b64_ntop ();
++			#include <sys/types.h>
++			#include <netinet/in.h>
++			#include <resolv.h>
++
+ int
+ main ()
+ {
+-return __b64_ntop ();
++b64_ntop(NULL, 0, NULL, 0);
+   ;
+   return 0;
+ }
+ _ACEOF
+-for ac_lib in '' resolv; do
+-  if test -z "$ac_lib"; then
+-    ac_res="none required"
+-  else
+-    ac_res=-l$ac_lib
+-    LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
+-  fi
+-  if ac_fn_c_try_link "$LINENO"; then :
+-  ac_cv_search___b64_ntop=$ac_res
++if ac_fn_c_try_link "$LINENO"; then :
++  found_b64_ntop=yes
++else
++  found_b64_ntop=no
++
+ fi
+ rm -f core conftest.err conftest.$ac_objext \
+-    conftest$ac_exeext
+-  if test "${ac_cv_search___b64_ntop+set}" = set; then :
+-  break
++    conftest$ac_exeext conftest.$ac_ext
++	if test "x$found_b64_ntop" = xno; then
++		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++	fi
+ fi
+-done
+-if test "${ac_cv_search___b64_ntop+set}" = set; then :
++if test "x$found_b64_ntop" = xyes; then
++	$as_echo "#define HAVE_B64_NTOP 1" >>confdefs.h
+ 
+-else
+-  ac_cv_search___b64_ntop=no
++	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
+ fi
+-rm conftest.$ac_ext
+-LIBS=$ac_func_search_save_LIBS
++ if test "x$found_b64_ntop" = xno; then
++  NO_B64_NTOP_TRUE=
++  NO_B64_NTOP_FALSE='#'
++else
++  NO_B64_NTOP_TRUE='#'
++  NO_B64_NTOP_FALSE=
+ fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___b64_ntop" >&5
+-$as_echo "$ac_cv_search___b64_ntop" >&6; }
+-ac_res=$ac_cv_search___b64_ntop
+-if test "$ac_res" != no; then :
+-  test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
+ 
+-fi
+ 
++# Look for networking libraries.
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntoa" >&5
+ $as_echo_n "checking for library containing inet_ntoa... " >&6; }
+ if test "${ac_cv_search_inet_ntoa+set}" = set; then :
diff --git a/misc/tmux/patches/patch-configure.ac b/misc/tmux/patches/patch-configure.ac
new file mode 100644
index 00000000000..46805ec0110
--- /dev/null
+++ b/misc/tmux/patches/patch-configure.ac
@@ -0,0 +1,53 @@
+$NetBSD: patch-configure.ac,v 1.1 2011/09/16 05:18:58 minskim Exp $
+
+Compatibility for b64_ntop.  SVN Revisions 2565 and 2568.
+
+--- configure.ac.orig	2011-07-09 16:00:17.000000000 +0000
++++ configure.ac
+@@ -121,9 +121,44 @@ if test "x$found_curses" = xno; then
+     AC_MSG_ERROR("curses not found")
+ fi
+ 
++# Check for b64_ntop.
++AC_MSG_CHECKING(for b64_ntop)
++AC_TRY_LINK(
++	[
++		#include <sys/types.h>
++		#include <netinet/in.h>
++		#include <resolv.h>
++	],
++	[b64_ntop(NULL, 0, NULL, 0);],
++	found_b64_ntop=yes,
++	found_b64_ntop=no
++)
++if test "x$found_b64_ntop" = xno; then
++	AC_MSG_RESULT(no)
++
++	AC_MSG_CHECKING(for b64_ntop with -lresolv)
++	LIBS="$LIBS -lresolv"
++	AC_TRY_LINK(
++		[
++			#include <sys/types.h>
++			#include <netinet/in.h>
++			#include <resolv.h>
++		],
++		[b64_ntop(NULL, 0, NULL, 0);],
++		found_b64_ntop=yes,
++		found_b64_ntop=no
++	)
++	if test "x$found_b64_ntop" = xno; then
++		AC_MSG_RESULT(no)
++	fi
++fi
++if test "x$found_b64_ntop" = xyes; then
++	AC_DEFINE(HAVE_B64_NTOP)
++	AC_MSG_RESULT(yes)
++fi
++AM_CONDITIONAL(NO_B64_NTOP, [test "x$found_b64_ntop" = xno])
++
+ # Look for networking libraries.
+-AC_SEARCH_LIBS(b64_ntop, resolv)
+-AC_SEARCH_LIBS(__b64_ntop, resolv)
+ AC_SEARCH_LIBS(inet_ntoa, nsl)
+ AC_SEARCH_LIBS(socket, socket)
+ AC_CHECK_LIB(xnet, socket)