Update to 5.7:

New features and improvements:

    * library
	  o new flavor of the ncurses library provides rudimentary
	  support for POSIX threads. Several functions are reentrant,
	  but most require either a window-level or screen-level
	  mutex.
	    (This is API-compatible, but not ABI-compatible with
	    the normal library).
	  o add NCURSES_OPAQUE symbol to curses.h, will use to make
	  structs opaque in selected configurations.
	  o add NCURSES_EXT_FUNCS and NCURSES_EXT_COLORS symbols
	  to curses.h to make it simpler to tell if the extended
	  functions and/or colors are declared.
          o add wresize to C++ binding
          o eliminate fixed-buffer vsprintf calls in C++ binding.
	  o add several functions to C++ binding which wrap C
	  functions that pass a WINDOW* parameter.
          o adapt mouse-handling code from menu library in form-library
          o improve tracing for form library, showing created forms, fields, etc.
          o make $NCURSES_NO_PADDING feature work for termcap interface .
	  o add check to trace-file open, if the given name is a
	  directory, add ".log" to the name and try again.
	  o several new manpages: curs_legacy.3x, curs_memleaks.3x,
	  curs_opaque.3x and curs_threads.3x
    * programs:
	  o modified three test-programs to demonstrate the threading
	  support in this version: ditto, rain, worm.
	  o several new test-programs: demo_panels, dots_mvcur,
	  inch_wide, inchs, key_name, key_names, savescreen,
	  savescreen.sh test_arrays, test_get_wstr, test_getstr,
	  test_instr, test_inwstr and test_opaque.
	  o add adacurses-config to the Ada95 install.
	  o modify tic -f option to format spaces as \s to prevent
	  them from being lost when that is read back in unformatted
	  strings.
	  o The tack program is now distributed separately from
	  ncurses.
    * terminal database
          o added entries:
                + Eterm-256color, Eterm-88color and rxvt-88color
                + aterm
                + konsole-256color
                + mrxvt
                + screen.mlterm
                + screen.rxvt
		+ teraterm4.59 is now the primary primary teraterm
		entry, renamed original to teraterm2.3
                + 9term terminal
                + Newbury Data entries
          o updated/improved entries:
                + gnome to version 2.22.3
                + h19, z100
                + konsole to version 1.6.6
                + mlterm, mlterm+pcfkeys
		+ xterm, and building-blocks for function-keys to
		xterm patch #230.

Major bug fixes:

    * add logic to tic for cancelling strings in user-defined
    capabilities (this is needed for current konsole terminfo
    entry).
    * modify mk-1st.awk so the generated makefile rules for linking
    or installing shared libraries do not first remove the library,
    in case it is in use, e.g., libncurses.so by /bin/sh.
    * correct check for notimeout in wgetch.
    * fix a sign-extension bug in infocmp's repair_acsc function.
    * change winnstr to stop at the end of the line.
    * make Ada95 demo_panels example work.
    * fix for adding a non-spacing character at the beginning of a line.
    * fill in extended-color pair to make colors work for
    wide-characters using extended-colors.
    * improve refresh of window on top of multi-column characters,
    taking into account split characters on left/right window
    boundaries.
    * modify win_wchnstr to ensure that only a base cell is returned
    for each multi-column character.
    * improve waddch and winsch handling of EILSEQ from mbrtowc by
    using unctrl to display illegal bytes rather than trying to
    append further bytes to make up a valid sequence.
    * restore curs_set state after endwin/refresh
    * modify keyname to use "^X" form only if meta has been called,
    or if keyname is called without initializing curses, e.g., via
    initscr or newterm.
    * modify unctrl to check codes in 128-255 range versus isprint.
    If they are not printable, and locale was set, use a "M-" or
    "~" sequence.
    * improve resizeterm by moving ripped-off lines, and repainting
    the soft-keys.
    * modify form library to accept control characters such as
    newline in set_field_buffer, which is compatible with Solaris.
    * use NCURSES_MOUSE_MASK in definition of BUTTON_RELEASE, etc.,
    to make those work properly with the --enable-ext-mouse
    configuration
    * correct some functions in Ada95 binding which were using
    return value from C where none was returned.
    * reviewed/fixed issues reported by Coverity and Klocwork tools.

