diff options
author | jlam <jlam> | 2000-10-12 14:56:42 +0000 |
---|---|---|
committer | jlam <jlam> | 2000-10-12 14:56:42 +0000 |
commit | 6f1602191466eec6099e74e29a91e635f7c4e332 (patch) | |
tree | 51c88ec7fd7971f7a3c8b588af11f0034acb199a | |
parent | 2b8b3c0d223945a564ced5e9ad3be6846bfd2204 (diff) | |
download | pkgsrc-6f1602191466eec6099e74e29a91e635f7c4e332.tar.gz |
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.
-rw-r--r-- | devel/ncurses/Makefile | 81 | ||||
-rw-r--r-- | devel/ncurses/files/md5 | 4 | ||||
-rw-r--r-- | devel/ncurses/files/patch-sum | 25 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-aa | 141 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-ab | 240 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-ac | 113 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-ad | 88 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-ae | 381 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-af | 53 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-ag | 90 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-ah | 54 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-ai | 58 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-aj | 16 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-ak | 39 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-al | 39 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-am | 91 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-an | 48 | ||||
-rw-r--r-- | devel/ncurses/patches/patch-ao | 34 | ||||
-rw-r--r-- | devel/ncurses/pkg/PLIST | 575 |
19 files changed, 1766 insertions, 404 deletions
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile index 107f2f19b71..19c6d99d883 100644 --- a/devel/ncurses/Makefile +++ b/devel/ncurses/Makefile @@ -1,59 +1,46 @@ -# $NetBSD: Makefile,v 1.31 2000/07/14 21:29:06 jlam Exp $ +# $NetBSD: Makefile,v 1.32 2000/10/12 14:56:42 jlam Exp $ -DISTNAME= ncurses-5.0 +DISTNAME= ncurses-${NC_VERS} +NC_VERS= 5.1 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GNU:=ncurses/} \ - ftp://ftp.clark.net/pub/dickey/ncurses/ + ftp://dickey.his.com/ncurses/ \ + ftp://dickey.his.com/ncurses/${NC_VERS}/ +DISTFILES+= ${NC_PATCH} MAINTAINER= jlam@netbsd.org -HOMEPAGE= http://www.clark.net/pub/dickey/ncurses/ncurses.html +HOMEPAGE= http://dickey.his.com/ncurses/ncurses.html + +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} +NC_PATCH= patch-5.1-20001009.sh -GNU_CONFIGURE= # defined USE_LIBTOOL= # defined -CONFIGURE_ARGS+= --with-normal --enable-bsdpad \ - --without-shared --without-debug --without-profile \ - --without-gpm --without-ada \ - --with-manpage-format=normal -MAKE_ENV+= NCURSES_MAJOR="${NCURSES_MAJOR}" \ - NCURSES_MINOR="${NCURSES_MINOR}" - -# Define these here so they can be conveniently changed when ncurses -# is integrated into the NetBSD source tree. -# -NCURSES_MAJOR= 5 -NCURSES_MINOR= 0 - -# The following installed headers directly reference <curses.h> and must be -# altered to reference <ncurses.h> instead. -# -CURSES_INCLUDES= c++/cursesw.h form/form.h include/unctrl.h \ - menu/menu.h panel/panel.h -CURSES_MAN_WITH_TABLES= captoinfo.1m curs_addch.3x curs_attr.3x \ - curs_getch.3x curs_inch.3x curs_mouse.3x \ - form.3x infocmp.1m menu.3x ncurses.3x -# terminfo.5 is handled by patch-ac -SED_NCURSES= '/\#[ ]*include/s/curses.h/ncurses.h/' + +GNU_CONFIGURE= # defined +CONFIGURE_ARGS+= --with-libtool +CONFIGURE_ARGS+= --enable-bsdpad +CONFIGURE_ARGS+= --with-cxx-binding +CONFIGURE_ARGS+= --without-ada +CONFIGURE_ARGS+= --without-curses-h +CONFIGURE_ARGS+= --without-gpm +CONFIGURE_ARGS+= --with-manpage-format=normal +CONFIGURE_ARGS+= --with-manpage-tbl + +# Remove these manpages from the distribution so they won't get installed +CURSES_NO_MAN= clear.1 tput.1 tset.1 + +post-extract: + cd ${WRKSRC} && ${SH} ${DISTDIR}/${DIST_SUBDIR}/${NC_PATCH} + ${FIND} ${WRKSRC} -name "*.orig" -exec ${RM} -f {} \; post-configure: - cd ${WRKSRC}; \ - ${LN} -sf curses.h include/ncurses.h; \ - for file in ${CURSES_INCLUDES}; do \ - ${SED} -e ${SED_NCURSES} <$${file} >$${file}.tmp; \ - ${MV} -f $${file}.tmp $${file}; \ - done - cd ${WRKSRC}/man; \ - ${RM} -f clear.1 tput.1 tset.1; \ - for file in ${CURSES_MAN_WITH_TABLES}; do \ - tbl $${file} > $${file}.notbl; \ - ${MV} $${file}.notbl $${file}; \ - done; \ - for file in *.1m; do \ - ${SED} -e ${SED_NCURSES} <$${file} >`basename $${file} .1m`.1; \ - ${RM} -f $${file}; \ - done; \ - for file in *.3x; do \ - ${SED} -e ${SED_NCURSES} <$${file} >`basename $${file} .3x`.3; \ - ${RM} -f $${file}; \ + cd ${WRKSRC}/man; \ + ${RM} -f ${CURSES_NO_MAN}; \ + for file in *.1m; do \ + ${MV} -f $${file} `basename $${file} .1m`.1; \ + done; \ + for file in *.3x; do \ + ${MV} -f $${file} `basename $${file} .3x`.3; \ done post-install: diff --git a/devel/ncurses/files/md5 b/devel/ncurses/files/md5 index 5da17d2c5db..5541f4e562a 100644 --- a/devel/ncurses/files/md5 +++ b/devel/ncurses/files/md5 @@ -1,3 +1,3 @@ -$NetBSD: md5,v 1.5 2000/01/15 18:39:29 jlam Exp $ +$NetBSD: md5,v 1.6 2000/10/12 14:56:44 jlam Exp $ -MD5 (ncurses-5.0.tar.gz) = 0fa25059bc5e1e947f3109a3a168e976 +MD5 (patch-5.1-20001009.sh) = e63c4c6d8de31024558c513864145f9a diff --git a/devel/ncurses/files/patch-sum b/devel/ncurses/files/patch-sum index 34a5ea9548f..5c07e9636e9 100644 --- a/devel/ncurses/files/patch-sum +++ b/devel/ncurses/files/patch-sum @@ -1,10 +1,17 @@ -$NetBSD: patch-sum,v 1.6 2000/07/14 21:29:08 jlam Exp $ +$NetBSD: patch-sum,v 1.7 2000/10/12 14:56:45 jlam Exp $ -MD5 (patch-aa) = 8cca6bc718475ec9f288c75cd24164ab -MD5 (patch-ab) = 954b4610801ccad8c61084bf3559bf5b -MD5 (patch-ac) = 27e6894380f88aa55c860bdb259e334c -MD5 (patch-ad) = e0d8bfb17f84b62290773412ce0633b2 -MD5 (patch-ae) = 5e59f99002985e98baa30cce9dd78c79 -MD5 (patch-af) = 4c16a0e085a0a5ff21ac0745ec1dd37a -MD5 (patch-ag) = 0a0eab3bdd57760a113fc41eda19d44c -MD5 (patch-ah) = a552ff5733c78b485153d6f66a5e0d60 +MD5 (patch-aa) = 2dffc61a1dc9d992901a142a53e496b8 +MD5 (patch-ab) = 9c7ca4152679a5c50e3a8a95cfff24d9 +MD5 (patch-ac) = 5c0d0db3de053cfc2fa9cfb2a4266c14 +MD5 (patch-ad) = c86dfe299ab580ecaf467441c6c99060 +MD5 (patch-ae) = e01ab583cd867a51fa0734530eedd04a +MD5 (patch-af) = 2f76777d03ec63e2f711b5dca265646c +MD5 (patch-ag) = 4e88825a4ccced424719ccdf51353a9d +MD5 (patch-ah) = 29604935e46e2762fbbc5fcf93d6369e +MD5 (patch-ai) = b6adb05de8f6d9da251ee077846f0c8a +MD5 (patch-aj) = 34aaf656d7d443fba7d158b27b8a4c9d +MD5 (patch-ak) = 3b0505a78df98ce43476926217dbe0c5 +MD5 (patch-al) = aab23491177da0d0c3e0330436af05e9 +MD5 (patch-am) = 744cdf10103792fae45516d7bab920cd +MD5 (patch-an) = 378db1107080ce563a2ad9613893122d +MD5 (patch-ao) = 77ad4b9d0d2505157e8519c05344a2dc diff --git a/devel/ncurses/patches/patch-aa b/devel/ncurses/patches/patch-aa index 5df330ee469..412cfb6df34 100644 --- a/devel/ncurses/patches/patch-aa +++ b/devel/ncurses/patches/patch-aa @@ -1,71 +1,72 @@ -$NetBSD: patch-aa,v 1.9 2000/07/14 21:29:09 jlam Exp $ +$NetBSD: patch-aa,v 1.10 2000/10/12 14:56:45 jlam Exp $ ---- c++/Makefile.in.orig Sat Oct 23 16:13:02 1999 -+++ c++/Makefile.in Fri Jul 14 15:55:55 2000 -@@ -77,10 +77,10 @@ - LINK = @LINK_PROGS@ $(CXX) @CXXLDFLAGS@ - - LIBROOT = ncurses++ --LIBNAME = @LIB_PREFIX@$(LIBROOT).a -+LIBNAME = @LIB_PREFIX@$(LIBROOT).la - --LDFLAGS = @EXTRA_LDFLAGS@ -L../lib -L$(libdir) \ -- -l$(LIBROOT) \ -+LDFLAGS = @EXTRA_LDFLAGS@ -L$(libdir) \ -+ $(LIBNAME) \ - @TEST_ARGS@ @LDFLAGS@ \ - @LD_MODEL@ @LIBS@ @EXTRA_LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS) - -@@ -94,7 +94,7 @@ - AUTO_SRC = \ - etip.h - --all: $(AUTO_SRC) ../lib/$(LIBNAME) demo$x -+all: $(AUTO_SRC) $(LIBNAME) demo$x - - sources : $(AUTO_SRC) - -@@ -111,9 +111,8 @@ - $(MODEL)/cursesapp.o \ - $(MODEL)/cursesmain.o - --../lib/$(LIBNAME) : $(LIB_OBJS) -- $(AR) $(AR_OPTS) $@ $? -- $(RANLIB) $@ -+$(LIBNAME) : $(LIB_OBJS) -+ cd ../lib && $(LINK) -o lib$(LIBROOT).la $(LIB_OBJS:.o=.lo) -rpath $(INSTALL_PREFIX)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) - - OBJS_DEMO = $(MODEL)/demo.o - -@@ -121,7 +120,7 @@ - $(cursesf_h) $(cursesm_h) $(cursesapp_h) - - demo$x: $(OBJS_DEMO) \ -- ../lib/$(LIBNAME) \ -+ $(LIBNAME) \ - @TEST_DEPS@ - @ECHO_LINK@ $(LINK) -o $@ $(OBJS_DEMO) $(LDFLAGS_DEFAULT) - -@@ -133,18 +132,18 @@ - $(srcdir)/../mkinstalldirs $@ - - install \ --install.libs:: ../lib/$(LIBNAME) $(INSTALL_PREFIX)$(libdir) -- $(INSTALL) ../lib/$(LIBNAME) $(INSTALL_PREFIX)$(libdir)/$(LIBNAME) -+install.libs:: $(LIBNAME) $(INSTALL_PREFIX)$(libdir) -+ $(LIBTOOL) $(INSTALL_DATA) $(LIBNAME) $(INSTALL_PREFIX)$(libdir)/$(LIBNAME) - - uninstall \ - uninstall.libs:: -- -rm -f $(INSTALL_PREFIX)$(libdir)/$(LIBNAME) -+ -$(LIBTOOL) rm -f $(INSTALL_PREFIX)$(libdir)/$(LIBNAME) - - mostlyclean :: - -rm -f core tags TAGS *~ *.ln *.atac trace - - clean :: mostlyclean -- -rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO) -+ -rm -f demo$x $(AUTO_SRC) $(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO) - - distclean :: clean - -rm -f Makefile +--- INSTALL.orig Thu Oct 12 04:52:50 2000 ++++ INSTALL +@@ -104,6 +104,8 @@ + + libncurses_p.a (profile) + ++ libncurses.la (libtool) ++ + If you do not specify any models, the normal and debug libraries will be + configured. Typing `configure' with no arguments is equivalent to: + +@@ -126,6 +128,13 @@ + and SunOS with gcc, but more work needs to be done to make shared libraries + work on other systems. + ++ If you have libtool installed, you can type ++ ++ ./configure --with-libtool ++ ++ to generate the appropriate static and/or shared libraries for your ++ platform using libtool. ++ + You can make curses and terminfo fall back to an existing file of termcap + definitions by configuring with --enable-termcap. If you do this, the + library will search /etc/termcap before the terminfo database, and will +@@ -176,7 +185,8 @@ + The terminfo(5) manual page must be preprocessed with tbl(1) before + being formatted by nroff(1). Modern man(1) implementations tend to do + this by default, but you may want to look at your version's manual page +- to be sure. ++ to be sure. You may also install the manual pages after preprocessing ++ with tbl(1) by specifying the configure option --with-manpage-tbl. + + If the system already has a curses library that you need to keep using + for some bizarre binary-compatibility reason, you'll need to distinguish +@@ -494,6 +504,10 @@ + NOTE: a few systems build shared libraries with fixed pathnames; this + option probably will not work for those configurations. + ++ --with-libtool ++ Generate libraries with libtool. If this option is selected, then ++ it overrides all other library model specifications. ++ + --with-manpage-format=XXX + Tell the configure script how you would like to install man-pages. The + option value must be one of these: gzip, compress, BSDI, normal, +@@ -513,6 +527,11 @@ + this on systems that do not support symbolic links will result in + copying the man-page for each alias. + ++ --with-manpage-tbl ++ Tell the configure script that you with to preprocess the manpages ++ by running them through tbl to generate tables understandable by ++ nroff. ++ + --with-normal + Generate normal (i.e., static) libraries (default). + +@@ -557,6 +576,11 @@ + --without-ada + Suppress the configure script's check for Ada95, do not build the + Ada95 binding and related demo. ++ ++ --without-curses-h ++ Don't install the ncurses header with the name "curses.h". Rather, ++ install as "ncurses.h" and modify the installed headers and manpages ++ accordingly. + + --without-cxx + XSI curses declares "bool" as part of the interface. C++ also declares diff --git a/devel/ncurses/patches/patch-ab b/devel/ncurses/patches/patch-ab index 63a088ae5af..0fce42ae899 100644 --- a/devel/ncurses/patches/patch-ab +++ b/devel/ncurses/patches/patch-ab @@ -1,91 +1,181 @@ -$NetBSD: patch-ab,v 1.8 2000/01/15 18:39:29 jlam Exp $ +$NetBSD: patch-ab,v 1.9 2000/10/12 14:56:45 jlam Exp $ ---- configure.orig Sat Oct 23 20:33:18 1999 -+++ configure Sat Jan 15 11:24:46 2000 -@@ -2461,7 +2461,7 @@ +--- aclocal.m4.orig Thu Oct 12 04:52:50 2000 ++++ aclocal.m4 +@@ -1000,27 +1000,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 <<CF_EOF + case \$DST in + /*/include/*) +- TMPSRC=\${TMPDIR-/tmp}/\`basename \$SRC\`\$\$ +- TMPSED=\${TMPDIR-/tmp}/headers.sed\$\$ + END=\`basename \$DST\` + for i in \`cat \$REF/../*/headers |fgrep -v "#"\` + do + NAME=\`basename \$i\` + echo "s/<\$NAME>/<\$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 <<CF_EOF ++case \$DST in ++/*/include/*) ++ END=\`basename \$DST\` ++ for i in \`cat \$REF/../*/headers |fgrep -v "#"\` ++ do ++ NAME=\`basename \$i\` ++ if test "\$NAME" = "curses.h" ++ then ++ echo "s/<curses.h>/<ncurses.h>/" >> \$TMPSED ++ NAME=ncurses.h ++ fi ++ echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED ++ done ++ ;; ++*) ++ echo "s/<curses.h>/<ncurses.h>/" >> \$TMPSED ++ ;; ++esac ++CF_EOF ++fi ++cat >>headers.sh <<CF_EOF ++rm -f \$TMPSRC ++sed -f \$TMPSED \$SRC > \$TMPSRC ++NAME=\`basename \$SRC\` ++CF_EOF ++if test $WITH_CURSES_H != yes; then ++ cat >>headers.sh <<CF_EOF ++test "\$NAME" = "curses.h" && NAME=ncurses.h ++CF_EOF ++fi ++cat >>headers.sh <<CF_EOF ++eval \$PRG \$TMPSRC \$DST/\$NAME ++rm -f \$TMPSRC \$TMPSED ++CF_EOF - - case $DFT_LWR_MODEL in -- normal) DFT_DEP_SUFFIX='.a' ;; -+ normal) DFT_DEP_SUFFIX='.la' ;; - debug) DFT_DEP_SUFFIX='_g.a' ;; - profile) DFT_DEP_SUFFIX='_p.a' ;; - shared) -@@ -2581,6 +2581,9 @@ + chmod 0755 headers.sh - cf_cv_rm_so_locs=no +@@ -1045,7 +1080,7 @@ + for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"` + do + echo " @ (cd \$(DESTDIR)\$(includedir) && rm -f `basename $i`) ; ../headers.sh \$(INSTALL_DATA) \$(DESTDIR)\$(includedir) \$(srcdir) $i" >>$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 -+LINK_PROGS='$(LIBTOOL)' -+LINK_TESTS='$(LIBTOOL)' + cat >>$cf_dir/Makefile <<CF_EOF +@@ -1073,6 +1108,7 @@ + [ + AC_REQUIRE([CF_SUBST_NCURSES_VERSION]) + case $1 in ++ libtool) $2='.la' ;; + normal) $2='.a' ;; + debug) $2='_g.a' ;; + profile) $2='_p.a' ;; +@@ -1092,6 +1128,7 @@ + AC_DEFUN([CF_LIB_TYPE], + [ + case $1 in ++ libtool) $2='' ;; + normal) $2='' ;; + debug) $2='_g' ;; + profile) $2='_p' ;; +@@ -1387,6 +1424,20 @@ + AC_MSG_RESULT($cf_manpage_symlinks) + ])dnl + dnl --------------------------------------------------------------------------- ++dnl This option causes manpages to be run through tbl(1) to generate tables ++dnl correctly. ++AC_DEFUN([CF_MANPAGE_TBL], ++[ ++AC_MSG_CHECKING(for manpage tbl) + - case $cf_cv_system_name in - hpux10.*) - # (tested with gcc 2.7.2 -- I don't have c89) -@@ -6440,7 +6443,7 @@ - ### could override this. - if test "$with_termlib" = yes ; then - TEST_DEPS="${LIB_PREFIX}${TINFO_NAME}${DFT_DEP_SUFFIX}" -- TEST_ARGS="-l${TINFO_NAME}${DFT_ARG_SUFFIX}" -+ TEST_ARGS="${LIB_PREFIX}${TINFO_NAME}${DFT_DEP_SUFFIX}" ++AC_ARG_WITH(manpage-tbl, ++ [ --with-manpage-tbl specify manpage processing with tbl], ++ [cf_manpage_tbl=$withval], ++ [cf_manpage_tbl=yes]) ++ ++AC_MSG_RESULT($cf_manpage_tbl) ++])dnl ++dnl --------------------------------------------------------------------------- + dnl Try to determine if the man-pages on the system are compressed, and if + dnl so, what format is used. Use this information to construct a script that + dnl will install man-pages. +@@ -1396,6 +1447,7 @@ + CF_MANPAGE_FORMAT + CF_MANPAGE_RENAMES + CF_MANPAGE_SYMLINKS ++CF_MANPAGE_TBL + + if test "$prefix" = "NONE" ; then + cf_prefix="$ac_default_prefix" +@@ -1509,6 +1561,18 @@ + test \$verb = installing && sed -e "s,@DATADIR@,\$datadir," < \$i | sed -f edit_man.sed >\$TMP + CF_EOF fi - PROG_DEPS="$TEST_DEPS" - PROG_ARGS="$TEST_ARGS" -@@ -6454,7 +6457,7 @@ ++if test $cf_manpage_tbl = yes ; then ++cat >>man/edit_man.sh <<CF_EOF ++ tbl \$TMP >\$TMP.out ++ mv \$TMP.out \$TMP ++CF_EOF ++fi ++if test $with_curses_h != yes ; then ++cat >>man/edit_man.sh <<CF_EOF ++ sed -e "/\#[ ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out ++ mv \$TMP.out \$TMP ++CF_EOF ++fi + if test $cf_format = yes ; then + cat >>man/edit_man.sh <<CF_EOF + nroff -man \$TMP >\$TMP.out +@@ -1645,6 +1709,7 @@ + AC_DEFUN([CF_OBJ_SUBDIR], + [ + case $1 in ++ libtool) $2='obj_lo' ;; + normal) $2='objects' ;; + debug) $2='obj_g' ;; + profile) $2='obj_p' ;; +@@ -2066,7 +2131,11 @@ # dependencies and linker-arguments for test-programs - TEST_DEPS="${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_DEPS" + TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${LIB_NAME}${DFT_DEP_SUFFIX} $TEST_DEPS" -TEST_ARGS="-l${LIB_NAME}${DFT_ARG_SUFFIX} $TEST_ARGS" -+TEST_ARGS="${LIB_PREFIX}${LIB_NAME}${DFT_DEP_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" -@@ -6497,16 +6500,17 @@ - EOF - - TEST_DEPS="${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS" +@@ -2101,7 +2170,11 @@ + AC_DEFINE_UNQUOTED(HAVE_${cf_have_include}_H) + AC_DEFINE_UNQUOTED(HAVE_LIB${cf_have_include}) + TEST_DEPS="${LIB_DIR}/${LIB_PREFIX}${cf_dir}${DFT_DEP_SUFFIX} $TEST_DEPS" - TEST_ARGS="-l${cf_dir}${DFT_ARG_SUFFIX} $TEST_ARGS" -+ TEST_ARGS="${LIB_PREFIX}${cf_dir}${DFT_DEP_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 - echo "$ac_t""$cf_cv_src_modules" 1>&6 --TEST_ARGS="-L${LIB_DIR} -L\$(libdir) $TEST_ARGS" -- - -- --PROG_ARGS="-L${LIB_DIR} -L\$(libdir) $PROG_ARGS" -+# Put $(libdir) last so we ensure programs are linked against newly-built -+# versions of libraries. -+# -+TEST_ARGS="$TEST_ARGS -L\$(libdir)" -+PROG_ARGS="$PROG_ARGS -L\$(libdir)" - - - SRC_SUBDIRS="man include" -@@ -7048,7 +7052,7 @@ - - - case $cf_item in -- normal) cf_suffix='.a' ;; -+ normal) cf_suffix='.la' ;; - debug) cf_suffix='_g.a' ;; - profile) cf_suffix='_p.a' ;; - shared) -@@ -7098,7 +7102,7 @@ - - - case $cf_item in -- normal) cf_suffix='.a' ;; -+ normal) cf_suffix='.la' ;; - debug) cf_suffix='_g.a' ;; - profile) cf_suffix='_p.a' ;; - shared) -@@ -7296,7 +7300,7 @@ - for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"` - do - echo " @ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f `basename $i`) ; ../headers.sh \$(INSTALL_DATA) \$(INSTALL_PREFIX)\$(includedir) \$(srcdir) $i" >>$cf_dir/Makefile -- test $i = curses.h && echo " @ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f ncurses.h && \$(LN_S) curses.h ncurses.h)" >>$cf_dir/Makefile -+ test $i = curses.h && echo " @ (cd \$(INSTALL_PREFIX)\$(includedir) && rm -f ncurses.h && mv -f curses.h ncurses.h)" >>$cf_dir/Makefile - done - - cat >>$cf_dir/Makefile <<CF_EOF diff --git a/devel/ncurses/patches/patch-ac b/devel/ncurses/patches/patch-ac index d302489e04b..74f5de3acb6 100644 --- a/devel/ncurses/patches/patch-ac +++ b/devel/ncurses/patches/patch-ac @@ -1,13 +1,104 @@ -$NetBSD: patch-ac,v 1.4 2000/01/15 18:39:30 jlam Exp $ +$NetBSD: patch-ac,v 1.5 2000/10/12 14:56:45 jlam Exp $ ---- man/Makefile.in.orig Wed Feb 11 07:13:49 1998 -+++ man/Makefile.in Sat Jan 15 11:24:46 2000 -@@ -63,7 +63,7 @@ - # We compose terminfo.5 from the real sources... - CAPLIST=$(srcdir)/../include/Caps - terminfo.5: $(srcdir)/terminfo.head $(CAPLIST) $(srcdir)/terminfo.tail Makefile $(srcdir)/MKterminfo.sh -- sh $(srcdir)/MKterminfo.sh $(srcdir)/terminfo.head $(CAPLIST) $(srcdir)/terminfo.tail >terminfo.5 -+ sh $(srcdir)/MKterminfo.sh $(srcdir)/terminfo.head $(CAPLIST) $(srcdir)/terminfo.tail | tbl >terminfo.5 - - mostlyclean : +--- c++/Makefile.in.orig Thu Oct 12 04:52:50 2000 ++++ c++/Makefile.in +@@ -48,6 +48,8 @@ + libdir = @libdir@ + includedir = @includedir@ + ++LIBTOOL = @LIBTOOL@ ++ + INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + +@@ -64,6 +66,7 @@ + + CCFLAGS = $(CPPFLAGS) $(CXXFLAGS) + ++CFLAGS_LIBTOOL = $(CCFLAGS) + CFLAGS_NORMAL = $(CCFLAGS) + CFLAGS_DEBUG = $(CCFLAGS) @CXX_G_OPT@ -DTRACE + CFLAGS_PROFILE = $(CCFLAGS) -pg +@@ -71,25 +74,37 @@ + + CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) + ++NCURSES_MAJOR = @NCURSES_MAJOR@ ++NCURSES_MINOR = @NCURSES_MINOR@ + REL_VERSION = @cf_cv_rel_version@ + ABI_VERSION = @cf_cv_abi_version@ + +-LINK = @LINK_PROGS@ $(CXX) @CXXLDFLAGS@ ++LINK = @LINK_PROGS@ $(LIBTOOL) $(CXX) @CXXLDFLAGS@ ++ ++LIBROOT = ncurses++ ++LIBNAME = @LIB_PREFIX@$(LIBROOT)@DFT_DEP_SUFFIX@ ++ ++LIBNAME_LIBTOOL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.la ++LIBNAME_NORMAL = @LIB_PREFIX@$(LIBROOT)@LIB_SUFFIX@.a + +-LIBROOT = ncurses++@LIB_SUFFIX@ +-LIBNAME = @LIB_PREFIX@$(LIBROOT).a ++LINK_FLAGS = @EXTRA_LDFLAGS@ -L../lib -L$(libdir) -l$(LIBROOT) + +-LDFLAGS = @EXTRA_LDFLAGS@ -L../lib -L$(libdir) \ +- -l$(LIBROOT) \ +- @TEST_ARGS@ @LDFLAGS@ \ ++LINK_LIBTOOL = @EXTRA_LDFLAGS@ -L../lib -L$(libdir) ../lib/$(LIBNAME) ++LINK_NORMAL = $(LINK_FLAGS) ++LINK_DEBUG = $(LINK_FLAGS) ++LINK_PROFILE = $(LINK_FLAGS) ++LINK_SHARED = $(LINK_FLAGS) ++ ++LDFLAGS = @TEST_ARGS@ @LDFLAGS@ \ + @LD_MODEL@ @LIBS@ @EXTRA_LIBS@ @LOCAL_LDFLAGS@ $(CXXLIBS) + ++LDFLAGS_LIBTOOL = $(LDFLAGS) + LDFLAGS_NORMAL = $(LDFLAGS) + LDFLAGS_DEBUG = $(LDFLAGS) @CC_G_OPT@ + LDFLAGS_PROFILE = $(LDFLAGS) -pg + LDFLAGS_SHARED = $(LDFLAGS) @LD_SHARED_OPTS@ + +-LDFLAGS_DEFAULT = $(LDFLAGS_@DFT_UPR_MODEL@) ++LDFLAGS_DEFAULT = $(LINK_@DFT_UPR_MODEL@) $(LDFLAGS_@DFT_UPR_MODEL@) + + AUTO_SRC = \ + etip.h +@@ -114,10 +129,15 @@ + $(MODEL)/cursesapp.o \ + $(MODEL)/cursesmain.o + +-../lib/$(LIBNAME) : $(LIB_OBJS) ++../lib/$(LIBNAME_NORMAL) : $(LIB_OBJS) + $(AR) $(AR_OPTS) $@ $? + $(RANLIB) $@ + ++../lib/$(LIBNAME_LIBTOOL) : $(LIB_OBJS) ++ cd ../lib && $(LIBTOOL) $(CXX) -o $(LIBNAME) $(LIB_OBJS:.o=.lo) \ ++ -rpath $(INSTALL_PREFIX)$(libdir) \ ++ -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR) ++ + OBJS_DEMO = $(MODEL)/demo.o + + $(MODEL)/demo.o : $(srcdir)/demo.cc \ +@@ -137,17 +157,17 @@ + + install \ + install.libs:: ../lib/$(LIBNAME) $(DESTDIR)$(libdir) +- $(INSTALL) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME) ++ $(LIBTOOL) $(INSTALL) ../lib/$(LIBNAME) $(DESTDIR)$(libdir)/$(LIBNAME) + + uninstall \ + uninstall.libs:: +- -rm -f $(DESTDIR)$(libdir)/$(LIBNAME) ++ -$(LIBTOOL) rm -f $(DESTDIR)$(libdir)/$(LIBNAME) + + mostlyclean :: -rm -f core tags TAGS *~ *.ln *.atac trace + + clean :: mostlyclean +- -rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(OBJS_DEMO) ++ -$(LIBTOOL) rm -f demo$x $(AUTO_SRC) ../lib/$(LIBNAME) $(LIB_OBJS) $(LIB_OBJS:.o=.lo) $(OBJS_DEMO) + + distclean :: clean + -rm -f Makefile diff --git a/devel/ncurses/patches/patch-ad b/devel/ncurses/patches/patch-ad index 17ca8dfeb0d..49f92789a66 100644 --- a/devel/ncurses/patches/patch-ad +++ b/devel/ncurses/patches/patch-ad @@ -1,12 +1,78 @@ -$NetBSD: patch-ad,v 1.3 2000/01/15 18:39:30 jlam Exp $ +$NetBSD: patch-ad,v 1.4 2000/10/12 14:56:45 jlam Exp $ ---- misc/run_tic.sh.orig Sat May 30 20:29:34 1998 -+++ misc/run_tic.sh Sat Jan 15 11:24:46 2000 -@@ -130,6 +130,7 @@ - # to find terminfo under /usr/lib. That is, we'll _try_ to do that. Not - # all systems support symbolic links, and those that do provide a variety - # of options for 'test'. -+exit 0 # don't do this - if test "$TICDIR" != "$TERMINFO" ; then - ( rm -f $TICDIR 2>/dev/null ) - if ( cd $TICDIR 2>/dev/null ) +--- configure.in.orig Thu Oct 12 04:52:53 2000 ++++ configure.in +@@ -162,6 +162,13 @@ + [cf_with_progs=yes]) + AC_MSG_RESULT($cf_with_progs) + ++AC_MSG_CHECKING(if you wish to install curses.h) ++AC_ARG_WITH(curses-h, ++ [ --without-curses-h install curses.h as ncurses.h only], ++ [with_curses_h=$withval], ++ [with_curses_h=yes]) ++AC_MSG_RESULT($with_curses_h) ++ + modules_to_build="ncurses" + if test "X$cf_with_progs" != Xno ; then + modules_to_build="$modules_to_build progs tack" +@@ -212,6 +219,20 @@ + cf_list_models="" + AC_SUBST(cf_list_models)dnl the complete list of models ("normal debug") + ++AC_MSG_CHECKING(if you want to build libraries with libtool) ++AC_ARG_WITH(libtool, ++ [ --with-libtool generate libraries with libtool], ++ [with_libtool=$withval], ++ [with_libtool=no]) ++AC_MSG_RESULT($with_libtool) ++if test "$with_libtool" = "yes"; then ++ cf_list_models="$cf_list_models libtool" ++ test -z "$LIBTOOL" && LIBTOOL=libtool ++else ++ LIBTOOL="" ++fi ++AC_SUBST(LIBTOOL) ++ + AC_MSG_CHECKING(if you want to build shared libraries) + AC_ARG_WITH(shared, + [ --with-shared generate shared-libraries], +@@ -248,6 +269,9 @@ + + AC_MSG_CHECKING(for specified models) + test -z "$cf_list_models" && cf_list_models=normal ++dnl If we use libtool to generate libraries, then it must be the only ++dnl specified model. ++test "$with_libtool" = "yes" && cf_list_models=libtool + AC_MSG_RESULT($cf_list_models) + + ### Use the first model as the default, and save its suffix for use in building +@@ -337,6 +361,7 @@ + + AC_MSG_CHECKING(for default loader flags) + case $DFT_LWR_MODEL in ++libtool) LD_MODEL='' ;; + normal) LD_MODEL='' ;; + debug) LD_MODEL=$CC_G_OPT ;; + profile) LD_MODEL='-pg';; +@@ -1075,7 +1100,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" +@@ -1116,6 +1145,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" diff --git a/devel/ncurses/patches/patch-ae b/devel/ncurses/patches/patch-ae index 7e08eaec24e..ca3c8d65637 100644 --- a/devel/ncurses/patches/patch-ae +++ b/devel/ncurses/patches/patch-ae @@ -1,64 +1,319 @@ -$NetBSD: patch-ae,v 1.2 2000/01/15 18:39:30 jlam Exp $ +$NetBSD: patch-ae,v 1.3 2000/10/12 14:56:45 jlam Exp $ ---- mk-1st.awk.orig Sat May 9 17:54:02 1998 -+++ mk-1st.awk Sat Jan 15 11:24:46 2000 -@@ -208,10 +208,16 @@ - } - else - { -+ if ( $2 == "c++" ) { -+ cplusplus="--cplusplus" -+ compile="CXX" -+ } else { -+ cplusplus="" -+ compile="CC" -+ } - end_name = lib_name; - printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS -- printf "\t$(AR) $(AR_OPTS) $@ $?\n" -- printf "\t$(RANLIB) $@\n" -+ printf "\tcd ../lib && $(LIBTOOL) %s $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(INSTALL_PREFIX)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR)\n", cplusplus, compile, lib_name, OBJS - if ( target == "vxworks" ) - { - printf "\t$(LD) $(LD_OPTS) $? -o $(@:.a=.o)\n" -@@ -220,15 +226,8 @@ - print "install \\" - print "install.libs \\" - printf "install.%s :: $(INSTALL_PREFIX)$(libdir) ../lib/%s\n", name, lib_name -- printf "\t@echo installing ../lib/%s as $(INSTALL_PREFIX)$(libdir)/%s \n", lib_name, lib_name -- printf "\t$(INSTALL_DATA) ../lib/%s $(INSTALL_PREFIX)$(libdir)/%s \n", lib_name, lib_name -- if ( overwrite == "yes" && lib_name == "libncurses.a" ) -- { -- printf "\t@echo linking libcurses.a to libncurses.a \n" -- printf "\t-@rm -f $(INSTALL_PREFIX)$(libdir)/libcurses.a \n" -- printf "\t(cd $(INSTALL_PREFIX)$(libdir) && $(LN_S) libncurses.a libcurses.a)\n" -- } -- printf "\t$(RANLIB) $(INSTALL_PREFIX)$(libdir)/%s\n", lib_name -+ printf "\t@echo installing ../lib/%s in $(INSTALL_PREFIX)$(libdir)\n", lib_name -+ printf "\tcd ../lib && $(LIBTOOL) %s $(INSTALL_DATA) %s $(INSTALL_PREFIX)$(libdir)\n", cplusplus, lib_name - if ( target == "vxworks" ) - { - printf "\t@echo installing ../lib/lib%s.o as $(INSTALL_PREFIX)$(libdir)/lib%s.o\n", name, name -@@ -239,12 +238,7 @@ - print "uninstall.libs \\" - printf "uninstall.%s ::\n", name - printf "\t@echo uninstalling $(INSTALL_PREFIX)$(libdir)/%s \n", lib_name -- printf "\t-@rm -f $(INSTALL_PREFIX)$(libdir)/%s\n", lib_name -- if ( overwrite == "yes" && lib_name == "libncurses.a" ) -- { -- printf "\t@echo linking libcurses.a to libncurses.a \n" -- printf "\t-@rm -f $(INSTALL_PREFIX)$(libdir)/libcurses.a \n" -- } -+ printf "\t-@$(LIBTOOL) rm -f $(INSTALL_PREFIX)$(libdir)/%s\n", lib_name - if ( target == "vxworks" ) - { - printf "\t@echo uninstalling $(INSTALL_PREFIX)$(libdir)/lib%s.o\n", name -@@ -253,7 +247,7 @@ - } - print "" - print "clean ::" -- printf "\t-rm -f ../lib/%s\n", lib_name -+ printf "\t-cd ../lib && $(LIBTOOL) rm -f %s\n", lib_name - print "" - print "mostlyclean::" - printf "\t-rm -f $(%s_OBJS)\n", OBJS +--- 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 <<EOF + Extensions: +@@ -1605,6 +1608,19 @@ + + echo "$ac_t""$cf_with_progs" 1>&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 <<CF_EOF ++ tbl \$TMP >\$TMP.out ++ mv \$TMP.out \$TMP ++CF_EOF ++fi ++if test $with_curses_h != yes ; then ++cat >>man/edit_man.sh <<CF_EOF ++ sed -e "/\#[ ]*include/s,curses.h,ncurses.h," < \$TMP >\$TMP.out ++ mv \$TMP.out \$TMP ++CF_EOF ++fi + if test $cf_format = yes ; then + cat >>man/edit_man.sh <<CF_EOF + nroff -man \$TMP >\$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 <<CF_EOF + case \$DST in + /*/include/*) +- TMPSRC=\${TMPDIR-/tmp}/\`basename \$SRC\`\$\$ +- TMPSED=\${TMPDIR-/tmp}/headers.sed\$\$ + END=\`basename \$DST\` + for i in \`cat \$REF/../*/headers |fgrep -v "#"\` + do + NAME=\`basename \$i\` + echo "s/<\$NAME>/<\$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 <<CF_EOF ++case \$DST in ++/*/include/*) ++ END=\`basename \$DST\` ++ for i in \`cat \$REF/../*/headers |fgrep -v "#"\` ++ do ++ NAME=\`basename \$i\` ++ if test "\$NAME" = "curses.h" ++ then ++ echo "s/<curses.h>/<ncurses.h>/" >> \$TMPSED ++ NAME=ncurses.h ++ fi ++ echo "s/<\$NAME>/<\$END\/\$NAME>/" >> \$TMPSED ++ done ++ ;; ++*) ++ echo "s/<curses.h>/<ncurses.h>/" >> \$TMPSED ++ ;; ++esac ++CF_EOF ++fi ++cat >>headers.sh <<CF_EOF ++rm -f \$TMPSRC ++sed -f \$TMPSED \$SRC > \$TMPSRC ++NAME=\`basename \$SRC\` ++CF_EOF ++if test $WITH_CURSES_H != yes; then ++ cat >>headers.sh <<CF_EOF ++test "\$NAME" = "curses.h" && NAME=ncurses.h ++CF_EOF ++fi ++cat >>headers.sh <<CF_EOF ++eval \$PRG \$TMPSRC \$DST/\$NAME ++rm -f \$TMPSRC \$TMPSED ++CF_EOF + + chmod 0755 headers.sh + +@@ -7902,7 +8025,7 @@ + for i in `cat $srcdir/$cf_dir/headers |fgrep -v "#"` + do + echo " @ (cd \$(DESTDIR)\$(includedir) && rm -f `basename $i`) ; ../headers.sh \$(INSTALL_DATA) \$(DESTDIR)\$(includedir) \$(srcdir) $i" >>$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 <<CF_EOF diff --git a/devel/ncurses/patches/patch-af b/devel/ncurses/patches/patch-af index 9e45b688ac7..c3b5e99b272 100644 --- a/devel/ncurses/patches/patch-af +++ b/devel/ncurses/patches/patch-af @@ -1,16 +1,39 @@ -$NetBSD: patch-af,v 1.3 2000/01/15 18:39:31 jlam Exp $ +$NetBSD: patch-af,v 1.4 2000/10/12 14:56:45 jlam Exp $ ---- 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 +--- 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) + LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ + + SHLIB_DIRS = -L../lib -L$(libdir) +@@ -87,6 +90,8 @@ + + MK_SHARED_LIB = @MK_SHARED_LIB@ + ++NCURSES_MAJOR = @NCURSES_MAJOR@ ++NCURSES_MINOR = @NCURSES_MINOR@ + REL_VERSION = @cf_cv_rel_version@ + ABI_VERSION = @cf_cv_abi_version@ + diff --git a/devel/ncurses/patches/patch-ag b/devel/ncurses/patches/patch-ag index 5906493e2e7..5c36d5eed68 100644 --- a/devel/ncurses/patches/patch-ag +++ b/devel/ncurses/patches/patch-ag @@ -1,52 +1,40 @@ -$NetBSD: patch-ag,v 1.2 2000/01/15 18:39:31 jlam Exp $ +$NetBSD: patch-ag,v 1.3 2000/10/12 14:56:46 jlam Exp $ ---- progs/Makefile.in.orig Sat May 30 20:07:33 1998 -+++ progs/Makefile.in Sat Jan 15 11:24:46 2000 -@@ -102,7 +102,7 @@ - AUTO_SRC = \ - termsort.c - --PROGS = tic$x toe$x infocmp$x clear$x tput$x tset$x -+PROGS = tic$x toe$x infocmp$x - - TESTPROGS = mvcur$x tctest$x hardscroll$x hashmap$x - -@@ -122,32 +122,22 @@ - uninstall.libs: - - install.progs: $(PROGS) $(INSTALL_PREFIX)$(bindir) -- $(INSTALL_PROGRAM) tic$x $(INSTALL_PREFIX)$(bindir)/tic$x -- $(INSTALL_PROGRAM) toe$x $(INSTALL_PREFIX)$(bindir)/toe$x -- $(INSTALL_PROGRAM) infocmp$x $(INSTALL_PREFIX)$(bindir)/infocmp$x -- $(INSTALL_PROGRAM) clear$x $(INSTALL_PREFIX)$(bindir)/clear$x -- $(INSTALL_PROGRAM) tput$x $(INSTALL_PREFIX)$(bindir)/tput$x -- $(INSTALL_PROGRAM) tset$x $(INSTALL_PREFIX)$(bindir)/tset$x -+ $(LIBTOOL) $(INSTALL_PROGRAM) tic$x $(INSTALL_PREFIX)$(bindir)/tic$x -+ $(LIBTOOL) $(INSTALL_PROGRAM) toe$x $(INSTALL_PREFIX)$(bindir)/toe$x -+ $(LIBTOOL) $(INSTALL_PROGRAM) infocmp$x $(INSTALL_PREFIX)$(bindir)/infocmp$x - @echo "linking captoinfo to tic" - -@rm -f $(INSTALL_PREFIX)$(bindir)/captoinfo$x - (cd $(INSTALL_PREFIX)$(bindir) && $(LN_S) tic$x captoinfo$x) - @echo "linking infotocap to tic" - -@rm -f $(INSTALL_PREFIX)$(bindir)/infotocap$x - (cd $(INSTALL_PREFIX)$(bindir) && $(LN_S) tic$x infotocap$x) -- @echo "linking reset to tset" -- -@rm -f $(INSTALL_PREFIX)$(bindir)/reset$x -- (cd $(INSTALL_PREFIX)$(bindir) && $(LN_S) tset$x reset$x) - - uninstall.progs: -- -@rm -f $(INSTALL_PREFIX)$(bindir)/tic$x -- -@rm -f $(INSTALL_PREFIX)$(bindir)/toe$x -- -@rm -f $(INSTALL_PREFIX)$(bindir)/infocmp$x -- -@rm -f $(INSTALL_PREFIX)$(bindir)/clear$x -- -@rm -f $(INSTALL_PREFIX)$(bindir)/tput$x -- -@rm -f $(INSTALL_PREFIX)$(bindir)/tset$x -+ -@$(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/tic$x -+ -@$(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/toe$x -+ -@$(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/infocmp$x - -@rm -f $(INSTALL_PREFIX)$(bindir)/captoinfo$x - -@rm -f $(INSTALL_PREFIX)$(bindir)/infotocap$x -- -@rm -f $(INSTALL_PREFIX)$(bindir)/reset$x - - $(INSTALL_PREFIX)$(bindir) : - $(srcdir)/../mkinstalldirs $@ +--- menu/Makefile.in.orig Thu Oct 12 04:52:55 2000 ++++ menu/Makefile.in +@@ -53,6 +53,8 @@ + libdir = @libdir@ + includedir = @includedir@ + ++LIBTOOL = @LIBTOOL@ ++ + INSTALL = @INSTALL@ + INSTALL_LIB = @INSTALL@ @INSTALL_LIB@ + INSTALL_DATA = @INSTALL_DATA@ +@@ -72,15 +74,15 @@ + + CCFLAGS = $(CPPFLAGS) $(CFLAGS) + ++CFLAGS_LIBTOOL = $(CCFLAGS) + CFLAGS_NORMAL = $(CCFLAGS) + CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE + CFLAGS_PROFILE = $(CCFLAGS) -pg +- + CFLAGS_SHARED = $(CCFLAGS) @CC_SHARED_OPTS@ + + CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) + +-LINK = $(CC) ++LINK = $(LIBTOOL) $(CC) + LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ + + SHLIB_DIRS = -L../lib -L$(libdir) +@@ -88,6 +90,8 @@ + + MK_SHARED_LIB = @MK_SHARED_LIB@ + ++NCURSES_MAJOR = @NCURSES_MAJOR@ ++NCURSES_MINOR = @NCURSES_MINOR@ + REL_VERSION = @cf_cv_rel_version@ + ABI_VERSION = @cf_cv_abi_version@ + diff --git a/devel/ncurses/patches/patch-ah b/devel/ncurses/patches/patch-ah index 59e1ee18b48..f25036fe7fd 100644 --- a/devel/ncurses/patches/patch-ah +++ b/devel/ncurses/patches/patch-ah @@ -1,42 +1,14 @@ -$NetBSD: patch-ah,v 1.2 2000/01/15 18:39:31 jlam Exp $ +$NetBSD: patch-ah,v 1.3 2000/10/12 14:56:46 jlam Exp $ ---- tack/Makefile.in.orig Sat Sep 18 19:33:48 1999 -+++ tack/Makefile.in Sat Jan 15 11:25:18 2000 -@@ -26,11 +26,13 @@ - libdir = @libdir@ - includedir = @includedir@ - datadir = @datadir@ -+mandir = @mandir@ - - ticdir = $(datadir)/terminfo - - INSTALL = @INSTALL@ - INSTALL_PROGRAM = @INSTALL_PROGRAM@ -+INSTALL_DATA = @INSTALL_DATA@ - - AWK = @AWK@ - LN_S = @LN_S@ -@@ -51,7 +53,7 @@ - CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) - - LD = @LD@ --LINK = $(CC) -+LINK = @LINK_PROGS@ $(CC) - LDFLAGS = @EXTRA_LDFLAGS@ \ - @PROG_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ @EXTRA_LIBS@ - -@@ -84,10 +86,12 @@ - uninstall.libs: - - install.tack: $(PROGS) $(INSTALL_PREFIX)$(bindir) -- $(INSTALL_PROGRAM) tack$x $(INSTALL_PREFIX)$(bindir)/tack$x -+ $(LIBTOOL) $(INSTALL_PROGRAM) tack$x $(INSTALL_PREFIX)$(bindir)/tack$x -+ $(INSTALL_DATA) tack.1 $(INSTALL_PREFIX)$(mandir)/man1/tack.1 - - uninstall.tack: -- -@rm -f $(INSTALL_PREFIX)$(bindir)/tack$x -+ -@$(LIBTOOL) rm -f $(INSTALL_PREFIX)$(bindir)/tack$x -+ -@rm -f $(INSTALL_PREFIX)$(mandir)/man1/tack.1 - - $(INSTALL_PREFIX)$(bindir) : - $(srcdir)/../mkinstalldirs $@ +--- misc/run_tic.in.orig Mon Oct 9 18:57:35 2000 ++++ misc/run_tic.in +@@ -113,6 +113,9 @@ + exit 1 + fi + ++# For NetBSD pkgsrc, don't bother with setting a symbolic link. ++exit 0 ++ + # Make a symbolic link to provide compatibility with applications that expect + # to find terminfo under /usr/lib. That is, we'll _try_ to do that. Not + # all systems support symbolic links, and those that do provide a variety diff --git a/devel/ncurses/patches/patch-ai b/devel/ncurses/patches/patch-ai new file mode 100644 index 00000000000..f55dd142780 --- /dev/null +++ b/devel/ncurses/patches/patch-ai @@ -0,0 +1,58 @@ +$NetBSD: patch-ai,v 1.3 2000/10/12 14:56:46 jlam Exp $ + +--- mk-1st.awk.orig Thu Oct 12 04:52:56 2000 ++++ mk-1st.awk +@@ -215,6 +215,29 @@ + printf "\t-@rm -f so_locations\n" + } + } ++ else if ( MODEL == "LIBTOOL" ) ++ { ++ if ( $2 == "c++" ) { ++ compile="CXX" ++ } else { ++ compile="CC" ++ } ++ end_name = lib_name; ++ printf "../lib/%s : $(%s_OBJS)\n", lib_name, OBJS ++ printf "\tcd ../lib && $(LIBTOOL) $(%s) -o %s $(%s_OBJS:.o=.lo) -rpath $(DESTDIR)$(libdir) -version-info $(NCURSES_MAJOR):$(NCURSES_MINOR)\n", compile, lib_name, OBJS ++ print "" ++ print "install \\" ++ print "install.libs \\" ++ printf "install.%s :: $(DESTDIR)$(libdir) ../lib/%s\n", name, lib_name ++ printf "\t@echo installing ../lib/%s as $(DESTDIR)$(libdir)/%s\n", lib_name, lib_name ++ printf "\tcd ../lib; $(LIBTOOL) $(INSTALL_DATA) %s $(DESTDIR)$(libdir)\n", lib_name ++ print "" ++ print "uninstall \\" ++ print "uninstall.libs \\" ++ printf "uninstall.%s ::\n", name ++ printf "\t@echo uninstalling $(DESTDIR)$(libdir)/%s\n", lib_name ++ printf "\t-@$(LIBTOOL) rm -f $(DESTDIR)$(libdir)/%s\n", lib_name ++ } + else + { + end_name = lib_name; +@@ -266,14 +289,23 @@ + print "" + print "mostlyclean::" + printf "\t-rm -f $(%s_OBJS)\n", OBJS ++ if ( MODEL == "LIBTOOL" ) { ++ printf "\t-rm -f $(%s_OBJS:.o=.lo)\n", OBJS ++ } + } + else if ( found == 2 ) + { + print "" + print "mostlyclean::" + printf "\t-rm -f $(%s_OBJS)\n", OBJS ++ if ( MODEL == "LIBTOOL" ) { ++ printf "\t-rm -f $(%s_OBJS:.o=.lo)\n", OBJS ++ } + print "" + print "clean ::" + printf "\t-rm -f $(%s_OBJS)\n", OBJS ++ if ( MODEL == "LIBTOOL" ) { ++ printf "\t-rm -f $(%s_OBJS:.o=.lo)\n", OBJS ++ } + } + } diff --git a/devel/ncurses/patches/patch-aj b/devel/ncurses/patches/patch-aj new file mode 100644 index 00000000000..31b39f86364 --- /dev/null +++ b/devel/ncurses/patches/patch-aj @@ -0,0 +1,16 @@ +$NetBSD: patch-aj,v 1.3 2000/10/12 14:56:46 jlam Exp $ + +--- mk-2nd.awk.orig Sat Apr 1 15:50:36 2000 ++++ mk-2nd.awk +@@ -100,9 +100,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 diff --git a/devel/ncurses/patches/patch-ak b/devel/ncurses/patches/patch-ak new file mode 100644 index 00000000000..c314d725fe4 --- /dev/null +++ b/devel/ncurses/patches/patch-ak @@ -0,0 +1,39 @@ +$NetBSD: patch-ak,v 1.3 2000/10/12 14:56:47 jlam Exp $ + +--- ncurses/Makefile.in.orig Thu Oct 12 04:52:56 2000 ++++ ncurses/Makefile.in +@@ -62,6 +62,8 @@ + includedir = @includedir@ + datadir = @datadir@ + ++LIBTOOL = @LIBTOOL@ ++ + INSTALL = @INSTALL@ + INSTALL_LIB = @INSTALL@ @INSTALL_LIB@ + INSTALL_DATA = @INSTALL_DATA@ +@@ -86,6 +88,7 @@ + HOSTCCFLAGS = @CFLAGS@ $(CPPFLAGS) + HOSTLDFLAGS = @LDFLAGS@ @LIBS@ + ++CFLAGS_LIBTOOL = $(CCFLAGS) + CFLAGS_NORMAL = $(CCFLAGS) + CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE + CFLAGS_PROFILE = $(CCFLAGS) -pg +@@ -93,7 +96,7 @@ + + CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) + +-LINK = $(CC) ++LINK = $(LIBTOOL) $(CC) + LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ + + SHLIB_DIRS = -L../lib -L$(libdir) +@@ -102,6 +105,8 @@ + + MK_SHARED_LIB = @MK_SHARED_LIB@ + ++NCURSES_MAJOR = @NCURSES_MAJOR@ ++NCURSES_MINOR = @NCURSES_MINOR@ + REL_VERSION = @cf_cv_rel_version@ + ABI_VERSION = @cf_cv_abi_version@ + diff --git a/devel/ncurses/patches/patch-al b/devel/ncurses/patches/patch-al new file mode 100644 index 00000000000..5d9783846fe --- /dev/null +++ b/devel/ncurses/patches/patch-al @@ -0,0 +1,39 @@ +$NetBSD: patch-al,v 1.3 2000/10/12 14:56:47 jlam Exp $ + +--- panel/Makefile.in.orig Thu Oct 12 04:52:58 2000 ++++ panel/Makefile.in +@@ -54,6 +54,8 @@ + includedir = @includedir@ + datadir = @datadir@ + ++LIBTOOL = @LIBTOOL@ ++ + INSTALL = @INSTALL@ + INSTALL_LIB = @INSTALL@ @INSTALL_LIB@ + INSTALL_DATA = @INSTALL_DATA@ +@@ -73,6 +75,7 @@ + + CCFLAGS = $(CPPFLAGS) $(CFLAGS) + ++CFLAGS_LIBTOOL = $(CCFLAGS) + CFLAGS_NORMAL = $(CCFLAGS) + CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE + CFLAGS_PROFILE = $(CCFLAGS) -pg +@@ -80,7 +83,7 @@ + + CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) + +-LINK = $(CC) ++LINK = $(LIBTOOL) $(CC) + LDFLAGS = @LDFLAGS@ @LD_MODEL@ @LIBS@ + + SHLIB_DIRS = -L../lib -L$(libdir) +@@ -88,6 +91,8 @@ + + MK_SHARED_LIB = @MK_SHARED_LIB@ + ++NCURSES_MAJOR = @NCURSES_MAJOR@ ++NCURSES_MINOR = @NCURSES_MINOR@ + REL_VERSION = @cf_cv_rel_version@ + ABI_VERSION = @cf_cv_abi_version@ + diff --git a/devel/ncurses/patches/patch-am b/devel/ncurses/patches/patch-am new file mode 100644 index 00000000000..af2908bf4ab --- /dev/null +++ b/devel/ncurses/patches/patch-am @@ -0,0 +1,91 @@ +$NetBSD: patch-am,v 1.3 2000/10/12 14:56:47 jlam Exp $ + +--- progs/Makefile.in.orig Thu Oct 12 04:52:58 2000 ++++ progs/Makefile.in +@@ -59,6 +59,8 @@ + includedir = @includedir@ + datadir = @datadir@ + ++LIBTOOL = @LIBTOOL@ ++ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + transform = @program_transform_name@ +@@ -76,6 +78,7 @@ + + CCFLAGS = $(CPPFLAGS) $(CFLAGS) + ++CFLAGS_LIBTOOL = $(CCFLAGS) + CFLAGS_NORMAL = $(CCFLAGS) + CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE + CFLAGS_PROFILE = $(CCFLAGS) -pg +@@ -84,10 +87,11 @@ + CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) + + LD = @LD@ +-LINK = @LINK_PROGS@ $(CC) ++LINK = @LINK_PROGS@ $(LIBTOOL) $(CC) + LDFLAGS = @EXTRA_LDFLAGS@ \ + @PROG_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ @EXTRA_LIBS@ + ++LDFLAGS_LIBTOOL = $(LDFLAGS) + LDFLAGS_NORMAL = $(LDFLAGS) + LDFLAGS_DEBUG = $(LDFLAGS) @CC_G_OPT@ + LDFLAGS_PROFILE = $(LDFLAGS) -pg +@@ -103,7 +107,7 @@ + termsort.c \ + transform.h + +-PROGS = tic$x toe$x infocmp$x clear$x tput$x tset$x ++PROGS = tic$x toe$x infocmp$x # clear$x tput$x tset$x + + TESTPROGS = mvcur$x tctest$x hardscroll$x hashmap$x + +@@ -143,12 +147,12 @@ + echo "#define PROG_INIT \"$(actual_init)\"" >>$@ + + install.progs: $(AUTO_SRC) $(PROGS) $(DESTDIR)$(bindir) +- $(INSTALL_PROGRAM) tic$x $(DESTDIR)$(bindir)/$(actual_tic) +- $(INSTALL_PROGRAM) toe$x $(DESTDIR)$(bindir)/$(actual_toe) +- $(INSTALL_PROGRAM) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp) +- $(INSTALL_PROGRAM) clear$x $(DESTDIR)$(bindir)/$(actual_clear) +- $(INSTALL_PROGRAM) tput$x $(DESTDIR)$(bindir)/$(actual_tput) +- $(INSTALL_PROGRAM) tset$x $(DESTDIR)$(bindir)/$(actual_tset) ++ $(LIBTOOL) $(INSTALL_PROGRAM) tic$x $(DESTDIR)$(bindir)/$(actual_tic) ++ $(LIBTOOL) $(INSTALL_PROGRAM) toe$x $(DESTDIR)$(bindir)/$(actual_toe) ++ $(LIBTOOL) $(INSTALL_PROGRAM) infocmp$x $(DESTDIR)$(bindir)/$(actual_infocmp) ++# $(LIBTOOL) $(INSTALL_PROGRAM) clear$x $(DESTDIR)$(bindir)/$(actual_clear) ++# $(LIBTOOL) $(INSTALL_PROGRAM) tput$x $(DESTDIR)$(bindir)/$(actual_tput) ++# $(LIBTOOL) $(INSTALL_PROGRAM) tset$x $(DESTDIR)$(bindir)/$(actual_tset) + @echo "linking $(actual_captoinfo) to $(actual_tic)" + -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo) + (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_captoinfo)) +@@ -156,19 +160,19 @@ + -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap) + (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tic) $(actual_infotocap)) + @echo "linking $(actual_reset) to $(actual_tset)" +- -@rm -f $(DESTDIR)$(bindir)/$(actual_reset) +- (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset)) ++# -@rm -f $(DESTDIR)$(bindir)/$(actual_reset) ++# (cd $(DESTDIR)$(bindir) && $(LN_S) $(actual_tset) $(actual_reset)) + + uninstall.progs: +- -@rm -f $(DESTDIR)$(bindir)/$(actual_tic) +- -@rm -f $(DESTDIR)$(bindir)/$(actual_toe) +- -@rm -f $(DESTDIR)$(bindir)/$(actual_infocmp) +- -@rm -f $(DESTDIR)$(bindir)/$(actual_clear) +- -@rm -f $(DESTDIR)$(bindir)/$(actual_tput) +- -@rm -f $(DESTDIR)$(bindir)/$(actual_tset) ++ -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_tic) ++ -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_toe) ++ -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_infocmp) ++# -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_clear) ++# -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_tput) ++# -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/$(actual_tset) + -@rm -f $(DESTDIR)$(bindir)/$(actual_captoinfo) + -@rm -f $(DESTDIR)$(bindir)/$(actual_infotocap) +- -@rm -f $(DESTDIR)$(bindir)/$(actual_reset) ++# -@rm -f $(DESTDIR)$(bindir)/$(actual_reset) + + $(DESTDIR)$(bindir) : + $(srcdir)/../mkinstalldirs $@ diff --git a/devel/ncurses/patches/patch-an b/devel/ncurses/patches/patch-an new file mode 100644 index 00000000000..0e0f5e4490b --- /dev/null +++ b/devel/ncurses/patches/patch-an @@ -0,0 +1,48 @@ +$NetBSD: patch-an,v 1.1 2000/10/12 14:56:48 jlam Exp $ + +--- tack/Makefile.in.orig Thu Oct 12 04:52:59 2000 ++++ tack/Makefile.in +@@ -28,6 +28,8 @@ + includedir = @includedir@ + datadir = @datadir@ + ++LIBTOOL = @LIBTOOL@ ++ + INSTALL = @INSTALL@ + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_DATA = @INSTALL_DATA@ +@@ -44,6 +46,7 @@ + + CCFLAGS = $(CPPFLAGS) $(CFLAGS) + ++CFLAGS_LIBTOOL = $(CCFLAGS) + CFLAGS_NORMAL = $(CCFLAGS) + CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE + CFLAGS_PROFILE = $(CCFLAGS) -pg +@@ -52,10 +55,11 @@ + CFLAGS_DEFAULT = $(CFLAGS_@DFT_UPR_MODEL@) + + LD = @LD@ +-LINK = @LINK_PROGS@ $(CC) ++LINK = @LINK_PROGS@ $(LIBTOOL) $(CC) + LDFLAGS = @EXTRA_LDFLAGS@ \ + @PROG_ARGS@ @LDFLAGS@ @LD_MODEL@ @LIBS@ @EXTRA_LIBS@ + ++LDFLAGS_LIBTOOL = $(LDFLAGS) + LDFLAGS_NORMAL = $(LDFLAGS) + LDFLAGS_DEBUG = $(LDFLAGS) @CC_G_OPT@ + LDFLAGS_PROFILE = $(LDFLAGS) -pg +@@ -88,11 +92,11 @@ + install.tack: $(PROGS) \ + $(DESTDIR)$(bindir) \ + $(DESTDIR)$(mandir) +- $(INSTALL_PROGRAM) tack$x $(DESTDIR)$(bindir)/tack$x ++ $(LIBTOOL) $(INSTALL_PROGRAM) tack$x $(DESTDIR)$(bindir)/tack$x + $(INSTALL_DATA) $(srcdir)/tack.1 $(DESTDIR)$(mandir)/tack.1 + + uninstall.tack: +- -@rm -f $(DESTDIR)$(bindir)/tack$x ++ -@$(LIBTOOL) rm -f $(DESTDIR)$(bindir)/tack$x + -@rm -f $(DESTDIR)$(mandir)/tack.1 + + $(DESTDIR)$(bindir) \ diff --git a/devel/ncurses/patches/patch-ao b/devel/ncurses/patches/patch-ao new file mode 100644 index 00000000000..d98b53dda75 --- /dev/null +++ b/devel/ncurses/patches/patch-ao @@ -0,0 +1,34 @@ +$NetBSD: patch-ao,v 1.1 2000/10/12 14:56:48 jlam Exp $ + +--- test/Makefile.in.orig Sat May 27 21:28:39 2000 ++++ test/Makefile.in +@@ -45,6 +45,8 @@ + libdir = @libdir@ + includedir = @includedir@ + ++LIBTOOL = @LIBTOOL@ ++ + CC = @CC@ + CPP = @CPP@ + +@@ -53,6 +55,7 @@ + + CCFLAGS = $(CPPFLAGS) $(CFLAGS) + ++CFLAGS_LIBTOOL = $(CCFLAGS) + CFLAGS_NORMAL = $(CCFLAGS) + CFLAGS_DEBUG = $(CCFLAGS) @CC_G_OPT@ -DTRACE + CFLAGS_PROFILE = $(CCFLAGS) -pg +@@ -66,10 +69,11 @@ + MATH_LIB = @MATH_LIB@ + + LD = @LD@ +-LINK = @LINK_TESTS@ $(CC) ++LINK = @LINK_TESTS@ $(LIBTOOL) $(CC) + + LDFLAGS = @LD_MODEL@ @TEST_ARGS@ @LIBS@ @EXTRA_LIBS@ @LOCAL_LDFLAGS@ @LDFLAGS@ + ++LDFLAGS_LIBTOOL = $(LDFLAGS) + LDFLAGS_NORMAL = $(LDFLAGS) + LDFLAGS_DEBUG = $(LDFLAGS) @CC_G_OPT@ + LDFLAGS_PROFILE = $(LDFLAGS) -pg diff --git a/devel/ncurses/pkg/PLIST b/devel/ncurses/pkg/PLIST index 59b7b70c586..3213637d916 100644 --- a/devel/ncurses/pkg/PLIST +++ b/devel/ncurses/pkg/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.12 2000/07/14 21:29:10 jlam Exp $ +@comment $NetBSD: PLIST,v 1.13 2000/10/12 14:56:48 jlam Exp $ bin/captoinfo bin/infocmp bin/infotocap bin/tack bin/tic bin/toe +include/curses.h include/cursesapp.h include/cursesf.h include/cursesm.h @@ -22,24 +23,68 @@ include/termcap.h include/unctrl.h lib/libform.a lib/libform.la -lib/libform.so.5.0 +lib/libform.so.5.1 lib/libmenu.a lib/libmenu.la -lib/libmenu.so.5.0 +lib/libmenu.so.5.1 lib/libncurses++.a lib/libncurses++.la -lib/libncurses++.so.5.0 +lib/libncurses++.so.5.1 lib/libncurses.a lib/libncurses.la -lib/libncurses.so.5.0 +lib/libncurses.so.5.1 lib/libpanel.a lib/libpanel.la -lib/libpanel.so.5.0 +lib/libpanel.so.5.1 man/man1/captoinfo.1 man/man1/infocmp.1 +man/man1/infotocap.1 man/man1/tack.1 man/man1/tic.1 man/man1/toe.1 +man/man3/COLOR_PAIR.3 +man/man3/PAIR_NUMBER.3 +man/man3/_nc_tracebits.3 +man/man3/_traceattr.3 +man/man3/_traceattr2.3 +man/man3/_tracechar.3 +man/man3/_tracechtype.3 +man/man3/_tracechtype2.3 +man/man3/_tracedump.3 +man/man3/_tracef.3 +man/man3/_tracemouse.3 +man/man3/addch.3 +man/man3/addchnstr.3 +man/man3/addchstr.3 +man/man3/addnstr.3 +man/man3/addstr.3 +man/man3/assume_default_colors.3 +man/man3/attr_get.3 +man/man3/attr_off.3 +man/man3/attr_on.3 +man/man3/attr_set.3 +man/man3/attroff.3 +man/man3/attron.3 +man/man3/attrset.3 +man/man3/baudrate.3 +man/man3/beep.3 +man/man3/bkgd.3 +man/man3/bkgdset.3 +man/man3/border.3 +man/man3/bottom_panel.3 +man/man3/box.3 +man/man3/can_change_color.3 +man/man3/cbreak.3 +man/man3/chgat.3 +man/man3/clear.3 +man/man3/clearok.3 +man/man3/clrtobot.3 +man/man3/clrtoeol.3 +man/man3/color_content.3 +man/man3/color_set.3 +man/man3/copywin.3 +man/man3/current_field.3 +man/man3/current_item.3 man/man3/curs_addch.3 man/man3/curs_addchstr.3 man/man3/curs_addstr.3 @@ -51,6 +96,7 @@ man/man3/curs_clear.3 man/man3/curs_color.3 man/man3/curs_delch.3 man/man3/curs_deleteln.3 +man/man3/curs_extend.3 man/man3/curs_getch.3 man/man3/curs_getstr.3 man/man3/curs_getyx.3 @@ -73,15 +119,57 @@ man/man3/curs_refresh.3 man/man3/curs_scanw.3 man/man3/curs_scr_dump.3 man/man3/curs_scroll.3 +man/man3/curs_set.3 man/man3/curs_slk.3 man/man3/curs_termattrs.3 man/man3/curs_termcap.3 man/man3/curs_terminfo.3 man/man3/curs_touch.3 +man/man3/curs_trace.3 man/man3/curs_util.3 man/man3/curs_window.3 +man/man3/curses_version.3 +man/man3/data_ahead.3 +man/man3/data_behind.3 +man/man3/def_prog_mode.3 +man/man3/def_shell_mode.3 +man/man3/default_colors.3 man/man3/define_key.3 -man/man3/dft_fgbg.3 +man/man3/del_curterm.3 +man/man3/del_panel.3 +man/man3/delay_output.3 +man/man3/delch.3 +man/man3/deleteln.3 +man/man3/delscreen.3 +man/man3/delwin.3 +man/man3/derwin.3 +man/man3/doupdate.3 +man/man3/dup_field.3 +man/man3/dupwin.3 +man/man3/dynamic_field_info.3 +man/man3/echo.3 +man/man3/echochar.3 +man/man3/endwin.3 +man/man3/erase.3 +man/man3/erasechar.3 +man/man3/field_arg.3 +man/man3/field_back.3 +man/man3/field_buffer.3 +man/man3/field_count.3 +man/man3/field_fore.3 +man/man3/field_index.3 +man/man3/field_info.3 +man/man3/field_just.3 +man/man3/field_opts.3 +man/man3/field_opts_off.3 +man/man3/field_opts_on.3 +man/man3/field_pad.3 +man/man3/field_status.3 +man/man3/field_type.3 +man/man3/field_userptr.3 +man/man3/filter.3 +man/man3/flash.3 +man/man3/flushinp.3 man/man3/form.3 man/man3/form_cursor.3 man/man3/form_data.3 @@ -95,34 +183,111 @@ man/man3/form_field_new.3 man/man3/form_field_opts.3 man/man3/form_field_userptr.3 man/man3/form_field_validation.3 +man/man3/form_fields.3 man/man3/form_fieldtype.3 man/man3/form_hook.3 man/man3/form_new.3 man/man3/form_new_page.3 man/man3/form_opts.3 +man/man3/form_opts_off.3 +man/man3/form_opts_on.3 man/man3/form_page.3 man/man3/form_post.3 +man/man3/form_request_by_name.3 +man/man3/form_request_name.3 man/man3/form_requestname.3 +man/man3/form_sub.3 man/man3/form_userptr.3 man/man3/form_win.3 +man/man3/free_field.3 +man/man3/free_fieldtype.3 +man/man3/free_form.3 +man/man3/free_item.3 +man/man3/free_menu.3 +man/man3/getbegyx.3 +man/man3/getbkgd.3 +man/man3/getch.3 +man/man3/getmaxyx.3 +man/man3/getmouse.3 +man/man3/getnstr.3 +man/man3/getparyx.3 +man/man3/getstr.3 +man/man3/getsyx.3 +man/man3/getwin.3 +man/man3/getyx.3 +man/man3/halfdelay.3 +man/man3/has_colors.3 +man/man3/has_ic.3 +man/man3/has_il.3 +man/man3/has_key.3 +man/man3/hide_panel.3 +man/man3/hline.3 +man/man3/idcok.3 +man/man3/idlok.3 +man/man3/immedok.3 +man/man3/inch.3 +man/man3/inchnstr.3 +man/man3/inchstr.3 +man/man3/init_color.3 +man/man3/init_pair.3 +man/man3/initscr.3 +man/man3/innstr.3 +man/man3/insch.3 +man/man3/insdelln.3 +man/man3/insertln.3 +man/man3/insnstr.3 +man/man3/insstr.3 +man/man3/instr.3 +man/man3/intrflush.3 +man/man3/is_linetouched.3 +man/man3/is_wintouched.3 +man/man3/isendwin.3 +man/man3/item_count.3 +man/man3/item_description.3 +man/man3/item_index.3 +man/man3/item_name.3 +man/man3/item_opts.3 +man/man3/item_opts_off.3 +man/man3/item_opts_on.3 +man/man3/item_userptr.3 +man/man3/item_value.3 +man/man3/item_visible.3 man/man3/keybound.3 +man/man3/keyname.3 man/man3/keyok.3 +man/man3/keypad.3 +man/man3/killchar.3 +man/man3/leaveok.3 +man/man3/link_field.3 +man/man3/link_fieldtype.3 +man/man3/longname.3 +man/man3/mcprint.3 man/man3/menu.3 -man/man3/menu_attribs.3 +man/man3/menu_attributes.3 +man/man3/menu_back.3 man/man3/menu_cursor.3 man/man3/menu_driver.3 +man/man3/menu_fore.3 man/man3/menu_format.3 +man/man3/menu_grey.3 man/man3/menu_hook.3 man/man3/menu_items.3 man/man3/menu_mark.3 man/man3/menu_new.3 man/man3/menu_opts.3 +man/man3/menu_opts_off.3 +man/man3/menu_opts_on.3 +man/man3/menu_pad.3 man/man3/menu_pattern.3 man/man3/menu_post.3 +man/man3/menu_request_by_name.3 +man/man3/menu_request_name.3 man/man3/menu_requestname.3 man/man3/menu_spacing.3 +man/man3/menu_sub.3 man/man3/menu_userptr.3 man/man3/menu_win.3 +man/man3/meta.3 man/man3/mitem_current.3 man/man3/mitem_name.3 man/man3/mitem_new.3 @@ -130,10 +295,289 @@ man/man3/mitem_opts.3 man/man3/mitem_userptr.3 man/man3/mitem_value.3 man/man3/mitem_visible.3 +man/man3/mouse_trafo.3 +man/man3/mouseinterval.3 +man/man3/mousemask.3 +man/man3/move.3 +man/man3/move_field.3 +man/man3/move_panel.3 +man/man3/mvaddch.3 +man/man3/mvaddchnstr.3 +man/man3/mvaddchstr.3 +man/man3/mvaddnstr.3 +man/man3/mvaddstr.3 +man/man3/mvchgat.3 +man/man3/mvcur.3 +man/man3/mvdelch.3 +man/man3/mvderwin.3 +man/man3/mvgetch.3 +man/man3/mvgetnstr.3 +man/man3/mvgetstr.3 +man/man3/mvhline.3 +man/man3/mvinch.3 +man/man3/mvinchnstr.3 +man/man3/mvinchstr.3 +man/man3/mvinnstr.3 +man/man3/mvinsch.3 +man/man3/mvinsnstr.3 +man/man3/mvinsstr.3 +man/man3/mvinstr.3 +man/man3/mvprintw.3 +man/man3/mvscanw.3 +man/man3/mvvline.3 +man/man3/mvwaddch.3 +man/man3/mvwaddchnstr.3 +man/man3/mvwaddchstr.3 +man/man3/mvwaddnstr.3 +man/man3/mvwaddstr.3 +man/man3/mvwchgat.3 +man/man3/mvwdelch.3 +man/man3/mvwgetch.3 +man/man3/mvwgetnstr.3 +man/man3/mvwgetstr.3 +man/man3/mvwhline.3 +man/man3/mvwin.3 +man/man3/mvwinch.3 +man/man3/mvwinchnstr.3 +man/man3/mvwinchstr.3 +man/man3/mvwinnstr.3 +man/man3/mvwinsch.3 +man/man3/mvwinsnstr.3 +man/man3/mvwinsstr.3 +man/man3/mvwinstr.3 +man/man3/mvwprintw.3 +man/man3/mvwscanw.3 +man/man3/mvwvline.3 +man/man3/napms.3 man/man3/ncurses.3 +man/man3/new_field.3 +man/man3/new_fieldtype.3 +man/man3/new_form.3 +man/man3/new_item.3 +man/man3/new_menu.3 +man/man3/new_page.3 +man/man3/new_panel.3 +man/man3/newpad.3 +man/man3/newterm.3 +man/man3/newwin.3 +man/man3/nl.3 +man/man3/nocbreak.3 +man/man3/nodelay.3 +man/man3/noecho.3 +man/man3/nonl.3 +man/man3/noqiflush.3 +man/man3/noraw.3 +man/man3/notimeout.3 +man/man3/overlay.3 +man/man3/overwrite.3 +man/man3/pair_content.3 man/man3/panel.3 +man/man3/panel_above.3 +man/man3/panel_below.3 +man/man3/panel_hidden.3 +man/man3/panel_userptr.3 +man/man3/panel_window.3 +man/man3/pechochar.3 +man/man3/pnoutrefresh.3 +man/man3/pos_form_cursor.3 +man/man3/pos_menu_cursor.3 +man/man3/post_form.3 +man/man3/post_menu.3 +man/man3/prefresh.3 +man/man3/printw.3 +man/man3/putp.3 +man/man3/putwin.3 +man/man3/qiflush.3 +man/man3/raw.3 +man/man3/redrawwin.3 +man/man3/refresh.3 +man/man3/replace_panel.3 +man/man3/reset_prog_mode.3 +man/man3/reset_shell_mode.3 +man/man3/resetty.3 man/man3/resizeterm.3 +man/man3/restartterm.3 +man/man3/ripoffline.3 +man/man3/savetty.3 +man/man3/scale_form.3 +man/man3/scale_menu.3 +man/man3/scanw.3 +man/man3/scr_dump.3 +man/man3/scr_init.3 +man/man3/scr_restore.3 +man/man3/scr_set.3 +man/man3/scrl.3 +man/man3/scroll.3 +man/man3/scrollok.3 +man/man3/set_current_field.3 +man/man3/set_current_item.3 +man/man3/set_curterm.3 +man/man3/set_field_back.3 +man/man3/set_field_buffer.3 +man/man3/set_field_fore.3 +man/man3/set_field_init.3 +man/man3/set_field_just.3 +man/man3/set_field_opts.3 +man/man3/set_field_pad.3 +man/man3/set_field_status.3 +man/man3/set_field_term.3 +man/man3/set_field_type.3 +man/man3/set_field_userptr.3 +man/man3/set_fieldtype_arg.3 +man/man3/set_fieldtype_choice.3 +man/man3/set_form_fields.3 +man/man3/set_form_init.3 +man/man3/set_form_opts.3 +man/man3/set_form_page.3 +man/man3/set_form_sub.3 +man/man3/set_form_term.3 +man/man3/set_form_userptr.3 +man/man3/set_form_win.3 +man/man3/set_item_init.3 +man/man3/set_item_opts.3 +man/man3/set_item_term.3 +man/man3/set_item_userptr.3 +man/man3/set_item_value.3 +man/man3/set_max_field.3 +man/man3/set_menu_back.3 +man/man3/set_menu_fore.3 +man/man3/set_menu_format.3 +man/man3/set_menu_grey.3 +man/man3/set_menu_init.3 +man/man3/set_menu_items.3 +man/man3/set_menu_mark.3 +man/man3/set_menu_opts.3 +man/man3/set_menu_pad.3 +man/man3/set_menu_pattern.3 +man/man3/set_menu_spacing.3 +man/man3/set_menu_sub.3 +man/man3/set_menu_term.3 +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_term.3 +man/man3/set_top_row.3 +man/man3/setscrreg.3 +man/man3/setsyx.3 +man/man3/setterm.3 +man/man3/setupterm.3 +man/man3/show_panel.3 +man/man3/slk_attr.3 +man/man3/slk_attr_off.3 +man/man3/slk_attr_on.3 +man/man3/slk_attr_set.3 +man/man3/slk_attroff.3 +man/man3/slk_attron.3 +man/man3/slk_attrset.3 +man/man3/slk_clear.3 +man/man3/slk_color.3 +man/man3/slk_init.3 +man/man3/slk_label.3 +man/man3/slk_noutrefresh.3 +man/man3/slk_refresh.3 +man/man3/slk_restore.3 +man/man3/slk_set.3 +man/man3/slk_touch.3 +man/man3/standend.3 +man/man3/standout.3 +man/man3/start_color.3 +man/man3/subpad.3 +man/man3/subwin.3 +man/man3/syncok.3 +man/man3/termattrs.3 +man/man3/termname.3 +man/man3/tgetent.3 +man/man3/tgetflag.3 +man/man3/tgetnum.3 +man/man3/tgetstr.3 +man/man3/tgoto.3 +man/man3/tigetflag.3 +man/man3/tigetnum.3 +man/man3/tigetstr.3 +man/man3/timeout.3 +man/man3/top_panel.3 +man/man3/top_row.3 +man/man3/touchline.3 +man/man3/touchwin.3 +man/man3/tparm.3 +man/man3/tputs.3 +man/man3/trace.3 +man/man3/typeahead.3 +man/man3/unctrl.3 +man/man3/ungetch.3 +man/man3/ungetmouse.3 +man/man3/unpost_form.3 +man/man3/unpost_menu.3 +man/man3/untouchwin.3 +man/man3/update_panels.3 +man/man3/use_default_colors.3 +man/man3/use_env.3 +man/man3/use_extended_names.3 +man/man3/vidattr.3 +man/man3/vidputs.3 +man/man3/vline.3 +man/man3/vw_printw.3 +man/man3/vw_scanw.3 +man/man3/vwprintw.3 +man/man3/vwscanw.3 +man/man3/waddch.3 +man/man3/waddchnstr.3 +man/man3/waddchstr.3 +man/man3/waddnstr.3 +man/man3/waddstr.3 +man/man3/wattr_get.3 +man/man3/wattr_off.3 +man/man3/wattr_on.3 +man/man3/wattr_set.3 +man/man3/wattroff.3 +man/man3/wattron.3 +man/man3/wattrset.3 +man/man3/wbkgd.3 +man/man3/wbkgdset.3 +man/man3/wborder.3 +man/man3/wchgat.3 +man/man3/wclear.3 +man/man3/wclrtobot.3 +man/man3/wclrtoeol.3 +man/man3/wcolor_set.3 +man/man3/wcursyncup.3 +man/man3/wdelch.3 +man/man3/wdeleteln.3 +man/man3/wechochar.3 +man/man3/wenclose.3 +man/man3/werase.3 +man/man3/wgetch.3 +man/man3/wgetnstr.3 +man/man3/wgetstr.3 +man/man3/whline.3 +man/man3/winch.3 +man/man3/winchnstr.3 +man/man3/winchstr.3 +man/man3/winnstr.3 +man/man3/winsch.3 +man/man3/winsdelln.3 +man/man3/winsertln.3 +man/man3/winsnstr.3 +man/man3/winsstr.3 +man/man3/winstr.3 +man/man3/wmouse_trafo.3 +man/man3/wmove.3 +man/man3/wnoutrefresh.3 +man/man3/wprintw.3 +man/man3/wredrawln.3 +man/man3/wrefresh.3 man/man3/wresize.3 +man/man3/wscanw.3 +man/man3/wscrl.3 +man/man3/wsetscrreg.3 +man/man3/wstandend.3 +man/man3/wstandout.3 +man/man3/wsyncdown.3 +man/man3/wsyncup.3 +man/man3/wtimeout.3 +man/man3/wtouchln.3 +man/man3/wvline.3 man/man5/term.5 man/man5/terminfo.5 man/man7/term.7 @@ -164,7 +608,6 @@ share/terminfo/6/605x share/terminfo/6/605x-dg share/terminfo/6/630-lm share/terminfo/6/630MTG-24 -share/terminfo/7/70092 share/terminfo/7/730MTG-24 share/terminfo/7/730MTG-41 share/terminfo/7/730MTG-41r @@ -173,6 +616,12 @@ share/terminfo/7/730MTGr-24 share/terminfo/8/8510 share/terminfo/9/955-hb share/terminfo/9/955-w +share/terminfo/E/Eterm +share/terminfo/E/Eterm-color +share/terminfo/L/LFT-PC850 +share/terminfo/M/MtxOrb +share/terminfo/M/MtxOrb162 +share/terminfo/M/MtxOrb204 share/terminfo/N/NCR260VT300WPP share/terminfo/N/NCRVT100WPP share/terminfo/P/P12 @@ -192,6 +641,12 @@ share/terminfo/P/P9 share/terminfo/P/P9-8 share/terminfo/P/P9-8-W share/terminfo/P/P9-W +share/terminfo/Q/Q306-8-pc +share/terminfo/Q/Q310-vip-H +share/terminfo/Q/Q310-vip-H-am +share/terminfo/Q/Q310-vip-Hw +share/terminfo/Q/Q310-vip-w +share/terminfo/Q/Q310-vip-w-am share/terminfo/X/X-hpterm share/terminfo/a/a210 share/terminfo/a/a80 @@ -302,6 +757,7 @@ share/terminfo/a/ambassador share/terminfo/a/amiga share/terminfo/a/amiga-8bit share/terminfo/a/amiga-h +share/terminfo/a/amiga-vnc share/terminfo/a/amp219 share/terminfo/a/amp219w share/terminfo/a/ampex-219 @@ -317,12 +773,34 @@ share/terminfo/a/ampex232w share/terminfo/a/ampex80 share/terminfo/a/annarbor4080 share/terminfo/a/ansi +share/terminfo/a/ansi+arrows +share/terminfo/a/ansi+csr +share/terminfo/a/ansi+cup +share/terminfo/a/ansi+erase +share/terminfo/a/ansi+idc +share/terminfo/a/ansi+idl +share/terminfo/a/ansi+idl1 +share/terminfo/a/ansi+inittabs +share/terminfo/a/ansi+local +share/terminfo/a/ansi+local1 +share/terminfo/a/ansi+pp +share/terminfo/a/ansi+rca +share/terminfo/a/ansi+rep +share/terminfo/a/ansi+sgr +share/terminfo/a/ansi+sgrbold +share/terminfo/a/ansi+sgrdim +share/terminfo/a/ansi+sgrso +share/terminfo/a/ansi+sgrul +share/terminfo/a/ansi+tabs share/terminfo/a/ansi-color-2-emx share/terminfo/a/ansi-color-3-emx share/terminfo/a/ansi-emx +share/terminfo/a/ansi-generic share/terminfo/a/ansi-m share/terminfo/a/ansi-mini share/terminfo/a/ansi-mono +share/terminfo/a/ansi-mr +share/terminfo/a/ansi-mtabs share/terminfo/a/ansi-nt share/terminfo/a/ansi.sys share/terminfo/a/ansi.sys-old @@ -505,7 +983,25 @@ share/terminfo/b/bh4 share/terminfo/b/bitgraph share/terminfo/b/blit share/terminfo/b/bobcat +share/terminfo/b/bq300 +share/terminfo/b/bq300-8 +share/terminfo/b/bq300-8-pc +share/terminfo/b/bq300-8-pc-rv +share/terminfo/b/bq300-8-pc-w +share/terminfo/b/bq300-8-pc-w-rv +share/terminfo/b/bq300-8rv +share/terminfo/b/bq300-8w +share/terminfo/b/bq300-pc +share/terminfo/b/bq300-pc-rv +share/terminfo/b/bq300-pc-w +share/terminfo/b/bq300-pc-w-rv +share/terminfo/b/bq300-rv +share/terminfo/b/bq300-w +share/terminfo/b/bq300-w-8rv +share/terminfo/b/bq300-w-rv share/terminfo/b/bsdos-pc +share/terminfo/b/bsdos-pc-m +share/terminfo/b/bsdos-pc-mono share/terminfo/b/bsdos-pc-nobold share/terminfo/b/bsdos-ppc share/terminfo/b/bsdos-sparc @@ -839,6 +1335,11 @@ share/terminfo/d/dialogue80 share/terminfo/d/digilog share/terminfo/d/dku7003 share/terminfo/d/dku7003-dumb +share/terminfo/d/dku7102 +share/terminfo/d/dku7102-old +share/terminfo/d/dku7102-sna +share/terminfo/d/dku7103-sna +share/terminfo/d/dku7202 share/terminfo/d/dm1520 share/terminfo/d/dm1521 share/terminfo/d/dm2500 @@ -930,6 +1431,7 @@ share/terminfo/g/gator-52t share/terminfo/g/gator-t share/terminfo/g/gigi share/terminfo/g/glasstty +share/terminfo/g/gnome share/terminfo/g/go-225 share/terminfo/g/go140 share/terminfo/g/go140w @@ -1000,6 +1502,7 @@ share/terminfo/h/heathkit-a share/terminfo/h/hft share/terminfo/h/hft-c share/terminfo/h/hft-c-old +share/terminfo/h/hft-old share/terminfo/h/hirez100 share/terminfo/h/hirez100-w share/terminfo/h/hmod1 @@ -1109,6 +1612,7 @@ share/terminfo/i/i3101 share/terminfo/i/i3164 share/terminfo/i/i400 share/terminfo/i/ibcs2 +share/terminfo/i/ibm+color share/terminfo/i/ibm-apl share/terminfo/i/ibm-pc share/terminfo/i/ibm-system1 @@ -1199,9 +1703,14 @@ share/terminfo/k/klone+sgr-dumb share/terminfo/k/kt7 share/terminfo/k/kt7ix share/terminfo/k/kterm +share/terminfo/k/kterm-co +share/terminfo/k/kterm-color share/terminfo/k/ktm +share/terminfo/k/kvt share/terminfo/l/la120 share/terminfo/l/layer +share/terminfo/l/lft +share/terminfo/l/lft-pc850 share/terminfo/l/linux share/terminfo/l/linux-c share/terminfo/l/linux-c-nc @@ -1224,6 +1733,7 @@ share/terminfo/m/mac share/terminfo/m/mac-w share/terminfo/m/mach share/terminfo/m/mach-bold +share/terminfo/m/mach-color share/terminfo/m/macintosh share/terminfo/m/macterminal-w share/terminfo/m/mai @@ -1236,6 +1746,7 @@ share/terminfo/m/memhp share/terminfo/m/mgr share/terminfo/m/mgr-linux share/terminfo/m/mgr-sun +share/terminfo/m/mgterm share/terminfo/m/microb share/terminfo/m/microbee share/terminfo/m/microterm @@ -1479,6 +1990,7 @@ share/terminfo/p/pcix share/terminfo/p/pckermit share/terminfo/p/pckermit12 share/terminfo/p/pckermit120 +share/terminfo/p/pcmw share/terminfo/p/pcplot share/terminfo/p/pcvt25 share/terminfo/p/pcvt25w @@ -1504,6 +2016,8 @@ share/terminfo/p/pe6312 share/terminfo/p/pe7000c share/terminfo/p/pe7000m share/terminfo/p/pilot +share/terminfo/p/pmcons +share/terminfo/p/pmconsole share/terminfo/p/printer share/terminfo/p/prism12 share/terminfo/p/prism12-m @@ -1544,11 +2058,21 @@ share/terminfo/p/pt505 share/terminfo/p/pt505-22 share/terminfo/p/pt505-24 share/terminfo/p/pty +share/terminfo/q/qansi +share/terminfo/q/qansi-g +share/terminfo/q/qansi-m +share/terminfo/q/qansi-t +share/terminfo/q/qansi-w share/terminfo/q/qdcons share/terminfo/q/qdss share/terminfo/q/qnx share/terminfo/q/qnx4 +share/terminfo/q/qnxm +share/terminfo/q/qnxt share/terminfo/q/qnxt2 +share/terminfo/q/qnxt4 +share/terminfo/q/qnxtmono +share/terminfo/q/qnxw share/terminfo/q/qume share/terminfo/q/qume5 share/terminfo/q/qvt101 @@ -1625,6 +2149,7 @@ share/terminfo/s/sun-24 share/terminfo/s/sun-34 share/terminfo/s/sun-48 share/terminfo/s/sun-c +share/terminfo/s/sun-cgsix share/terminfo/s/sun-cmd share/terminfo/s/sun-e share/terminfo/s/sun-e-s @@ -1807,6 +2332,10 @@ share/terminfo/t/tvi970 share/terminfo/t/tvi970-2p share/terminfo/t/tvi970-vb share/terminfo/t/tvipt +share/terminfo/t/tws-generic +share/terminfo/t/tws2102-sna +share/terminfo/t/tws2103 +share/terminfo/t/tws2103-sna share/terminfo/u/ultima2 share/terminfo/u/ultimaII share/terminfo/u/uniterm @@ -1818,6 +2347,7 @@ share/terminfo/v/v200-nam share/terminfo/v/v320n share/terminfo/v/v3220 share/terminfo/v/v5410 +share/terminfo/v/vanilla share/terminfo/v/vapple share/terminfo/v/vc103 share/terminfo/v/vc203 @@ -1846,6 +2376,13 @@ share/terminfo/v/viewpoint share/terminfo/v/viewpoint3a+ share/terminfo/v/viewpoint60 share/terminfo/v/viewpoint90 +share/terminfo/v/vip +share/terminfo/v/vip-H +share/terminfo/v/vip-Hw +share/terminfo/v/vip-w +share/terminfo/v/vip7800-H +share/terminfo/v/vip7800-Hw +share/terminfo/v/vip7800-w share/terminfo/v/visa50 share/terminfo/v/visual603 share/terminfo/v/vitty @@ -1884,12 +2421,17 @@ share/terminfo/v/vt125 share/terminfo/v/vt131 share/terminfo/v/vt132 share/terminfo/v/vt200 +share/terminfo/v/vt200-8 +share/terminfo/v/vt200-8bit share/terminfo/v/vt200-js +share/terminfo/v/vt200-old share/terminfo/v/vt200-w share/terminfo/v/vt220 share/terminfo/v/vt220-8 +share/terminfo/v/vt220-8bit share/terminfo/v/vt220-js share/terminfo/v/vt220-nam +share/terminfo/v/vt220-old share/terminfo/v/vt220-w share/terminfo/v/vt220d share/terminfo/v/vt300 @@ -2039,6 +2581,7 @@ share/terminfo/w/wy75-w share/terminfo/w/wy75-wvb share/terminfo/w/wy75ap share/terminfo/w/wy85 +share/terminfo/w/wy85-8bit share/terminfo/w/wy85-vb share/terminfo/w/wy85-w share/terminfo/w/wy85-wvb @@ -2147,6 +2690,7 @@ share/terminfo/w/wyse75-w share/terminfo/w/wyse75-wvb share/terminfo/w/wyse75ap share/terminfo/w/wyse85 +share/terminfo/w/wyse85-8bit share/terminfo/w/wyse85-vb share/terminfo/w/wyse85-w share/terminfo/w/wyse85-wvb @@ -2164,6 +2708,7 @@ share/terminfo/x/x1750 share/terminfo/x/x68k share/terminfo/x/x68k-ite share/terminfo/x/x820 +share/terminfo/x/xdku share/terminfo/x/xenix share/terminfo/x/xerox share/terminfo/x/xerox-lm @@ -2176,16 +2721,24 @@ share/terminfo/x/xterm+sl share/terminfo/x/xterm+sl-twm share/terminfo/x/xterm-16color share/terminfo/x/xterm-24 +share/terminfo/x/xterm-256color +share/terminfo/x/xterm-88color share/terminfo/x/xterm-8bit +share/terminfo/x/xterm-basic share/terminfo/x/xterm-bold share/terminfo/x/xterm-color +share/terminfo/x/xterm-hp share/terminfo/x/xterm-new share/terminfo/x/xterm-nic +share/terminfo/x/xterm-noapp share/terminfo/x/xterm-old share/terminfo/x/xterm-pcolor share/terminfo/x/xterm-r5 share/terminfo/x/xterm-r6 +share/terminfo/x/xterm-sco share/terminfo/x/xterm-sun +share/terminfo/x/xterm-vt220 +share/terminfo/x/xterm-vt52 share/terminfo/x/xterm-xf86-v32 share/terminfo/x/xterm-xf86-v33 share/terminfo/x/xterm-xf86-v333 @@ -2256,8 +2809,12 @@ share/terminfo/z/ztx11 @dirrm share/terminfo/b @dirrm share/terminfo/a @dirrm share/terminfo/X +@dirrm share/terminfo/Q @dirrm share/terminfo/P @dirrm share/terminfo/N +@dirrm share/terminfo/M +@dirrm share/terminfo/L +@dirrm share/terminfo/E @dirrm share/terminfo/9 @dirrm share/terminfo/8 @dirrm share/terminfo/7 |