Tue Oct 4 11:55:34 2011 UTC ()
Fix PR pkg/45402.
* Add DragonFly support from SVN 2600.
* Regen configure script.


(ryoon)
diff -r1.15 -r1.16 pkgsrc/misc/tmux/distinfo
diff -r1.1 -r1.2 pkgsrc/misc/tmux/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/misc/tmux/patches/patch-configure.ac
diff -r0 -r1.1 pkgsrc/misc/tmux/patches/patch-osdep-dragonfly.c

cvs diff -r1.15 -r1.16 pkgsrc/misc/tmux/distinfo (expand / switch to unified diff)

--- pkgsrc/misc/tmux/distinfo 2011/09/16 05:18:57 1.15
+++ pkgsrc/misc/tmux/distinfo 2011/10/04 11:55:34 1.16
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.15 2011/09/16 05:18:57 minskim Exp $ 1$NetBSD: distinfo,v 1.16 2011/10/04 11:55:34 ryoon Exp $
2 2
3SHA1 (tmux-1.5.tar.gz) = e26132f02f344f8d6d06ae87d11f6a7aad880f67 3SHA1 (tmux-1.5.tar.gz) = e26132f02f344f8d6d06ae87d11f6a7aad880f67
4RMD160 (tmux-1.5.tar.gz) = 08eec02bcbd91b3c37a36a05167f3758e7911973 4RMD160 (tmux-1.5.tar.gz) = 08eec02bcbd91b3c37a36a05167f3758e7911973
5Size (tmux-1.5.tar.gz) = 374093 bytes 5Size (tmux-1.5.tar.gz) = 374093 bytes
6SHA1 (patch-configure) = 86974baa9f2e51d46dda93f78ea6f60ba78d0eeb 6SHA1 (patch-configure) = 945501bfb2ae1fc3edf78947f2ddcc662e950c50
7SHA1 (patch-configure.ac) = 2b9b076f184f73ed00e509fc96f5da7e7358a710 7SHA1 (patch-configure.ac) = a9f12fee5bec74ad6e608ab7d5442b346816bb3d
 8SHA1 (patch-osdep-dragonfly.c) = dbd6ab3e3437aaae7c333ac884f39bc7d0a5b917

cvs diff -r1.1 -r1.2 pkgsrc/misc/tmux/patches/Attic/patch-configure (expand / switch to unified diff)

--- pkgsrc/misc/tmux/patches/Attic/patch-configure 2011/09/16 05:18:58 1.1
+++ pkgsrc/misc/tmux/patches/Attic/patch-configure 2011/10/04 11:55:34 1.2
@@ -1,29 +1,206 @@ @@ -1,29 +1,206 @@
1$NetBSD: patch-configure,v 1.1 2011/09/16 05:18:58 minskim Exp $ 1$NetBSD: patch-configure,v 1.2 2011/10/04 11:55:34 ryoon Exp $
2 2
3Compatibility for b64_ntop. SVN Revisions 2565 and 2568. 3Compatibility for b64_ntop. SVN Revisions 2565 and 2568.
 4Add DragonFly support, SVN 2600.
4 5
5--- configure.orig 2011-07-09 16:12:35.000000000 +0000 6--- configure.orig 2011-07-09 16:12:35.000000000 +0000
6+++ configure 7+++ configure
7@@ -637,6 +637,8 @@ NO_FORKPTY_TRUE 8@@ -603,6 +603,8 @@ IS_FREEBSD_FALSE
 9 IS_FREEBSD_TRUE
 10 IS_LINUX_FALSE
 11 IS_LINUX_TRUE
 12+IS_DRAGONFLY_FALSE
 13+IS_DRAGONFLY_TRUE
 14 IS_DARWIN_FALSE
 15 IS_DARWIN_TRUE
 16 IS_AIX_FALSE
 17@@ -637,6 +639,8 @@ NO_FORKPTY_TRUE