Portability:

    * configure script:
          o new options:

	    --disable-big-strings
		control whether static string tables are generated
		as single large strings (to improve startup
		performance), or as array of individual strings.
            --disable-relink
		control whether shared libraries are relinked
		(during install) when rpath is enabled.
            --disable-tic-depends
		make explicit whether tic library depends on
		ncurses/ncursesw library.
            --enable-mixed-case
		override the configure script's check if the
		filesystem supports mixed-case filenames. This
		allows one to control how the terminal database
		maps to the filesystem. For filesystems that do
		not support mixed-case, the library uses generate
		2-character (hexadecimal) codes for the lower-level
		of the filesystem terminfo database
            --enable-reentrant
		builds a different flavor of the ncurses library
		(ncursest) which improves reentrant use of the
		library by reducing global and static variables
		(see the "--with-pthread" option for the threaded
		support).
            --enable-weak-symbols
		use weak-symbols for linking to the POSIX thread
		library, and use the same soname for the ncurses
		shared library as the normal library (caveat: the
		ABI is for the threaded library, which makes global
		data accessed via functions).
            --with-pthread
		build with the POSIX thread library (tested with
		AIX, GNU/Linux, FreeBSD, OpenBSD, HPUX, IRIX64,
		Solaris, Tru64).
            --with-ticlib
		build/install the tic-support functions in a separate
		library

          o improved options:

            --enable-ext-colors
                requires the wide-character configuration.
            --with-chtype
		ignore option value "unsigned" is always added to
		the type in curses.h; do the same for --with-mmask-t.
            --with-dmalloc
                build-fix for redefinition of strndup.
            --with-hashed-db
		    + accepts a parameter which is the install-prefix
		    of a given Berkeley Database.
		    + the $LIBS environment variable overrides the
		    search for the db library.
            --without-hashed-db
                assumed when "--disable-database" is used.

    * other configure/build issues:
          o build-fixes for LynxOS
          o modify shared-library rules to allow FreeBSD 3.x to use rpath.
          o build-fix for FreeBSD "contemporary" TTY interface.
          o build-fixes for AIX with libtool.
          o build-fixes for Darwin and libtool.
          o modify BeOS-specific ifdef's to build on Haiku.
	  o corrected gcc options for building shared libraries on
	  Solaris and IRIX64.
          o change shared-library configuration for OpenBSD, make rpath work.
          o build-fixes for using libutf8, e.g., on OpenBSD 3.7
	  o add "-e" option in ncurses/Makefile.in when generating
	  source-files to force earlier exit if the build environment
	  fails unexpectedly.
          o add support for shared libraries for QNX.
	  o change delimiter in MKlib_gen.sh from '%' to '@', to
	  avoid substitution by IBM xlc to '#' as part of its
	  extensions to digraphs.
    * library:
	  o rewrite wrapper for wcrtomb, making it work on Solaris.
	  This is used in the form library to determine the length
	  of the buffer needed by field_buffer.
	  o add/use configure script macro CF_SIG_ATOMIC_T, use
	  the corresponding type for data manipulated by signal
	  handlers.
	  o set locale in misc/ncurses-config.in since it uses a
	  range
	  o disable GPM mouse support when $TERM does not happen
	  to contain "linux", since Gpm_Open no longer limits its
	  assertion to terminals that it might handle, e.g., within
	  "screen" in xterm.
	  o reset mouse file-descriptor when unloading GPM library.
    * test programs:
	  o update test programs to build/work with various UNIX
	  curses for comparisons.

6 files changed, 90 insertions, 31 deletions

diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 5c46c01d8eb..818e9607aea 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.81 2007/12/11 05:27:05 bjs Exp $
+# $NetBSD: Makefile,v 1.82 2008/11/05 16:12:38 wiz Exp $
 
 .include "Makefile.common"
-PKGREVISION=	2
 
 COMMENT=	CRT screen handling and optimization package
 
diff --git a/devel/ncurses/Makefile.common b/devel/ncurses/Makefile.common
index 21af2c09b5c..a9cca7099bd 100644
--- a/devel/ncurses/Makefile.common
+++ b/devel/ncurses/Makefile.common
@@ -1,16 +1,14 @@
-# $NetBSD: Makefile.common,v 1.8 2008/04/12 22:43:00 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2008/11/05 16:12:38 wiz Exp $
+#
+# used by devel/ncursesw/Makefile
 
 DISTNAME=	ncurses-${NC_VERS}
-NC_VERS=	5.6
+NC_VERS=	5.7
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU:=ncurses/} \
 		ftp://dickey.his.com/ncurses/ \
 		ftp://dickey.his.com/ncurses/${NC_VERS}/
 
