From owner-svn-src-all@FreeBSD.ORG Thu Jul 14 13:57:13 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id DE6D7106566C; Thu, 14 Jul 2011 13:57:13 +0000 (UTC) (envelope-from nwhitehorn@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id CCDEC8FC21; Thu, 14 Jul 2011 13:57:13 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p6EDvDF0032091; Thu, 14 Jul 2011 13:57:13 GMT (envelope-from nwhitehorn@svn.freebsd.org) Received: (from nwhitehorn@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6EDvDFG032079; Thu, 14 Jul 2011 13:57:13 GMT (envelope-from nwhitehorn@svn.freebsd.org) Message-Id: <201107141357.p6EDvDFG032079@svn.freebsd.org> From: Nathan Whitehorn Date: Thu, 14 Jul 2011 13:57:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org X-SVN-Group: vendor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r224012 - in vendor/dialog/dist: . package package/debian po samples X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 14 Jul 2011 13:57:14 -0000 Author: nwhitehorn Date: Thu Jul 14 13:57:13 2011 New Revision: 224012 URL: http://svn.freebsd.org/changeset/base/224012 Log: Import dialog 1.1-20110707. This adds support for several features (e.g. --hline) found in the old FreeBSD dialog. Added: vendor/dialog/dist/help.c vendor/dialog/dist/po/sk.po vendor/dialog/dist/samples/valgrind.log Modified: vendor/dialog/dist/CHANGES vendor/dialog/dist/VERSION vendor/dialog/dist/aclocal.m4 vendor/dialog/dist/arrows.c vendor/dialog/dist/buttons.c vendor/dialog/dist/calendar.c vendor/dialog/dist/checklist.c vendor/dialog/dist/columns.c vendor/dialog/dist/config.guess vendor/dialog/dist/config.sub vendor/dialog/dist/configure vendor/dialog/dist/configure.in vendor/dialog/dist/dialog.1 vendor/dialog/dist/dialog.3 vendor/dialog/dist/dialog.c vendor/dialog/dist/dialog.h vendor/dialog/dist/dlg_keys.h vendor/dialog/dist/editbox.c vendor/dialog/dist/formbox.c vendor/dialog/dist/fselect.c vendor/dialog/dist/guage.c vendor/dialog/dist/inputbox.c vendor/dialog/dist/makefile.in vendor/dialog/dist/menubox.c vendor/dialog/dist/mixedgauge.c vendor/dialog/dist/msgbox.c vendor/dialog/dist/package/debian/changelog vendor/dialog/dist/package/debian/control vendor/dialog/dist/package/dialog.spec vendor/dialog/dist/pause.c vendor/dialog/dist/prgbox.c vendor/dialog/dist/progressbox.c vendor/dialog/dist/rc.c vendor/dialog/dist/tailbox.c vendor/dialog/dist/textbox.c vendor/dialog/dist/timebox.c vendor/dialog/dist/trace.c vendor/dialog/dist/ui_getc.c vendor/dialog/dist/util.c vendor/dialog/dist/yesno.c Modified: vendor/dialog/dist/CHANGES ============================================================================== --- vendor/dialog/dist/CHANGES Thu Jul 14 13:47:42 2011 (r224011) +++ vendor/dialog/dist/CHANGES Thu Jul 14 13:57:13 2011 (r224012) @@ -1,9 +1,94 @@ --- $Id: CHANGES,v 1.333 2011/03/02 10:06:37 tom Exp $ +-- $Id: CHANGES,v 1.360 2011/07/07 23:35:10 tom Exp $ -- Thomas E. Dickey This version of dialog was originally from a Debian snapshot. I've done this to it: +2011/07/07 + + modify util.c to work better with old versions of ncurses: + + suppress use of wchgat() before fix in 20060715 which is needed + for simple shadow manipulation used here in 2011/06/30 (report + by xDog Walker). + + add a null-pointer check in dlg_print_scrolled() + + fix a regression in dlg_getc() introduced by changes to intercept + F1 for help-popup (report by xDog Walker). + +2011/06/30 + + correct license statement for prgbox.c (Debian #632198). + + correct layout when "--colors" is used, by discounting characters in + the escape sequences from the column counts (report by xDog Walker). + + modify dlg_checklist() so that only one item in the list can + initially be selected (report by xDog Walker). + + add/use macro dlg_enter_buttoncode() to improve implementation of + "--nook" option (report by xDog Walker). + + add option "--no-nl-expand" to suppress the conversion of "\n" + strings into newlines (request by xDog Walker). + + modify LIB_CREATE symbol in makefile.in to include the library + dependencies such as ncurses. This is needed when dynamically + loading the library (report/analysis by xDog Walker). + + modify dlg_exit_label() to suppress the Cancel button, for + consistency. + + modify dlg_exit_label() to honor the --nook option, except when there + is no other button, e.g., the help-button. + + modify dlg_exit_buttoncode() so that it returns the proper code for + help-button (report by xDog Walker). + + correct loop limit when processing "--column-separator" (report by + xDog Walker). + + modify handling of "--version" and "--help" to ensure that they are + processed, and exit before widgets. Separate "--print-version" + from "--version", allowing its output to be interspersed with + widget output (report by xDog Walker). + + correct a few places where "--version" or "--help" options went + always to stdout rather than allowing redirection with the "--stderr" + option (report by xDog Walker). + + improve repainting after erasing a widget and its shadow. + + add "--hline" and "--hfile" options for compatibility with FreeBSD + dialog (request by Devin Teske). + + add dialog version message when opening a trace file (request by + xDog Walker). + + show filename of rc-file in traces. + + add piped-in data for gauge widget to traces. + + add entrypoints to gauge widget, for allocating, updating and freeing + the widget (adapted from patch by Stephen Hurd). + + fix a reference to freed memory in the gauge widget. + + fix --no-mouse option by actually closing the mouse (report by + xDog Walker). + + add sk.po from + http://translationproject.org/latest/dialog/ + + limit Solaris xpg4 portability fix for redefinition of ERR to cover + the specific value found in , in case an application + includes dialog.h after curses.h (FreeBSD #156601, report by Jaakko + Heinonen, Stephen Hurd). + + updated configure macros: + + CF_CURSES_CPPFLAGS, + + CF_CURSES_LIBS, make checks for special libraries on hpux10 and + sunos4 optional + + CF_CURSES_FUNCS, workaround for bug in gcc 4.2.1 (FreeBSD 8.1) + which caused part of test program to be omitted, i.e., when it saw + two return-statements in a row it omitted the _first_ one. Also + add expression to pointer check to help FreeBSD's linker decide it + should be validated. Just an assignment was not enough. Also, add + check for unctrl.h + + CF_CURSES_HEADER, change order for curses.h / ncurses.h pairs to + put ncurses.h first, which will tend to provide the same #define's + as in CF_NCURSES_HEADER (report by Dennis Preiser). + + CF_CURSES_TERM_H, modify to avoid spurious check for + if there is no ncurses version. Look for + ncurses's term.h anyway, to work around breakage by packagers who + separate ncurses' header files. + + CF_DISABLE_RPATH_HACK, fix garbled message + + CF_LD_RPATH_OPT, add mirbsd + + CF_MAKEFLAGS, filter out GNU make's entering/leaving messages. + This only appeared when using the macro in a dpkg script, though it + should have in other cases. + + CF_RPATH_HACK, add a check for libraries not found, e.g., from + suppressed functionality of gcc in linking from /usr/local/lib, and + add a -L option to help work around this. + + CF_XOPEN_SOURCE, workaround for cygwin to get ncurses' configure + script to define _XOPEN_SOURCE_EXTENDED (cygwin's features.h + doesn't do anything, so it needs a crutch). + + updated config.guess, config.sub + 2011/03/02 + add --prgbox and --programbox (adapted from patch by David Boyd). + add sl.po from @@ -649,7 +734,7 @@ to it: colors to be the same, provided that bold attribute is set. Also improved the logic for choosing a background color when the foreground and background are the same (report by Erika Pacholleck). - + update configure script macro CF_XOPEN_SOURCE, ensuring that the + + updated configure script macro CF_XOPEN_SOURCE, ensuring that the _POSIX_C_SOURCE value is defined with a specific value (bug report originally for lynx). + fix configure script so that po/makefile is generated properly when Modified: vendor/dialog/dist/VERSION ============================================================================== --- vendor/dialog/dist/VERSION Thu Jul 14 13:47:42 2011 (r224011) +++ vendor/dialog/dist/VERSION Thu Jul 14 13:57:13 2011 (r224012) @@ -1 +1 @@ -9:0:0 1.1 20110302 +10:0:0 1.1 20110707 Modified: vendor/dialog/dist/aclocal.m4 ============================================================================== --- vendor/dialog/dist/aclocal.m4 Thu Jul 14 13:47:42 2011 (r224011) +++ vendor/dialog/dist/aclocal.m4 Thu Jul 14 13:57:13 2011 (r224012) @@ -1,5 +1,5 @@ dnl macros used for DIALOG configure script -dnl $Id: aclocal.m4,v 1.80 2011/01/18 23:17:01 tom Exp $ +dnl $Id: aclocal.m4,v 1.82 2011/06/28 22:48:31 tom Exp $ dnl --------------------------------------------------------------------------- dnl Copyright 1999-2010,2011 -- Thomas E. Dickey dnl @@ -1128,7 +1128,7 @@ CF_NCURSES_VERSION CF_CURSES_LIBS ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_CPPFLAGS version: 10 updated: 2009/01/06 19:34:11 +dnl CF_CURSES_CPPFLAGS version: 11 updated: 2011/04/09 14:51:08 dnl ------------------ dnl Look for the curses headers. AC_DEFUN([CF_CURSES_CPPFLAGS],[ @@ -1137,13 +1137,19 @@ AC_CACHE_CHECK(for extra include directo cf_cv_curses_incdir=no case $host_os in #(vi hpux10.*) #(vi - test -d /usr/include/curses_colr && \ - cf_cv_curses_incdir="-I/usr/include/curses_colr" + if test "x$cf_cv_screen" = "xcurses_colr" + then + test -d /usr/include/curses_colr && \ + cf_cv_curses_incdir="-I/usr/include/curses_colr" + fi ;; sunos3*|sunos4*) - test -d /usr/5lib && \ - test -d /usr/5include && \ - cf_cv_curses_incdir="-I/usr/5include" + if test "x$cf_cv_screen" = "xcurses_5lib" + then + test -d /usr/5lib && \ + test -d /usr/5include && \ + cf_cv_curses_incdir="-I/usr/5include" + fi ;; esac ]) @@ -1153,7 +1159,7 @@ CF_CURSES_HEADER CF_TERM_HEADER ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_FUNCS version: 15 updated: 2010/10/23 15:52:32 +dnl CF_CURSES_FUNCS version: 17 updated: 2011/05/14 16:07:29 dnl --------------- dnl Curses-functions are a little complicated, since a lot of them are macros. AC_DEFUN([CF_CURSES_FUNCS], @@ -1161,6 +1167,7 @@ AC_DEFUN([CF_CURSES_FUNCS], AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl AC_REQUIRE([CF_XOPEN_CURSES]) AC_REQUIRE([CF_CURSES_TERM_H]) +AC_REQUIRE([CF_CURSES_UNCTRL_H]) for cf_func in $1 do CF_UPPER(cf_tr_func,$cf_func) @@ -1173,7 +1180,8 @@ do [ #ifndef ${cf_func} long foo = (long)(&${cf_func}); -${cf_cv_main_return:-return}(foo == 0); +if (foo + 1234 > 5678) + ${cf_cv_main_return:-return}(foo); #endif ], [cf_result=yes], @@ -1190,7 +1198,7 @@ ${cf_cv_main_return:-return}(foo == 0); done ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_HEADER version: 2 updated: 2010/04/28 06:02:16 +dnl CF_CURSES_HEADER version: 3 updated: 2011/05/01 19:47:45 dnl ---------------- dnl Find a "curses" header file, e.g,. "curses.h", or one of the more common dnl variations of ncurses' installs. @@ -1200,10 +1208,10 @@ AC_DEFUN([CF_CURSES_HEADER],[ AC_CACHE_CHECK(if we have identified curses headers,cf_cv_ncurses_header,[ cf_cv_ncurses_header=none for cf_header in ifelse($1,,,[ \ - $1/curses.h \ - $1/ncurses.h]) \ - curses.h \ - ncurses.h ifelse($1,,[ncurses/curses.h ncurses/ncurses.h]) + $1/ncurses.h \ + $1/curses.h]) \ + ncurses.h \ + curses.h ifelse($1,,[ncurses/ncurses.h ncurses/curses.h]) do AC_TRY_COMPILE([#include <${cf_header}>], [initscr(); tgoto("?", 0,0)], @@ -1219,7 +1227,7 @@ fi AC_CHECK_HEADERS($cf_cv_ncurses_header) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_LIBS version: 32 updated: 2011/01/16 17:43:15 +dnl CF_CURSES_LIBS version: 34 updated: 2011/04/09 14:51:08 dnl -------------- dnl Look for the curses libraries. Older curses implementations may require dnl termcap/termlib to be linked as well. Call CF_CURSES_CPPFLAGS first. @@ -1239,19 +1247,26 @@ freebsd*) #(vi AC_CHECK_LIB(mytinfo,tgoto,[CF_ADD_LIBS(-lmytinfo)]) ;; hpux10.*) #(vi - AC_CHECK_LIB(cur_colr,initscr,[ - CF_ADD_LIBS(-lcur_colr) - ac_cv_func_initscr=yes - ],[ - AC_CHECK_LIB(Hcurses,initscr,[ - # HP's header uses __HP_CURSES, but user claims _HP_CURSES. - CF_ADD_LIBS(-lHcurses) - CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" - ac_cv_func_initscr=yes - ])]) + # Looking at HPUX 10.20, the Hcurses library is the oldest (1997), cur_colr + # next (1998), and xcurses "newer" (2000). There is no header file for + # Hcurses; the subdirectory curses_colr has the headers (curses.h and + # term.h) for cur_colr + if test "x$cf_cv_screen" = "xcurses_colr" + then + AC_CHECK_LIB(cur_colr,initscr,[ + CF_ADD_LIBS(-lcur_colr) + ac_cv_func_initscr=yes + ],[ + AC_CHECK_LIB(Hcurses,initscr,[ + # HP's header uses __HP_CURSES, but user claims _HP_CURSES. + CF_ADD_LIBS(-lHcurses) + CPPFLAGS="$CPPFLAGS -D__HP_CURSES -D_HP_CURSES" + ac_cv_func_initscr=yes + ])]) + fi ;; linux*) - case `arch` in + case `arch 2>/dev/null` in x86_64) if test -d /lib64 then @@ -1266,9 +1281,12 @@ linux*) esac ;; sunos3*|sunos4*) - if test -d /usr/5lib ; then - CF_ADD_LIBDIR(/usr/5lib) - CF_ADD_LIBS(-lcurses -ltermcap) + if test "x$cf_cv_screen" = "xcurses_5lib" + then + if test -d /usr/5lib ; then + CF_ADD_LIBDIR(/usr/5lib) + CF_ADD_LIBS(-lcurses -ltermcap) + fi fi ac_cv_func_initscr=yes ;; @@ -1333,7 +1351,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_CURSES_TERM_H version: 8 updated: 2010/10/23 15:54:49 +dnl CF_CURSES_TERM_H version: 9 updated: 2011/04/09 18:19:55 dnl ---------------- dnl SVr4 curses should have term.h as well (where it puts the definitions of dnl the low-level interface). This may not be true in old/broken implementations, @@ -1347,9 +1365,17 @@ AC_CACHE_CHECK(for term.h, cf_cv_term_he # If we found , look for , but always look # for if we do not find the variant. -for cf_header in \ - `echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%/.*%/%'`term.h \ - term.h + +cf_header_list="term.h ncurses/term.h ncursesw/term.h" + +case ${cf_cv_ncurses_header:-curses.h} in #(vi +*/*) + cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`term.h + cf_header_list="$cf_header_item $cf_header_list" + ;; +esac + +for cf_header in $cf_header_list do AC_TRY_COMPILE([ #include <${cf_cv_ncurses_header:-curses.h}> @@ -1395,6 +1421,61 @@ ncursesw/term.h) esac ])dnl dnl --------------------------------------------------------------------------- +dnl CF_CURSES_UNCTRL_H version: 1 updated: 2011/04/09 18:19:55 +dnl ------------------ +dnl Any X/Open curses implementation must have unctrl.h, but ncurses packages +dnl may put it in a subdirectory (along with ncurses' other headers, of +dnl course). Packages which put the headers in inconsistent locations are +dnl broken). +AC_DEFUN([CF_CURSES_UNCTRL_H], +[ +AC_REQUIRE([CF_CURSES_CPPFLAGS])dnl + +AC_CACHE_CHECK(for unctrl.h, cf_cv_unctrl_header,[ + +# If we found , look for , but always look +# for if we do not find the variant. + +cf_header_list="unctrl.h ncurses/unctrl.h ncursesw/unctrl.h" + +case ${cf_cv_ncurses_header:-curses.h} in #(vi +*/*) + cf_header_item=`echo ${cf_cv_ncurses_header:-curses.h} | sed -e 's%\..*%%' -e 's%/.*%/%'`unctrl.h + cf_header_list="$cf_header_item $cf_header_list" + ;; +esac + +for cf_header in $cf_header_list +do + AC_TRY_COMPILE([ +#include <${cf_cv_ncurses_header:-curses.h}> +#include <${cf_header}>], + [WINDOW *x], + [cf_cv_unctrl_header=$cf_header + break], + [cf_cv_unctrl_header=no]) +done + +case $cf_cv_unctrl_header in #(vi +no) + AC_MSG_WARN(unctrl.h header not found) + ;; +esac +]) + +case $cf_cv_unctrl_header in #(vi +unctrl.h) #(vi + AC_DEFINE(HAVE_UNCTRL_H) + ;; +ncurses/unctrl.h) #(vi + AC_DEFINE(HAVE_NCURSES_UNCTRL_H) + ;; +ncursesw/unctrl.h) + AC_DEFINE(HAVE_NCURSESW_UNCTRL_H) + ;; +esac +])dnl +dnl --------------------------------------------------------------------------- dnl CF_CURSES_WACS_MAP version: 5 updated: 2011/01/15 11:28:59 dnl ------------------ dnl Check for likely values of wacs_map[]. @@ -1518,7 +1599,7 @@ fi AC_SUBST(LIBTOOL_VERSION) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_DISABLE_RPATH_HACK version: 1 updated: 2010/04/11 10:54:00 +dnl CF_DISABLE_RPATH_HACK version: 2 updated: 2011/02/13 13:31:33 dnl --------------------- dnl The rpath-hack makes it simpler to build programs, particularly with the dnl *BSD ports which may have essential libraries in unusual places. But it @@ -1526,7 +1607,7 @@ dnl can interfere with building an execu dnl option in that case. AC_DEFUN([CF_DISABLE_RPATH_HACK], [ -AC_MSG_CHECKING(if rpath should be not be set) +AC_MSG_CHECKING(if rpath-hack should be disabled) CF_ARG_DISABLE(rpath-hack, [ --disable-rpath-hack don't add rpath options for additional libraries], [cf_disable_rpath_hack=yes], @@ -2256,7 +2337,7 @@ ifdef([AC_FUNC_FSEEKO],[ ]) ]) dnl --------------------------------------------------------------------------- -dnl CF_LD_RPATH_OPT version: 3 updated: 2010/06/02 05:03:05 +dnl CF_LD_RPATH_OPT version: 4 updated: 2011/06/04 20:09:13 dnl --------------- dnl For the given system and compiler, find the compiler flags to pass to the dnl loader to use the "rpath" feature. @@ -2277,7 +2358,7 @@ irix*) #(vi linux*|gnu*|k*bsd*-gnu) #(vi LD_RPATH_OPT="-Wl,-rpath," ;; -openbsd[[2-9]].*) #(vi +openbsd[[2-9]].*|mirbsd*) #(vi LD_RPATH_OPT="-Wl,-rpath," ;; freebsd*) #(vi @@ -2356,7 +2437,7 @@ ifelse($1,,,[$1=$LIB_PREFIX]) AC_SUBST(LIB_PREFIX) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MAKEFLAGS version: 13 updated: 2010/10/23 15:52:32 +dnl CF_MAKEFLAGS version: 14 updated: 2011/03/31 19:29:46 dnl ------------ dnl Some 'make' programs support ${MAKEFLAGS}, some ${MFLAGS}, to pass 'make' dnl options to lower-levels. It's very useful for "make -n" -- if we have it. @@ -2373,7 +2454,7 @@ SHELL = /bin/sh all : @ echo '.$cf_option' CF_EOF - cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | sed -e 's,[[ ]]*$,,'` + cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp 2>/dev/null | fgrep -v "ing directory" | sed -e 's,[[ ]]*$,,'` case "$cf_result" in .*k) cf_result=`${MAKE:-make} -k -f cf_makeflags.tmp CC=cc 2>/dev/null` @@ -3107,7 +3188,7 @@ $1=`echo "$2" | \ -e 's/-[[UD]]'"$3"'\(=[[^ ]]*\)\?[$]//g'` ])dnl dnl --------------------------------------------------------------------------- -dnl CF_RPATH_HACK version: 8 updated: 2010/04/17 15:38:58 +dnl CF_RPATH_HACK version: 9 updated: 2011/02/13 13:31:33 dnl ------------- AC_DEFUN([CF_RPATH_HACK], [ @@ -3120,9 +3201,36 @@ if test -n "$LD_RPATH_OPT" ; then cf_rpath_list="/usr/lib /lib" if test "$cf_ldd_prog" != no then + cf_rpath_oops= + AC_TRY_LINK([#include ], [printf("Hello");], - [cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`]) + [cf_rpath_oops=`$cf_ldd_prog conftest$ac_exeext | fgrep ' not found' | sed -e 's% =>.*$%%' |sort -u` + cf_rpath_list=`$cf_ldd_prog conftest$ac_exeext | fgrep / | sed -e 's%^.*[[ ]]/%/%' -e 's%/[[^/]][[^/]]*$%%' |sort -u`]) + + # If we passed the link-test, but get a "not found" on a given library, + # this could be due to inept reconfiguration of gcc to make it only + # partly honor /usr/local/lib (or whatever). Sometimes this behavior + # is intentional, e.g., installing gcc in /usr/bin and suppressing the + # /usr/local libraries. + if test -n "$cf_rpath_oops" + then + for cf_rpath_src in $cf_rpath_oops + do + for cf_rpath_dir in \ + /usr/local \ + /usr/pkg \ + /opt/sfw + do + if test -f $cf_rpath_dir/lib/$cf_rpath_src + then + CF_VERBOSE(...adding -L$cf_rpath_dir/lib to LDFLAGS for $cf_rpath_src) + LDFLAGS="$LDFLAGS -L$cf_rpath_dir/lib" + break + fi + done + done + fi fi CF_VERBOSE(...checking EXTRA_LDFLAGS $EXTRA_LDFLAGS) @@ -3572,7 +3680,7 @@ if test "$with_dmalloc" = yes ; then fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_WITH_LIBTOOL version: 26 updated: 2010/10/23 15:55:24 +dnl CF_WITH_LIBTOOL version: 27 updated: 2011/06/28 18:45:38 dnl --------------- dnl Provide a configure option to incorporate libtool. Define several useful dnl symbols for the makefile rules. @@ -3648,7 +3756,7 @@ ifdef([AC_PROG_LIBTOOL],[ AC_MSG_ERROR(Cannot find libtool) fi ])dnl - LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} -o' + LIB_CREATE='${LIBTOOL} --mode=link ${CC} -rpath ${DESTDIR}${libdir} ${LIBTOOL_VERSION} `cut -f1 ${srcdir}/VERSION` ${LIBTOOL_OPTS} ${LT_UNDEF} $(LIBS) -o' LIB_OBJECT='${OBJECTS:.o=.lo}' LIB_SUFFIX=.la LIB_CLEAN='${LIBTOOL} --mode=clean' @@ -3842,7 +3950,7 @@ AC_TRY_LINK([ test $cf_cv_need_xopen_extension = yes && CPPFLAGS="$CPPFLAGS -D_XOPEN_SOURCE_EXTENDED" ])dnl dnl --------------------------------------------------------------------------- -dnl CF_XOPEN_SOURCE version: 34 updated: 2010/05/26 05:38:42 +dnl CF_XOPEN_SOURCE version: 35 updated: 2011/02/20 20:37:37 dnl --------------- dnl Try to get _XOPEN_SOURCE defined properly that we can use POSIX functions, dnl or adapt to the vendor's definitions to get equivalent functionality, @@ -3861,6 +3969,9 @@ case $host_os in #(vi aix[[456]]*) #(vi cf_xopen_source="-D_ALL_SOURCE" ;; +cygwin) #(vi + cf_XOPEN_SOURCE=600 + ;; darwin[[0-8]].*) #(vi cf_xopen_source="-D_APPLE_C_SOURCE" ;; Modified: vendor/dialog/dist/arrows.c ============================================================================== --- vendor/dialog/dist/arrows.c Thu Jul 14 13:47:42 2011 (r224011) +++ vendor/dialog/dist/arrows.c Thu Jul 14 13:57:13 2011 (r224012) @@ -1,5 +1,5 @@ /* - * $Id: arrows.c,v 1.33 2011/01/19 00:27:53 tom Exp $ + * $Id: arrows.c,v 1.36 2011/06/27 09:13:56 tom Exp $ * * arrows.c -- draw arrows to indicate end-of-range for lists * @@ -36,6 +36,10 @@ #define add_acs(win, code) waddch(win, dlg_boxchar(code)) #endif +/* size of decorations */ +#define ON_LEFT 4 +#define ON_RIGHT 3 + #ifdef HAVE_COLOR static chtype merge_colors(chtype foreground, chtype background) @@ -59,6 +63,36 @@ merge_colors(chtype foreground, chtype b #define merge_colors(f,b) (f) #endif +/* + * If we have help-line text, e.g., from "--hline", draw it between the other + * decorations at the bottom of the dialog window. + */ +void +dlg_draw_helpline(WINDOW *win, bool decorations) +{ + int cur_x, cur_y; + int bottom; + + if (dialog_vars.help_line != 0 + && (bottom = getmaxy(win) - 1) > 0) { + chtype attr = A_NORMAL; + const int *cols = dlg_index_columns(dialog_vars.help_line); + int other = decorations ? (ON_LEFT + ON_RIGHT) : 0; + int avail = (getmaxx(win) - other - 2); + int limit = dlg_limit_columns(dialog_vars.help_line, avail, 0); + + if (limit > 0) { + getyx(win, cur_y, cur_x); + other = decorations ? ON_LEFT : 0; + (void) wmove(win, bottom, other + (avail - limit) / 2); + waddch(win, '['); + dlg_print_text(win, dialog_vars.help_line, cols[limit], &attr); + waddch(win, ']'); + wmove(win, cur_y, cur_x); + } + } +} + void dlg_draw_arrows2(WINDOW *win, int top_arrow, @@ -94,7 +128,7 @@ dlg_draw_arrows2(WINDOW *win, (void) waddstr(win, "(-)"); } else { wattrset(win, attr); - (void) whline(win, dlg_boxchar(ACS_HLINE), 4); + (void) whline(win, dlg_boxchar(ACS_HLINE), ON_LEFT); } } mouse_mkbutton(top, x - 1, 6, KEY_PPAGE); @@ -106,7 +140,7 @@ dlg_draw_arrows2(WINDOW *win, (void) waddstr(win, "(+)"); } else { wattrset(win, borderattr); - (void) whline(win, dlg_boxchar(ACS_HLINE), 4); + (void) whline(win, dlg_boxchar(ACS_HLINE), ON_LEFT); } mouse_mkbutton(bottom, x - 1, 6, KEY_NPAGE); @@ -141,6 +175,7 @@ dlg_draw_scrollbar(WINDOW *win, getyx(win, oldy, oldx); getmaxyx(win, maxy, maxx); + dlg_draw_helpline(win, TRUE); if (bottom_arrow || top_arrow || dialog_state.use_scrollbar) { percent = (!total_data ? 100 @@ -213,6 +248,7 @@ dlg_draw_arrows(WINDOW *win, int top, int bottom) { + dlg_draw_helpline(win, TRUE); dlg_draw_arrows2(win, top_arrow, bottom_arrow, Modified: vendor/dialog/dist/buttons.c ============================================================================== --- vendor/dialog/dist/buttons.c Thu Jul 14 13:47:42 2011 (r224011) +++ vendor/dialog/dist/buttons.c Thu Jul 14 13:57:13 2011 (r224012) @@ -1,5 +1,5 @@ /* - * $Id: buttons.c,v 1.84 2011/01/19 00:27:53 tom Exp $ + * $Id: buttons.c,v 1.86 2011/06/28 10:46:46 tom Exp $ * * buttons.c -- draw buttons, e.g., OK/Cancel * @@ -442,16 +442,23 @@ const char ** dlg_exit_label(void) { const char **result; + DIALOG_VARS save; if (dialog_vars.extra_button) { + dlg_save_vars(&save); + dialog_vars.nocancel = TRUE; result = dlg_ok_labels(); + dlg_restore_vars(&save); } else { static const char *labels[3]; int n = 0; - labels[n++] = my_exit_label(); + if (!dialog_vars.nook) + labels[n++] = my_exit_label(); if (dialog_vars.help_button) labels[n++] = my_help_label(); + if (n == 0) + labels[n++] = my_exit_label(); labels[n] = 0; result = labels; @@ -465,7 +472,17 @@ dlg_exit_label(void) int dlg_exit_buttoncode(int button) { - return dlg_ok_buttoncode(button); + int result; + DIALOG_VARS save; + + dlg_save_vars(&save); + dialog_vars.nocancel = TRUE; + + result = dlg_ok_buttoncode(button); + + dlg_restore_vars(&save); + + return result; } const char ** Modified: vendor/dialog/dist/calendar.c ============================================================================== --- vendor/dialog/dist/calendar.c Thu Jul 14 13:47:42 2011 (r224011) +++ vendor/dialog/dist/calendar.c Thu Jul 14 13:57:13 2011 (r224012) @@ -1,5 +1,5 @@ /* - * $Id: calendar.c,v 1.60 2011/01/03 23:29:51 tom Exp $ + * $Id: calendar.c,v 1.62 2011/06/29 09:47:06 tom Exp $ * * calendar.c -- implements the calendar box * @@ -388,6 +388,7 @@ dialog_calendar(const char *title, { /* *INDENT-OFF* */ static DLG_KEYS_BINDING binding[] = { + HELPKEY_BINDINGS, ENTERKEY_BINDINGS, DLG_KEYS_DATA( DLGK_ENTER, ' ' ), DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ), @@ -571,7 +572,7 @@ dialog_calendar(const char *title, state = sYEAR; break; case DLGK_ENTER: - result = dlg_ok_buttoncode(button); + result = dlg_enter_buttoncode(button); break; case DLGK_FIELD_PREV: state = dlg_prev_ok_buttonindex(state, sMONTH); Modified: vendor/dialog/dist/checklist.c ============================================================================== --- vendor/dialog/dist/checklist.c Thu Jul 14 13:47:42 2011 (r224011) +++ vendor/dialog/dist/checklist.c Thu Jul 14 13:57:13 2011 (r224012) @@ -1,5 +1,5 @@ /* - * $Id: checklist.c,v 1.124 2011/01/19 00:27:53 tom Exp $ + * $Id: checklist.c,v 1.127 2011/06/29 23:04:09 tom Exp $ * * checklist.c -- implements the checklist box * @@ -149,6 +149,7 @@ dlg_checklist(const char *title, { /* *INDENT-OFF* */ static DLG_KEYS_BINDING binding[] = { + HELPKEY_BINDINGS, ENTERKEY_BINDINGS, DLG_KEYS_DATA( DLGK_FIELD_NEXT, KEY_RIGHT ), DLG_KEYS_DATA( DLGK_FIELD_NEXT, TAB ), @@ -193,6 +194,24 @@ dlg_checklist(const char *title, dlg_does_output(); dlg_tab_correct_str(prompt); + /* + * If this is a radiobutton list, ensure that no more than one item is + * selected initially. Allow none to be selected, since some users may + * wish to provide this flavor. + */ + if (flag == FLAG_RADIO) { + bool first = TRUE; + + for (i = 0; i < item_no; i++) { + if (items[i].state) { + if (first) { + first = FALSE; + } else { + items[i].state = 0; + } + } + } + } #ifdef KEY_RESIZE retry: #endif @@ -291,11 +310,12 @@ dlg_checklist(const char *title, choice = max_choice - 1; } /* Print the list */ - for (i = 0; i < max_choice; i++) + for (i = 0; i < max_choice; i++) { print_item(list, &items[i + scrollamt], states, i, i == choice); + } (void) wnoutrefresh(list); /* register the new window, along with its borders */ @@ -565,7 +585,7 @@ dlg_checklist(const char *title, if (fkey) { switch (key) { case DLGK_ENTER: - result = dlg_ok_buttoncode(button); + result = dlg_enter_buttoncode(button); break; case DLGK_FIELD_PREV: button = dlg_prev_button(buttons, button); Modified: vendor/dialog/dist/columns.c ============================================================================== --- vendor/dialog/dist/columns.c Thu Jul 14 13:47:42 2011 (r224011) +++ vendor/dialog/dist/columns.c Thu Jul 14 13:57:13 2011 (r224012) @@ -1,5 +1,5 @@ /* - * $Id: columns.c,v 1.7 2011/01/16 21:51:44 tom Exp $ + * $Id: columns.c,v 1.8 2011/06/28 09:26:23 tom Exp $ * * columns.c -- implements column-alignment * @@ -25,7 +25,7 @@ #define each(row, data) \ row = 0, data = target; \ - row < num_rows - 1; \ + row < num_rows; \ ++row, data = next_row(data, per_row) static char * Modified: vendor/dialog/dist/config.guess ============================================================================== --- vendor/dialog/dist/config.guess Thu Jul 14 13:47:42 2011 (r224011) +++ vendor/dialog/dist/config.guess Thu Jul 14 13:57:13 2011 (r224012) @@ -1,10 +1,10 @@ #! /bin/sh # Attempt to guess a canonical system name. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, -# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, +# 2911 Free Software Foundation, Inc. -timestamp='2010-09-24' +timestamp='2011-01-01' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -57,8 +57,8 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -92,7 +92,7 @@ if test $# != 0; then exit 1 fi -trap 'exit 1' HUP INT TERM +trap 'exit 1' 1 2 15 # CC_FOR_BUILD -- compiler used by this script. Note that the use of a # compiler to aid in system detection is discouraged as it requires @@ -106,7 +106,7 @@ trap 'exit 1' HUP INT TERM set_cc_for_build=' trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ; -trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" HUP INT PIPE TERM ; +trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; : ${TMPDIR=/tmp} ; { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || @@ -270,7 +270,10 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'` - exit ;; + # Reset EXIT trap before exiting to avoid spurious non-zero exit code. + exitcode=$? + trap '' 0 + exit $exitcode ;; Alpha\ *:Windows_NT*:*) # How do we know it's Interix rather than the generic POSIX subsystem? # Should we change UNAME_MACHINE based on the output of uname instead @@ -326,8 +329,8 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$ sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) - echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` - exit ;; + echo ${UNAME_MACHINE}-ibm-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit ;; @@ -495,7 +498,7 @@ EOF else echo i586-dg-dgux${UNAME_RELEASE} fi - exit ;; + exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; @@ -820,8 +823,8 @@ EOF echo x86_64-unknown-interix${UNAME_RELEASE} exit ;; IA64) - echo ia64-unknown-interix${UNAME_RELEASE} - exit ;; + echo ia64-unknown-interix${UNAME_RELEASE} + exit ;; esac ;; [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) echo i${UNAME_MACHINE}-pc-mks @@ -934,14 +937,14 @@ EOF test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } ;; or32:Linux:*:*) - echo or32-unknown-linux-gnu - exit ;; + echo or32-unknown-linux-gnu + exit ;; padre:Linux:*:*) echo sparc-unknown-linux-gnu exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) - echo hppa64-unknown-linux-gnu - exit ;; + echo hppa64-unknown-linux-gnu + exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in Modified: vendor/dialog/dist/config.sub ============================================================================== --- vendor/dialog/dist/config.sub Thu Jul 14 13:47:42 2011 (r224011) +++ vendor/dialog/dist/config.sub Thu Jul 14 13:57:13 2011 (r224012) @@ -2,9 +2,9 @@ # Configuration validation subroutine script. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 -# Free Software Foundation, Inc. +# 2011 Free Software Foundation, Inc. -timestamp='2010-09-11' +timestamp='2011-04-01' # This file is (in principle) common to ALL GNU software. # The presence of a machine in this file suggests that SOME GNU software @@ -76,8 +76,8 @@ version="\ GNU config.sub ($timestamp) Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, -2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free -Software Foundation, Inc. +2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 +Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -175,10 +175,10 @@ case $os in os=-chorusos basic_machine=$1 ;; - -chorusrdb) - os=-chorusrdb + -chorusrdb) + os=-chorusrdb basic_machine=$1 - ;; + ;; -hiux*) os=-hiuxwe2 ;; @@ -283,12 +283,13 @@ case $basic_machine in | moxie \ | mt \ | msp430 \ - | nds32 | nds32le | nds32be\ + | nds32 | nds32le | nds32be \ | nios | nios2 \ | ns16k | ns32k \ + | open8 \ | or32 \ | pdp10 | pdp11 | pj | pjl \ - | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ + | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ | rx \ | score \ @@ -296,12 +297,12 @@ case $basic_machine in | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ - | spu | strongarm \ - | tahoe | thumb | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ + | spu \ + | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e \ | we32k \ - | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ + | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; @@ -324,7 +325,15 @@ case $basic_machine in ms1) basic_machine=mt-unknown ;; - + strongarm | thumb | xscale) + basic_machine=arm-unknown + ;; + xscaleeb) + basic_machine=armeb-unknown + ;; + xscaleel) + basic_machine=armel-unknown + ;; # We use `pc' rather than `unknown' # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. @@ -382,24 +391,25 @@ case $basic_machine in | nds32-* | nds32le-* | nds32be-* \ | nios-* | nios2-* \ | none-* | np1-* | ns16k-* | ns32k-* \ + | open8-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ - | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \ + | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ - | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ - | tahoe-* | thumb-* \ + | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \ + | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile-* | tilegx-* \ | tron-* \ | ubicom32-* \ | v850-* | v850e-* | vax-* \ | we32k-* \ - | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ + | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) @@ -539,7 +549,7 @@ case $basic_machine in basic_machine=craynv-cray os=-unicosmp ;; - cr16) + cr16 | cr16-*) basic_machine=cr16-unknown os=-elf ;; @@ -826,10 +836,10 @@ case $basic_machine in basic_machine=v70-nec os=-sysv ;; - next | m*-next ) + next | m*-next) basic_machine=m68k-next case $os in - -nextstep* ) + -nextstep*) ;; -ns2*) os=-nextstep2 @@ -948,11 +958,14 @@ case $basic_machine in *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***