8 NO_IMSG_FALSE 18 NO_IMSG_FALSE
9 NO_IMSG_TRUE 19 NO_IMSG_TRUE
10 XOPEN_DEFINES 20 XOPEN_DEFINES
11+NO_B64_NTOP_FALSE 21+NO_B64_NTOP_FALSE
12+NO_B64_NTOP_TRUE 22+NO_B64_NTOP_TRUE
13 IS_GLIBC_FALSE 23 IS_GLIBC_FALSE
14 IS_GLIBC_TRUE 24 IS_GLIBC_TRUE
15 IS_SUNCC_FALSE 25 IS_SUNCC_FALSE
16@@ -4605,119 +4607,83 @@ if test "x$found_curses" = xno; then 26@@ -1315,11 +1319,9 @@ Configuration:
 27 --srcdir=DIR find the sources in DIR [configure dir or \`..']
 28
 29 Installation directories:
 30- --prefix=PREFIX
 31- install architecture-independent files in PREFIX
 32+ --prefix=PREFIX install architecture-independent files in PREFIX
 33 [$ac_default_prefix]
 34- --exec-prefix=EPREFIX
 35- install architecture-dependent files in EPREFIX
 36+ --exec-prefix=EPREFIX install architecture-dependent files in EPREFIX
 37 [PREFIX]
 38
 39 By default, \`make install' will install all the files in
 40@@ -1344,8 +1346,7 @@ Fine tuning of the installation director
 41 --infodir=DIR info documentation [DATAROOTDIR/info]
 42 --localedir=DIR locale-dependent data [DATAROOTDIR/locale]
 43 --mandir=DIR man documentation [DATAROOTDIR/man]
 44- --docdir=DIR
 45- documentation root [DATAROOTDIR/doc/tmux]
 46+ --docdir=DIR documentation root [DATAROOTDIR/doc/tmux]
 47 --htmldir=DIR html documentation [DOCDIR]
 48 --dvidir=DIR dvi documentation [DOCDIR]
 49 --pdfdir=DIR pdf documentation [DOCDIR]
 50@@ -1377,26 +1378,18 @@ Optional Features:
 51 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
 52 --disable-dependency-tracking speeds up one-time build
 53 --enable-dependency-tracking do not reject slow dependency extractors
 54- --enable-debug
 55- create a debug build
 56- --enable-static
 57- create a static build
 58+ --enable-debug create a debug build
 59+ --enable-static create a static build
 60
 61 Some influential environment variables:
 62- CC
 63- C compiler command
 64- CFLAGS
 65- C compiler flags
 66- LDFLAGS
 67- linker flags, e.g. -L<lib dir> if you have libraries in a
 68+ CC C compiler command
 69+ CFLAGS C compiler flags
 70+ LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
 71 nonstandard directory <lib dir>
 72- LIBS
 73- libraries to pass to the linker, e.g. -l<library>
 74- CPPFLAGS
 75- C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
 76+ LIBS libraries to pass to the linker, e.g. -l<library>
 77+ CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
 78 you have headers in a nonstandard directory <include dir>
 79- CPP
 80- C preprocessor
 81+ CPP C preprocessor
 82
 83 Use these variables to override the choices made by `configure' or to help
 84 it to find libraries and programs with nonstandard names/locations.
 85@@ -2083,32 +2076,26 @@ $as_echo "/* confdefs.h */" > confdefs.h
 86
 87 cat >>confdefs.h <<_ACEOF
 88 #define PACKAGE_NAME "$PACKAGE_NAME"
 89-
 90 _ACEOF
 91
 92 cat >>confdefs.h <<_ACEOF
 93 #define PACKAGE_TARNAME "$PACKAGE_TARNAME"
 94-
 95 _ACEOF
 96
 97 cat >>confdefs.h <<_ACEOF
 98 #define PACKAGE_VERSION "$PACKAGE_VERSION"
 99-
 100 _ACEOF
 101
 102 cat >>confdefs.h <<_ACEOF
 103 #define PACKAGE_STRING "$PACKAGE_STRING"
 104-
 105 _ACEOF
 106
 107 cat >>confdefs.h <<_ACEOF
 108 #define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
 109-
 110 _ACEOF
 111
 112 cat >>confdefs.h <<_ACEOF
 113 #define PACKAGE_URL "$PACKAGE_URL"
 114-
 115 _ACEOF
 116
 117
 118@@ -2661,13 +2648,11 @@ fi
 119
 120 cat >>confdefs.h <<_ACEOF
 121 #define PACKAGE "$PACKAGE"
 122-
 123 _ACEOF
 124
 125
 126 cat >>confdefs.h <<_ACEOF
 127 #define VERSION "$VERSION"
 128-
 129 _ACEOF
 130
 131 # Some tools Automake needs.
 132@@ -3839,8 +3824,7 @@ else
 133 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 134 $as_echo "no" >&6; }
 135
 136-$as_echo "#define NO_MINUS_C_MINUS_O 1
 137-" >>confdefs.h
 138+$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h
 139
 140 fi
 141
 142@@ -4239,8 +4223,7 @@ fi
 143 $as_echo "$ac_cv_header_stdc" >&6; }
 144 if test $ac_cv_header_stdc = yes; then
 145
 146-$as_echo "#define STDC_HEADERS 1
 147-" >>confdefs.h
 148+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 149
 150 fi
 151
 152@@ -4248,15 +4231,13 @@ fi
 153 for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
 154 inttypes.h stdint.h unistd.h
 155 do :
 156- as_ac_Header=`$as_echo "ac_cv_header_$ac_header
 157-" | $as_tr_sh`
 158+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 159 ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
 160 "
 161 eval as_val=\$$as_ac_Header
 162 if test "x$as_val" = x""yes; then :
 163 cat >>confdefs.h <<_ACEOF
 164 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 165-
 166 _ACEOF
 167
 168 fi
 169@@ -4284,14 +4265,12 @@ for ac_header in \
 170
 171
 172 do :
 173- as_ac_Header=`$as_echo "ac_cv_header_$ac_header
 174-" | $as_tr_sh`
 175+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
 176 ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
 177 eval as_val=\$$as_ac_Header
 178 if test "x$as_val" = x""yes; then :
 179 cat >>confdefs.h <<_ACEOF
 180 #define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 181-
 182 _ACEOF
 183
 184 fi
 185@@ -4470,7 +4449,6 @@ $as_echo "$ac_cv_lib_rt_clock_gettime" >
 186 if test "x$ac_cv_lib_rt_clock_gettime" = x""yes; then :
 187 cat >>confdefs.h <<_ACEOF
 188 #define HAVE_LIBRT 1
 189-
 190 _ACEOF
 191
 192 LIBS="-lrt $LIBS"
 193@@ -4605,119 +4583,83 @@ if test "x$found_curses" = xno; then
