head 1.7; access; symbols pkgsrc-2013Q2:1.7.0.54 pkgsrc-2013Q2-base:1.7 pkgsrc-2012Q4:1.7.0.52 pkgsrc-2012Q4-base:1.7 pkgsrc-2011Q4:1.7.0.50 pkgsrc-2011Q4-base:1.7 pkgsrc-2011Q2:1.7.0.48 pkgsrc-2011Q2-base:1.7 pkgsrc-2009Q4:1.7.0.46 pkgsrc-2009Q4-base:1.7 pkgsrc-2008Q4:1.7.0.44 pkgsrc-2008Q4-base:1.7 pkgsrc-2008Q3:1.7.0.42 pkgsrc-2008Q3-base:1.7 cube-native-xorg:1.7.0.40 cube-native-xorg-base:1.7 pkgsrc-2008Q2:1.7.0.38 pkgsrc-2008Q2-base:1.7 pkgsrc-2008Q1:1.7.0.36 pkgsrc-2008Q1-base:1.7 pkgsrc-2007Q4:1.7.0.34 pkgsrc-2007Q4-base:1.7 pkgsrc-2007Q3:1.7.0.32 pkgsrc-2007Q3-base:1.7 pkgsrc-2007Q2:1.7.0.30 pkgsrc-2007Q2-base:1.7 pkgsrc-2007Q1:1.7.0.28 pkgsrc-2007Q1-base:1.7 pkgsrc-2006Q4:1.7.0.26 pkgsrc-2006Q4-base:1.7 pkgsrc-2006Q3:1.7.0.24 pkgsrc-2006Q3-base:1.7 pkgsrc-2006Q2:1.7.0.22 pkgsrc-2006Q2-base:1.7 pkgsrc-2006Q1:1.7.0.20 pkgsrc-2006Q1-base:1.7 pkgsrc-2005Q4:1.7.0.18 pkgsrc-2005Q4-base:1.7 pkgsrc-2005Q3:1.7.0.16 pkgsrc-2005Q3-base:1.7 pkgsrc-2005Q2:1.7.0.14 pkgsrc-2005Q2-base:1.7 pkgsrc-2005Q1:1.7.0.12 pkgsrc-2005Q1-base:1.7 pkgsrc-2004Q4:1.7.0.10 pkgsrc-2004Q4-base:1.7 pkgsrc-2004Q3:1.7.0.8 pkgsrc-2004Q3-base:1.7 pkgsrc-2004Q2:1.7.0.6 pkgsrc-2004Q2-base:1.7 pkgsrc-2004Q1:1.7.0.4 pkgsrc-2004Q1-base:1.7 pkgsrc-2003Q4:1.7.0.2 pkgsrc-2003Q4-base:1.7 netbsd-1-6:1.6.0.8 netbsd-1-6-RELEASE-base:1.6 pkgviews:1.6.0.4 pkgviews-base:1.6 buildlink2:1.6.0.2 buildlink2-base:1.6 netbsd-1-5-PATCH003:1.6 netbsd-1-5-RELEASE:1.4 netbsd-1-4-PATCH003:1.4 netbsd-1-4-PATCH002:1.3 comdex-fall-1999:1.2 netbsd-1-4-PATCH001:1.1; locks; strict; comment @# @; 1.7 date 2002.08.25.18.38.41; author jlam; state dead; branches; next 1.6; 1.6 date 2001.06.19.05.35.39; author jlam; state Exp; branches 1.6.2.1; next 1.5; 1.5 date 2000.10.15.04.50.12; author jlam; state dead; branches; next 1.4; 1.4 date 2000.10.12.14.56.45; author jlam; state Exp; branches; next 1.3; 1.3 date 2000.01.15.18.39.31; author jlam; state Exp; branches; next 1.2; 1.2 date 99.09.24.00.39.13; author jlam; state Exp; branches; next 1.1; 1.1 date 99.07.06.07.51.05; author jlam; state Exp; branches; next ; 1.6.2.1 date 2002.05.11.02.09.05; author jlam; state dead; branches; next ; desc @@ 1.7 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 @$NetBSD: patch-af,v 1.6 2001/06/19 05:35:39 jlam Exp $ --- menu/Makefile.in.orig Sat Oct 14 13:57:02 2000 +++ menu/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.6 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.6.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-af,v 1.6 2001/06/19 05:35:39 jlam Exp $ @ 1.5 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-af,v 1.4 2000/10/12 14:56:45 jlam Exp $ d3 4 a6 25 --- form/Makefile.in.orig Thu Oct 12 04:52:53 2000 +++ form/Makefile.in @@@@ -53,6 +53,8 @@@@ libdir = @@libdir@@ includedir = @@includedir@@ +LIBTOOL = @@LIBTOOL@@ + INSTALL = @@INSTALL@@ INSTALL_LIB = @@INSTALL@@ @@INSTALL_LIB@@ INSTALL_DATA = @@INSTALL_DATA@@ @@@@ -72,6 +74,7 @@@@ CCFLAGS = $(CPPFLAGS) $(CFLAGS) +CFLAGS_LIBTOOL = $(CCFLAGS) CFLAGS_NORMAL = $(CCFLAGS) CFLAGS_DEBUG = $(CCFLAGS) @@CC_G_OPT@@ -DTRACE CFLAGS_PROFILE = $(CCFLAGS) -pg @@@@ -79,7 +82,7 @@@@ CFLAGS_DEFAULT = $(CFLAGS_@@DFT_UPR_MODEL@@) -LINK = $(CC) +LINK = $(LIBTOOL) $(CC) d9 3 a11 2 SHLIB_DIRS = -L../lib -L$(libdir) @@@@ -87,6 +90,8 @@@@ a13 6 +NCURSES_MAJOR = @@NCURSES_MAJOR@@ +NCURSES_MINOR = @@NCURSES_MINOR@@ REL_VERSION = @@cf_cv_rel_version@@ ABI_VERSION = @@cf_cv_abi_version@@ @ 1.4 log @Update ncurses to 5.1 (20001009). Changes from version 5.0 include better support for termcap, new extensions for color, several bug fixes, minor API changes, buffer-overrun checks. @ text @d1 1 a1 1 $NetBSD$ @ 1.3 log @Update ncurses to 5.0. From the release notes: We decided to release ncurses as a new whole number release (5.0) because it incorporates several interface changes, including some that would invalidate existing shared libraries. These are the highlights from the change-log since ncurses 4.2 release. Interface changes: * The principal source of changes to the interface comes from the release of X/Open Curses in 1997. Earlier versions of ncurses (4.0 and before) were based on a draft version of the specification. The release version adds parameters to some functions to support the evolving internationalization of curses. These summarize the impact: + modified several prototypes to correspond with 1997 version of X/Open Curses (affects ABI since developers have used attr_get). + corrected prototypes for slk_* functions, using chtype rather than attr_t. + the slk_attr_{set,off,on} functions need an additional void* parameter according to XSI. + correct macros for wattr_set, wattr_get, separate wattrset macro from these to preserve behavior that allows attributes to be combined with color pair numbers. + reviewed/updated curses.h, term.h against X/Open Curses Issue 4 Version 2. This includes making some parameters NCURSES_CONST rather than const, e.g., in termcap.h. + reviewed/corrected macros in curses.h as per XSI document. + add set_a_attributes and set_pglen_inch to terminfo structure, as per XSI and Solaris 2.5. * The newest version of the X/Open Curses is implemented on Solaris and other vendor's systems. It adds new features to the terminfo descriptions: + implement tparm %l format. + implement tparm printf-style width and precision for %s, %d, %x, %o as per XSI. * We made additional changes to reduce impact by future interface changes: + rename key_names[] array to _nc_key_names since it is not part of the curses interface. + move macro winch to a function, to hide details of struct ldat * modify configure script to embed ABI in shared libraries for HP-UX 10.x (detailed request by Tim Mooney). * modify configuration of shared libraries on Digital Unix so that versioning is embedded in the library, rather than implied by links (patch by Tim Mooney). New features: * enable sigwinch handler by default. * turn on hashmap scrolling code by default * improved support for termcap applications + modify tput to accept termcap names as an alternative to terminfo names. + provide support for termcap PC variable by copying it from terminfo data and using it as the padding character in tputs. + provide support for termcap ospeed variable by copying it from the internal cur_term member, and using ospeed as the baudrate reference for the delay_output and tputs functions. + change name-comparisons in lib_termcap to compare no more than 2 characters. + add configure option --enable-tcap-names, which essentially allows users to define new capabilities as in termcap. * add mouse support to ncurses menus. * add mouse and dll support for OS/2 EMX * modify terminfo parsing to accept octal and hexadecimal constants * add configure option --enable-no-padding, to allow environment variable $NCURSES_NO_PADDING to eliminate non-mandatory padding, thereby making terminal emulators (e.g., for vt100) a little more efficient. * modify lib_color.c to eliminate dependency on orig_colors and orig_pair, since SVr4 curses does not require these either, but uses them when they are available. * add -f option to infocmp and tic, which formats the terminfo if/then/else/endif so that they are readable (with newlines and tabs). * modify tic to compile into %'char' form in preference to %{number}, since that is a little more efficient. Major bug fixes: * modify lib_tstp.c to block SIGTTOU when handling SIGTSTP, fixes a problem where ncurses applications which were run via a shell script would hang when given a ^Z. Also, check if the terminal's process group is consistent, i.e., a shell has not taken ownership of it, before deciding to save the current terminal settings in the SIGTSTP handler. * suppress sc/rc capabilities from terminal description if they appear in smcup/rmcup. This affects only scrolling optimization, to fix a problem reported by several people with xterm's alternate screen, though the problem is more general. * modify relative_move and tputs to avoid an interaction with the BSD-style padding. The relative_move function could produce a string to replace on the screen which began with a numeric character, which was then interpreted by tputs as padding. * modify setupterm so that cancelled strings are treated the same as absent strings, cancelled and absent booleans false (does not affect tic, infocmp). * modify lib_vidattr.c to allow for terminal types (e.g., xterm-color) which may reset all attributes in the 'op' capability, so that colors are set before turning on bold and other attributes, but still after turning attributes off. * use 'access()' to check if ncurses library should be permitted to open or modify files with fopen/open/link/unlink/remove calls, in case the calling application is running in setuid mode. * correction to doupdate, for case where terminal does not support insert/delete character. The logic did not check that there was a difference in alignment of changes to old/new screens before repainting the whole non-blank portion of the line. Modified to fall through into logic that reduces by the portion which does not differ. @ text @d3 37 a39 14 --- mk-2nd.awk.orig Sat Oct 17 17:54:21 1998 +++ mk-2nd.awk Sat Jan 15 11:24:46 2000 @@@@ -93,9 +93,9 @@@@ dir = $3 "/" sub("^\\$\\(srcdir\\)/","",dir); sub("^\\./","",dir); - printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c ../%s/%s%s%s", atsign, model, compile, MODEL, name, dir, $1, suffix + printf "\t%scd ../%s; $(LIBTOOL) $(%s) $(CFLAGS_%s) -c ../%s/%s%s%s", atsign, model, compile, MODEL, name, dir, $1, suffix } else - printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c %s/%s%s", atsign, model, compile, MODEL, $3, $1, suffix + printf "\t%scd ../%s; $(LIBTOOL) $(%s) $(CFLAGS_%s) -c %s/%s%s", atsign, model, compile, MODEL, $3, $1, suffix } else { printf "%s", $1 for (n = 2; n <= NF; n++) printf " %s", $n @ 1.2 log @Go ahead and build and install the the ncurses C++ application framework library. This was a side-effect of trying to deal with --with-cxx and --without-cxx. We accept the default --with-cxx. This should work regardless of whether libg++ exists. @ text @d3 9 a11 21 --- mk-2nd.awk.orig Wed Feb 11 07:13:53 1998 +++ mk-2nd.awk Thu Sep 23 17:24:17 1999 @@@@ -74,9 +74,11 @@@@ if ( $1 != "" ) { print "" if ( $2 == "c++" ) { + cplusplus="--cplusplus" compile="CXX" suffix=".cc" } else { + cplusplus="" compile="CC" suffix=".c" } @@@@ -89,10 +91,14 @@@@ atsign="@@" printf "\t@@echo 'compiling %s (%s)'\n", $1, model } - if ( $3 == "." || srcdir == "." ) - printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c ../%s/%s%s", atsign, model, compile, MODEL, name, $1, suffix - else d13 1 a13 8 + if ( $3 == "." || srcdir == "." ) { + libprefix="../" + dirname=name + } else { + libprefix="" + dirname=$3 + } + printf "\t%scd ../%s; $(LIBTOOL) %s --mode=compile $(%s) $(CFLAGS_%s) -c %s%s/%s%s", atsign, model, cplusplus, compile, MODEL, libprefix, dirname, $1, suffix @ 1.1 log @ * Update "devel/ncurses" to latest release 4.2. * Libtoolize library build. @ text @d4 1 a4 1 +++ mk-2nd.awk Tue Jun 29 17:47:39 1999 d17 1 a17 1 @@@@ -89,10 +91,17 @@@@ d23 2 d32 1 a32 5 + if ( $2 == "lib" ) + printf "\t%scd ../%s; $(LIBTOOL) %s --mode=compile $(%s) $(CFLAGS_%s) -c %s%s/%s%s", atsign, model, cplusplus, compile, MODEL, libprefix, dirname, $1, suffix else - printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c %s/%s%s", atsign, model, compile, MODEL, $3, $1, suffix + printf "\t%scd ../%s; $(%s) $(CFLAGS_%s) -c %s%s/%s%s", atsign, model, compile, MODEL, libprefix, dirname, $1, suffix @