head 1.6; access; symbols pkgsrc-2021Q4:1.5.0.6 pkgsrc-2021Q4-base:1.5 pkgsrc-2021Q3:1.5.0.4 pkgsrc-2021Q3-base:1.5 pkgsrc-2021Q2:1.5.0.2 pkgsrc-2021Q2-base:1.5 pkgsrc-2013Q2:1.3.0.4 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.2 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.2.0.2 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.1.0.2 pkgsrc-2011Q3-base:1.1; locks; strict; comment @# @; 1.6 date 2021.12.29.19.18.39; author rhialto; state dead; branches; next 1.5; commitid mUjaiNZ7fF930AmD; 1.5 date 2021.04.17.10.28.22; author leot; state Exp; branches; next 1.4; commitid 2DcZF3EbhhWtiDPC; 1.4 date 2021.04.17.10.11.04; author leot; state Exp; branches; next 1.3; commitid pp6WpnJQqUcxcDPC; 1.3 date 2012.01.28.23.04.53; author christos; state dead; branches; next 1.2; 1.2 date 2011.10.04.11.55.34; author ryoon; state Exp; branches; next 1.1; 1.1 date 2011.09.16.05.18.58; author minskim; state Exp; branches; next ; desc @@ 1.6 log @misc/tmux: minor update to 3.2a. CHANGES FROM 3.2 TO 3.2a * Add an "always" value for the "extended-keys" option; if set then tmux will forward extended keys to applications even if they do not request them. * Add a "mouse" terminal feature so tmux can enable the mouse on terminals where it is known to be supported even if terminfo(5) says otherwise. * Do not expand the filename given to -f so it can contain colons. * Fixes for problems with extended keys and modifiers, scroll region, source-file, crosscompiling, format modifiers and other minor issues. @ text @$NetBSD: patch-configure,v 1.5 2021/04/17 10:28:22 leot Exp $ Avoid unportable `==' test(1) operator. Shared upstream via: --- configure.orig 2021-04-17 09:58:34.124050016 +0000 +++ configure @@@@ -3030,10 +3030,10 @@@@ fi if test "x$enable_fuzzing" = xyes; then $as_echo "#define NEED_FUZZING 1" >>confdefs.h - test "x$CC" == x && CC=clang - test "x$FUZZING_LIBS" == x && \ + test "x$CC" = x && CC=clang + test "x$FUZZING_LIBS" = x && \ FUZZING_LIBS="-fsanitize=fuzzer" - test "x$SAVED_CFLAGS" == x && \ + test "x$SAVED_CFLAGS" = x && \ AM_CFLAGS="-g -fsanitize=fuzzer-no-link,address" fi @ 1.5 log @tmux: Add a reference to upstream PR @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.4 2021/04/17 10:11:04 leot Exp $ @ 1.4 log @tmux: Update to 3.2 Changes: 3.2 --- * Add a flag to disable keys to close a message. * Permit shortcut keys in buffer, client, tree modes to be configured with a format (-K flag to choose-buffer, choose-client, choose-tree). * Add a current_file format for the config file being parsed. * When display-message used in config file, show the message after the config file finishes. * Add client-detached notification in control mode. * Improve performance of format evaluation. * Make jump command support UTF-8 in copy mode. * Support X11 colour names and other colour formats for OSC 10 and 11. * Add "pipe" variants of "copy-pipe" commands which do not copy. * Include "focused" in client flags. * Send Unicode directional isolate characters around horizontal pane borders if the terminal supports UTF-8 and an extension terminfo(5) capability "Bidi" is present. * Add a -S flag to new-window to make it select the existing window if one with the given name already exists rather than failing with an error. * Addd a format modifier to check if a window or session name exists (N/w or N/s). * Add compat clock_gettime for older macOS. * Add a no-detached choice to detach-on-destroy which detaches only if there are no other detached sessions to switch to. * Add rectangle-on and rectangle-off copy mode commands. * Change so that window_flags escapes # automatically. A new format window_raw_flags contains the old unescaped version. * Add -N flag to never start server even if command would normally do so. * With incremental search, start empty and only repeat the previous search if the user tries to search again with an empty prompt. * Add a value for remain-on-exit that only keeps the pane if the program failed. * Add a -C flag to run-shell to use a tmux command rather than a shell command. * Do not list user options with show-hooks. * Remove current match indicator in copy mode which can't work anymore since we only search the visible region. * Make synchronize-panes a pane option and add -U flag to set-option to unset an option on all panes. * Make replacement of ##s consistent when drawing formats, whether followed by [ or not. Add a flag (e) to the q: format modifier to double up #s * Add -N flag to display-panes to ignore keys. * Change how escaping is processed for formats so that ## and # can be used in styles. * Add a 'w' format modifier for string width. * Add support for Haiku. * Expand menu and popup -x and -y as formats. * Add numeric comparisons for formats. * Fire focus events even when the pane is in a mode. * Add -O flag to display-menu to not automatically close when all mouse buttons are released. * Allow fnmatch(3) wildcards in update-environment. * Disable nested job expansion so that the result of #() is not expanded again. * Use the setal capability as well as (tmux's) Setulc. * Add -q flag to unbind-key to hide errors. * Allow -N without a command to change or add a note to an existing key. * Add a -w flag to set- and load-buffer to send to clipboard using OSC 52. * Add -F to set-environment and source-file. * Allow colour to be spelt as color in various places. * Add n: modifier to get length of a format. * Respond to OSC colour requests if a colour is available. * Add a -d option to display-message to set delay. * Add a way for control mode clients to subscribe to a format and be notified of changes rather than having to poll. * Add some formats for search in copy mode (search_present, search_match). * Do not wait on shutdown for commands started with run -b. * Add -b flags to insert a window before (like the existing -a for after) to break-pane, move-window, new-window. * Make paste -p the default for ]. * Add support for pausing a pane when the output buffered for a control mode client gets too far behind. The pause-after flag with a time is set on the pane with refresh-client -f and a paused pane may be resumed with refresh-client -A. * Allow strings in configuration files to span multiple lines - newlines and any leading whitespace are removed, as well as any following comments that couldn't be part of a format. This allows long formats or other strings to be annotated and indented. * Instead of using a custom parse function to process {} in configuration files, treat as a set of statements the same as outside {} and convert back to a string as the last step. This means the rules are consistent inside and outside {}, %if and friends work at the right time, and the final result isn't littered with unnecessary newlines. * Add support for extended keys - both xterm(1)'s CSI 27 ~ sequence and the libtickit CSI u sequence are accepted; only the latter is output. tmux will only attempt to use these if the extended-keys option is on and it can detect that the terminal outside supports them (or is told it does with the "extkeys" terminal feature). * Add an option to set the pane border lines style from a choice of single lines (ACS or UTF-8), double or heavy (UTF-8), simple (plain ASCII) or number (the pane numbers). Lines that won't work on a non-UTF-8 terminal are translated back into ACS when they are output. * Make focus events update the latest client (like a key press). * Store UTF-8 characters differently to reduce memory use. * Fix break-pane -n when only one pane in the window. * Instead of sending all data to control mode clients as fast as possible, add a limit of how much data will be sent to the client and try to use it for panes with some degree of fairness. * Add an active-pane client flag (set with attach-session -f, new-session -f or refresh-client -f). This allows a client to have an independent active pane for interactive use (the window client pane is still used for many things however). * Add a mark to copy mode, this is set with the set-mark command (bound to X) and appears with the entire line shown using copy-mode-mark-style and the marked character in reverse. The jump-to-mark command (bound to M-x) swaps the mark and the cursor positions. * Add a -D flag to make the tmux server run in the foreground and not as a daemon. * Do not loop forever in copy mode when search finds an empty match. * Fix the next-matching-bracket logic when using vi(1) keys. * Add a customize mode where options may be browsed and changed, includes adding a brief description of each option. Bound to C-b C by default. * Change message log (C-b ~) so there is one for the server rather than one per client and it remains after detach, and make it useful by logging every command. * Add M-+ and M-- to tree mode to expand and collapse all. * Change the existing client flags for control mode to apply for any client, use the same mechanism for the read-only flag and add an ignore-size flag. refresh-client -F has become -f (-F stays for backwards compatibility) and attach-session and switch-client now have -f flags also. A new format client_flags lists the flags and is shown by list-clients by default. This separates the read-only flag from "ignore size" behaviour (new ignore-size) flag - both behaviours are useful in different circumstances. attach -r and switchc -r remain and set or toggle both flags together. * Store and restore cursor position when copy mode is resized. * Export TERM_PROGRAM and TERM_PROGRAM_VERSION like various other terminals. * Add formats for after hook command arguments: hook_arguments with all the arguments together; hook_argument_0, hook_argument_1 and so on with individual arguments; hook_flag_X if flag -X is present; hook_flag_X_0, hook_flag_X_1 and so on if -X appears multiple times. * Try to search the entire history first for up to 200 ms so a search count can be shown. If it takes too long, search the visible text only. * Use VIS_CSTYLE for paste buffers also (show \012 as \n). * Change default formats for tree mode, client mode and buffer mode to be more compact and remove some clutter. * Add a key (e) in buffer mode to open the buffer in an editor. The buffer contents is updated when the editor exits. * Add -e flag for new-session to set environment variables, like the same flag for new-window. * Improve search match marking in copy mode. Two new options copy-mode-match-style and copy-mode-current-match-style to set the style for matches and for the current match respectively. Also a change so that if a copy key is pressed with no selection, the current match (if any) is copied. * Sanitize session names like window names instead of forbidding invalid ones. * Check if the clear terminfo(5) capability starts with CSI and if so then assume the terminal is VT100-like, rather than relying on the XT capability. * Improve command prompt tab completion and add menus both for strings and -t and -s (when used without a trailing space). command-prompt has additional flags for only completing a window (-W) and a target (-T), allowing C-b ' to only show windows and C-b . only targets. * Change all the style options to string options so they can support formats. Change pane-border-active-style to use this to change the border colour when in a mode or with synchronize-panes on. This also implies a few minor changes to existing behaviour: - set-option -a with a style option automatically inserts a comma between the old value and appended text. - OSC 10 and 11 no longer set the window-style option, instead they store the colour internally in the pane data and it is used as the default when the option is evaluated. - status-fg and -bg now override status-style instead of the option values being changed. * Add extension terminfo(5) capabilities for margins and focus reporting. * Try $XDG_CONFIG_HOME/tmux/tmux.conf as well as ~/.config/tmux/tmux.conf for configuration file (the search paths are in TMUX_CONF in Makefile.am). * Remove the DSR 1337 iTerm2 extension and replace by the extended device attributes sequence (CSI > q) supported by more terminals. * Add a -s flag to copy-mode to specify a different pane for the source content. This means it is possible to view two places in a pane's history at the same time in different panes, or view the history while still using the pane. Pressing r refreshes the content from the source pane. * Add an argument to list-commands to show only a single command. * Change copy mode to make copy of the pane history so it does not need to freeze the pane. * Restore pane_current_path format from portable tmux on OpenBSD. * Wait until the initial command sequence is done before sending a device attributes request and other bits that prompt a reply from the terminal. This means that stray relies are not left on the terminal if the command has attached and then immediately detached and tmux will not be around to receive them. * Add a -f filter argument to the list commands like choose-tree. * Move specific hooks for panes to pane options and windows for window options rather than all hooks being session options. These hooks are now window options: window-layout-changed window-linked window-pane-changed window-renamed window-unlinked And these now pane options: pane-died pane-exited pane-focus-in pane-focus-out pane-mode-changed pane-set-clipboard Any existing configurations using these hooks on a session rather than globally (that is, set-hook or set-option without -g) may need to be changed. * Show signal names when a process exits with remain-on-exit on platforms which have a way to get them. * Start menu with top item selected if no mouse and use mode-style for the selected item. * Add a copy-command option and change copy-pipe and friends to pipe to it if used without arguments, allows all the default copy key bindings to be changed to pipe with one option rather than needing to change each key binding individually. * Tidy up the terminal detection and feature code and add named sets of terminal features, each of which are defined in one place and map to a builtin set of terminfo(5) capabilities. Features can be specified based on TERM with a new terminal-features option or with the -T flag when running tmux. tmux will also detect a few common terminals from the DA and DSR responses. This is intended to make it easier to configure tmux's use of terminfo(5) even in the presence of outdated ncurses(3) or terminfo(5) databases or for features which do not yet have a terminfo(5) entry. Instead of having to grok terminfo(5) capability names and what they should be set to in the terminal-overrides option, the user can hopefully just give tmux a feature name and let it do the right thing. The terminal-overrides option remains both for backwards compatibility and to allow tweaks of individual capabilities. * Support mintty's application escape sequence (means tmux doesn't have to delay to wait for Escape, so no need to reduce escape-time when using mintty). * Change so main-pane-width and height can be given as a percentage. * Support for the iTerm2 synchronized updates feature (allows the terminal to avoid unnecessary drawing while output is still in progress). * Make the mouse_word and mouse_line formats work in copy mode and enable the default pane menu in copy mode. * Add a -T flag to resize-pane to trim lines below the cursor, moving lines out of the history. * Add a way to mark environment variables as "hidden" so they can be used by tmux (for example in formats) but are not set in the environment for new panes. set-environment and show-environment have a new -h flag and there is a new %hidden statement for the configuration file. * Change default position for display-menu -x and -y to centre rather than top left. * Add support for per-client transient popups, similar to menus but which are connected to an external command (like a pane). These are created with new command display-popup. * Change double and triple click bindings so that only one is fired (previously double click was fired on the way to triple click). Also add default double and triple click bindings to copy the word or line under the cursor and change the existing bindings in copy mode to do the same. * Add a default binding for button 2 to paste. * Add -d flag to run-shell to delay before running the command and allow it to run without a command so it just delays. * Add C-g to cancel command prompt with vi keys as well as emacs, and q in command mode. * When the server socket is given with -S, create it with umask 177 instead of 117 (because it may not be in a safe directory like the default directory in /tmp). * Add a copy-mode -H flag to hide the position marker in the top right. * Add number operators for formats (+, -, *, / and m), @ text @d1 1 a1 1 $NetBSD$ d5 4 @ 1.3 log @PR/45885: Matthias Rampke: [patch] misc/tmux: update to version 1.6 @ text @d1 1 a1 1 $NetBSD: patch-configure,v 1.2 2011/10/04 11:55:34 ryoon Exp $ d3 1 a3 2 Compatibility for b64_ntop. SVN Revisions 2565 and 2568. Add DragonFly support, SVN 2600. d5 1 a5 1 --- configure.orig 2011-07-09 16:12:35.000000000 +0000 d7 12 a18 653 @@@@ -603,6 +603,8 @@@@ IS_FREEBSD_FALSE IS_FREEBSD_TRUE IS_LINUX_FALSE IS_LINUX_TRUE +IS_DRAGONFLY_FALSE +IS_DRAGONFLY_TRUE IS_DARWIN_FALSE IS_DARWIN_TRUE IS_AIX_FALSE @@@@ -637,6 +639,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 @@@@ -1315,11 +1319,9 @@@@ Configuration: --srcdir=DIR find the sources in DIR [configure dir or \`..'] Installation directories: - --prefix=PREFIX - install architecture-independent files in PREFIX + --prefix=PREFIX install architecture-independent files in PREFIX [$ac_default_prefix] - --exec-prefix=EPREFIX - install architecture-dependent files in EPREFIX + --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX [PREFIX] By default, \`make install' will install all the files in @@@@ -1344,8 +1346,7 @@@@ Fine tuning of the installation director --infodir=DIR info documentation [DATAROOTDIR/info] --localedir=DIR locale-dependent data [DATAROOTDIR/locale] --mandir=DIR man documentation [DATAROOTDIR/man] - --docdir=DIR - documentation root [DATAROOTDIR/doc/tmux] + --docdir=DIR documentation root [DATAROOTDIR/doc/tmux] --htmldir=DIR html documentation [DOCDIR] --dvidir=DIR dvi documentation [DOCDIR] --pdfdir=DIR pdf documentation [DOCDIR] @@@@ -1377,26 +1378,18 @@@@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --disable-dependency-tracking speeds up one-time build --enable-dependency-tracking do not reject slow dependency extractors - --enable-debug - create a debug build - --enable-static - create a static build + --enable-debug create a debug build + --enable-static create a static build Some influential environment variables: - CC - C compiler command - CFLAGS - C compiler flags - LDFLAGS - linker flags, e.g. -L if you have libraries in a + CC C compiler command + CFLAGS C compiler flags + LDFLAGS linker flags, e.g. -L if you have libraries in a nonstandard directory - LIBS - libraries to pass to the linker, e.g. -l - CPPFLAGS - C/C++/Objective C preprocessor flags, e.g. -I if + LIBS libraries to pass to the linker, e.g. -l + CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I if you have headers in a nonstandard directory - CPP - C preprocessor + CPP C preprocessor Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. @@@@ -2083,32 +2076,26 @@@@ $as_echo "/* confdefs.h */" > confdefs.h cat >>confdefs.h <<_ACEOF #define PACKAGE_NAME "$PACKAGE_NAME" - _ACEOF cat >>confdefs.h <<_ACEOF #define PACKAGE_TARNAME "$PACKAGE_TARNAME" - _ACEOF cat >>confdefs.h <<_ACEOF #define PACKAGE_VERSION "$PACKAGE_VERSION" - _ACEOF cat >>confdefs.h <<_ACEOF #define PACKAGE_STRING "$PACKAGE_STRING" - _ACEOF cat >>confdefs.h <<_ACEOF #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT" - _ACEOF cat >>confdefs.h <<_ACEOF #define PACKAGE_URL "$PACKAGE_URL" - _ACEOF @@@@ -2661,13 +2648,11 @@@@ fi cat >>confdefs.h <<_ACEOF #define PACKAGE "$PACKAGE" - _ACEOF cat >>confdefs.h <<_ACEOF #define VERSION "$VERSION" - _ACEOF # Some tools Automake needs. @@@@ -3839,8 +3824,7 @@@@ else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } -$as_echo "#define NO_MINUS_C_MINUS_O 1 -" >>confdefs.h +$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h fi @@@@ -4239,8 +4223,7 @@@@ fi $as_echo "$ac_cv_header_stdc" >&6; } if test $ac_cv_header_stdc = yes; then -$as_echo "#define STDC_HEADERS 1 -" >>confdefs.h +$as_echo "#define STDC_HEADERS 1" >>confdefs.h fi @@@@ -4248,15 +4231,13 @@@@ fi for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header -" | $as_tr_sh` + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default " eval as_val=\$$as_ac_Header if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF fi @@@@ -4284,14 +4265,12 @@@@ for ac_header in \ do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header -" | $as_tr_sh` + as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" eval as_val=\$$as_ac_Header if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1 - _ACEOF fi @@@@ -4470,7 +4449,6 @@@@ $as_echo "$ac_cv_lib_rt_clock_gettime" > if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBRT 1 - _ACEOF LIBS="-lrt $LIBS" @@@@ -4605,119 +4583,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 + #include + #include + 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 + #include + #include + 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 : @@@@ -4869,7 +4811,6 @@@@ $as_echo "$ac_cv_lib_xnet_socket" >&6; } if test "x$ac_cv_lib_xnet_socket" = x""yes; then : cat >>confdefs.h <<_ACEOF #define HAVE_LIBXNET 1 - _ACEOF LIBS="-lxnet $LIBS" @@@@ -5053,8 +4994,7 @@@@ else fi if test "x$found_imsg_init" = xyes; then - $as_echo "#define HAVE_IMSG 1 -" >>confdefs.h + $as_echo "#define HAVE_IMSG 1" >>confdefs.h fi if test "x$found_imsg_init" = xno; then @@@@ -5126,8 +5066,7 @@@@ else fi if test "x$found_forkpty" = xyes; then - $as_echo "#define HAVE_FORKPTY 1 -" >>confdefs.h + $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h fi if test "x$found_forkpty" = xno; then @@@@ -5148,8 +5087,7 @@@@ else fi if test "x$found_closefrom" = xyes; then - $as_echo "#define HAVE_CLOSEFROM 1 -" >>confdefs.h + $as_echo "#define HAVE_CLOSEFROM 1" >>confdefs.h fi if test "x$found_closefrom" = xno; then @@@@ -5170,8 +5108,7 @@@@ else fi if test "x$found_daemon" = xyes; then - $as_echo "#define HAVE_DAEMON 1 -" >>confdefs.h + $as_echo "#define HAVE_DAEMON 1" >>confdefs.h fi if test "x$found_daemon" = xno; then @@@@ -5192,8 +5129,7 @@@@ else fi if test "x$found_setenv" = xyes; then - $as_echo "#define HAVE_SETENV 1 -" >>confdefs.h + $as_echo "#define HAVE_SETENV 1" >>confdefs.h fi if test "x$found_setenv" = xno; then @@@@ -5214,8 +5150,7 @@@@ else fi if test "x$found_strlcpy" = xyes; then - $as_echo "#define HAVE_STRLCPY 1 -" >>confdefs.h + $as_echo "#define HAVE_STRLCPY 1" >>confdefs.h fi if test "x$found_strlcpy" = xno; then @@@@ -5236,8 +5171,7 @@@@ else fi if test "x$found_strlcat" = xyes; then - $as_echo "#define HAVE_STRLCAT 1 -" >>confdefs.h + $as_echo "#define HAVE_STRLCAT 1" >>confdefs.h fi if test "x$found_strlcat" = xno; then @@@@ -5258,8 +5192,7 @@@@ else fi if test "x$found_asprintf" = xyes; then - $as_echo "#define HAVE_ASPRINTF 1 -" >>confdefs.h + $as_echo "#define HAVE_ASPRINTF 1" >>confdefs.h fi if test "x$found_asprintf" = xno; then @@@@ -5280,8 +5213,7 @@@@ else fi if test "x$found_fgetln" = xyes; then - $as_echo "#define HAVE_FGETLN 1 -" >>confdefs.h + $as_echo "#define HAVE_FGETLN 1" >>confdefs.h fi if test "x$found_fgetln" = xno; then @@@@ -5302,8 +5234,7 @@@@ else fi if test "x$found_strcasestr" = xyes; then - $as_echo "#define HAVE_STRCASESTR 1 -" >>confdefs.h + $as_echo "#define HAVE_STRCASESTR 1" >>confdefs.h fi if test "x$found_strcasestr" = xno; then @@@@ -5324,8 +5255,7 @@@@ else fi if test "x$found_strsep" = xyes; then - $as_echo "#define HAVE_STRSEP 1 -" >>confdefs.h + $as_echo "#define HAVE_STRSEP 1" >>confdefs.h fi if test "x$found_strsep" = xno; then @@@@ -5346,8 +5276,7 @@@@ else fi if test "x$found_strtonum" = xyes; then - $as_echo "#define HAVE_STRTONUM 1 -" >>confdefs.h + $as_echo "#define HAVE_STRTONUM 1" >>confdefs.h fi if test "x$found_strtonum" = xno; then @@@@ -5368,8 +5297,7 @@@@ else fi if test "x$found_strnvis" = xyes; then - $as_echo "#define HAVE_VIS 1 -" >>confdefs.h + $as_echo "#define HAVE_VIS 1" >>confdefs.h fi if test "x$found_strnvis" = xno; then @@@@ -5404,7 +5332,6 @@@@ fi cat >>confdefs.h <<_ACEOF #define HAVE_DECL_OPTARG $ac_have_decl - _ACEOF if test $ac_have_decl = 1; then : @@@@ -5424,7 +5351,6 @@@@ fi cat >>confdefs.h <<_ACEOF #define HAVE_DECL_OPTIND $ac_have_decl - _ACEOF if test $ac_have_decl = 1; then : @@@@ -5444,7 +5370,6 @@@@ fi cat >>confdefs.h <<_ACEOF #define HAVE_DECL_OPTRESET $ac_have_decl - _ACEOF if test $ac_have_decl = 1; then : @@@@ -5462,8 +5387,7 @@@@ $as_echo "yes" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - $as_echo "#define HAVE_GETOPT 1 -" >>confdefs.h + $as_echo "#define HAVE_GETOPT 1" >>confdefs.h fi fi @@@@ -5485,14 +5409,12 @@@@ for ac_func in \ do : - as_ac_var=`$as_echo "ac_cv_func_$ac_func -" | $as_tr_sh` + as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" eval as_val=\$$as_ac_var if test "x$as_val" = x""yes; then : cat >>confdefs.h <<_ACEOF #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1 - _ACEOF fi @@@@ -5516,8 +5438,7 @@@@ cat confdefs.h - <<_ACEOF >conftest.$ac_ _ACEOF if ac_fn_c_try_compile "$LINENO"; then : - $as_echo "#define HAVE_BSD_TYPES 1 -" >>confdefs.h + $as_echo "#define HAVE_BSD_TYPES 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else @@@@ -5547,8 +5468,7 @@@@ else fi if test "x$found_queue_h" = xyes; then - $as_echo "#define HAVE_QUEUE_H 1 -" >>confdefs.h + $as_echo "#define HAVE_QUEUE_H 1" >>confdefs.h fi @@@@ -5569,8 +5489,7 @@@@ cat confdefs.h - <<_ACEOF >conftest.$ac_ _ACEOF if ac_fn_c_try_link "$LINENO"; then : - $as_echo "#define HAVE___PROGNAME 1 -" >>confdefs.h + $as_echo "#define HAVE___PROGNAME 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else @@@@ -5586,8 +5505,7 @@@@ ac_fn_c_check_decl "$LINENO" "F_CLOSEM" " if test "x$ac_cv_have_decl_F_CLOSEM" = x""yes; then : - $as_echo "#define HAVE_FCNTL_CLOSEM 1 -" >>confdefs.h + $as_echo "#define HAVE_FCNTL_CLOSEM 1" >>confdefs.h fi @@@@ -5596,8 +5514,7 @@@@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /proc/\$\$" >&5 $as_echo_n "checking for /proc/\$\$... " >&6; } if test -d /proc/$$; then - $as_echo "#define HAVE_PROC_PID 1 -" >>confdefs.h + $as_echo "#define HAVE_PROC_PID 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@@@ -5610,8 +5527,7 @@@@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /proc/\$\$/fd" >&5 $as_echo_n "checking for /proc/\$\$/fd... " >&6; } if test -d /proc/$$/fd; then - $as_echo "#define HAVE_DIRFD 1 -" >>confdefs.h + $as_echo "#define HAVE_DIRFD 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@@@ -5632,17 +5548,21 @@@@ $as_echo "aix" >&6; } *darwin*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: darwin" >&5 $as_echo "darwin" >&6; } - $as_echo "#define BROKEN_CMSG_FIRSTHDR 1 -" >>confdefs.h + $as_echo "#define BROKEN_CMSG_FIRSTHDR 1" >>confdefs.h PLATFORM=darwin ;; + *dragonfly*) + { $as_echo "$as_me:${as_lineno-$LINENO}: result: dragonfly" >&5 +$as_echo "dragonfly" >&6; } + PLATFORM=dragonfly + ;; *linux*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: linux" >&5 $as_echo "linux" >&6; } PLATFORM=linux ;; - *freebsd*|*dragonfly*) + *freebsd*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: freebsd" >&5 $as_echo "freebsd" >&6; } PLATFORM=freebsd @@@@ -5695,6 +5615,14 @@@@ else IS_DARWIN_FALSE= fi + if test "x$PLATFORM" = xdragonfly; then + IS_DRAGONFLY_TRUE= + IS_DRAGONFLY_FALSE='#' +else + IS_DRAGONFLY_TRUE='#' + IS_DRAGONFLY_FALSE= +fi + if test "x$PLATFORM" = xlinux; then IS_LINUX_TRUE= IS_LINUX_FALSE='#' @@@@ -5920,6 +5848,10 @@@@ if test -z "${IS_GLIBC_TRUE}" && test -z as_fn_error "conditional \"IS_GLIBC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${NO_B64_NTOP_TRUE}" && test -z "${NO_B64_NTOP_FALSE}"; then + as_fn_error "conditional \"NO_B64_NTOP\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${NO_IMSG_TRUE}" && test -z "${NO_IMSG_FALSE}"; then as_fn_error "conditional \"NO_IMSG\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@@@ -5984,6 +5916,10 @@@@ if test -z "${IS_DARWIN_TRUE}" && test - as_fn_error "conditional \"IS_DARWIN\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 a19 13 +if test -z "${IS_DRAGONFLY_TRUE}" && test -z "${IS_DRAGONFLY_FALSE}"; then + as_fn_error "conditional \"IS_DRAGONFLY\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${IS_LINUX_TRUE}" && test -z "${IS_LINUX_FALSE}"; then as_fn_error "conditional \"IS_LINUX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@@@ -6462,7 +6398,6 @@@@ Usage: $0 [OPTION]... [TAG]... -d, --debug don't remove temporary files --recheck update $as_me by reconfiguring in the same conditions --file=FILE[:TEMPLATE] - instantiate the configuration file FILE a20 1 Configuration files: @ 1.2 log @Fix PR pkg/45402. * Add DragonFly support from SVN 2600. * Regen configure script. @ text @d1 1 a1 1 $NetBSD$ @ 1.1 log @Make tmux build on Darwin/amd64. Patches from tmux Subversion Revisions 2565 and 2568. @ text @d4 1 d8 10 a17 1 @@@@ -637,6 +637,8 @@@@ NO_FORKPTY_TRUE d26 168 a193 1 @@@@ -4605,119 +4607,83 @@@@ if test "x$found_curses" = xno; then d359 318 @