17 as_fn_error "\"curses not found\"" "$LINENO" 5 194 as_fn_error "\"curses not found\"" "$LINENO" 5
18 fi 195 fi
19  196
20-# Look for networking libraries. 197-# Look for networking libraries.
21-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing b64_ntop" >&5 198-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing b64_ntop" >&5
22-$as_echo_n "checking for library containing b64_ntop... " >&6; } 199-$as_echo_n "checking for library containing b64_ntop... " >&6; }
23-if test "${ac_cv_search_b64_ntop+set}" = set; then : 200-if test "${ac_cv_search_b64_ntop+set}" = set; then :
24- $as_echo_n "(cached) " >&6 201- $as_echo_n "(cached) " >&6
25-else 202-else
26- ac_func_search_save_LIBS=$LIBS 203- ac_func_search_save_LIBS=$LIBS
27+# Check for b64_ntop. 204+# Check for b64_ntop.
28+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for b64_ntop" >&5 205+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for b64_ntop" >&5
29+$as_echo_n "checking for b64_ntop... " >&6; } 206+$as_echo_n "checking for b64_ntop... " >&6; }
@@ -169,13 +346,331 @@ Compatibility for b64_ntop. SVN Revisio @@ -169,13 +346,331 @@ Compatibility for b64_ntop. SVN Revisio
169 fi 346 fi
170-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___b64_ntop" >&5 347-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search___b64_ntop" >&5
171-$as_echo "$ac_cv_search___b64_ntop" >&6; } 348-$as_echo "$ac_cv_search___b64_ntop" >&6; }
172-ac_res=$ac_cv_search___b64_ntop 349-ac_res=$ac_cv_search___b64_ntop
173-if test "$ac_res" != no; then : 350-if test "$ac_res" != no; then :
174- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS" 351- test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
175  352
176-fi 353-fi
177  354
178+# Look for networking libraries. 355+# Look for networking libraries.
179 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntoa" >&5 356 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing inet_ntoa" >&5
180 $as_echo_n "checking for library containing inet_ntoa... " >&6; } 357 $as_echo_n "checking for library containing inet_ntoa... " >&6; }
181 if test "${ac_cv_search_inet_ntoa+set}" = set; then : 358 if test "${ac_cv_search_inet_ntoa+set}" = set; then :
 359@@ -4869,7 +4811,6 @@ $as_echo "$ac_cv_lib_xnet_socket" >&6; }
 360 if test "x$ac_cv_lib_xnet_socket" = x""yes; then :
 361 cat >>confdefs.h <<_ACEOF
 362 #define HAVE_LIBXNET 1
 363-
 364 _ACEOF
 365
 366 LIBS="-lxnet $LIBS"
 367@@ -5053,8 +4994,7 @@ else
 368 fi
 369
 370 if test "x$found_imsg_init" = xyes; then
 371- $as_echo "#define HAVE_IMSG 1
 372-" >>confdefs.h
 373+ $as_echo "#define HAVE_IMSG 1" >>confdefs.h
 374
 375 fi
 376 if test "x$found_imsg_init" = xno; then
 377@@ -5126,8 +5066,7 @@ else
 378 fi
 379
 380 if test "x$found_forkpty" = xyes; then
 381- $as_echo "#define HAVE_FORKPTY 1
 382-" >>confdefs.h
 383+ $as_echo "#define HAVE_FORKPTY 1" >>confdefs.h
 384
 385 fi
 386 if test "x$found_forkpty" = xno; then
 387@@ -5148,8 +5087,7 @@ else
 388 fi
 389
 390 if test "x$found_closefrom" = xyes; then
 391- $as_echo "#define HAVE_CLOSEFROM 1
 392-" >>confdefs.h
 393+ $as_echo "#define HAVE_CLOSEFROM 1" >>confdefs.h
 394
 395 fi
 396 if test "x$found_closefrom" = xno; then
 397@@ -5170,8 +5108,7 @@ else
 398 fi
 399
 400 if test "x$found_daemon" = xyes; then
 401- $as_echo "#define HAVE_DAEMON 1
 402-" >>confdefs.h
 403+ $as_echo "#define HAVE_DAEMON 1" >>confdefs.h
 404
 405 fi
 406 if test "x$found_daemon" = xno; then
 407@@ -5192,8 +5129,7 @@ else
 408 fi
 409
 410 if test "x$found_setenv" = xyes; then
 411- $as_echo "#define HAVE_SETENV 1
 412-" >>confdefs.h
 413+ $as_echo "#define HAVE_SETENV 1" >>confdefs.h
 414
 415 fi
 416 if test "x$found_setenv" = xno; then
 417@@ -5214,8 +5150,7 @@ else
 418 fi
 419
 420 if test "x$found_strlcpy" = xyes; then
 421- $as_echo "#define HAVE_STRLCPY 1
 422-" >>confdefs.h
 423+ $as_echo "#define HAVE_STRLCPY 1" >>confdefs.h
 424
 425 fi
 426 if test "x$found_strlcpy" = xno; then
 427@@ -5236,8 +5171,7 @@ else
 428 fi
 429
 430 if test "x$found_strlcat" = xyes; then
 431- $as_echo "#define HAVE_STRLCAT 1
 432-" >>confdefs.h
 433+ $as_echo "#define HAVE_STRLCAT 1" >>confdefs.h
 434
 435 fi
 436 if test "x$found_strlcat" = xno; then
 437@@ -5258,8 +5192,7 @@ else
 438 fi
 439
 440 if test "x$found_asprintf" = xyes; then
 441- $as_echo "#define HAVE_ASPRINTF 1
 442-" >>confdefs.h
 443+ $as_echo "#define HAVE_ASPRINTF 1" >>confdefs.h
 444
 445 fi
 446 if test "x$found_asprintf" = xno; then
 447@@ -5280,8 +5213,7 @@ else
 448 fi
 449
 450 if test "x$found_fgetln" = xyes; then
 451- $as_echo "#define HAVE_FGETLN 1
 452-" >>confdefs.h
 453+ $as_echo "#define HAVE_FGETLN 1" >>confdefs.h
 454
 455 fi
 456 if test "x$found_fgetln" = xno; then
 457@@ -5302,8 +5234,7 @@ else
 458 fi
 459
 460 if test "x$found_strcasestr" = xyes; then
 461- $as_echo "#define HAVE_STRCASESTR 1
 462-" >>confdefs.h
 463+ $as_echo "#define HAVE_STRCASESTR 1" >>confdefs.h
 464
 465 fi
 466 if test "x$found_strcasestr" = xno; then
 467@@ -5324,8 +5255,7 @@ else
 468 fi
 469
 470 if test "x$found_strsep" = xyes; then
 471- $as_echo "#define HAVE_STRSEP 1
 472-" >>confdefs.h
 473+ $as_echo "#define HAVE_STRSEP 1" >>confdefs.h
 474
 475 fi
 476 if test "x$found_strsep" = xno; then
 477@@ -5346,8 +5276,7 @@ else
 478 fi
 479
 480 if test "x$found_strtonum" = xyes; then
 481- $as_echo "#define HAVE_STRTONUM 1
 482-" >>confdefs.h
 483+ $as_echo "#define HAVE_STRTONUM 1" >>confdefs.h
 484
 485 fi
 486 if test "x$found_strtonum" = xno; then
 487@@ -5368,8 +5297,7 @@ else
 488 fi
 489
 490 if test "x$found_strnvis" = xyes; then
 491- $as_echo "#define HAVE_VIS 1
 492-" >>confdefs.h
 493+ $as_echo "#define HAVE_VIS 1" >>confdefs.h
 494
 495 fi
 496 if test "x$found_strnvis" = xno; then
 497@@ -5404,7 +5332,6 @@ fi
 498
 499 cat >>confdefs.h <<_ACEOF
 500 #define HAVE_DECL_OPTARG $ac_have_decl
 501-
 502 _ACEOF
 503 if test $ac_have_decl = 1; then :
 504
 505@@ -5424,7 +5351,6 @@ fi
 506
 507 cat >>confdefs.h <<_ACEOF
 508 #define HAVE_DECL_OPTIND $ac_have_decl
 509-
 510 _ACEOF
 511 if test $ac_have_decl = 1; then :
 512
 513@@ -5444,7 +5370,6 @@ fi
 514
 515 cat >>confdefs.h <<_ACEOF
 516 #define HAVE_DECL_OPTRESET $ac_have_decl
 517-
 518 _ACEOF
 519 if test $ac_have_decl = 1; then :
 520
 521@@ -5462,8 +5387,7 @@ $as_echo "yes" >&6; }
 522 else
 523 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 524 $as_echo "no" >&6; }
 525- $as_echo "#define HAVE_GETOPT 1
 526-" >>confdefs.h
 527+ $as_echo "#define HAVE_GETOPT 1" >>confdefs.h
 528
 529 fi
 530 fi
 531@@ -5485,14 +5409,12 @@ for ac_func in \
 532
 533
 534 do :
 535- as_ac_var=`$as_echo "ac_cv_func_$ac_func
 536-" | $as_tr_sh`
 537+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 538 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
 539 eval as_val=\$$as_ac_var
 540 if test "x$as_val" = x""yes; then :
 541 cat >>confdefs.h <<_ACEOF
 542 #define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 543-
 544 _ACEOF
 545
 546 fi
 547@@ -5516,8 +5438,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
 548
 549 _ACEOF
 550 if ac_fn_c_try_compile "$LINENO"; then :
 551- $as_echo "#define HAVE_BSD_TYPES 1
 552-" >>confdefs.h
 553+ $as_echo "#define HAVE_BSD_TYPES 1" >>confdefs.h
 554 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 555 $as_echo "yes" >&6; }
 556 else
 557@@ -5547,8 +5468,7 @@ else
 558 fi
 559
 560 if test "x$found_queue_h" = xyes; then
 561- $as_echo "#define HAVE_QUEUE_H 1
 562-" >>confdefs.h
 563+ $as_echo "#define HAVE_QUEUE_H 1" >>confdefs.h
 564
 565 fi
 566
 567@@ -5569,8 +5489,7 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_
 568
 569 _ACEOF
 570 if ac_fn_c_try_link "$LINENO"; then :
 571- $as_echo "#define HAVE___PROGNAME 1
 572-" >>confdefs.h
 573+ $as_echo "#define HAVE___PROGNAME 1" >>confdefs.h
 574 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 575 $as_echo "yes" >&6; }
 576 else
 577@@ -5586,8 +5505,7 @@ ac_fn_c_check_decl "$LINENO" "F_CLOSEM"
 578
 579 "
 580 if test "x$ac_cv_have_decl_F_CLOSEM" = x""yes; then :
 581- $as_echo "#define HAVE_FCNTL_CLOSEM 1
 582-" >>confdefs.h
 583+ $as_echo "#define HAVE_FCNTL_CLOSEM 1" >>confdefs.h
 584
 585 fi
 586
 587@@ -5596,8 +5514,7 @@ fi
 588 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /proc/\$\$" >&5
 589 $as_echo_n "checking for /proc/\$\$... " >&6; }
 590 if test -d /proc/$$; then
 591- $as_echo "#define HAVE_PROC_PID 1
 592-" >>confdefs.h
 593+ $as_echo "#define HAVE_PROC_PID 1" >>confdefs.h
 594
 595 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 596 $as_echo "yes" >&6; }
 597@@ -5610,8 +5527,7 @@ fi
 598 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for /proc/\$\$/fd" >&5
 599 $as_echo_n "checking for /proc/\$\$/fd... " >&6; }
 600 if test -d /proc/$$/fd; then
 601- $as_echo "#define HAVE_DIRFD 1
 602-" >>confdefs.h
 603+ $as_echo "#define HAVE_DIRFD 1" >>confdefs.h
 604
 605 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 606 $as_echo "yes" >&6; }
 607@@ -5632,17 +5548,21 @@ $as_echo "aix" >&6; }
 608 *darwin*)
 609 { $as_echo "$as_me:${as_lineno-$LINENO}: result: darwin" >&5
 610 $as_echo "darwin" >&6; }
 611- $as_echo "#define BROKEN_CMSG_FIRSTHDR 1
 612-" >>confdefs.h
 613+ $as_echo "#define BROKEN_CMSG_FIRSTHDR 1" >>confdefs.h
 614
 615 PLATFORM=darwin
 616 ;;
 617+ *dragonfly*)
 618+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: dragonfly" >&5
 619+$as_echo "dragonfly" >&6; }
 620+ PLATFORM=dragonfly
 621+ ;;
 622 *linux*)
 623 { $as_echo "$as_me:${as_lineno-$LINENO}: result: linux" >&5
 624 $as_echo "linux" >&6; }
 625 PLATFORM=linux
 626 ;;
 627- *freebsd*|*dragonfly*)
 628+ *freebsd*)
 629 { $as_echo "$as_me:${as_lineno-$LINENO}: result: freebsd" >&5
 630 $as_echo "freebsd" >&6; }
 631 PLATFORM=freebsd
 632@@ -5695,6 +5615,14 @@ else
 633 IS_DARWIN_FALSE=
 634 fi
 635
 636+ if test "x$PLATFORM" = xdragonfly; then
 637+ IS_DRAGONFLY_TRUE=
 638+ IS_DRAGONFLY_FALSE='#'
 639+else
 640+ IS_DRAGONFLY_TRUE='#'
 641+ IS_DRAGONFLY_FALSE=
 642+fi
 643+
 644 if test "x$PLATFORM" = xlinux; then
 645 IS_LINUX_TRUE=
 646 IS_LINUX_FALSE='#'
 647@@ -5920,6 +5848,10 @@ if test -z "${IS_GLIBC_TRUE}" && test -z
 648 as_fn_error "conditional \"IS_GLIBC\" was never defined.
 649 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 650 fi
 651+if test -z "${NO_B64_NTOP_TRUE}" && test -z "${NO_B64_NTOP_FALSE}"; then
 652+ as_fn_error "conditional \"NO_B64_NTOP\" was never defined.
 653+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 654+fi
 655 if test -z "${NO_IMSG_TRUE}" && test -z "${NO_IMSG_FALSE}"; then
 656 as_fn_error "conditional \"NO_IMSG\" was never defined.
 657 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 658@@ -5984,6 +5916,10 @@ if test -z "${IS_DARWIN_TRUE}" && test -
 659 as_fn_error "conditional \"IS_DARWIN\" was never defined.
 660 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 661 fi
 662+if test -z "${IS_DRAGONFLY_TRUE}" && test -z "${IS_DRAGONFLY_FALSE}"; then
 663+ as_fn_error "conditional \"IS_DRAGONFLY\" was never defined.
 664+Usually this means the macro was only invoked conditionally." "$LINENO" 5
 665+fi
 666 if test -z "${IS_LINUX_TRUE}" && test -z "${IS_LINUX_FALSE}"; then
 667 as_fn_error "conditional \"IS_LINUX\" was never defined.
 668 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 669@@ -6462,7 +6398,6 @@ Usage: $0 [OPTION]... [TAG]...
 670 -d, --debug don't remove temporary files
 671 --recheck update $as_me by reconfiguring in the same conditions
 672 --file=FILE[:TEMPLATE]
 673-
 674 instantiate the configuration file FILE
 675
 676 Configuration files:

