svn commit: r251843 - in head: contrib/dialog contrib/dialog/package contrib/dialog/package/debian contrib/dialog/po contrib/dialog/samples contrib/dialog/samples/copifuncs contrib/dialog/samples/i...

Baptiste Daroussin bapt at FreeBSD.org
Mon Jun 17 10:28:56 UTC 2013 

Author: bapt
Date: Mon Jun 17 10:28:55 2013
New Revision: 251843
URL: http://svnweb.freebsd.org/changeset/base/251843

Log:
  Update dialog to 1.2-20130523
  Level up WARNS

Added:
  head/contrib/dialog/buildlist.c
     - copied unchanged from r251840, vendor/dialog/dist/buildlist.c
  head/contrib/dialog/po/an.po
     - copied unchanged from r251840, vendor/dialog/dist/po/an.po
  head/contrib/dialog/po/ia.po
     - copied unchanged from r251840, vendor/dialog/dist/po/ia.po
  head/contrib/dialog/rangebox.c
     - copied unchanged from r251840, vendor/dialog/dist/rangebox.c
  head/contrib/dialog/samples/buildlist
     - copied unchanged from r251840, vendor/dialog/dist/samples/buildlist
  head/contrib/dialog/samples/buildlist2
     - copied unchanged from r251840, vendor/dialog/dist/samples/buildlist2
  head/contrib/dialog/samples/checklist12
     - copied unchanged from r251840, vendor/dialog/dist/samples/checklist12
  head/contrib/dialog/samples/dft-cancel
     - copied unchanged from r251840, vendor/dialog/dist/samples/dft-cancel
  head/contrib/dialog/samples/dft-extra
     - copied unchanged from r251840, vendor/dialog/dist/samples/dft-extra
  head/contrib/dialog/samples/dft-help
     - copied unchanged from r251840, vendor/dialog/dist/samples/dft-help
  head/contrib/dialog/samples/dft-no
     - copied unchanged from r251840, vendor/dialog/dist/samples/dft-no
  head/contrib/dialog/samples/fselect0
     - copied unchanged from r251840, vendor/dialog/dist/samples/fselect0
  head/contrib/dialog/samples/menubox12
     - copied unchanged from r251840, vendor/dialog/dist/samples/menubox12
  head/contrib/dialog/samples/rangebox
     - copied unchanged from r251840, vendor/dialog/dist/samples/rangebox
  head/contrib/dialog/samples/rangebox2
     - copied unchanged from r251840, vendor/dialog/dist/samples/rangebox2
  head/contrib/dialog/samples/rangebox3
     - copied unchanged from r251840, vendor/dialog/dist/samples/rangebox3
  head/contrib/dialog/samples/rangebox4
     - copied unchanged from r251840, vendor/dialog/dist/samples/rangebox4
  head/contrib/dialog/samples/treeview
     - copied unchanged from r251840, vendor/dialog/dist/samples/treeview
  head/contrib/dialog/samples/treeview2
     - copied unchanged from r251840, vendor/dialog/dist/samples/treeview2
  head/contrib/dialog/samples/with-dquotes
     - copied unchanged from r251840, vendor/dialog/dist/samples/with-dquotes
  head/contrib/dialog/samples/with-squotes
     - copied unchanged from r251840, vendor/dialog/dist/samples/with-squotes
  head/contrib/dialog/treeview.c
     - copied unchanged from r251840, vendor/dialog/dist/treeview.c
Deleted:
  head/contrib/dialog/samples/copifuncs/admin.funcs
  head/contrib/dialog/samples/copifuncs/common.funcs
  head/contrib/dialog/samples/copifuncs/copi.funcs
  head/contrib/dialog/samples/copifuncs/copi.ifman1
  head/contrib/dialog/samples/copifuncs/copi.ifman2
  head/contrib/dialog/samples/copifuncs/copi.ifmcfg2
  head/contrib/dialog/samples/copifuncs/copi.ifmcfg4
  head/contrib/dialog/samples/copifuncs/copi.ifmcfg5
  head/contrib/dialog/samples/copifuncs/copi.ifpoll1
  head/contrib/dialog/samples/copifuncs/copi.ifpoll2
  head/contrib/dialog/samples/copifuncs/copi.ifreq1
  head/contrib/dialog/samples/copifuncs/copi.ifreq2
  head/contrib/dialog/samples/copifuncs/copi.rcnews
  head/contrib/dialog/samples/copifuncs/copi.sendifm1
  head/contrib/dialog/samples/copifuncs/copi.sendifm2
  head/contrib/dialog/samples/copifuncs/copi.trnrc
  head/contrib/dialog/samples/copifuncs/copi.wheel
  head/contrib/dialog/samples/copifuncs/ifpatch
  head/contrib/dialog/samples/copismall
  head/contrib/dialog/samples/dselect
  head/contrib/dialog/samples/install/FDISK.TEST
  head/contrib/dialog/samples/install/makefile.in
  head/contrib/dialog/samples/install/setup.c
  head/contrib/dialog/samples/install/setup.help
  head/contrib/dialog/samples/valgrind.log
Modified:
  head/contrib/dialog/CHANGES
  head/contrib/dialog/VERSION
  head/contrib/dialog/aclocal.m4
  head/contrib/dialog/argv.c
  head/contrib/dialog/arrows.c
  head/contrib/dialog/buttons.c
  head/contrib/dialog/calendar.c
  head/contrib/dialog/checklist.c
  head/contrib/dialog/columns.c
  head/contrib/dialog/config.guess
  head/contrib/dialog/config.sub
  head/contrib/dialog/configure
  head/contrib/dialog/configure.in
  head/contrib/dialog/dialog-config.in
  head/contrib/dialog/dialog.1
  head/contrib/dialog/dialog.3
  head/contrib/dialog/dialog.c
  head/contrib/dialog/dialog.h
  head/contrib/dialog/dlg_colors.h
  head/contrib/dialog/dlg_keys.c
  head/contrib/dialog/dlg_keys.h
  head/contrib/dialog/editbox.c
  head/contrib/dialog/formbox.c
  head/contrib/dialog/fselect.c
  head/contrib/dialog/guage.c
  head/contrib/dialog/headers-sh.in
  head/contrib/dialog/help.c
  head/contrib/dialog/inputbox.c
  head/contrib/dialog/inputstr.c
  head/contrib/dialog/makefile.in
  head/contrib/dialog/menubox.c
  head/contrib/dialog/mixedform.c
  head/contrib/dialog/mixedgauge.c
  head/contrib/dialog/mouse.c
  head/contrib/dialog/mousewget.c
  head/contrib/dialog/msgbox.c
  head/contrib/dialog/package/debian/changelog
  head/contrib/dialog/package/dialog.spec
  head/contrib/dialog/pause.c
  head/contrib/dialog/po/cs.po
  head/contrib/dialog/po/el.po
  head/contrib/dialog/po/gl.po
  head/contrib/dialog/po/hr.po
  head/contrib/dialog/po/sr.po
  head/contrib/dialog/po/zh_TW.po
  head/contrib/dialog/prgbox.c
  head/contrib/dialog/progressbox.c
  head/contrib/dialog/rc.c
  head/contrib/dialog/rename.sh
  head/contrib/dialog/samples/README
  head/contrib/dialog/samples/debian.rc
  head/contrib/dialog/samples/dialog.py
  head/contrib/dialog/samples/form1
  head/contrib/dialog/samples/inputmenu
  head/contrib/dialog/samples/inputmenu-stdout
  head/contrib/dialog/samples/inputmenu1
  head/contrib/dialog/samples/inputmenu2
  head/contrib/dialog/samples/inputmenu3
  head/contrib/dialog/samples/inputmenu4
  head/contrib/dialog/samples/killall
  head/contrib/dialog/samples/prgbox
  head/contrib/dialog/samples/prgbox2
  head/contrib/dialog/samples/report-button
  head/contrib/dialog/samples/report-edit
  head/contrib/dialog/samples/report-string
  head/contrib/dialog/samples/report-tempfile
  head/contrib/dialog/samples/report-yesno
  head/contrib/dialog/samples/setup-edit
  head/contrib/dialog/samples/setup-tempfile
  head/contrib/dialog/samples/setup-utf8
  head/contrib/dialog/samples/setup-vars
  head/contrib/dialog/samples/slackware.rc
  head/contrib/dialog/samples/sourcemage.rc
  head/contrib/dialog/samples/suse.rc
  head/contrib/dialog/samples/tailboxbg
  head/contrib/dialog/samples/tailboxbg1
  head/contrib/dialog/samples/tailboxbg2
  head/contrib/dialog/samples/testdata-8bit
  head/contrib/dialog/samples/wheel
  head/contrib/dialog/samples/whiptail.rc
  head/contrib/dialog/tailbox.c
  head/contrib/dialog/textbox.c
  head/contrib/dialog/timebox.c
  head/contrib/dialog/trace.c
  head/contrib/dialog/ui_getc.c
  head/contrib/dialog/util.c
  head/contrib/dialog/yesno.c
  head/gnu/lib/libdialog/Makefile
  head/gnu/lib/libdialog/dlg_config.h
  head/gnu/usr.bin/dialog/Makefile