-PATCH_SITES=		${MASTER_SITES:M*${NC_VERS}*}
-PATCHFILES=		${DISTNAME}-coverity.patch.gz
-PATCH_DIST_STRIP=	-p1
-
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://dickey.his.com/ncurses/ncurses.html
 
diff --git a/devel/ncurses/PLIST b/devel/ncurses/PLIST
index 963dd8d65c3..d81c07665fe 100644
--- a/devel/ncurses/PLIST
+++ b/devel/ncurses/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.14 2008/04/12 22:43:00 jlam Exp $
+@comment $NetBSD: PLIST,v 1.15 2008/11/05 16:12:38 wiz Exp $
 bin/captoinfo
 bin/clear
 bin/infocmp
 bin/infotocap
 bin/ncurses5-config
 bin/reset
-bin/tack
 bin/tic
 bin/toe
 bin/tput
@@ -20,11 +19,14 @@ include/eti.h
 include/etip.h
 include/form.h
 include/menu.h
+include/nc_tparm.h
 include/ncurses.h
 include/ncurses_dll.h
 include/panel.h
 include/term.h
+include/term_entry.h
 include/termcap.h
+include/tic.h
 include/unctrl.h
 lib/libform.la
 lib/libmenu.la
@@ -36,13 +38,14 @@ man/man1/clear.1
 man/man1/infocmp.1
 man/man1/infotocap.1
 man/man1/reset.1
-man/man1/tack.1
 man/man1/tic.1
 man/man1/toe.1
 man/man1/tput.1
 man/man1/tset.1
 man/man3/COLOR_PAIR.3
 man/man3/PAIR_NUMBER.3
+man/man3/_nc_free_and_exit.3
+man/man3/_nc_freeall.3
 man/man3/_nc_tracebits.3
 man/man3/_traceattr.3
 man/man3/_traceattr2.3
@@ -129,8 +132,11 @@ man/man3/curs_insstr.3
 man/man3/curs_instr.3
 man/man3/curs_inwstr.3
 man/man3/curs_kernel.3
+man/man3/curs_legacy.3
+man/man3/curs_memleaks.3
 man/man3/curs_mouse.3
 man/man3/curs_move.3
+man/man3/curs_opaque.3
 man/man3/curs_outopts.3
 man/man3/curs_overlay.3
 man/man3/curs_pad.3
@@ -145,6 +151,7 @@ man/man3/curs_slk.3
 man/man3/curs_termattrs.3
 man/man3/curs_termcap.3
 man/man3/curs_terminfo.3
+man/man3/curs_threads.3
 man/man3/curs_touch.3
 man/man3/curs_trace.3
 man/man3/curs_util.3
@@ -233,15 +240,23 @@ man/man3/free_item.3
 man/man3/free_menu.3
 man/man3/get_wch.3
 man/man3/get_wstr.3
+man/man3/getbegx.3
+man/man3/getbegy.3
 man/man3/getbegyx.3
 man/man3/getbkgd.3
 man/man3/getbkgrnd.3
 man/man3/getcchar.3
 man/man3/getch.3
+man/man3/getcurx.3
+man/man3/getcury.3
+man/man3/getmaxx.3
+man/man3/getmaxy.3
 man/man3/getmaxyx.3
 man/man3/getmouse.3
 man/man3/getn_wstr.3
 man/man3/getnstr.3
+man/man3/getparx.3
+man/man3/getpary.3
 man/man3/getparyx.3
 man/man3/getstr.3
 man/man3/getsyx.3
@@ -280,8 +295,19 @@ man/man3/insstr.3
 man/man3/instr.3
 man/man3/intrflush.3
 man/man3/inwstr.3
+man/man3/is_cleared.3
+man/man3/is_idcok.3
+man/man3/is_idlok.3
+man/man3/is_immedok.3
+man/man3/is_keypad.3
+man/man3/is_leaveok.3
 man/man3/is_linetouched.3
+man/man3/is_nodelay.3
+man/man3/is_notimeout.3
+man/man3/is_scrollok.3
+man/man3/is_syncok.3
 man/man3/is_term_resized.3
+man/man3/is_timeout.3
 man/man3/is_wintouched.3
 man/man3/isendwin.3
 man/man3/item_count.3
@@ -501,6 +527,7 @@ man/man3/scrollok.3
 man/man3/set_current_field.3
 man/man3/set_current_item.3
 man/man3/set_curterm.3