cvs diff -r1.1 -r1.2 pkgsrc/misc/tmux/patches/Attic/patch-configure.ac (expand / switch to unified diff)

--- pkgsrc/misc/tmux/patches/Attic/patch-configure.ac 2011/09/16 05:18:58 1.1
+++ pkgsrc/misc/tmux/patches/Attic/patch-configure.ac 2011/10/04 11:55:34 1.2
@@ -1,16 +1,17 @@ @@ -1,16 +1,17 @@
1$NetBSD: patch-configure.ac,v 1.1 2011/09/16 05:18:58 minskim Exp $ 1$NetBSD: patch-configure.ac,v 1.2 2011/10/04 11:55:34 ryoon Exp $
2 2
3Compatibility for b64_ntop. SVN Revisions 2565 and 2568. 3Compatibility for b64_ntop. SVN Revisions 2565 and 2568.
 4Add DragonFly support, SVN 2600.
4 5
5--- configure.ac.orig 2011-07-09 16:00:17.000000000 +0000 6--- configure.ac.orig 2011-07-09 16:00:17.000000000 +0000
6+++ configure.ac 7+++ configure.ac
7@@ -121,9 +121,44 @@ if test "x$found_curses" = xno; then 8@@ -121,9 +121,44 @@ if test "x$found_curses" = xno; then
8 AC_MSG_ERROR("curses not found") 9 AC_MSG_ERROR("curses not found")
9 fi 10 fi
10  11
11+# Check for b64_ntop. 12+# Check for b64_ntop.
12+AC_MSG_CHECKING(for b64_ntop) 13+AC_MSG_CHECKING(for b64_ntop)
13+AC_TRY_LINK( 14+AC_TRY_LINK(
14+ [ 15+ [
15+ #include <sys/types.h> 16+ #include <sys/types.h>
16+ #include <netinet/in.h> 17+ #include <netinet/in.h>
@@ -41,13 +42,38 @@ Compatibility for b64_ntop. SVN Revisio @@ -41,13 +42,38 @@ Compatibility for b64_ntop. SVN Revisio
41+fi 42+fi
42+if test "x$found_b64_ntop" = xyes; then 43+if test "x$found_b64_ntop" = xyes; then
43+ AC_DEFINE(HAVE_B64_NTOP) 44+ AC_DEFINE(HAVE_B64_NTOP)
44+ AC_MSG_RESULT(yes) 45+ AC_MSG_RESULT(yes)
45+fi 46+fi
46+AM_CONDITIONAL(NO_B64_NTOP, [test "x$found_b64_ntop" = xno]) 47+AM_CONDITIONAL(NO_B64_NTOP, [test "x$found_b64_ntop" = xno])
47+ 48+
48 # Look for networking libraries. 49 # Look for networking libraries.
49-AC_SEARCH_LIBS(b64_ntop, resolv) 50-AC_SEARCH_LIBS(b64_ntop, resolv)
50-AC_SEARCH_LIBS(__b64_ntop, resolv) 51-AC_SEARCH_LIBS(__b64_ntop, resolv)
51 AC_SEARCH_LIBS(inet_ntoa, nsl) 52 AC_SEARCH_LIBS(inet_ntoa, nsl)
52 AC_SEARCH_LIBS(socket, socket) 53 AC_SEARCH_LIBS(socket, socket)
53 AC_CHECK_LIB(xnet, socket) 54 AC_CHECK_LIB(xnet, socket)
 55@@ -385,11 +420,15 @@ case "$host_os" in
 56 AC_DEFINE(BROKEN_CMSG_FIRSTHDR)
 57 PLATFORM=darwin
 58 ;;
 59+ *dragonfly*)
 60+ AC_MSG_RESULT(dragonfly)
 61+ PLATFORM=dragonfly
 62+ ;;
 63 *linux*)
 64 AC_MSG_RESULT(linux)
 65 PLATFORM=linux
 66 ;;
 67- *freebsd*|*dragonfly*)
 68+ *freebsd*)
 69 AC_MSG_RESULT(freebsd)
 70 PLATFORM=freebsd
 71 ;;
 72@@ -421,6 +460,7 @@ esac
 73 AC_SUBST(PLATFORM)
 74 AM_CONDITIONAL(IS_AIX, test "x$PLATFORM" = xaix)
 75 AM_CONDITIONAL(IS_DARWIN, test "x$PLATFORM" = xdarwin)
 76+AM_CONDITIONAL(IS_DRAGONFLY, test "x$PLATFORM" = xdragonfly)
 77 AM_CONDITIONAL(IS_LINUX, test "x$PLATFORM" = xlinux)
 78 AM_CONDITIONAL(IS_FREEBSD, test "x$PLATFORM" = xfreebsd)
 79 AM_CONDITIONAL(IS_NETBSD, test "x$PLATFORM" = xnetbsd)