Directory Properties:
  head/contrib/dialog/   (props changed)

Modified: head/contrib/dialog/CHANGES
==============================================================================
--- head/contrib/dialog/CHANGES	Mon Jun 17 10:21:38 2013	(r251842)
+++ head/contrib/dialog/CHANGES	Mon Jun 17 10:28:55 2013	(r251843)
@@ -1,9 +1,229 @@
--- $Id: CHANGES,v 1.360 2011/07/07 23:35:10 tom Exp $
+-- $Id: CHANGES,v 1.458 2013/05/24 00:23:22 tom Exp $
 -- Thomas E. Dickey <dickey at invisible-island.net>
 
 This version of dialog was originally from a Debian snapshot.  I've done this
 to it:
 
+2013/05/23
+	+ modify ifdef in arrows.c to work around packages which use the
+	  wide-character ncursesw headers with the ncurses library (report
+	  by Aleksey Cheusov).
+	+ correct workaround for xterm alternate-screen to work with/without
+	  the fix made in ncurses that makes putp() always write to the
+	  standard output (Debian #708829).
+	+ improve limit-checks for checklist, in case the dialog is resized
+	  (report by Ilya A Arkhipov).
+	+ add --last-key option (adapted from patch by Jordi Pujol, Debian
+	  #697607).
+
+2013/03/15
+	+ update zh_TW.po, add an.po from
+		http://translationproject.org/latest/dialog/
+
+2012/12/30 - release 1.2
+	+ improve some older changelog entries to help with HTML'izing content.
+	+ various fixes/improvments for scrollbar appearance.
+	+ add mappings for some equivalent options provided by whiptail;
+	  add configure option --disable-whiptail to allow suppressing these.
+	+ add configure option --disable-Xdialog2 to allow suppressing the
+	  newer features, i.e., for cdialog 1.2
+	+ add --no-items option, for consistency.
+	+ add --no-tags option, like Xdialog.
+	+ add buildlist, rangebox and treeview dialogs, like Xdialog.
+	+ remove obsolete workaround for ncurses 4.2 scrolling in checklist
+	  and menubox.
+	+ improve dialog_helpfile() by preventing it from showing extra buttons
+	  (suggested by xDog Walker).
+	+ correct logic in formbox's scroll_next() function (report by xDog
+	  Walker).
+	+ fix a case with inputbox widget where preset input text is not shown
+	  until moving the cursor within the text (report by xDog Walker).
+	+ handle SIGCHLD in dialog_prgbox() to eliminate defunct processes
+	  (report by xDog Walker).
+	+ improve the way "hotkeys" are assigned to widget buttons by checking
+	  if a given key has already been used in the row of buttons (Debian
+	  #684933).
+	+ amend fix for --trace parsing from 2012/07/03, which sometimes
+	  skipped a parameter (report by xDog Walker).
+	+ drop copismall and install files from samples, which were essentially
+	  nonfunctional.
+	+ correct secondary border colors in samples/slackware.rc and
+	  samples/whiptail.rc
+	+ update gl.po, add ia.po from
+		http://translationproject.org/latest/dialog/
+	+ fix various issues reported by coverity scan.
+	+ miscellaneous configure script fixes/updates:
+	  + require autoconf 2.52+patches
+	  + support --datarootdir option
+	  + check for clang compiler
+	  + check for tinfo library when looking for ncurses
+	  + add 3rd parameter to AC_DEFINE for autoheader
+	  + remove unused macros from aclocal.m4
+	+ update config.guess, config.sub
+
+2012/07/06
+	+ modify samples/setup-tempfile to work with Tru64's shell.
+	+ modify inputmenu sample scripts to make them more portable:
+	  + use "id" rather than "$GROUPS", use sed to work with Solaris.
+	  + use sed to split-up the rename results to work with HPUX.
+	+ fix regression in msgbox (ArchLinux #30574)
+
+2012/07/03
+	+ modify prgbox widget to work with --extra-button, etc.
+	+ add case values to several widgets to allow for mouse-clicks with
+	"--extra-button" and "--help-button" additions.
+	+ correct timebox widget's exit code for "--extra-button" when handing
+	  the "enter" key.
+	+ modify msgbox widget to honor "--extra-button".
+	+ corrected processing of "--trace" option, which did not update the
+	  index into command-line to point past its value.
+	+ add a check in dialog program for valid characters used in option,
+	  e.g., to generate an error if a script attempts to add option value
+	  using "=" rather than with whitespace.
+	+ add new command-line option --default-button and library function
+	  dlg_default_button() to retrieve the value set by the option
+	  to provide a way to set the default button directly rather than
+	  by combining --nook, etc. (patch by Zoltan Kelemen).
+	+ amend include of unctrl.h to apply only to the case where curses.h
+	  is included, to avoid conflict of ncurses' unctrl.h with a system
+	  implementation (report by Martin Roedlach)
+	+ add limit-check to dlg_toupper() in non-wide curses mode to work
+	  when non-character values such as arrow-key codes are passed to
+	  it (patch by Zoltan Kelemen).
+	+ override timeout value, e.g., as set via --timeout command-line
+	  option in pause widget because that interferes with pause's behavior
+	  (report by Jan Spitalnik).
+	+ modify samples/inputmenu* to allow ":" in renamed text (report by
+	  Andreas Stoewing).
+	+ modify double-quoting to make it more consistent, i.e., checklist
+	  output is quoted only when needed.  This fixes the case where
+	  single-quotes were used whether or not needed, but also modifies
+	  older checklist behavior for double-quoting which always added those
+	  (Debian #663664).
+	+ correct exit-code used in inputmenu for "rename" button (Debian
+	  #673041, forwarded from Ubuntu #333909, patch by Lebedev Vadim).
+	+ update el.po and hr.po from
+		http://translationproject.org/latest/dialog/
+	+ use checkbashisms to clean up sample scripts.
+
+2012/02/15
+	+ modify menubox.c to use the same improvement as in checklist.c
+	+ improve auto width computation for checklist widget by using
+	  dlg_calc_list_width as in the non-auto case (Edho Arief).
+	+ eliminate some bashisms in the sample scripts (Pedro Giffuni).
+	+ makefile fixes from FreeBSD ports (Li-Wen Hsu):
+	  + make --with-package option of configure script work.
+	  + get LIBTOOL_VERSION from configure script, needed by
+	    ${LIBTOOL_VERSION} in LIBTOOL_CREATE (LIB_CREATE in configure and
+	    aclocal.m4)
+	+ update cs.po and sr.po from
+		http://translationproject.org/latest/dialog/
+	+ updated configure script macros, improving CF_XOPEN_SOURCE among
+	  other fixes.
+
+2011/10/20
+	+ fix --analyze warnings for clang versions 2.8, 2.9.
+	+ add configure check for lint program.
+	+ add check in dlg_getc() in case its window is freed as a side effect
+	  of removing callbacks.
+	+ fix logic in freeing subwindows (report by xDog Walker).
+	+ fix a regression in logic distinguishing between inputmenu and menu
+	  widgets (report by xDog Walker).
+	+ minor fixes to library manpage.
+
+2011/10/18
+	+ modify header-sh.in to work around limit on sed script length on
+	  HPUX.
+	+ add a special case of parameter parsing for "--trace" to the
+	  initialization done before calling init_dialog(), to allow users to
+	  capture the initial state of the parameter list before any options
+	  are processed and removed.  This is only done if "--trace" is the
+	  first option, otherwise it is handled in the common options as before
+	  (report by xDog Walker).
+	+ modify samples/testdata-8bit, discarding $1 from the parameter list
+	  if it was used, so that the source'ing scripts can consistently use
+	  "$@" to insert parameters before the widget, e.g., as an alternative
+	  to using $DIALOGOPTS (report by xDog Walker).
+	+ modify treatment of function pointers in menubox.c, make
+	  dlg_renamed_menutext() and dlg_dummy_menutext() visible to library
+	  users (request by xDog Walker).
+	+ add dlg_count_real_columns(), use to modify centering for "--hline"
+	  text to account for "\Z"s (report by xDog Walker).
+	+ improve check in dlg_draw_arrows2() for conflict between the window
+	  title and up-arrow marker to take into account that the given window
+	  may not be the top-level window of the widget.
+	+ change width of page up/down mouse areas in fselect panes to use the
+	  full width of the panes rather than only the portion from the left
+	  margin to the up/down arrow.
+	+ add/use dlg_draw_box2() and dlg_draw_bottom_box2() to use the
+	  secondary borders.
+	+ modify rc-file read/write to accept/generate color values that refer
+	  to previously-processed items in the color table.  This reduces the
+	  number of distinct colors that must be specified to set up a color
+	  scheme.
+	+ add color table entries for secondary borders, i.e., the ones that
+	  are normally drawn with the dialog's text-colors (Debian #641168).
+	+ modify fselect.c to scan the current directory if the input field
+	  happens to be empty (Debian #640905).
+	+ repeated the discussion of environment variables that can override
+	  the exit-status values in the manpage's return-codes section
+	  (Debian #642105).
+	+ add an example to the manpage showing how to override the form
+	  widget's keys used for field/button traversal (Debian #642108).
+	+ modify call to dlg_register_window() in formbox.c so that the editing
+	  bindings are attached to the form sub-window rather than the
+	  top-level dialog window.  Also change the name by which the editing
+	  bindings are bound for editbox.c, fselect.c and inputbox.c, so that
+	  the editing and navigation bindings can be different.
+	+ correct logic in dlg_lookup_key() so that it matches the widget name
+	  before using a binding from .dialogrc, allowing the inner/outer
+	  windows of form and other editing widgets to have different bindings.
+	+ modify dlg_register_window() to call dlg_dump_window_keys() after
+	  its updates, via the --trace output, to supplement the manpage
+	  description of key bindings (Debian #642108).
+	+ add DLGK_FORM_PREV and DLGK_FORM_NEXT key-bindings to form.c, to
+	  allow binding a single key to traverse both form-fields and buttons
+	  (Debian #642108).
+	+ modify dlg_parse_rc() to check for error return from
+	  dlg_parse_bindkey().
+	+ add function dlg_dump_window_keys(), to help with debugging widgets.
+	+ add CR, LF, TAB, FF and ESC to table of curses names to help make
+	  key bindings more readable.
+	+ update table of dialog key-names so that helpfile and trace are
+	  dumped properly.
+	+ correct dlg_dump_keys(), which was showing only the first item in
+	  the matched binding table.
+	+ save/restore window current position in dlg_update_mixedgauge().
+	+ pass return-code from pause_for_ok() from dlg_progressbox() when
+	  pauseopt is set, rather than only DLG_OK.
+	+ call setlocale() in init_dialog() rather than relying on on-demand
+	  use within inputstr.c, since there are paths in textbox widget which
+	  do not exercise the latter (report by xDog Walker).
+	+ fix some places where checks for "\Z" were done without also checking
+	  dialog_vars.colors (report by Moray Henderson).
+	+ correct logic for DIALOGOPTS parsing so that the parse happens only
+	  once unless memory leak checking is enabled (report by xDog Walker).
+	+ remove an incorrect free() call in dlg_free_gauge() (report by xDog
+	  Walker).
+	+ modify dlg_trace_win() to log wide-characters (report by xDog Walker).
+	+ make traces shorter by skipping repeated ERR's, but showing the
+	  number skipped (report by xDog Walker).
+	+ improve description in manpage to distinguish program box and
+	  progress box from tailboxes (adapted from email by xDog Walker).
+	+ modify dlg_trace_win() so that it looks for the topmost window in a
+	  dialog.  Because subwindows share space with the top window, tracing
+	  the latter shows the whole widget (report by xDog Walker).
+	+ expand tracing so that each window is traced before soliciting input,
+	  making the ^T feature to print a window on demand partly redundant
+	  (suggested by xDog Walker).
+	+ cosmetic change in dialog.h to avoid "*/*" strings from comments next
+	  to "*" (report by xDog Walker).
+	+ ensure result from dlg_align_columns() has trailing null on each
+	  string.  Analysis was hindered by libc6's continuance of libc5's
+	  early-1990s misfeature of clearing the result from malloc, noting
+	  that libc6's documentation incorrectly claims that it does not do
+	  this (report by xDog Walker).
+
 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
@@ -87,7 +307,7 @@ to it:
 	  + 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
+	+ update config.guess, config.sub
 
 2011/03/02
 	+ add --prgbox and --programbox (adapted from patch by David Boyd).
@@ -155,7 +375,7 @@ to it:
 	    CF_ADD_LIBDIR for the curses-directory here, from
 	    CF_NCURSES_CPPFLAGS and CF_NCURSES_LDFLAGS, so it will work even
 	    with the default checking, e.g., no --with-ncurses, etc.
-	+ updated config.guess, config.sub
+	+ update config.guess, config.sub
 
 2010/04/28
 	+ several improvements to configure script:
@@ -250,7 +470,7 @@ to it:
 	    libutf8 and libiconv.
 	+ update da.po, ru.po from
 		http://translationproject.org/latest/dialog/
-	+ updated config.guess, config.sub
+	+ update config.guess, config.sub
 
 2008/08/19
 	+ amend changes to quoting; by default, the checklist widget quotes its
@@ -333,7 +553,7 @@ to it:
 	  ESC to be returned, quitting dialog (report by Reiner Huober).
 	+ add extern "C" declarations to dlg_keys.h so the corresponding
 	  function declarations are exported to C++ as C symbols.
-	+ updated config.guess, config.sub
+	+ update config.guess, config.sub
 
 2007/06/04
 	+ fix a memory leak in editbox.c
@@ -395,7 +615,8 @@ to it:
 	+ use $(INSTALL_SCRIPT) for installing dialog-config (report by
 	  Santiago Vila).
 
-2007/02/27
+2007/02/27 - release 1.1
+	+ mark as "dialog 1.1"
 	+ add dialog-config script, which provides applications with compile-
 	  and link-information for using the dialog library.
 	+ move calls to dlg_trim_string() out of loop in dialog.c, so each
@@ -436,7 +657,7 @@ to it:
 	  CF_CURSES_LIBS, CF_INCLUDE_DIRS, CF_LARGEFILE, CF_MAKEFLAGS,
 	  CF_PATH_SYNTAX, CF_SUBDIR_PATH, CF_SUBST, CF_WITH_DBMALLOC,
 	  CF_WITH_DMALLOC, CF_WITH_LIBTOOL and CF_XOPEN_SOURCE.
-	+ updated config.guess, config.sub
+	+ update config.guess, config.sub
 	> adapted fixes from SuSE package (Werner Fink):
 	  + add some limit-checks in dlg_draw_shadow().
 	  + make shadows resizable, using new dlg_move_window() in msgbox.c
@@ -628,8 +849,7 @@ to it:
 	+ modify tailboxbg by resetting tty modes at the point where it forks a
 	  process to update the screen, rather than waiting until that process
 	  exits.  This improves user feedback by making it apparent that dialog
-	  is no longer processing input after that point (Redhat Bugzilla
-	  #142538).
+	  is no longer processing input after that point (Redhat #142538).
 	+ minor updates to some .po files using Babel Fish, comparing with lynx.
 	+ update es.po (Santiago Vila).
 	+ work around bug in NetBSD 1.6 curses which seems to be confused by
@@ -815,8 +1035,7 @@ to it:
 	  before dialog is invoked (Debian #244746).
 	+ correct dlg_match_char() function, which was broken during rewrite
 	  to support wide-characters (Debian #244777).
-	+ improved ru.po, uses UTF-8 charset (Leonid Kanter, Redhat Bugzilla
-	  #119200).
+	+ improved ru.po, uses UTF-8 charset (Leonid Kanter, Redhat #119200).
 	+ correct position of shadow drawn for dialogs, which appeared to work
 	  for most versions of curses (other than NetBSD) but would have been
 	  visible for certain color schemes (discussion with Julian Coleman).
@@ -1147,7 +1366,7 @@ to it:
 	  the --stdout option does not work on HPUX but otherwise dialog works.
 	+ updated el.po (patch by kromJx <kromJx at crosswinds.net>).
 
-2002/05/19
+2002/05/19 - release 0.9b
 	+ add --no-collapse option to allow one to retain tabs and repeated
 	  blanks in a message box (request by Roberto Simoni).
 	+ use DLG_EXIT_ESC constant rather than -1's in several places.  This
@@ -1615,15 +1834,15 @@ to it:
 	  Santiago Vila <sanvila at ctv.es>:
 
 	  1999/10/07
-		+ add a password dialog box.
+		+ add a password dialog box (Debian #45964, patch by Joey Hess).
 		+ implement "--defaultno" option to specify if the default for
-		  the yes/no box is "No".
+		  the yes/no box is "No" (Debian #46076, patch by Joey Hess).
 	  1999/03/10
 		+ modify input.c to clear the input field to the right of the
-		  given string (unclear:  this seems redundant, since the
-		  dialog is drawn in a new window).
+		  given string, to help with screen-refresh
 	  1998/12/08
-		+ check for list_height less than one in checklist.c
+		+ check for list_height less than one in checklist.c (Debian
+		  #22239).
 	  1998/10/21
 		+ use function wscrl() in preference to scroll() in checklist.c
 		  and menubox.c (unclear: in ncurses, scroll() is a macro that
@@ -1633,12 +1852,14 @@ to it:
 		  that directory.
 	  1998/09/12
 		+ simplify menubox.c using new functions print_arrows() and
-		  print_items().
-		+ add logic to handle KEY_NPAGE and KEY_PPAGE.
-		+ change sample scripts to use Debian tempfile utility rather
-		  than putting files into /tmp.
-		+ change sample scripts to use 'dialog' from user's path rather
-		  than in the parent directory as in the build directory.
+		  print_items().  add logic to handle KEY_NPAGE and KEY_PPAGE
+		  (Debian #26326).
+		+ modifications to provide sample scripts (Debian #26211):
+		  + change sample scripts to use Debian tempfile utility rather
+		    than putting files into /tmp.
+		  + change sample scripts to use 'dialog' from user's path
+		    rather than in the parent directory as in the build
+		    directory.
 		+ use the system copy of GPL rather than that in the build
 		  directory as an example for the textbox script.
 
@@ -1664,16 +1885,16 @@ The relevant portions of the Debian chan
 1998/05/24
 
 	+ Replaced guage.c by the one in dialog 0.6z, which is known to work.
-	  Fixes Bug #18284: unstable dialog.
+	  Fixes Debian #18284: unstable dialog.
 
 1997/12/16
 
 	+ dialog.c:  dialog_input_result printed with "%s" format.  This was
-	  Bug #9913, fixed by Bill Mitchell, but the change was lost.
+	  Debian #9913, fixed by Bill Mitchell, but the change was lost.
 	+ Pristine source, .depend is not removed in clean target.  Instead, it
-	  is made zero lenght (otherwise it would not work *without* fakeroot).
-	+ Added '^U' support in input box (Bug #9915, patch by joey at debian.org).
-	+ Wrote patch to fix core-dumping problem (Bug #13170).  Sven Rudolph
+	  is made zero length (otherwise it would not work *without* fakeroot).
+	+ Added '^U' support in input box (Debian #9915, patch by Joey Hess).
+	+ Wrote patch to fix core-dumping problem (Debian #13170).  Sven Rudolph
 	  <sr1 at inf.tu-dresden.de>:
 
 -- vile:fk=8bit

Modified: head/contrib/dialog/VERSION
==============================================================================
--- head/contrib/dialog/VERSION	Mon Jun 17 10:21:38 2013	(r251842)
+++ head/contrib/dialog/VERSION	Mon Jun 17 10:28:55 2013	(r251843)
@@ -1 +1 @@
-10:0:0	1.1	20110707
+11:1:0	1.2	20130523

Modified: head/contrib/dialog/aclocal.m4
==============================================================================
--- head/contrib/dialog/aclocal.m4	Mon Jun 17 10:21:38 2013	(r251842)
+++ head/contrib/dialog/aclocal.m4	Mon Jun 17 10:28:55 2013	(r251843)
@@ -1,7 +1,7 @@
 dnl macros used for DIALOG configure script
-dnl $Id: aclocal.m4,v 1.82 2011/06/28 22:48:31 tom Exp $
+dnl $Id: aclocal.m4,v 1.90 2012/12/02 20:07:30 tom Exp $
 dnl ---------------------------------------------------------------------------
-dnl Copyright 1999-2010,2011 -- Thomas E. Dickey
+dnl Copyright 1999-2011,2012 -- Thomas E. Dickey
 dnl
 dnl Permission is hereby granted, free of charge, to any person obtaining a
 dnl copy of this software and associated documentation files (the
@@ -31,23 +31,21 @@ dnl see
 dnl http://invisible-island.net/autoconf/ 
 dnl ---------------------------------------------------------------------------
 dnl ---------------------------------------------------------------------------
-dnl AM_GNU_GETTEXT version: 12 updated: 2010/06/19 07:02:11
+dnl AM_GNU_GETTEXT version: 13 updated: 2012/11/09 05:47:26
 dnl --------------
 dnl Usage: Just like AM_WITH_NLS, which see.
 AC_DEFUN([AM_GNU_GETTEXT],
   [AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-   AC_REQUIRE([AC_PROG_CC])dnl
    AC_REQUIRE([AC_CANONICAL_HOST])dnl
    AC_REQUIRE([AC_PROG_RANLIB])dnl
-   AC_REQUIRE([AC_ISC_POSIX])dnl
    AC_REQUIRE([AC_HEADER_STDC])dnl
-   AC_REQUIRE([AC_C_CONST])dnl
    AC_REQUIRE([AC_C_INLINE])dnl
    AC_REQUIRE([AC_TYPE_OFF_T])dnl
    AC_REQUIRE([AC_TYPE_SIZE_T])dnl
    AC_REQUIRE([AC_FUNC_ALLOCA])dnl
    AC_REQUIRE([AC_FUNC_MMAP])dnl
    AC_REQUIRE([jm_GLIBC21])dnl
+   AC_REQUIRE([CF_PROG_CC])dnl
 
    AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \
 stdlib.h string.h unistd.h sys/param.h])
@@ -282,7 +280,7 @@ fi
 AC_SUBST($1)dnl
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl AM_WITH_NLS version: 24 updated: 2010/06/20 09:24:28
+dnl AM_WITH_NLS version: 25 updated: 2012/10/06 08:57:51
 dnl -----------
 dnl Inserted as requested by gettext 0.10.40
 dnl File from /usr/share/aclocal
@@ -385,7 +383,7 @@ AC_DEFUN([AM_WITH_NLS],
       LIBS="$cf_save_LIBS_1"
 
       if test "$cf_cv_func_gettext" = yes ; then
-        AC_DEFINE(HAVE_LIBINTL_H)
+        AC_DEFINE(HAVE_LIBINTL_H,1,[Define to 1 if we have libintl.h])
 
         dnl If an already present or preinstalled GNU gettext() is found,
         dnl use it.  But if this macro is used in GNU gettext, and GNU
@@ -592,15 +590,30 @@ changequote([,])dnl
   AC_SUBST(GENCAT)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_AC_PREREQ version: 2 updated: 1997/09/06 13:24:56
-dnl ------------
-dnl Conditionally generate script according to whether we're using the release
-dnl version of autoconf, or a patched version (using the ternary component as
-dnl the patch-version).
-define(CF_AC_PREREQ,
-[CF_PREREQ_COMPARE(
-AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)),
-AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), [$1], [$2], [$3])])dnl
+dnl CF_ACVERSION_CHECK version: 3 updated: 2012/10/03 18:39:53
+dnl ------------------
+dnl Conditionally generate script according to whether we're using a given autoconf.
+dnl
+dnl $1 = version to compare against
+dnl $2 = code to use if AC_ACVERSION is at least as high as $1.
+dnl $3 = code to use if AC_ACVERSION is older than $1.
+define([CF_ACVERSION_CHECK],
+[
+ifdef([m4_version_compare],
+[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])],
+[CF_ACVERSION_COMPARE(
+AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])),
+AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_ACVERSION_COMPARE version: 3 updated: 2012/10/03 18:39:53
+dnl --------------------
+dnl CF_ACVERSION_COMPARE(MAJOR1, MINOR1, TERNARY1,
+dnl                      MAJOR2, MINOR2, TERNARY2,
+dnl                      PRINTABLE2, not FOUND, FOUND)
+define([CF_ACVERSION_COMPARE],
+[ifelse(builtin([eval], [$2 < $5]), 1,
+[ifelse([$8], , ,[$8])],
+[ifelse([$9], , ,[$9])])])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42
 dnl -------------
@@ -876,12 +889,6 @@ dnl Allow user to disable a normally-on 
 AC_DEFUN([CF_ARG_DISABLE],
 [CF_ARG_OPTION($1,[$2],[$3],[$4],yes)])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_ARG_ENABLE version: 3 updated: 1999/03/30 17:24:31
-dnl -------------
-dnl Allow user to enable a normally-off option.
-AC_DEFUN([CF_ARG_ENABLE],
-[CF_ARG_OPTION($1,[$2],[$3],[$4],no)])dnl
-dnl ---------------------------------------------------------------------------
 dnl CF_ARG_MSG_ENABLE version: 2 updated: 2000/07/29 19:32:03
 dnl -----------------
 dnl Verbose form of AC_ARG_ENABLE:
@@ -927,7 +934,7 @@ ifelse([$3],,[    :]dnl
 ])dnl
   ])])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_BUNDLED_INTL version: 16 updated: 2010/10/23 15:55:05
+dnl CF_BUNDLED_INTL version: 17 updated: 2012/10/06 08:57:51
 dnl ---------------
 dnl Top-level macro for configuring an application with a bundled copy of
 dnl the intl and po directories for gettext.
@@ -984,7 +991,7 @@ if test "$USE_NLS" = yes ; then
 		[  --with-textdomain=PKG   NLS text-domain (default is package name)],
 		[NLS_TEXTDOMAIN=$withval],
 		[NLS_TEXTDOMAIN=$PACKAGE])
-	AC_DEFINE_UNQUOTED(NLS_TEXTDOMAIN,"$NLS_TEXTDOMAIN")
+	AC_DEFINE_UNQUOTED(NLS_TEXTDOMAIN,"$NLS_TEXTDOMAIN",[Define to the nls textdomain value])
 	AC_SUBST(NLS_TEXTDOMAIN)
 fi
 
@@ -1004,7 +1011,7 @@ if test "$USE_INCLUDED_LIBINTL" = yes ; 
 		INTLDIR_MAKE="#"
 	fi
 	if test -z "$INTLDIR_MAKE"; then
-		AC_DEFINE(HAVE_LIBGETTEXT_H)
+		AC_DEFINE(HAVE_LIBGETTEXT_H,1,[Define to 1 if we have libgettext.h])
 		for cf_makefile in \
 			$srcdir/intl/Makefile.in \
 			$srcdir/intl/makefile.in
@@ -1047,17 +1054,43 @@ dnl own code, except ENABLE_NLS, which i
 
 if test "$USE_INCLUDED_LIBINTL" = yes ; then
 	if test "$nls_cv_force_use_gnu_gettext" = yes ; then
-		AC_DEFINE(HAVE_GETTEXT)
+		AC_DEFINE(HAVE_GETTEXT,1,[Define to 1 if we have gettext function])
 	elif test "$nls_cv_use_gnu_gettext" = yes ; then
-		AC_DEFINE(HAVE_GETTEXT)
+		AC_DEFINE(HAVE_GETTEXT,1,[Define to 1 if we have gettext function])
 	fi
 	if test -n "$nls_cv_header_intl" ; then
-		AC_DEFINE(HAVE_LIBINTL_H)
+		AC_DEFINE(HAVE_LIBINTL_H,1,[Define to 1 if we have header-file for libintl])
 	fi
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CHECK_CACHE version: 11 updated: 2008/03/23 14:45:59
+dnl CF_CC_ENV_FLAGS version: 1 updated: 2012/10/03 05:25:49
+dnl ---------------
+dnl Check for user's environment-breakage by stuffing CFLAGS/CPPFLAGS content
+dnl into CC.  This will not help with broken scripts that wrap the compiler with
+dnl options, but eliminates a more common category of user confusion.
+AC_DEFUN([CF_CC_ENV_FLAGS],
+[
+# This should have been defined by AC_PROG_CC
+: ${CC:=cc}
+
+AC_MSG_CHECKING(\$CC variable)
+case "$CC" in #(vi
+*[[\ \	]]-[[IUD]]*)
+	AC_MSG_RESULT(broken)
+	AC_MSG_WARN(your environment misuses the CC variable to hold CFLAGS/CPPFLAGS options)
+	# humor him...
+	cf_flags=`echo "$CC" | sed -e 's/^[[^ 	]]*[[ 	]]//'`
+	CC=`echo "$CC" | sed -e 's/[[ 	]].*//'`
+	CF_ADD_CFLAGS($cf_flags)
+	;;
+*)
+	AC_MSG_RESULT(ok)
+	;;
+esac
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CHECK_CACHE version: 12 updated: 2012/10/02 20:55:03
 dnl --------------
 dnl Check if we're accidentally using a cache from a different machine.
 dnl Derive the system name, as a check for reusing the autoconf cache.
@@ -1080,7 +1113,7 @@ else
 		system_name="`(hostname) 2>/dev/null`"
 	fi
 fi
-test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name")
+test -n "$system_name" && AC_DEFINE_UNQUOTED(SYSTEM_NAME,"$system_name",[Define to the system name.])
 AC_CACHE_VAL(cf_cv_system_name,[cf_cv_system_name="$system_name"])
 
 test -z "$system_name" && system_name="$cf_cv_system_name"
@@ -1092,7 +1125,40 @@ if test ".$system_name" != ".$cf_cv_syst
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_CHTYPE version: 7 updated: 2010/10/23 15:54:49
+dnl CF_CLANG_COMPILER version: 1 updated: 2012/06/16 14:55:39
+dnl -----------------
+dnl Check if the given compiler is really clang.  clang's C driver defines
+dnl __GNUC__ (fooling the configure script into setting $GCC to yes) but does
+dnl not ignore some gcc options.
+dnl
+dnl This macro should be run "soon" after AC_PROG_CC or AC_PROG_CPLUSPLUS, to
+dnl ensure that it is not mistaken for gcc/g++.  It is normally invoked from
+dnl the wrappers for gcc and g++ warnings.
+dnl
+dnl $1 = GCC (default) or GXX
+dnl $2 = INTEL_COMPILER (default) or INTEL_CPLUSPLUS
+dnl $3 = CFLAGS (default) or CXXFLAGS
+AC_DEFUN([CF_CLANG_COMPILER],[
+ifelse([$2],,CLANG_COMPILER,[$2])=no
+
+if test "$ifelse([$1],,[$1],GCC)" = yes ; then
+	AC_MSG_CHECKING(if this is really Clang ifelse([$1],GXX,C++,C) compiler)
+	cf_save_CFLAGS="$ifelse([$3],,CFLAGS,[$3])"
+	ifelse([$3],,CFLAGS,[$3])="$ifelse([$3],,CFLAGS,[$3]) -Qunused-arguments"
+	AC_TRY_COMPILE([],[
+#ifdef __clang__
+#else
+make an error
+#endif
+],[ifelse([$2],,CLANG_COMPILER,[$2])=yes
+cf_save_CFLAGS="$cf_save_CFLAGS -Qunused-arguments"
+],[])
+	ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS"
+	AC_MSG_RESULT($ifelse([$2],,CLANG_COMPILER,[$2]))
+fi
+])
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_CHTYPE version: 8 updated: 2012/10/06 08:57:51
 dnl ----------------
 dnl Test if curses defines 'chtype' (usually a 'long' type for SysV curses).
 AC_DEFUN([CF_CURSES_CHTYPE],
@@ -1104,14 +1170,14 @@ AC_CACHE_CHECK(for chtype typedef,cf_cv_
 		[cf_cv_chtype_decl=yes],
 		[cf_cv_chtype_decl=no])])
 if test $cf_cv_chtype_decl = yes ; then
-	AC_DEFINE(HAVE_TYPE_CHTYPE)
+	AC_DEFINE(HAVE_TYPE_CHTYPE,1,[Define to 1 if chtype is declared])
 	AC_CACHE_CHECK(if chtype is scalar or struct,cf_cv_chtype_type,[
 		AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
 			[chtype foo; long x = foo],
 			[cf_cv_chtype_type=scalar],
 			[cf_cv_chtype_type=struct])])
 	if test $cf_cv_chtype_type = scalar ; then
-		AC_DEFINE(TYPE_CHTYPE_IS_SCALAR)
+		AC_DEFINE(TYPE_CHTYPE_IS_SCALAR,1,[Define to 1 if chtype is a scaler/integer])
 	fi
 fi
 ])dnl
@@ -1227,7 +1293,7 @@ fi
 AC_CHECK_HEADERS($cf_cv_ncurses_header)
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_LIBS version: 34 updated: 2011/04/09 14:51:08
+dnl CF_CURSES_LIBS version: 36 updated: 2012/07/07 21:02:48
 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.
@@ -1307,7 +1373,7 @@ if test ".$ac_cv_func_initscr" != .yes ;
     # Check for library containing tgoto.  Do this before curses library
     # because it may be needed to link the test-case for initscr.
     AC_CHECK_FUNC(tgoto,[cf_term_lib=predefined],[
-        for cf_term_lib in $cf_check_list termcap termlib unknown
+        for cf_term_lib in $cf_check_list otermcap termcap tinfo termlib unknown
         do
             AC_CHECK_LIB($cf_term_lib,tgoto,[break])
         done
@@ -1351,7 +1417,7 @@ fi
 
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_TERM_H version: 9 updated: 2011/04/09 18:19:55
+dnl CF_CURSES_TERM_H version: 10 updated: 2012/10/06 08:57:51
 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,
@@ -1410,18 +1476,18 @@ esac
 
 case $cf_cv_term_header in #(vi
 term.h) #(vi
-	AC_DEFINE(HAVE_TERM_H)
+	AC_DEFINE(HAVE_TERM_H,1,[Define to 1 if we have term.h])
 	;;
 ncurses/term.h) #(vi
-	AC_DEFINE(HAVE_NCURSES_TERM_H)
+	AC_DEFINE(HAVE_NCURSES_TERM_H,1,[Define to 1 if we have ncurses/term.h])
 	;;
 ncursesw/term.h)
-	AC_DEFINE(HAVE_NCURSESW_TERM_H)
+	AC_DEFINE(HAVE_NCURSESW_TERM_H,1,[Define to 1 if we have ncursesw/term.h])
 	;;
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_UNCTRL_H version: 1 updated: 2011/04/09 18:19:55
+dnl CF_CURSES_UNCTRL_H version: 2 updated: 2012/10/06 08:57:51
 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
@@ -1465,18 +1531,18 @@ esac
 
 case $cf_cv_unctrl_header in #(vi
 unctrl.h) #(vi
-	AC_DEFINE(HAVE_UNCTRL_H)
+	AC_DEFINE(HAVE_UNCTRL_H,1,[Define to 1 if we have unctrl.h])
 	;;
 ncurses/unctrl.h) #(vi
-	AC_DEFINE(HAVE_NCURSES_UNCTRL_H)
+	AC_DEFINE(HAVE_NCURSES_UNCTRL_H,1,[Define to 1 if we have ncurses/unctrl.h])
 	;;
 ncursesw/unctrl.h)
-	AC_DEFINE(HAVE_NCURSESW_UNCTRL_H)
+	AC_DEFINE(HAVE_NCURSESW_UNCTRL_H,1,[Define to 1 if we have ncursesw/unctrl.h])
 	;;
 esac
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_WACS_MAP version: 5 updated: 2011/01/15 11:28:59
+dnl CF_CURSES_WACS_MAP version: 6 updated: 2012/10/06 08:57:51
 dnl ------------------
 dnl Check for likely values of wacs_map[].
 AC_DEFUN([CF_CURSES_WACS_MAP],
@@ -1495,10 +1561,10 @@ AC_CACHE_CHECK(for wide alternate charac
 	 break])
 	done])
 
-test "$cf_cv_curses_wacs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_WACS_ARRAY,$cf_cv_curses_wacs_map)
+test "$cf_cv_curses_wacs_map" != unknown && AC_DEFINE_UNQUOTED(CURSES_WACS_ARRAY,$cf_cv_curses_wacs_map,[Define to name of (n)curses wide-character array])
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_CURSES_WACS_SYMBOLS version: 1 updated: 2011/01/15 11:28:59
+dnl CF_CURSES_WACS_SYMBOLS version: 2 updated: 2012/10/06 08:57:51
 dnl ----------------------
 dnl Do a check to see if the WACS_xxx constants are defined compatibly with
 dnl X/Open Curses.  In particular, NetBSD's implementation of the WACS_xxx
@@ -1530,7 +1596,31 @@ else
 fi
 ])
 
-test "$cf_cv_curses_wacs_symbols" != no && AC_DEFINE(CURSES_WACS_SYMBOLS)
+test "$cf_cv_curses_wacs_symbols" != no && AC_DEFINE(CURSES_WACS_SYMBOLS,1,[Define to 1 if (n)curses supports wide-character WACS_ symbols])
+])dnl
+dnl ---------------------------------------------------------------------------
+dnl CF_CURSES_WGETPARENT version: 3 updated: 2012/10/06 08:57:51
+dnl --------------------
+dnl Check for curses support for directly determining the parent of a given
+dnl window.  Some implementations make this difficult, so we provide for
+dnl defining an application-specific function that gives this functionality.
+dnl
+dnl $1 = name of function to use if the feature is missing
+AC_DEFUN([CF_CURSES_WGETPARENT],[
+CF_CURSES_FUNCS(wgetparent)
+if test "x$cf_cv_func_wgetparent" != xyes
+then
+	AC_MSG_CHECKING(if WINDOW has _parent member)
+	AC_TRY_COMPILE([#include <${cf_cv_ncurses_header:-curses.h}>],
+		[WINDOW *p = stdscr->_parent],
+		[cf_window__parent=yes],
+		[cf_window__parent=no])
+	AC_MSG_RESULT($cf_window__parent)
+	if test "$cf_window__parent" = yes
+	then
+		AC_DEFINE(HAVE_WINDOW__PARENT,1,[Define to 1 if WINDOW struct has _parent member])
+	fi
+fi
 ])dnl
 dnl ---------------------------------------------------------------------------
 dnl CF_DIRNAME version: 4 updated: 2002/12/21 19:25:52
@@ -1538,7 +1628,7 @@ dnl ----------
 dnl "dirname" is not portable, so we fake it with a shell script.
 AC_DEFUN([CF_DIRNAME],[$1=`echo $2 | sed -e 's%/[[^/]]*$%%'`])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_DISABLE_ECHO version: 11 updated: 2009/12/13 13:16:57
+dnl CF_DISABLE_ECHO version: 12 updated: 2012/10/06 16:30:28
 dnl ---------------
 dnl You can always use "make -n" to see the actual options, but it's hard to
 dnl pick out/analyze warning messages when the compile-line is long.
@@ -1553,7 +1643,7 @@ dnl
 AC_DEFUN([CF_DISABLE_ECHO],[
 AC_MSG_CHECKING(if you want to see long compiling messages)
 CF_ARG_DISABLE(echo,
-	[  --disable-echo          display "compiling" commands],
+	[  --disable-echo          do not display "compiling" commands],
 	[
     ECHO_LT='--silent'
     ECHO_LD='@echo linking [$]@;'
@@ -1618,38 +1708,6 @@ if test "$cf_disable_rpath_hack" = no ; 
 fi
 ])
 dnl ---------------------------------------------------------------------------
-dnl CF_FIND_HEADER version: 2 updated: 2007/07/29 11:32:00
-dnl --------------
-dnl Find a header file, searching for it if it is not already in the include
-dnl path.
-dnl
-dnl	$1 = the header filename
-dnl	$2 = the package name
-dnl	$3 = action to perform if successful
-dnl	$4 = action to perform if not successful
-AC_DEFUN([CF_FIND_HEADER],[
-AC_CHECK_HEADER([$1],
-	cf_find_header=yes,[
-	cf_find_header=no
-CF_HEADER_PATH(cf_search,$2)
-for cf_incdir in $cf_search
-do
-	if test -f $cf_incdir/$1 ; then
-		CF_ADD_INCDIR($cf_incdir)
-		CF_VERBOSE(... found in $cf_incdir)
-		cf_find_header=yes
-		break
-	fi
-	CF_VERBOSE(... tested $cf_incdir)
-done
-])
-if test "$cf_find_header" = yes ; then
-ifelse([$3],,:,[$3])
-ifelse([$4],,,[else
-$4])
-fi
-])dnl
-dnl ---------------------------------------------------------------------------
 dnl CF_FIND_LIBRARY version: 9 updated: 2008/03/23 14:48:54
 dnl ---------------
 dnl Look for a non-standard library, given parameters for AC_TRY_LINK.  We
@@ -1830,7 +1888,7 @@ ifelse([$5],,AC_MSG_WARN(Cannot find $3 
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_FUNC_WAIT version: 2 updated: 1997/10/21 19:45:33
+dnl CF_FUNC_WAIT version: 3 updated: 2012/10/06 08:57:51
 dnl ------------
 dnl Test for the presence of <sys/wait.h>, 'union wait', arg-type of 'wait()'
 dnl and/or 'waitpid()'.
@@ -1855,7 +1913,7 @@ if test $cf_cv_type_unionwait = yes; the
 			[cf_cv_arg_union_wait=no])
 		])
 	AC_MSG_RESULT($cf_cv_arg_union_wait)
-	test $cf_cv_arg_union_wait = yes && AC_DEFINE(WAIT_USES_UNION)
+	test $cf_cv_arg_union_wait = yes && AC_DEFINE(WAIT_USES_UNION,1,[Define to 1 if wait() uses a union parameter])
 
 	AC_MSG_CHECKING(if union wait can be used as waitpid-arg)
 	AC_CACHE_VAL(cf_cv_arg_union_waitpid,[
@@ -1865,12 +1923,12 @@ if test $cf_cv_type_unionwait = yes; the
 			[cf_cv_arg_union_waitpid=no])
 		])
 	AC_MSG_RESULT($cf_cv_arg_union_waitpid)
-	test $cf_cv_arg_union_waitpid = yes && AC_DEFINE(WAITPID_USES_UNION)
+	test $cf_cv_arg_union_waitpid = yes && AC_DEFINE(WAITPID_USES_UNION,1,[Define to 1 if waitpid() uses a union parameter])
 
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_ATTRIBUTES version: 14 updated: 2010/10/23 15:52:32
+dnl CF_GCC_ATTRIBUTES version: 16 updated: 2012/10/02 20:55:03
 dnl -----------------
 dnl Test for availability of useful gcc __attribute__ directives to quiet
 dnl compiler warnings.  Though useful, not all are supported -- and contrary
@@ -1948,27 +2006,27 @@ EOF
 			test -n "$verbose" && AC_MSG_RESULT(... $cf_attribute)
 			cat conftest.h >>confdefs.h
 			case $cf_attribute in #(vi
+			noreturn) #(vi
+				AC_DEFINE_UNQUOTED(GCC_NORETURN,$cf_directive,[Define to noreturn-attribute for gcc])
+				;;
 			printf) #(vi
-				if test "$cf_printf_attribute" = no ; then
-					cat >>confdefs.h <<EOF
-#define GCC_PRINTFLIKE(fmt,var) /* nothing */
-EOF
-				else
-					cat >>confdefs.h <<EOF
-#define GCC_PRINTFLIKE(fmt,var) __attribute__((format(printf,fmt,var)))
-EOF
+				cf_value='/* nothing */'
+				if test "$cf_printf_attribute" != no ; then
+					cf_value='__attribute__((format(printf,fmt,var)))'
+					AC_DEFINE(GCC_PRINTF,1,[Define to 1 if the compiler supports gcc-like printf attribute.])
 				fi
+				AC_DEFINE_UNQUOTED(GCC_PRINTFLIKE(fmt,var),$cf_value,[Define to printf-attribute for gcc])
 				;;
 			scanf) #(vi
-				if test "$cf_scanf_attribute" = no ; then
-					cat >>confdefs.h <<EOF
-#define GCC_SCANFLIKE(fmt,var) /* nothing */
-EOF
-				else
-					cat >>confdefs.h <<EOF
-#define GCC_SCANFLIKE(fmt,var)  __attribute__((format(scanf,fmt,var)))
-EOF
+				cf_value='/* nothing */'
+				if test "$cf_scanf_attribute" != no ; then
+					cf_value='__attribute__((format(scanf,fmt,var)))'
+					AC_DEFINE(GCC_SCANF,1,[Define to 1 if the compiler supports gcc-like scanf attribute.])
 				fi
+				AC_DEFINE_UNQUOTED(GCC_SCANFLIKE(fmt,var),$cf_value,[Define to sscanf-attribute for gcc])
+				;;
+			unused) #(vi
+				AC_DEFINE_UNQUOTED(GCC_UNUSED,$cf_directive,[Define to unused-attribute for gcc])
 				;;
 			esac
 		fi
@@ -1980,7 +2038,7 @@ rm -rf conftest*
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_VERSION version: 5 updated: 2010/04/24 11:02:31
+dnl CF_GCC_VERSION version: 7 updated: 2012/10/18 06:46:33
 dnl --------------
 dnl Find version of gcc
 AC_DEFUN([CF_GCC_VERSION],[
@@ -1988,13 +2046,13 @@ AC_REQUIRE([AC_PROG_CC])
 GCC_VERSION=none
 if test "$GCC" = yes ; then
 	AC_MSG_CHECKING(version of $CC)
-	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
+	GCC_VERSION="`${CC} --version 2>/dev/null | sed -e '2,$d' -e 's/^.*(GCC[[^)]]*) //' -e 's/^.*(Debian[[^)]]*) //' -e 's/^[[^0-9.]]*//' -e 's/[[^0-9.]].*//'`"
 	test -z "$GCC_VERSION" && GCC_VERSION=unknown
 	AC_MSG_RESULT($GCC_VERSION)
 fi
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_GCC_WARNINGS version: 27 updated: 2010/10/23 15:52:32
+dnl CF_GCC_WARNINGS version: 29 updated: 2012/06/16 14:55:39
 dnl ---------------
 dnl Check if the compiler supports useful warning options.  There's a few that
 dnl we don't use, simply because they're too noisy:
@@ -2017,6 +2075,7 @@ AC_DEFUN([CF_GCC_WARNINGS],
 [
 AC_REQUIRE([CF_GCC_VERSION])
 CF_INTEL_COMPILER(GCC,INTEL_COMPILER,CFLAGS)
+CF_CLANG_COMPILER(GCC,CLANG_COMPILER,CFLAGS)
 
 cat > conftest.$ac_ext <<EOF
 #line __oline__ "${as_me:-configure}"
@@ -2092,6 +2151,13 @@ then
 					continue;;
 				esac
 				;;
+			Wpointer-arith) #(vi
+				case $GCC_VERSION in
+				[[12]].*)
+					CF_VERBOSE(feature is broken in gcc $GCC_VERSION)
+					continue;;
+				esac
+				;;
 			esac
 			EXTRA_CFLAGS="$EXTRA_CFLAGS -$cf_opt"
 		fi
@@ -2190,77 +2256,6 @@ test -d "$oldincludedir" && {
 $1="[$]$1 $cf_header_path_list"
 ])dnl
 dnl ---------------------------------------------------------------------------
-dnl CF_HELP_MESSAGE version: 3 updated: 1998/01/14 10:56:23
-dnl ---------------
-dnl Insert text into the help-message, for readability, from AC_ARG_WITH.
-AC_DEFUN([CF_HELP_MESSAGE],
-[AC_DIVERT_HELP([$1])dnl
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_INCLUDE_DIRS version: 6 updated: 2009/01/06 19:37:40
-dnl ---------------
-dnl Construct the list of include-options according to whether we're building
-dnl in the source directory or using '--srcdir=DIR' option.  If we're building
-dnl with gcc, don't append the includedir if it happens to be /usr/include,
-dnl since that usually breaks gcc's shadow-includes.
-AC_DEFUN([CF_INCLUDE_DIRS],
-[
-CPPFLAGS="$CPPFLAGS -I. -I../include"
-if test "$srcdir" != "."; then
-	CPPFLAGS="$CPPFLAGS -I\${srcdir}/../include"
-fi
-if test "$GCC" != yes; then
-	CPPFLAGS="$CPPFLAGS -I\${includedir}"
-elif test "$includedir" != "/usr/include"; then
-	if test "$includedir" = '${prefix}/include' ; then
-		if test $prefix != /usr ; then
-			CPPFLAGS="$CPPFLAGS -I\${includedir}"
-		fi
-	else
-		CPPFLAGS="$CPPFLAGS -I\${includedir}"
-	fi
-fi
-AC_SUBST(CPPFLAGS)
-])dnl
-dnl ---------------------------------------------------------------------------
-dnl CF_INCLUDE_PATH version: 5 updated: 2010/01/17 20:36:17
-dnl ---------------
-dnl	Adds to the include-path
-dnl
-dnl	Autoconf 1.11 should have provided a way to add include path options to
-dnl	the cpp-tests.
-dnl
-AC_DEFUN([CF_INCLUDE_PATH],
-[
-$1=
-for cf_path in $1
-do
-	cf_result="no"
-	AC_MSG_CHECKING(for directory $cf_path)
-	if test -d $cf_path
-	then
-		INCLUDES="$INCLUDES -I$cf_path"
-		ac_cpp="${ac_cpp} -I$cf_path"
-		CFLAGS="$CFLAGS -I$cf_path"
-		cf_result="yes"
-		case $cf_path in
-		/usr/include|/usr/include/*)
-			;;
-		*)
-			CF_DIRNAME(cf_temp,$cf_path)

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-src-all mailing list