+man/man3/set_escdelay.3
 man/man3/set_field_back.3
 man/man3/set_field_buffer.3
 man/man3/set_field_fore.3
@@ -545,6 +572,7 @@ man/man3/set_menu_userptr.3
 man/man3/set_menu_win.3
 man/man3/set_new_page.3
 man/man3/set_panel_userptr.3
+man/man3/set_tabsize.3
 man/man3/set_term.3
 man/man3/set_top_row.3
 man/man3/setcchar.3
@@ -607,6 +635,8 @@ man/man3/use_default_colors.3
 man/man3/use_env.3
 man/man3/use_extended_names.3
 man/man3/use_legacy_coding.3
+man/man3/use_screen.3
+man/man3/use_window.3
 man/man3/vid_attr.3
 man/man3/vid_puts.3
 man/man3/vidattr.3
@@ -658,6 +688,8 @@ man/man3/wgetbkgrnd.3
 man/man3/wgetch.3
 man/man3/wgetn_wstr.3
 man/man3/wgetnstr.3
+man/man3/wgetparent.3
+man/man3/wgetscrreg.3
 man/man3/wgetstr.3
 man/man3/whline.3
 man/man3/whline_set.3
@@ -736,8 +768,11 @@ ${TERMINFODIR}/7/730MTGr-24
 ${TERMINFODIR}/8/8510
 ${TERMINFODIR}/9/955-hb
 ${TERMINFODIR}/9/955-w
+${TERMINFODIR}/9/9term
 ${TERMINFODIR}/A/Apple_Terminal
 ${TERMINFODIR}/E/Eterm
+${TERMINFODIR}/E/Eterm-256color
+${TERMINFODIR}/E/Eterm-88color
 ${TERMINFODIR}/E/Eterm-color
 ${TERMINFODIR}/L/LFT-PC850
 ${TERMINFODIR}/M/MtxOrb
@@ -975,6 +1010,7 @@ ${TERMINFODIR}/a/arm100-w
 ${TERMINFODIR}/a/arm100-wam
 ${TERMINFODIR}/a/at386
 ${TERMINFODIR}/a/atari
+${TERMINFODIR}/a/aterm
 ${TERMINFODIR}/a/att2300
 ${TERMINFODIR}/a/att2350
 ${TERMINFODIR}/a/att4410
@@ -1599,6 +1635,9 @@ ${TERMINFODIR}/g/gator-t
 ${TERMINFODIR}/g/gigi
 ${TERMINFODIR}/g/glasstty
 ${TERMINFODIR}/g/gnome
+${TERMINFODIR}/g/gnome+pcfkeys
+${TERMINFODIR}/g/gnome-2007
+${TERMINFODIR}/g/gnome-2008
 ${TERMINFODIR}/g/gnome-256color
 ${TERMINFODIR}/g/gnome-fc5
 ${TERMINFODIR}/g/gnome-rh62
@@ -1883,7 +1922,9 @@ ${TERMINFODIR}/k/klone+sgr8
 ${TERMINFODIR}/k/kon
 ${TERMINFODIR}/k/kon2
 ${TERMINFODIR}/k/konsole
+${TERMINFODIR}/k/konsole+pcfkeys
 ${TERMINFODIR}/k/konsole-16color
+${TERMINFODIR}/k/konsole-256color
 ${TERMINFODIR}/k/konsole-base
 ${TERMINFODIR}/k/konsole-linux
 ${TERMINFODIR}/k/konsole-solaris
@@ -1912,6 +1953,7 @@ ${TERMINFODIR}/l/linux-lat
 ${TERMINFODIR}/l/linux-m
 ${TERMINFODIR}/l/linux-nic
 ${TERMINFODIR}/l/linux-vt
+${TERMINFODIR}/l/linux2.6.26
 ${TERMINFODIR}/l/lisa
 ${TERMINFODIR}/l/lisaterm
 ${TERMINFODIR}/l/lisaterm-w
@@ -1970,6 +2012,7 @@ ${TERMINFODIR}/m/minix
 ${TERMINFODIR}/m/minix-old
 ${TERMINFODIR}/m/minix-old-am
 ${TERMINFODIR}/m/mlterm
+${TERMINFODIR}/m/mlterm+pcfkeys
 ${TERMINFODIR}/m/mm314
 ${TERMINFODIR}/m/mm340
 ${TERMINFODIR}/m/mod
@@ -1980,6 +2023,7 @@ ${TERMINFODIR}/m/modgraph48
 ${TERMINFODIR}/m/mono-emx
 ${TERMINFODIR}/m/morphos
 ${TERMINFODIR}/m/mouse-sun