File Added: pkgsrc/misc/tmux/patches/Attic/patch-osdep-dragonfly.c
$NetBSD: patch-osdep-dragonfly.c,v 1.1 2011/10/04 11:55:34 ryoon Exp $

Add DragonFly support, SVN 2600

--- osdep-dragonfly.c.orig	2011-10-04 09:36:43.000000000 +0000
+++ osdep-dragonfly.c
@@ -0,0 +1,126 @@
+/* $: osdep-dragonfly.c 2600 2011-09-29 08:43:01Z nicm $ */
+
+/*
+ * Copyright (c) 2009 Nicholas Marriott <nicm@users.sourceforge.net>
+ *
+ * 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 MIND, 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.
+ */
+
+#include <sys/param.h>
+#include <sys/stat.h>
+#include <sys/sysctl.h>
+#include <sys/user.h>
+
+#include <err.h>
+#include <errno.h>
+#include <event.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+struct kinfo_proc	*cmp_procs(struct kinfo_proc *, struct kinfo_proc *);
+char			*osdep_get_name(int, char *);
+struct event_base	*osdep_event_init(void);
+
+#ifndef nitems
+#define nitems(_a) (sizeof((_a)) / sizeof((_a)[0]))
+#endif
+
+#define is_runnable(p) \
+	((p)->kp_stat == SACTIVE || (p)->kp_stat == SIDL)
+#define is_stopped(p) \
+	((p)->kp_stat == SSTOP || (p)->kp_stat == SZOMB)
+
+struct kinfo_proc *
+cmp_procs(struct kinfo_proc *p1, struct kinfo_proc *p2)
+{
+	if (is_runnable(p1) && !is_runnable(p2))
+		return (p1);
+	if (!is_runnable(p1) && is_runnable(p2))
+		return (p2);
+
+	if (is_stopped(p1) && !is_stopped(p2))
+		return (p1);
+	if (!is_stopped(p1) && is_stopped(p2))
+		return (p2);
+
+	if (strcmp(p1->kp_comm, p2->kp_comm) < 0)
+		return (p1);
+	if (strcmp(p1->kp_comm, p2->kp_comm) > 0)
+		return (p2);
+
+	if (p1->kp_pid > p2->kp_pid)
+		return (p1);
+	return (p2);
+}
+
+char *
+osdep_get_name(int fd, char *tty)
+{
+	int		 mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PGRP, 0 };
+	struct stat	 sb;
+	size_t		 len;
+	struct kinfo_proc *buf, *newbuf, *bestp;
+	u_int		 i;
+	char		*name;
+
+	buf = NULL;
+
+	if (stat(tty, &sb) == -1)
+		return (NULL);
+	if ((mib[3] = tcgetpgrp(fd)) == -1)
+		return (NULL);
+
+retry:
+	if (sysctl(mib, nitems(mib), NULL, &len, NULL, 0) == -1)
+		return (NULL);
+	len = (len * 5) / 4;
+
+	if ((newbuf = realloc(buf, len)) == NULL)
+		goto error;
+	buf = newbuf;
+
+	if (sysctl(mib, nitems(mib), buf, &len, NULL, 0) == -1) {
+		if (errno == ENOMEM)
+			goto retry;
+		goto error;
+	}
+
+	bestp = NULL;
+	for (i = 0; i < len / sizeof (struct kinfo_proc); i++) {
+		if (buf[i].kp_tdev != sb.st_rdev)
+			continue;
+		if (bestp == NULL)
+			bestp = &buf[i];
+		else
+			bestp = cmp_procs(&buf[i], bestp);
+	}
+
+	name = NULL;
+	if (bestp != NULL)
+		name = strdup(bestp->kp_comm);
+
+	free(buf);
+	return (name);
+
+error:
+	free(buf);
+	return (NULL);
+}
+
+struct event_base *
+osdep_event_init(void)
+{
+	return (event_init());
+}