head 1.9; access; symbols pkgsrc-2013Q2:1.9.0.8 pkgsrc-2013Q2-base:1.9 pkgsrc-2012Q4:1.9.0.6 pkgsrc-2012Q4-base:1.9 pkgsrc-2011Q4:1.9.0.4 pkgsrc-2011Q4-base:1.9 pkgsrc-2011Q2:1.9.0.2 pkgsrc-2011Q2-base:1.9 pkgsrc-2010Q4:1.8.0.36 pkgsrc-2010Q4-base:1.8 pkgsrc-2010Q3:1.8.0.34 pkgsrc-2010Q3-base:1.8 pkgsrc-2010Q2:1.8.0.32 pkgsrc-2010Q2-base:1.8 pkgsrc-2010Q1:1.8.0.30 pkgsrc-2010Q1-base:1.8 pkgsrc-2009Q4:1.8.0.28 pkgsrc-2009Q4-base:1.8 pkgsrc-2009Q3:1.8.0.26 pkgsrc-2009Q3-base:1.8 pkgsrc-2009Q2:1.8.0.24 pkgsrc-2009Q2-base:1.8 pkgsrc-2009Q1:1.8.0.22 pkgsrc-2009Q1-base:1.8 pkgsrc-2008Q4:1.8.0.20 pkgsrc-2008Q4-base:1.8 pkgsrc-2008Q3:1.8.0.18 pkgsrc-2008Q3-base:1.8 cube-native-xorg:1.8.0.16 cube-native-xorg-base:1.8 pkgsrc-2008Q2:1.8.0.14 pkgsrc-2008Q2-base:1.8 cwrapper:1.8.0.12 pkgsrc-2008Q1:1.8.0.10 pkgsrc-2008Q1-base:1.8 pkgsrc-2007Q4:1.8.0.8 pkgsrc-2007Q4-base:1.8 pkgsrc-2007Q3:1.8.0.6 pkgsrc-2007Q3-base:1.8 pkgsrc-2007Q2:1.8.0.4 pkgsrc-2007Q2-base:1.8 pkgsrc-2007Q1:1.8.0.2 pkgsrc-2007Q1-base:1.8 pkgsrc-2006Q4:1.7.0.2 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.6.0.24 pkgsrc-2006Q3-base:1.6 pkgsrc-2006Q2:1.6.0.22 pkgsrc-2006Q2-base:1.6 pkgsrc-2006Q1:1.6.0.20 pkgsrc-2006Q1-base:1.6 pkgsrc-2005Q4:1.6.0.18 pkgsrc-2005Q4-base:1.6 pkgsrc-2005Q3:1.6.0.16 pkgsrc-2005Q3-base:1.6 pkgsrc-2005Q2:1.6.0.14 pkgsrc-2005Q2-base:1.6 pkgsrc-2005Q1:1.6.0.12 pkgsrc-2005Q1-base:1.6 pkgsrc-2004Q4:1.6.0.10 pkgsrc-2004Q4-base:1.6 pkgsrc-2004Q3:1.6.0.8 pkgsrc-2004Q3-base:1.6 pkgsrc-2004Q2:1.6.0.6 pkgsrc-2004Q2-base:1.6 pkgsrc-2004Q1:1.6.0.4 pkgsrc-2004Q1-base:1.6 pkgsrc-2003Q4:1.6.0.2 pkgsrc-2003Q4-base:1.6 netbsd-1-6:1.5.0.8 netbsd-1-6-RELEASE-base:1.5 pkgviews:1.5.0.4 pkgviews-base:1.5 buildlink2:1.5.0.2 buildlink2-base:1.5 netbsd-1-5-PATCH003:1.5 netbsd-1-5-RELEASE:1.3 netbsd-1-4-PATCH003:1.3 netbsd-1-4-PATCH002:1.2 comdex-fall-1999:1.1 netbsd-1-4-PATCH001:1.1; locks; strict; comment @# @; 1.9 date 2011.02.28.11.02.46; author adam; state dead; branches; next 1.8; 1.8 date 2007.01.08.11.01.05; author adam; state Exp; branches; next 1.7; 1.7 date 2006.10.08.17.16.59; author wiz; state Exp; branches; next 1.6; 1.6 date 2002.08.25.18.38.40; author jlam; state dead; branches; next 1.5; 1.5 date 2001.06.19.05.35.39; author jlam; state Exp; branches 1.5.2.1; next 1.4; 1.4 date 2000.10.15.04.50.12; author jlam; state dead; branches; next 1.3; 1.3 date 2000.10.12.14.56.45; author jlam; state Exp; branches; next 1.2; 1.2 date 2000.01.15.18.39.30; author jlam; state Exp; branches; next 1.1; 1.1 date 99.07.06.07.51.05; author jlam; state Exp; branches; next ; 1.5.2.1 date 2002.05.11.02.09.05; author jlam; state dead; branches; next ; desc @@ 1.9 log @Changes 5.8: Interface changes * turn on _XOPEN_CURSES definition in curses.h. * change _nc_has_mouse to has_mouse, reflect its use in C++ and Ada95. * add is_pad and is_subwin functions for opaque access to the WINDOW structure. * add tiparm, based on review of X/Open Curses Issue 7. Library Improvements * add a terminal driver for Windows console, which supports a MinGW port to Windows. * add extended functions which specify the SCREEN pointer for several curses functions which use the global SP. * improve the NCURSES_NO_UTF8_ACS feature by adding a check for an extended terminfo capability U8. * improve performance of tigetstr, etc., by using hashing code from tic. * add WACS_xxx definitions to wide-character configuration for thick- and double-lines. * modify init_pair to allow caller to create extra color pairs beyond the color_pairs limit, which use default colors. Improvements to Programs * add tabs program. * modify tic's -I/-C dump to reformat acsc strings into canonical form (sorted, unique mapping). * add checks in tic for inconsistent cursor-movement controls, and for inconsistent printer-controls. * add special case to _nc_infotocap (used by tic and infocmp) to recognize the setaf/setab strings from xterm+256color and xterm+88color, and provide a reduced version which works with termcap. @ text @$NetBSD: patch-ae,v 1.8 2007/01/08 11:01:05 adam Exp $ --- misc/Makefile.in.orig 2007-01-08 09:40:08.000000000 +0100 +++ misc/Makefile.in @@@@ -66,7 +66,7 @@@@ ticfile = $(ticdir).db source = @@TERMINFO_SRC@@ INSTALL = @@INSTALL@@ -INSTALL_PROG = @@INSTALL_PROGRAM@@ +INSTALL_PROG = @@INSTALL_SCRIPT@@ INSTALL_DATA = @@INSTALL_DATA@@ ################################################################################ @ 1.8 log @Changes 5.6: Hashed-databases are supported for storing terminal descriptions. Support for magic-cookies such as hpterm was improved. Support for rpath in shared libraries was revised. Many bugfixes were made for memory leaks, wide-character support, portability, and more. @ text @d1 1 a1 1 $NetBSD$ @ 1.7 log @Add patch addressing PR 33916, supplied by David Holland. Bump PKGREVISION. @ text @d3 11 a13 13 --- progs/tset.c.orig 2005-09-25 00:43:52.000000000 +0000 +++ progs/tset.c @@@@ -1024,7 +1024,9 @@@@ report(const char *name, int which, unsi * Check 'delete' before 'backspace', since the key_backspace value * is ambiguous. */ - if (newer == 0177) + if (newer == _POSIX_VDISABLE) + (void) fprintf(stderr, "disabled.\n"); + else if (newer == 0177) (void) fprintf(stderr, "delete.\n"); else if ((p = key_backspace) != 0 && newer == (unsigned char) p[0] @ 1.6 log @Merge changes in packages from the buildlink2 branch that have buildlink2.mk files back into the main trunk. This provides sufficient buildlink2 infrastructure to start merging other packages from the buildlink2 branch that have already been converted to use the buildlink2 framework. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.5 2001/06/19 05:35:39 jlam Exp $ d3 13 a15 11 --- form/Makefile.in.orig Sat Oct 14 13:57:02 2000 +++ form/Makefile.in @@@@ -85,7 +85,7 @@@@ LINK = $(LIBTOOL) $(CC) LDFLAGS = @@LDFLAGS@@ @@LD_MODEL@@ @@LIBS@@ -SHLIB_DIRS = -L../lib -L$(libdir) +SHLIB_DIRS = -L../lib SHLIB_LIST = $(SHLIB_DIRS) -lncurses@@LIB_SUFFIX@@ @@SHLIB_LIST@@ MK_SHARED_LIB = @@MK_SHARED_LIB@@ @ 1.5 log @Remove explicit inclusion of -I$(includedir) into CPPFLAGS and -L$(libdir) into LDFLAGS. This makes building of ncurses on a system already having ncurses installed possible. This is just another chapter of the continuing buildlink saga. @ text @d1 1 a1 1 $NetBSD$ @ 1.5.2.1 log @First pass at conversion of various packages to use the buildlink2 framework. Add many buildlink2.mk files to add to the framework. Please see buildlink2.txt for more details. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.5 2001/06/19 05:35:39 jlam Exp $ @ 1.4 log @Patch with ncurses-5.1-20001014.patch.gz. This has a few minor bug fixes, but mostly comprises patches to ease building on NetBSD pkgsrc. Tom Dickey has been kind enough to accept our patches back into the main source tree. Many thanks to him. @ text @d1 1 a1 1 $NetBSD: patch-ae,v 1.3 2000/10/12 14:56:45 jlam Exp $ d3 9 a11 22 --- configure.orig Thu Oct 12 04:52:53 2000 +++ configure @@@@ -193,8 +193,10 @@@@ --without-cxx-binding do not build C++ binding and demo --without-ada suppress check for Ada95, don't build demo --without-progs suppress build with programs (e.g., tic) + --without-curses-h install curses.h as ncurses.h only --with-install-prefix prefixes actual install-location Options to Specify the Libraries Built/Used: + --with-libtool generate libraries with libtool --with-shared generate shared-libraries --with-normal generate normal-libraries (default) --with-debug generate debug-libraries (default) @@@@ -229,6 +231,7 @@@@ optionally formatted, e.g., gzip,formatted --with-manpage-renames specify manpage-renaming --with-manpage-symlinks specify manpage-symlinks + --with-manpage-tbl specify manpage processing with tbl EOF cat <&6 +echo $ac_n "checking if you wish to install curses.h""... $ac_c" 1>&6 +echo "configure:1597: checking if you wish to install curses.h" >&5 + +# Check whether --with-curses-h or --without-curses-h was given. +if test "${with_curses_h+set}" = set; then + withval="$with_curses_h" + with_curses_h=$withval +else + with_curses_h=yes +fi + +echo "$ac_t""$with_curses_h" 1>&6 + modules_to_build="ncurses" if test "X$cf_with_progs" != Xno ; then modules_to_build="$modules_to_build progs tack" @@@@ -2141,6 +2157,25 @@@@ ### shared, for example. cf_list_models="" +echo $ac_n "checking if you want to build libraries with libtool""... $ac_c" 1>&6 +echo "configure:2146: checking if you want to build libraries with libtool" >&5 + +# Check whether --with-libtool or --without-libtool was given. +if test "${with_libtool+set}" = set; then + withval="$with_libtool" + with_libtool=$withval +else + with_libtool=no +fi + +echo "$ac_t""$with_libtool" 1>&6 +if test "$with_libtool" = "yes"; then + cf_list_models="$cf_list_models libtool" + test -z "$LIBTOOL" && LIBTOOL=libtool +else + LIBTOOL="" +fi + echo $ac_n "checking if you want to build shared libraries""... $ac_c" 1>&6 echo "configure:2146: checking if you want to build shared libraries" >&5 @@@@ -2202,6 +2237,9 @@@@ echo $ac_n "checking for specified models""... $ac_c" 1>&6 echo "configure:2204: checking for specified models" >&5 test -z "$cf_list_models" && cf_list_models=normal +# If we use libtool to generate libraries, then it must be the only +# specified model. +test "$with_libtool" = "yes" && cf_list_models=libtool echo "$ac_t""$cf_list_models" 1>&6 ### Use the first model as the default, and save its suffix for use in building @@@@ -2496,6 +2534,7 @@@@ echo $ac_n "checking for default loader flags""... $ac_c" 1>&6 echo "configure:2498: checking for default loader flags" >&5 case $DFT_LWR_MODEL in +libtool) LD_MODEL='' ;; normal) LD_MODEL='' ;; debug) LD_MODEL=$CC_G_OPT ;; profile) LD_MODEL='-pg';; @@@@ -3469,6 +3508,22 @@@@ echo "$ac_t""$cf_manpage_symlinks" 1>&6 +echo $ac_n "checking for manpage tbl""... $ac_c" 1>&6 +echo "configure:3458: checking for manpage tbl" >&5 + + +# Check whether --with-manpage-tbl or --without-manpage-tbl was given. +if test "${with_manpage_tbl+set}" = set; then + withval="$with_manpage_tbl" + cf_manpage_tbl=$withval +else + cf_manpage_tbl=yes +fi + + +echo "$ac_t""$cf_manpage_tbl" 1>&6 + + if test "$prefix" = "NONE" ; then cf_prefix="$ac_default_prefix" else @@@@ -3580,6 +3635,18 @@@@ test \$verb = installing && sed -e "s,@@DATADIR@@,\$datadir," < \$i | sed -f edit_man.sed >\$TMP CF_EOF fi +if test $cf_manpage_tbl = yes ; then +cat >>man/edit_man.sh <\$TMP.out + mv \$TMP.out \$TMP +CF_EOF +fi +if test $with_curses_h != yes ; then +cat >>man/edit_man.sh <\$TMP.out + mv \$TMP.out \$TMP +CF_EOF +fi if test $cf_format = yes ; then cat >>man/edit_man.sh <\$TMP.out @@@@ -6964,6 +7031,7 @@@@ echo "configure:6965: checking default library suffix" >&5 case $DFT_LWR_MODEL in + libtool) DFT_ARG_SUFFIX='' ;; normal) DFT_ARG_SUFFIX='' ;; debug) DFT_ARG_SUFFIX='_g' ;; profile) DFT_ARG_SUFFIX='_p' ;; @@@@ -6977,6 +7045,7 @@@@ case $DFT_LWR_MODEL in + libtool) DFT_DEP_SUFFIX='.la' ;; normal) DFT_DEP_SUFFIX='.a' ;; debug) DFT_DEP_SUFFIX='_g.a' ;; profile) DFT_DEP_SUFFIX='_p.a' ;; @@@@ -6993,6 +7062,7 @@@@ echo "configure:6994: checking default object directory" >&5 case $DFT_LWR_MODEL in + libtool) DFT_OBJ_SUBDIR='obj_lo' ;; normal) DFT_OBJ_SUBDIR='objects' ;; debug) DFT_OBJ_SUBDIR='obj_g' ;; profile) DFT_OBJ_SUBDIR='obj_p' ;; @@@@ -7018,7 +7088,11 @@@@ ### could override this. if test "$with_termlib" = yes ; then TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${TINFO_NAME}${DFT_DEP_SUFFIX}" - TEST_ARGS="-l${TINFO_NAME}${DFT_ARG_SUFFIX}" + if test "$DFT_LWR_MODEL" = "libtool"; then + TEST_ARGS="${TEST_DEPS}" + else + TEST_ARGS="-l${TINFO_NAME}${DFT_ARG_SUFFIX}" + fi fi PROG_DEPS="$TEST_DEPS" PROG_ARGS="$TEST_ARGS" @@@@ -7032,7 +7106,11 @@@@ # dependencies and linker-arguments for test-programs TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_DEPS" -TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS" +if test "$DFT_LWR_MODEL" = "libtool"; then + TEST_ARGS="${TEST_DEPS}" +else + TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS" +fi # dependencies and linker-arguments for utility-programs PROG_ARGS="$TEST_ARGS" @@@@ -7075,7 +7153,11 @@@@ EOF TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS" - TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS" + if test "$DFT_LWR_MODEL" = "libtool"; then + TEST_ARGS="${TEST_DEPS}" + else + TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS" + fi fi fi done @@@@ -7121,6 +7203,7 @@@@ do case $cf_item in + libtool) cf_subdir='obj_lo' ;; normal) cf_subdir='objects' ;; debug) cf_subdir='obj_g' ;; profile) cf_subdir='obj_p' ;; @@@@ -7257,6 +7340,7 @@@@ s/@@@@/%@@/; s/@@@@/@@%/; s/@@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s%@@LIBTOOL@@%$LIBTOOL%g s%@@SHELL@@%$SHELL%g s%@@CFLAGS@@%$CFLAGS%g s%@@CPPFLAGS@@%$CPPFLAGS%g @@@@ -7611,6 +7695,7 @@@@ TINFO_NAME="$TINFO_NAME" WITH_ECHO="$with_echo" WITH_OVERWRITE="$with_overwrite" +WITH_CURSES_H="$with_curses_h" cf_cv_abi_version="$cf_cv_abi_version" cf_cv_do_symlinks="$cf_cv_do_symlinks" cf_cv_rel_version="$cf_cv_rel_version" @@@@ -7645,6 +7730,7 @@@@ case $cf_item in + libtool) cf_suffix='.la' ;; normal) cf_suffix='.a' ;; debug) cf_suffix='_g.a' ;; profile) cf_suffix='_p.a' ;; @@@@ -7695,6 +7781,7 @@@@ case $cf_item in + libtool) cf_suffix='.la' ;; normal) cf_suffix='.a' ;; debug) cf_suffix='_g.a' ;; profile) cf_suffix='_p.a' ;; @@@@ -7708,6 +7795,7 @@@@ case $cf_item in + libtool) cf_subdir='obj_lo' ;; normal) cf_subdir='objects' ;; debug) cf_subdir='obj_g' ;; profile) cf_subdir='obj_p' ;; @@@@ -7857,27 +7945,62 @@@@ DST=\$1 REF=\$2 SRC=\$3 +TMPSRC=\${TMPDIR-/tmp}/\`basename \$SRC\`\$\$ +TMPSED=\${TMPDIR-/tmp}/headers.sed\$\$ echo installing \$SRC in \$DST +CF_EOF +if test $WITH_CURSES_H = yes; then + cat >>headers.sh </<\$END\/\$NAME>/" >> \$TMPSED done - rm -f \$TMPSRC - sed -f \$TMPSED \$SRC > \$TMPSRC - eval \$PRG \$TMPSRC \$DST/\`basename \$SRC\` - rm -f \$TMPSRC \$TMPSED ;; *) - eval \$PRG \$SRC \$DST + echo "" >> \$TMPSED ;; esac CF_EOF +else + cat >>headers.sh <//" >> \$TMPSED + NAME=ncurses.h + fi + echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED + done + ;; +*) + echo "s///" >> \$TMPSED + ;; +esac +CF_EOF +fi +cat >>headers.sh < \$TMPSRC +NAME=\`basename \$SRC\` +CF_EOF +if test $WITH_CURSES_H != yes; then + cat >>headers.sh <>headers.sh <>$cf_dir/Makefile - test $i = curses.h && echo " @@ (cd \$(DESTDIR)\$(includedir) && rm -f ncurses.h && \$(LN_S) curses.h ncurses.h)" >>$cf_dir/Makefile + test $i = curses.h && test $WITH_CURSES_H = yes && echo " @@ (cd \$(DESTDIR)\$(includedir) && rm -f ncurses.h && \$(LN_S) curses.h ncurses.h)" >>$cf_dir/Makefile done cat >>$cf_dir/Makefile <