+${TERMINFODIR}/m/mrxvt
 ${TERMINFODIR}/m/ms-vt-utf8
 ${TERMINFODIR}/m/ms-vt100
 ${TERMINFODIR}/m/ms-vt100+
@@ -2058,6 +2102,15 @@ ${TERMINFODIR}/n/ncsa-m-ns
 ${TERMINFODIR}/n/ncsa-ns
 ${TERMINFODIR}/n/ncsa-vt220
 ${TERMINFODIR}/n/ncsa-vt220-8
+${TERMINFODIR}/n/nd9500
+${TERMINFODIR}/n/ndr9500
+${TERMINFODIR}/n/ndr9500-25
+${TERMINFODIR}/n/ndr9500-25-mc
+${TERMINFODIR}/n/ndr9500-25-mc-nl
+${TERMINFODIR}/n/ndr9500-25-nl
+${TERMINFODIR}/n/ndr9500-mc
+${TERMINFODIR}/n/ndr9500-mc-nl
+${TERMINFODIR}/n/ndr9500-nl
 ${TERMINFODIR}/n/nec
 ${TERMINFODIR}/n/nec5520
 ${TERMINFODIR}/n/newhp
@@ -2400,6 +2453,7 @@ ${TERMINFODIR}/r/rxvt
 ${TERMINFODIR}/r/rxvt+pcfkeys
 ${TERMINFODIR}/r/rxvt-16color
 ${TERMINFODIR}/r/rxvt-256color
+${TERMINFODIR}/r/rxvt-88color
 ${TERMINFODIR}/r/rxvt-basic
 ${TERMINFODIR}/r/rxvt-color
 ${TERMINFODIR}/r/rxvt-cygwin
@@ -2431,6 +2485,9 @@ ${PLIST.not-sunos}${TERMINFODIR}/s/screen-s
 ${PLIST.not-sunos}${TERMINFODIR}/s/screen-w
 ${PLIST.not-sunos}${TERMINFODIR}/s/screen.linux
 ${PLIST.not-sunos}${TERMINFODIR}/s/screen.teraterm
+${TERMINFODIR}/s/screen+fkeys
+${TERMINFODIR}/s/screen.mlterm
+${TERMINFODIR}/s/screen.rxvt
 ${TERMINFODIR}/s/screen.xterm-new
 ${TERMINFODIR}/s/screen.xterm-r6
 ${TERMINFODIR}/s/screen.xterm-xfree86
@@ -2533,6 +2590,8 @@ ${TERMINFODIR}/t/tek4404
 ${TERMINFODIR}/t/teleray
 ${TERMINFODIR}/t/teletec
 ${TERMINFODIR}/t/teraterm
+${TERMINFODIR}/t/teraterm2.3
+${TERMINFODIR}/t/teraterm4.59
 ${TERMINFODIR}/t/terminet
 ${TERMINFODIR}/t/terminet1200
 ${TERMINFODIR}/t/terminet300
@@ -3161,15 +3220,22 @@ ${TERMINFODIR}/x/xtalk
 ${TERMINFODIR}/x/xterm
 ${TERMINFODIR}/x/xterm+256color
 ${TERMINFODIR}/x/xterm+88color
+${TERMINFODIR}/x/xterm+app
+${TERMINFODIR}/x/xterm+edit
+${TERMINFODIR}/x/xterm+noapp
+${TERMINFODIR}/x/xterm+pc+edit
 ${TERMINFODIR}/x/xterm+pcc0
 ${TERMINFODIR}/x/xterm+pcc1
 ${TERMINFODIR}/x/xterm+pcc2
 ${TERMINFODIR}/x/xterm+pcc3
+${TERMINFODIR}/x/xterm+pce2
 ${TERMINFODIR}/x/xterm+pcf0
 ${TERMINFODIR}/x/xterm+pcf2
 ${TERMINFODIR}/x/xterm+pcfkeys
+${TERMINFODIR}/x/xterm+r6f2
 ${TERMINFODIR}/x/xterm+sl
 ${TERMINFODIR}/x/xterm+sl-twm
+${TERMINFODIR}/x/xterm+vt+edit
 ${TERMINFODIR}/x/xterm-1002
 ${TERMINFODIR}/x/xterm-1003
 ${TERMINFODIR}/x/xterm-16color
diff --git a/devel/ncurses/distinfo b/devel/ncurses/distinfo
index 96eb8715fa5..aaa21fdb37f 100644
--- a/devel/ncurses/distinfo
+++ b/devel/ncurses/distinfo
@@ -1,13 +1,10 @@
-$NetBSD: distinfo,v 1.17 2007/12/22 00:23:58 joerg Exp $
+$NetBSD: distinfo,v 1.18 2008/11/05 16:12:38 wiz Exp $
 
-SHA1 (ncurses-5.6-coverity.patch.gz) = fee27bdd55c1c316248643e168865b55235d79c7
-RMD160 (ncurses-5.6-coverity.patch.gz) = b11682ae9e043be8d6c50f040d8531f80fc26ce8
-Size (ncurses-5.6-coverity.patch.gz) = 6196 bytes
-SHA1 (ncurses-5.6.tar.gz) = 4d54d8ad0b90fffa2780a0a45edb6fcb027ef18d
-RMD160 (ncurses-5.6.tar.gz) = 1a878819c43e6426500fd74ccedf0a032ef399d8
-Size (ncurses-5.6.tar.gz) = 2402592 bytes
+SHA1 (ncurses-5.7.tar.gz) = 8233ee56ed84ae05421e4e6d6db6c1fe72ee6797
+RMD160 (ncurses-5.7.tar.gz) = a19ca026d32255f5a4d22eb006d65182041e0234
+Size (ncurses-5.7.tar.gz) = 2445052 bytes
 SHA1 (patch-aa) = a3a24e73b79ca8611ae4d5616f1c671926ea5a64
 SHA1 (patch-ab) = 39679b18ba817af7ec47a17a62ab3ae6e214b443
-SHA1 (patch-ac) = 19becdf15b3a0fc8f630985ff2af4680e8f2652c
+SHA1 (patch-ac) = 17b2b1cfed767441f8e4b5a4fc51fa0272758637
 SHA1 (patch-ad) = bfb957df138b1567d895882316c96011f44a1c30
 SHA1 (patch-ae) = 5e3396e7dafe0f772780d0c2ad2b9ec752c09a86
diff --git a/devel/ncurses/patches/patch-ac b/devel/ncurses/patches/patch-ac
index f94bf515a8e..025ff29550b 100644
--- a/devel/ncurses/patches/patch-ac
+++ b/devel/ncurses/patches/patch-ac
@@ -1,17 +1,17 @@
-$NetBSD: patch-ac,v 1.15 2007/12/22 00:23:58 joerg Exp $
+$NetBSD: patch-ac,v 1.16 2008/11/05 16:12:38 wiz Exp $
 
---- configure.orig	2007-12-21 22:33:08.000000000 +0000
+--- configure.orig	2008-10-26 00:04:38.000000000 +0000
 +++ configure
-@@ -6051,7 +6051,7 @@ case $host_os in #(vi
- aix[45]*) #(vi
- 	CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
- 	;;
+@@ -2663,7 +2663,7 @@ if test "$cross_compiling" = yes ; then
+   LDCONFIG=:
+ else
+ case "$cf_cv_system_name" in #(vi
 -freebsd*) #(vi
 +dragonfly*|freebsd*) #(vi
- 	# 5.x headers associate
- 	#	_XOPEN_SOURCE=600 with _POSIX_C_SOURCE=200112L
- 	#	_XOPEN_SOURCE=500 with _POSIX_C_SOURCE=199506L
-@@ -7921,12 +7921,7 @@ case ".$MANPAGE_RENAMES" in #(vi
+   test -z "$LDCONFIG" && LDCONFIG="/sbin/ldconfig -R"
+   ;;
+ *) LDPATH=$PATH:/sbin:/usr/sbin
+@@ -8516,12 +8516,7 @@ case ".$MANPAGE_RENAMES" in #(vi
  .no) #(vi
    ;;
  .|.yes)
diff --git a/devel/ncursesw/Makefile b/devel/ncursesw/Makefile
index 038b4ddbc39..14327dd6430 100644
--- a/devel/ncursesw/Makefile
+++ b/devel/ncursesw/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.4 2007/12/11 05:27:05 bjs Exp $
+# $NetBSD: Makefile,v 1.5 2008/11/05 16:12:38 wiz Exp $
 
 .include "../../devel/ncurses/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/ncurses/ncursesw/}
-PKGREVISION=	2
 COMMENT=	Wide character CRT screen handling and optimization package
 
 PATCHDIR=	${.CURDIR}/../../devel/ncurses/patches