aboutsummaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorIgor Pashev <igor.pashev@nexenta.com>2012-12-19 13:02:54 +0400
committerIgor Pashev <igor.pashev@nexenta.com>2012-12-19 13:05:12 +0400
commit3e567218b60d7f885e769e1a2a07d84d38f11c13 (patch)
treef43668e026c492f304f4c827fc4b567ca85b1963 /examples
parentfdcf880b3c8c67f08453f553474a551e9707d29d (diff)
downloadcibs-3e567218b60d7f885e769e1a2a07d84d38f11c13.tar.gz
Update examples
Diffstat (limited to 'examples')
-rw-r--r--examples/c-ares/Makefile45
-rw-r--r--examples/c-ares/c-ares.license10
-rw-r--r--examples/c-ares/c-ares.p5m93
-rw-r--r--examples/coreutils/Makefile26
-rw-r--r--examples/coreutils/coreutils.p5m436
-rw-r--r--examples/db5.1/Makefile33
-rw-r--r--examples/db5.1/db-sql.p5m10
-rw-r--r--examples/db5.1/db.p5m26
-rw-r--r--examples/db5.1/libdb-cxx-so.p5m10
-rw-r--r--examples/db5.1/libdb-cxx.p5m14
-rw-r--r--examples/db5.1/libdb-so.p5m10
-rw-r--r--examples/db5.1/libdb-sql-so.p5m10
-rw-r--r--examples/db5.1/libdb-sql.p5m14
-rw-r--r--examples/db5.1/libdb-stl-so.p5m10
-rw-r--r--examples/db5.1/libdb-stl.p5m26
-rw-r--r--examples/db5.1/libdb.p5m15
-rw-r--r--examples/findutils/Makefile26
-rw-r--r--examples/findutils/gnu-findutils.p5m145
-rw-r--r--examples/findutils/locate.p5m29
-rw-r--r--examples/gawk/Makefile25
-rw-r--r--examples/gawk/gawk.p5m80
-rw-r--r--examples/gcc-4.4/Makefile2
-rw-r--r--examples/gcc-4.4/illumos-gcc.p5m1
-rw-r--r--examples/gcc-defaults/Makefile1
-rw-r--r--examples/gcc-defaults/cpp.p5m6
-rw-r--r--examples/gcc-defaults/g++.p5m6
-rw-r--r--examples/gcc-defaults/gcc.p5m6
-rw-r--r--examples/gcc-defaults/gfortran.p5m8
-rw-r--r--examples/gm4/Makefile26
-rw-r--r--examples/gm4/gm4.p5m26
-rw-r--r--examples/gmp/gmp.p5m9
-rw-r--r--examples/gmp/gmp10.p5m11
-rw-r--r--examples/gmp/gmpxx.p5m10
-rw-r--r--examples/gmp/gmpxx10.p5m11
-rw-r--r--examples/gperf/Makefile20
-rw-r--r--examples/gperf/gperf.p5m18
-rw-r--r--examples/grep/Makefile26
-rw-r--r--examples/grep/gnu-grep.p5m158
-rw-r--r--examples/libsigsegv/Makefile23
-rw-r--r--examples/libsigsegv/libsigsegv.p5m19
-rw-r--r--examples/libtool/Makefile17
-rw-r--r--examples/libtool/libltdl.p5m15
-rw-r--r--examples/libtool/libltdl7.p5m11
-rw-r--r--examples/libtool/patches/bootstrap-no-go.patch12
-rw-r--r--examples/libunistring/Makefile24
-rw-r--r--examples/libunistring/libunistring.p5m87
-rw-r--r--examples/mpfr/Makefile24
-rw-r--r--examples/mpfr/mpfr.p5m26
-rw-r--r--examples/ncurses/Makefile70
-rw-r--r--examples/ncurses/ncurses-base.p5m58
-rw-r--r--examples/ncurses/ncurses-bin.p5m27
-rw-r--r--examples/ncurses/ncurses.license108
-rw-r--r--examples/ncurses/ncurses.p5m52
-rw-r--r--examples/ncurses/ncurses5.p5m23
-rw-r--r--examples/ncurses/ncursesw.p5m40
-rw-r--r--examples/ncurses/ncursesw5.p5m15
-rw-r--r--examples/ncurses/patches/00-terminfo-update.diff2126
-rw-r--r--examples/ncurses/patches/02-debian-backspace.diff41
-rw-r--r--examples/ncurses/patches/03-debian-ncursesconfig-omit-L.diff35
-rw-r--r--examples/ncurses/patches/04-fix-tabset-directory.diff45
-rw-r--r--examples/ncurses/patches/05-fix-poll-test.diff2176
-rw-r--r--examples/ncurses/tinfo.p5m16
-rw-r--r--examples/ncurses/tinfo5.p5m15
-rw-r--r--examples/nodejs/Makefile45
-rw-r--r--examples/nodejs/developer-nodejs.p5m110
-rw-r--r--examples/nodejs/patches/01-shared-c-ares.patch288
-rw-r--r--examples/nodejs/patches/02-rename-node-to-nodejs.patch34
-rw-r--r--examples/nodejs/patches/03-waf.patch16
-rw-r--r--examples/nodejs/patches/04-lib-path.patch24
-rw-r--r--examples/nodejs/runtime-nodejs.p5m13
-rw-r--r--examples/openpgm/Makefile26
-rw-r--r--examples/openpgm/libpgm.p5m68
-rw-r--r--examples/openpgm/patches/000_ifr_netmask.patch15
-rw-r--r--examples/openpgm/patches/010_ifa_flags.patch107
-rw-r--r--examples/pcre/Makefile22
-rw-r--r--examples/pcre/pcre.p5m109
-rw-r--r--examples/pcre/pcrecpp.p5m21
-rw-r--r--examples/symlinks/Makefile6
-rw-r--r--examples/zeromq/Makefile32
-rw-r--r--examples/zeromq/zeromq.p5m27
80 files changed, 6107 insertions, 1399 deletions
diff --git a/examples/c-ares/Makefile b/examples/c-ares/Makefile
deleted file mode 100644
index 66dfa3c..0000000
--- a/examples/c-ares/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-
-# We are going to package for IPS ;-)
-include /usr/share/cibs/rules/ips.mk
-
-# We are using tarball(s)
-include /usr/share/cibs/rules/archive.mk
-
-# We are using GNU configure
-include /usr/share/cibs/rules/autotools.mk
-
-# We will build 32-bit version
-include /usr/share/cibs/rules/32.mk
-
-# ... and 64-bit
-include /usr/share/cibs/rules/64.mk
-
-
-summary := C library that performs DNS requests and name resolves asynchronously
-license := MIT
-
-# build-depends +=
-# build-conflicts +=
-
-home := http://c-ares.haxx.se
-name := c-ares
-version := 1.9.1
-archive := $(name)-$(version).tar.gz
-download := $(home)/download/$(archive)
-checksum := \
- sha1:fe41e47f300bfd587b7f552a141ad3bf85437b0f \
- sha256:023f28001f2f839645c8700187391a011198950c73ddd91510c7549d87373936 \
- md5:389db4917a3b58c4ce4ebfe961fd84c4 \
- size:782945
-
-# archives := more.zip tarballs.tar.bz2
-# download_more.zip := ftp://...
-# download_tarballs.tar.bz2 := https://...
-# checksum_more.zip := ...
-# checksum_tarballs.tar.bz2 := ...
-#
-# patch::
-# autoreconf -vi
-
-
-
diff --git a/examples/c-ares/c-ares.license b/examples/c-ares/c-ares.license
deleted file mode 100644
index f0a205f..0000000
--- a/examples/c-ares/c-ares.license
+++ /dev/null
@@ -1,10 +0,0 @@
-Copyright 1998 by the Massachusetts Institute of Technology.
-
-Permission to use, copy, modify, and distribute this software and its
-documentation for any purpose and without fee is hereby granted, provided that
-the above copyright notice appear in all copies and that both that copyright
-notice and this permission notice appear in supporting documentation, and that
-the name of M.I.T. not be used in advertising or publicity pertaining to
-distribution of the software without specific, written prior permission.
-M.I.T. makes no representations about the suitability of this software for any
-purpose. It is provided "as is" without express or implied warranty.
diff --git a/examples/c-ares/c-ares.p5m b/examples/c-ares/c-ares.p5m
deleted file mode 100644
index bc0efb9..0000000
--- a/examples/c-ares/c-ares.p5m
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license
-# at http://www.opensource.org/licenses/CDDL-1.0
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each file.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright (C) 2012, Nexenta Systems, Inc. All rights reserved.
-#
-
-
-set name=pkg.fmri value=pkg:/library/c-ares@$(ips-version)
-set name=pkg.summary value="$(summary)"
-set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
-license c-ares.license license="$(license)"
-
-
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man3
-dir path=usr/include
-file path=usr/lib/$(MACH64)/libcares.so.2.0.0
-file path=usr/lib/$(MACH64)/pkgconfig/libcares.pc
-file path=usr/lib/pkgconfig/libcares.pc
-file path=usr/lib/libcares.so.2.0.0
-file path=usr/share/man/man3/ares_parse_soa_reply.3
-file path=usr/share/man/man3/ares_timeout.3
-file path=usr/share/man/man3/ares_parse_ptr_reply.3
-file path=usr/share/man/man3/ares_query.3
-file path=usr/share/man/man3/ares_free_hostent.3
-file path=usr/share/man/man3/ares_free_data.3
-file path=usr/share/man/man3/ares_gethostbyname.3
-file path=usr/share/man/man3/ares_parse_mx_reply.3
-file path=usr/share/man/man3/ares_save_options.3
-file path=usr/share/man/man3/ares_expand_string.3
-file path=usr/share/man/man3/ares_get_servers.3
-file path=usr/share/man/man3/ares_parse_txt_reply.3
-file path=usr/share/man/man3/ares_library_cleanup.3
-file path=usr/share/man/man3/ares_parse_srv_reply.3
-file path=usr/share/man/man3/ares_version.3
-file path=usr/share/man/man3/ares_init_options.3
-file path=usr/share/man/man3/ares_init.3
-file path=usr/share/man/man3/ares_process.3
-file path=usr/share/man/man3/ares_cancel.3
-file path=usr/share/man/man3/ares_fds.3
-file path=usr/share/man/man3/ares_destroy.3
-file path=usr/share/man/man3/ares_parse_ns_reply.3
-file path=usr/share/man/man3/ares_parse_aaaa_reply.3
-file path=usr/share/man/man3/ares_parse_naptr_reply.3
-file path=usr/share/man/man3/ares_gethostbyaddr.3
-file path=usr/share/man/man3/ares_strerror.3
-file path=usr/share/man/man3/ares_gethostbyname_file.3
-file path=usr/share/man/man3/ares_free_string.3
-file path=usr/share/man/man3/ares_search.3
-file path=usr/share/man/man3/ares_parse_a_reply.3
-file path=usr/share/man/man3/ares_library_init.3
-file path=usr/share/man/man3/ares_set_socket_callback.3
-file path=usr/share/man/man3/ares_mkquery.3
-file path=usr/share/man/man3/ares_set_servers.3
-file path=usr/share/man/man3/ares_getnameinfo.3
-file path=usr/share/man/man3/ares_expand_name.3
-file path=usr/share/man/man3/ares_dup.3
-file path=usr/share/man/man3/ares_destroy_options.3
-file path=usr/share/man/man3/ares_getsock.3
-file path=usr/share/man/man3/ares_send.3
-file path=usr/include/ares_build.h
-file path=usr/include/ares_rules.h
-file path=usr/include/ares_dns.h
-file path=usr/include/ares_version.h
-file path=usr/include/ares.h
-link path=usr/lib/libcares.so target=libcares.so.2.0.0
-link path=usr/lib/$(MACH64)/libcares.so target=libcares.so.2.0.0
-link path=usr/lib/$(MACH64)/libcares.so.2 target=libcares.so.2.0.0
-link path=usr/lib/libcares.so.2 target=libcares.so.2.0.0
diff --git a/examples/coreutils/Makefile b/examples/coreutils/Makefile
new file mode 100644
index 0000000..1768b32
--- /dev/null
+++ b/examples/coreutils/Makefile
@@ -0,0 +1,26 @@
+include /usr/share/cibs/rules/ips.mk
+include /usr/share/cibs/rules/archive.mk
+include /usr/share/cibs/rules/autotools.mk
+include /usr/share/cibs/rules/64.mk
+
+summary := the basic file, shell and text manipulation utilities of the GNU operating system
+license := GPL
+license-file := COPYING
+
+prefix := /usr/gnu
+
+build-depends += \
+ pkg:/compress/xz \
+ pkg:/library/gmp
+
+
+name := coreutils
+home := http://www.gnu.org/software/$(name)/
+version := 8.20
+archive := $(name)-$(version).tar.xz
+download := http://ftp.gnu.org/gnu/$(name)/$(archive)
+checksum := \
+ md5:3d69af8f561fce512538a9fe85f147ff \
+ sha1:b120f138758100060333c2ed207ee276dd318980 \
+ sha256:dbcb798764827a0f74be738662ecb516705cf520330cd3d7b2640fdffa499eb2 \
+ size:5273788
diff --git a/examples/coreutils/coreutils.p5m b/examples/coreutils/coreutils.p5m
new file mode 100644
index 0000000..9da9807
--- /dev/null
+++ b/examples/coreutils/coreutils.p5m
@@ -0,0 +1,436 @@
+set name=pkg.fmri value=pkg:/file/gnu-$(name)@$(ips-version)
+set name=pkg.summary value="$(summary)"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license=$(license)
+
+<transform file path=usr/gnu/bin/(.+) -> \
+emit link path=usr/bin/g%<1> target=../gnu/bin/%<1> >
+
+<transform file path=usr/gnu/share/man/man1/(.+) -> \
+emit link path=usr/share/man/man1/g%<1> target=../../../gnu/share/man/man1/%<1>>
+
+dir path=usr
+dir path=usr/gnu
+dir path=usr/gnu/share
+dir path=usr/gnu/share/man
+dir path=usr/gnu/share/man/man1
+dir path=usr/gnu/share/locale
+dir path=usr/gnu/share/locale/ca
+dir path=usr/gnu/share/locale/ca/LC_MESSAGES
+dir path=usr/gnu/share/locale/ca/LC_TIME
+dir path=usr/gnu/share/locale/ro
+dir path=usr/gnu/share/locale/ro/LC_MESSAGES
+dir path=usr/gnu/share/locale/ro/LC_TIME
+dir path=usr/gnu/share/locale/it
+dir path=usr/gnu/share/locale/it/LC_MESSAGES
+dir path=usr/gnu/share/locale/it/LC_TIME
+dir path=usr/gnu/share/locale/eo
+dir path=usr/gnu/share/locale/eo/LC_TIME
+dir path=usr/gnu/share/locale/eo/LC_MESSAGES
+dir path=usr/gnu/share/locale/kk
+dir path=usr/gnu/share/locale/kk/LC_MESSAGES
+dir path=usr/gnu/share/locale/kk/LC_TIME
+dir path=usr/gnu/share/locale/sl
+dir path=usr/gnu/share/locale/sl/LC_TIME
+dir path=usr/gnu/share/locale/sl/LC_MESSAGES
+dir path=usr/gnu/share/locale/tr
+dir path=usr/gnu/share/locale/tr/LC_MESSAGES
+dir path=usr/gnu/share/locale/tr/LC_TIME
+dir path=usr/gnu/share/locale/sk
+dir path=usr/gnu/share/locale/sk/LC_MESSAGES
+dir path=usr/gnu/share/locale/sk/LC_TIME
+dir path=usr/gnu/share/locale/be
+dir path=usr/gnu/share/locale/be/LC_MESSAGES
+dir path=usr/gnu/share/locale/be/LC_TIME
+dir path=usr/gnu/share/locale/da
+dir path=usr/gnu/share/locale/da/LC_MESSAGES
+dir path=usr/gnu/share/locale/da/LC_TIME
+dir path=usr/gnu/share/locale/ja
+dir path=usr/gnu/share/locale/ja/LC_TIME
+dir path=usr/gnu/share/locale/ja/LC_MESSAGES
+dir path=usr/gnu/share/locale/de
+dir path=usr/gnu/share/locale/de/LC_MESSAGES
+dir path=usr/gnu/share/locale/de/LC_TIME
+dir path=usr/gnu/share/locale/vi
+dir path=usr/gnu/share/locale/vi/LC_MESSAGES
+dir path=usr/gnu/share/locale/vi/LC_TIME
+dir path=usr/gnu/share/locale/uk
+dir path=usr/gnu/share/locale/uk/LC_MESSAGES
+dir path=usr/gnu/share/locale/uk/LC_TIME
+dir path=usr/gnu/share/locale/el
+dir path=usr/gnu/share/locale/el/LC_MESSAGES
+dir path=usr/gnu/share/locale/el/LC_TIME
+dir path=usr/gnu/share/locale/sv
+dir path=usr/gnu/share/locale/sv/LC_TIME
+dir path=usr/gnu/share/locale/sv/LC_MESSAGES
+dir path=usr/gnu/share/locale/fi
+dir path=usr/gnu/share/locale/fi/LC_TIME
+dir path=usr/gnu/share/locale/fi/LC_MESSAGES
+dir path=usr/gnu/share/locale/pt_BR
+dir path=usr/gnu/share/locale/pt_BR/LC_MESSAGES
+dir path=usr/gnu/share/locale/pt_BR/LC_TIME
+dir path=usr/gnu/share/locale/eu
+dir path=usr/gnu/share/locale/eu/LC_MESSAGES
+dir path=usr/gnu/share/locale/eu/LC_TIME
+dir path=usr/gnu/share/locale/pt
+dir path=usr/gnu/share/locale/pt/LC_MESSAGES
+dir path=usr/gnu/share/locale/pt/LC_TIME
+dir path=usr/gnu/share/locale/ko
+dir path=usr/gnu/share/locale/ko/LC_MESSAGES
+dir path=usr/gnu/share/locale/ko/LC_TIME
+dir path=usr/gnu/share/locale/id
+dir path=usr/gnu/share/locale/id/LC_TIME
+dir path=usr/gnu/share/locale/id/LC_MESSAGES
+dir path=usr/gnu/share/locale/ru
+dir path=usr/gnu/share/locale/ru/LC_TIME
+dir path=usr/gnu/share/locale/ru/LC_MESSAGES
+dir path=usr/gnu/share/locale/cs
+dir path=usr/gnu/share/locale/cs/LC_TIME
+dir path=usr/gnu/share/locale/cs/LC_MESSAGES
+dir path=usr/gnu/share/locale/af
+dir path=usr/gnu/share/locale/af/LC_MESSAGES
+dir path=usr/gnu/share/locale/af/LC_TIME
+dir path=usr/gnu/share/locale/lt
+dir path=usr/gnu/share/locale/lt/LC_TIME
+dir path=usr/gnu/share/locale/lt/LC_MESSAGES
+dir path=usr/gnu/share/locale/lg
+dir path=usr/gnu/share/locale/lg/LC_TIME
+dir path=usr/gnu/share/locale/lg/LC_MESSAGES
+dir path=usr/gnu/share/locale/fr
+dir path=usr/gnu/share/locale/fr/LC_MESSAGES
+dir path=usr/gnu/share/locale/fr/LC_TIME
+dir path=usr/gnu/share/locale/nl
+dir path=usr/gnu/share/locale/nl/LC_TIME
+dir path=usr/gnu/share/locale/nl/LC_MESSAGES
+dir path=usr/gnu/share/locale/ga
+dir path=usr/gnu/share/locale/ga/LC_TIME
+dir path=usr/gnu/share/locale/ga/LC_MESSAGES
+dir path=usr/gnu/share/locale/nb
+dir path=usr/gnu/share/locale/nb/LC_TIME
+dir path=usr/gnu/share/locale/nb/LC_MESSAGES
+dir path=usr/gnu/share/locale/zh_TW
+dir path=usr/gnu/share/locale/zh_TW/LC_MESSAGES
+dir path=usr/gnu/share/locale/zh_TW/LC_TIME
+dir path=usr/gnu/share/locale/hr
+dir path=usr/gnu/share/locale/hr/LC_MESSAGES
+dir path=usr/gnu/share/locale/hr/LC_TIME
+dir path=usr/gnu/share/locale/et
+dir path=usr/gnu/share/locale/et/LC_TIME
+dir path=usr/gnu/share/locale/et/LC_MESSAGES
+dir path=usr/gnu/share/locale/bg
+dir path=usr/gnu/share/locale/bg/LC_MESSAGES
+dir path=usr/gnu/share/locale/bg/LC_TIME
+dir path=usr/gnu/share/locale/es
+dir path=usr/gnu/share/locale/es/LC_MESSAGES
+dir path=usr/gnu/share/locale/es/LC_TIME
+dir path=usr/gnu/share/locale/pl
+dir path=usr/gnu/share/locale/pl/LC_TIME
+dir path=usr/gnu/share/locale/pl/LC_MESSAGES
+dir path=usr/gnu/share/locale/hu
+dir path=usr/gnu/share/locale/hu/LC_MESSAGES
+dir path=usr/gnu/share/locale/hu/LC_TIME
+dir path=usr/gnu/share/locale/ms
+dir path=usr/gnu/share/locale/ms/LC_MESSAGES
+dir path=usr/gnu/share/locale/ms/LC_TIME
+dir path=usr/gnu/share/locale/zh_CN
+dir path=usr/gnu/share/locale/zh_CN/LC_TIME
+dir path=usr/gnu/share/locale/zh_CN/LC_MESSAGES
+dir path=usr/gnu/share/locale/gl
+dir path=usr/gnu/share/locale/gl/LC_MESSAGES
+dir path=usr/gnu/share/locale/gl/LC_TIME
+dir path=usr/gnu/libexec
+dir path=usr/gnu/libexec/coreutils
+dir path=usr/gnu/bin
+dir path=usr/gnu/lib
+dir path=usr/gnu/lib/$(MACH64)
+dir path=usr/share
+dir path=usr/share/info
+file path=usr/gnu/share/man/man1/uniq.1
+file path=usr/gnu/share/man/man1/unexpand.1
+file path=usr/gnu/share/man/man1/vdir.1
+file path=usr/gnu/share/man/man1/runcon.1
+file path=usr/gnu/share/man/man1/touch.1
+file path=usr/gnu/share/man/man1/cat.1
+file path=usr/gnu/share/man/man1/uname.1
+file path=usr/gnu/share/man/man1/dd.1
+file path=usr/gnu/share/man/man1/tr.1
+file path=usr/gnu/share/man/man1/seq.1
+file path=usr/gnu/share/man/man1/sleep.1
+file path=usr/gnu/share/man/man1/split.1
+file path=usr/gnu/share/man/man1/sum.1
+file path=usr/gnu/share/man/man1/basename.1
+file path=usr/gnu/share/man/man1/expand.1
+file path=usr/gnu/share/man/man1/dircolors.1
+file path=usr/gnu/share/man/man1/chcon.1
+file path=usr/gnu/share/man/man1/nice.1
+file path=usr/gnu/share/man/man1/tty.1
+file path=usr/gnu/share/man/man1/nproc.1
+file path=usr/gnu/share/man/man1/fmt.1
+file path=usr/gnu/share/man/man1/chgrp.1
+file path=usr/gnu/share/man/man1/chown.1
+file path=usr/gnu/share/man/man1/stty.1
+file path=usr/gnu/share/man/man1/unlink.1
+file path=usr/gnu/share/man/man1/mknod.1
+file path=usr/gnu/share/man/man1/shuf.1
+file path=usr/gnu/share/man/man1/cut.1
+file path=usr/gnu/share/man/man1/tsort.1
+file path=usr/gnu/share/man/man1/tee.1
+file path=usr/gnu/share/man/man1/chmod.1
+file path=usr/gnu/share/man/man1/head.1
+file path=usr/gnu/share/man/man1/md5sum.1
+file path=usr/gnu/share/man/man1/users.1
+file path=usr/gnu/share/man/man1/tail.1
+file path=usr/gnu/share/man/man1/base64.1
+file path=usr/gnu/share/man/man1/pinky.1
+file path=usr/gnu/share/man/man1/factor.1
+file path=usr/gnu/share/man/man1/who.1
+file path=usr/gnu/share/man/man1/mkfifo.1
+file path=usr/gnu/share/man/man1/printenv.1
+file path=usr/gnu/share/man/man1/uptime.1
+file path=usr/gnu/share/man/man1/mv.1
+file path=usr/gnu/share/man/man1/pathchk.1
+file path=usr/gnu/share/man/man1/rm.1
+file path=usr/gnu/share/man/man1/expr.1
+file path=usr/gnu/share/man/man1/pr.1
+file path=usr/gnu/share/man/man1/dir.1
+file path=usr/gnu/share/man/man1/false.1
+file path=usr/gnu/share/man/man1/df.1
+file path=usr/gnu/share/man/man1/printf.1
+file path=usr/gnu/share/man/man1/whoami.1
+file path=usr/gnu/share/man/man1/cp.1
+file path=usr/gnu/share/man/man1/true.1
+file path=usr/gnu/share/man/man1/sync.1
+file path=usr/gnu/share/man/man1/yes.1
+file path=usr/gnu/share/man/man1/date.1
+file path=usr/gnu/share/man/man1/link.1
+file path=usr/gnu/share/man/man1/ls.1
+file path=usr/gnu/share/man/man1/id.1
+file path=usr/gnu/share/man/man1/test.1
+file path=usr/gnu/share/man/man1/shred.1
+file path=usr/gnu/share/man/man1/pwd.1
+file path=usr/gnu/share/man/man1/paste.1
+file path=usr/gnu/share/man/man1/sha256sum.1
+file path=usr/gnu/share/man/man1/join.1
+file path=usr/gnu/share/man/man1/env.1
+file path=usr/gnu/share/man/man1/echo.1
+file path=usr/gnu/share/man/man1/sha384sum.1
+file path=usr/gnu/share/man/man1/nohup.1
+file path=usr/gnu/share/man/man1/sha1sum.1
+file path=usr/gnu/share/man/man1/nl.1
+file path=usr/gnu/share/man/man1/stdbuf.1
+file path=usr/gnu/share/man/man1/kill.1
+file path=usr/gnu/share/man/man1/sha512sum.1
+file path=usr/gnu/share/man/man1/logname.1
+file path=usr/gnu/share/man/man1/hostid.1
+file path=usr/gnu/share/man/man1/sha224sum.1
+file path=usr/gnu/share/man/man1/readlink.1
+file path=usr/gnu/share/man/man1/stat.1
+file path=usr/gnu/share/man/man1/mktemp.1
+file path=usr/gnu/share/man/man1/csplit.1
+file path=usr/gnu/share/man/man1/groups.1
+file path=usr/gnu/share/man/man1/od.1
+file path=usr/gnu/share/man/man1/mkdir.1
+file path=usr/gnu/share/man/man1/sort.1
+file path=usr/gnu/share/man/man1/tac.1
+file path=usr/gnu/share/man/man1/chroot.1
+file path=usr/gnu/share/man/man1/fold.1
+file path=usr/gnu/share/man/man1/timeout.1
+file path=usr/gnu/share/man/man1/realpath.1
+file path=usr/gnu/share/man/man1/wc.1
+file path=usr/gnu/share/man/man1/rmdir.1
+file path=usr/gnu/share/man/man1/install.1
+file path=usr/gnu/share/man/man1/dirname.1
+file path=usr/gnu/share/man/man1/du.1
+file path=usr/gnu/share/man/man1/comm.1
+file path=usr/gnu/share/man/man1/cksum.1
+file path=usr/gnu/share/man/man1/ln.1
+file path=usr/gnu/share/man/man1/ptx.1
+file path=usr/gnu/share/man/man1/truncate.1
+file path=usr/gnu/share/locale/ca/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/ro/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/it/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/eo/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/kk/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/sl/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/tr/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/sk/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/be/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/da/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/ja/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/de/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/vi/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/uk/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/el/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/sv/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/fi/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/pt_BR/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/eu/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/pt/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/ko/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/id/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/ru/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/cs/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/af/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/lt/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/lg/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/fr/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/nl/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/ga/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/nb/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/zh_TW/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/hr/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/et/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/bg/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/es/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/pl/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/hu/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/ms/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/zh_CN/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/share/locale/gl/LC_MESSAGES/coreutils.mo
+file path=usr/gnu/libexec/coreutils/libstdbuf.so
+file path=usr/gnu/bin/rmdir
+file path=usr/gnu/bin/base64
+file path=usr/gnu/bin/tee
+file path=usr/gnu/bin/sha384sum
+file path=usr/gnu/bin/id
+file path=usr/gnu/bin/chown
+file path=usr/gnu/bin/readlink
+file path=usr/gnu/bin/stdbuf
+file path=usr/gnu/bin/dirname
+file path=usr/gnu/bin/basename
+file path=usr/gnu/bin/nproc
+file path=usr/gnu/bin/stty
+file path=usr/gnu/bin/realpath
+file path=usr/gnu/bin/env
+file path=usr/gnu/bin/unexpand
+file path=usr/gnu/bin/uptime
+file path=usr/gnu/bin/mknod
+file path=usr/gnu/bin/shred
+file path=usr/gnu/bin/sha1sum
+file path=usr/gnu/bin/echo
+file path=usr/gnu/bin/tr
+file path=usr/gnu/bin/yes
+file path=usr/gnu/bin/touch
+file path=usr/gnu/bin/dir
+file path=usr/gnu/bin/chmod
+file path=usr/gnu/bin/sleep
+file path=usr/gnu/bin/mv
+file path=usr/gnu/bin/true
+file path=usr/gnu/bin/tac
+file path=usr/gnu/bin/du
+file path=usr/gnu/bin/logname
+file path=usr/gnu/bin/whoami
+file path=usr/gnu/bin/uname
+file path=usr/gnu/bin/fmt
+file path=usr/gnu/bin/df
+file path=usr/gnu/bin/sync
+file path=usr/gnu/bin/false
+file path=usr/gnu/bin/expand
+file path=usr/gnu/bin/install
+file path=usr/gnu/bin/wc
+file path=usr/gnu/bin/kill
+file path=usr/gnu/bin/split
+file path=usr/gnu/bin/nice
+file path=usr/gnu/bin/cat
+file path=usr/gnu/bin/sum
+file path=usr/gnu/bin/mktemp
+file path=usr/gnu/bin/od
+file path=usr/gnu/bin/tail
+file path=usr/gnu/bin/fold
+file path=usr/gnu/bin/vdir
+file path=usr/gnu/bin/sort
+file path=usr/gnu/bin/ln
+file path=usr/gnu/bin/groups
+file path=usr/gnu/bin/pr
+file path=usr/gnu/bin/sha512sum
+file path=usr/gnu/bin/shuf
+file path=usr/gnu/bin/join
+file path=usr/gnu/bin/dd
+file path=usr/gnu/bin/cksum
+file path=usr/gnu/bin/test
+file path=usr/gnu/bin/tty
+file path=usr/gnu/bin/cut
+file path=usr/gnu/bin/hostid
+file path=usr/gnu/bin/timeout
+file path=usr/gnu/bin/truncate
+file path=usr/gnu/bin/rm
+file path=usr/gnu/bin/sha224sum
+file path=usr/gnu/bin/pathchk
+file path=usr/gnu/bin/sha256sum
+file path=usr/gnu/bin/printf
+file path=usr/gnu/bin/stat
+file path=usr/gnu/bin/runcon
+file path=usr/gnu/bin/users
+file path=usr/gnu/bin/cp
+file path=usr/gnu/bin/seq
+file path=usr/gnu/bin/paste
+file path=usr/gnu/bin/mkdir
+file path=usr/gnu/bin/nohup
+file path=usr/gnu/bin/head
+file path=usr/gnu/bin/factor
+file path=usr/gnu/bin/link
+file path=usr/gnu/bin/md5sum
+file path=usr/gnu/bin/chcon
+file path=usr/gnu/bin/unlink
+file path=usr/gnu/bin/ls
+file path=usr/gnu/bin/pinky
+file path=usr/gnu/bin/mkfifo
+file path=usr/gnu/bin/expr
+file path=usr/gnu/bin/dircolors
+file path=usr/gnu/bin/date
+file path=usr/gnu/bin/pwd
+file path=usr/gnu/bin/who
+file path=usr/gnu/bin/ptx
+file path=usr/gnu/bin/tsort
+file path=usr/gnu/bin/nl
+file path=usr/gnu/bin/csplit
+file path=usr/gnu/bin/chgrp
+file path=usr/gnu/bin/[
+file path=usr/gnu/bin/chroot
+file path=usr/gnu/bin/uniq
+file path=usr/gnu/bin/comm
+file path=usr/gnu/bin/printenv
+file path=usr/share/info/coreutils.info
+link path=usr/gnu/share/locale/ca/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/ro/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/it/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/eo/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/kk/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/sl/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/tr/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/sk/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/be/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/da/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/ja/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/de/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/vi/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/uk/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/el/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/sv/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/fi/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/pt_BR/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/eu/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/pt/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/ko/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/id/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/ru/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/cs/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/af/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/lt/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/lg/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/fr/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/nl/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/ga/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/nb/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/zh_TW/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/hr/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/et/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/bg/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/es/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/pl/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/hu/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/ms/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/zh_CN/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
+link path=usr/gnu/share/locale/gl/LC_TIME/coreutils.mo target=../LC_MESSAGES/coreutils.mo
diff --git a/examples/db5.1/Makefile b/examples/db5.1/Makefile
new file mode 100644
index 0000000..27008c2
--- /dev/null
+++ b/examples/db5.1/Makefile
@@ -0,0 +1,33 @@
+include /usr/share/cibs/rules/ips.mk
+include /usr/share/cibs/rules/archive.mk
+include /usr/share/cibs/rules/32.mk
+include /usr/share/cibs/rules/64.mk
+include /usr/share/cibs/rules/autotools.mk
+
+db-ver := 5.1
+
+summary := Berkeley Database v$(db-ver)
+license := BSD
+license-file := LICENSE
+
+build-depends += \
+
+configure-options += \
+ --enable-cxx \
+ --enable-compat185 \
+ --enable-sql \
+ --enable-stl
+
+
+configure = $(sourcedir)/dist/configure
+
+name := db
+home := http://www.oracle.com/technetwork/products/berkeleydb
+version := $(db-ver).29
+archive := $(name)-$(version).tar.gz
+download := http://download.oracle.com/berkeley-db/$(archive)
+checksum := \
+ md5:a94ea755ab695bc04f82b94d2e24a1ef \
+ sha1:42dc96c71873c7fde543c916ed866cadee6fa51d \
+ sha256:a943cb4920e62df71de1069ddca486d408f6d7a09ddbbb5637afe7a229389182 \
+ size:32188074
diff --git a/examples/db5.1/db-sql.p5m b/examples/db5.1/db-sql.p5m
new file mode 100644
index 0000000..5b1419d
--- /dev/null
+++ b/examples/db5.1/db-sql.p5m
@@ -0,0 +1,10 @@
+set name=pkg.fmri value=pkg:/database/db-$(db-ver)-sql@$(ips-version)
+set name=pkg.summary value="$(summary), SQL utility"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+
+file usr/bin/dbsql path=usr/bin/db-$(db-ver)_sql
+
diff --git a/examples/db5.1/db.p5m b/examples/db5.1/db.p5m
new file mode 100644
index 0000000..6e6b737
--- /dev/null
+++ b/examples/db5.1/db.p5m
@@ -0,0 +1,26 @@
+set name=pkg.fmri value=pkg:/database/db-$(db-ver)@$(ips-version)
+set name=pkg.summary value="$(summary), utilities"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+
+
+# Rename db_foo -> db<version>_foo
+<transform file path=.*/bin/db_.* -> set action.hash %(path)>
+<transform file path=.*/bin/db_.* -> edit path db_ db-$(db-ver)_>
+
+file path=usr/bin/db_dump
+file path=usr/bin/db_archive
+file path=usr/bin/db_replicate
+file path=usr/bin/db_deadlock
+file path=usr/bin/db_verify
+file path=usr/bin/db_upgrade
+file path=usr/bin/db_stat
+file path=usr/bin/db_checkpoint
+file path=usr/bin/db_printlog
+file path=usr/bin/db_hotbackup
+file path=usr/bin/db_recover
+file path=usr/bin/db_log_verify
+file path=usr/bin/db_load
diff --git a/examples/db5.1/libdb-cxx-so.p5m b/examples/db5.1/libdb-cxx-so.p5m
new file mode 100644
index 0000000..3d1e8c0
--- /dev/null
+++ b/examples/db5.1/libdb-cxx-so.p5m
@@ -0,0 +1,10 @@
+set name=pkg.fmri value=pkg:/library/libdb-cxx-$(db-ver)-so@$(ips-version)
+set name=pkg.summary value="$(summary), C++ shared library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+
+file path=usr/lib/$(mach64)/libdb_cxx-$(db-ver).so
+file path=usr/lib/libdb_cxx-$(db-ver).so
diff --git a/examples/db5.1/libdb-cxx.p5m b/examples/db5.1/libdb-cxx.p5m
new file mode 100644
index 0000000..9dd55a0
--- /dev/null
+++ b/examples/db5.1/libdb-cxx.p5m
@@ -0,0 +1,14 @@
+set name=pkg.fmri value=pkg:/library/libdb-cxx-$(db-ver)@$(ips-version)
+set name=pkg.summary value="$(summary), C++ library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+depend fmri=pkg:/library/libdb-cxx-$(db-ver)-so@$(ips-version) type=require
+depend fmri=pkg:/library/libdb-cxx-$(db-ver)-so@$(ips-version) type=incorporate
+
+file path=usr/include/db_cxx.h
+
+link target=libdb_cxx--$(db-ver).so path=usr/lib/$(mach64)/libdb_cxx.so
+link target=libdb_cxx--$(db-ver).so path=usr/lib/libdb_cxx.so
diff --git a/examples/db5.1/libdb-so.p5m b/examples/db5.1/libdb-so.p5m
new file mode 100644
index 0000000..5fc32ef
--- /dev/null
+++ b/examples/db5.1/libdb-so.p5m
@@ -0,0 +1,10 @@
+set name=pkg.fmri value=pkg:/library/libdb-$(db-ver)-so@$(ips-version)
+set name=pkg.summary value="$(summary), shared library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+
+file path=usr/lib/$(mach64)/libdb-$(db-ver).so
+file path=usr/lib/libdb-$(db-ver).so
diff --git a/examples/db5.1/libdb-sql-so.p5m b/examples/db5.1/libdb-sql-so.p5m
new file mode 100644
index 0000000..4e41392
--- /dev/null
+++ b/examples/db5.1/libdb-sql-so.p5m
@@ -0,0 +1,10 @@
+set name=pkg.fmri value=pkg:/library/libdb-sql-$(db-ver)-so@$(ips-version)
+set name=pkg.summary value="$(summary), SQL shared library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+
+file path=usr/lib/$(mach64)/libdb_sql-$(db-ver).so
+file path=usr/lib/libdb_sql-$(db-ver).so
diff --git a/examples/db5.1/libdb-sql.p5m b/examples/db5.1/libdb-sql.p5m
new file mode 100644
index 0000000..3ec75ac
--- /dev/null
+++ b/examples/db5.1/libdb-sql.p5m
@@ -0,0 +1,14 @@
+set name=pkg.fmri value=pkg:/library/libdb-sql-$(db-ver)@$(ips-version)
+set name=pkg.summary value="$(summary), SQL library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+depend fmri=pkg:/library/libdb-sql-$(db-ver)-so@$(ips-version) type=require
+depend fmri=pkg:/library/libdb-sql-$(db-ver)-so@$(ips-version) type=incorporate
+
+file path=usr/include/dbsql.h
+
+link target=libdb_sql--$(db-ver).so path=usr/lib/$(mach64)/libdb_sql.so
+link target=libdb_sql--$(db-ver).so path=usr/lib/libdb_sql.so
diff --git a/examples/db5.1/libdb-stl-so.p5m b/examples/db5.1/libdb-stl-so.p5m
new file mode 100644
index 0000000..0c404cc
--- /dev/null
+++ b/examples/db5.1/libdb-stl-so.p5m
@@ -0,0 +1,10 @@
+set name=pkg.fmri value=pkg:/library/libdb-stl-$(db-ver)-so@$(ips-version)
+set name=pkg.summary value="$(summary), C++ STL shared library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+
+file path=usr/lib/$(mach64)/libdb_stl-$(db-ver).so
+file path=usr/lib/libdb_stl-$(db-ver).so
diff --git a/examples/db5.1/libdb-stl.p5m b/examples/db5.1/libdb-stl.p5m
new file mode 100644
index 0000000..6236107
--- /dev/null
+++ b/examples/db5.1/libdb-stl.p5m
@@ -0,0 +1,26 @@
+set name=pkg.fmri value=pkg:/library/libdb-stl-$(db-ver)@$(ips-version)
+set name=pkg.summary value="$(summary), C++ STL library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+depend fmri=pkg:/library/libdb-stl-$(db-ver)-so@$(ips-version) type=require
+depend fmri=pkg:/library/libdb-stl-$(db-ver)-so@$(ips-version) type=incorporate
+
+file path=usr/include/dbstl_vector.h
+file path=usr/include/dbstl_inner_utility.h
+file path=usr/include/dbstl_utility.h
+file path=usr/include/dbstl_map.h
+file path=usr/include/dbstl_set.h
+file path=usr/include/dbstl_dbt.h
+file path=usr/include/dbstl_resource_manager.h
+file path=usr/include/dbstl_container.h
+file path=usr/include/dbstl_element_ref.h
+file path=usr/include/dbstl_exception.h
+file path=usr/include/dbstl_base_iterator.h
+file path=usr/include/dbstl_common.h
+file path=usr/include/dbstl_dbc.h
+
+link target=libdb_stl--$(db-ver).so path=usr/lib/$(mach64)/libdb_stl.so
+link target=libdb_stl--$(db-ver).so path=usr/lib/libdb_stl.so
diff --git a/examples/db5.1/libdb.p5m b/examples/db5.1/libdb.p5m
new file mode 100644
index 0000000..35236b2
--- /dev/null
+++ b/examples/db5.1/libdb.p5m
@@ -0,0 +1,15 @@
+set name=pkg.fmri value=pkg:/library/libdb-$(db-ver)@$(ips-version)
+set name=pkg.summary value="$(summary), library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+depend fmri=pkg:/library/libdb-$(db-ver)-so@$(ips-version) type=require
+depend fmri=pkg:/library/libdb-$(db-ver)-so@$(ips-version) type=incorporate
+
+file path=usr/include/db.h
+file path=usr/include/db_185.h
+
+link target=libdb--$(db-ver).so path=usr/lib/$(mach64)/libdb.so
+link target=libdb--$(db-ver).so path=usr/lib/libdb.so
diff --git a/examples/findutils/Makefile b/examples/findutils/Makefile
deleted file mode 100644
index a9ec520..0000000
--- a/examples/findutils/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-include /usr/share/cibs/rules/ips.mk
-include /usr/share/cibs/rules/archive.mk
-include /usr/share/cibs/rules/autotools.mk
-include /usr/share/cibs/rules/32.mk
-
-
-summary := GNU utilities for finding files
-license := GPLv3
-license-file := COPYING
-
-configure-options += --localstatedir=/var/cache/glocate
-
-build-depends += \
-
-prefix := /usr/gnu
-
-name := findutils
-home := http://www.gnu.org/software/$(name)/
-version := 4.4.2
-archive := $(name)-$(version).tar.gz
-download := http://ftp.gnu.org/gnu/$(name)/$(archive)
-checksum := \
- md5:351cc4adb07d54877fa15f75fb77d39f \
- sha1:e8dd88fa2cc58abffd0bfc1eddab9020231bb024 \
- sha256:434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a \
- size:2149838
diff --git a/examples/findutils/gnu-findutils.p5m b/examples/findutils/gnu-findutils.p5m
deleted file mode 100644
index e4e6c32..0000000
--- a/examples/findutils/gnu-findutils.p5m
+++ /dev/null
@@ -1,145 +0,0 @@
-set name=pkg.fmri value=pkg:/file/gnu-$(name)@$(ips-version)
-set name=pkg.summary value="$(summary)"
-set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
-license $(license-file) license="$(license)"
-
-<transform file path=usr/gnu/bin/(.+) -> \
-emit link path=usr/bin/g%<1> target=../gnu/bin/%<1> >
-
-<transform file path=usr/gnu/share/man/man1/(.+) -> \
-emit link path=usr/share/man/man1/g%<1> target=../../../gnu/share/man/man1/%<1> >
-
-
-dir path=usr
-dir path=usr/gnu
-dir path=usr/gnu/bin
-dir path=usr/gnu/share
-dir path=usr/gnu/share/locale
-dir path=usr/gnu/share/locale/be
-dir path=usr/gnu/share/locale/be/LC_MESSAGES
-dir path=usr/gnu/share/locale/bg
-dir path=usr/gnu/share/locale/bg/LC_MESSAGES
-dir path=usr/gnu/share/locale/ca
-dir path=usr/gnu/share/locale/ca/LC_MESSAGES
-dir path=usr/gnu/share/locale/cs
-dir path=usr/gnu/share/locale/cs/LC_MESSAGES
-dir path=usr/gnu/share/locale/da
-dir path=usr/gnu/share/locale/da/LC_MESSAGES
-dir path=usr/gnu/share/locale/de
-dir path=usr/gnu/share/locale/de/LC_MESSAGES
-dir path=usr/gnu/share/locale/el
-dir path=usr/gnu/share/locale/el/LC_MESSAGES
-dir path=usr/gnu/share/locale/eo
-dir path=usr/gnu/share/locale/eo/LC_MESSAGES
-dir path=usr/gnu/share/locale/es
-dir path=usr/gnu/share/locale/es/LC_MESSAGES
-dir path=usr/gnu/share/locale/et
-dir path=usr/gnu/share/locale/et/LC_MESSAGES
-dir path=usr/gnu/share/locale/fi
-dir path=usr/gnu/share/locale/fi/LC_MESSAGES
-dir path=usr/gnu/share/locale/fr
-dir path=usr/gnu/share/locale/fr/LC_MESSAGES
-dir path=usr/gnu/share/locale/ga
-dir path=usr/gnu/share/locale/ga/LC_MESSAGES
-dir path=usr/gnu/share/locale/gl
-dir path=usr/gnu/share/locale/gl/LC_MESSAGES
-dir path=usr/gnu/share/locale/hr
-dir path=usr/gnu/share/locale/hr/LC_MESSAGES
-dir path=usr/gnu/share/locale/hu
-dir path=usr/gnu/share/locale/hu/LC_MESSAGES
-dir path=usr/gnu/share/locale/id
-dir path=usr/gnu/share/locale/id/LC_MESSAGES
-dir path=usr/gnu/share/locale/it
-dir path=usr/gnu/share/locale/it/LC_MESSAGES
-dir path=usr/gnu/share/locale/ja
-dir path=usr/gnu/share/locale/ja/LC_MESSAGES
-dir path=usr/gnu/share/locale/ko
-dir path=usr/gnu/share/locale/ko/LC_MESSAGES
-dir path=usr/gnu/share/locale/lg
-dir path=usr/gnu/share/locale/lg/LC_MESSAGES
-dir path=usr/gnu/share/locale/lt
-dir path=usr/gnu/share/locale/lt/LC_MESSAGES
-dir path=usr/gnu/share/locale/ms
-dir path=usr/gnu/share/locale/ms/LC_MESSAGES
-dir path=usr/gnu/share/locale/nl
-dir path=usr/gnu/share/locale/nl/LC_MESSAGES
-dir path=usr/gnu/share/locale/pl
-dir path=usr/gnu/share/locale/pl/LC_MESSAGES
-dir path=usr/gnu/share/locale/pt
-dir path=usr/gnu/share/locale/pt_BR
-dir path=usr/gnu/share/locale/pt_BR/LC_MESSAGES
-dir path=usr/gnu/share/locale/pt/LC_MESSAGES
-dir path=usr/gnu/share/locale/ro
-dir path=usr/gnu/share/locale/ro/LC_MESSAGES
-dir path=usr/gnu/share/locale/ru
-dir path=usr/gnu/share/locale/ru/LC_MESSAGES
-dir path=usr/gnu/share/locale/rw
-dir path=usr/gnu/share/locale/rw/LC_MESSAGES
-dir path=usr/gnu/share/locale/sk
-dir path=usr/gnu/share/locale/sk/LC_MESSAGES
-dir path=usr/gnu/share/locale/sl
-dir path=usr/gnu/share/locale/sl/LC_MESSAGES
-dir path=usr/gnu/share/locale/sr
-dir path=usr/gnu/share/locale/sr/LC_MESSAGES
-dir path=usr/gnu/share/locale/sv
-dir path=usr/gnu/share/locale/sv/LC_MESSAGES
-dir path=usr/gnu/share/locale/tr
-dir path=usr/gnu/share/locale/tr/LC_MESSAGES
-dir path=usr/gnu/share/locale/uk
-dir path=usr/gnu/share/locale/uk/LC_MESSAGES
-dir path=usr/gnu/share/locale/vi
-dir path=usr/gnu/share/locale/vi/LC_MESSAGES
-dir path=usr/gnu/share/locale/zh_CN
-dir path=usr/gnu/share/locale/zh_CN/LC_MESSAGES
-dir path=usr/gnu/share/locale/zh_TW
-dir path=usr/gnu/share/locale/zh_TW/LC_MESSAGES
-dir path=usr/gnu/share/man
-dir path=usr/gnu/share/man/man1
-dir path=usr/share
-dir path=usr/share/info
-file path=usr/gnu/bin/find
-file path=usr/gnu/bin/xargs
-file path=usr/gnu/share/locale/be/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/bg/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/ca/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/cs/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/da/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/de/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/el/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/eo/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/es/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/et/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/fi/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/fr/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/ga/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/gl/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/hr/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/hu/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/id/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/it/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/ja/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/ko/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/lg/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/lt/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/ms/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/nl/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/pl/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/pt_BR/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/pt/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/ro/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/ru/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/rw/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/sk/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/sl/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/sr/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/sv/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/tr/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/uk/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/vi/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/zh_CN/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/locale/zh_TW/LC_MESSAGES/findutils.mo
-file path=usr/gnu/share/man/man1/find.1
-file path=usr/gnu/share/man/man1/xargs.1
-file path=usr/share/info/find-maint.info
-file path=usr/share/info/find.info
diff --git a/examples/findutils/locate.p5m b/examples/findutils/locate.p5m
deleted file mode 100644
index e798007..0000000
--- a/examples/findutils/locate.p5m
+++ /dev/null
@@ -1,29 +0,0 @@
-set name=pkg.fmri value=pkg:/file/gnu-$(name)/locate@$(ips-version)
-set name=pkg.summary value="$(summary)"
-set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
-license $(license-file) license="$(license)"
-
-depend fmri=pkg:/file/gnu-$(name)@4.4 type=require
-
-# TODO: mediators for /usr/bin/{locate,updatedb}
-
-dir path=usr
-dir path=usr/gnu
-dir path=usr/gnu/bin
-dir path=usr/gnu/libexec
-dir path=usr/gnu/share
-dir path=usr/gnu/share/man
-dir path=usr/gnu/share/man/man1
-dir path=usr/gnu/share/man/man5
-dir path=var
-dir path=var/cache/
-dir path=var/cache/glocate
-file path=usr/gnu/bin/locate
-file path=usr/gnu/bin/updatedb
-file path=usr/gnu/libexec/bigram
-file path=usr/gnu/libexec/code
-file path=usr/gnu/libexec/frcode
-file path=usr/gnu/share/man/man1/locate.1
-file path=usr/gnu/share/man/man1/updatedb.1
-file path=usr/gnu/share/man/man5/locatedb.5
diff --git a/examples/gawk/Makefile b/examples/gawk/Makefile
deleted file mode 100644
index 6c0f66e..0000000
--- a/examples/gawk/Makefile
+++ /dev/null
@@ -1,25 +0,0 @@
-include /usr/share/cibs/rules/ips.mk
-include /usr/share/cibs/rules/archive.mk
-include /usr/share/cibs/rules/autotools.mk
-include /usr/share/cibs/rules/32.mk
-
-summary := GNU implementation of the traditional Unix macro processor
-license := GPL
-license-file := COPYING
-
-build-depends += \
- pkg:/library/libsigsegv \
- pkg:/library/readline \
- pkg:/compress/xz
-
-
-name := gawk
-home := http://www.gnu.org/software/$(name)/
-version := 4.0.1
-archive := $(name)-$(version).tar.xz
-download := http://ftp.gnu.org/gnu/$(name)/$(archive)
-checksum := \
- md5:a601b032c39cd982f34272664f8afa49 \
- sha1:9be956d124e0c0794836055846aea78d2dc547ad \
- sha256:ae0cb9a0ac80686df316fcd126d0da7d1fb6a0acfe043320511c1f212f2ecb47 \
- size:1612448
diff --git a/examples/gawk/gawk.p5m b/examples/gawk/gawk.p5m
deleted file mode 100644
index a9939c2..0000000
--- a/examples/gawk/gawk.p5m
+++ /dev/null
@@ -1,80 +0,0 @@
-set name=pkg.fmri value=pkg:/text/$(name)@$(ips-version)
-set name=pkg.summary value="$(summary)"
-set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
-
-license $(license-file) license=$(license)
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/libexec
-dir path=usr/libexec/awk
-dir path=usr/share
-dir path=usr/share/awk
-dir path=usr/share/info
-dir path=usr/share/locale
-dir path=usr/share/locale/da
-dir path=usr/share/locale/da/LC_MESSAGES
-dir path=usr/share/locale/de
-dir path=usr/share/locale/de/LC_MESSAGES
-dir path=usr/share/locale/es
-dir path=usr/share/locale/es/LC_MESSAGES
-dir path=usr/share/locale/fi
-dir path=usr/share/locale/fi/LC_MESSAGES
-dir path=usr/share/locale/fr
-dir path=usr/share/locale/fr/LC_MESSAGES
-dir path=usr/share/locale/it
-dir path=usr/share/locale/it/LC_MESSAGES
-dir path=usr/share/locale/ja
-dir path=usr/share/locale/ja/LC_MESSAGES
-dir path=usr/share/locale/nl
-dir path=usr/share/locale/nl/LC_MESSAGES
-dir path=usr/share/locale/pl
-dir path=usr/share/locale/pl/LC_MESSAGES
-dir path=usr/share/locale/sv
-dir path=usr/share/locale/sv/LC_MESSAGES
-dir path=usr/share/man
-dir path=usr/share/man/man1
-file path=usr/bin/dgawk
-file path=usr/bin/gawk-$(version)
-file path=usr/bin/igawk
-file path=usr/bin/pgawk-$(version)
-file path=usr/libexec/awk/grcat
-file path=usr/libexec/awk/pwcat
-file path=usr/share/awk/assert.awk
-file path=usr/share/awk/bits2str.awk
-file path=usr/share/awk/cliff_rand.awk
-file path=usr/share/awk/ctime.awk
-file path=usr/share/awk/ftrans.awk
-file path=usr/share/awk/getopt.awk
-file path=usr/share/awk/gettime.awk
-file path=usr/share/awk/group.awk
-file path=usr/share/awk/join.awk
-file path=usr/share/awk/libintl.awk
-file path=usr/share/awk/noassign.awk
-file path=usr/share/awk/ord.awk
-file path=usr/share/awk/passwd.awk
-file path=usr/share/awk/quicksort.awk
-file path=usr/share/awk/readable.awk
-file path=usr/share/awk/rewind.awk
-file path=usr/share/awk/round.awk
-file path=usr/share/awk/strtonum.awk
-file path=usr/share/awk/walkarray.awk
-file path=usr/share/awk/zerofile.awk
-file path=usr/share/info/gawk.info
-file path=usr/share/info/gawkinet.info
-file path=usr/share/locale/da/LC_MESSAGES/gawk.mo
-file path=usr/share/locale/de/LC_MESSAGES/gawk.mo
-file path=usr/share/locale/es/LC_MESSAGES/gawk.mo
-file path=usr/share/locale/fi/LC_MESSAGES/gawk.mo
-file path=usr/share/locale/fr/LC_MESSAGES/gawk.mo
-file path=usr/share/locale/it/LC_MESSAGES/gawk.mo
-file path=usr/share/locale/ja/LC_MESSAGES/gawk.mo
-file path=usr/share/locale/nl/LC_MESSAGES/gawk.mo
-file path=usr/share/locale/pl/LC_MESSAGES/gawk.mo
-file path=usr/share/locale/sv/LC_MESSAGES/gawk.mo
-file path=usr/share/man/man1/gawk.1
-file path=usr/share/man/man1/igawk.1
-file path=usr/share/man/man1/pgawk.1
-link path=usr/bin/gawk target=gawk-$(version)
-link path=usr/bin/pgawk target=pgawk-$(version)
diff --git a/examples/gcc-4.4/Makefile b/examples/gcc-4.4/Makefile
index 44fa77f..b8847f8 100644
--- a/examples/gcc-4.4/Makefile
+++ b/examples/gcc-4.4/Makefile
@@ -20,8 +20,6 @@ build-depends += \
developer/gperf \
developer/build/autogen \
-
-
configure-options += \
--enable-languages='c,c++,fortran' \
--enable-shared \
diff --git a/examples/gcc-4.4/illumos-gcc.p5m b/examples/gcc-4.4/illumos-gcc.p5m
index f77e71e..cd33a89 100644
--- a/examples/gcc-4.4/illumos-gcc.p5m
+++ b/examples/gcc-4.4/illumos-gcc.p5m
@@ -29,7 +29,6 @@ set name=info.upstream-url value=$(home)
depend fmri=pkg:/developer/gcc/gcc-4.4 type=require
depend fmri=pkg:/developer/gcc/g++-4.4 type=require
-dir path=opt
dir path=opt/gcc
dir path=opt/gcc/4.4.4
dir path=opt/gcc/4.4.4/bin
diff --git a/examples/gcc-defaults/Makefile b/examples/gcc-defaults/Makefile
index 9e87543..fdb02a2 100644
--- a/examples/gcc-defaults/Makefile
+++ b/examples/gcc-defaults/Makefile
@@ -1,5 +1,6 @@
include /usr/share/cibs/rules/ips.mk
+name := gcc-default
default-version := 4.4
version := $(default-version)
diff --git a/examples/gcc-defaults/cpp.p5m b/examples/gcc-defaults/cpp.p5m
index 96df610..8027867 100644
--- a/examples/gcc-defaults/cpp.p5m
+++ b/examples/gcc-defaults/cpp.p5m
@@ -27,6 +27,8 @@ set name=pkg.summary value="GNU C preprocessor, default version"
depend fmri=pkg:/developer/gcc/cpp-$(default-version) type=require
-link path=usr/bin/cpp target=cpp-$(default-version)
-link path=usr/share/man/man1/cpp.1 target=cpp-$(default-version).1
+link path=usr/bin/cpp target=cpp-$(default-version) \
+ original_name=developer/gcc-3
+link path=usr/share/man/man1/cpp.1 target=cpp-$(default-version).1 \
+ original_name=developer/gcc-3
diff --git a/examples/gcc-defaults/g++.p5m b/examples/gcc-defaults/g++.p5m
index 255a0c3..40decb5 100644
--- a/examples/gcc-defaults/g++.p5m
+++ b/examples/gcc-defaults/g++.p5m
@@ -27,6 +27,8 @@ set name=pkg.summary value="GNU C++ compiler, default version"
depend fmri=pkg:/developer/gcc/g++-$(default-version) type=require
-link path=usr/bin/g++ target=g++-$(default-version)
-link path=usr/share/man/man1/g++.1 target=g++-$(default-version).1
+link path=usr/bin/g++ target=g++-$(default-version) \
+ original_name=developer/gcc-3
+link path=usr/share/man/man1/g++.1 target=g++-$(default-version).1 \
+ original_name=developer/gcc-3
diff --git a/examples/gcc-defaults/gcc.p5m b/examples/gcc-defaults/gcc.p5m
index 6e860eb..3534350 100644
--- a/examples/gcc-defaults/gcc.p5m
+++ b/examples/gcc-defaults/gcc.p5m
@@ -27,6 +27,8 @@ set name=pkg.summary value="GNU C compiler, default version"
depend fmri=pkg:/developer/gcc/gcc-$(default-version) type=require
-link path=usr/bin/gcc target=gcc-$(default-version)
-link path=usr/share/man/man1/gcc.1 target=gcc-$(default-version).1
+link path=usr/bin/gcc target=gcc-$(default-version) \
+ original_name=developer/gcc-3
+link path=usr/share/man/man1/gcc.1 target=gcc-$(default-version).1 \
+ original_name=developer/gcc-3
diff --git a/examples/gcc-defaults/gfortran.p5m b/examples/gcc-defaults/gfortran.p5m
index a690ec2..cda97d9 100644
--- a/examples/gcc-defaults/gfortran.p5m
+++ b/examples/gcc-defaults/gfortran.p5m
@@ -22,11 +22,13 @@
#
-set name=pkg.fmri value=pkg:/developer/gfortran/gfortran@$(ips-version)
+set name=pkg.fmri value=pkg:/developer/gcc/gfortran@$(ips-version)
set name=pkg.summary value="GNU Frotran 95 compiler, default version"
depend fmri=pkg:/developer/gcc/gfortran-$(default-version) type=require
-link path=usr/bin/gfortran target=gfortran-$(default-version)
-link path=usr/share/man/man1/gfortran.1 target=gfortran-$(default-version).1
+link path=usr/bin/gfortran target=gfortran-$(default-version) \
+ original_name=developer/gcc-3
+link path=usr/share/man/man1/gfortran.1 target=gfortran-$(default-version).1 \
+ original_name=developer/gcc-3
diff --git a/examples/gm4/Makefile b/examples/gm4/Makefile
deleted file mode 100644
index 393aa1c..0000000
--- a/examples/gm4/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-include /usr/share/cibs/rules/ips.mk
-include /usr/share/cibs/rules/archive.mk
-#include /usr/share/cibs/rules/autoreconf.mk
-include /usr/share/cibs/rules/autotools.mk
-include /usr/share/cibs/rules/32.mk
-
-summary := GNU implementation of the traditional Unix macro processor
-license := GPL
-license-file := COPYING
-
-prefix := /usr/gnu
-
-build-depends += \
- pkg:/library/libsigsegv
-
-
-home := http://www.gnu.org/software/m4/
-name := m4
-version := 1.4.16
-archive := $(name)-$(version).tar.bz2
-download := http://ftp.gnu.org/gnu/$(name)/$(archive)
-checksum := \
- md5:8a7cef47fecab6272eb86a6be6363b2f \
- sha1:0390c77780ab4cd65b07fe4e2d23e4e39769f967 \
- sha256:42500c1fddd90bcb161e6b58de931d769929c495c124112d67428a23543db90c \
- size:1258362
diff --git a/examples/gm4/gm4.p5m b/examples/gm4/gm4.p5m
deleted file mode 100644
index 72eb682..0000000
--- a/examples/gm4/gm4.p5m
+++ /dev/null
@@ -1,26 +0,0 @@
-set name=pkg.fmri value=pkg:/developer/macro/gnu-$(name)@$(ips-version)
-set name=pkg.summary value="$(summary)"
-set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
-
-license $(license-file) license=$(license)
-
-<transform file path=usr/gnu/bin/(.+) -> \
-emit link path=usr/bin/g%<1> target=../gnu/bin/%<1> >
-
-<transform file path=usr/gnu/share/man/man1/(.+) -> \
-emit link path=usr/share/man/man1/g%<1> target=../../../gnu/share/man/man1/%<1>>
-
-
-dir path=usr
-dir path=usr/gnu
-dir path=usr/gnu/bin
-dir path=usr/gnu/share
-dir path=usr/gnu/share/man
-dir path=usr/gnu/share/man/man1
-dir path=usr/share/info
-file path=usr/gnu/bin/m4
-file path=usr/gnu/share/man/man1/m4.1
-file path=usr/share/info/m4.info
-file path=usr/share/info/m4.info-1
-file path=usr/share/info/m4.info-2
diff --git a/examples/gmp/gmp.p5m b/examples/gmp/gmp.p5m
index 4b4c139..f8f64c8 100644
--- a/examples/gmp/gmp.p5m
+++ b/examples/gmp/gmp.p5m
@@ -1,10 +1,13 @@
set name=pkg.fmri value=pkg:/library/gmp@$(ips-version)
set name=pkg.summary value="$(summary)"
set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
+set name=info.source-url value="$(download)"
license $(license-file) license=$(license)
+depend fmri=pkg:/library/gmp10@$(ips-version) type=require
+depend fmri=pkg:/library/gmp10@$(ips-version) type=incorporate
+
dir path=usr
dir path=usr/include
dir path=usr/lib
@@ -12,15 +15,11 @@ dir path=usr/lib/$(MACH64)
dir path=usr/share
dir path=usr/share/info
file path=usr/include/gmp.h
-file path=usr/lib/$(MACH64)/libgmp.so.10.0.5
-file path=usr/lib/libgmp.so.10.0.5
file path=usr/share/info/gmp.info
file path=usr/share/info/gmp.info-1
file path=usr/share/info/gmp.info-2
link path=usr/lib/$(MACH64)/libgmp.so target=libgmp.so.10.0.5
-link path=usr/lib/$(MACH64)/libgmp.so.10 target=libgmp.so.10.0.5
link path=usr/lib/libgmp.so target=libgmp.so.10.0.5
-link path=usr/lib/libgmp.so.10 target=libgmp.so.10.0.5
# GMP 5.0 is upwardly source and binary compatible with 4.x,
# and 3.x versions, except for applications that use
diff --git a/examples/gmp/gmp10.p5m b/examples/gmp/gmp10.p5m
new file mode 100644
index 0000000..6ffd7ec
--- /dev/null
+++ b/examples/gmp/gmp10.p5m
@@ -0,0 +1,11 @@
+set name=pkg.fmri value=pkg:/library/gmp10@$(ips-version)
+set name=pkg.summary value="$(summary), shared library"
+set name=info.upstream-url value="$(home)"
+set name=info.sourcer-_url value="$(download)"
+license $(license-file) license=$(license)
+
+file path=usr/lib/$(MACH64)/libgmp.so.10.0.5
+file path=usr/lib/libgmp.so.10.0.5
+link path=usr/lib/$(MACH64)/libgmp.so.10 target=libgmp.so.10.0.5
+link path=usr/lib/libgmp.so.10 target=libgmp.so.10.0.5
+
diff --git a/examples/gmp/gmpxx.p5m b/examples/gmp/gmpxx.p5m
index d93a82b..7772f20 100644
--- a/examples/gmp/gmpxx.p5m
+++ b/examples/gmp/gmpxx.p5m
@@ -1,20 +1,20 @@
set name=pkg.fmri value=pkg:/library/gmpxx@$(ips-version)
set name=pkg.summary value="$(summary), C++ library"
set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
+set name=info.source-url value="$(download)"
license $(license-file) license=$(license)
depend fmri=pkg:/library/gmp@$(ips-version) type=incorporate
+depend fmri=pkg:/library/gmp@$(ips-version) type=require
+depend fmri=pkg:/library/gmpxx4@$(ips-version) type=incorporate
+depend fmri=pkg:/library/gmpxx4@$(ips-version) type=require
dir path=usr
dir path=usr/include
dir path=usr/lib
dir path=usr/lib/$(MACH64)
file path=usr/include/gmpxx.h
-file path=usr/lib/$(MACH64)/libgmpxx.so.4.2.5
-file path=usr/lib/libgmpxx.so.4.2.5
link path=usr/lib/$(MACH64)/libgmpxx.so target=libgmpxx.so.4.2.5
-link path=usr/lib/$(MACH64)/libgmpxx.so.4 target=libgmpxx.so.4.2.5
link path=usr/lib/libgmpxx.so target=libgmpxx.so.4.2.5
-link path=usr/lib/libgmpxx.so.4 target=libgmpxx.so.4.2.5
+
diff --git a/examples/gmp/gmpxx10.p5m b/examples/gmp/gmpxx10.p5m
new file mode 100644
index 0000000..94a2cf8
--- /dev/null
+++ b/examples/gmp/gmpxx10.p5m
@@ -0,0 +1,11 @@
+set name=pkg.fmri value=pkg:/library/gmpxx4@$(ips-version)
+set name=pkg.summary value="$(summary), C++ shared library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+license $(license-file) license=$(license)
+
+file path=usr/lib/$(MACH64)/libgmpxx.so.4.2.5
+file path=usr/lib/libgmpxx.so.4.2.5
+link path=usr/lib/$(MACH64)/libgmpxx.so.4 target=libgmpxx.so.4.2.5
+link path=usr/lib/libgmpxx.so.4 target=libgmpxx.so.4.2.5
+
diff --git a/examples/gperf/Makefile b/examples/gperf/Makefile
deleted file mode 100644
index 6d3ca23..0000000
--- a/examples/gperf/Makefile
+++ /dev/null
@@ -1,20 +0,0 @@
-include /usr/share/cibs/rules/ips.mk
-include /usr/share/cibs/rules/archive.mk
-include /usr/share/cibs/rules/autotools.mk
-include /usr/share/cibs/rules/32.mk
-
-summary := GNU implementation of the traditional Unix macro processor
-license := GPL
-license-file := COPYING
-
-
-name := gperf
-home := http://www.gnu.org/software/$(name)/
-version := 3.0.4
-archive := $(name)-$(version).tar.gz
-download := http://ftp.gnu.org/gnu/$(name)/$(archive)
-checksum := \
- md5:c1f1db32fb6598d6a93e6e88796a8632 \
- sha1:e32d4aff8f0c730c9a56554377b2c6d82d0951b8 \
- sha256:767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e \
- size:983500
diff --git a/examples/gperf/gperf.p5m b/examples/gperf/gperf.p5m
deleted file mode 100644
index 3918850..0000000
--- a/examples/gperf/gperf.p5m
+++ /dev/null
@@ -1,18 +0,0 @@
-set name=pkg.fmri value=pkg:/developer/$(name)@$(ips-version)
-set name=pkg.summary value="$(summary)"
-set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
-
-license $(license-file) license=$(license)
-
-dir path=usr
-dir path=usr/bin
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/doc
-dir path=usr/share/info
-file path=usr/bin/gperf
-file path=usr/share/man/man1/gperf.1
-file path=usr/share/doc/gperf.html
-file path=usr/share/info/gperf.info
diff --git a/examples/grep/Makefile b/examples/grep/Makefile
deleted file mode 100644
index ddc9201..0000000
--- a/examples/grep/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-include /usr/share/cibs/rules/ips.mk
-include /usr/share/cibs/rules/archive.mk
-include /usr/share/cibs/rules/autotools.mk
-include /usr/share/cibs/rules/32.mk
-
-
-summary := GNU grep, egrep and fgrep
-license := GPLv3
-license-file := COPYING
-
-build-depends += \
- library/pcre \
- compress/xz
-
-prefix := /usr/gnu
-
-name := grep
-home := http://www.gnu.org/software/$(name)/
-version := 2.14
-archive := $(name)-$(version).tar.xz
-download := http://ftp.gnu.org/gnu/$(name)/$(archive)
-checksum := \
- md5:d4a3f03849d1e17ce56ab76aa5a24cab \
- sha1:fb6ea404a0ef915334ca6212c7b517432ffe193e \
- sha256:e70e801d4fbb16e761654a58ae48bf5020621c95c8e35bd864742577685872e1 \
- size:1195640
diff --git a/examples/grep/gnu-grep.p5m b/examples/grep/gnu-grep.p5m
deleted file mode 100644
index 86f02f9..0000000
--- a/examples/grep/gnu-grep.p5m
+++ /dev/null
@@ -1,158 +0,0 @@
-set name=pkg.fmri value=pkg:/text/gnu-$(name)@$(ips-version)
-set name=pkg.summary value="$(summary)"
-set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
-license $(license-file) license="$(license)"
-
-<transform file path=usr/gnu/bin/(.+) -> \
-emit link path=usr/bin/g%<1> target=../gnu/bin/%<1> >
-
-<transform file path=usr/gnu/share/man/man1/(.+) -> \
-emit link path=usr/share/man/man1/g%<1> target=../../../gnu/share/man/man1/%<1> >
-
-
-dir path=usr
-dir path=usr/gnu
-dir path=usr/gnu/bin
-dir path=usr/gnu/share
-dir path=usr/gnu/share/locale
-dir path=usr/gnu/share/locale/af
-dir path=usr/gnu/share/locale/af/LC_MESSAGES
-dir path=usr/gnu/share/locale/be
-dir path=usr/gnu/share/locale/be/LC_MESSAGES
-dir path=usr/gnu/share/locale/bg
-dir path=usr/gnu/share/locale/bg/LC_MESSAGES
-dir path=usr/gnu/share/locale/ca
-dir path=usr/gnu/share/locale/ca/LC_MESSAGES
-dir path=usr/gnu/share/locale/cs
-dir path=usr/gnu/share/locale/cs/LC_MESSAGES
-dir path=usr/gnu/share/locale/da
-dir path=usr/gnu/share/locale/da/LC_MESSAGES
-dir path=usr/gnu/share/locale/de
-dir path=usr/gnu/share/locale/de/LC_MESSAGES
-dir path=usr/gnu/share/locale/el
-dir path=usr/gnu/share/locale/el/LC_MESSAGES
-dir path=usr/gnu/share/locale/eo
-dir path=usr/gnu/share/locale/eo/LC_MESSAGES
-dir path=usr/gnu/share/locale/es
-dir path=usr/gnu/share/locale/es/LC_MESSAGES
-dir path=usr/gnu/share/locale/et
-dir path=usr/gnu/share/locale/et/LC_MESSAGES
-dir path=usr/gnu/share/locale/eu
-dir path=usr/gnu/share/locale/eu/LC_MESSAGES
-dir path=usr/gnu/share/locale/fi
-dir path=usr/gnu/share/locale/fi/LC_MESSAGES
-dir path=usr/gnu/share/locale/fr
-dir path=usr/gnu/share/locale/fr/LC_MESSAGES
-dir path=usr/gnu/share/locale/ga
-dir path=usr/gnu/share/locale/ga/LC_MESSAGES
-dir path=usr/gnu/share/locale/gl
-dir path=usr/gnu/share/locale/gl/LC_MESSAGES
-dir path=usr/gnu/share/locale/he
-dir path=usr/gnu/share/locale/he/LC_MESSAGES
-dir path=usr/gnu/share/locale/hr
-dir path=usr/gnu/share/locale/hr/LC_MESSAGES
-dir path=usr/gnu/share/locale/hu
-dir path=usr/gnu/share/locale/hu/LC_MESSAGES
-dir path=usr/gnu/share/locale/id
-dir path=usr/gnu/share/locale/id/LC_MESSAGES
-dir path=usr/gnu/share/locale/it
-dir path=usr/gnu/share/locale/it/LC_MESSAGES
-dir path=usr/gnu/share/locale/ja
-dir path=usr/gnu/share/locale/ja/LC_MESSAGES
-dir path=usr/gnu/share/locale/ko
-dir path=usr/gnu/share/locale/ko/LC_MESSAGES
-dir path=usr/gnu/share/locale/ky
-dir path=usr/gnu/share/locale/ky/LC_MESSAGES
-dir path=usr/gnu/share/locale/lt
-dir path=usr/gnu/share/locale/lt/LC_MESSAGES
-dir path=usr/gnu/share/locale/nb
-dir path=usr/gnu/share/locale/nb/LC_MESSAGES
-dir path=usr/gnu/share/locale/nl
-dir path=usr/gnu/share/locale/nl/LC_MESSAGES
-dir path=usr/gnu/share/locale/pa
-dir path=usr/gnu/share/locale/pa/LC_MESSAGES
-dir path=usr/gnu/share/locale/pl
-dir path=usr/gnu/share/locale/pl/LC_MESSAGES
-dir path=usr/gnu/share/locale/pt
-dir path=usr/gnu/share/locale/pt_BR
-dir path=usr/gnu/share/locale/pt_BR/LC_MESSAGES
-dir path=usr/gnu/share/locale/pt/LC_MESSAGES
-dir path=usr/gnu/share/locale/ro
-dir path=usr/gnu/share/locale/ro/LC_MESSAGES
-dir path=usr/gnu/share/locale/ru
-dir path=usr/gnu/share/locale/ru/LC_MESSAGES
-dir path=usr/gnu/share/locale/sk
-dir path=usr/gnu/share/locale/sk/LC_MESSAGES
-dir path=usr/gnu/share/locale/sl
-dir path=usr/gnu/share/locale/sl/LC_MESSAGES
-dir path=usr/gnu/share/locale/sr
-dir path=usr/gnu/share/locale/sr/LC_MESSAGES
-dir path=usr/gnu/share/locale/sv
-dir path=usr/gnu/share/locale/sv/LC_MESSAGES
-dir path=usr/gnu/share/locale/th
-dir path=usr/gnu/share/locale/th/LC_MESSAGES
-dir path=usr/gnu/share/locale/tr
-dir path=usr/gnu/share/locale/tr/LC_MESSAGES
-dir path=usr/gnu/share/locale/uk
-dir path=usr/gnu/share/locale/uk/LC_MESSAGES
-dir path=usr/gnu/share/locale/vi
-dir path=usr/gnu/share/locale/vi/LC_MESSAGES
-dir path=usr/gnu/share/locale/zh_CN
-dir path=usr/gnu/share/locale/zh_CN/LC_MESSAGES
-dir path=usr/gnu/share/locale/zh_TW
-dir path=usr/gnu/share/locale/zh_TW/LC_MESSAGES
-dir path=usr/gnu/share/man
-dir path=usr/gnu/share/man/man1
-dir path=usr/share
-dir path=usr/share/info
-file path=usr/gnu/bin/egrep
-file path=usr/gnu/bin/fgrep
-file path=usr/gnu/bin/grep
-file path=usr/gnu/share/locale/af/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/be/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/bg/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/ca/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/cs/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/da/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/de/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/el/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/eo/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/es/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/et/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/eu/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/fi/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/fr/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/ga/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/gl/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/he/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/hr/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/hu/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/id/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/it/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/ja/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/ko/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/ky/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/lt/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/nb/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/nl/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/pa/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/pl/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/pt_BR/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/pt/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/ro/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/ru/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/sk/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/sl/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/sr/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/sv/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/th/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/tr/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/uk/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/vi/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/zh_CN/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/locale/zh_TW/LC_MESSAGES/grep.mo
-file path=usr/gnu/share/man/man1/egrep.1
-file path=usr/gnu/share/man/man1/fgrep.1
-file path=usr/gnu/share/man/man1/grep.1
-file path=usr/share/info/grep.info
diff --git a/examples/libsigsegv/Makefile b/examples/libsigsegv/Makefile
deleted file mode 100644
index 407cc55..0000000
--- a/examples/libsigsegv/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-include /usr/share/cibs/rules/ips.mk
-include /usr/share/cibs/rules/archive.mk
-include /usr/share/cibs/rules/autotools.mk
-include /usr/share/cibs/rules/32.mk
-include /usr/share/cibs/rules/64.mk
-
-summary := handling page faults in user mode
-license := GPL
-license-file := COPYING
-
-
-configure-options += --enable-shared
-
-name := libsigsegv
-home := http://www.gnu.org/software/$(name)/
-version := 2.10
-archive := $(name)-$(version).tar.gz
-download := http://ftp.gnu.org/gnu/$(name)/$(archive)
-checksum := \
- md5:7f96fb1f65b3b8cbc1582fb7be774f0f \
- sha1:b75a647a9ebda70e7a3b33583efdd550e0eac094 \
- sha256:8460a4a3dd4954c3d96d7a4f5dd5bc4d9b76f5754196aa245287553b26d2199a \
- size:402279
diff --git a/examples/libsigsegv/libsigsegv.p5m b/examples/libsigsegv/libsigsegv.p5m
deleted file mode 100644
index 1577f64..0000000
--- a/examples/libsigsegv/libsigsegv.p5m
+++ /dev/null
@@ -1,19 +0,0 @@
-
-set name=pkg.fmri value=pkg:/library/$(name)@$(ips-version)
-set name=pkg.summary value="$(summary)"
-set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
-license $(license-file) license="$(license)"
-
-
-dir path=usr
-dir path=usr/include
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-file path=usr/include/sigsegv.h
-file path=usr/lib/$(MACH64)/libsigsegv.so.2.0.3
-file path=usr/lib/libsigsegv.so.2.0.3
-link path=usr/lib/$(MACH64)/libsigsegv.so target=libsigsegv.so.2.0.3
-link path=usr/lib/$(MACH64)/libsigsegv.so.2 target=libsigsegv.so.2.0.3
-link path=usr/lib/libsigsegv.so target=libsigsegv.so.2.0.3
-link path=usr/lib/libsigsegv.so.2 target=libsigsegv.so.2.0.3
diff --git a/examples/libtool/Makefile b/examples/libtool/Makefile
index 32f7cf0..db1a2ac 100644
--- a/examples/libtool/Makefile
+++ b/examples/libtool/Makefile
@@ -1,6 +1,7 @@
include /usr/share/cibs/rules/ips.mk
include /usr/share/cibs/rules/archive.mk
-#include /usr/share/cibs/rules/autoreconf.mk
+include /usr/share/cibs/rules/patch.mk
+include /usr/share/cibs/rules/autoreconf.mk
include /usr/share/cibs/rules/autotools.mk
include /usr/share/cibs/rules/32.mk
include /usr/share/cibs/rules/64.mk
@@ -9,17 +10,13 @@ summary := Generic library support script
license := GPL
license-file := COPYING
-build-depends += \
-
-# build-conflicts +=
-
home := http://www.gnu.org/software/libtool/
name := libtool
-version := 2.2.2
+version := 2.4.2
archive := $(name)-$(version).tar.gz
download := http://ftp.gnu.org/gnu/$(name)/$(archive)
checksum := \
- md5:9281a5f1976da110be872b1ba048d8ac \
- sha1:41e0d829188083ab9f6bedf2b9eca89543dc0f8a \
- sha256:c3963d969e13588fb142001d5a81c07962dc2ce7c03e2f4f551a29760e844a10 \
- size:2223210
+ md5:d2f3b7d4627e69e13514a40e72a24d50 \
+ sha1:22b71a8b5ce3ad86e1094e7285981cae10e6ff88 \
+ sha256:b38de44862a987293cd3d8dfae1c409d514b6c4e794ebc93648febf9afc38918 \
+ size:2632347
diff --git a/examples/libtool/libltdl.p5m b/examples/libtool/libltdl.p5m
index 6f2d8d4..0688575 100644
--- a/examples/libtool/libltdl.p5m
+++ b/examples/libtool/libltdl.p5m
@@ -1,7 +1,10 @@
set name=pkg.fmri value=pkg:/library/libtool/libltdl@$(ips-version)
set name=pkg.summary value="A system independent dlopen wrapper for GNU libtool"
set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
+set name=info.source-url value="$(download)"
+
+depend fmri=pkg:/library/libtool/libltdl7@$(ips-version) type=require
+depend fmri=pkg:/library/libtool/libltdl7@$(ips-version) type=incorporate
<transform dir file link path=.*/share/libtool/libltdl.* -> default facet.devel true>
@@ -49,9 +52,7 @@ file path=usr/share/libtool/libltdl/COPYING.LIB
file path=usr/include/libltdl/lt_system.h
file path=usr/include/libltdl/lt_dlloader.h
file path=usr/include/libltdl/lt_error.h
-file path=usr/lib/libltdl.so.7.1.1
-link path=usr/lib/libltdl.so.7 target=libltdl.so.7.1.1
-link path=usr/lib/libltdl.so target=libltdl.so.7.1.1
-file path=usr/lib/$(MACH64)/libltdl.so.7.1.1
-link path=usr/lib/$(MACH64)/libltdl.so.7 target=libltdl.so.7.1.1
-link path=usr/lib/$(MACH64)/libltdl.so target=libltdl.so.7.1.1
+link path=usr/lib/libltdl.so target=libltdl.so.7.3.0
+link path=usr/lib/$(MACH64)/libltdl.so target=libltdl.so.7.3.0
+file path=usr/lib/libltdl.a
+file path=usr/lib/$(MACH64)/libltdl.a
diff --git a/examples/libtool/libltdl7.p5m b/examples/libtool/libltdl7.p5m
new file mode 100644
index 0000000..be0b360
--- /dev/null
+++ b/examples/libtool/libltdl7.p5m
@@ -0,0 +1,11 @@
+set name=pkg.fmri value=pkg:/library/libtool/libltdl7@$(ips-version)
+set name=pkg.summary value="A system independent dlopen wrapper for GNU libtool, shared library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license libltdl/COPYING.LIB license=LGPL
+
+file path=usr/lib/$(MACH64)/libltdl.so.7.3.0
+file path=usr/lib/libltdl.so.7.3.0
+link path=usr/lib/$(MACH64)/libltdl.so.7 target=libltdl.so.7.3.0
+link path=usr/lib/libltdl.so.7 target=libltdl.so.7.3.0
diff --git a/examples/libtool/patches/bootstrap-no-go.patch b/examples/libtool/patches/bootstrap-no-go.patch
new file mode 100644
index 0000000..1d8e98a
--- /dev/null
+++ b/examples/libtool/patches/bootstrap-no-go.patch
@@ -0,0 +1,12 @@
+Description: Go is not supported before LT 2.4
+diff -dubr source/configure.ac nogo/configure.ac
+--- source/configure.ac 2011-10-17 14:17:17.000000000 +0400
++++ nogo/configure.ac 2012-10-13 00:29:40.973202656 +0400
+@@ -196,7 +196,6 @@
+ LT_LANG(C++)
+ LT_LANG(Fortran 77)
+ LT_LANG(Fortran)
+-LT_LANG(Go)
+ LT_LANG(Java)
+ LT_LANG(Windows Resource)
+
diff --git a/examples/libunistring/Makefile b/examples/libunistring/Makefile
deleted file mode 100644
index 775e0ff..0000000
--- a/examples/libunistring/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-include /usr/share/cibs/rules/ips.mk
-include /usr/share/cibs/rules/archive.mk
-include /usr/share/cibs/rules/autotools.mk
-include /usr/share/cibs/rules/32.mk
-include /usr/share/cibs/rules/64.mk
-
-
-summary := manipulate Unicode strings and C strings according to the Unicode standard.
-license := LGPL
-license-file := COPYING.LIB
-
-# build-depends +=
-# build-conflicts +=
-
-home := http://www.gnu.org/software/libunistring/
-name := libunistring
-version := 0.9.3
-archive := $(name)-$(version).tar.gz
-download := http://ftp.gnu.org/gnu/$(name)/$(archive)
-checksum := \
- md5:db8eca3b64163abadf8c40e5cecc261f \
- sha1:e1ea13c24a30bc93932d19eb5ad0704a618506dd \
- sha256:610d3ec724fbdaa654afe3cff20b9f4d504be3fd296fded2e0f7f764041006a3 \
- size:2555215
diff --git a/examples/libunistring/libunistring.p5m b/examples/libunistring/libunistring.p5m
deleted file mode 100644
index e40114b..0000000
--- a/examples/libunistring/libunistring.p5m
+++ /dev/null
@@ -1,87 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license
-# at http://www.opensource.org/licenses/CDDL-1.0
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each file.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright (C) 2012, Nexenta Systems, Inc. All rights reserved.
-#
-
-
-set name=pkg.fmri value=pkg:/library/libunistring@$(ips-version)
-set name=pkg.summary value="$(summary)"
-set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
-license $(license-file) license="$(license)"
-
-
-dir path=usr
-dir path=usr/include
-dir path=usr/include/unistring
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/share
-dir path=usr/share/doc
-dir path=usr/share/doc/libunistring
-dir path=usr/share/info
-file path=usr/include/uniname.h
-file path=usr/include/unitypes.h
-file path=usr/include/unistr.h
-file path=usr/include/unistring/stdbool.h
-file path=usr/include/unistring/cdefs.h
-file path=usr/include/unistring/version.h
-file path=usr/include/unistring/stdint.h
-file path=usr/include/unistring/woe32dll.h
-file path=usr/include/unistring/iconveh.h
-file path=usr/include/unistring/localcharset.h
-file path=usr/include/unistring/inline.h
-file path=usr/include/unilbrk.h
-file path=usr/include/unistdio.h
-file path=usr/include/unictype.h
-file path=usr/include/uninorm.h
-file path=usr/include/unicase.h
-file path=usr/include/uniwidth.h
-file path=usr/include/uniwbrk.h
-file path=usr/include/uniconv.h
-file path=usr/lib/libunistring.so.0.1.2
-file path=usr/lib/$(MACH64)/libunistring.so.0.1.2
-file path=usr/share/doc/libunistring/libunistring_3.html
-file path=usr/share/doc/libunistring/libunistring_10.html
-file path=usr/share/doc/libunistring/libunistring_7.html
-file path=usr/share/doc/libunistring/libunistring_14.html
-file path=usr/share/doc/libunistring/libunistring_18.html
-file path=usr/share/doc/libunistring/libunistring_19.html
-file path=usr/share/doc/libunistring/libunistring_2.html
-file path=usr/share/doc/libunistring/libunistring_abt.html
-file path=usr/share/doc/libunistring/libunistring_11.html
-file path=usr/share/doc/libunistring/libunistring_6.html
-file path=usr/share/doc/libunistring/libunistring_15.html
-file path=usr/share/doc/libunistring/libunistring_8.html
-file path=usr/share/doc/libunistring/libunistring_toc.html
-file path=usr/share/doc/libunistring/libunistring_13.html
-file path=usr/share/doc/libunistring/libunistring_4.html
-file path=usr/share/doc/libunistring/libunistring_17.html
-file path=usr/share/doc/libunistring/libunistring_1.html
-file path=usr/share/doc/libunistring/libunistring_12.html
-file path=usr/share/doc/libunistring/libunistring_5.html
-file path=usr/share/doc/libunistring/libunistring_16.html
-file path=usr/share/doc/libunistring/libunistring_9.html
-file path=usr/share/info/libunistring.info
-link path=usr/lib/libunistring.so target=libunistring.so.0.1.2
-link path=usr/lib/libunistring.so.0 target=libunistring.so.0.1.2
-link path=usr/lib/$(MACH64)/libunistring.so target=libunistring.so.0.1.2
-link path=usr/lib/$(MACH64)/libunistring.so.0 target=libunistring.so.0.1.2
diff --git a/examples/mpfr/Makefile b/examples/mpfr/Makefile
deleted file mode 100644
index cde4099..0000000
--- a/examples/mpfr/Makefile
+++ /dev/null
@@ -1,24 +0,0 @@
-include /usr/share/cibs/rules/ips.mk
-include /usr/share/cibs/rules/archive.mk
-include /usr/share/cibs/rules/autotools.mk
-include /usr/share/cibs/rules/32.mk
-include /usr/share/cibs/rules/64.mk
-
-summary := GNU library for multiple-precision floating-point computations with correct rounding
-license := LGPLv3
-license-file := COPYING.LESSER
-
-build-depends += \
- pkg:/library/gmp \
- pkg:/compress/xz \
-
-name := mpfr
-home := http://www.mpfr.org/
-version := 3.1.1
-archive := $(name)-$(version).tar.xz
-download := http://ftp.gnu.org/gnu/$(name)/$(archive)
-checksum := \
- md5:91d51c41fcf2799e4ee7a7126fc95c17 \
- sha1:7527c322b91fe8e6055ead551e1b46b9f1712ccd \
- sha256:49d5acc32dbeec30a8e26af9c19845763d63feacb8bf97b12876008419f5a17a \
- size:1071688
diff --git a/examples/mpfr/mpfr.p5m b/examples/mpfr/mpfr.p5m
deleted file mode 100644
index 202bbd7..0000000
--- a/examples/mpfr/mpfr.p5m
+++ /dev/null
@@ -1,26 +0,0 @@
-set name=pkg.fmri value=pkg:/library/$(name)@$(ips-version)
-set name=pkg.summary value="$(summary)"
-set name=info.upstream-url value="$(home)"
-set name=info.source-url value="$(download)"
-
-license $(license-file) license="$(license)"
-
-dir path=usr
-dir path=usr/include
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/share
-dir path=usr/share/info
-file path=usr/include/mpf2mpfr.h
-file path=usr/include/mpfr.h
-file path=usr/lib/$(MACH64)/libmpfr.so.4.1.1
-file path=usr/lib/libmpfr.so.4.1.1
-file path=usr/share/info/mpfr.info
-link path=usr/lib/$(MACH64)/libmpfr.so target=libmpfr.so.4.1.1
-link path=usr/lib/$(MACH64)/libmpfr.so.4 target=libmpfr.so.4.1.1
-link path=usr/lib/libmpfr.so target=libmpfr.so.4.1.1
-link path=usr/lib/libmpfr.so.4 target=libmpfr.so.4.1.1
-
-# Transitional links:
-link path=usr/lib/libmpfr.so.1 target=libmpfr.so.4
-link path=usr/lib/$(MACH64)/libmpfr.so.1 target=libmpfr.so.4
diff --git a/examples/ncurses/Makefile b/examples/ncurses/Makefile
new file mode 100644
index 0000000..bedc404
--- /dev/null
+++ b/examples/ncurses/Makefile
@@ -0,0 +1,70 @@
+include /usr/share/cibs/rules/ips.mk
+include /usr/share/cibs/rules/archive.mk
+include /usr/share/cibs/rules/patch.mk
+include /usr/share/cibs/rules/autotools.mk
+include /usr/share/cibs/rules/32.mk
+include /usr/share/cibs/rules/64.mk
+
+summary := The new curses library
+license := MIT, BSD
+license-file := ncurses.license
+
+name := ncurses
+home := http://invisible-island.net/$(name)
+version := 5.9
+archive := $(name)-$(version).tar.gz
+download := ftp://invisible-island.net/$(name)/$(archive)
+checksum := \
+ md5:8cb9c412e5f2d96bc6f459aa8c6282a1 \
+ sha1:3e042e5f2c7223bffdaac9646a533b8c758b65b5 \
+ sha256:9046298fb440324c9d4135ecea7879ffed8546dd1b58e59430ea07a4633f563b \
+ size:2826473
+
+configure-options += \
+ --with-shared \
+ --without-profile \
+ --without-debug \
+ --disable-rpath \
+ --enable-echo \
+ --enable-const \
+ --enable-pc-files \
+ --without-ada \
+ --without-tests \
+ --enable-symlinks \
+ --disable-lp64 \
+ --with-chtype='long' \
+ --with-mmask-t='long' \
+ --disable-termcap \
+ --with-default-terminfo-dir=/etc/terminfo \
+ --with-terminfo-dirs="/etc/terminfo:/lib/terminfo:/usr/share/terminfo" \
+ --with-ticlib=tic \
+ --with-termlib=tinfo
+
+configure-env.32 = \
+ PKG_CONFIG_LIBDIR="$(libdir.32)/pkgconfig"
+configure-options.32 = \
+ --without-manpages \
+ --without-progs
+
+# We need only 32-bit libs:
+build-32-stamp: target = libs
+install-32-stamp: target = install.libs
+
+configure-env.64 = \
+ PKG_CONFIG_LIBDIR="$(libdir.64)/pkgconfig"
+configure-options.64 = \
+ --with-progs
+
+
+# Variant with wide-character support.
+# 64-bit only
+$(eval $(call add-variant,wide))
+%-wide-stamp: bits = 64
+configure-options.wide = \
+ --enable-widec \
+ --disable-overwrite \
+
+# We need only libs:
+build-wide-stamp: target = libs
+install-wide-stamp: target = install.libs
+
diff --git a/examples/ncurses/ncurses-base.p5m b/examples/ncurses/ncurses-base.p5m
new file mode 100644
index 0000000..41b7e6c
--- /dev/null
+++ b/examples/ncurses/ncurses-base.p5m
@@ -0,0 +1,58 @@
+set name=pkg.fmri value=pkg:/library/$(name)-base@$(ips-version)
+set name=pkg.summary value="$(summary), basic terminal type definitions"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+<transform file path=etc/.* -> set action.hash %(path) >
+
+
+# NOTE: moving from /etc into /lib
+<transform file path=etc/.* -> edit path etc/ lib/ >
+
+file path=etc/terminfo/E/Eterm
+file path=etc/terminfo/a/ansi
+file path=etc/terminfo/c/cons25
+file path=etc/terminfo/c/cons25-debian
+file path=etc/terminfo/c/cygwin
+file path=etc/terminfo/d/dumb
+file path=etc/terminfo/h/hurd
+file path=etc/terminfo/l/linux
+file path=etc/terminfo/m/mach
+file path=etc/terminfo/m/mach-bold
+file path=etc/terminfo/m/mach-color
+file path=etc/terminfo/p/pcansi
+file path=etc/terminfo/r/rxvt
+file path=etc/terminfo/r/rxvt-basic
+file path=etc/terminfo/s/screen
+file path=etc/terminfo/s/screen-256color
+file path=etc/terminfo/s/screen-256color-bce
+file path=etc/terminfo/s/screen-bce
+file path=etc/terminfo/s/screen-s
+file path=etc/terminfo/s/screen-w
+file path=etc/terminfo/s/sun
+file path=etc/terminfo/s/sun-color
+file path=etc/terminfo/v/vt100
+file path=etc/terminfo/v/vt102
+file path=etc/terminfo/v/vt220
+file path=etc/terminfo/v/vt52
+file path=etc/terminfo/w/wsvt25
+file path=etc/terminfo/w/wsvt25m
+file path=etc/terminfo/x/xterm
+file path=etc/terminfo/x/xterm-256color
+file path=etc/terminfo/x/xterm-color
+file path=etc/terminfo/x/xterm-r5
+file path=etc/terminfo/x/xterm-r6
+file path=etc/terminfo/x/xterm-vt220
+file path=etc/terminfo/x/xterm-xfree86
+
+link target=Eterm path=lib/terminfo/E/Eterm-color
+link target=rxvt-base path=lib/terminfo/r/rxvt-m
+link target=xterm path=lib/terminfo/x/xterm-debian
+
+dir path=usr/share/tabset
+file path=usr/share/tabset/vt300
+file path=usr/share/tabset/stdcrt
+file path=usr/share/tabset/std
+file path=usr/share/tabset/vt100
diff --git a/examples/ncurses/ncurses-bin.p5m b/examples/ncurses/ncurses-bin.p5m
new file mode 100644
index 0000000..a179486
--- /dev/null
+++ b/examples/ncurses/ncurses-bin.p5m
@@ -0,0 +1,27 @@
+set name=pkg.fmri value=pkg:/terminal/$(name)-bin@$(ips-version)
+set name=pkg.summary value="$(summary), terminal-related programs and man pages"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+file path=usr/bin/clear
+file path=usr/bin/infocmp
+file path=usr/bin/tabs
+file path=usr/bin/tic
+file path=usr/bin/toe
+file path=usr/bin/tput
+file path=usr/bin/tset
+file path=usr/share/man/man1/captoinfo.1m
+file path=usr/share/man/man1/clear.1
+file path=usr/share/man/man1/infocmp.1m
+file path=usr/share/man/man1/infotocap.1m
+file path=usr/share/man/man1/tabs.1
+file path=usr/share/man/man1/tic.1m
+file path=usr/share/man/man1/toe.1m
+file path=usr/share/man/man1/tput.1
+file path=usr/share/man/man1/tset.1
+link path=usr/bin/captoinfo target=tic
+link path=usr/bin/infotocap target=tic
+link path=usr/bin/reset target=tset
+link path=usr/share/man/man1/reset.1 target=tset.1
diff --git a/examples/ncurses/ncurses.license b/examples/ncurses/ncurses.license
new file mode 100644
index 0000000..ce34ce5
--- /dev/null
+++ b/examples/ncurses/ncurses.license
@@ -0,0 +1,108 @@
+Copyright (c) 1998-2011 Free Software Foundation, Inc.
+Copyright © 2001 by Pradeep Padala
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, distribute with modifications, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE ABOVE COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
+THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization.
+
+
+Copyright (C) 1994 X Consortium
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to
+deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+sell copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
+AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
+TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name of the X Consortium shall not
+be used in advertising or otherwise to promote the sale, use or other deal-
+ings in this Software without prior written authorization from the X Consor-
+tium.
+
+
+Copyright (c) 1980, 1991, 1992, 1993
+ The Regents of the University of California. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+3. Neither the name of the University nor the names of its contributors
+ may be used to endorse or promote products derived from this software
+ without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGE.
+
+
+Copyright 1996-2007 by Thomas E. Dickey
+
+ All Rights Reserved
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE ABOVE LISTED COPYRIGHT HOLDER(S) BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+Except as contained in this notice, the name(s) of the above copyright
+holders shall not be used in advertising or otherwise to promote the
+sale, use or other dealings in this Software without prior written
+authorization.
diff --git a/examples/ncurses/ncurses.p5m b/examples/ncurses/ncurses.p5m
new file mode 100644
index 0000000..c1eab3c
--- /dev/null
+++ b/examples/ncurses/ncurses.p5m
@@ -0,0 +1,52 @@
+set name=pkg.fmri value=pkg:/library/ncurses@$(ips-version)
+set name=pkg.summary value="$(summary)"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+depend fmri=pkg:/library/ncurses5@$(ips-version) type=require
+depend fmri=pkg:/library/ncurses5@$(ips-version) type=incorporate
+
+depend fmri=pkg:/library/tinfo@$(ips-version) type=require
+depend fmri=pkg:/library/tinfo@$(ips-version) type=incorporate
+
+# Use progs from the same source package:
+depend fmri=pkg:/terminal/ncurses-bin@$(version) type=require
+
+file path=usr/bin/ncurses5-config facet.devel=true
+file path=usr/include/curses.h
+file path=usr/include/cursesapp.h
+file path=usr/include/cursesf.h
+file path=usr/include/cursesm.h
+file path=usr/include/cursesp.h
+file path=usr/include/cursesw.h
+file path=usr/include/cursslk.h
+file path=usr/include/eti.h
+file path=usr/include/etip.h
+file path=usr/include/form.h
+file path=usr/include/menu.h
+file path=usr/include/nc_tparm.h
+file path=usr/include/ncurses_dll.h
+file path=usr/include/panel.h
+file path=usr/include/term.h
+file path=usr/include/term_entry.h
+file path=usr/include/termcap.h
+file path=usr/include/tic.h
+file path=usr/include/unctrl.h
+file path=usr/lib/pkgconfig/form.pc
+file path=usr/lib/pkgconfig/menu.pc
+file path=usr/lib/pkgconfig/ncurses.pc
+file path=usr/lib/pkgconfig/panel.pc
+file path=usr/share/man/man1/ncurses5-config.1 facet.devel=true
+link path=usr/include/ncurses.h target=curses.h
+link path=usr/lib/$(mach64)/libcurses.so target=libncurses.so.5.9
+link path=usr/lib/$(mach64)/libform.so target=libform.so.5
+link path=usr/lib/$(mach64)/libmenu.so target=libmenu.so.5
+link path=usr/lib/$(mach64)/libncurses.so target=libncurses.so.5
+link path=usr/lib/$(mach64)/libpanel.so target=libpanel.so.5
+link path=usr/lib/libcurses.so target=libncurses.so.5.9
+link path=usr/lib/libform.so target=libform.so.5
+link path=usr/lib/libmenu.so target=libmenu.so.5
+link path=usr/lib/libncurses.so target=libncurses.so.5
+link path=usr/lib/libpanel.so target=libpanel.so.5
diff --git a/examples/ncurses/ncurses5.p5m b/examples/ncurses/ncurses5.p5m
new file mode 100644
index 0000000..f5009f7
--- /dev/null
+++ b/examples/ncurses/ncurses5.p5m
@@ -0,0 +1,23 @@
+set name=pkg.fmri value=pkg:/library/ncurses5@$(ips-version)
+set name=pkg.summary value="$(summary), shared libraries"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+file path=usr/lib/$(MACH64)/libform.so.5.9
+file path=usr/lib/$(MACH64)/libmenu.so.5.9
+file path=usr/lib/$(MACH64)/libncurses.so.5.9
+file path=usr/lib/$(MACH64)/libpanel.so.5.9
+file path=usr/lib/libform.so.5.9
+file path=usr/lib/libmenu.so.5.9
+file path=usr/lib/libncurses.so.5.9
+file path=usr/lib/libpanel.so.5.9
+link path=usr/lib/$(MACH64)/libform.so.5 target=libform.so.5.9
+link path=usr/lib/$(MACH64)/libmenu.so.5 target=libmenu.so.5.9
+link path=usr/lib/$(MACH64)/libncurses.so.5 target=libncurses.so.5.9
+link path=usr/lib/$(MACH64)/libpanel.so.5 target=libpanel.so.5.9
+link path=usr/lib/libform.so.5 target=libform.so.5.9
+link path=usr/lib/libmenu.so.5 target=libmenu.so.5.9
+link path=usr/lib/libncurses.so.5 target=libncurses.so.5.9
+link path=usr/lib/libpanel.so.5 target=libpanel.so.5.9
diff --git a/examples/ncurses/ncursesw.p5m b/examples/ncurses/ncursesw.p5m
new file mode 100644
index 0000000..8b968d9
--- /dev/null
+++ b/examples/ncurses/ncursesw.p5m
@@ -0,0 +1,40 @@
+set name=pkg.fmri value=pkg:/library/ncursesw@$(ips-version)
+set name=pkg.summary value="$(summary) (wide character support)"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+depend fmri=pkg:/library/ncursesw5@$(ips-version) type=require
+depend fmri=pkg:/library/ncursesw5@$(ips-version) type=incorporate
+
+file path=usr/bin/ncursesw5-config facet.devel=true
+file path=usr/include/ncursesw/curses.h
+file path=usr/include/ncursesw/cursesapp.h
+file path=usr/include/ncursesw/cursesf.h
+file path=usr/include/ncursesw/cursesm.h
+file path=usr/include/ncursesw/cursesp.h
+file path=usr/include/ncursesw/cursesw.h
+file path=usr/include/ncursesw/cursslk.h
+file path=usr/include/ncursesw/eti.h
+file path=usr/include/ncursesw/etip.h
+file path=usr/include/ncursesw/form.h
+file path=usr/include/ncursesw/menu.h
+file path=usr/include/ncursesw/nc_tparm.h
+file path=usr/include/ncursesw/ncurses_dll.h
+file path=usr/include/ncursesw/panel.h
+file path=usr/include/ncursesw/term.h
+file path=usr/include/ncursesw/term_entry.h
+file path=usr/include/ncursesw/termcap.h
+file path=usr/include/ncursesw/tic.h
+file path=usr/include/ncursesw/unctrl.h
+file path=usr/lib/pkgconfig/formw.pc
+file path=usr/lib/pkgconfig/menuw.pc
+file path=usr/lib/pkgconfig/ncursesw.pc
+file path=usr/lib/pkgconfig/panelw.pc
+file path=usr/share/man/man1/ncurses5-config.1 facet.devel=true
+link path=usr/lib/$(mach64)/libcursesw.so target=libncursesw.so.5.9
+link path=usr/lib/$(mach64)/libformw.so target=libformw.so.5
+link path=usr/lib/$(mach64)/libmenuw.so target=libmenuw.so.5
+link path=usr/lib/$(mach64)/libncursesw.so target=libncursesw.so.5
+link path=usr/lib/$(mach64)/libpanelw.so target=libpanelw.so.5
diff --git a/examples/ncurses/ncursesw5.p5m b/examples/ncurses/ncursesw5.p5m
new file mode 100644
index 0000000..d974758
--- /dev/null
+++ b/examples/ncurses/ncursesw5.p5m
@@ -0,0 +1,15 @@
+set name=pkg.fmri value=pkg:/library/ncursesw5@$(ips-version)
+set name=pkg.summary value="$(summary), shared libraries with wide character support"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+file path=usr/lib/$(mach64)/libformw.so.5.9
+file path=usr/lib/$(mach64)/libmenuw.so.5.9
+file path=usr/lib/$(mach64)/libncursesw.so.5.9
+file path=usr/lib/$(mach64)/libpanelw.so.5.9
+link path=usr/lib/$(mach64)/libformw.so.5 target=libformw.so.5.9
+link path=usr/lib/$(mach64)/libmenuw.so.5 target=libmenuw.so.5.9
+link path=usr/lib/$(mach64)/libncursesw.so.5 target=libncursesw.so.5.9
+link path=usr/lib/$(mach64)/libpanelw.so.5 target=libpanelw.so.5.9
diff --git a/examples/ncurses/patches/00-terminfo-update.diff b/examples/ncurses/patches/00-terminfo-update.diff
new file mode 100644
index 0000000..34f7ee9
--- /dev/null
+++ b/examples/ncurses/patches/00-terminfo-update.diff
@@ -0,0 +1,2126 @@
+Description: Update terminfo entries
+ Update terminfo entries to the 20120602 upstream patchlevel
+Origin: upstream
+Forwarded: not-needed
+Author: Sven Joachim <svenjoac@gmx.de>
+Last-Update: 2012-06-03
+
+---
+ misc/terminfo.src | 1215 ++++++++++++++++++++++++++++++++++++++----------------
+ 1 file changed, 873 insertions(+), 342 deletions(-)
+
+--- a/misc/terminfo.src
++++ b/misc/terminfo.src
+@@ -6,8 +6,8 @@
+ # Report bugs and new terminal descriptions to
+ # bug-ncurses@gnu.org
+ #
+-# $Revision: 1.383 $
+-# $Date: 2011/02/20 20:46:53 $
++# $Revision: 1.460 $
++# $Date: 2012/06/02 20:15:40 $
+ #
+ # The original header is preserved below for reference. It is noted that there
+ # is a "newer" version which differs in some cosmetic details (but actually
+@@ -376,11 +376,19 @@ ansi+sgrdim|ansi graphic renditions; ass
+ dim=\E[2m,
+ sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p5%t2;%;%?%p7%t8;%;m,
+ use=ansi+sgr, use=ansi+sgrso, use=ansi+sgrul,
+-ansi+pp|ansi printer port,
+- mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
+ ansi+csr|ansi scroll-region plus cursor save & restore,
+ csr=\E[%i%p1%d;%p2%dr, rc=\E8, sc=\E7,
+
++# The normal (ANSI) flavor of "media copy" building block asserts that
++# characters sent to the printer do not echo on the screen. DEC terminals
++# can also be put into autoprinter mode, where each line is sent to the
++# printer as you move off that line, e.g., by a carriage return.
++ansi+pp|ansi printer port,
++ mc5i,
++ mc0=\E[i, mc4=\E[4i, mc5=\E[5i,
++dec+pp|DEC autoprinter mode,
++ mc0=\E[i, mc4=\E[?4i, mc5=\E[?5i,
++
+ # The IBM PC alternate character set. Plug this into any Intel console entry.
+ # We use \E[11m for rmacs rather than \E[12m so the <acsc> string can use the
+ # ROM graphics for control characters such as the diamond, up- and down-arrow.
+@@ -456,9 +464,10 @@ ibcs2|Intel Binary Compatibility Standar
+ cud=\E[%p1%dB, cud1=\E[1B, cuf=\E[%p1%dC, cuf1=\E[1C,
+ cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[1A,
+ dch=\E[%p1%dP, dispc=\E=%p1%dg, ech=\E[%p1%dX,
+- hpa=\E[%i%p1%dG, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL,
+- indn=\E[%p1%dS, rc=\E7, rin=\E[%p1%dT, rmam=\E[?7l, sc=\E7,
+- smam=\E[?7h, tbc=\E[g, vpa=\E[%i%p1%dd,
++ hpa=\E[%i%p1%dG, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
++ il=\E[%p1%dL, indn=\E[%p1%dS, rc=\E7, rin=\E[%p1%dT,
++ rmam=\E[?7l, sc=\E7, smam=\E[?7h, tbc=\E[g,
++ vpa=\E[%i%p1%dd,
+
+ #### ANSI/ECMA-48 terminals and terminal emulators
+ #
+@@ -488,7 +497,7 @@ ansi-mini|any ansi terminal with pessimi
+ # ansi-mtabs adds relative addressing and minimal tab support
+ ansi-mtabs|any ansi terminal with pessimistic assumptions,
+ it#8,
+- ht=^I, use=ansi+local1, use=ansi-mini,
++ ht=^I, use=ansi-mini, use=ansi+local1,
+
+ # ANSI X3.64 from emory!mlhhh (Hugh Hansard) via BRL
+ #
+@@ -690,9 +699,7 @@ nansi.sysk|nansisysk|PC-DOS Public Domai
+ use=ansi.sysk,
+
+ #### ANSI console types
+-#
+
+-#############################################################################
+ #
+ # Atari ST terminals.
+ # From Guido Flohr <gufl0000@stud.uni-sb.de>.
+@@ -909,7 +916,7 @@ linux-basic|linux console,
+ khome=\E[1~, kich1=\E[2~, kmous=\E[M, knp=\E[6~, kpp=\E[5~,
+ kspd=^Z, nel=^M^J, rc=\E8, rev=\E[7m, ri=\EM, rmam=\E[?7l,
+ rmir=\E[4l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R, sc=\E7,
+- sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
++ sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p9%t;11%;m,
+ smam=\E[?7h, smir=\E[4h, smul=\E[4m, tbc=\E[3g,
+ vpa=\E[%i%p1%dd, use=vt102+enq, use=klone+sgr,
+ use=ecma+color,
+@@ -936,10 +943,29 @@ linux-c|linux console 1.3.6+ for older n
+ # The 2.2.x kernels add a private mode that sets the cursor type; use that to
+ # get a block cursor for cvvis.
+ # reported by Frank Heckenbach <frank@g-n-u.de>.
+-linux|linux console,
++linux2.2|linux 2.2.x console,
+ civis=\E[?25l\E[?1c, cnorm=\E[?25h\E[?0c,
+ cvvis=\E[?25h\E[?8c, use=linux-c-nc,
+
++# Linux 2.6.x has a fix for SI/SO to work with UTF-8 encoding added here:
++# http://lkml.indiana.edu/hypermail/linux/kernel/0602.2/0868.html
++# Using SI/SO has the drawback that it confuses screen. SCS would work.
++# However, SCS is buggy (see comment in Debian #515609) -TD
++# Further, this breaks longstanding workarounds for Linux console's line
++# drawing (see Debian 665959) -TD
++linux2.6|linux 2.6.x console,
++ rmacs=^O,
++ sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;m%?%p9%t\016%e\017%;,
++ sgr0=\E[m\017, smacs=^N, use=linux2.2,
++
++# The 3.0 kernel adds support for clearing scrollback buffer (capability E3).
++linux3.0|linux 3.0 kernels,
++ E3=\E[3;J, use=linux2.6,
++
++# This is Linux console for ncurses.
++linux|linux console,
++ use=linux2.2,
++
+ # Subject: linux 2.6.26 vt back_color_erase
+ # Changes to the Linux console driver broke bce model as reported in
+ # https://bugzilla.novell.com/show_bug.cgi?id=418613
+@@ -947,7 +973,7 @@ linux|linux console,
+ # http://lkml.org/lkml/2008/4/26/305
+ # http://groups.google.com/group/fa.linux.kernel/browse_thread/thread/87f98338f0d636bb/aa96e8b86cee0d1e?lnk=st&q=#aa96e8b86cee0d1e
+ linux2.6.26|linux console w/o bce,
+- bce@, use=linux,
++ bce@, use=linux2.6,
+
+ # See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
+ linux-nic|linux with ich/ich1 suppressed for non-curses programs,
+@@ -1024,7 +1050,7 @@ bterm|bogl virtual terminal,
+ kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~,
+ kf8=\E[19~, kf9=\E[20~, khome=\E[1~, kich1=\E[2~,
+ kmous=\E[M, knp=\E[6~, kpp=\E[5~, kspd=^Z, nel=^M^J,
+- op=\E49;39m, rev=\E[7m, ri=\EM, rmacs=^O, rmso=\E[27m,
++ op=\E[49m\E[39m, rev=\E[7m, ri=\EM, rmacs=^O, rmso=\E[27m,
+ rmul=\E[24m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+ sgr0=\E[0m, smacs=^N, smso=\E[7m, smul=\E[4m,
+
+@@ -1053,6 +1079,24 @@ mach-color|Mach Console with ANSI color,
+ dim=\E[2m, invis=\E[8m, op=\E[37;40m, rmso=\E[27m,
+ setab=\E[4%p1%dm, setaf=\E[3%p1%dm, use=mach,
+
++# From: Samuel Thibault
++# Source: git://git.sv.gnu.org/hurd/gnumach.git
++# Files: i386/i386at/kd.c
++#
++# Added nel, hpa, sgr and removed rmacs, smacs based on source -TD
++mach-gnu|GNU Mach,
++ acsc=+>\,<-\^.v0\333`+a\261f\370g\361h\260i#j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
++ dch=\E[%p1%dP, dch1=\E[P, dim=\E[2m, ech=\E[%p1%dX,
++ el1=\E[1K, hpa=\E[%i%p1%dG, ich=\E[%p1%d@, ich1=\E[@,
++ indn=\E[%p1%dS, invis=\E[8m, nel=\EE, rin=\E[%p1%dT,
++ sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m,
++ use=mach,
++
++mach-gnu-color|Mach Console with ANSI color,
++ colors#8, pairs#64,
++ op=\E[37;40m, rmso=\E[27m, setab=\E[4%p1%dm,
++ setaf=\E[3%p1%dm, use=mach-gnu,
++
+ # From: Marcus Brinkmann
+ # http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/hurd/hurd/console/
+ #
+@@ -1183,7 +1227,7 @@ scoansi-new|SCO Extended ANSI standard c
+ civis=\E[=0c, cnorm=\E[=1c, csr=\E[%i%p1%d;%p2%dr,
+ cvvis=\E[=2c, mgc=\E[=r, oc=\E[51m, op=\E[50m,
+ rep=\E[%p1%d;%p2%db, rmm=\E[=11L,
+- sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
++ sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%e;10%;m,
+ smgb=\E[=1;0m, smgbp=\E[=1;%i%p1%dm,
+ smglp=\E[=2;%i%p1%dm, smgr=\E[=3;0m,
+ smgrp=\E[=3;%i%p1%dm, smgt=\E[=0;0m,
+@@ -1649,6 +1693,56 @@ qansi-m|QNX ansi with mouse,
+ qansi-w|QNX ansi for windows,
+ xvpa, use=qansi-m,
+
++#### OpenBSD consoles
++#
++# From: Alexei Malinin <Alexei.Malinin@mail.ru>; October, 2011.
++#
++# The following terminal descriptions for the AMD/Intel PC console
++# were prepared based on information contained in the OpenBSD-4.9
++# termtypes.master and wscons(4) & vga(4) manuals (2010, November).
++#
++# Added bce based on testing with tack -TD
++# Added several capabilities to pccon+base, reading wsemul_vt100_subr.c -TD
++# Changed kbs to DEL and removed keys that duplicate stty settings -TD
++#
++pccon+keys|OpenBSD PC keyboard keys,
++ kbs=\177, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
++ kdch1=\E[3~, kend=\E[8~, kent=^M, kf1=\E[11~, kf10=\E[21~,
++ kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, kf3=\E[13~,
++ kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
++ kf9=\E[20~, khome=\E[7~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
++ krfr=^R,
++pccon+sgr+acs0|sgr and simple ASCII pseudographics for OpenBSD PC console,
++ acsc=+>\,<-\^.v0#`+a\:f\\h#i#j+k+l+m+n+o~p-q-r-s_t+u+v+w+x|y#z#{*|!}#~o,
++ sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m,
++pccon+sgr+acs|sgr and default ASCII pseudographics for OpenBSD PC console,
++ acsc=++\,\,--..00``aaffgghhiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
++ enacs=\E)0$<5>, rmacs=\E(B$<5>,
++ sgr=\E[0%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<5>,
++ sgr0=\E[m\E(B$<5>, smacs=\E(0$<5>,
++pccon+colors|ANSI colors for OpenBSD PC console,
++ bce,
++ colors#8, pairs#64,
++ op=\E[m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++pccon+base|base capabilities for OpenBSD PC console,
++ am, km, mc5i, msgr, npc, nxon, xenl, xon,
++ cols#80, it#8, lines#24,
++ bel=^G, clear=\E[H\E[J, cr=^M, cub1=^H, cud1=^J, cuf1=\E[C,
++ cup=\E[%i%p1%d;%p2%dH, cuu1=\E[A, dch=\E[%p1%dP,
++ dch1=\E[P, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
++ el1=\E[1K, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
++ il1=\E[L, ind=\ED, nel=\EE, rev=\E[7m, ri=\EM, rmam=\E[?7l,
++ rmso=\E[m, rs2=\Ec$<50>, smam=\E[?7h, smso=\E[7m,
++ tbc=\E[3g, u6=\E[%i%d;%dR, u7=\E[6n,
++pccon0-m|OpenBSD PC console without colors & with simple ASCII pseudographics,
++ use=pccon+base, use=pccon+sgr+acs0, use=pccon+keys,
++pccon0|OpenBSD PC console with simple ASCII pseudographics,
++ use=pccon0-m, use=pccon+colors,
++pccon-m|OpenBSD PC console without colors,
++ use=pccon+base, use=pccon+sgr+acs, use=pccon+keys,
++pccon|OpenBSD PC console,
++ use=pccon-m, use=pccon+colors,
++
+ #### NetBSD consoles
+ #
+ # pcvt termcap database entries (corresponding to release 3.31)
+@@ -1786,7 +1880,7 @@ x68k|x68k-ite|NetBSD/x68k ITE,
+ ofcons|DNARD OpenFirmware console,
+ bw,
+ cols#80, lines#30,
+- bel=^G, blink=\2337;2m, bold=\2331m, clear=^L, cr=^M,
++ bel=^G, blink=\2335m, bold=\2331m, clear=^L, cr=^M,
+ cub=\233%p1%dD, cub1=\233D, cud=\233%p1%dB, cud1=\233B,
+ cuf=\233%p1%dC, cuf1=\233C, cup=\233%i%p1%d;%p2%dH,
+ cuu=\233%p1%dA, cuu1=\233A, dch=\233%p1%dP, dch1=\233P,
+@@ -1798,8 +1892,8 @@ ofcons|DNARD OpenFirmware console,
+ kf4=\2330x, kf5=\2330t, kf6=\2330u, kf7=\2330q, kf8=\2330r,
+ kf9=\2330p, knp=\233/, kpp=\233?, nel=^M^J, rev=\2337m,
+ rmso=\2330m, rmul=\2330m,
+- sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m,
+- sgr0=\2330m,
++ sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p5%t2%;%?%p7%t8%;%?%p1%p3%|%t;7%;m,
++ sgr0=\2330m, smso=\2337m, smul=\2334m,
+
+ # NetBSD "wscons" emulator in vt220 mode.
+ # This entry is based on the NetBSD termcap entry, correcting the ncv value.
+@@ -1816,7 +1910,8 @@ ofcons|DNARD OpenFirmware console,
+ wsvt25|NetBSD wscons in 25 line DEC VT220 mode,
+ bce, msgr,
+ colors#8, cols#80, it#8, lines#25, ncv#2, pairs#64,
+- is2=\E[r\E[25;1H, kend=\E[8~, kf1=\E[11~, kf10=\E[21~,
++ civis=\E[?25l, cnorm=\E[?25h, is2=\E[r\E[25;1H,
++ kdch1=\E[3~, kend=\E[8~, kf1=\E[11~, kf10=\E[21~,
+ kf11=\E[23~, kf12=\E[24~, kf2=\E[12~, kf3=\E[13~,
+ kf4=\E[14~, kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+ kf9=\E[20~, khome=\E[7~, op=\E[m, rs1=\Ec,
+@@ -2377,8 +2472,9 @@ vt132|DEC vt132,
+ # with the key marked (ESC) on the vt220. See vt220d for an alternate mapping.
+ # PF1--PF4 are used as F1--F4.
+ #
++# added msgr -TD
+ vt220-old|vt200-old|DEC VT220 in vt100 emulation mode,
+- OTbs, OTpt, am, mir, xenl, xon,
++ OTbs, OTpt, am, mir, msgr, xenl, xon,
+ cols#80, lines#24, vt#3,
+ OTnl=^J,
+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+@@ -2404,8 +2500,15 @@ vt220-old|vt200-old|DEC VT220 in vt100 e
+ # A much better description of the VT200/220; used to be vt220-8
+ # changed rmacs/smacs from shift-in/shift-out to vt200-old's explicit G0/G1
+ # designation to accommodate bug in pcvt -TD
++#
++# Here's a picture of the VT220 editing keypad:
++# +--------+--------+--------+
++# | Find | Insert | Remove |
++# +--------+--------+--------+
++# | Select | Prev | Next |
++# +--------+--------+--------+
+ vt220|vt200|dec vt220,
+- OTbs, am, mc5i, mir, msgr, xenl, xon,
++ OTbs, am, mir, msgr, xenl, xon,
+ cols#80, it#8, lines#24, vt#3,
+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ bel=^G, blink=\E[5m, bold=\E[1m, clear=\E[H\E[J, cr=^M,
+@@ -2418,19 +2521,20 @@ vt220|vt200|dec vt220,
+ ich=\E[%p1%d@, if=/usr/share/tabset/vt100,
+ il=\E[%p1%dL, il1=\E[L, ind=\ED,
+ is2=\E[?7h\E[>\E[?1h\E F\E[?4l, kbs=^H, kcub1=\E[D,
+- kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf1=\EOP, kf10=\E[21~,
+- kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
+- kf17=\E[31~, kf18=\E[32~, kf19=\E[33~, kf2=\EOQ,
+- kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~, kf7=\E[18~,
+- kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~, khlp=\E[28~,
+- kich1=\E[2~, knp=\E[6~, kpp=\E[5~, krdo=\E[29~, kslt=\E[4~,
+- lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, mc0=\E[i, mc4=\E[4i,
+- mc5=\E[5i, nel=\EE, rc=\E8, rev=\E[7m, ri=\EM,
+- rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m,
+- rmul=\E[24m, rs1=\E[?3l, sc=\E7,
++ kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kf1=\EOP,
++ kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13=\E[25~,
++ kf14=\E[26~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
++ kf2=\EOQ, kf20=\E[34~, kf3=\EOR, kf4=\EOS, kf6=\E[17~,
++ kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~,
++ khlp=\E[28~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
++ krdo=\E[29~, kslt=\E[4~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4,
++ nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B$<4>,
++ rmam=\E[?7l, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
++ rs1=\E[?3l, sc=\E7,
+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
+ sgr0=\E[m\E(B, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h,
+- smso=\E[7m, smul=\E[4m, tbc=\E[3g,
++ smso=\E[7m, smul=\E[4m, tbc=\E[3g, use=ansi+pp,
++ use=ansi+enq,
+ vt220-w|vt200-w|DEC vt220 in wide mode,
+ cols#132,
+ rs3=\E[?3h, use=vt220,
+@@ -2449,16 +2553,16 @@ vt220-8bit|vt220-8|vt200-8bit|vt200-8|de
+ il=\233%p1%dL, il1=\233L, ind=\ED,
+ is2=\233?7h\233>\233?1h\E F\233?4l, kbs=^H,
+ kcub1=\233D, kcud1=\233B, kcuf1=\233C, kcuu1=\233A,
+- kf1=\EOP, kf10=\23321~, kf11=\23323~, kf12=\23324~,
+- kf13=\23325~, kf14=\23326~, kf17=\23331~, kf18=\23332~,
+- kf19=\23333~, kf2=\EOQ, kf20=\23334~, kf3=\EOR, kf4=\EOS,
+- kf6=\23317~, kf7=\23318~, kf8=\23319~, kf9=\23320~,
+- kfnd=\2331~, khlp=\23328~, khome=\233H, kich1=\2332~,
+- knp=\2336~, kpp=\2335~, krdo=\23329~, kslt=\2334~, lf1=pf1,
+- lf2=pf2, lf3=pf3, lf4=pf4, mc0=\233i, mc4=\2334i, mc5=\2335i,
+- nel=\EE, rc=\E8, rev=\2337m, ri=\EM, rmacs=\E(B,
+- rmam=\233?7l, rmir=\2334l, rmso=\23327m, rmul=\23324m,
+- rs1=\233?3l, sc=\E7,
++ kdch1=\2333~, kf1=\EOP, kf10=\23321~, kf11=\23323~,
++ kf12=\23324~, kf13=\23325~, kf14=\23326~, kf17=\23331~,
++ kf18=\23332~, kf19=\23333~, kf2=\EOQ, kf20=\23334~,
++ kf3=\EOR, kf4=\EOS, kf6=\23317~, kf7=\23318~, kf8=\23319~,
++ kf9=\23320~, kfnd=\2331~, khlp=\23328~, khome=\233H,
++ kich1=\2332~, knp=\2336~, kpp=\2335~, krdo=\23329~,
++ kslt=\2334~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4, mc0=\233i,
++ mc4=\2334i, mc5=\2335i, nel=\EE, rc=\E8, rev=\2337m, ri=\EM,
++ rmacs=\E(B, rmam=\233?7l, rmir=\2334l, rmso=\23327m,
++ rmul=\23324m, rs1=\233?3l, sc=\E7,
+ sgr=\2330%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
+ sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h, smir=\2334h,
+ smso=\2337m, smul=\2334m, tbc=\2333g,
+@@ -2495,8 +2599,9 @@ vt220-nam|v200-nam|VT220 in vt100 mode w
+ #
+ # From: Alexander Latzko <latzko@marsenius.rutgers.edu>, 30 Dec 1996
+ # (Added vt100 <rc>,<sc> to quiet a tic warning -- esr)
++# added msgr -TD
+ vt200-js|vt220-js|dec vt200 series with jump scroll,
+- am,
++ am, msgr,
+ cols#80,
+ bel=^G, clear=\E[H\E[J, cr=^M, csr=\E[%i%p1%d;%p2%dr,
+ cub1=^H, cud1=^J, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
+@@ -2534,7 +2639,7 @@ vt320nam|v320n|DEC VT320 in vt100 emul.
+ # From: Adam Thompson <athompso@pangea.ca> Sept 10 1995
+ # (vt320: uncommented <fsl> --esr)
+ vt320|vt300|dec vt320 7 bit terminal,
+- am, eslok, hs, mir, msgr, xenl,
++ am, hs, mir, msgr, xenl,
+ cols#80, lines#24, wsl#80,
+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+@@ -2543,9 +2648,8 @@ vt320|vt300|dec vt320 7 bit terminal,
+ cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
+ cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+ dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+- ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, fsl=\E[0$},
+- home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL,
+- il1=\E[L, ind=\ED,
++ ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, home=\E[H, ht=^I,
++ hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L, ind=\ED,
+ is2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h\E[1;24r\E[24;1H,
+ kbs=\177, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ kdch1=\E[3~, kel=\E[4~, kf10=\E[21~, kf11=\E[23~,
+@@ -2553,8 +2657,7 @@ vt320|vt300|dec vt320 7 bit terminal,
+ kf16=\E[29~, kf17=\E[31~, kf18=\E[32~, kf19=\E[33~,
+ kf20=\E[34~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~,
+ kf9=\E[20~, khome=\E[1~, kich1=\E[2~, knp=\E[6~, knxt=^I,
+- kpp=\E[5~, kprv=\E[Z, kslt=\E[4~, mc0=\E[i, mc4=\E[?4i,
+- mc5=\E[?5i, nel=\EE, rc=\E8, rev=\E[7m,
++ kpp=\E[5~, kprv=\E[Z, kslt=\E[4~, nel=\EE, rc=\E8, rev=\E[7m,
+ rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B,
+ rmam=\E[?7l, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[m,
+ rmul=\E[m,
+@@ -2563,7 +2666,7 @@ vt320|vt300|dec vt320 7 bit terminal,
+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
+ sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+ smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+- tsl=\E[1$}\E[H\E[K, use=vt220+keypad,
++ use=dec+pp, use=vt220+keypad, use=dec+sl, use=ansi+enq,
+ vt320-nam|vt300-nam|dec vt320 7 bit terminal with no am to make SAS happy,
+ am@,
+ is2=\E>\E[?3l\E[?4l\E[?5l\E[?7l\E[?8h\E[1;24r\E[24;1H,
+@@ -2673,33 +2776,38 @@ vt400|vt400-24|dec-vt400|dec vt400 24x80
+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
+ sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smir=\E[4h,
+ smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+- tsl=\E[2$~\E[1$}\E[1;%dH,
++ tsl=\E[2$~\E[1$}\E[1;%dH, use=dec+sl,
+
+ # (vt420: I removed <kf0>, it collided with <kf10>. I also restored
+ # a missing <sc> -- esr)
++# add msgr and other capabilities from vt220 -TD
+ vt420|DEC VT420,
+- am, mir, xenl, xon,
+- cols#80, lines#24, vt#3,
++ am, mir, msgr, xenl, xon,
++ cols#80, it#8, lines#24, vt#3,
+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+- bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
+- clear=\E[H\E[2J$<50>, cr=^M, csr=\E[%i%p1%d;%p2%dr,
+- cub1=^H, cud1=\E[B, cuf1=\E[C,
+- cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P,
+- dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
+- if=/usr/share/tabset/vt300, il1=\E[L, ind=\ED,
+- is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=^H,
+- kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+- kdch1=\E[3~, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR,
+- kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~,
+- kf9=\E[21~, kfnd=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+- kslt=\E[4~, rc=\E8, rev=\E[7m$<2>,
+- rf=/usr/share/tabset/vt300, ri=\EM, rmacs=\E(B$<4>,
+- rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
++ bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>, civis=\E[?25l,
++ clear=\E[H\E[2J$<50>, cnorm=\E[?25h, cr=^M,
++ csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
++ cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
++ cup=\E[%i%p1%d;%p2%dH$<10>, cuu=\E[%p1%dA, cuu1=\E[A,
++ dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
++ ech=\E[%p1%dX, ed=\E[J$<50>, el=\E[K$<3>, el1=\E[1K,
++ enacs=\E)0, flash=\E[?5h$<200/>\E[?5l, home=\E[H, ht=^I,
++ hts=\EH, ich=\E[%p1%d@, if=/usr/share/tabset/vt300,
++ il=\E[%p1%dL, il1=\E[L, ind=\ED, is2=\E[1;24r\E[24;1H,
++ is3=\E[?67h\E[64;1"p, kbs=^H, kcub1=\E[D, kcud1=\E[B,
++ kcuf1=\E[C, kcuu1=\E[A, kdch1=\E[3~, kf1=\EOP, kf10=\E[29~,
++ kf2=\EOQ, kf3=\EOR, kf4=\EOS, kf5=\E[17~, kf6=\E[18~,
++ kf7=\E[19~, kf8=\E[20~, kf9=\E[21~, kfnd=\E[1~,
++ kich1=\E[2~, knp=\E[6~, kpp=\E[5~, kslt=\E[4~, nel=\EE,
++ rc=\E8, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300,
++ ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l, rmkx=\E>,
+ rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+- rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, sc=\E7,
++ rmso=\E[27m, rmul=\E[24m, rs3=\E[?67h\E[64;1"p, sc=\E7,
+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
+- sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h,
+- smkx=\E=, smso=\E[7m, smul=\E[4m,
++ sgr0=\E[m\E(B$<2>, smacs=\E(0$<2>, smam=\E[?7h,
++ smir=\E[4h, smkx=\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
++ use=ansi+pp, use=dec+sl, use=ansi+enq,
+
+ # DEC VT220 and up support DECUDK (user-defined keys). DECUDK (i.e., pfx)
+ # takes two parameters, the key and the string. Translating the key is
+@@ -2772,58 +2880,11 @@ vt510pcdos|DEC VT510 w/PC for DOS Merge,
+ # terminal mode is being used. If Set-Up has been disabled or
+ # assigned to an unknown key, Set-Up may be entered by pressing
+ # [F3] as the first key after power up, regardless of keyboard type.
+-# (vt520: I added <rmam>/<smam> based on the init string, also <sc> -- esr)
+ vt520|DEC VT520,
+- am, mir, xenl, xon,
+- cols#80, lines#24, vt#3,
+- acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+- bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
+- clear=\E[H\E[2J$<50>, cr=^M, csr=\E[%i%p1%d;%p2%dr,
+- cub1=^H, cud1=\E[B, cuf1=\E[C,
+- cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P,
+- dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
+- if=/usr/share/tabset/vt300, il1=\E[L, ind=\ED,
+- is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=^H,
+- kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+- kdch1=\E[3~, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR,
+- kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~,
+- kf9=\E[21~, kfnd=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+- kslt=\E[4~,
+- pfx=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>%t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+%d/%p2%s\E\\,
+- rc=\E8, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300,
+- ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l,
+- rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+- rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, sc=\E7,
+- sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
+- sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h,
+- smso=\E[7m, smul=\E[4m,
++ use=ansi+rca, use=vt420, use=ansi+tabs,
+
+-# (vt525: I added <rmam>/<smam> based on the init string;
+-# removed <rmso>=\E[m, <rmul>=\E[m, added <sc> -- esr)
+ vt525|DEC VT525,
+- am, mir, xenl, xon,
+- cols#80, lines#24, vt#3,
+- acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+- bel=^G, blink=\E[5m$<2>, bold=\E[1m$<2>,
+- clear=\E[H\E[2J$<50>, cr=^M, csr=\E[%i%p1%d;%p2%dr,
+- cub1=^H, cud1=\E[B, cuf1=\E[C,
+- cup=\E[%i%p1%d;%p2%dH$<10>, cuu1=\E[A, dch1=\E[P,
+- dl1=\E[M, ed=\E[J$<50>, el=\E[K$<3>, home=\E[H, ht=^I,
+- if=/usr/share/tabset/vt300, il1=\E[L, ind=\ED,
+- is2=\E[1;24r\E[24;1H, is3=\E[?67h\E[64;1"p, kbs=^H,
+- kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+- kdch1=\E[3~, kf1=\EOP, kf10=\E[29~, kf2=\EOQ, kf3=\EOR,
+- kf4=\EOS, kf5=\E[17~, kf6=\E[18~, kf7=\E[19~, kf8=\E[20~,
+- kf9=\E[21~, kfnd=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+- kslt=\E[4~,
+- pfx=\EP1;1|%?%{16}%p1%>%t%{0}%e%{21}%p1%>%t%{1}%e%{25}%p1%>%t%{2}%e%{27}%p1%>%t%{3}%e%{30}%p1%>%t%{4}%e%{5}%;%p1%+%d/%p2%s\E\\,
+- rc=\E8, rev=\E[7m$<2>, rf=/usr/share/tabset/vt300,
+- ri=\EM, rmacs=\E(B$<4>, rmam=\E[?7l, rmir=\E[4l,
+- rmsc=\E[?0;0r\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h,
+- rmso=\E[m, rmul=\E[m, rs3=\E[?67h\E[64;1"p, sc=\E7,
+- sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;$<2>,
+- sgr0=\E[m$<2>, smacs=\E(0$<2>, smam=\E[?7h, smir=\E[4h,
+- smso=\E[7m, smul=\E[4m,
++ use=vt520,
+
+ #### VT100 emulations
+ #
+@@ -2887,7 +2948,7 @@ crt|crt-vt220|CRT 2.3 emulating VT220,
+ # the default behavior -TD
+
+ putty|PuTTY terminal emulator,
+- am, bce, bw, ccc, hs, mir, msgr, xenl, xon, XT,
++ am, bce, bw, ccc, mir, msgr, xenl, xon, XT,
+ colors#8, it#8, ncv#22, pairs#64, U8#1,
+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+@@ -2897,11 +2958,10 @@ putty|PuTTY terminal emulator,
+ cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\EM,
+ dch=\E[%p1%dP, dch1=\E[P,
+ dispc=%?%p1%{8}%=%t\E%%G\342\227\230\E%%@%e%p1%{10}%=%t\E%%G\342\227\231\E%%@%e%p1%{12}%=%t\E%%G\342\231\0\E%%@%e%p1%{13}%=%t\E%%G\342\231\252\E%%@%e%p1%{14}%=%t\E%%G\342\231\253\E%%@%e%p1%{15}%=%t\E%%G\342\230\274\E%%@%e%p1%{27}%=%t\E%%G\342\206\220\E%%@%e%p1%{155}%=%t\E%%G\340\202\242\E%%@%e%p1%c%;,
+- dl=\E[%p1%dM, dl1=\E[M, dsl=\E]0;\007, ech=\E[%p1%dX,
+- ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
+- flash=\E[?5h\E[?5l, fsl=^G, home=\E[H, hpa=\E[%i%p1%dG,
+- ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L, ind=^J,
+- indn=\E[%p1%dS,
++ dl=\E[%p1%dM, dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K,
++ el1=\E[1K, enacs=\E(B\E)0, flash=\E[?5h\E[?5l, home=\E[H,
++ hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L,
++ ind=^J, indn=\E[%p1%dS,
+ initc=\E]P%p1%x%p2%{255}%*%{1000}%/%02x%p3%{255}%*%{1000}%/%02x%p4%{255}%*%{1000}%/%02x,
+ is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>\E]R,
+ kb2=\E[G, kbs=\177, kcbt=\E[Z, kcub1=\E[D, kcud1=\E[B,
+@@ -2922,7 +2982,7 @@ putty|PuTTY terminal emulator,
+ sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
+ sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smcup=\E[?47h,
+ smir=\E[4h, smpch=\E[11m, smso=\E[7m, smul=\E[4m,
+- tbc=\E[3g, tsl=\E]0;, vpa=\E[%i%p1%dd, use=vt102+enq,
++ tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt102+enq, use=xterm+sl,
+ vt100-putty|Reset PuTTY to pure vt100,
+ rs2=\E<\E["p\Ec\E[?3l\E]R\E[40"p\E[61"p\E[50;1;2"p,
+ use=vt100,
+@@ -2937,6 +2997,28 @@ putty-vt100|VT100+ keyboard layout,
+ kf3=\EOR, kf4=\EOS, kf5=\EOT, kf6=\EOU, kf7=\EOV, kf8=\EOW,
+ kf9=\EOX, use=putty,
+
++# Unlike xterm-sco, this leaves kmous ambiguous with kf1.
++#
++# Use modifiers to obtain function keys past 12:
++# F1-F12 - normal
++# F13-F24 - shift
++# F25-F36 - control/alt
++# F37-F48 - control/shift
++#
++putty-sco|putty with SCO function keys,
++ kbeg=\E[E, kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
++ kdch1=\177, kend=\E[F, kf1=\E[M, kf10=\E[V, kf11=\E[W,
++ kf12=\E[X, kf13=\E[Y, kf14=\E[Z, kf15=\E[a, kf16=\E[b,
++ kf17=\E[c, kf18=\E[d, kf19=\E[e, kf2=\E[N, kf20=\E[f,
++ kf21=\E[g, kf22=\E[h, kf23=\E[i, kf24=\E[j, kf25=\E[k,
++ kf26=\E[l, kf27=\E[m, kf28=\E[n, kf29=\E[o, kf3=\E[O,
++ kf30=\E[p, kf31=\E[q, kf32=\E[r, kf33=\E[s, kf34=\E[t,
++ kf35=\E[u, kf36=\E[v, kf37=\E[w, kf38=\E[x, kf39=\E[y,
++ kf4=\E[P, kf40=\E[z, kf41=\E[@, kf42=\E[[, kf43=\E[\\,
++ kf44=\E[], kf45=\E[\^, kf46=\E[_, kf47=\E[`, kf48=\E[{,
++ kf5=\E[Q, kf6=\E[R, kf7=\E[S, kf8=\E[T, kf9=\E[U, khome=\E[H,
++ kich1=\E[L, knp=\E[G, kpp=\E[I, use=putty,
++
+ # This entry is for Tera Term Pro version 2.3, for MS-Windows 95/NT written by
+ # T. Teranishi dated Mar 10, 1998. It is a free software terminal emulator
+ # (communication program) which supports:
+@@ -3091,7 +3173,8 @@ tt|tkterm|Don Libes' tk text widget term
+ kf9=\EOX, rmkx=\E[?1l\E>, rmso=\E[m, smkx=\E[?1h\E,
+ smso=\E[7m,
+
+-#### X terminal emulators
++######## X TERMINAL EMULATORS
++#### XTERM
+ #
+ # You can add the following line to your .Xdefaults to change the terminal type
+ # set by the xterms you start up to my-xterm:
+@@ -3183,7 +3266,7 @@ xterm-r6|xterm-old|xterm X11R6 version,
+ # This is the base xterm entry for the xterm supplied with XFree86 3.2 & up.
+ # The name has been changed and some aliases have been removed.
+ xterm-xf86-v32|xterm terminal emulator (XFree86 3.2 Window System),
+- OTbs, am, bce, km, mir, msgr, xenl,
++ OTbs, am, bce, km, mir, msgr, xenl, XT,
+ cols#80, it#8, lines#24, ncv@,
+ acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ bel=^G, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+@@ -3227,13 +3310,13 @@ xterm-xf86-v33|xterm terminal emulator (
+ # xterm to use terminfo-based descriptions with the titeInhibit resource.
+ # -- the distribution contained incorrect khome/kend values -TD
+ xterm-xf86-v333|xterm terminal emulator (XFree86 3.3.3 Window System),
+- mc5i,
+ blink=\E[5m, ich1@, invis=\E[8m,
+ is2=\E[!p\E[?3;4l\E[4l\E>, kdch1=\E[3~, kfnd@, kslt@,
+- mc0=\E[i, mc4=\E[4i, mc5=\E[5i, rmcup=\E[?1047l\E[?1048l,
+- rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>,
++ rmcup=\E[?1047l\E[?1048l, rs1=\Ec,
++ rs2=\E[!p\E[?3;4l\E[4l\E>,
+ sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+- smcup=\E[?1048h\E[?1047h, use=xterm-xf86-v33,
++ smcup=\E[?1048h\E[?1047h, use=ansi+pp,
++ use=xterm-xf86-v33,
+
+ # This version was released in XFree86 4.0.
+ xterm-xf86-v40|xterm terminal emulator (XFree86 4.0 Window System),
+@@ -3274,12 +3357,14 @@ xterm-xfree86|xterm terminal emulator (X
+ # This version reflects the current xterm features.
+ xterm-new|modern xterm terminal emulator,
+ npc,
+- indn=\E[%p1%dS, kDC=\E[3;2~, kEND=\E[1;2F, kHOM=\E[1;2H,
+- kIC=\E[2;2~, kNXT=\E[6;2~, kPRV=\E[5;2~, kb2=\EOE,
+- kcbt=\E[Z, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+- kend=\EOF, kent=\EOM, khome=\EOH, kich1=\E[2~, kmous=\E[M,
+- knp=\E[6~, kpp=\E[5~, rin=\E[%p1%dT, use=xterm+pcfkeys,
++ indn=\E[%p1%dS, kb2=\EOE, kcbt=\E[Z, kent=\EOM,
++ rin=\E[%p1%dT, use=xterm+pcfkeys, use=xterm+tmux,
+ use=xterm-basic,
++
++# This fragment is for people who cannot agree on what the backspace key
++# should send.
++xterm+kbs|fragment for backspace key,
++ kbs=^H,
+ #
+ # This fragment describes as much of XFree86 xterm's "pc-style" function
+ # keys as will fit into terminfo's 60 function keys.
+@@ -3445,7 +3530,7 @@ xterm+r6f2|xterm with oldFunctionKeys an
+ #
+ # This chunk is used for building the VT220/Sun/PC keyboard variants.
+ xterm-basic|modern xterm terminal emulator - common,
+- OTbs, am, bce, km, mc5i, mir, msgr, xenl, AX,
++ OTbs, am, bce, km, mir, msgr, xenl, AX, XT,
+ colors#8, cols#80, it#8, lines#24, pairs#64,
+ acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[?25l,
+@@ -3457,19 +3542,20 @@ xterm-basic|modern xterm terminal emulat
+ dl1=\E[M, ech=\E[%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K,
+ flash=\E[?5h$<100/>\E[?5l, home=\E[H, hpa=\E[%i%p1%dG,
+ ht=^I, hts=\EH, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[L,
+- ind=^J, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>, kbs=^H,
+- kmous=\E[M, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, meml=\El,
+- memu=\Em, op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM,
+- rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?1049l, rmir=\E[4l,
+- rmkx=\E[?1l\E>, rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m,
+- rs1=\Ec, rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7,
+- setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++ ind=^J, invis=\E[8m, is2=\E[!p\E[?3;4l\E[4l\E>,
++ kmous=\E[M, meml=\El, memu=\Em, op=\E[39;49m, rc=\E8,
++ rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
++ rmcup=\E[?1049l, rmir=\E[4l, rmkx=\E[?1l\E>,
++ rmm=\E[?1034l, rmso=\E[27m, rmul=\E[24m, rs1=\Ec,
++ rs2=\E[!p\E[?3;4l\E[4l\E>, sc=\E7, setab=\E[4%p1%dm,
++ setaf=\E[3%p1%dm,
+ setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+ setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
+ sgr0=\E(B\E[m, smacs=\E(0, smam=\E[?7h, smcup=\E[?1049h,
+ smir=\E[4h, smkx=\E[?1h\E=, smm=\E[?1034h, smso=\E[7m,
+- smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt100+enq,
++ smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=ansi+pp,
++ use=xterm+kbs, use=vt100+enq,
+
+ # From: David J. MacKenzie <djm@va.pubnix.com>, 14 Nov 1997
+ # In retrospect, something like xterm-r6 was intended here -TD
+@@ -3527,6 +3613,28 @@ xterm-1002|testing xterm-mouse,
+ xterm-1003|testing xterm-mouse,
+ XM=\E[?1003%?%p1%{1}%=%th%el%;, use=xterm-new,
+
++# This chunk is based on suggestions by Ailin Nemui and Nicholas Marriott, who
++# asked for some of xterm's advanced features to be added to its terminfo
++# entry. It defines extended capabilities not found in standard terminfo or
++# termcap. These are useful in tmux, for instance, hence the name.
++#
++# One caveat in adding extended capabilities in ncurses is that if the names
++# are longer than two characters, then they will not be visible through the
++# termcap interface.
++#
++# Ms modifies the selection/clipboard. Its parameters are
++# p1 = the storage unit (clipboard, selection or cut buffer)
++# p2 = the base64-encoded clipboard content.
++#
++# Ss is used to set the cursor style as described by the DECSCUSR
++# function to a block or underline.
++# Se resets the cursor style to the terminal power-on default.
++#
++# Cs and Cr set and reset the cursor colour.
++xterm+tmux|advanced xterm features used in tmux,
++ Cr=\E]112\007, Cs=\E]12;%p1%s\007,
++ Ms=\E]52;%p1%s;%p2%s\007, Se=\E[2 q, Ss=\E[%p1%d q,
++
+ # This is another variant, for XFree86 4.0 xterm (T.Dickey)
+ # This is an 8-bit version of xterm, which emulates DEC vt220 with ANSI color.
+ # To use it, your decTerminalID resource must be set to 200 or above.
+@@ -3552,8 +3660,8 @@ xterm-8bit|xterm terminal emulator 8-bit
+ hpa=\233%i%p1%dG, ht=^I, hts=\210, ich=\233%p1%d@,
+ il=\233%p1%dL, il1=\233L, ind=^J, invis=\2338m,
+ is2=\E[62"p\E G\233m\233?7h\E>\E7\233?1;3;4;6l\2334l\233r\E8,
+- ka1=\217w, ka3=\217u, kb2=\217y, kbeg=\217E, kbs=^H,
+- kc1=\217q, kc3=\217s, kcbt=\233Z, kcub1=\217D, kcud1=\217B,
++ ka1=\217w, ka3=\217u, kb2=\217y, kbeg=\217E, kc1=\217q,
++ kc3=\217s, kcbt=\233Z, kcub1=\217D, kcud1=\217B,
+ kcuf1=\217C, kcuu1=\217A, kdch1=\2333~, kend=\2334~,
+ kent=\217M, kf1=\23311~, kf10=\23321~, kf11=\23323~,
+ kf12=\23324~, kf13=\23325~, kf14=\23326~, kf15=\23328~,
+@@ -3575,6 +3683,7 @@ xterm-8bit|xterm terminal emulator 8-bit
+ smcup=\233?1049h, smir=\2334h, smkx=\233?1h\E=,
+ smso=\2337m, smul=\2334m, tbc=\2333g, u6=\233[%i%d;%dR,
+ u7=\E[6n, u8=\233[?1;2c, u9=\E[c, vpa=\233%i%p1%dd,
++ use=xterm+kbs,
+
+ xterm-hp|xterm with hpterm function keys,
+ kclr=\EJ, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
+@@ -3621,15 +3730,16 @@ xterm-vt52|xterm emulating dec vt52,
+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ bel=^G, clear=\EH\EJ, cr=^M, cub1=\ED, cud1=\EB, cuf1=\EC,
+ cup=\EY%p1%' '%+%c%p2%' '%+%c, cuu1=\EA, ed=\EJ, el=\EK,
+- home=\EH, ht=^I, ind=^J, kbs=^H, kcub1=\ED, kcud1=\EB,
+- kcuf1=\EC, kcuu1=\EA, nel=^M^J, ri=\EI, rmacs=\EG, smacs=\EF,
++ home=\EH, ht=^I, ind=^J, kcub1=\ED, kcud1=\EB, kcuf1=\EC,
++ kcuu1=\EA, nel=^M^J, ri=\EI, rmacs=\EG, smacs=\EF,
++ use=xterm+kbs,
+
+ xterm-noapp|xterm with cursor keys in normal mode,
+ rmcup@, rmkx=\E>, smcup@, smkx=\E=, use=xterm+noapp,
+ use=xterm,
+
+ xterm-24|vs100|xterms|xterm terminal emulator (X Window System),
+- lines#24, use=xterm-old,
++ lines#24, use=xterm,
+
+ # This is xterm for ncurses.
+ xterm|xterm terminal emulator (X Window System),
+@@ -3640,25 +3750,68 @@ xterm|xterm terminal emulator (X Window
+ xterm-utf8|xterm with no VT100 line-drawing in UTF-8 mode,
+ U8#1, use=xterm,
+
+-# These entries allow access to the X titlebar and icon name as a status line.
+-# Note that twm (and possibly window managers descended from it such as tvtwm,
+-# ctwm, and vtwm) track windows by icon-name; thus, you don't want to mess
+-# with it.
++# These building-blocks allow access to the X titlebar and icon name as a
++# status line. There are a few problems in using them in entries:
++#
++# a) tsl should have a parameter to denote the column on which to transfer to
++# the status line.
++# b) the "0" code for xterm updates both icon-title and window title. Some
++# window managers such as twm (and possibly window managers descended from
++# it such as tvtwm, ctwm, and vtwm) track windows by icon-name. Thus, you
++# don't want to mess with icon-name when using those window managers.
+ xterm+sl|access X title line and icon name,
+ hs,
+- wsl#40,
+- dsl=\E]0;\007, fsl=^G, tsl=\E]0;, use=xterm,
++ dsl=\E]0;\007, fsl=^G, tsl=\E]0;,
+ xterm+sl-twm|access X title line (pacify twm-descended window managers),
+ hs,
+- wsl#40,
+- dsl=\E]2;\007, fsl=^G, tsl=\E]2;, use=xterm,
++ dsl=\E]2;\007, fsl=^G, tsl=\E]2;,
++
++# In contrast, this block can be used for a DEC vt320 and up. There are two
++# controls used.
++#
++# DECSASD (select active status display)
++# \E[0$} Main display
++# \E[1$} Status line
++#
++# DECSSDT (select status line type)
++# \E[0$~ No status line
++# \E[1$~ Indicator status line
++# \E[2$~ Host-writable status line
++#
++# The building block assumes that the terminal always shows something at the
++# status line (either the indicator, or status line). That is because if no
++# status line is used, then the terminal makes that line part of the user
++# window, changing its size without notice.
++#
++# Because there is no "esl" (enable status line) capability, the "tsl"
++# capability ensures that the status line is host-writable. A DEC terminal
++# will clear the status line when changing from indicator to host-writable
++# mode.
++#
++# Once on the status line, the row part of cursor addressing is ignored. Since
++# tsl expects a parameter (to specify the column), the shortest addressing that
++# can be used for this purpose is HPA, e.g., \E[5d to go to column 5.
++#
++dec+sl|DEC VTxx status line,
++ eslok, hs,
++ dsl=\E[1$~, fsl=\E[0$}, tsl=\E[2$~\E[1$}\E[%i%p1%d`,
+
+ #
+ # The following xterm variants don't depend on your base version
+ #
+ # xterm with bold instead of underline
+ xterm-bold|xterm terminal emulator (X11R6 Window System) standout w/bold,
+- smso=\E[7m, smul=\E[1m, use=xterm-old,
++ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;1%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m,
++ smso=\E[7m, smul=\E[1m, use=xterm,
++
++# See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
++xterm-nic|xterm with ich/ich1 suppressed for non-curses programs,
++ ich@, ich1@, use=xterm,
++# From: Mark Sheppard <kimble@mistral.co.uk>, 4 May 1996
++xterm1|xterm terminal emulator ignoring the alternate screen buffer,
++ rmcup@, smcup@, use=xterm,
++
++#### KTERM
+ # (kterm: this had extension capabilities ":KJ:TY=ascii:" -- esr)
+ # (kterm should not invoke DEC Graphics as the alternate character set
+ # -- Kenji Rikitake)
+@@ -3676,12 +3829,51 @@ kterm|kterm kanji terminal emulator (X w
+ tsl=\E[?E\E[?%i%p1%dT, use=xterm-r6, use=ecma+color,
+ kterm-color|kterm-co|kterm with ANSI colors,
+ ncv@, use=kterm, use=ecma+color,
+-# See the note on ICH/ICH1 VERSUS RMIR/SMIR near the end of file
+-xterm-nic|xterm with ich/ich1 suppressed for non-curses programs,
+- ich@, ich1@, use=xterm,
+-# From: Mark Sheppard <kimble@mistral.co.uk>, 4 May 1996
+-xterm1|xterm terminal emulator ignoring the alternate screen buffer,
+- rmcup@, smcup@, use=xterm,
++
++#### Other XTERM
++# These (xtermc and xtermm) are distributed with Solaris. They refer to a
++# variant of xterm which is apparently no longer supported, but are interesting
++# because they illustrate SVr4 curses mouse controls - T.Dickey
++xtermm|xterm terminal emulator (monocrome),
++ OTbs, am, km, mir, msgr, xenl,
++ btns#3, cols#80, it#8, lines#24,
++ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
++ bel=^G, blink@, bold=\E[1m, clear=\E[H\E[2J, cr=^M,
++ csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
++ cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
++ cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
++ dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
++ el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0, getm=\E[%p1%dY,
++ home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
++ il=\E[%p1%dL, il1=\E[L, ind=^J, kbs=^H, kcub1=\EOD,
++ kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\E[Y, kf0=\EOy,
++ kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf5=\EOT, kf6=\EOU,
++ kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H, kmous=\E[^_,
++ knp=\E[U, kpp=\E[V, rc=\E8, reqmp=\E[492Z, rev=\E[7m, ri=\EM,
++ rmacs=^O, rmcup=\E@0\E[?4r, rmso=\E[m,
++ rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
++ rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
++ sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
++ sgr0=\E[m\017, smacs=^N, smcup=\E@0\E[?4s\E[?4h\E@1,
++ smso=\E[7m, tbc=\E[3g, use=vt100+fnkeys,
++
++xtermc|xterm terminal emulator (color),
++ colors#8, ncv#7, pairs#64,
++ op=\E[100m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++ setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
++ setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
++ use=xtermm,
++
++# From: David J. MacKenzie <djm@va.pubnix.com> 20 Apr 1995
++# Here's a termcap entry I've been using for xterm_color, which comes
++# with BSD/OS 2.0, and the X11R6 contrib tape too I think. Besides the
++# color stuff, I also have a status line defined as the window manager
++# title bar. [I have translated it to terminfo -- ESR]
++xterm-pcolor|xterm with color used for highlights and status line,
++ wsl#40,
++ bold=\E[1;43m, rev=\E[7;34m,
++ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1;43%;%?%p2%t;4;42%;%?%p1%t;7;31%;%?%p3%t;7;34%;%?%p4%t;5%;%?%p7%t;8%;m,
++ smso=\E[7;31m, smul=\E[4;42m, use=xterm+sl, use=xterm-r6,
+
+ # This describes the capabilities of color_xterm, an xterm variant from
+ # before ECMA-64 color support was folded into the main-line xterm release.
+@@ -3729,6 +3921,32 @@ xterm-color|nxterm|generic color xterm,
+ ncv@,
+ op=\E[m, use=xterm-r6, use=klone+color,
+
++# This entry describes an xterm with Sun-style function keys enabled
++# via the X resource setting "xterm*sunFunctionKeys:true"
++# To understand <kf11>/<kf12> note that L1,L2 and F11,F12 are the same.
++# The <kf13>...<kf20> keys are L3-L10. We don't set <kf16=\E[197z>
++# because we want it to be seen as <kcpy>.
++# The <kf31>...<kf45> keys are R1-R15. We treat some of these in accordance
++# with their Sun keyboard labels instead.
++# From: Simon J. Gerraty <sjg@zen.void.oz.au> 10 Jan 1996
++xterm-sun|xterm with sunFunctionKeys true,
++ kb2=\E[218z, kcpy=\E[197z, kcub1=\EOD, kcud1=\EOB,
++ kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3z, kend=\E[220z,
++ kent=\EOM, kf1=\E[224z, kf10=\E[233z, kf11=\E[192z,
++ kf12=\E[193z, kf13=\E[194z, kf14=\E[195z, kf15=\E[196z,
++ kf17=\E[198z, kf18=\E[199z, kf19=\E[200z, kf2=\E[225z,
++ kf20=\E[201z, kf3=\E[226z, kf31=\E[208z, kf32=\E[209z,
++ kf33=\E[210z, kf34=\E[211z, kf35=\E[212z, kf36=\E[213z,
++ kf38=\E[215z, kf4=\E[227z, kf40=\E[217z, kf42=\E[219z,
++ kf44=\E[221z, kf45=\E[222z, kf46=\E[234z, kf47=\E[235z,
++ kf5=\E[228z, kf6=\E[229z, kf7=\E[230z, kf8=\E[231z,
++ kf9=\E[232z, kfnd=\E[200z, khlp=\E[196z, khome=\E[214z,
++ kich1=\E[2z, knp=\E[222z, kpp=\E[216z, kund=\E[195z,
++ use=xterm-basic,
++xterms-sun|small (80x24) xterm with sunFunctionKeys true,
++ cols#80, lines#24, use=xterm-sun,
++
++#### GNOME (VTE)
+ # this describes the alpha-version of Gnome terminal shipped with Redhat 6.0
+ gnome-rh62|Gnome terminal,
+ bce,
+@@ -3782,7 +4000,7 @@ gnome-rh80|GNOME Terminal,
+ #
+ # bce and msgr are repaired.
+ gnome-rh90|GNOME Terminal,
+- bce, msgr,
++ bce, msgr, XT,
+ hpa=\E[%i%p1%dG, kDC=\E[3;2~, kLFT=\EO2D, kRIT=\EO2C,
+ kb2=\E[E, kcbt=\E[Z, kend=\EOF, khome=\EOH, tbc=\E[3g,
+ vpa=\E[%i%p1%dd, use=xterm+pcf0, use=xterm+pcfkeys,
+@@ -3867,6 +4085,7 @@ gnome-256color|GNOME Terminal with xterm
+ xfce|Xfce Terminal,
+ use=vte,
+
++#### Other GNOME
+ # Multi-Gnome-Terminal 1.6.2
+ #
+ # This does not use VTE, and does have different behavior (compare xfce and
+@@ -3874,6 +4093,7 @@ xfce|Xfce Terminal,
+ mgt|Multi GNOME Terminal,
+ indn=\E[%p1%dS, rin=\E[%p1%dT, use=xterm-xf86-v333,
+
++#### KDE
+ # This is kvt 0-18.7, shipped with Redhat 6.0 (though whether it supports bce
+ # or not is debatable).
+ kvt|KDE terminal,
+@@ -3922,7 +4142,7 @@ konsole-base|KDE console window,
+ ncv@,
+ bel@, blink=\E[5m, civis=\E[?25l, cnorm=\E[?25h,
+ ech=\E[%p1%dX, flash=\E[?5h$<100/>\E[?5l,
+- hpa=\E[%i%p1%dG, indn=\E[%p1%dS, kbs=\177, kdch1@,
++ hpa=\E[%i%p1%dG, indn=\E[%p1%dS, kbs=\177, kdch1=\E[3~,
+ kend=\E[4~, kf1@, kf10@, kf11@, kf12@, kf13@, kf14@, kf15@, kf16@,
+ kf17@, kf18@, kf19@, kf2@, kf20@, kf3@, kf4@, kf5@, kf6@, kf7@, kf8@,
+ kf9@, kfnd@, khome=\E[1~, kslt@, rin=\E[%p1%dT, rmam=\E[?7l,
+@@ -3932,11 +4152,10 @@ konsole-base|KDE console window,
+ sgr0=\E[0m\017, smam=\E[?7h, vpa=\E[%i%p1%dd,
+ use=ecma+color, use=xterm-r6,
+ konsole-linux|KDE console window with linux keyboard,
+- kdch1=\E[3~, kf1=\E[[A, kf10=\E[21~, kf11=\E[23~,
+- kf12=\E[24~, kf13@, kf14@, kf15@, kf16@, kf17@, kf18@, kf19@,
+- kf2=\E[[B, kf20@, kf3=\E[[C, kf4=\E[[D, kf5=\E[[E,
+- kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+- use=konsole-base,
++ kf1=\E[[A, kf10=\E[21~, kf11=\E[23~, kf12=\E[24~, kf13@,
++ kf14@, kf15@, kf16@, kf17@, kf18@, kf19@, kf2=\E[[B, kf20@,
++ kf3=\E[[C, kf4=\E[[D, kf5=\E[[E, kf6=\E[17~, kf7=\E[18~,
++ kf8=\E[19~, kf9=\E[20~, use=konsole-base,
+ konsole-solaris|KDE console window with Solaris keyboard,
+ kbs=^H, kend=\E[4~, khome=\E[1~, use=konsole-vt100,
+ # KDE's "XFree86 3.x.x" keyboard is based on reading the xterm terminfo rather
+@@ -3972,6 +4191,7 @@ konsole|KDE console window,
+ konsole-256color|KDE console window with xterm 256-colors,
+ initc@, use=xterm+256color, use=konsole,
+
++#### MLTERM
+ # This is mlterm 2.9.3's mlterm.ti, with some additions/corrections -TD
+ #
+ # It is nominally a vt102 emulator, with features borrowed from rxvt and
+@@ -4037,6 +4257,7 @@ mlterm+pcfkeys|fragment for PC-style fke
+ mlterm-256color|mlterm 3.0 with xterm 256-colors,
+ use=xterm+256color, use=rxvt,
+
++#### RXVT
+ # From: Thomas Dickey <dickey@clark.net> 04 Oct 1997
+ # Updated: Oezguer Kesim <kesim@math.fu-berlin.de> 02 Nov 1997
+ # Notes:
+@@ -4208,6 +4429,7 @@ rxvt-cygwin-native|rxvt terminal emulato
+ rxvt-16color|xterm with 16 colors like aixterm,
+ ncv#32, use=ibm+16color, use=rxvt,
+
++#### MRXVT
+ # mrxvt 0.5.4
+ #
+ # mrxvt is based on rxvt 2.7.11, but has by default XTERM_FKEYS defined, which
+@@ -4225,6 +4447,7 @@ mrxvt|multitabbed rxvt,
+ mrxvt-256color|multitabbed rxvt with 256 colors,
+ use=xterm+256color, use=mrxvt,
+
++#### ETERM
+ # From: Michael Jennings <mej@valinux.com>
+ #
+ # Eterm 0.9.3
+@@ -4270,11 +4493,13 @@ Eterm-256color|Eterm with xterm 256-colo
+ Eterm-88color|Eterm with 88 colors,
+ use=xterm+88color, use=Eterm,
+
++#### ATERM
+ # Based on rxvt 2.4.8, it has a few differences in key bindings
+ aterm|AfterStep terminal,
+ XT,
+ kbs=\177, kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, use=rxvt,
+
++#### XITERM
+ # xiterm 0.5-5.2
+ # This is not based on xterm's source...
+ # vttest shows several problems with keyboard, cursor-movements.
+@@ -4283,48 +4508,8 @@ xiterm|internationalized terminal emulat
+ km@,
+ kbs=\177, kdch1=\E[3~, use=klone+color, use=xterm-r6,
+
+-# These (xtermc and xtermm) are distributed with Solaris. They refer to a
+-# variant of xterm which is apparently no longer supported, but are interesting
+-# because they illustrate SVr4 curses mouse controls - T.Dickey
+-xtermm|xterm terminal emulator (monocrome),
+- OTbs, am, km, mir, msgr, xenl,
+- btns#3, cols#80, it#8, lines#24,
+- acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+- bel=^G, blink@, bold=\E[1m, clear=\E[H\E[2J, cr=^M,
+- csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=\E[D,
+- cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
+- cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+- dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
+- el=\E[K, el1=\E[1K$<3>, enacs=\E(B\E)0, getm=\E[%p1%dY,
+- home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@, ich1=\E[@,
+- il=\E[%p1%dL, il1=\E[L, ind=^J, kbs=^H, kcub1=\EOD,
+- kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, kend=\E[Y, kf0=\EOy,
+- kf10=\EOY, kf11=\EOZ, kf12=\EOA, kf5=\EOT, kf6=\EOU,
+- kf7=\EOV, kf8=\EOW, kf9=\EOX, khome=\E[H, kmous=\E[^_,
+- knp=\E[U, kpp=\E[V, rc=\E8, reqmp=\E[492Z, rev=\E[7m, ri=\EM,
+- rmacs=^O, rmcup=\E@0\E[?4r, rmso=\E[m,
+- rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
+- rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+- sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;,
+- sgr0=\E[m\017, smacs=^N, smcup=\E@0\E[?4s\E[?4h\E@1,
+- smso=\E[7m, tbc=\E[3g, use=vt100+fnkeys,
+-
+-xtermc|xterm terminal emulator (color),
+- colors#8, ncv#7, pairs#64,
+- op=\E[100m, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+- setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+- setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+- use=xtermm,
+-
+-# From: David J. MacKenzie <djm@va.pubnix.com> 20 Apr 1995
+-# Here's a termcap entry I've been using for xterm_color, which comes
+-# with BSD/OS 2.0, and the X11R6 contrib tape too I think. Besides the
+-# color stuff, I also have a status line defined as the window manager
+-# title bar. [I have translated it to terminfo -- ESR]
+-xterm-pcolor|xterm with color used for highlights and status line,
+- bold=\E[1m\E[43m, rev=\E[7m\E[34m, smso=\E[7m\E[31m,
+- smul=\E[4m\E[42m, use=xterm+sl, use=xterm-r6,
+
++#### HPTERM
+ # HP ships this (HPUX 9 and 10), except for the pb#9600 which was merged in
+ # from BSD termcap. (hpterm: added empty <acsc>, we have no idea what ACS
+ # chars look like --esr)
+@@ -4357,31 +4542,7 @@ hpterm-color|HP X11 terminal emulator wi
+ initp=\E&v%p2%da%p3%db%p4%dc%p5%dx%p6%dy%p7%dz%p1%dI,
+ op=\E&v0S, scp=\E&v%p1%dS, use=hpterm,
+
+-# This entry describes an xterm with Sun-style function keys enabled
+-# via the X resource setting "xterm*sunFunctionKeys:true"
+-# To understand <kf11>/<kf12> note that L1,L2 and F11,F12 are the same.
+-# The <kf13>...<kf20> keys are L3-L10. We don't set <kf16=\E[197z>
+-# because we want it to be seen as <kcpy>.
+-# The <kf31>...<kf45> keys are R1-R15. We treat some of these in accordance
+-# with their Sun keyboard labels instead.
+-# From: Simon J. Gerraty <sjg@zen.void.oz.au> 10 Jan 1996
+-xterm-sun|xterm with sunFunctionKeys true,
+- kb2=\E[218z, kcpy=\E[197z, kcub1=\EOD, kcud1=\EOB,
+- kcuf1=\EOC, kcuu1=\EOA, kdch1=\E[3z, kend=\E[220z,
+- kent=\EOM, kf1=\E[224z, kf10=\E[233z, kf11=\E[192z,
+- kf12=\E[193z, kf13=\E[194z, kf14=\E[195z, kf15=\E[196z,
+- kf17=\E[198z, kf18=\E[199z, kf19=\E[200z, kf2=\E[225z,
+- kf20=\E[201z, kf3=\E[226z, kf31=\E[208z, kf32=\E[209z,
+- kf33=\E[210z, kf34=\E[211z, kf35=\E[212z, kf36=\E[213z,
+- kf38=\E[215z, kf4=\E[227z, kf40=\E[217z, kf42=\E[219z,
+- kf44=\E[221z, kf45=\E[222z, kf46=\E[234z, kf47=\E[235z,
+- kf5=\E[228z, kf6=\E[229z, kf7=\E[230z, kf8=\E[231z,
+- kf9=\E[232z, kfnd=\E[200z, khlp=\E[196z, khome=\E[214z,
+- kich1=\E[2z, knp=\E[222z, kpp=\E[216z, kund=\E[195z,
+- use=xterm-basic,
+-xterms-sun|small (80x24) xterm with sunFunctionKeys true,
+- cols#80, lines#24, use=xterm-sun,
+-
++#### EMU
+ # This is for the extensible terminal emulator on the X11R6 contrib tape.
+ # It corresponds to emu's internal emulation:
+ # emu -term emu
+@@ -4443,6 +4604,8 @@ emu-220|Emu-220 (vt200-7bit mode),
+ sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ sgr0=\E[m, smacs=^N, smcup=\E[?1l\E=, smkx=\E=,
+ smso=\E[0;7m, smul=\E[0;4m, tbc=\E[3g,
++
++#### MVTERM
+ # A commercial product, Reportedly a version of Xterm with an OPEN LOOK UI,
+ # print interface, ANSI X3.64 colour escape sequences, etc. Newsgroup postings
+ # indicate that it emulates more than one terminal, but incompletely.
+@@ -4477,7 +4640,7 @@ mvterm|vv100|SwitchTerm aka mvTERM,
+ smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+ tsl=\E[?E\E[?%i%p1%dT, use=vt100+fnkeys,
+
+-### MTERM
++#### MTERM
+ #
+ # This application is available by email from <mouse@Rodents.Montreal.QC.CA>.
+ #
+@@ -4598,6 +4761,123 @@ mgr-linux|Mgr window with Linux keyboard
+ kf5=\E[[E, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+ khome=\E[1~, knp=\E[6~, kpp=\E[5~, use=mgr,
+
++#### SIMPLETERM
++# st.suckless.org
++# st-0.1.1
++#
++# Note: the original terminfo description uses leading blank to persuade
++# ncurses to use "st" as its name. Proper fix for that is to use "st" as an
++# alias.
++#
++# Reading the code shows it should work for aixterm 16-colors
++# - added st-16color
++#
++# Using tack:
++# - set eo (erase-overstrike)
++# - set xenl
++# - tbc doesn't work
++# - hts works
++# - cbt doesn't work
++# - shifted cursor-keys send sequences like rxvt
++# - sgr referred to unimplemented "invis" mode.
++# Fixes: add eo and xenl per tack, remove nonworking cbt, hts and tbc, invis
++simpleterm|st| simpleterm,
++ am, eo, mir, msgr, ul, xenl,
++ colors#8, cols#80, it#8, lines#24, ncv#3, pairs#64,
++ acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
++ bel=^G, bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J,
++ cnorm=\E[?12l\E[?25h, cr=^M, csr=\E[%i%p1%d;%p2%dr,
++ cub1=^H, cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
++ cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
++ dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J, el=\E[K,
++ home=\E[H, hpa=\E[%i%p1%dG, ht=^I, ich=\E[%p1%d@,
++ il=\E[%p1%dL, il1=\E[L, ind=^J, indn=\E[%p1%dS, kbs=\177,
++ kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
++ kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
++ kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
++ kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++ khome=\E[1~, knp=\E[6~, kpp=\E[5~, op=\E[37;40m, rc=\E8,
++ rev=\E[7m, rmacs=\E(B, rmso=\E[m, rmul=\E[m, sc=\E7,
++ setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
++ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;m,
++ sgr0=\E[0m, smacs=\E(0, smso=\E[7m, smul=\E[4m,
++st-16color|simpleterm with 16-colors,
++ use=ibm+16color, use=simpleterm,
++# 256 colors "works", but when running xterm's test-scripts, some garbage is
++# shown in the titlebar.
++st-256color|simpleterm with 256 colors,
++ ccc@,
++ initc@, use=xterm+256color, use=simpleterm,
++
++### TERMINATOR
++# http://software.jessies.org/terminator/
++# Tested using their Debian package org.jessies.terminator 6.104.3256 on 64-bit
++# Debian/current -TD (2011/8/20)
++#
++# There are some packaging problems:
++# a) using Java, the program starts off using 50Mb, and climbs from there,
++# up to 114Mb after testing (no scrollback).
++# b) it insists on reinstalling its terminal description in $HOME/.terminfo
++# (two copies, just in case the host happens to be Mac OS X).
++# I deleted this after testing with tack.
++#
++# Issues/features found with tack:
++# a) tbc does not work (implying that hts also is broken).
++# Comparing with the tabs utility shows a problem with the last tabstop on
++# a line.
++# b) has xterm-style shifted function-key strings
++# meta also is used, but control is ignored.
++# c) has xterm-style modifiers for cursor keys (shift, control, shift+control, meta)
++# d) some combinations of shift/control send xterm-style sequences for
++# insert/delete/home/end.
++# e) numeric keypad sends only numbers (compare with vttest).
++# f) meta mode (km) is not implemented.
++#
++# Issues found with ncurses test-program:
++# a) bce is inconsistently implemented
++# b) widths of Unicode values above 256 do not always agree with wcwidth.
++#
++# Checked with vttest, found low degree of compatibility there.
++#
++# Checked with xterm's scripts, found that the 256-color palette is fixed.
++#
++# Fixes:
++# a) add sgr string
++# b) corrected sgr0 to reset alternate character set
++# c) modified smacs/rmacs to use SCS rather than SI/SO
++# d) removed bce
++# e) removed km
++terminator|Terminator no line wrap,
++ eo, mir, msgr, xenl, xon,
++ colors#256, cols#80, it#8, lines#24, lm#0, pairs#32767,
++ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
++ bold=\E[1m, civis=\E[?25l, clear=\E[H\E[2J,
++ cnorm=\E[?25h, cr=^M, csr=\E[%i%p1%d;%p2%dr,
++ cub=\E[%p1%dD, cub1=^H, cud=\E[%p1%dB, cud1=^J,
++ cuf=\E[%p1%dC, cuf1=\E[C, cup=\E[%i%p1%d;%p2%dH,
++ cuu=\E[%p1%dA, cuu1=\E[A, dch=\E[%p1%dP, dch1=\E[P,
++ dl=\E[%p1%dM, dl1=\E[M, dsl=\E]2;\007, ed=\E[J, el=\E[K,
++ el1=\E[1K, enacs=\E(B\E)0, flash=^G, fsl=^G, home=\E[H,
++ hpa=\E[%i%p1%dG, ht=^I, hts=\EH, il=\E[%p1%dL, il1=\E[L,
++ ind=^J, is1=\E[?47l\E=\E[?1l,
++ is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kbs=^H,
++ kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
++ kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
++ kf11=\E[23~, kf12=\E[24~, kf13=\E[25~, kf14=\E[26~,
++ kf15=\E[28~, kf16=\E[29~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
++ kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++ khome=\E[1~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
++ op=\E[39;49m, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B,
++ rmcup=\E[?47l\E8, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
++ rs1=\E>\E[1;3;4;5;6l\E[?7h\E[m\E[r\E[2J\E[H,
++ rs2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l\E>,
++ s0ds=\E(B, s1ds=\E(0, sc=\E7, setab=\E[48;5;%p1%dm,
++ setaf=\E[38;5;%p1%dm,
++ sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%;m%?%p9%t\E(0%e\E(B%;,
++ sgr0=\E[m\E(B, smacs=\E(0, smcup=\E7\E[?47h, smir=\E[4h,
++ smso=\E[7m, smul=\E[4m, tbc=\E[3g, tsl=\E]2;%p1,
++ vpa=\E[%i%p1%dd,
++
+ ######## UNIX VIRTUAL TERMINALS, VIRTUAL CONSOLES, AND TELNET CLIENTS
+ #
+
+@@ -4920,18 +5200,18 @@ screen3|older VT 100/ANSI X3.64 virtual
+ # sequences for setting the window-title. So you must use tsl and fsl in
+ # pairs, since the latter ends the string that is loaded to the window-title.
+ ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for Macintosh in vt220-8 mode,
+- am, hs, km, mir, msgr, xenl,
++ am, km, mir, msgr, xenl,
+ acsc=``aaffggiijjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+ clear=\E[H\E[2J, cnorm=\E[?25h, cr=^M,
+ csr=\E[%i%p1%d;%p2%dr, cub=\E[%p1%dD, cub1=^H,
+ cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
+ cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+- dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M,
+- dsl=\E]0;\007, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
+- flash=\E[?5h\E[?5l, fsl=^G, home=\E[H, ht=^I, hts=\EH,
+- ich=\E[%p1%d@, if=/usr/share/tabset/vt100,
+- il=\E[%p1%dL, il1=\E[L, ind=\n$<150*>,
++ dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM, dl1=\E[M, ed=\E[J,
++ el=\E[K, el1=\E[1K, enacs=\E)0, flash=\E[?5h\E[?5l,
++ home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
++ if=/usr/share/tabset/vt100, il=\E[%p1%dL, il1=\E[L,
++ ind=\n$<150*>,
+ is2=\E7\E[r\E[m\E[?7h\E[?1;4;6l\E[4l\E8\E>, kbs=^H,
+ kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ kdch1=\E[4~, kend=\E[5~, kf1=\E[17~, kf10=\E[28~,
+@@ -4945,8 +5225,8 @@ ncsa-m|ncsa-vt220-8|NCSA Telnet 2.6 for
+ rs2=\E7\E[r\E8\E[m\E[?7h\E[?1;4;6l\E[4l\E>, sc=\E7,
+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m%?%p9%t\E(0%e\E(B%;,
+ sgr0=\E[m\E(B, smacs=\E(0, smam=\E[?7h, smcup=\E7,
+- smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g, tsl=\E]0;,
+- u8=\E[?62;1;6c, use=ansi+enq,
++ smir=\E[4h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
++ u8=\E[?62;1;6c, use=xterm+sl, use=ansi+enq,
+ ncsa|NCSA Telnet 2.7 for Macintosh in vt220-8 mode,
+ use=ncsa-m, use=klone+color,
+ ncsa-ns|NCSA Telnet 2.7 for Macintosh in vt220-8 mode,
+@@ -5064,10 +5344,10 @@ sun-il|Sun Microsystems console with wor
+ kf10=\E[233z, kf11=\E[234z, kf12=\E[235z, kf2=\E[225z,
+ kf3=\E[226z, kf4=\E[227z, kf5=\E[228z, kf6=\E[229z,
+ kf7=\E[230z, kf8=\E[231z, kf9=\E[232z, khome=\E[214z,
+- knp=\E[222z, kopt=\E[194z, kpp=\E[216z, kres=\E[193z,
+- kund=\E[195z, rev=\E[7m, rmso=\E[m, rmul@, rs2=\E[s,
+- sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m, smso=\E[7m,
+- u8=\E[1t, u9=\E[11t,
++ kich1=\E[247z, knp=\E[222z, kopt=\E[194z, kpp=\E[216z,
++ kres=\E[193z, kund=\E[195z, rev=\E[7m, rmso=\E[m, rmul@,
++ rs2=\E[s, sgr=\E[0%?%p1%p3%|%t;7%;m, sgr0=\E[m,
++ smso=\E[7m, u8=\E[1t, u9=\E[11t,
+ # On some versions of CGSIX framebuffer firmware (SparcStation 5), <il1>/<il>
+ # flake out on the last line. Unfortunately, without them the terminal has no
+ # way to scroll.
+@@ -5077,6 +5357,10 @@ sun-cgsix|sun-ss5|Sun SparcStation 5 con
+ sun|sun1|sun2|Sun Microsystems Inc. workstation console,
+ use=sun-il,
+
++sun+sl|Sun Workstation window status line,
++ hs,
++ dsl=\E]l\E\\, fsl=\E\\, tsl=\E]l,
++
+ # From: <john@ucbrenoir> Tue Sep 24 13:14:44 1985
+ sun-s|Sun Microsystems Workstation window with status line,
+ hs,
+@@ -5131,10 +5415,11 @@ sun-type4|Sun Workstation console with t
+ sun-color|Sun Microsystems Workstation console with color support (IA systems),
+ colors#8, ncv#3, pairs#64,
+ cub=\E[%p1%dD, cud=\E[%p1%dB, cuf=\E[%p1%dC,
+- cuu=\E[%p1%dA, home=\E[H, op=\E[0m, setab=\E[4%p1%dm,
+- setaf=\E[3%p1%dm,
++ cuu=\E[%p1%dA, home=\E[H, op=\E[0m, rs2=\E[s,
++ setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+ setb=\E[4%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
+ setf=\E[3%?%p1%{1}%=%t4%e%p1%{3}%=%t6%e%p1%{4}%=%t1%e%p1%{6}%=%t3%e%p1%d%;m,
++ sgr=\E[0%?%p1;1%;%?%p3%;7%;m, sgr0=\E[m, smso=\E[1m,
+ use=sun,
+
+ #### Iris consoles
+@@ -5405,7 +5690,7 @@ dtterm|CDE desktop terminal,
+ #### Non-Unix Consoles
+ #
+
+-### EMX termcap.dat compatibility modes
++#### EMX termcap.dat compatibility modes
+ #
+ # Also (possibly only EMX, so we don't put it in ansi.sys, etc): set the
+ # no_color_video to inform the application that standout(1), underline(2)
+@@ -5544,7 +5829,7 @@ cygwin|ansi emulation for Cygwin,
+ rmacs=\E[10m, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l,
+ rmpch=\E[10m, rmso=\E[27m, rmul=\E[24m, rs1=\Ec\E]R,
+ sc=\E7, setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+- sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
++ sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;11%;m,
+ sgr0=\E[0;10m, smacs=\E[11m, smcup=\E7\E[?47h,
+ smir=\E[4h, smpch=\E[11m, smso=\E[7m, smul=\E[4m, tsl=\E];,
+ vpa=\E[%i%p1%dd, use=vt102+enq,
+@@ -5579,7 +5864,7 @@ cygwinDBG|Debug Version for Cygwin,
+ rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E[10m, rmir=\E[4l,
+ rmso=\E[m, rmul=\E[m, rs1=\Ec\E]R, sc=\E7,
+ setab=\E[4%p1%dm, setaf=\E[3%p1%dm,
+- sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
++ sgr=\E[0;10%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t;2%;%?%p6%t;1%;%?%p7%t;8%;%?%p9%t;12%;m,
+ sgr0=\E[0;10m, smacs=\E[11m, smir=\E[4h, smso=\E[7m,
+ smul=\E[4m, tbc=\E[3g, vpa=\E[%i%p1%dd, use=vt102+enq,
+
+@@ -5825,7 +6110,7 @@ pcmw|PC running Microsoft Works,
+ ht=^I, hts=\EH$<2/>, ind=\ED$<5/>, is2=\E[1;24r\E[24;1H,
+ kbs=^H, kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ kf1=\EOP, kf2=\EOQ, kf3=\EOR, kf4=\EOS, nel=\r\ED$<5/>,
+- rc=\E8, rev=\E[7m$<2/>, rf=/usr/share/lib/tabset/vt100,
++ rc=\E8, rev=\E[7m$<2/>, rf=/usr/share/tabset/vt100,
+ ri=\EM$<5/>, rmso=\E[m$<2/>, rmul=\E[m$<2/>,
+ rs2=\E>\E[?3l\E[?4l\E[?5l\E[?7h\E[?8h, sc=\E7,
+ sgr0=\E[m$<2/>, smso=\E[7m$<2/>, smul=\E[4m$<2/>,
+@@ -5968,7 +6253,7 @@ altos2|alt2|altos-2|altos II,
+ # :cC=^Al\r:cD=^Am\r:cE=^An\r:cF=^Ao\r:
+ # :XU=^Aq\r:XD=^Ar\r:XR=^As\r:XL=^At\r:\
+ # :HL=^AP\r:SP=\E[i:\
+-# :IS=\E[@:DE=\E[P:IL=\E[L:NS=\E[S:PS=\E[T:\
++# :IS=\E[@:DE=\E[P:IL=\E[L:NS=\E[S:PS=\E[T:
+ altos3|altos5|alt3|alt5|altos-3|altos-5|altos III or V,
+ blink=\E[5p, ri=\EM, sgr0=\E[p, use=altos2,
+ altos4|alt4|altos-4|altos IV,
+@@ -6183,7 +6468,7 @@ hp2626|hp2626a|hp2626p|hp 2626,
+ da, db,
+ lm#0, pb#19200,
+ ed=\ED\EJ$<500>\EC, indn=\E&r%p1%dD, ip=$<4>,
+- is2=\E&j@\r, rin=\E&r%p1%dU, use=hp+pfk+cr,
++ is2=\E&j@\r, rin=\E&r%p1%dU, use=hp+pfk-cr,
+ use=hp+labels, use=scrhp,
+
+ # This entry is for sysline. It allocates a 23 line window with
+@@ -6384,7 +6669,7 @@ hp2621b-kx-p|hp 2621b with new keyboard
+ hp2622|hp2622a|hp 2622,
+ da, db,
+ lm#0, pb#19200,
+- is2=\E&dj@\r, use=hp+pfk+cr, use=hp+labels, use=scrhp,
++ is2=\E&dj@\r, use=hp+pfk-cr, use=hp+labels, use=scrhp,
+
+ # The 2623 is a 2622 with extra graphics hardware.
+ hp2623|hp2623a|hp 2623,
+@@ -7088,6 +7373,9 @@ qvt101|qvt108|qume qvt 101 and QVT 108,
+ # What seems to be going on here is that this entry was designed so that
+ # the normal highlight is bold and standout is dim plus something else
+ # (reverse-video maybe? But then, are there two <rev> sequences?)
++#
++# Added kdch1, kil1, kdl1 based on screenshot -TD:
++# http://www.vintagecomputer.net/qume/qvt-108/qume_qvt-108_keyboard.jpg
+ qvt101+|qvt101p|qume qvt 101 PLUS product,
+ am, bw, hs, ul,
+ cols#80, lines#24, xmc#0,
+@@ -7096,11 +7384,11 @@ qvt101+|qvt101p|qume qvt 101 PLUS produc
+ dch1=\EW, dl1=\ER, dsl=\Eg\Ef\r, ed=\EY, el=\ET,
+ flash=\Eb$<200>\Ed, fsl=^M, home=^^, ht=^I, hts=\E1,
+ ich1=\EQ, il1=\EE, ind=^J, invis@, kbs=^H, kcbt=\EI, kcub1=^H,
+- kcud1=^J, kcuf1=^L, kcuu1=^K, kdl1=\ER, ked=\EY, kel=\ET,
+- kf1=^A@\r, kf10=^AI\r, kf2=^AA\r, kf3=^AB\r, kf4=^AC\r,
+- kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r, kf9=^AH\r,
+- khome=^^, kich1=\EQ, kil1=\EE, mc4=\EA, mc5=\E@, rmso=\E(,
+- smso=\E0P\E), tbc=\E3, tsl=\Eg\Ef, use=adm+sgr,
++ kcud1=^J, kcuf1=^L, kcuu1=^K, kdch1=\EW, kdl1=\ER, ked=\EY,
++ kel=\ET, kf1=^A@\r, kf10=^AI\r, kf2=^AA\r, kf3=^AB\r,
++ kf4=^AC\r, kf5=^AD\r, kf6=^AE\r, kf7=^AF\r, kf8=^AG\r,
++ kf9=^AH\r, khome=^^, kich1=\EQ, kil1=\EE, mc4=\EA, mc5=\E@,
++ rmso=\E(, smso=\E0P\E), tbc=\E3, tsl=\Eg\Ef, use=adm+sgr,
+ qvt102|qume qvt 102,
+ cnorm=\E., use=qvt101,
+ # (qvt103: added <rmam>/<smam> based on init string -- esr)
+@@ -8212,8 +8500,8 @@ tvi9065|televideo 9065,
+ rmxon=^N, rs1=\EC\EDF\E[0;0v\E[8;1v\E[=65l,
+ rs2=\E.b\E[10;20v\E[14;1v\E[3;0v\E[7;0v\E[=11.h\E[=12.h\E[=13.h\E[=14.h\E[=15l\E[=20h\E[=60l\E[=61h\E[=9l\E[=10l\E[=21l\E[=23l\E[=3l\E_40\E_50\En\Ew\Ee \Ex0\0\0\Ex1\0\0\Ex2\0\0\Ex3\0\0\Ex4\0\0\E1,
+ rs3=\E[=19h\E.3\E9\E0O\0\0\0\0\0\E0o\0\0\0\0\0\E0J\177\0\0\0\0,
+- sgr=\EG0%?%p1%t\EGt%;%?%p2%t\EG8%;%?%p3%t\EG4%;%?%p4%t\EG2%;%?%p5%t\EGp%;%?%p6%t\EG\,%;%?%p7%t\EG1%;%?%p9%t\E$%e\E%%%;,
+- sgr0=\EG0, smacs=\E$, smam=\E=7h, smcup=\E.2, smdc=\Er,
++ sgr=\EG0%?%p1%t\EGt%;%?%p2%t\EG8%;%?%p3%t\EG4%;%?%p4%t\EG2%;%?%p5%t\EGp%;%?%p6%t\EG\,%;%?%p7%t\EG1%;%?%p8%t\E&%;%?%p9%t\E$%e\E%%%;,
++ sgr0=\EG0\E%, smacs=\E$, smam=\E=7h, smcup=\E.2, smdc=\Er,
+ smir=\Eq, smln=\E[4;2v, smso=\EGt, smul=\EG8, smxon=^O,
+ tbc=\E3, tsl=\E[4;1v\E_30, uc=\EG8\EG0,
+
+@@ -9980,7 +10268,7 @@ att5410v1|att4410v1|tty5410v1|AT&T 4410/
+ pln=\E[%p1%d;00q%p2%:-16s, rc=\E8, rev=\E[7m, ri=\EM,
+ rmacs=^O, rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y,
+ sc=\E7,
+- sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++ sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ sgr0=\E[m\017, smacs=^N, smso=\E[7m, smul=\E[4m,
+ tsl=\E7\E[25;%p1%{1}%+%dH,
+
+@@ -10078,7 +10366,7 @@ att4415|tty5420|att5420|AT&T 4415/5420 8
+ pln=\E[%p1%d;0;0;0q%p2%:-16.16s, prot=\EV,
+ rin=\E[%p1%dF, rmam=\E[?7l, rmir=\E[4l,
+ rmkx=\E[19;0j\E[21;1j\212, rmln=\E|,
+- sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++ sgr=\E[0%?%p1%p5%|%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;,
+ sgr0=\E[m\017, smam=\E[?7h, smir=\E[4h,
+ smkx=\E[19;1j\E[21;4j\Eent, smln=\E~, tbc=\E[3g,
+ tsl=\E7\E[25;%p1%{8}%+%dH, vpa=\E[%p1%{1}%+%dd,
+@@ -10284,7 +10572,7 @@ att5425|tty5425|att4425|AT&T 4425/5425,
+ rev=\E[7m, ri=\EM, rin=\E[%p1%dF, rmacs=^O, rmam=\E[?7l,
+ rmir=\E[4l, rmkx=\E[21;0j\E[25;1j\212, rmln=\E|,
+ rmso=\E[m, rmul=\E[m, rs2=\Ec\E[?3l\E[2;0y, sc=\E7,
+- sgr=\E[0%?%p1%p5%|%t;2%;%?%p2%p6%|%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++ sgr=\E[0%?%p5%p6%|%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%p6%|%t;7%;%?%p7%t;8%;m%?%p8%t\EV%;%?%p9%t\016%e\017%;,
+ sgr0=\E[m\017, smacs=^N, smam=\E[?7h, smir=\E[4h,
+ smkx=\E[21;1j\E[25;4j\Eent\E~, smln=\E~, smso=\E[7m,
+ smul=\E[4m, tbc=\E[3g, tsl=\E7\E[25;%p1%{8}%+%dH,
+@@ -10681,7 +10969,7 @@ att620|AT&T 620; 80 column; 98key keyboa
+ ri=\EM, rin=\E[%p1%dT, rmacs=\E(B\017, rmam=\E[?7l,
+ rmir=\E[4l, rmln=\E[2p, rmso=\E[m, rmul=\E[m,
+ rs2=\Ec\E[?3l, sc=\E7,
+- sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
++ sgr=\E[0%?%p6%t;1%;%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p3%p1%|%t;7%;%?%p7%t;8%;m%?%p9%t\E)0\016%e\E(B\017%;,
+ sgr0=\E[m\E(B\017, smacs=\E)0\016, smam=\E[?7h,
+ smir=\E[4h, smln=\E[p, smso=\E[7m, smul=\E[4m,
+ tsl=\E7\E[25;%i%p1%dx,
+@@ -10741,7 +11029,7 @@ att630|AT&T 630 windowing terminal,
+ mc5=\E[?5i, nel=^M^J, pfx=\E[%p1%d;%p2%l%dq%p2%s, rc=\E8,
+ rev=\E[7m, ri=\EM, rin=\E[%p1%dT, rmir=\E[4l, rmso=\E[m,
+ rmul=\E[m, rs2=\Ec, sc=\E7,
+- sgr=\E[0%?%p2%t;4%;%?%p1%p3%|%p4%|%p5%|%t;7%;m,
++ sgr=\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%p4%|%t;7%;m,
+ sgr0=\E[m, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+ att630-24|5630-24|5630DMD-24|630MTG-24|AT&T 630 windowing terminal 24 lines,
+ lines#24, use=att630,
+@@ -11391,7 +11679,7 @@ aaa+unk|aaa-unk|ann arbor ambassador (in
+ rep=%p1%c\E[%p2%{1}%-%db, rev=\E[7m,
+ rmkx=\EP`>y~[[J`8xy~[[A`4xy~[[D`6xy~[[C`2xy~[[B\E\\,
+ rmm=\E[>52l, rmso=\E[m, rmul=\E[m, sc=\E7,
+- sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
++ sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m,
+ sgr0=\E[m,
+ smkx=\EP`>z~[[J`8xz~[[A`4xz~[[D`6xz~[[C`2xz~[[B\E\\,
+ smm=\E[>52h, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
+@@ -11401,13 +11689,13 @@ aaa+rv|ann arbor ambassador in reverse v
+ blink=\E[5;7m, bold=\E[1;7m, invis=\E[7;8m,
+ is1=\E[7m\E7\E[H\E9\E8, rev=\E[m, rmso=\E[7m, rmul=\E[7m,
+ rs1=\E[H\E[7m\E[J$<156>,
+- sgr=\E[%?%p1%p3%|%!%t7;%;%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m,
++ sgr=\E[%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p1%p2%|%p3%!%t7;%;%?%p7%t8;%;m\016,
+ sgr0=\E[7m\016, smso=\E[m, smul=\E[4;7m,
+ # Ambassador with the DEC option, for partial vt100 compatibility.
+ aaa+dec|ann arbor ambassador in dec vt100 mode,
+ acsc=aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}},
+ csr=\E[%i%p1%d;%p2%dr, enacs=\E(0, rmacs=^N,
+- sgr=\E[%?%p1%p3%|%!%t7;%;%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m%?%p9%t\017%e\016%;,
++ sgr=\E[%?%p2%t4;%;%?%p4%t5;%;%?%p6%t1;%;%?%p1%p3%|%!%t7;%;%?%p7%t8;%;m%?%p9%t\017%e\016%;,
+ smacs=^O,
+ aaa-18|ann arbor ambassador/18 lines,
+ lines#18,
+@@ -11574,7 +11862,7 @@ aaa-rv-unk|ann arbor unknown type,
+ blink=\E[5;7m, bold=\E[1;7m, home=\E[H, invis=\E[7;8m,
+ is1=\E[7m\E7\E[H\E9\E8, rev=\E[m, rmso=\E[7m, rmul=\E[7m,
+ rs1=\E[H\E[7m\E[J,
+- sgr=\E[%?%p1%!%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;m,
++ sgr=\E[%?%p6%t1;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p1%!%t7;%;%?%p7%t8;%;m,
+ sgr0=\E[7m, smso=\E[m, smul=\E[4;7m,
+
+ #### Applied Digital Data Systems (adds)
+@@ -12416,7 +12704,7 @@ oc100|oconcept|c100-1p|old 1 page concep
+ # and mc5= should use the \E[?4i and \E[?5i strings instead).
+
+ hds200|Human Designed Systems HDS200,
+- am, bw, eslok, hs, km, mc5i, mir, msgr, xenl, xon,
++ am, bw, eslok, hs, km, mir, msgr, xenl, xon,
+ cols#80, it#8, lines#24, lm#0,
+ acsc=``aaffggjjkkllmmnnooqqssttuuvvwwxx~~, bel=^G,
+ blink=\E[0;5m, bold=\E[0;1m, cbt=\E[Z, civis=\E[6+{,
+@@ -12445,13 +12733,12 @@ hds200|Human Designed Systems HDS200,
+ kf51=^\051\r, kf52=^\052\r, kf53=^\053\r, kf6=^\006\r,
+ kf7=^\007\r, kf8=^\008\r, kf9=^\009\r, khome=\E[H,
+ kind=\E[T, knp=\E[U, kpp=\E[V, kri=\E[S, ll=\E[H\E[A,
+- mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\E[E, rc=\E8,
+- rev=\E[0;7m, ri=\EM, rmacs=^O, rmir=\E[4l, rmso=\E[m\017,
+- rmul=\E[m\017, sc=\E7,
++ nel=\E[E, rc=\E8, rev=\E[0;7m, ri=\EM, rmacs=^O, rmir=\E[4l,
++ rmso=\E[m\017, rmul=\E[m\017, sc=\E7,
+ sgr=\E[0%?%p1%p6%O%t;1%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%O%t;7%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ sgr0=\E[m\017, smacs=^N, smir=\E[4h, smso=\E[0;1;7m,
+ smul=\E[0;4m, tbc=\E[3g, tsl=\E[2!w\E[%i%p1%dG,
+- vpa=\E[%i%p1%dd,
++ vpa=\E[%i%p1%dd, use=ansi+pp,
+
+ # <ht> through <el> included to specify padding needed in raw mode.
+ # (avt-ns: added empty <acsc> to suppress a tic warning --esr)
+@@ -12478,10 +12765,11 @@ avt-ns|concept avt no status line,
+ ri=\EM$<4>, rmacs=\016$<1>, rmcup=\E[w\E2\r\n,
+ rmir=\E[4l, rmkx=\E[!z\E[0;2u, rmso=\E[7!{, rmul=\E[4!{,
+ sc=\E7,
+- sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;m,
+- sgr0=\E[m, smacs=\017$<1>, smcup=\E[=4l\E[1;24w\E2\r,
+- smir=\E[4h, smkx=\E[1!z\E[0;3u, smso=\E[7m, smul=\E[4m,
+- tbc=\E[3g, vpa=\E[%p1%{1}%+%dd,
++ sgr=\E[%?%p1%t7;%;%?%p2%t4;%;%?%p3%t7;%;%?%p4%t5;%;%?%p6%t1;%;%?%p7%t8;%;%?%p8%t99;%;m%?%p5%t\E[1!{%;%?%p9%t\017%e\016%;$<1>,
++ sgr0=\E[m\016$<1>, smacs=\017$<1>,
++ smcup=\E[=4l\E[1;24w\E2\r, smir=\E[4h,
++ smkx=\E[1!z\E[0;3u, smso=\E[7m, smul=\E[4m, tbc=\E[3g,
++ vpa=\E[%p1%{1}%+%dd,
+ avt-rv-ns|concept avt in reverse video mode/no status line,
+ flash=\E[=205l$<200>\E[=205h, is1=\E[=103l\E[=205h,
+ use=avt-ns,
+@@ -12763,7 +13051,6 @@ dg450|dg6134|data general 6134,
+ # backspace on all terminals. This is not so in DG mode.
+ # (dg460-ansi: removed obsolete ":kn#6:"; also removed ":mu=\EW:", on the
+ # grounds that there is no matching ":ml:"
+-# fixed garbled ":k9=\E[00\:z:" capability -- esr)
+ dg460-ansi|Data General Dasher 460 in ANSI-mode,
+ OTbs, am, msgr, ul,
+ cols#80, it#8, lines#24,
+@@ -12774,10 +13061,12 @@ dg460-ansi|Data General Dasher 460 in AN
+ kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A,
+ kf0=\E[001z, kf1=\E[002z, kf2=\E[003z, kf3=\E[004z,
+ kf4=\E[005z, kf5=\E[006z, kf6=\E[007z, kf7=\E[008z,
+- kf8=\E[009z, kf9=\E[010z, khome=\E[H, lf0=f1, lf1=f2, lf2=f3,
+- lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10, rev=\E[7m,
+- ri=\E[T, rmso=\E[m, rmul=\E[05, sgr0=\E[m, smso=\E[7m,
+- smul=\E[4m,
++ kf8=\E[009z, kf9=\E[00\:z, khome=\E[H, lf0=f1, lf1=f2,
++ lf2=f3, lf3=f4, lf4=f5, lf5=f6, lf6=f7, lf7=f8, lf9=f10,
++ mc0=\E[i, rev=\E[7m, ri=\E[T, rmso=\E[m, rmul=\E[05,
++ sgr=%?%p9%t\E(0%e\E(B%;\E[0%?%p5%t;2%;%?%p2%t;4%;%?%p4%t;5%;%?%p1%p3%|%t;7%;m,
++ sgr0=\E(B\E[m, smso=\E[7m, smul=\E[4m, u6=\E[%d;%dR,
++ u7=\E[6n, u8=\E[5n, u9=\E[0n,
+ # From: Wayne Throop <mcnc!rti-sel!rtp47!throopw> (not official)
+ # Data General 605x
+ # Ought to work for a Model 6242, Type D210 as well as a 605x.
+@@ -12824,7 +13113,7 @@ d210|d214|Data General DASHER D210 serie
+ cuu=\E[%p1%dA, cuu1=\E[A, dim=\E[2m, ed=\E[J, el=\E[K,
+ el1=\E[1K, home=\E[H, ind=^J, is1=\E[<0;<1;<4l,
+ ll=\E[H\E[A, nel=^J, rev=\E[7m, rmso=\E[m, rmul=\E[m,
+- sgr=\E[%?%p1%p3%|%p6%|%t7;%;%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;m,
++ sgr=\E[%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;%?%p1%p3%|%p6%|%t7;%;m,
+ sgr0=\E[m, smso=\E[2;7m, smul=\E[4m, use=dgkeys+7b,
+
+ # DASHER D210 series terminals in DG mode.
+@@ -13026,7 +13315,7 @@ d410|d411|d460|d461|Data General DASHER
+ is2=\E[3;2;2;1;1;1v\E(B\E)4\017, mc4=\E[4i, mc5=\E[5i,
+ ri=\EM, rmacs=\E)4\017, rs1=\Ec\E[<2h,
+ rs2=\E[4;0;2;1;1;1v\E(B\E)4,
+- sgr=\E[%?%p1%p3%|%p6%|%t7;%;%?%p4%t5;%;%?%p2%p6%|%t4;%;%?%p1%p5%|%t2;%;m\E)%?%p9%t6\016%e4\017%;,
++ sgr=\E[%?%p1%t2;7%;%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p1%p5%|%t2;%;%?%p6%t4;7;%;m\E)%?%p9%t6\016%e4\017%;,
+ sgr0=\E[m\E)4\017, smacs=\E)6\016, use=d211,
+
+ # Initialization string 2 sets:
+@@ -13196,12 +13485,12 @@ d430c-unix-sr-ccc|d430-unix-sr-ccc|Data
+ #
+ d470c|d470|Data General DASHER D470C,
+ is1=\E[<0;<1;<2;<4l\E[1;1;80w\E[1;6;<2h,
+- sgr=\E[%?%p1%p3%|%p6%|%t7;%{1}%e%{0}%;%PR%?%p4%t5;%{1}%e%{0}%;%PB%?%p2%p6%|%t4;%{1}%e%{0}%;%PU%?%p1%p5%|%t2;%{1}%e%{0}%;%PDm\E)%?%p9%t6\016%e4\017%;,
++ sgr=\E[%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p6%t4;7;%;%?%p1%t2;7;%;%?%p5%t2;%;m\E)%?%p9%t6\016%e4\017%;,
+ use=dg+color, use=d460,
+
+ d470c-7b|d470-7b|Data General DASHER D470C in 7 bit mode,
+ is1=\E[<0;<1;<2;<4l\E[1;1;80w\E[1;6;<2h,
+- sgr=\E[%?%p1%p3%|%p6%|%t7;%{1}%e%{0}%;%PR%?%p4%t5;%{1}%e%{0}%;%PB%?%p2%p6%|%t4;%{1}%e%{0}%;%PU%?%p1%p5%|%t2;%{1}%e%{0}%;%PDm%?%p9%t\016%e\017%;,
++ sgr=\E[%?%p3%t7;%;%?%p4%t5;%;%?%p2%t4;%;%?%p6%t4;7;%;%?%p1%t2;7;%;%?%p5%t2;%;m%?%p9%t\016%e\017%;,
+ use=dg+color, use=d460-7b,
+
+ # Initialization string 2 sets:
+@@ -13757,7 +14046,7 @@ superbeeic|super bee with insert char,
+ sb2|sb3|fixed superbee,
+ xsb@, use=superbee,
+
+-#### Beehive Medical Electronics
++#### Beehive Medical Electronics
+ #
+ # Steve Seymour <srseymour@mindspring.com> writes (Wed, 03 Feb 1999):
+ # Regarding your question though; Beehive terminals weren't made by Harris.
+@@ -14224,6 +14513,8 @@ lft|lft-pc850|LFT-PC850|IBM LFT PC850 De
+ sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t;8%;m%?%p9%t\E(0%e\E(B%;,
+ sgr0=\E[0m, smacs=\E(0, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+ tbc=\E[3g,
++# "Megapel" refers to the display adapter, which was used with the IBM RT
++# aka IBM 6150.
+ ibm5081|hft|IBM Megapel Color display,
+ acsc=jjkkllmmnnqqttuuvvwwxx, blink@, bold@, s0ds=\E(B,
+ s1ds=\E(0, sgr0=\E[0m\E(B, use=ibm5154,
+@@ -14578,7 +14869,7 @@ icl6404|kds7372|icl6402|kds6402|ICL 6404
+ is1=\EC\E.3\EDF\EV1\Eg\E[0ZZ, nel=^_, rev=\E[4ZZ,
+ rmir=\Er, rmso=\E[%gh%{4}%^%Ph%gh%dZZ,
+ rmul=\E[%gh%{8}%^%Ph%gh%dZZ, rs2=\Eo1,
+- sgr=\E[%{0}%?%p1%t%{4}%|%;%?%p2%t%{8}%|%;%?%p3%t%{4}%|%;%?%p4%t%{2}%|%;%?%p7%t%{1}%|%;ZZ,
++ sgr=\E[%'0'%?%p1%t%'8'%|%;%?%p2%t%'8'%|%;%?%p3%t%'4'%|%;%?%p4%t%'2'%|%;%?%p7%t%'1'%|%;%cZZ,
+ sgr0=\E[0ZZ, smir=\Eq, smso=\E[8ZZ, smul=\E[8ZZ, tbc=\E3,
+ icl6404-w|kds7372-w|ICL 6404 aka Kokusai Display Systems 7372 132 cols,
+ rs2=\Eo1, use=icl6404,
+@@ -14895,7 +15186,7 @@ prism8-w|p8-w|P8-W|MDC Prism-8 in 132 co
+ # (esr: commented out <smacs>/<rmacs> because there's no <acsc>)
+ #
+ prism9|p9|P9|MDC Prism-9 in ANSII mode,
+- am, bw, hs, mc5i, msgr, xenl, xon,
++ am, bw, hs, msgr, xenl, xon,
+ cols#80, it#8, lines#24, vt#3, wsl#72,
+ bel=^G, blink=\E[5m, bold=\E[1m, cbt=\E[Z, civis=\E[<4l,
+ clear=^L, cnorm=\E[<4h, cr=^M, csr=\E[%i%p1%d;%p2%d%%v,
+@@ -14911,14 +15202,15 @@ prism9|p9|P9|MDC Prism-9 in ANSII mode,
+ kf14=\E[26~, kf15=\E[28~, kf16=\E[29~, kf17=\E[31~,
+ kf18=\E[32~, kf2=\E[12~, kf3=\E[13~, kf4=\E[14~,
+ kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
+- khome=\E[H, mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=^M^J,
+- prot=\E[32%{, rc=\E[%z, rep=\E[%p2%db%p1%c, rev=\E[7m,
+- ri=\E[L, rmir=\E[4l, rmso=\E[27m, rmul=\E[24m,
++ khome=\E[H, nel=^M^J, prot=\E[32%{, rc=\E[%z,
++ rep=\E[%p2%db%p1%c, rev=\E[7m, ri=\E[L, rmir=\E[4l,
++ rmso=\E[27m, rmul=\E[24m,
+ rs2=\E[&p\E[<12l\E F\E[3g\E[9;17;25;33;41;49;57;65;73 N,
+ sc=\E[%y,
+- sgr=\E[%{0}%?%p1%p3%|%t%{7}%+%;%?%p2%t%{2}%+%;%?%p4%t%{5}%+%;%?%p6%t%{1}%+%;m%?%p8%t\E[%{32}%+%d%%{%;%?%p9%t\016%e\017%;,
++ sgr=\E[0%?%p1%p3%|%t;7%;%?%p2%t;4%;%?%p4%t;5%;%?%p6%t;1%;m%?%p8%t\E[32%%{%;%?%p9%t\016%e\017%;,
+ sgr0=\E[0m\017, smir=\E[4h, smso=\E[7m, smul=\E[4m,
+ tbc=\E[3g, tsl=\E[%i%p1%d%%}, vpa=\E[%i%p1%dd,
++ use=ansi+pp,
+
+ # p9-w: Prism-9 in 132 column mode
+ # --------------------------------
+@@ -15282,7 +15574,7 @@ ncr260vt100an|NCR 2900_260 vt100 with an
+ rmkx=\E[?1l\E>, rmso=\E[0m, rmul=\E[0m,
+ rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
+ sc=\E7,
+- sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<20>,
++ sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>,
+ sgr0=\E[0m\017$<20>, smacs=^N, smir=\E[4h,
+ smkx=\E[?1h\E=, smso=\E[1;7m, smul=\E[4m, tbc=\E[3g,
+ tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>, use=vt220+keypad,
+@@ -15339,7 +15631,7 @@ ncr260vt200an|NCR 2900_260 vt200 with an
+ rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m,
+ rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
+ sc=\E7,
+- sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<20>,
++ sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>,
+ sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h,
+ smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+ tbc=\E[3g, tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>,
+@@ -15395,7 +15687,7 @@ ncr260vt300an|NCR 2900_260 vt300 with an
+ rmul=\E[24m,
+ rs2=\E[!p\E[?7;19;67h\E[?1;3;4l\E[1;0%w\E(B\E)0\017\E[2J\E[1;1H\E>$<200>,
+ sc=\E7,
+- sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;m%?%p9%t\016%e\017%;$<20>,
++ sgr=\E[0%?%p1%p6%|%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;$<20>,
+ sgr0=\E[0m\017$<20>, smacs=\016$<20>, smam=\E[?7h,
+ smir=\E[4h, smkx=\E[?1h\E=, smso=\E[7m, smul=\E[4m,
+ tbc=\E[3g, tsl=\E[2$~\E[1$}, vpa=\E[%p1%dd$<40>,
+@@ -15809,7 +16101,7 @@ ndr9500|nd9500|Newbury Data 9500,
+ pfloc=\E|%{48}%p1%+%c2%p2\031,
+ pfx=\E|%{48}%p1%+%c1%p2\031, prot=\E), ri=\Ej,
+ rmacs=\E%%, rmir=\Er, rmso=\E(, rmxon=^N,
+- sgr=\E%%\E(%?%p1%p5%p8%|%|%t\E)%;%?%p9%t\E$%;,
++ sgr=\EG0\E%%%%\E(%?%p1%p5%p8%|%|%t\E)%;%?%p9%t\E$%;,
+ sgr0=\EG0\E%%\E(, smacs=\E$, smir=\Eq, smso=\E), smxon=^O,
+ tbc=\E3, tsl=\Eg\Ef\011%p1%{32}%+%c, .kbs=^H,
+
+@@ -16279,7 +16571,7 @@ tek4107|tek4109|tektronix terminals 4107
+ kbs=^H, kcub1=\ED, kcud1=\EB, kcuf1=\EC, kcuu1=\EA,
+ rev=\E%!1\E[7m$<2>\E%!0, ri=\EI,
+ rmso=\E%!1\E[m$<2>\E%!0, rmul=\E%!1\E[m$<2>\E%!0,
+- sgr=\E%%!1\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m$<2>\E%%!0,
++ sgr=\E%%!1\E[%?%p1%t;7;5%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p5%t<0%;%?%p6%t;1%;m$<2>\E%%!0,
+ sgr0=\E%!1\E[m$<2>\E%!0, smso=\E%!1\E[7;5m$<2>\E%!0,
+ smul=\E%!1\E[4m$<2>\E%!0,
+ # Tektronix 4207 with sysline. In the ancestral termcap file this was 4107-s;
+@@ -16466,9 +16758,10 @@ tek4205|tektronix 4205,
+ clear=\E[2J\E[H, cr=^M, cub=\E[%p1%dD, cub1=\E[D,
+ cud=\E[%p1%dB, cud1=\E[B, cuf=\E[%p1%dC, cuf1=\E[C,
+ cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+- dch1=\E[1P, dim=\E[=1;<6m, dl1=\E[1M, ech=\E%p1%dX,
+- ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0, home=\E[H, ht=^I,
+- ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[1L, ind=\ED,
++ dch1=\E[1P, dim=\E[=1;<6m, dl=\E[%p1%dM, dl1=\E[1M,
++ ech=\E%p1%dX, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E)0,
++ home=\E[H, ht=^I, ich=\E[%p1%d@, il=\E[%p1%dL, il1=\E[1L,
++ ind=\ED,
+ initc=\E%%!0\ETF4%?%p1%{0}%=%t0%e%p1%{1}%=%t4%e%p1%{2}%=%t3%e%p1%{3}%=%t5%e%p1%{4}%=%t2%e%p1%{5}%=%t6%e%p1%{6}%=%t7%e1%;%?%p2%{125}%<%t0%e%p2%{250}%<%tA2%e%p2%{375}%<%tA?%e%p2%{500}%<%tC8%e%p2%{625}%<%tD4%e%p2%{750}%<%tE1%e%p2%{875}%<%tE\:%eF4%;%?%p3%{125}%<%t0%e%p3%{250}%<%tA2%e%p3%{375}%<%tA?%e%p3%{500}%<%tC8%e%p3%{625}%<%tD4%e%p3%{750}%<%tE1%e%p3%{875}%<%tE\:%eF4%;%?%p4%{125}%<%t0%e%p4%{250}%<%tA2%e%p4%{375}%<%tA?%e%p4%{500}%<%tC8%e%p4%{625}%<%tD4%e%p4%{750}%<%tE1%e%p4%{875}%<%tE\:%eF4%;\E%%!1,
+ invis=\E[=6;<5, is1=\E%!0\ETM1\E%!1\E[m, kbs=^H,
+ kcub1=\E[D, kcud1=\E[B, kcuf1=\E[C, kcuu1=\E[A, kf0=\EOA,
+@@ -16639,7 +16932,7 @@ ibmpc|wy60-PC|wyse60-PC|IBM PC/XT runnin
+ kf9=\250, khome=\E[H, kich1=\E[^H, knp=\E[U, kpp=\E[V,
+ ll=\E[24;1H, nel=^M, rev=\E[7m, ri=\E[T\E[A,
+ rin=\E[%p1%dT\E[%p1%dA, rmso=\E[m, rmul=\E[m,
+- sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m,
++ sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;%?%p7%t30;40%;m,
+ sgr0=\E[m, smso=\E[7m, smul=\E[4m,
+
+ #### Apple II
+@@ -17101,6 +17394,7 @@ nsterm+mac|AppKit Terminal.app v41+ basi
+ sgr=\E[0%?%p6%t;1%;%?%p2%t;4%;%?%p1%p3%|%t;7%;%?%p4%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ sgr0=\E[m\017, smacs=^N, use=nsterm+7,
+
++# compare with xterm+sl-twm
+ nsterm+s|AppKit Terminal.app v41+ status-line (window titlebar) support,
+ hs,
+ wsl#50,
+@@ -17752,6 +18046,23 @@ osexec|Osborne executive,
+ # See
+ # http://www.minix3.org/manpages/man4/console.4.html
+ minix|minix console (v3),
++ acsc=+\020\,\021-\030.^Y0\333`\004a\261f\370g\361h\260j\331k\277l\332m\300n\305o~p\304q\304r\304s_t\303u\264v\301w\302x\263y\363z\362{\343|\330}\234~\376,
++ kdch1=\177, kend=\E[Y, kf0=\E[21~, kf1=\E[11~, kf10=\E[21~,
++ kf11=\E[11;2~, kf12=\E[12;2~, kf13=\E[13;2~,
++ kf14=\E[14;2~, kf15=\E[15;2~, kf16=\E[17;2~,
++ kf17=\E[18;2~, kf18=\E[19;2~, kf19=\E[20;2~, kf2=\E[12~,
++ kf20=\E[21;2~, kf21=\E[11;5~, kf22=\E[12;5~,
++ kf23=\E[13;5~, kf24=\E[14;5~, kf25=\E[15;5~,
++ kf26=\E[17;5~, kf27=\E[18;5~, kf28=\E[19;5~,
++ kf29=\E[20;5~, kf3=\E[13~, kf30=\E[21;5~, kf31=\E[11;6~,
++ kf32=\E[12;6~, kf33=\E[13;6~, kf34=\E[14;6~,
++ kf35=\E[15;6~, kf36=\E[17;6~, kf37=\E[18;6~,
++ kf38=\E[19;6~, kf39=\E[20;6~, kf4=\E[14~, kf40=\E[21;6~,
++ kf5=\E[15~, kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~,
++ kich1=\E[@, knp=\E[U, kpp=\E[V, lf0@, lf1@, lf2@, lf3@, lf4@, lf5@,
++ use=minix-3.0,
++
++minix-3.0|minix console (v3.0),
+ use=ecma+color, use=minix-1.7,
+
+ # See
+@@ -17792,7 +18103,7 @@ minix-old-am|minix console with linewrap
+ am, use=minix-old,
+
+ pc-minix|minix console on an Intel box,
+- use=klone+acs, use=minix,
++ use=klone+acs, use=minix-3.0,
+
+ # According to the Coherent 2.3 manual, the PC console is similar
+ # to a z19. The differences seem to be (1) 25 lines, (2) no status
+@@ -18195,6 +18506,7 @@ dku7102-old|BULL Questar 200 DKU7102 (mi
+ use=tws-generic,
+ dku7202|BULL Questar 200 DKU7202 (colour/character attributes),
+ blink=\E[0;2;4m, dim=\E[0;5m, ht=^I, is3=\E[?3h\Eb,
++ sgr=\E[0%?%p1%t;2;4;5;7%;%?%p3%t;7%;%?%p2%t;2%;%?%p4%t;2;4%;%?%p5%t;5%;%?%p7%t;8%;m%?%p9%t\016%e\017%;,
+ smso=\E[0;4;5;7m, smul=\E[0;2m, use=tws-generic,
+
+ #=========================================================#
+@@ -18274,7 +18586,7 @@ dku7202|BULL Questar 200 DKU7202 (colour
+
+ # This entry covers BQ303, BQ306, BQ310, Q303, Q306, Q310
+ bq300|Bull vt320 ISO Latin 1 80 columns terminal,
+- am, eo, eslok, hs, km, mc5i, mir, msgr, xenl, xon,
++ am, eo, eslok, hs, km, mir, msgr, xenl, xon,
+ cols#80, it#8, lines#24, vt#3, wsl#80,
+ acsc=``aaffggjjkkllmmnnooppqqrrssttuuvvwwxxyyzz{{||}}~~,
+ bel=^G, blink=\E[5m, bold=\E[1m, civis=\E[?25l,
+@@ -18298,14 +18610,14 @@ bq300|Bull vt320 ISO Latin 1 80 columns
+ kf6=\E[17~, kf7=\E[18~, kf8=\E[19~, kf9=\E[20~, kfnd=\E[1~,
+ khlp=\E[28~, kich1=\E[2~, knp=\E[6~, kpp=\E[5~,
+ krdo=\E[29~, kslt=\E[4~, lf1=pf1, lf2=pf2, lf3=pf3, lf4=pf4,
+- mc0=\E[i, mc4=\E[4i, mc5=\E[5i, nel=\EE, rc=\E8, rev=\E[7m,
+- ri=\EM, rmacs=\E(B, rmam=\E[?7l, rmcup=\E[?7h, rmir=\E[4l,
+- rmkx=\E[?1l\E>, rmso=\E[27m, rmul=\E[24m, rs1=\E[!p,
+- rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0, sc=\E7,
++ nel=\EE, rc=\E8, rev=\E[7m, ri=\EM, rmacs=\E(B, rmam=\E[?7l,
++ rmcup=\E[?7h, rmir=\E[4l, rmkx=\E[?1l\E>, rmso=\E[27m,
++ rmul=\E[24m, rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0,
++ sc=\E7,
+ sgr=\E[%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m%?%p9%t\E(0%e\E(B%;,
+ sgr0=\E[0m\E(B, smacs=\E(0, smam=\E[?7h,
+ smcup=\E[?7l\E[?1l\E(B, smir=\E[4h, smso=\E[7m,
+- smul=\E[4m, tbc=\E[3g, tsl=\E[1$}\E[2$~,
++ smul=\E[4m, tbc=\E[3g, tsl=\E[1$}\E[2$~, use=ansi+pp,
+ bq300-rv|Bull vt320 reverse 80 columns,
+ flash=\E[?5l$<50>\E[?5h,
+ is2=\E[?2h\E[?3l\E[?5h\E[?7h\E[?8h\E>\E[?1l\E F\E[?42l\E[?4l,
+@@ -18383,12 +18695,12 @@ bq300-8|Bull vt320 full 8 bits 80 column
+ csr=\233%i%p1%d;%p2%dr, cub=\233%p1%dD, cub1=\2331D,
+ cud=\233%p1%dB, cud1=\2331B, cuf=\233%p1%dC, cuf1=\2331C,
+ cup=\233%i%p1%d;%p2%dH, cuu=\233%p1%dA, cuu1=\2331A,
+- dch=\233%p1%dP, dch1=\233P, dl=\233%p1%dM,
++ dch=\233%p1%dP, dch1=\233P, dl=\233%p1%dM, dl1=\233M,
+ dsl=\2331$}\2332$~\n\2330$}, ech=\233%p1%dX, ed=\233J,
+ el=\233K, el1=\2331K, enacs=\E(B\E)0,
+ flash=\233?5h$<50>\233?5l, fsl=\2330$}, home=\233H,
+- ht=^I, hts=\EH, ich=\233%p1%d@, il=\233%p1%dL, ind=\ED,
+- is1=\E[63;2"p\E[2h,
++ ht=^I, hts=\EH, ich=\233%p1%d@, il=\233%p1%dL, il1=\233L,
++ ind=\ED, is1=\E[63;2"p\E[2h,
+ is2=\E[?2h\E[?3l\E[?5l\E[?7h\E[?8h\E>\E[?1l\E G\E[?42l\E[?4l,
+ is3=\2330$}\233?25h\2332l\233H\233J, ka1=\217w,
+ ka3=\217y, kb2=\217u, kbs=^H, kc1=\217q, kc3=\217s,
+@@ -18401,11 +18713,12 @@ bq300-8|Bull vt320 full 8 bits 80 column
+ khlp=\23328~, kich1=\2332~, knp=\2336~, kpp=\2335~,
+ krdo=\23329~, kslt=\2334~, lf1=pf1, lf2=pf2, lf3=pf3,
+ lf4=pf4, mc0=\233i, mc4=\2334i, mc5=\2335i, nel=\EE, rc=\E8,
+- rev=\2337m, ri=\EM, rmacs=^O, rmam=\233?7l, rmcup=\233?7h,
+- rmir=\2334l, rmkx=\233?1l\E>, rmso=\23327m, rmul=\23324m,
+- rs1=\E[!p, rs2=\E[?3l, s0ds=\E(B, s1ds=\E(0, sc=\E7,
++ rev=\2337m, ri=\EM, rmacs=\E(B, rmam=\233?7l,
++ rmcup=\233?7h, rmir=\2334l, rmkx=\233?1l\E>,
++ rmso=\23327m, rmul=\23324m, rs1=\E[!p, rs2=\E[?3l,
++ s0ds=\E(B, s1ds=\E(0, sc=\E7,
+ sgr=\233%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m%?%p9%t\E(0%e\E(B%;,
+- sgr0=\2330m\E(B, smacs=^N, smam=\233?7h,
++ sgr0=\2330m\E(B, smacs=\E(0, smam=\233?7h,
+ smcup=\233?7l\233?1l\E(B, smir=\2334h, smso=\2337m,
+ smul=\2334m, tbc=\2333g, tsl=\2331$}\2332$~,
+ bq300-8rv|Bull vt320 8-bit reverse mode 80 columns,
+@@ -19010,14 +19323,14 @@ z29a|z29a-kc-bc|h29a-kc-bc|heath/zenith
+ cud=\E[%p1%dB, cud1=^J, cuf=\E[%p1%dC, cuf1=\E[C,
+ cup=\E[%i%p1%d;%p2%dH, cuu=\E[%p1%dA, cuu1=\E[A,
+ dch=\E[%p1%dP, dch1=\E[1P, dim=\E[2m, dl=\E[%p1%dM,
+- dsl=\E[>1l, ed=\E[J, el=\E[K, fsl=\E[u\E[>5l, home=\E[H,
+- ht=^I, hts=\EH, if=/usr/share/tabset/vt100, il=\E[%p1%dL,
+- ind=\ED, kbs=^H, kclr=\E[J, kcub1=\EOD, kcud1=\EOB,
+- kcuf1=\EOC, kcuu1=\EOA, ked=\E[J, kf0=\E[~, kf1=\EOS,
+- kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW, kf6=\EOP, kf7=\EOQ,
+- kf8=\EOR, kf9=\EOX, khome=\E[H, lf0=help, mc0=\E#7,
+- nel=^M\ED, rc=\E[r, rev=\E[7m, ri=\EM, rmcup=\E[?7h,
+- rmso=\E[m, rmul=\E[m,
++ dl1=\E[M, dsl=\E[>1l, ed=\E[J, el=\E[K, fsl=\E[u\E[>5l,
++ home=\E[H, ht=^I, hts=\EH, if=/usr/share/tabset/vt100,
++ il=\E[%p1%dL, il1=\E[L, ind=\ED, kbs=^H, kclr=\E[J,
++ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA, ked=\E[J,
++ kf0=\E[~, kf1=\EOS, kf2=\EOT, kf3=\EOU, kf4=\EOV, kf5=\EOW,
++ kf6=\EOP, kf7=\EOQ, kf8=\EOR, kf9=\EOX, khome=\E[H, lf0=help,
++ mc0=\E#7, nel=^M\ED, rc=\E[r, rev=\E[7m, ri=\EM,
++ rmcup=\E[?7h, rmso=\E[m, rmul=\E[m,
+ rs1=\E<\E[1;24r\E[24;1H\E[?7h\E[>4h\E[>1;2;3;5;6;7;8;9l\E[m\E[11m,
+ sc=\E[s, sgr0=\E[m, smcup=\E[?7l, smso=\E[7;2m, smul=\E[4m,
+ tbc=\E[3g, tsl=\E[s\E[>5;1h\E[25;%i%dH\E[1K,
+@@ -20217,9 +20530,9 @@ dwk|dwk-vt|dwk terminal,
+ sgr0=\EX, smacs=\EF, smso=\ET,
+ env230|envision230|envision 230 graphics terminal,
+ xenl@,
+- mc0=\E[0i, mc4=\E[4i, mc5=\E[5i,
+- sgr=\E[%?%p1%t;1%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m$<2>,
+- use=vt100,
++ enacs@, mc0=\E[0i, mc4=\E[4i, mc5=\E[5i, rmacs@,
++ sgr=\E[0%?%p1%t;7%;%?%p2%t;4%;%?%p3%t;7%;%?%p4%t;5%;%?%p6%t;1%;m$<2>,
++ sgr0=\E[0m$<2>, smacs@, use=vt100,
+ # These execuports were impact-printer ttys with a 30- or maybe 15-cps acoustic
+ # coupler attached, the whole rig fitting in a suitcase and more or less
+ # portable. Hot stuff for c.1977 :-) -- esr
+@@ -20274,7 +20587,7 @@ opus3n1+|Esprit Opus3n1+ in wy60 mode wi
+ rmacs=\EH^C, rmam=\Ed., rmcup=, rmir=\Er, rmln=\EA11,
+ rmxon=\Ec20, rs1=\E~!\E~4$<150>, rs2=\EeF$<150>,
+ rs3=\EwG\Ee($<150>,
+- sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;\EG%{48}%?%p2%p6%|%t%{8}%|%;%?%p1%p3%|%p6%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c,
++ sgr=%?%p8%t\E)%e\E(%;%?%p9%t\EH\002%e\EH\003%;\EG%{48}%?%p2%t%{8}%|%;%?%p1%p3%|%t%{4}%|%;%?%p4%t%{2}%|%;%?%p1%p5%|%t%{64}%|%;%?%p7%t%{1}%|%;%c,
+ sgr0=\E(\EH\003\EG0\EcD, smacs=\EH^B, smam=\Ed/,
+ smcup=\Ezz&\E[A\177\Ezz'\E[B\177\Ezz(\E[D\177\Ezz)\E[C\177\Ezz<\E[Q\177,
+ smir=\Eq, smln=\EA10, smxon=\Ec21, tbc=\E0, tsl=\Ez(,
+@@ -21011,11 +21324,107 @@ v3220|LANPAR Vision II model 3220/3221/3
+ # CF for civis and CO for cvvis. Finally, they define a boolean :ct:
+ # that flags color terminals.
+ #
++# Extensions added after ncurses 5.0 generally use the "-x" option of tic and
++# infocmp to manipulate user-definable capabilities. Those that are intended
++# for use in either terminfo or termcap use 2-character names. Extended
++# function keys do not use 2-character names, and are available only with
++# terminfo.
++#
++# As of mid-2012, no other terminfo/termcap implementation than ncurses
++# supports this extension; termcap libraries can as noted above make limited
++# use of the feature.
++#
++# ncurses makes explicit checks for a few user-definable capabilities: AX, U8,
++# XM.
++#
++# SCREEN Extensions:
++#
++# The screen program uses the termcap interface. It recognizes a few useful
++# nonstandard capabilities. Those are used in this file.
++#
++# AX (bool) Does understand ANSI set default fg/bg color (\E[39m /
++# \E[49m).
++# G0 (bool) Terminal can deal with ISO 2022 font selection sequences.
++# E0 (str) Switch charset 'G0' back to standard charset.
++# S0 (str) Switch charset 'G0' to the specified charset.
++# XT (bool) Terminal understands special xterm sequences (OSC, mouse
++# tracking).
++#
++# AX is relatively straightforward; it is interpreted by ncurses to say that
++# SGR 39/49 reset the terminal's foreground and background colors to their
++# "default".
++#
++# XT is harder, since screen's manpage does not give more details. For that,
++# we must read screen's source-code. When XT is set, screen assumes
++#
++# a) OSC 1 sets the title string, e.g., for the icon. Recent versions of
++# screen may also set the terminal's name, which is (for xterm) distinct
++# from the icon name.
++# b) OSC 20 sets the background pixmap. This is an rxvt feature.
++# c) OSC 39 and OSC 49 set the default foreground/background colors. Again
++# this is an rxvt feature.
++# d) certain mode settings enable the mouse: 9, 1000, 1001, 1002, 1003.
++# These are from xterm, although xterm accepts mouse codes that may not be
++# recognized by screen, e.g., 1005, 1006.
++# e) colors beyond 0..7 are implemented by xterm's aixterm-like 16-color
++# sequence. However, because screen uses only termcap, the values returned
++# by Af/Ab are not usable because they rely on expressions that termcap
++# does not support. Therefore, screen uses a hardcoded string to work
++# around the limitation.
++# f) all entries named "*xterm*" or "*rxvt*" have the bce flag set.
++#
++# The other ISO-2022 features are rarely used, but provided here to make
++# screen's termcap features available.
++#
++# XTERM Extensions:
++#
++# Most of the xterm extensions are for function-keys. Since patch #94 (in
++# 1999), xterm has supported shift/control/alt/meta modifiers which produce
++# additional function-key strings. Some other developers copied the feature,
++# though they did not follow xterm's lead in patch #167 (in 2002), to make
++# these key definitions less ambiguous.
++#
++# A few terminals provide similar functionality (sending distinct keys when
++# a modifier is used), including rxvt.
++#
++# These are the extended keys defined in this file:
++#
++# kDC3 kDC4 kDC5 kDC6 kDC7 kDN kDN3 kDN4 kDN5 kDN6 kDN7 kEND3 kEND4 kEND5 kEND6
++# kEND7 kHOM3 kHOM4 kHOM5 kHOM6 kHOM7 kIC3 kIC4 kIC5 kIC6 kIC7 kLFT3 kLFT4
++# kLFT5 kLFT6 kLFT7 kNXT3 kNXT4 kNXT5 kNXT6 kNXT7 kPRV3 kPRV4 kPRV5 kPRV6 kPRV7
++# kRIT3 kRIT4 kRIT5 kRIT6 kRIT7 kUP kUP3 kUP4 kUP5 kUP6 kUP7 ka2 kb1 kb3 kc2
++#
++# Here are the other xterm-related extensions which are used in this file:
++#
++# Cr is a string capability which resets the cursor color
++# Cs is a string capability which sets the cursor color to a given value.
++# The single string parameter is the color name/number, according to the
++# implementation.
++# Ms modifies the selection/clipboard. Its parameters are
++# p1 = the storage unit (clipboard, selection or cut buffer)
++# p2 = the base64-encoded clipboard content.
++# Se resets the cursor style to the terminal power-on default.
++# Ss is a string capability with one numeric parameter. It is used to set the
++# cursor style as described by the DECSCUSR function to a block or
++# underline.
++# XM is a string capability which overrides ncurses's built-in string which
++# enables xterm mouse mode.
++#
++# Miscellaneous extensions:
++#
++# gsbom/grbom are used to enable/disable real bold (not intensity bright) mode.
++# This was implemented for the Hurd.
++# E3 clears the terminal's scrollback buffer. This was implemented in the
++# Linux 3.0 kernel as a security feature.
++# U8 is a numeric capability which denotes a terminal emulator which does not
++# support VT100 SI/SO when processing UTF-8 encoding. Set this to a nonzero
++# value to enable it.
++#
+ ######## CHANGE HISTORY
+ #
+ # The last /etc/termcap version maintained by John Kunze was 8.3, dated 8/5/94.
+-# Releases 9 and up are maintained by Eric S. Raymond as part of the ncurses
+-# project.
++# Releases 9 and 10 (up until the release of ncurses 4.2 in 1998) were
++# maintained by Eric S. Raymond as part of the ncurses project.
+ #
+ # This file contains all the capability information present in John Kunze's
+ # last version of the termcap master file, except as noted in the change
+@@ -21115,7 +21524,7 @@ v3220|LANPAR Vision II model 3220/3221/3
+ # * Replaced HP entries up to hpsub with purpose-built ones.
+ # * Blank rmir/smir/rmdc/smdc capabilities removed.
+ # * Small fixes merged in from SCO entries for lpr, fos, tvi910+, tvi924.
+-# 9.4.8 (Fri Apr 7 09:36:34 EDT 199):
++# 9.4.8 (Fri Apr 7 09:36:34 EDT 1995):
+ # * Replaced the Ann Arbor entries with SCO's, the init strings are
+ # more efficient (but the entries otherwise identical).
+ # * Added dg211 from Shuford archive.
+@@ -22224,7 +22633,7 @@ v3220|LANPAR Vision II model 3220/3221/3
+ # * add screen.rxvt -TD
+ #
+ # 2008-04-28
+-# * add screen+fkeys (prompted by Debian # 478094) -TD
++# * add screen+fkeys (prompted by Debian #478094) -TD
+ #
+ # 2008-06-28
+ # * add screen.mlterm -TD
+@@ -22354,6 +22763,128 @@ v3220|LANPAR Vision II model 3220/3221/3
+ # * add xterm-utf8 as a demo of the U8 feature -TD
+ #
+ # 2011-02-20
+-# * add cons25-debian entry (Brian M Carlson, Debina #607662).
++# * add cons25-debian entry (Brian M Carlson, Debian #607662).
++#
++# 2011-06-11
++# * update minix entry to minix 3.2 (Thomas Cort).
++#
++# 2011-07-09
++# * fix inconsistent tabset path in pcmw (Todd C. Miller).
++# * remove a backslash which continued comment, obscuring altos3
++# definition with OpenBSD toolset (Nicholas Marriott).
++#
++# 2011-07-16
++# * add/use xterm+tmux chunk from xterm #271 -TD
++# * resync xterm-new entry from xterm #271 -TD
++# * add E3 extended capability to linux-basic (Miroslav Lichvar)
++# * add linux2.2, linux2.6, linux3.0 entries to give context for E3 -TD
++# * add SI/SO change to linux2.6 entry (Debian #515609) -TD
++#
++# 2011-07-21
++# * add kich1 to sun (Yuri Pankov)
++# * use bold rather than reverse for smso in sun-color (Yuri Pankov).
++#
++# 2011-08-06
++# * corrected k9 in dg460-ansi, add other features based on manuals -TD
++#
++# 2011-08-20
++# * minor cleanup of X-terminal emulator section -TD
++# * add terminator entry -TD
++# * add simpleterm entry -TD
++#
++# 2011-09-10
++# * add xterm+kbs fragment from xterm #272 -TD
++#
++# 2011-11-12
++# * add pccon entries for OpenBSD console (Alexei Malinin)
++#
++# 2011-12-17
++# * corrected old changelog comments -TD
++#
++# 2011-11-24
++# * add putty-sco -TD
++#
++# 2012-01-28
++# * add mach-gnu (Samuel Thibault)
++# * add mach-gnu-color, tweaks to mach-gnu -TD
++# * make sgr for sun-color agree with smso -TD
++# * make sgr for prism9 agree with other caps -TD
++# * make sgr for icl6404 agree with other caps -TD
++# * make sgr for ofcons agree with other caps -TD
++# * make sgr for att5410v1, att4415, att620 agree with other caps -TD
++# * make sgr for aaa-unk, aaa-rv agree with other caps -TD
++# * make sgr for avt-ns agree with other caps -TD
++#
++# 2012-02-11
++# * make sgr for xterm-pcolor agree with other caps -TD
++# * make sgr for att5425 agree with other caps -TD
++# * make sgr for att630 agree with other caps -TD
++# * make sgr for linux entries agree with other caps -TD
++# * make sgr for tvi9065 agree with other caps -TD
++# * make sgr for ncr260vt200an agree with other caps -TD
++# * make sgr for ncr160vt100pp agree with other caps -TD
++# * make sgr for ncr260vt300an agree with other caps -TD
++# * make sgr for aaa-60-dec-rv, aaa+dec agree with other caps -TD
++# * make sgr for cygwin, cygwinDBG agree with other caps -TD
++#
++# 2012-03-31
++# * correct order of use-clauses in st-256color -TD
++#
++# 2012-04-01
++# * revert 2011-07-16 change to "linux" alias, return to "linux2.2" -TD
++#
++# 2012-04-14
++# * document all of the user-defined capabilities in one place -TD
++# * add XT to some places to improve usefulness for other applications
++# than screen, which would like to pretend that xterm's title is
++# a status-line. -TD
++# * change use-clauses in ansi-mtabs, hp2626, and hp2622 based on review
++# of ordering and overrides -TD
++#
++# 2012-04-21
++# * add msgr to vt420, similar DEC vtXXX entries -TD
++# * add several missing vt420 capabilities from vt220 -TD
++# * factor out ansi+pp from several entries -TD
++# * change xterm+sl and xterm+sl-twm to include only the status-line
++# capabilities and not "use=xterm", making them more generally useful
++# as building-blocks -TD
++# * add dec+sl building block, as example -TD
++#
++# 2012-04-28
++# * fix some inconsistencies between vt320/vt420, e.g., cnorm/civis -TD
++# * add eslok flag to dec+sl -TD
++# * dec+sl applies to vt320 and up -TD
++# * drop wsl width from xterm+sl -TD
++# * reuse xterm+sl in putty and nsca-m -TD
++# * add ansi+tabs to vt520 -TD
++# * add ansi+enq to vt220-vt520 -TD
++#
++# 2012-05-05
++# * remove p6 (bold) from opus3n1+ for consistency -TD
++# * remove acs stuff from env230 per clues in Ingres termcap -TD
++# * modify env230 sgr/sgr0 to match other capabilities -TD
++# * modify smacs/rmacs in bq300-8 to match sgr/sgr0 -TD
++# * make sgr for dku7202 agree with other caps -TD
++# * make sgr for ibmpc agree with other caps -TD
++# * make sgr for tek4107 agree with other caps -TD
++# * make sgr for ndr9500 agree with other caps -TD
++# * make sgr for sco-ansi agree with other caps -TD
++# * make sgr for d410 agree with other caps -TD
++# * make sgr for d210 agree with other caps -TD
++# * make sgr for d470c, d470c-7b agree with other caps -TD
++#
++# 2012-05-12
++# * rewrite vt520 entry based on vt420 -TD
++# * corrected 'op' for bterm (report by Samuel Thibault) -TD
++#
++# 2012-06-02
++# * add kdch1 to wsvt25 entry from NetBSD CVS (reported by David Lord,
++# analysis by Martin Husemann).
++# * add cnorm/civis to wsvt25 entry from NetBSD CVS (report/analysis by
++# Onno van der Linden).
++# * add kdch1 aka "Remove" to vt220 and vt220-8 entries -TD
++# * add kdch1, etc., to qvt108 -TD
++# * add dl1/il1 to some entries based on dl/il values -TD
++# * add dl to simpleterm -TD
+ #
+ ######## SHANTIH! SHANTIH! SHANTIH!
diff --git a/examples/ncurses/patches/02-debian-backspace.diff b/examples/ncurses/patches/02-debian-backspace.diff
new file mode 100644
index 0000000..ff3339b
--- /dev/null
+++ b/examples/ncurses/patches/02-debian-backspace.diff
@@ -0,0 +1,41 @@
+Author: Daniel Jacobowitz <dan@debian.org>
+Author: Sven Joachim <svenjoac@gmx.de>
+Description: Fix backspace key description in some terminfo entries
+Bug-Debian: http://bugs.debian.org/237997
+Bug-Debian: http://bugs.debian.org/602300
+Forwarded: not-needed
+Last-Update: 2012-02-29
+
+---
+ misc/terminfo.src | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/misc/terminfo.src
++++ b/misc/terminfo.src
+@@ -3387,7 +3387,7 @@
+ # This fragment is for people who cannot agree on what the backspace key
+ # should send.
+ xterm+kbs|fragment for backspace key,
+- kbs=^H,
++ kbs=\177,
+ #
+ # This fragment describes as much of XFree86 xterm's "pc-style" function
+ # keys as will fit into terminfo's 60 function keys.
+@@ -4462,7 +4462,7 @@
+ ich1=\E[@, il=\E[%p1%dL, il1=\E[L, ind=^J,
+ is1=\E[?47l\E>\E[?1l,
+ is2=\E[r\E[m\E[2J\E[H\E[?7h\E[?1;3;4;6l\E[4l, kNXT@,
+- kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=^H,
++ kPRV@, ka1=\E[7~, ka3=\E[5~, kb2=\EOu, kbeg=\EOu, kbs=\177,
+ kc1=\E[8~, kc3=\E[6~, kent=\EOM, khlp=\E[28~, kmous=\E[M,
+ mc4=\E[4i, mc5=\E[5i, rc=\E8, rev=\E[7m, ri=\EM, rmacs=^O,
+ rmam=\E[?7l, rmcup=\E[2J\E[?47l\E8, rmir=\E[4l, rmkx=,
+@@ -4952,7 +4952,7 @@
+ cvvis=\E[34l, dch=\E[%p1%dP, dch1=\E[P, dl=\E[%p1%dM,
+ dl1=\E[M, ed=\E[J, el=\E[K, el1=\E[1K, enacs=\E(B\E)0,
+ flash=\Eg, home=\E[H, ht=^I, hts=\EH, ich=\E[%p1%d@,
+- il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=^H, kcbt=\E[Z,
++ il=\E[%p1%dL, il1=\E[L, ind=^J, is2=\E)0, kbs=\177, kcbt=\E[Z,
+ kcub1=\EOD, kcud1=\EOB, kcuf1=\EOC, kcuu1=\EOA,
+ kdch1=\E[3~, kend=\E[4~, kf1=\EOP, kf10=\E[21~,
+ kf11=\E[23~, kf12=\E[24~, kf2=\EOQ, kf3=\EOR, kf4=\EOS,
diff --git a/examples/ncurses/patches/03-debian-ncursesconfig-omit-L.diff b/examples/ncurses/patches/03-debian-ncursesconfig-omit-L.diff
new file mode 100644
index 0000000..f4f79f4
--- /dev/null
+++ b/examples/ncurses/patches/03-debian-ncursesconfig-omit-L.diff
@@ -0,0 +1,35 @@
+Author: Sven Joachim <svenjoac@gmx.de>
+Description: Omit -L part from ncurses5{w,}-config output
+ "ncurses5-config --libs" includes a "-L" part which is not needed
+ since the library is installed in a directory in the default linker
+ search path. The value is also wrong if ncurses-bin is of a
+ different architecture than libncurses5-dev.
+ .
+ Upstream included a similar patch in the 20110507 patchlevel to omit
+ the -L part if $libdir is /usr/lib. Until there is a way to obtain
+ the multiarch path without running dpkg-architecture our patch is not
+ upstreamable.
+Bug-Debian: http://bugs.debian.org/638281
+Forwarded: not-needed
+Last-Update: 2011-08-24
+
+---
+ misc/ncurses-config.in | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/misc/ncurses-config.in
++++ b/misc/ncurses-config.in
+@@ -85,11 +85,11 @@
+ --libs)
+ if test @TINFO_NAME@ = @LIB_NAME@ ; then
+ sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
++ @EXTRA_LDFLAGS@ -l${THIS} @LIBS@
+ ENDECHO
+ else
+ sed -e 's,^[ ]*,,' -e 's, [ ]*, ,g' -e 's,[ ]*$,,' <<-ENDECHO
+- -L$libdir @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@
++ @EXTRA_LDFLAGS@ -l${THIS} -l${TINFO_LIB} @LIBS@
+ ENDECHO
+ fi
+ ;;
diff --git a/examples/ncurses/patches/04-fix-tabset-directory.diff b/examples/ncurses/patches/04-fix-tabset-directory.diff
new file mode 100644
index 0000000..896bf57
--- /dev/null
+++ b/examples/ncurses/patches/04-fix-tabset-directory.diff
@@ -0,0 +1,45 @@
+Description: Set tabset directory to /usr/share/tabset
+ By default tun-tic.sh assumes the tabset directory is a sibling to
+ the default terminfo directory, which is wrong the tabset files are
+ installed into /usr/share/tabset, but the default terminfo directory
+ should be /etc/terminfo rather than /usr/share/terminfo. This patch
+ corrects that assumption.
+Author: Sven Joachim <svenjoac@gmx.de>
+Bug-Debian: http://bugs.debian.org/509919
+Bug-Debian: http://bugs.debian.org/653435
+Forwarded: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=653435#18
+Last-Update: 2012-01-23
+
+---
+ misc/Makefile.in | 2 +-
+ misc/gen_edit.sh | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+--- a/misc/gen_edit.sh
++++ b/misc/gen_edit.sh
+@@ -37,12 +37,12 @@
+ # The leaf directory names (lib, tabset, terminfo)
+ #
+
+-: ${ticdir=@TERMINFO@}
++: ${datadir=@datadir@}
+ : ${xterm_new=@WHICH_XTERM@}
+
+ # If we're not installing into /usr/share/, we'll have to adjust the location
+ # of the tabset files in terminfo.src (which are in a parallel directory).
+-TABSET=`echo $ticdir | sed -e 's%/terminfo$%/tabset%'`
++TABSET=${datadir}/tabset
+ if test "x$TABSET" != "x/usr/share/tabset" ; then
+ cat <<EOF
+ s%/usr/share/tabset%$TABSET%g
+--- a/misc/Makefile.in
++++ b/misc/Makefile.in
+@@ -120,7 +120,7 @@ terminfo.tmp : run_tic.sed $(source)
+
+ run_tic.sed :
+ WHICH_XTERM=@WHICH_XTERM@ \
+- ticdir=${ticdir} \
++ datadir=${datadir} \
+ $(SHELL) $(srcdir)/gen_edit.sh >$@
+
+ $(DESTDIR)$(bindir) \
diff --git a/examples/ncurses/patches/05-fix-poll-test.diff b/examples/ncurses/patches/05-fix-poll-test.diff
new file mode 100644
index 0000000..6d683f0
--- /dev/null
+++ b/examples/ncurses/patches/05-fix-poll-test.diff
@@ -0,0 +1,2176 @@
+Description: Correct CF_FUNC_POLL test
+ There were actually two problems with the test: it did not check
+ whether standard input was redirected, and if poll() returned a
+ positive result, the test inadvertently failed. Building ncurses with
+ stdin redirected to /dev/null (as under sbuild) would thus result in
+ select() rather than poll() being used in ncurses/tty/tty_update.c.
+Author: Sven Joachim <svenjoac@gmx.de>
+Bug-Debian: http://bugs.debian.org/676461
+Last-Update: 2012-06-11
+
+---
+ aclocal.m4 | 12 -
+ configure | 628 ++++++++++++++++++++++++++++++-------------------------------
+ 2 files changed, 328 insertions(+), 312 deletions(-)
+
+--- a/aclocal.m4
++++ b/aclocal.m4
+@@ -1441,6 +1441,8 @@ AC_DEFUN([CF_FUNC_POLL],[
+ AC_CACHE_CHECK(if poll really works,cf_cv_working_poll,[
+ AC_TRY_RUN([
+ #include <stdio.h>
++#include <unistd.h>
++#include <fcntl.h>
+ #ifdef HAVE_POLL_H
+ #include <poll.h>
+ #else
+@@ -1450,11 +1452,17 @@ int main() {
+ struct pollfd myfds;
+ int ret;
+
+- myfds.fd = 0;
++ int fd = 0;
++ if (!isatty(fd)) {
++ fd = open("/dev/tty", O_RDWR);
++ }
++
++ myfds.fd = fd;
+ myfds.events = POLLIN;
++ myfds.revents = 0;
+
+ ret = poll(&myfds, 1, 100);
+- ${cf_cv_main_return:-return}(ret != 0);
++ ${cf_cv_main_return:-return}(ret < 0);
+ }],
+ [cf_cv_working_poll=yes],
+ [cf_cv_working_poll=no],
+--- a/configure
++++ b/configure
+@@ -15729,6 +15729,8 @@ else
+ #include "confdefs.h"
+
+ #include <stdio.h>
++#include <unistd.h>
++#include <fcntl.h>
+ #ifdef HAVE_POLL_H
+ #include <poll.h>
+ #else
+@@ -15738,23 +15740,29 @@ int main() {
+ struct pollfd myfds;
+ int ret;
+
+- myfds.fd = 0;
++ int fd = 0;
++ if (!isatty(fd)) {
++ fd = open("/dev/tty", O_RDWR);
++ }
++
++ myfds.fd = fd;
+ myfds.events = POLLIN;
++ myfds.revents = 0;
+
+ ret = poll(&myfds, 1, 100);
+- ${cf_cv_main_return:-return}(ret != 0);
++ ${cf_cv_main_return:-return}(ret < 0);
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:15749: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15757: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15752: \$? = $ac_status" >&5
++ echo "$as_me:15760: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:15754: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15762: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15757: \$? = $ac_status" >&5
++ echo "$as_me:15765: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_working_poll=yes
+ else
+@@ -15766,20 +15774,20 @@ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:15769: result: $cf_cv_working_poll" >&5
++echo "$as_me:15777: result: $cf_cv_working_poll" >&5
+ echo "${ECHO_T}$cf_cv_working_poll" >&6
+ test "$cf_cv_working_poll" = "yes" && cat >>confdefs.h <<\EOF
+ #define HAVE_WORKING_POLL 1
+ EOF
+
+-echo "$as_me:15775: checking for va_copy" >&5
++echo "$as_me:15783: checking for va_copy" >&5
+ echo $ECHO_N "checking for va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have_va_copy+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15782 "configure"
++#line 15790 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -15796,16 +15804,16 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15799: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15807: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15802: \$? = $ac_status" >&5
++ echo "$as_me:15810: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:15805: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15813: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15808: \$? = $ac_status" >&5
++ echo "$as_me:15816: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_have_va_copy=yes
+ else
+@@ -15815,21 +15823,21 @@ cf_cv_have_va_copy=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15818: result: $cf_cv_have_va_copy" >&5
++echo "$as_me:15826: result: $cf_cv_have_va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have_va_copy" >&6
+
+ test "$cf_cv_have_va_copy" = yes && cat >>confdefs.h <<\EOF
+ #define HAVE_VA_COPY 1
+ EOF
+
+-echo "$as_me:15825: checking for __va_copy" >&5
++echo "$as_me:15833: checking for __va_copy" >&5
+ echo $ECHO_N "checking for __va_copy... $ECHO_C" >&6
+ if test "${cf_cv_have___va_copy+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15832 "configure"
++#line 15840 "configure"
+ #include "confdefs.h"
+
+ #include <stdarg.h>
+@@ -15846,16 +15854,16 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:15849: \"$ac_link\"") >&5
++if { (eval echo "$as_me:15857: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:15852: \$? = $ac_status" >&5
++ echo "$as_me:15860: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:15855: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15863: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15858: \$? = $ac_status" >&5
++ echo "$as_me:15866: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_have___va_copy=yes
+ else
+@@ -15865,20 +15873,20 @@ cf_cv_have___va_copy=no
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:15868: result: $cf_cv_have___va_copy" >&5
++echo "$as_me:15876: result: $cf_cv_have___va_copy" >&5
+ echo "${ECHO_T}$cf_cv_have___va_copy" >&6
+
+ test "$cf_cv_have___va_copy" = yes && cat >>confdefs.h <<\EOF
+ #define HAVE___VA_COPY 1
+ EOF
+
+-echo "$as_me:15875: checking for pid_t" >&5
++echo "$as_me:15883: checking for pid_t" >&5
+ echo $ECHO_N "checking for pid_t... $ECHO_C" >&6
+ if test "${ac_cv_type_pid_t+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15881 "configure"
++#line 15889 "configure"
+ #include "confdefs.h"
+ $ac_includes_default
+ int
+@@ -15893,16 +15901,16 @@ if (sizeof (pid_t))
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:15896: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:15904: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:15899: \$? = $ac_status" >&5
++ echo "$as_me:15907: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:15902: \"$ac_try\"") >&5
++ { (eval echo "$as_me:15910: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:15905: \$? = $ac_status" >&5
++ echo "$as_me:15913: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_type_pid_t=yes
+ else
+@@ -15912,7 +15920,7 @@ ac_cv_type_pid_t=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ fi
+-echo "$as_me:15915: result: $ac_cv_type_pid_t" >&5
++echo "$as_me:15923: result: $ac_cv_type_pid_t" >&5
+ echo "${ECHO_T}$ac_cv_type_pid_t" >&6
+ if test $ac_cv_type_pid_t = yes; then
+ :
+@@ -15927,23 +15935,23 @@ fi
+ for ac_header in unistd.h vfork.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:15930: checking for $ac_header" >&5
++echo "$as_me:15938: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15936 "configure"
++#line 15944 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:15940: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:15948: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- echo "$as_me:15946: \$? = $ac_status" >&5
++ echo "$as_me:15954: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -15962,7 +15970,7 @@ else
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:15965: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:15973: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+@@ -15975,13 +15983,13 @@ done
+ for ac_func in fork vfork
+ do
+ as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+-echo "$as_me:15978: checking for $ac_func" >&5
++echo "$as_me:15986: checking for $ac_func" >&5
+ echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 15984 "configure"
++#line 15992 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below. */
+@@ -16012,16 +16020,16 @@ f = $ac_func;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16015: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16023: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16018: \$? = $ac_status" >&5
++ echo "$as_me:16026: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:16021: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16029: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16024: \$? = $ac_status" >&5
++ echo "$as_me:16032: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+ else
+@@ -16031,7 +16039,7 @@ eval "$as_ac_var=no"
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ fi
+-echo "$as_me:16034: result: `eval echo '${'$as_ac_var'}'`" >&5
++echo "$as_me:16042: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+ if test `eval echo '${'$as_ac_var'}'` = yes; then
+ cat >>confdefs.h <<EOF
+@@ -16043,7 +16051,7 @@ done
+
+ ac_cv_func_fork_works=$ac_cv_func_fork
+ if test "x$ac_cv_func_fork" = xyes; then
+- echo "$as_me:16046: checking for working fork" >&5
++ echo "$as_me:16054: checking for working fork" >&5
+ echo $ECHO_N "checking for working fork... $ECHO_C" >&6
+ if test "${ac_cv_func_fork_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16066,15 +16074,15 @@ else
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16069: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16077: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16072: \$? = $ac_status" >&5
++ echo "$as_me:16080: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:16074: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16082: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16077: \$? = $ac_status" >&5
++ echo "$as_me:16085: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_fork_works=yes
+ else
+@@ -16086,7 +16094,7 @@ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:16089: result: $ac_cv_func_fork_works" >&5
++echo "$as_me:16097: result: $ac_cv_func_fork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_fork_works" >&6
+
+ fi
+@@ -16100,12 +16108,12 @@ if test "x$ac_cv_func_fork_works" = xcro
+ ac_cv_func_fork_works=yes
+ ;;
+ esac
+- { echo "$as_me:16103: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
++ { echo "$as_me:16111: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&5
+ echo "$as_me: WARNING: CROSS: Result $ac_cv_func_fork_works guessed due to cross-compiling." >&2;}
+ fi
+ ac_cv_func_vfork_works=$ac_cv_func_vfork
+ if test "x$ac_cv_func_vfork" = xyes; then
+- echo "$as_me:16108: checking for working vfork" >&5
++ echo "$as_me:16116: checking for working vfork" >&5
+ echo $ECHO_N "checking for working vfork... $ECHO_C" >&6
+ if test "${ac_cv_func_vfork_works+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16114,7 +16122,7 @@ else
+ ac_cv_func_vfork_works=cross
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16117 "configure"
++#line 16125 "configure"
+ #include "confdefs.h"
+ /* Thanks to Paul Eggert for this test. */
+ #include <stdio.h>
+@@ -16211,15 +16219,15 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:16214: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16222: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16217: \$? = $ac_status" >&5
++ echo "$as_me:16225: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:16219: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16227: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16222: \$? = $ac_status" >&5
++ echo "$as_me:16230: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_func_vfork_works=yes
+ else
+@@ -16231,13 +16239,13 @@ fi
+ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+ fi
+ fi
+-echo "$as_me:16234: result: $ac_cv_func_vfork_works" >&5
++echo "$as_me:16242: result: $ac_cv_func_vfork_works" >&5
+ echo "${ECHO_T}$ac_cv_func_vfork_works" >&6
+
+ fi;
+ if test "x$ac_cv_func_fork_works" = xcross; then
+ ac_cv_func_vfork_works=ac_cv_func_vfork
+- { echo "$as_me:16240: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
++ { echo "$as_me:16248: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&5
+ echo "$as_me: WARNING: CROSS: Result $ac_cv_func_vfork_works guessed due to cross-compiling." >&2;}
+ fi
+
+@@ -16264,7 +16272,7 @@ fi
+
+ # special check for test/ditto.c
+
+-echo "$as_me:16267: checking for openpty in -lutil" >&5
++echo "$as_me:16275: checking for openpty in -lutil" >&5
+ echo $ECHO_N "checking for openpty in -lutil... $ECHO_C" >&6
+ if test "${ac_cv_lib_util_openpty+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16272,7 +16280,7 @@ else
+ ac_check_lib_save_LIBS=$LIBS
+ LIBS="-lutil $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16275 "configure"
++#line 16283 "configure"
+ #include "confdefs.h"
+
+ /* Override any gcc2 internal prototype to avoid an error. */
+@@ -16291,16 +16299,16 @@ openpty ();
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16294: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16302: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16297: \$? = $ac_status" >&5
++ echo "$as_me:16305: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:16300: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16308: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16303: \$? = $ac_status" >&5
++ echo "$as_me:16311: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ ac_cv_lib_util_openpty=yes
+ else
+@@ -16311,7 +16319,7 @@ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS=$ac_check_lib_save_LIBS
+ fi
+-echo "$as_me:16314: result: $ac_cv_lib_util_openpty" >&5
++echo "$as_me:16322: result: $ac_cv_lib_util_openpty" >&5
+ echo "${ECHO_T}$ac_cv_lib_util_openpty" >&6
+ if test $ac_cv_lib_util_openpty = yes; then
+ cf_cv_lib_util=yes
+@@ -16319,7 +16327,7 @@ else
+ cf_cv_lib_util=no
+ fi
+
+-echo "$as_me:16322: checking for openpty header" >&5
++echo "$as_me:16330: checking for openpty header" >&5
+ echo $ECHO_N "checking for openpty header... $ECHO_C" >&6
+ if test "${cf_cv_func_openpty+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16330,7 +16338,7 @@ else
+ for cf_header in pty.h libutil.h util.h
+ do
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16333 "configure"
++#line 16341 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_header>
+@@ -16347,16 +16355,16 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16350: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16358: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16353: \$? = $ac_status" >&5
++ echo "$as_me:16361: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:16356: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16364: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16359: \$? = $ac_status" >&5
++ echo "$as_me:16367: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_func_openpty=$cf_header
+@@ -16374,7 +16382,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
+ LIBS="$cf_save_LIBS"
+
+ fi
+-echo "$as_me:16377: result: $cf_cv_func_openpty" >&5
++echo "$as_me:16385: result: $cf_cv_func_openpty" >&5
+ echo "${ECHO_T}$cf_cv_func_openpty" >&6
+
+ if test "$cf_cv_func_openpty" != no ; then
+@@ -16426,7 +16434,7 @@ if test -n "$with_hashed_db/include" ; t
+ cf_save_CPPFLAGS=$CPPFLAGS
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16429 "configure"
++#line 16437 "configure"
+ #include "confdefs.h"
+ #include <stdio.h>
+ int
+@@ -16438,16 +16446,16 @@ printf("Hello")
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16441: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16449: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16444: \$? = $ac_status" >&5
++ echo "$as_me:16452: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16447: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16455: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16450: \$? = $ac_status" >&5
++ echo "$as_me:16458: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ :
+ else
+@@ -16464,7 +16472,7 @@ rm -f conftest.$ac_objext conftest.$ac_e
+ if test "$cf_have_incdir" = no ; then
+ test -n "$verbose" && echo " adding $cf_add_incdir to include-path" 1>&6
+
+-echo "${as_me:-configure}:16467: testing adding $cf_add_incdir to include-path ..." 1>&5
++echo "${as_me:-configure}:16475: testing adding $cf_add_incdir to include-path ..." 1>&5
+
+ CPPFLAGS="$CPPFLAGS -I$cf_add_incdir"
+
+@@ -16498,7 +16506,7 @@ if test -n "$with_hashed_db/lib" ; then
+ if test "$cf_have_libdir" = no ; then
+ test -n "$verbose" && echo " adding $cf_add_libdir to library-path" 1>&6
+
+-echo "${as_me:-configure}:16501: testing adding $cf_add_libdir to library-path ..." 1>&5
++echo "${as_me:-configure}:16509: testing adding $cf_add_libdir to library-path ..." 1>&5
+
+ LDFLAGS="-L$cf_add_libdir $LDFLAGS"
+ fi
+@@ -16509,23 +16517,23 @@ fi
+ fi
+ esac
+
+-echo "$as_me:16512: checking for db.h" >&5
++echo "$as_me:16520: checking for db.h" >&5
+ echo $ECHO_N "checking for db.h... $ECHO_C" >&6
+ if test "${ac_cv_header_db_h+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16518 "configure"
++#line 16526 "configure"
+ #include "confdefs.h"
+ #include <db.h>
+ _ACEOF
+-if { (eval echo "$as_me:16522: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:16530: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- echo "$as_me:16528: \$? = $ac_status" >&5
++ echo "$as_me:16536: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_c_preproc_warn_flag
+@@ -16544,11 +16552,11 @@ else
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:16547: result: $ac_cv_header_db_h" >&5
++echo "$as_me:16555: result: $ac_cv_header_db_h" >&5
+ echo "${ECHO_T}$ac_cv_header_db_h" >&6
+ if test $ac_cv_header_db_h = yes; then
+
+-echo "$as_me:16551: checking for version of db" >&5
++echo "$as_me:16559: checking for version of db" >&5
+ echo $ECHO_N "checking for version of db... $ECHO_C" >&6
+ if test "${cf_cv_hashed_db_version+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16559,10 +16567,10 @@ cf_cv_hashed_db_version=unknown
+ for cf_db_version in 1 2 3 4 5
+ do
+
+-echo "${as_me:-configure}:16562: testing checking for db version $cf_db_version ..." 1>&5
++echo "${as_me:-configure}:16570: testing checking for db version $cf_db_version ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16565 "configure"
++#line 16573 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -16592,16 +16600,16 @@ DBT *foo = 0
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16595: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16603: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16598: \$? = $ac_status" >&5
++ echo "$as_me:16606: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16601: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16609: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16604: \$? = $ac_status" >&5
++ echo "$as_me:16612: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ cf_cv_hashed_db_version=$cf_db_version
+@@ -16615,16 +16623,16 @@ rm -f conftest.$ac_objext conftest.$ac_e
+ done
+
+ fi
+-echo "$as_me:16618: result: $cf_cv_hashed_db_version" >&5
++echo "$as_me:16626: result: $cf_cv_hashed_db_version" >&5
+ echo "${ECHO_T}$cf_cv_hashed_db_version" >&6
+
+ if test "$cf_cv_hashed_db_version" = unknown ; then
+- { { echo "$as_me:16622: error: Cannot determine version of db" >&5
++ { { echo "$as_me:16630: error: Cannot determine version of db" >&5
+ echo "$as_me: error: Cannot determine version of db" >&2;}
+ { (exit 1); exit 1; }; }
+ else
+
+-echo "$as_me:16627: checking for db libraries" >&5
++echo "$as_me:16635: checking for db libraries" >&5
+ echo $ECHO_N "checking for db libraries... $ECHO_C" >&6
+ if test "${cf_cv_hashed_db_libs+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16638,10 +16646,10 @@ do
+ LIBS="-l$cf_db_libs $LIBS"
+ fi
+
+-echo "${as_me:-configure}:16641: testing checking for library "$cf_db_libs" ..." 1>&5
++echo "${as_me:-configure}:16649: testing checking for library "$cf_db_libs" ..." 1>&5
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16644 "configure"
++#line 16652 "configure"
+ #include "confdefs.h"
+
+ $ac_includes_default
+@@ -16696,16 +16704,16 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16699: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16707: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16702: \$? = $ac_status" >&5
++ echo "$as_me:16710: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:16705: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16713: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16708: \$? = $ac_status" >&5
++ echo "$as_me:16716: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ if test -n "$cf_db_libs" ; then
+@@ -16725,11 +16733,11 @@ rm -f conftest.$ac_objext conftest$ac_ex
+ done
+
+ fi
+-echo "$as_me:16728: result: $cf_cv_hashed_db_libs" >&5
++echo "$as_me:16736: result: $cf_cv_hashed_db_libs" >&5
+ echo "${ECHO_T}$cf_cv_hashed_db_libs" >&6
+
+ if test "$cf_cv_hashed_db_libs" = unknown ; then
+- { { echo "$as_me:16732: error: Cannot determine library for db" >&5
++ { { echo "$as_me:16740: error: Cannot determine library for db" >&5
+ echo "$as_me: error: Cannot determine library for db" >&2;}
+ { (exit 1); exit 1; }; }
+ elif test "$cf_cv_hashed_db_libs" != default ; then
+@@ -16739,7 +16747,7 @@ fi
+
+ else
+
+- { { echo "$as_me:16742: error: Cannot find db.h" >&5
++ { { echo "$as_me:16750: error: Cannot find db.h" >&5
+ echo "$as_me: error: Cannot find db.h" >&2;}
+ { (exit 1); exit 1; }; }
+
+@@ -16754,7 +16762,7 @@ fi
+
+ # Just in case, check if the C compiler has a bool type.
+
+-echo "$as_me:16757: checking if we should include stdbool.h" >&5
++echo "$as_me:16765: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -16762,7 +16770,7 @@ if test "${cf_cv_header_stdbool_h+set}"
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16765 "configure"
++#line 16773 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -16774,23 +16782,23 @@ bool foo = false
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16777: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16785: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16780: \$? = $ac_status" >&5
++ echo "$as_me:16788: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16783: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16791: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16786: \$? = $ac_status" >&5
++ echo "$as_me:16794: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_header_stdbool_h=0
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16793 "configure"
++#line 16801 "configure"
+ #include "confdefs.h"
+
+ #ifndef __BEOS__
+@@ -16806,16 +16814,16 @@ bool foo = false
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16809: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16817: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16812: \$? = $ac_status" >&5
++ echo "$as_me:16820: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16815: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16823: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16818: \$? = $ac_status" >&5
++ echo "$as_me:16826: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_header_stdbool_h=1
+ else
+@@ -16829,13 +16837,13 @@ rm -f conftest.$ac_objext conftest.$ac_e
+ fi
+
+ if test "$cf_cv_header_stdbool_h" = 1
+-then echo "$as_me:16832: result: yes" >&5
++then echo "$as_me:16840: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:16834: result: no" >&5
++else echo "$as_me:16842: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:16838: checking for builtin bool type" >&5
++echo "$as_me:16846: checking for builtin bool type" >&5
+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
+
+ if test "${cf_cv_cc_bool_type+set}" = set; then
+@@ -16843,7 +16851,7 @@ if test "${cf_cv_cc_bool_type+set}" = se
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16846 "configure"
++#line 16854 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -16858,16 +16866,16 @@ bool x = false
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:16861: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:16869: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:16864: \$? = $ac_status" >&5
++ echo "$as_me:16872: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:16867: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16875: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16870: \$? = $ac_status" >&5
++ echo "$as_me:16878: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_cc_bool_type=1
+ else
+@@ -16880,9 +16888,9 @@ rm -f conftest.$ac_objext conftest.$ac_e
+ fi
+
+ if test "$cf_cv_cc_bool_type" = 1
+-then echo "$as_me:16883: result: yes" >&5
++then echo "$as_me:16891: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:16885: result: no" >&5
++else echo "$as_me:16893: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -16904,7 +16912,7 @@ os2*) #(vi
+ cf_stdcpp_libname=stdc++
+ ;;
+ esac
+-echo "$as_me:16907: checking for library $cf_stdcpp_libname" >&5
++echo "$as_me:16915: checking for library $cf_stdcpp_libname" >&5
+ echo $ECHO_N "checking for library $cf_stdcpp_libname... $ECHO_C" >&6
+ if test "${cf_cv_libstdcpp+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16913,7 +16921,7 @@ else
+ cf_save="$LIBS"
+ LIBS="-l$cf_stdcpp_libname $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 16916 "configure"
++#line 16924 "configure"
+ #include "confdefs.h"
+
+ #include <strstream.h>
+@@ -16929,16 +16937,16 @@ strstreambuf foo(buf, sizeof(buf))
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:16932: \"$ac_link\"") >&5
++if { (eval echo "$as_me:16940: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:16935: \$? = $ac_status" >&5
++ echo "$as_me:16943: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:16938: \"$ac_try\"") >&5
++ { (eval echo "$as_me:16946: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16941: \$? = $ac_status" >&5
++ echo "$as_me:16949: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_libstdcpp=yes
+ else
+@@ -16950,12 +16958,12 @@ rm -f conftest.$ac_objext conftest$ac_ex
+ LIBS="$cf_save"
+
+ fi
+-echo "$as_me:16953: result: $cf_cv_libstdcpp" >&5
++echo "$as_me:16961: result: $cf_cv_libstdcpp" >&5
+ echo "${ECHO_T}$cf_cv_libstdcpp" >&6
+ test "$cf_cv_libstdcpp" = yes && CXXLIBS="-l$cf_stdcpp_libname $CXXLIBS"
+ fi
+
+- echo "$as_me:16958: checking whether $CXX understands -c and -o together" >&5
++ echo "$as_me:16966: checking whether $CXX understands -c and -o together" >&5
+ echo $ECHO_N "checking whether $CXX understands -c and -o together... $ECHO_C" >&6
+ if test "${cf_cv_prog_CXX_c_o+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -16971,15 +16979,15 @@ CF_EOF
+ # We do the test twice because some compilers refuse to overwrite an
+ # existing .o file with -o, though they will create one.
+ ac_try='$CXX -c conftest.$ac_ext -o conftest2.$ac_objext >&5'
+-if { (eval echo "$as_me:16974: \"$ac_try\"") >&5
++if { (eval echo "$as_me:16982: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16977: \$? = $ac_status" >&5
++ echo "$as_me:16985: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+- test -f conftest2.$ac_objext && { (eval echo "$as_me:16979: \"$ac_try\"") >&5
++ test -f conftest2.$ac_objext && { (eval echo "$as_me:16987: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:16982: \$? = $ac_status" >&5
++ echo "$as_me:16990: \$? = $ac_status" >&5
+ (exit $ac_status); };
+ then
+ eval cf_cv_prog_CXX_c_o=yes
+@@ -16990,10 +16998,10 @@ rm -rf conftest*
+
+ fi
+ if test $cf_cv_prog_CXX_c_o = yes; then
+- echo "$as_me:16993: result: yes" >&5
++ echo "$as_me:17001: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+- echo "$as_me:16996: result: no" >&5
++ echo "$as_me:17004: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -17013,12 +17021,12 @@ os2*) #(vi
+ ;;
+ esac
+ if test "$GXX" = yes; then
+- echo "$as_me:17016: checking for lib$cf_gpp_libname" >&5
++ echo "$as_me:17024: checking for lib$cf_gpp_libname" >&5
+ echo $ECHO_N "checking for lib$cf_gpp_libname... $ECHO_C" >&6
+ cf_save="$LIBS"
+ LIBS="-l$cf_gpp_libname $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17021 "configure"
++#line 17029 "configure"
+ #include "confdefs.h"
+
+ #include <$cf_gpp_libname/builtin.h>
+@@ -17032,16 +17040,16 @@ two_arg_error_handler_t foo2 = lib_error
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17035: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17043: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17038: \$? = $ac_status" >&5
++ echo "$as_me:17046: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:17041: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17049: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17044: \$? = $ac_status" >&5
++ echo "$as_me:17052: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cxx_library=yes
+ CXXLIBS="-l$cf_gpp_libname $CXXLIBS"
+@@ -17060,7 +17068,7 @@ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17063 "configure"
++#line 17071 "configure"
+ #include "confdefs.h"
+
+ #include <builtin.h>
+@@ -17074,16 +17082,16 @@ two_arg_error_handler_t foo2 = lib_error
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:17077: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17085: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17080: \$? = $ac_status" >&5
++ echo "$as_me:17088: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:17083: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17091: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17086: \$? = $ac_status" >&5
++ echo "$as_me:17094: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cxx_library=yes
+ CXXLIBS="-l$cf_gpp_libname $CXXLIBS"
+@@ -17100,7 +17108,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
+ fi
+ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
+ LIBS="$cf_save"
+- echo "$as_me:17103: result: $cf_cxx_library" >&5
++ echo "$as_me:17111: result: $cf_cxx_library" >&5
+ echo "${ECHO_T}$cf_cxx_library" >&6
+ fi
+
+@@ -17116,7 +17124,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS
+ ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return=return
+-echo "$as_me:17119: checking how to run the C++ preprocessor" >&5
++echo "$as_me:17127: checking how to run the C++ preprocessor" >&5
+ echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
+ if test -z "$CXXCPP"; then
+ if test "${ac_cv_prog_CXXCPP+set}" = set; then
+@@ -17133,18 +17141,18 @@ do
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17136 "configure"
++#line 17144 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:17141: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17149: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- echo "$as_me:17147: \$? = $ac_status" >&5
++ echo "$as_me:17155: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -17167,17 +17175,17 @@ rm -f conftest.err conftest.$ac_ext
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17170 "configure"
++#line 17178 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:17174: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17182: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- echo "$as_me:17180: \$? = $ac_status" >&5
++ echo "$as_me:17188: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -17214,7 +17222,7 @@ fi
+ else
+ ac_cv_prog_CXXCPP=$CXXCPP
+ fi
+-echo "$as_me:17217: result: $CXXCPP" >&5
++echo "$as_me:17225: result: $CXXCPP" >&5
+ echo "${ECHO_T}$CXXCPP" >&6
+ ac_preproc_ok=false
+ for ac_cxx_preproc_warn_flag in '' yes
+@@ -17224,18 +17232,18 @@ do
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp. "Syntax error" is here to catch this case.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17227 "configure"
++#line 17235 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax error
+ _ACEOF
+-if { (eval echo "$as_me:17232: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17240: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- echo "$as_me:17238: \$? = $ac_status" >&5
++ echo "$as_me:17246: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -17258,17 +17266,17 @@ rm -f conftest.err conftest.$ac_ext
+ # OK, works on sane cases. Now check whether non-existent headers
+ # can be detected and how.
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17261 "configure"
++#line 17269 "configure"
+ #include "confdefs.h"
+ #include <ac_nonexistent.h>
+ _ACEOF
+-if { (eval echo "$as_me:17265: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17273: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- echo "$as_me:17271: \$? = $ac_status" >&5
++ echo "$as_me:17279: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -17296,7 +17304,7 @@ rm -f conftest.err conftest.$ac_ext
+ if $ac_preproc_ok; then
+ :
+ else
+- { { echo "$as_me:17299: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
++ { { echo "$as_me:17307: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&5
+ echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+@@ -17311,23 +17319,23 @@ ac_main_return=return
+ for ac_header in iostream typeinfo
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-echo "$as_me:17314: checking for $ac_header" >&5
++echo "$as_me:17322: checking for $ac_header" >&5
+ echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17320 "configure"
++#line 17328 "configure"
+ #include "confdefs.h"
+ #include <$ac_header>
+ _ACEOF
+-if { (eval echo "$as_me:17324: \"$ac_cpp conftest.$ac_ext\"") >&5
++if { (eval echo "$as_me:17332: \"$ac_cpp conftest.$ac_ext\"") >&5
+ (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+ ac_status=$?
+ egrep -v '^ *\+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+- echo "$as_me:17330: \$? = $ac_status" >&5
++ echo "$as_me:17338: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null; then
+ if test -s conftest.err; then
+ ac_cpp_err=$ac_cxx_preproc_warn_flag
+@@ -17346,7 +17354,7 @@ else
+ fi
+ rm -f conftest.err conftest.$ac_ext
+ fi
+-echo "$as_me:17349: result: `eval echo '${'$as_ac_Header'}'`" >&5
++echo "$as_me:17357: result: `eval echo '${'$as_ac_Header'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
+ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+ cat >>confdefs.h <<EOF
+@@ -17357,10 +17365,10 @@ fi
+ done
+
+ if test x"$ac_cv_header_iostream" = xyes ; then
+- echo "$as_me:17360: checking if iostream uses std-namespace" >&5
++ echo "$as_me:17368: checking if iostream uses std-namespace" >&5
+ echo $ECHO_N "checking if iostream uses std-namespace... $ECHO_C" >&6
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17363 "configure"
++#line 17371 "configure"
+ #include "confdefs.h"
+
+ #include <iostream>
+@@ -17377,16 +17385,16 @@ cerr << "testing" << endl;
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17380: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17388: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17383: \$? = $ac_status" >&5
++ echo "$as_me:17391: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:17386: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17394: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17389: \$? = $ac_status" >&5
++ echo "$as_me:17397: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_iostream_namespace=yes
+ else
+@@ -17395,7 +17403,7 @@ cat conftest.$ac_ext >&5
+ cf_iostream_namespace=no
+ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+- echo "$as_me:17398: result: $cf_iostream_namespace" >&5
++ echo "$as_me:17406: result: $cf_iostream_namespace" >&5
+ echo "${ECHO_T}$cf_iostream_namespace" >&6
+ if test "$cf_iostream_namespace" = yes ; then
+ cat >>confdefs.h <<\EOF
+@@ -17405,7 +17413,7 @@ EOF
+ fi
+ fi
+
+-echo "$as_me:17408: checking if we should include stdbool.h" >&5
++echo "$as_me:17416: checking if we should include stdbool.h" >&5
+ echo $ECHO_N "checking if we should include stdbool.h... $ECHO_C" >&6
+
+ if test "${cf_cv_header_stdbool_h+set}" = set; then
+@@ -17413,7 +17421,7 @@ if test "${cf_cv_header_stdbool_h+set}"
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17416 "configure"
++#line 17424 "configure"
+ #include "confdefs.h"
+
+ int
+@@ -17425,23 +17433,23 @@ bool foo = false
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17428: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17436: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17431: \$? = $ac_status" >&5
++ echo "$as_me:17439: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:17434: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17442: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17437: \$? = $ac_status" >&5
++ echo "$as_me:17445: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_header_stdbool_h=0
+ else
+ echo "$as_me: failed program was:" >&5
+ cat conftest.$ac_ext >&5
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17444 "configure"
++#line 17452 "configure"
+ #include "confdefs.h"
+
+ #ifndef __BEOS__
+@@ -17457,16 +17465,16 @@ bool foo = false
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17460: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17468: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17463: \$? = $ac_status" >&5
++ echo "$as_me:17471: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:17466: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17474: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17469: \$? = $ac_status" >&5
++ echo "$as_me:17477: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_header_stdbool_h=1
+ else
+@@ -17480,13 +17488,13 @@ rm -f conftest.$ac_objext conftest.$ac_e
+ fi
+
+ if test "$cf_cv_header_stdbool_h" = 1
+-then echo "$as_me:17483: result: yes" >&5
++then echo "$as_me:17491: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:17485: result: no" >&5
++else echo "$as_me:17493: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:17489: checking for builtin bool type" >&5
++echo "$as_me:17497: checking for builtin bool type" >&5
+ echo $ECHO_N "checking for builtin bool type... $ECHO_C" >&6
+
+ if test "${cf_cv_builtin_bool+set}" = set; then
+@@ -17494,7 +17502,7 @@ if test "${cf_cv_builtin_bool+set}" = se
+ else
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17497 "configure"
++#line 17505 "configure"
+ #include "confdefs.h"
+
+ #include <stdio.h>
+@@ -17509,16 +17517,16 @@ bool x = false
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17512: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17520: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17515: \$? = $ac_status" >&5
++ echo "$as_me:17523: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:17518: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17526: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17521: \$? = $ac_status" >&5
++ echo "$as_me:17529: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_builtin_bool=1
+ else
+@@ -17531,13 +17539,13 @@ rm -f conftest.$ac_objext conftest.$ac_e
+ fi
+
+ if test "$cf_cv_builtin_bool" = 1
+-then echo "$as_me:17534: result: yes" >&5
++then echo "$as_me:17542: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+-else echo "$as_me:17536: result: no" >&5
++else echo "$as_me:17544: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+-echo "$as_me:17540: checking for size of bool" >&5
++echo "$as_me:17548: checking for size of bool" >&5
+ echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17548,7 +17556,7 @@ else
+ cf_cv_type_of_bool=unknown
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17551 "configure"
++#line 17559 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -17590,15 +17598,15 @@ main()
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17593: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17601: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17596: \$? = $ac_status" >&5
++ echo "$as_me:17604: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:17598: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17606: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17601: \$? = $ac_status" >&5
++ echo "$as_me:17609: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_type_of_bool=`cat cf_test.out`
+ if test -z "$cf_cv_type_of_bool"; then
+@@ -17616,18 +17624,18 @@ fi
+ fi
+
+ rm -f cf_test.out
+-echo "$as_me:17619: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:17627: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ case .$NCURSES_BOOL in #(vi
+ .auto|.) NCURSES_BOOL=unsigned;;
+ esac
+- { echo "$as_me:17625: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++ { echo "$as_me:17633: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+
+-echo "$as_me:17630: checking for special defines needed for etip.h" >&5
++echo "$as_me:17638: checking for special defines needed for etip.h" >&5
+ echo $ECHO_N "checking for special defines needed for etip.h... $ECHO_C" >&6
+ cf_save_CXXFLAGS="$CXXFLAGS"
+ cf_result="none"
+@@ -17639,7 +17647,7 @@ do
+ test -n "$cf_math" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_math}"
+ test -n "$cf_excp" && CXXFLAGS="$CXXFLAGS -DETIP_NEEDS_${cf_excp}"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17642 "configure"
++#line 17650 "configure"
+ #include "confdefs.h"
+
+ #include <etip.h.in>
+@@ -17653,16 +17661,16 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17656: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17664: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17659: \$? = $ac_status" >&5
++ echo "$as_me:17667: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:17662: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17670: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17665: \$? = $ac_status" >&5
++ echo "$as_me:17673: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+
+ test -n "$cf_math" && cat >>confdefs.h <<EOF
+@@ -17683,12 +17691,12 @@ fi
+ rm -f conftest.$ac_objext conftest.$ac_ext
+ done
+ done
+-echo "$as_me:17686: result: $cf_result" >&5
++echo "$as_me:17694: result: $cf_result" >&5
+ echo "${ECHO_T}$cf_result" >&6
+ CXXFLAGS="$cf_save_CXXFLAGS"
+
+ if test -n "$CXX"; then
+-echo "$as_me:17691: checking if $CXX accepts parameter initialization" >&5
++echo "$as_me:17699: checking if $CXX accepts parameter initialization" >&5
+ echo $ECHO_N "checking if $CXX accepts parameter initialization... $ECHO_C" >&6
+ if test "${cf_cv_cpp_param_init+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17705,7 +17713,7 @@ ac_main_return=return
+ cf_cv_cpp_param_init=unknown
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17708 "configure"
++#line 17716 "configure"
+ #include "confdefs.h"
+
+ class TEST {
+@@ -17724,15 +17732,15 @@ void main() { }
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17727: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17735: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17730: \$? = $ac_status" >&5
++ echo "$as_me:17738: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:17732: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17740: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17735: \$? = $ac_status" >&5
++ echo "$as_me:17743: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_cpp_param_init=yes
+ else
+@@ -17751,7 +17759,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return=return
+
+ fi
+-echo "$as_me:17754: result: $cf_cv_cpp_param_init" >&5
++echo "$as_me:17762: result: $cf_cv_cpp_param_init" >&5
+ echo "${ECHO_T}$cf_cv_cpp_param_init" >&6
+ fi
+ test "$cf_cv_cpp_param_init" = yes && cat >>confdefs.h <<\EOF
+@@ -17760,7 +17768,7 @@ EOF
+
+ if test -n "$CXX"; then
+
+-echo "$as_me:17763: checking if $CXX accepts static_cast" >&5
++echo "$as_me:17771: checking if $CXX accepts static_cast" >&5
+ echo $ECHO_N "checking if $CXX accepts static_cast... $ECHO_C" >&6
+ if test "${cf_cv_cpp_static_cast+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17774,7 +17782,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return=return
+
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17777 "configure"
++#line 17785 "configure"
+ #include "confdefs.h"
+
+ class NCursesPanel
+@@ -17818,16 +17826,16 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext
+-if { (eval echo "$as_me:17821: \"$ac_compile\"") >&5
++if { (eval echo "$as_me:17829: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:17824: \$? = $ac_status" >&5
++ echo "$as_me:17832: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest.$ac_objext'
+- { (eval echo "$as_me:17827: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17835: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17830: \$? = $ac_status" >&5
++ echo "$as_me:17838: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_cpp_static_cast=yes
+ else
+@@ -17845,7 +17853,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ ac_main_return=return
+
+ fi
+-echo "$as_me:17848: result: $cf_cv_cpp_static_cast" >&5
++echo "$as_me:17856: result: $cf_cv_cpp_static_cast" >&5
+ echo "${ECHO_T}$cf_cv_cpp_static_cast" >&6
+
+ fi
+@@ -17893,7 +17901,7 @@ else
+ else
+ if test "$cf_cv_header_stdbool_h" = 1 ; then
+
+-echo "$as_me:17896: checking for size of bool" >&5
++echo "$as_me:17904: checking for size of bool" >&5
+ echo $ECHO_N "checking for size of bool... $ECHO_C" >&6
+ if test "${cf_cv_type_of_bool+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -17904,7 +17912,7 @@ else
+ cf_cv_type_of_bool=unknown
+ else
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 17907 "configure"
++#line 17915 "configure"
+ #include "confdefs.h"
+
+ #include <stdlib.h>
+@@ -17946,15 +17954,15 @@ main()
+
+ _ACEOF
+ rm -f conftest$ac_exeext
+-if { (eval echo "$as_me:17949: \"$ac_link\"") >&5
++if { (eval echo "$as_me:17957: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:17952: \$? = $ac_status" >&5
++ echo "$as_me:17960: \$? = $ac_status" >&5
+ (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+- { (eval echo "$as_me:17954: \"$ac_try\"") >&5
++ { (eval echo "$as_me:17962: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:17957: \$? = $ac_status" >&5
++ echo "$as_me:17965: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_cv_type_of_bool=`cat cf_test.out`
+ if test -z "$cf_cv_type_of_bool"; then
+@@ -17972,25 +17980,25 @@ fi
+ fi
+
+ rm -f cf_test.out
+-echo "$as_me:17975: result: $cf_cv_type_of_bool" >&5
++echo "$as_me:17983: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ if test "$cf_cv_type_of_bool" = unknown ; then
+ case .$NCURSES_BOOL in #(vi
+ .auto|.) NCURSES_BOOL=unsigned;;
+ esac
+- { echo "$as_me:17981: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
++ { echo "$as_me:17989: WARNING: Assuming $NCURSES_BOOL for type of bool" >&5
+ echo "$as_me: WARNING: Assuming $NCURSES_BOOL for type of bool" >&2;}
+ cf_cv_type_of_bool=$NCURSES_BOOL
+ fi
+
+ else
+- echo "$as_me:17987: checking for fallback type of bool" >&5
++ echo "$as_me:17995: checking for fallback type of bool" >&5
+ echo $ECHO_N "checking for fallback type of bool... $ECHO_C" >&6
+ case "$host_cpu" in #(vi
+ i?86) cf_cv_type_of_bool=char ;; #(vi
+ *) cf_cv_type_of_bool=int ;;
+ esac
+- echo "$as_me:17993: result: $cf_cv_type_of_bool" >&5
++ echo "$as_me:18001: result: $cf_cv_type_of_bool" >&5
+ echo "${ECHO_T}$cf_cv_type_of_bool" >&6
+ fi
+ fi
+@@ -18019,7 +18027,7 @@ if test -f "${srcdir}/Ada95/Makefile.in"
+
+ if test "$cf_with_ada" != "no" ; then
+ if test "$with_libtool" != "no"; then
+- { echo "$as_me:18022: WARNING: libtool does not support Ada - disabling feature" >&5
++ { echo "$as_me:18030: WARNING: libtool does not support Ada - disabling feature" >&5
+ echo "$as_me: WARNING: libtool does not support Ada - disabling feature" >&2;}
+ cf_with_ada=no
+ fi
+@@ -18030,7 +18038,7 @@ echo "$as_me: WARNING: libtool does not
+ cf_ada_make=gnatmake
+ # Extract the first word of "$cf_ada_make", so it can be a program name with args.
+ set dummy $cf_ada_make; ac_word=$2
+-echo "$as_me:18033: checking for $ac_word" >&5
++echo "$as_me:18041: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_gnat_exists+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18045,7 +18053,7 @@ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_gnat_exists="yes"
+-echo "$as_me:18048: found $ac_dir/$ac_word" >&5
++echo "$as_me:18056: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -18054,10 +18062,10 @@ fi
+ fi
+ gnat_exists=$ac_cv_prog_gnat_exists
+ if test -n "$gnat_exists"; then
+- echo "$as_me:18057: result: $gnat_exists" >&5
++ echo "$as_me:18065: result: $gnat_exists" >&5
+ echo "${ECHO_T}$gnat_exists" >&6
+ else
+- echo "$as_me:18060: result: no" >&5
++ echo "$as_me:18068: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -18065,12 +18073,12 @@ if test "$ac_cv_prog_gnat_exists" = no;
+ cf_ada_make=
+ else
+
+-echo "$as_me:18068: checking for gnat version" >&5
++echo "$as_me:18076: checking for gnat version" >&5
+ echo $ECHO_N "checking for gnat version... $ECHO_C" >&6
+ cf_gnat_version=`${cf_ada_make:-gnatmake} -v 2>&1 | \
+ grep '[0-9].[0-9][0-9]*' |\
+ sed -e '2,$d' -e 's/[^0-9 \.]//g' -e 's/^[ ]*//' -e 's/ .*//'`
+-echo "$as_me:18073: result: $cf_gnat_version" >&5
++echo "$as_me:18081: result: $cf_gnat_version" >&5
+ echo "${ECHO_T}$cf_gnat_version" >&6
+
+ case $cf_gnat_version in #(vi
+@@ -18078,7 +18086,7 @@ case $cf_gnat_version in #(vi
+ cf_cv_prog_gnat_correct=yes
+ ;;
+ *)
+- { echo "$as_me:18081: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
++ { echo "$as_me:18089: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&5
+ echo "$as_me: WARNING: Unsupported GNAT version $cf_gnat_version. We require 3.11 or better. Disabling Ada95 binding." >&2;}
+ cf_cv_prog_gnat_correct=no
+ ;;
+@@ -18086,7 +18094,7 @@ esac
+
+ # Extract the first word of "m4", so it can be a program name with args.
+ set dummy m4; ac_word=$2
+-echo "$as_me:18089: checking for $ac_word" >&5
++echo "$as_me:18097: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_prog_M4_exists+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18101,7 +18109,7 @@ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ $as_executable_p "$ac_dir/$ac_word" || continue
+ ac_cv_prog_M4_exists="yes"
+-echo "$as_me:18104: found $ac_dir/$ac_word" >&5
++echo "$as_me:18112: found $ac_dir/$ac_word" >&5
+ break
+ done
+
+@@ -18110,10 +18118,10 @@ fi
+ fi
+ M4_exists=$ac_cv_prog_M4_exists
+ if test -n "$M4_exists"; then
+- echo "$as_me:18113: result: $M4_exists" >&5
++ echo "$as_me:18121: result: $M4_exists" >&5
+ echo "${ECHO_T}$M4_exists" >&6
+ else
+- echo "$as_me:18116: result: no" >&5
++ echo "$as_me:18124: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -18122,7 +18130,7 @@ fi
+ echo Ada95 binding required program m4 not found. Ada95 binding disabled.
+ fi
+ if test "$cf_cv_prog_gnat_correct" = yes; then
+- echo "$as_me:18125: checking if GNAT works" >&5
++ echo "$as_me:18133: checking if GNAT works" >&5
+ echo $ECHO_N "checking if GNAT works... $ECHO_C" >&6
+
+ rm -rf conftest* *~conftest*
+@@ -18150,7 +18158,7 @@ else
+ fi
+ rm -rf conftest* *~conftest*
+
+- echo "$as_me:18153: result: $cf_cv_prog_gnat_correct" >&5
++ echo "$as_me:18161: result: $cf_cv_prog_gnat_correct" >&5
+ echo "${ECHO_T}$cf_cv_prog_gnat_correct" >&6
+ fi
+ fi
+@@ -18175,7 +18183,7 @@ fi
+ ;;
+ esac
+
+-echo "$as_me:18178: checking if GNAT supports generics" >&5
++echo "$as_me:18186: checking if GNAT supports generics" >&5
+ echo $ECHO_N "checking if GNAT supports generics... $ECHO_C" >&6
+ case $cf_gnat_version in #(vi
+ 3.[1-9]*|[4-9].*) #(vi
+@@ -18185,7 +18193,7 @@ case $cf_gnat_version in #(vi
+ cf_gnat_generics=no
+ ;;
+ esac
+-echo "$as_me:18188: result: $cf_gnat_generics" >&5
++echo "$as_me:18196: result: $cf_gnat_generics" >&5
+ echo "${ECHO_T}$cf_gnat_generics" >&6
+
+ if test "$cf_gnat_generics" = yes
+@@ -18197,7 +18205,7 @@ else
+ cf_generic_objects=
+ fi
+
+-echo "$as_me:18200: checking if GNAT supports SIGINT" >&5
++echo "$as_me:18208: checking if GNAT supports SIGINT" >&5
+ echo $ECHO_N "checking if GNAT supports SIGINT... $ECHO_C" >&6
+ if test "${cf_cv_gnat_sigint+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18245,7 +18253,7 @@ fi
+ rm -rf conftest* *~conftest*
+
+ fi
+-echo "$as_me:18248: result: $cf_cv_gnat_sigint" >&5
++echo "$as_me:18256: result: $cf_cv_gnat_sigint" >&5
+ echo "${ECHO_T}$cf_cv_gnat_sigint" >&6
+
+ if test $cf_cv_gnat_sigint = yes ; then
+@@ -18254,7 +18262,7 @@ else
+ USE_GNAT_SIGINT="#"
+ fi
+
+-echo "$as_me:18257: checking if GNAT pragma Unreferenced works" >&5
++echo "$as_me:18265: checking if GNAT pragma Unreferenced works" >&5
+ echo $ECHO_N "checking if GNAT pragma Unreferenced works... $ECHO_C" >&6
+ if test "${cf_cv_pragma_unreferenced+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -18285,7 +18293,7 @@ fi
+ rm -rf conftest* *~conftest*
+
+ fi
+-echo "$as_me:18288: result: $cf_cv_pragma_unreferenced" >&5
++echo "$as_me:18296: result: $cf_cv_pragma_unreferenced" >&5
+ echo "${ECHO_T}$cf_cv_pragma_unreferenced" >&6
+
+ # if the pragma is supported, use it (needed in the Trace code).
+@@ -18298,7 +18306,7 @@ fi
+ cf_gnat_libraries=no
+ cf_gnat_projects=no
+
+-echo "$as_me:18301: checking if GNAT supports project files" >&5
++echo "$as_me:18309: checking if GNAT supports project files" >&5
+ echo $ECHO_N "checking if GNAT supports project files... $ECHO_C" >&6
+ case $cf_gnat_version in #(vi
+ 3.[0-9]*) #(vi
+@@ -18366,14 +18374,14 @@ CF_EOF
+ esac
+ ;;
+ esac
+-echo "$as_me:18369: result: $cf_gnat_projects" >&5
++echo "$as_me:18377: result: $cf_gnat_projects" >&5
+ echo "${ECHO_T}$cf_gnat_projects" >&6
+
+ if test $cf_gnat_projects = yes
+ then
+- echo "$as_me:18374: checking if GNAT supports libraries" >&5
++ echo "$as_me:18382: checking if GNAT supports libraries" >&5
+ echo $ECHO_N "checking if GNAT supports libraries... $ECHO_C" >&6
+- echo "$as_me:18376: result: $cf_gnat_libraries" >&5
++ echo "$as_me:18384: result: $cf_gnat_libraries" >&5
+ echo "${ECHO_T}$cf_gnat_libraries" >&6
+ fi
+
+@@ -18393,7 +18401,7 @@ else
+ USE_GNAT_LIBRARIES="#"
+ fi
+
+-echo "$as_me:18396: checking for ada-compiler" >&5
++echo "$as_me:18404: checking for ada-compiler" >&5
+ echo $ECHO_N "checking for ada-compiler... $ECHO_C" >&6
+
+ # Check whether --with-ada-compiler or --without-ada-compiler was given.
+@@ -18404,12 +18412,12 @@ else
+ cf_ada_compiler=gnatmake
+ fi;
+
+-echo "$as_me:18407: result: $cf_ada_compiler" >&5
++echo "$as_me:18415: result: $cf_ada_compiler" >&5
+ echo "${ECHO_T}$cf_ada_compiler" >&6
+
+ cf_ada_package=terminal_interface
+
+-echo "$as_me:18412: checking for ada-include" >&5
++echo "$as_me:18420: checking for ada-include" >&5
+ echo $ECHO_N "checking for ada-include... $ECHO_C" >&6
+
+ # Check whether --with-ada-include or --without-ada-include was given.
+@@ -18445,7 +18453,7 @@ case ".$withval" in #(vi
+ withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ *)
+- { { echo "$as_me:18448: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:18456: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -18454,10 +18462,10 @@ esac
+ fi
+ ADA_INCLUDE="$withval"
+
+-echo "$as_me:18457: result: $ADA_INCLUDE" >&5
++echo "$as_me:18465: result: $ADA_INCLUDE" >&5
+ echo "${ECHO_T}$ADA_INCLUDE" >&6
+
+-echo "$as_me:18460: checking for ada-objects" >&5
++echo "$as_me:18468: checking for ada-objects" >&5
+ echo $ECHO_N "checking for ada-objects... $ECHO_C" >&6
+
+ # Check whether --with-ada-objects or --without-ada-objects was given.
+@@ -18493,7 +18501,7 @@ case ".$withval" in #(vi
+ withval=`echo $withval | sed -e s%NONE%$cf_path_syntax%`
+ ;;
+ *)
+- { { echo "$as_me:18496: error: expected a pathname, not \"$withval\"" >&5
++ { { echo "$as_me:18504: error: expected a pathname, not \"$withval\"" >&5
+ echo "$as_me: error: expected a pathname, not \"$withval\"" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+@@ -18502,10 +18510,10 @@ esac
+ fi
+ ADA_OBJECTS="$withval"
+
+-echo "$as_me:18505: result: $ADA_OBJECTS" >&5
++echo "$as_me:18513: result: $ADA_OBJECTS" >&5
+ echo "${ECHO_T}$ADA_OBJECTS" >&6
+
+-echo "$as_me:18508: checking if an Ada95 shared-library should be built" >&5
++echo "$as_me:18516: checking if an Ada95 shared-library should be built" >&5
+ echo $ECHO_N "checking if an Ada95 shared-library should be built... $ECHO_C" >&6
+
+ # Check whether --with-ada-sharedlib or --without-ada-sharedlib was given.
+@@ -18515,7 +18523,7 @@ if test "${with_ada_sharedlib+set}" = se
+ else
+ with_ada_sharedlib=no
+ fi;
+-echo "$as_me:18518: result: $with_ada_sharedlib" >&5
++echo "$as_me:18526: result: $with_ada_sharedlib" >&5
+ echo "${ECHO_T}$with_ada_sharedlib" >&6
+
+ ADA_SHAREDLIB='lib$(LIB_NAME).so.1'
+@@ -18546,7 +18554,7 @@ fi
+ ### chooses to split module lists into libraries.
+ ###
+ ### (see CF_LIB_RULES).
+-echo "$as_me:18549: checking for library subsets" >&5
++echo "$as_me:18557: checking for library subsets" >&5
+ echo $ECHO_N "checking for library subsets... $ECHO_C" >&6
+ LIB_SUBSETS=
+
+@@ -18587,7 +18595,7 @@ fi
+ test "$with_widec" = yes && LIB_SUBSETS="${LIB_SUBSETS}+widechar"
+ test "$with_ext_funcs" = yes && LIB_SUBSETS="${LIB_SUBSETS}+ext_funcs"
+
+-echo "$as_me:18590: result: $LIB_SUBSETS" >&5
++echo "$as_me:18598: result: $LIB_SUBSETS" >&5
+ echo "${ECHO_T}$LIB_SUBSETS" >&6
+
+ ### Construct the list of include-directories to be generated
+@@ -18625,7 +18633,7 @@ elif test "$includedir" != "/usr/include
+ fi
+
+ ### Build up pieces for makefile rules
+-echo "$as_me:18628: checking default library suffix" >&5
++echo "$as_me:18636: checking default library suffix" >&5
+ echo $ECHO_N "checking default library suffix... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -18636,10 +18644,10 @@ echo $ECHO_N "checking default library s
+ shared) DFT_ARG_SUFFIX='' ;;
+ esac
+ test -n "$LIB_SUFFIX" && DFT_ARG_SUFFIX="${LIB_SUFFIX}${DFT_ARG_SUFFIX}"
+-echo "$as_me:18639: result: $DFT_ARG_SUFFIX" >&5
++echo "$as_me:18647: result: $DFT_ARG_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_ARG_SUFFIX" >&6
+
+-echo "$as_me:18642: checking default library-dependency suffix" >&5
++echo "$as_me:18650: checking default library-dependency suffix" >&5
+ echo $ECHO_N "checking default library-dependency suffix... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in #(vi
+@@ -18692,10 +18700,10 @@ echo $ECHO_N "checking default library-d
+ esac
+ test -n "$LIB_SUFFIX" && DFT_LIB_SUFFIX="${LIB_SUFFIX}${DFT_LIB_SUFFIX}"
+ test -n "$LIB_SUFFIX" && DFT_DEP_SUFFIX="${LIB_SUFFIX}${DFT_DEP_SUFFIX}"
+-echo "$as_me:18695: result: $DFT_DEP_SUFFIX" >&5
++echo "$as_me:18703: result: $DFT_DEP_SUFFIX" >&5
+ echo "${ECHO_T}$DFT_DEP_SUFFIX" >&6
+
+-echo "$as_me:18698: checking default object directory" >&5
++echo "$as_me:18706: checking default object directory" >&5
+ echo $ECHO_N "checking default object directory... $ECHO_C" >&6
+
+ case $DFT_LWR_MODEL in
+@@ -18711,12 +18719,12 @@ echo $ECHO_N "checking default object di
+ DFT_OBJ_SUBDIR='obj_s' ;;
+ esac
+ esac
+-echo "$as_me:18714: result: $DFT_OBJ_SUBDIR" >&5
++echo "$as_me:18722: result: $DFT_OBJ_SUBDIR" >&5
+ echo "${ECHO_T}$DFT_OBJ_SUBDIR" >&6
+
+ # libtool thinks it can make c++ shared libraries (perhaps only g++)
+ if test "$cf_with_cxx" = yes ; then
+-echo "$as_me:18719: checking c++ library-dependency suffix" >&5
++echo "$as_me:18727: checking c++ library-dependency suffix" >&5
+ echo $ECHO_N "checking c++ library-dependency suffix... $ECHO_C" >&6
+ if test "$with_libtool" != "no"; then
+ CXX_LIB_SUFFIX=$DFT_DEP_SUFFIX
+@@ -18773,7 +18781,7 @@ else
+ test -n "$LIB_SUFFIX" && CXX_LIB_SUFFIX="${LIB_SUFFIX}${CXX_LIB_SUFFIX}"
+ test -n "$LIB_SUFFIX" && CXX_DEP_SUFFIX="${LIB_SUFFIX}${CXX_DEP_SUFFIX}"
+ fi
+-echo "$as_me:18776: result: $CXX_LIB_SUFFIX" >&5
++echo "$as_me:18784: result: $CXX_LIB_SUFFIX" >&5
+ echo "${ECHO_T}$CXX_LIB_SUFFIX" >&6
+
+ fi
+@@ -18927,19 +18935,19 @@ fi
+
+ if test -n "$LDFLAGS_STATIC" && test -n "$LDFLAGS_SHARED"
+ then
+- echo "$as_me:18930: checking if linker supports switching between static/dynamic" >&5
++ echo "$as_me:18938: checking if linker supports switching between static/dynamic" >&5
+ echo $ECHO_N "checking if linker supports switching between static/dynamic... $ECHO_C" >&6
+
+ rm -f libconftest.a
+ cat >conftest.$ac_ext <<EOF
+-#line 18935 "configure"
++#line 18943 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp) { return fflush(fp); }
+ EOF
+- if { (eval echo "$as_me:18939: \"$ac_compile\"") >&5
++ if { (eval echo "$as_me:18947: \"$ac_compile\"") >&5
+ (eval $ac_compile) 2>&5
+ ac_status=$?
+- echo "$as_me:18942: \$? = $ac_status" >&5
++ echo "$as_me:18950: \$? = $ac_status" >&5
+ (exit $ac_status); } ; then
+ ( $AR $ARFLAGS libconftest.a conftest.o ) 2>&5 1>/dev/null
+ ( eval $RANLIB libconftest.a ) 2>&5 >/dev/null
+@@ -18950,10 +18958,10 @@ EOF
+
+ LIBS="$LDFLAGS_STATIC -L`pwd` -lconftest $LDFLAGS_DYNAMIC $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+-#line 18953 "configure"
++#line 18961 "configure"
+ #include "confdefs.h"
+
+-#line 18956 "configure"
++#line 18964 "configure"
+ #include <stdio.h>
+ int cf_ldflags_static(FILE *fp);
+
+@@ -18968,16 +18976,16 @@ main ()
+ }
+ _ACEOF
+ rm -f conftest.$ac_objext conftest$ac_exeext
+-if { (eval echo "$as_me:18971: \"$ac_link\"") >&5
++if { (eval echo "$as_me:18979: \"$ac_link\"") >&5
+ (eval $ac_link) 2>&5
+ ac_status=$?
+- echo "$as_me:18974: \$? = $ac_status" >&5
++ echo "$as_me:18982: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -s conftest$ac_exeext'
+- { (eval echo "$as_me:18977: \"$ac_try\"") >&5
++ { (eval echo "$as_me:18985: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+- echo "$as_me:18980: \$? = $ac_status" >&5
++ echo "$as_me:18988: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ cf_ldflags_static=yes
+ else
+@@ -18990,7 +18998,7 @@ rm -f conftest.$ac_objext conftest$ac_ex
+ rm -f libconftest.*
+ LIBS="$cf_save_LIBS"
+
+- echo "$as_me:18993: result: $cf_ldflags_static" >&5
++ echo "$as_me:19001: result: $cf_ldflags_static" >&5
+ echo "${ECHO_T}$cf_ldflags_static" >&6
+
+ if test $cf_ldflags_static != yes
+@@ -19006,12 +19014,12 @@ fi
+ ;;
+ esac
+
+-echo "$as_me:19009: checking where we will install curses.h" >&5
++echo "$as_me:19017: checking where we will install curses.h" >&5
+ echo $ECHO_N "checking where we will install curses.h... $ECHO_C" >&6
+ test "$with_overwrite" = no && \
+ test "x$includedir" = 'x${prefix}/include' && \
+ includedir='${prefix}/include/ncurses'${LIB_SUFFIX}
+-echo "$as_me:19014: result: $includedir" >&5
++echo "$as_me:19022: result: $includedir" >&5
+ echo "${ECHO_T}$includedir" >&6
+
+ ### Resolve a conflict between normal and wide-curses by forcing applications
+@@ -19019,7 +19027,7 @@ echo "${ECHO_T}$includedir" >&6
+ if test "$with_overwrite" != no ; then
+ if test "$NCURSES_LIBUTF8" = 1 ; then
+ NCURSES_LIBUTF8='defined(HAVE_LIBUTF8_H)'
+- { echo "$as_me:19022: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
++ { echo "$as_me:19030: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&5
+ echo "$as_me: WARNING: Wide-character applications must define HAVE_LIBUTF8_H to include curses.h" >&2;}
+ fi
+ fi
+@@ -19036,7 +19044,7 @@ EOF
+ ### Construct the list of subdirectories for which we'll customize makefiles
+ ### with the appropriate compile-rules.
+
+-echo "$as_me:19039: checking for src modules" >&5
++echo "$as_me:19047: checking for src modules" >&5
+ echo $ECHO_N "checking for src modules... $ECHO_C" >&6
+
+ # dependencies and linker-arguments for test-programs
+@@ -19099,7 +19107,7 @@ EOF
+ fi
+ fi
+ done
+-echo "$as_me:19102: result: $cf_cv_src_modules" >&5
++echo "$as_me:19110: result: $cf_cv_src_modules" >&5
+ echo "${ECHO_T}$cf_cv_src_modules" >&6
+
+ TEST_ARGS="-L${LIB_DIR} $TEST_ARGS"
+@@ -19305,7 +19313,7 @@ fi
+
+ # Extract the first word of "tic", so it can be a program name with args.
+ set dummy tic; ac_word=$2
+-echo "$as_me:19308: checking for $ac_word" >&5
++echo "$as_me:19316: checking for $ac_word" >&5
+ echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+ if test "${ac_cv_path_TIC_PATH+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+@@ -19322,7 +19330,7 @@ for ac_dir in $ac_dummy; do
+ test -z "$ac_dir" && ac_dir=.
+ if $as_executable_p "$ac_dir/$ac_word"; then
+ ac_cv_path_TIC_PATH="$ac_dir/$ac_word"
+- echo "$as_me:19325: found $ac_dir/$ac_word" >&5
++ echo "$as_me:19333: found $ac_dir/$ac_word" >&5
+ break
+ fi
+ done
+@@ -19334,10 +19342,10 @@ fi
+ TIC_PATH=$ac_cv_path_TIC_PATH
+
+ if test -n "$TIC_PATH"; then
+- echo "$as_me:19337: result: $TIC_PATH" >&5
++ echo "$as_me:19345: result: $TIC_PATH" >&5
+ echo "${ECHO_T}$TIC_PATH" >&6
+ else
+- echo "$as_me:19340: result: no" >&5
++ echo "$as_me:19348: result: no" >&5
+ echo "${ECHO_T}no" >&6
+ fi
+
+@@ -19345,7 +19353,7 @@ if test -n "$FALLBACK_LIST"
+ then
+ if test "$TIC_PATH" = unknown
+ then
+- { echo "$as_me:19348: WARNING: no tic program found for fallbacks" >&5
++ { echo "$as_me:19356: WARNING: no tic program found for fallbacks" >&5
+ echo "$as_me: WARNING: no tic program found for fallbacks" >&2;}
+ fi
+ fi
+@@ -19446,7 +19454,7 @@ DEFS=-DHAVE_CONFIG_H
+ : ${CONFIG_STATUS=./config.status}
+ ac_clean_files_save=$ac_clean_files
+ ac_clean_files="$ac_clean_files $CONFIG_STATUS"
+-{ echo "$as_me:19449: creating $CONFIG_STATUS" >&5
++{ echo "$as_me:19457: creating $CONFIG_STATUS" >&5
+ echo "$as_me: creating $CONFIG_STATUS" >&6;}
+ cat >$CONFIG_STATUS <<_ACEOF
+ #! $SHELL
+@@ -19622,7 +19630,7 @@ cat >>$CONFIG_STATUS <<\EOF
+ echo "$ac_cs_version"; exit 0 ;;
+ --he | --h)
+ # Conflict between --help and --header
+- { { echo "$as_me:19625: error: ambiguous option: $1
++ { { echo "$as_me:19633: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: ambiguous option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -19641,7 +19649,7 @@ Try \`$0 --help' for more information."
+ ac_need_defaults=false;;
+
+ # This is an error.
+- -*) { { echo "$as_me:19644: error: unrecognized option: $1
++ -*) { { echo "$as_me:19652: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&5
+ echo "$as_me: error: unrecognized option: $1
+ Try \`$0 --help' for more information." >&2;}
+@@ -19747,7 +19755,7 @@ do
+ "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
+ "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;;
+ "include/ncurses_cfg.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/ncurses_cfg.h:include/ncurses_cfg.hin" ;;
+- *) { { echo "$as_me:19750: error: invalid argument: $ac_config_target" >&5
++ *) { { echo "$as_me:19758: error: invalid argument: $ac_config_target" >&5
+ echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
+ { (exit 1); exit 1; }; };;
+ esac
+@@ -20157,7 +20165,7 @@ done; }
+ esac
+
+ if test x"$ac_file" != x-; then
+- { echo "$as_me:20160: creating $ac_file" >&5
++ { echo "$as_me:20168: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+ rm -f "$ac_file"
+ fi
+@@ -20175,7 +20183,7 @@ echo "$as_me: creating $ac_file" >&6;}
+ -) echo $tmp/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:20178: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:20186: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -20188,7 +20196,7 @@ echo "$as_me: error: cannot find input f
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+- { { echo "$as_me:20191: error: cannot find input file: $f" >&5
++ { { echo "$as_me:20199: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -20254,7 +20262,7 @@ for ac_file in : $CONFIG_HEADERS; do tes
+ * ) ac_file_in=$ac_file.in ;;
+ esac
+
+- test x"$ac_file" != x- && { echo "$as_me:20257: creating $ac_file" >&5
++ test x"$ac_file" != x- && { echo "$as_me:20265: creating $ac_file" >&5
+ echo "$as_me: creating $ac_file" >&6;}
+
+ # First look for the input files in the build tree, otherwise in the
+@@ -20265,7 +20273,7 @@ echo "$as_me: creating $ac_file" >&6;}
+ -) echo $tmp/stdin ;;
+ [\\/$]*)
+ # Absolute (can't be DOS-style, as IFS=:)
+- test -f "$f" || { { echo "$as_me:20268: error: cannot find input file: $f" >&5
++ test -f "$f" || { { echo "$as_me:20276: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ echo $f;;
+@@ -20278,7 +20286,7 @@ echo "$as_me: error: cannot find input f
+ echo $srcdir/$f
+ else
+ # /dev/null tree
+- { { echo "$as_me:20281: error: cannot find input file: $f" >&5
++ { { echo "$as_me:20289: error: cannot find input file: $f" >&5
+ echo "$as_me: error: cannot find input file: $f" >&2;}
+ { (exit 1); exit 1; }; }
+ fi;;
+@@ -20336,7 +20344,7 @@ cat >>$CONFIG_STATUS <<\EOF
+ rm -f $tmp/in
+ if test x"$ac_file" != x-; then
+ if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
+- { echo "$as_me:20339: $ac_file is unchanged" >&5
++ { echo "$as_me:20347: $ac_file is unchanged" >&5
+ echo "$as_me: $ac_file is unchanged" >&6;}
+ else
+ ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff --git a/examples/ncurses/tinfo.p5m b/examples/ncurses/tinfo.p5m
new file mode 100644
index 0000000..9021c76
--- /dev/null
+++ b/examples/ncurses/tinfo.p5m
@@ -0,0 +1,16 @@
+set name=pkg.fmri value=pkg:/library/tinfo@$(ips-version)
+set name=pkg.summary value="$(summary), library for the low-level terminfo library"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+depend fmri=pkg:/library/tinfo5@$(ips-version) type=require
+depend fmri=pkg:/library/tinfo5@$(ips-version) type=incorporate
+
+file path=usr/lib/pkgconfig/tic.pc
+file path=usr/lib/pkgconfig/tinfo.pc
+link path=usr/lib/$(mach64)/libtic.so target=libtic.so.5
+link path=usr/lib/$(mach64)/libtinfo.so target=libtinfo.so.5
+link path=usr/lib/libtic.so target=libtic.so.5
+link path=usr/lib/libtinfo.so target=libtinfo.so.5
diff --git a/examples/ncurses/tinfo5.p5m b/examples/ncurses/tinfo5.p5m
new file mode 100644
index 0000000..5b2bc66
--- /dev/null
+++ b/examples/ncurses/tinfo5.p5m
@@ -0,0 +1,15 @@
+set name=pkg.fmri value=pkg:/library/tinfo5@$(ips-version)
+set name=pkg.summary value="$(summary), shared low-level terminfo library for terminal handling"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+file path=usr/lib/$(mach64)/libtic.so.5.9
+file path=usr/lib/$(mach64)/libtinfo.so.5.9
+file path=usr/lib/libtic.so.5.9
+file path=usr/lib/libtinfo.so.5.9
+link path=usr/lib/$(mach64)/libtic.so.5 target=libtic.so.5.9
+link path=usr/lib/$(mach64)/libtinfo.so.5 target=libtinfo.so.5.9
+link path=usr/lib/libtic.so.5 target=libtic.so.5.9
+link path=usr/lib/libtinfo.so.5 target=libtinfo.so.5.9
diff --git a/examples/nodejs/Makefile b/examples/nodejs/Makefile
new file mode 100644
index 0000000..bf478c7
--- /dev/null
+++ b/examples/nodejs/Makefile
@@ -0,0 +1,45 @@
+include /usr/share/cibs/rules/ips.mk
+include /usr/share/cibs/rules/archive.mk
+include /usr/share/cibs/rules/patch.mk
+include /usr/share/cibs/rules/copy.mk
+include /usr/share/cibs/rules/64.mk
+# Not autotools, but similar:
+include /usr/share/cibs/rules/autotools.mk
+
+# Must run from the current directory:
+configure := ./configure
+
+# Flock wrapper even does not return error on failure:
+export LINK = $(CXX)
+
+name := nodejs
+version := 0.8.15
+home := http://nodejs.org
+archive := node-v$(version).tar.gz
+download := http://nodejs.org/dist/v$(version)/$(archive)
+checksum := \
+ md5:6cb31180b07475db103e694f65e8bb9b \
+ sha1:a7874cde1a87497992f1f8ea0fdaa760f617a94f \
+ sha256:1758639c6df3e081fe26585472d0f1961c5703b44ba6c57ecdf66a4c015792b1 \
+ size:11867033
+
+summary := event-based server-side javascript engine
+license := BSD
+license-file := LICENSE
+
+build-depends += \
+ library/libv8 \
+ library/c-ares \
+ library/libev \
+ library/openssl
+
+# Node.js configure is a autotools lookalike confuserator:
+configure-options := \
+ --dest-os=solaris \
+ --prefix=/usr \
+ --without-npm \
+ --shared-v8 \
+ --shared-zlib \
+ --shared-openssl \
+ --no-ssl2
+
diff --git a/examples/nodejs/developer-nodejs.p5m b/examples/nodejs/developer-nodejs.p5m
new file mode 100644
index 0000000..58a22cc
--- /dev/null
+++ b/examples/nodejs/developer-nodejs.p5m
@@ -0,0 +1,110 @@
+set name=pkg.fmri value=pkg:/developer/$(name)@$(ips-version)
+set name=pkg.summary value="$(summary), developer files"
+set name=pkg.description value="Contain Node.js header and node-waf utility. \
+Install this package if you want to write Node.js bindings"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+
+license $(license-file) license="$(license)"
+
+# FIXME: Versions ?
+depend fmri=pkg:/library/libv8 type=require
+depend fmri=pkg:/library/c-ares type=require
+depend fmri=pkg:/library/libev type=require
+depend fmri=pkg:/library/openssl type=require
+
+depend fmri=pkg:/runtime/nodejs@$(ips-version) type=require
+depend fmri=pkg:/runtime/nodejs@$(ips-version) type=incorporate
+
+
+# Move headers into usr/include/nodejs:
+<transform dir -> edit path /node /nodejs >
+<transform file path=(.+/include)/node/(.+) -> \
+ emit file %<1>/node/%<2> path=%<1>/nodejs/%<2> >
+<transform file path=(.+/include)/node/(.+) -> \
+ drop >
+
+dir path=usr/include
+dir path=usr/include/node
+dir path=usr/include/node/uv-private
+file path=usr/include/node/uv-private/uv-unix.h
+file path=usr/include/node/uv-private/eio.h
+file path=usr/include/node/uv-private/ngx-queue.h
+file path=usr/include/node/uv-private/ev.h
+file path=usr/include/node/uv-private/uv-win.h
+file path=usr/include/node/uv-private/tree.h
+file path=usr/include/node/eio-emul.h
+file path=usr/include/node/node.h
+file path=usr/include/node/node_buffer.h
+file path=usr/include/node/ev-emul.h
+file path=usr/include/node/node_object_wrap.h
+file path=usr/include/node/node_version.h
+file path=usr/include/node/uv.h
+
+# Move WAF into usr/share/nodejs:
+<transform dir -> edit path /lib/node/ /share/nodejs/ >
+<transform file path=(.+/lib)/node/(.+) -> \
+ emit file %<1>/node/%<2> path=usr/share/nodejs/%<2> >
+<transform file path=(.+/lib)/node/(.+) -> \
+ drop >
+
+<transform dir file path=.+/wafadmin/.+ -> \
+ default facet.devel true>
+
+dir path=usr/lib/node/wafadmin
+dir path=usr/lib/node/wafadmin/Tools
+file path=usr/lib/node/wafadmin/pproc.py
+file path=usr/lib/node/wafadmin/py3kfixes.py
+file path=usr/lib/node/wafadmin/TaskGen.py
+file path=usr/lib/node/wafadmin/__init__.py
+file path=usr/lib/node/wafadmin/Logs.py
+file path=usr/lib/node/wafadmin/Task.py
+file path=usr/lib/node/wafadmin/Configure.py
+file path=usr/lib/node/wafadmin/Build.py
+file path=usr/lib/node/wafadmin/Scripting.py
+file path=usr/lib/node/wafadmin/Utils.py
+file path=usr/lib/node/wafadmin/ansiterm.py
+file path=usr/lib/node/wafadmin/Runner.py
+file path=usr/lib/node/wafadmin/Tools/compiler_d.py
+file path=usr/lib/node/wafadmin/Tools/winres.py
+file path=usr/lib/node/wafadmin/Tools/compiler_cc.py
+file path=usr/lib/node/wafadmin/Tools/nasm.py
+file path=usr/lib/node/wafadmin/Tools/xlcxx.py
+file path=usr/lib/node/wafadmin/Tools/preproc.py
+file path=usr/lib/node/wafadmin/Tools/icpc.py
+file path=usr/lib/node/wafadmin/Tools/gdc.py
+file path=usr/lib/node/wafadmin/Tools/unittestw.py
+file path=usr/lib/node/wafadmin/Tools/gcc.py
+file path=usr/lib/node/wafadmin/Tools/osx.py
+file path=usr/lib/node/wafadmin/Tools/node_addon.py
+file path=usr/lib/node/wafadmin/Tools/cc.py
+file path=usr/lib/node/wafadmin/Tools/d.py
+file path=usr/lib/node/wafadmin/Tools/config_c.py
+file path=usr/lib/node/wafadmin/Tools/ar.py
+file path=usr/lib/node/wafadmin/Tools/ccroot.py
+file path=usr/lib/node/wafadmin/Tools/suncc.py
+file path=usr/lib/node/wafadmin/Tools/intltool.py
+file path=usr/lib/node/wafadmin/Tools/gas.py
+file path=usr/lib/node/wafadmin/Tools/compiler_cxx.py
+file path=usr/lib/node/wafadmin/Tools/icc.py
+file path=usr/lib/node/wafadmin/Tools/dmd.py
+file path=usr/lib/node/wafadmin/Tools/libtool.py
+file path=usr/lib/node/wafadmin/Tools/__init__.py
+file path=usr/lib/node/wafadmin/Tools/python.py
+file path=usr/lib/node/wafadmin/Tools/xlc.py
+file path=usr/lib/node/wafadmin/Tools/misc.py
+file path=usr/lib/node/wafadmin/Tools/gxx.py
+file path=usr/lib/node/wafadmin/Tools/suncxx.py
+file path=usr/lib/node/wafadmin/Tools/gob2.py
+file path=usr/lib/node/wafadmin/Tools/cxx.py
+file path=usr/lib/node/wafadmin/Tools/gnu_dirs.py
+file path=usr/lib/node/wafadmin/Node.py
+file path=usr/lib/node/wafadmin/Environment.py
+file path=usr/lib/node/wafadmin/Options.py
+file path=usr/lib/node/wafadmin/Constants.py
+
+# Do not bother with python version:
+file path=usr/bin/node-waf \
+ pkg.depend.bypass-generate=.* \
+ facet.devel=true
+
diff --git a/examples/nodejs/patches/01-shared-c-ares.patch b/examples/nodejs/patches/01-shared-c-ares.patch
new file mode 100644
index 0000000..220f2c7
--- /dev/null
+++ b/examples/nodejs/patches/01-shared-c-ares.patch
@@ -0,0 +1,288 @@
+diff -dubr source/configure cares/configure
+--- source/configure 2012-10-26 00:49:32.000000000 +0400
++++ cares/configure 2012-11-01 21:18:15.766658414 +0400
+@@ -460,6 +460,8 @@
+ 'cflags': [],
+ }
+
++output['libraries'] += ['-lcares']
++
+ configure_node(output)
+ configure_libz(output)
+ configure_v8(output)
+diff -dubr source/deps/uv/config-unix.mk cares/deps/uv/config-unix.mk
+--- source/deps/uv/config-unix.mk 2012-10-26 00:49:32.000000000 +0400
++++ cares/deps/uv/config-unix.mk 2012-11-01 21:24:35.522262825 +0400
+@@ -47,7 +47,7 @@
+ ifeq (SunOS,$(uname_S))
+ EV_CONFIG=config_sunos.h
+ EIO_CONFIG=config_sunos.h
+-CPPFLAGS += -Isrc/ares/config_sunos -D__EXTENSIONS__ -D_XOPEN_SOURCE=500
++CPPFLAGS += -D__EXTENSIONS__ -D_XOPEN_SOURCE=500
+ LINKFLAGS+=-lsocket -lnsl -lkstat
+ OBJS += src/unix/sunos.o
+ endif
+@@ -65,7 +65,6 @@
+ EV_CONFIG=config_linux.h
+ EIO_CONFIG=config_linux.h
+ CSTDFLAG += -D_GNU_SOURCE
+-CPPFLAGS += -Isrc/ares/config_linux
+ LINKFLAGS+=-ldl -lrt
+ OBJS += src/unix/linux/linux-core.o \
+ src/unix/linux/inotify.o \
+@@ -75,7 +74,6 @@
+ ifeq (FreeBSD,$(uname_S))
+ EV_CONFIG=config_freebsd.h
+ EIO_CONFIG=config_freebsd.h
+-CPPFLAGS += -Isrc/ares/config_freebsd
+ LINKFLAGS+=-lkvm
+ OBJS += src/unix/freebsd.o
+ OBJS += src/unix/kqueue.o
+@@ -84,7 +82,6 @@
+ ifeq (DragonFly,$(uname_S))
+ EV_CONFIG=config_freebsd.h
+ EIO_CONFIG=config_freebsd.h
+-CPPFLAGS += -Isrc/ares/config_freebsd
+ LINKFLAGS+=
+ OBJS += src/unix/freebsd.o
+ OBJS += src/unix/kqueue.o
+@@ -93,7 +90,6 @@
+ ifeq (NetBSD,$(uname_S))
+ EV_CONFIG=config_netbsd.h
+ EIO_CONFIG=config_netbsd.h
+-CPPFLAGS += -Isrc/ares/config_netbsd
+ LINKFLAGS+=
+ OBJS += src/unix/netbsd.o
+ OBJS += src/unix/kqueue.o
+@@ -102,7 +98,6 @@
+ ifeq (OpenBSD,$(uname_S))
+ EV_CONFIG=config_openbsd.h
+ EIO_CONFIG=config_openbsd.h
+-CPPFLAGS += -Isrc/ares/config_openbsd
+ LINKFLAGS+=-lkvm
+ OBJS += src/unix/openbsd.o
+ OBJS += src/unix/kqueue.o
+@@ -113,7 +108,6 @@
+ EIO_CONFIG=config_cygwin.h
+ # We drop the --std=c89, it hides CLOCK_MONOTONIC on cygwin
+ CSTDFLAG = -D_GNU_SOURCE
+-CPPFLAGS += -Isrc/ares/config_cygwin
+ LINKFLAGS+=
+ OBJS += src/unix/cygwin.o
+ endif
+@@ -131,7 +125,7 @@
+ RUNNER_LIBS=
+ RUNNER_SRC=test/runner-unix.c
+
+-uv.a: $(OBJS) src/cares.o src/fs-poll.o src/uv-common.o src/unix/ev/ev.o src/unix/uv-eio.o src/unix/eio/eio.o $(CARES_OBJS)
++uv.a: $(OBJS) src/cares.o src/fs-poll.o src/uv-common.o src/unix/ev/ev.o src/unix/uv-eio.o src/unix/eio/eio.o
+ $(AR) rcs uv.a $^
+
+ src/%.o: src/%.c include/uv.h include/uv-private/uv-unix.h
+@@ -157,7 +151,6 @@
+
+
+ clean-platform:
+- -rm -f src/ares/*.o
+ -rm -f src/unix/*.o
+ -rm -f src/unix/ev/*.o
+ -rm -f src/unix/eio/*.o
+@@ -165,7 +158,6 @@
+ -rm -rf test/run-tests.dSYM run-benchmarks.dSYM
+
+ distclean-platform:
+- -rm -f src/ares/*.o
+ -rm -f src/unix/*.o
+ -rm -f src/unix/ev/*.o
+ -rm -f src/unix/eio/*.o
+diff -dubr source/deps/uv/include/uv.h cares/deps/uv/include/uv.h
+--- source/deps/uv/include/uv.h 2012-10-26 00:49:32.000000000 +0400
++++ cares/deps/uv/include/uv.h 2012-11-01 21:17:00.331361102 +0400
+@@ -55,7 +55,7 @@
+ #include <stdint.h> /* int64_t */
+ #include <sys/types.h> /* size_t */
+
+-#include "ares.h"
++#include <ares.h>
+
+ #if defined(__unix__) || defined(__POSIX__) || defined(__APPLE__)
+ # include "uv-private/uv-unix.h"
+diff -dubr source/deps/uv/Makefile cares/deps/uv/Makefile
+--- source/deps/uv/Makefile 2012-10-26 00:49:32.000000000 +0400
++++ cares/deps/uv/Makefile 2012-11-01 21:19:24.730021729 +0400
+@@ -26,51 +26,6 @@
+
+ CPPFLAGS += -Iinclude -Iinclude/uv-private
+
+-CARES_OBJS =
+-CARES_OBJS += src/ares/ares__close_sockets.o
+-CARES_OBJS += src/ares/ares__get_hostent.o
+-CARES_OBJS += src/ares/ares__read_line.o
+-CARES_OBJS += src/ares/ares__timeval.o
+-CARES_OBJS += src/ares/ares_cancel.o
+-CARES_OBJS += src/ares/ares_data.o
+-CARES_OBJS += src/ares/ares_destroy.o
+-CARES_OBJS += src/ares/ares_expand_name.o
+-CARES_OBJS += src/ares/ares_expand_string.o
+-CARES_OBJS += src/ares/ares_fds.o
+-CARES_OBJS += src/ares/ares_free_hostent.o
+-CARES_OBJS += src/ares/ares_free_string.o
+-CARES_OBJS += src/ares/ares_gethostbyaddr.o
+-CARES_OBJS += src/ares/ares_gethostbyname.o
+-CARES_OBJS += src/ares/ares_getnameinfo.o
+-CARES_OBJS += src/ares/ares_getopt.o
+-CARES_OBJS += src/ares/ares_getsock.o
+-CARES_OBJS += src/ares/ares_init.o
+-CARES_OBJS += src/ares/ares_library_init.o
+-CARES_OBJS += src/ares/ares_llist.o
+-CARES_OBJS += src/ares/ares_mkquery.o
+-CARES_OBJS += src/ares/ares_nowarn.o
+-CARES_OBJS += src/ares/ares_options.o
+-CARES_OBJS += src/ares/ares_parse_a_reply.o
+-CARES_OBJS += src/ares/ares_parse_aaaa_reply.o
+-CARES_OBJS += src/ares/ares_parse_mx_reply.o
+-CARES_OBJS += src/ares/ares_parse_ns_reply.o
+-CARES_OBJS += src/ares/ares_parse_ptr_reply.o
+-CARES_OBJS += src/ares/ares_parse_srv_reply.o
+-CARES_OBJS += src/ares/ares_parse_txt_reply.o
+-CARES_OBJS += src/ares/ares_process.o
+-CARES_OBJS += src/ares/ares_query.o
+-CARES_OBJS += src/ares/ares_search.o
+-CARES_OBJS += src/ares/ares_send.o
+-CARES_OBJS += src/ares/ares_strcasecmp.o
+-CARES_OBJS += src/ares/ares_strdup.o
+-CARES_OBJS += src/ares/ares_strerror.o
+-CARES_OBJS += src/ares/ares_timeout.o
+-CARES_OBJS += src/ares/ares_version.o
+-CARES_OBJS += src/ares/ares_writev.o
+-CARES_OBJS += src/ares/bitncmp.o
+-CARES_OBJS += src/ares/inet_net_pton.o
+-CARES_OBJS += src/ares/inet_ntop.o
+-
+ ifneq (,$(findstring MINGW,$(uname_S)))
+ include config-mingw.mk
+ else
+@@ -82,9 +37,6 @@
+
+ all: uv.a
+
+-$(CARES_OBJS): %.o: %.c
+- $(CC) -o $*.o -c $(CFLAGS) $(CPPFLAGS) $< -DHAVE_CONFIG_H
+-
+ test/run-tests$(E): test/*.h test/run-tests.c $(RUNNER_SRC) test/runner-unix.c $(TESTS) uv.a
+ $(CC) $(CPPFLAGS) $(RUNNER_CFLAGS) -o test/run-tests test/run-tests.c \
+ test/runner.c $(RUNNER_SRC) $(TESTS) uv.a $(RUNNER_LIBS) $(RUNNER_LINKFLAGS)
+diff -dubr source/deps/uv/src/uv-common.c cares/deps/uv/src/uv-common.c
+--- source/deps/uv/src/uv-common.c 2012-10-26 00:49:32.000000000 +0400
++++ cares/deps/uv/src/uv-common.c 2012-11-01 21:17:00.332151637 +0400
+@@ -28,10 +28,8 @@
+ #include <stdlib.h> /* malloc */
+ #include <string.h> /* memset */
+
+-/* use inet_pton from c-ares if necessary */
+-#include "ares_config.h"
+-#include "ares/inet_net_pton.h"
+-#include "ares/inet_ntop.h"
++#include <ares.h>
++#include <arpa/inet.h>
+
+ #define XX(uc, lc) case UV_##uc: return sizeof(uv_##lc##_t);
+
+@@ -182,20 +180,20 @@
+
+ addr.sin6_family = AF_INET6;
+ addr.sin6_port = htons(port);
+- ares_inet_pton(AF_INET6, ip, &addr.sin6_addr);
++ inet_pton(AF_INET6, ip, &addr.sin6_addr);
+
+ return addr;
+ }
+
+
+ int uv_ip4_name(struct sockaddr_in* src, char* dst, size_t size) {
+- const char* d = ares_inet_ntop(AF_INET, &src->sin_addr, dst, size);
++ const char* d = inet_ntop(AF_INET, &src->sin_addr, dst, size);
+ return d != dst;
+ }
+
+
+ int uv_ip6_name(struct sockaddr_in6* src, char* dst, size_t size) {
+- const char* d = ares_inet_ntop(AF_INET6, &src->sin6_addr, dst, size);
++ const char* d = inet_ntop(AF_INET6, &src->sin6_addr, dst, size);
+ return d != dst;
+ }
+
+diff -dubr source/deps/uv/uv.gyp cares/deps/uv/uv.gyp
+--- source/deps/uv/uv.gyp 2012-10-26 00:49:32.000000000 +0400
++++ cares/deps/uv/uv.gyp 2012-11-01 21:17:00.332535345 +0400
+@@ -53,70 +53,6 @@
+ 'src/fs-poll.c',
+ 'src/uv-common.c',
+ 'src/uv-common.h',
+- 'src/ares/ares_cancel.c',
+- 'src/ares/ares__close_sockets.c',
+- 'src/ares/ares_data.c',
+- 'src/ares/ares_data.h',
+- 'src/ares/ares_destroy.c',
+- 'src/ares/ares_dns.h',
+- 'src/ares/ares_expand_name.c',
+- 'src/ares/ares_expand_string.c',
+- 'src/ares/ares_fds.c',
+- 'src/ares/ares_free_hostent.c',
+- 'src/ares/ares_free_string.c',
+- 'src/ares/ares_getenv.h',
+- 'src/ares/ares_gethostbyaddr.c',
+- 'src/ares/ares_gethostbyname.c',
+- 'src/ares/ares__get_hostent.c',
+- 'src/ares/ares_getnameinfo.c',
+- 'src/ares/ares_getopt.c',
+- 'src/ares/ares_getopt.h',
+- 'src/ares/ares_getsock.c',
+- 'src/ares/ares_init.c',
+- 'src/ares/ares_ipv6.h',
+- 'src/ares/ares_library_init.c',
+- 'src/ares/ares_library_init.h',
+- 'src/ares/ares_llist.c',
+- 'src/ares/ares_llist.h',
+- 'src/ares/ares_mkquery.c',
+- 'src/ares/ares_nowarn.c',
+- 'src/ares/ares_nowarn.h',
+- 'src/ares/ares_options.c',
+- 'src/ares/ares_parse_aaaa_reply.c',
+- 'src/ares/ares_parse_a_reply.c',
+- 'src/ares/ares_parse_mx_reply.c',
+- 'src/ares/ares_parse_ns_reply.c',
+- 'src/ares/ares_parse_ptr_reply.c',
+- 'src/ares/ares_parse_srv_reply.c',
+- 'src/ares/ares_parse_txt_reply.c',
+- 'src/ares/ares_platform.h',
+- 'src/ares/ares_private.h',
+- 'src/ares/ares_process.c',
+- 'src/ares/ares_query.c',
+- 'src/ares/ares__read_line.c',
+- 'src/ares/ares_rules.h',
+- 'src/ares/ares_search.c',
+- 'src/ares/ares_send.c',
+- 'src/ares/ares_setup.h',
+- 'src/ares/ares_strcasecmp.c',
+- 'src/ares/ares_strcasecmp.h',
+- 'src/ares/ares_strdup.c',
+- 'src/ares/ares_strdup.h',
+- 'src/ares/ares_strerror.c',
+- 'src/ares/ares_timeout.c',
+- 'src/ares/ares__timeval.c',
+- 'src/ares/ares_version.c',
+- 'src/ares/ares_writev.c',
+- 'src/ares/ares_writev.h',
+- 'src/ares/bitncmp.c',
+- 'src/ares/bitncmp.h',
+- 'src/ares/inet_net_pton.c',
+- 'src/ares/inet_net_pton.h',
+- 'src/ares/inet_ntop.c',
+- 'src/ares/inet_ntop.h',
+- 'src/ares/nameser.h',
+- 'src/ares/setup_once.h',
+- 'src/ares/windows_port.c',
+ ],
+ 'conditions': [
+ [ 'OS=="win"', {
diff --git a/examples/nodejs/patches/02-rename-node-to-nodejs.patch b/examples/nodejs/patches/02-rename-node-to-nodejs.patch
new file mode 100644
index 0000000..8e6c9e5
--- /dev/null
+++ b/examples/nodejs/patches/02-rename-node-to-nodejs.patch
@@ -0,0 +1,34 @@
+diff -dubr source/doc/node.1 rename/doc/node.1
+--- source/doc/node.1 2012-10-26 00:49:56.000000000 +0400
++++ rename/doc/node.1 2012-11-01 21:57:48.271896703 +0400
+@@ -2,12 +2,12 @@
+
+
+ .SH "NAME"
+-node \- Server-side JavaScript
++nodejs \- Server-side JavaScript
+
+ .SH SYNOPSIS
+
+
+-.B node
++.B nodejs
+ [
+ .B \-v
+ ]
+diff -dubr source/tools/wafadmin/Tools/node_addon.py rename/tools/wafadmin/Tools/node_addon.py
+--- source/tools/wafadmin/Tools/node_addon.py 2012-10-26 00:49:32.000000000 +0400
++++ rename/tools/wafadmin/Tools/node_addon.py 2012-11-01 21:59:05.441880615 +0400
+@@ -26,10 +26,10 @@
+ conf.env['PREFIX_NODE'] = get_prefix()
+ prefix = conf.env['PREFIX_NODE']
+ lib = join(prefix, 'lib')
+- nodebin = join(prefix, 'bin', 'node')
++ nodebin = join(prefix, 'bin', 'nodejs')
+
+ conf.env['LIBPATH_NODE'] = lib
+- conf.env['CPPPATH_NODE'] = join(prefix, 'include', 'node')
++ conf.env['CPPPATH_NODE'] = join(prefix, 'include', 'nodejs')
+
+ conf.env.append_value('CPPFLAGS_NODE', '-D_GNU_SOURCE')
+
diff --git a/examples/nodejs/patches/03-waf.patch b/examples/nodejs/patches/03-waf.patch
new file mode 100644
index 0000000..0eda3dc
--- /dev/null
+++ b/examples/nodejs/patches/03-waf.patch
@@ -0,0 +1,16 @@
+diff -dubr source/tools/node-waf waf/tools/node-waf
+--- source/tools/node-waf 2012-10-26 00:49:32.000000000 +0400
++++ waf/tools/node-waf 2012-11-01 23:20:51.438482412 +0400
+@@ -5,7 +5,11 @@
+ join = os.path.join
+ bindir = os.path.dirname(os.path.realpath(__file__))
+ prefix = join(bindir, "..")
+-wafdir = join(prefix, "lib", "node")
++if os.environ.has_key('PREFIX_NODE'):
++ prefix = os.environ['PREFIX_NODE']
++else:
++ prefix = "/usr"
++wafdir = join(prefix, "share", "nodejs")
+
+ w = join(wafdir, 'wafadmin')
+ t = join(w, 'Tools')
diff --git a/examples/nodejs/patches/04-lib-path.patch b/examples/nodejs/patches/04-lib-path.patch
new file mode 100644
index 0000000..c3ff124
--- /dev/null
+++ b/examples/nodejs/patches/04-lib-path.patch
@@ -0,0 +1,24 @@
+diff -dubr source/lib/module.js libpath/lib/module.js
+--- source/lib/module.js 2012-10-26 00:49:32.000000000 +0400
++++ libpath/lib/module.js 2012-11-01 23:30:34.638509805 +0400
+@@ -493,7 +493,7 @@
+ };
+
+ Module._initPaths = function() {
+- var paths = [path.resolve(process.execPath, '..', '..', 'lib', 'node')];
++ var paths = ['/usr/lib/nodejs'];
+
+ if (process.env['HOME']) {
+ paths.unshift(path.resolve(process.env['HOME'], '.node_libraries'));
+diff -dubr source/tools/wafadmin/Tools/node_addon.py libpath/tools/wafadmin/Tools/node_addon.py
+--- source/tools/wafadmin/Tools/node_addon.py 2012-11-01 23:22:54.032306132 +0400
++++ libpath/tools/wafadmin/Tools/node_addon.py 2012-11-01 23:29:37.203544596 +0400
+@@ -70,7 +70,7 @@
+ nodePath = None
+ if not os.environ.has_key('NODE_PATH'):
+ if not os.environ.has_key('HOME'):
+- nodePath = join(get_prefix(), 'lib', 'node')
++ nodePath = join(get_prefix(), 'lib', 'nodejs')
+ else:
+ nodePath = join(os.environ['HOME'], '.node_libraries')
+ else:
diff --git a/examples/nodejs/runtime-nodejs.p5m b/examples/nodejs/runtime-nodejs.p5m
new file mode 100644
index 0000000..cf678bd
--- /dev/null
+++ b/examples/nodejs/runtime-nodejs.p5m
@@ -0,0 +1,13 @@
+set name=pkg.fmri value=pkg:/runtime/$(name)@$(ips-version)
+set name=pkg.summary value="$(summary)"
+set name=info.upstream-url value="$(home)"
+set name=info.source-url value="$(download)"
+license $(license-file) license="$(license)"
+
+
+dir path=usr/lib/nodejs
+file usr/bin/node path=usr/bin/nodejs
+link path=usr/bin/node target=nodejs
+file usr/share/man/man1/node.1 path=usr/share/man/man1/nodejs.1
+link path=usr/share/man/man1/node.1 target=nodejs.1
+
diff --git a/examples/openpgm/Makefile b/examples/openpgm/Makefile
deleted file mode 100644
index 534f229..0000000
--- a/examples/openpgm/Makefile
+++ /dev/null
@@ -1,26 +0,0 @@
-include /usr/share/cibs/rules/ips.mk
-include /usr/share/cibs/rules/archive.mk
-include /usr/share/cibs/rules/patch.mk
-include /usr/share/cibs/rules/autoreconf.mk
-include /usr/share/cibs/rules/autotools.mk
-include /usr/share/cibs/rules/32.mk
-include /usr/share/cibs/rules/64.mk
-
-configure := $(sourcedir)/openpgm/pgm/configure
-
-summary := open source implementation of the Pragmatic General Multicast (PGM) specification in RFC 3208
-license := LGPL
-license-file := openpgm/pgm/COPYING
-
-# build-conflicts +=
-
-home := https://code.google.com/p/openpgm/
-name := libpgm
-version := 5.1.118
-archive := $(name)-$(version).tar.bz2
-download := https://openpgm.googlecode.com/files/$(archive)
-checksum := \
- md5:f561caa7902220eff4d1e2004ba5eedc \
- sha1:76888874a938c26870096105249990c5fdfa9ec2 \
- sha256:7806ab830e3993db77590877fa8133037a86fb6f22e99418a5c7075d93d3aa8b \
- size:857603
diff --git a/examples/openpgm/libpgm.p5m b/examples/openpgm/libpgm.p5m
deleted file mode 100644
index 573ec84..0000000
--- a/examples/openpgm/libpgm.p5m
+++ /dev/null
@@ -1,68 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license
-# at http://www.opensource.org/licenses/CDDL-1.0
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each file.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-#
-# Copyright (C) 2012, Nexenta Systems, Inc. All rights reserved.
-#
-
-
-set name=pkg.fmri value=pkg:/library/libpgm@$(ips-version)
-set name=pkg.summary value="$(summary)"
-set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
-license $(license-file) license="$(license)"
-
-dir path=usr
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/include
-dir path=usr/include/pgm-5.1
-dir path=usr/include/pgm-5.1/pgm
-file path=usr/lib/$(MACH64)/libpgm-5.1.so.0.0.118
-file path=usr/lib/$(MACH64)/pkgconfig/openpgm-5.1.pc
-file path=usr/lib/libpgm-5.1.so.0.0.118
-file path=usr/lib/pkgconfig/openpgm-5.1.pc
-file path=usr/include/pgm-5.1/pgm/msgv.h
-file path=usr/include/pgm-5.1/pgm/time.h
-file path=usr/include/pgm-5.1/pgm/skbuff.h
-file path=usr/include/pgm-5.1/pgm/messages.h
-file path=usr/include/pgm-5.1/pgm/macros.h
-file path=usr/include/pgm-5.1/pgm/zinttypes.h
-file path=usr/include/pgm-5.1/pgm/winint.h
-file path=usr/include/pgm-5.1/pgm/packet.h
-file path=usr/include/pgm-5.1/pgm/list.h
-file path=usr/include/pgm-5.1/pgm/atomic.h
-file path=usr/include/pgm-5.1/pgm/pgm.h
-file path=usr/include/pgm-5.1/pgm/engine.h
-file path=usr/include/pgm-5.1/pgm/in.h
-file path=usr/include/pgm-5.1/pgm/tsi.h
-file path=usr/include/pgm-5.1/pgm/error.h
-file path=usr/include/pgm-5.1/pgm/version.h
-file path=usr/include/pgm-5.1/pgm/wininttypes.h
-file path=usr/include/pgm-5.1/pgm/types.h
-file path=usr/include/pgm-5.1/pgm/socket.h
-file path=usr/include/pgm-5.1/pgm/gsi.h
-file path=usr/include/pgm-5.1/pgm/mem.h
-file path=usr/include/pgm-5.1/pgm/if.h
-link path=usr/lib/libpgm-5.1.so.0 target=libpgm-5.1.so.0.0.118
-link path=usr/lib/$(MACH64)/libpgm-5.1.so.0 target=libpgm-5.1.so.0.0.118
-link path=usr/lib/$(MACH64)/libpgm.so target=libpgm-5.1.so.0.0.118
-link path=usr/lib/libpgm.so target=libpgm-5.1.so.0.0.118
diff --git a/examples/openpgm/patches/000_ifr_netmask.patch b/examples/openpgm/patches/000_ifr_netmask.patch
deleted file mode 100644
index 20fc94e..0000000
--- a/examples/openpgm/patches/000_ifr_netmask.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: libpgm-5.1.118-1~dfsg/openpgm/pgm/configure.ac
-===================================================================
---- libpgm-5.1.118-1~dfsg.orig/openpgm/pgm/configure.ac 2011-09-27 17:59:08.000000000 +0000
-+++ libpgm-5.1.118-1~dfsg/openpgm/pgm/configure.ac 2012-06-06 20:21:04.407905323 +0000
-@@ -184,8 +184,8 @@
- AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM([[#include <sys/types.h>
- #include <ifaddrs.h>]],
-- [[struct ifaddrs ifa;
--ifa.ifa_netmask = (struct sockaddr*)0;]])],
-+ [[struct ifreq ifr;
-+ifr.ifr_netmask = (struct sockaddr*)0;]])],
- [AC_MSG_RESULT([yes])
- CFLAGS="$CFLAGS -DCONFIG_HAVE_IFR_NETMASK"],
- [AC_MSG_RESULT([no])])
diff --git a/examples/openpgm/patches/010_ifa_flags.patch b/examples/openpgm/patches/010_ifa_flags.patch
deleted file mode 100644
index f362703..0000000
--- a/examples/openpgm/patches/010_ifa_flags.patch
+++ /dev/null
@@ -1,107 +0,0 @@
-Descriptions: on illumos ifa_flags is uint64_t
-Bug: http://code.google.com/p/openpgm/issues/detail?id=25
-
-diff -dubr libpgm-5.1.118/openpgm/pgm/getifaddrs.c libpgm-5.1.118.flags/openpgm/pgm/getifaddrs.c
---- libpgm-5.1.118/openpgm/pgm/getifaddrs.c 2011-09-27 21:59:08.000000000 +0400
-+++ libpgm-5.1.118.flags/openpgm/pgm/getifaddrs.c 2012-09-24 05:25:16.404925472 +0400
-@@ -813,6 +813,68 @@
- return TRUE;
- }
- #endif /* _WIN32 */
-+#if defined( HAVE_GETIFADDRS )
-+static
-+bool
-+_pgm_getifaddrs (
-+ struct pgm_ifaddrs_t** restrict ifap,
-+ pgm_error_t** restrict error
-+ )
-+{
-+ struct ifaddrs *_ifap, *_ifa;
-+ const int e = getifaddrs (&_ifap);
-+ if (-1 == e) {
-+ char errbuf[1024];
-+ pgm_set_error (error,
-+ PGM_ERROR_DOMAIN_IF,
-+ pgm_error_from_errno (errno),
-+ _("getifaddrs failed: %s"),
-+ pgm_strerror_s (errbuf, sizeof (errbuf), errno));
-+ return FALSE;
-+ }
-+
-+ int n = 0, k = 0;
-+ for (_ifa = _ifap; _ifa; _ifa = _ifa->ifa_next)
-+ ++n;
-+
-+ struct _pgm_ifaddrs_t* ifa = pgm_new0 (struct _pgm_ifaddrs_t, n);
-+ struct _pgm_ifaddrs_t* ift = ifa;
-+ for (_ifa = _ifap; _ifa; _ifa = _ifa->ifa_next)
-+ {
-+/* ensure IP adapter */
-+ if (NULL == _ifa->ifa_addr ||
-+ (_ifa->ifa_addr->sa_family != AF_INET &&
-+ _ifa->ifa_addr->sa_family != AF_INET6) )
-+ {
-+ continue;
-+ }
-+
-+/* address */
-+ ift->_ifa.ifa_addr = (void*)&ift->_addr;
-+ memcpy (ift->_ifa.ifa_addr, _ifa->ifa_addr, pgm_sockaddr_len (_ifa->ifa_addr));
-+
-+/* name */
-+ ift->_ifa.ifa_name = ift->_name;
-+ pgm_strncpy_s (ift->_ifa.ifa_name, IF_NAMESIZE, _ifa->ifa_name, _TRUNCATE);
-+
-+/* flags */
-+ ift->_ifa.ifa_flags = _ifa->ifa_flags;
-+
-+/* netmask */
-+ ift->_ifa.ifa_netmask = (void*)&ift->_netmask;
-+ memcpy (ift->_ifa.ifa_netmask, _ifa->ifa_netmask, pgm_sockaddr_len (_ifa->ifa_netmask));
-+
-+/* next */
-+ if (k++ < (n - 1)) {
-+ ift->_ifa.ifa_next = (struct pgm_ifaddrs_t*)(ift + 1);
-+ ift = (struct _pgm_ifaddrs_t*)(ift->_ifa.ifa_next);
-+ }
-+ }
-+ freeifaddrs (_ifap);
-+ *ifap = (struct pgm_ifaddrs_t*)ifa;
-+ return TRUE;
-+}
-+#endif /* HAVE_GETIFADDRS */
-
- /* returns TRUE on success setting ifap to a linked list of system interfaces,
- * returns FALSE on failure and sets error appropriately.
-@@ -830,17 +892,7 @@
- (void*)ifap, (void*)error);
-
- #ifdef CONFIG_HAVE_GETIFADDRS
-- const int e = getifaddrs ((struct ifaddrs**)ifap);
-- if (-1 == e) {
-- char errbuf[1024];
-- pgm_set_error (error,
-- PGM_ERROR_DOMAIN_IF,
-- pgm_error_from_errno (errno),
-- _("getifaddrs failed: %s"),
-- pgm_strerror_s (errbuf, sizeof (errbuf), errno));
-- return FALSE;
-- }
-- return TRUE;
-+ return _pgm_getifaddrs (ifap, error);
- #elif defined(CONFIG_TARGET_WINE)
- return _pgm_getadaptersinfo (ifap, error);
- #elif defined(_WIN32)
-@@ -861,11 +913,7 @@
- {
- pgm_return_if_fail (NULL != ifa);
-
--#ifdef CONFIG_HAVE_GETIFADDRS
-- freeifaddrs ((struct ifaddrs*)ifa);
--#else
- pgm_free (ifa);
--#endif
- }
-
- /* eof */
-Только в libpgm-5.1.118.flags/openpgm/pgm: getifaddrs.c.orig
diff --git a/examples/pcre/Makefile b/examples/pcre/Makefile
deleted file mode 100644
index 610fcec..0000000
--- a/examples/pcre/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-include /usr/share/cibs/rules/ips.mk
-include /usr/share/cibs/rules/archive.mk
-include /usr/share/cibs/rules/autotools.mk
-include /usr/share/cibs/rules/32.mk
-include /usr/share/cibs/rules/64.mk
-
-summary := Perl Compatible Regular Expressions
-license := BSD
-license-file := LICENCE
-
-# build-conflicts +=
-
-home := http://www.pcre.org/
-name := pcre
-version := 8.31
-archive := $(name)-$(version).tar.bz2
-download := http://sourceforge.net/projects/$(name)/files/$(name)/$(version)/$(archive)/download
-checksum := \
- md5:1c9a276af932b5599157f96e945391f0 \
- sha1:1132276bb8bea7cb0662210fb812fbef7791621f \
- sha256:5778a02535473c7ee7838ea598c19f451e63cf5eec0bf0307a688301c9078c3c \
- size:1257162
diff --git a/examples/pcre/pcre.p5m b/examples/pcre/pcre.p5m
deleted file mode 100644
index b016eff..0000000
--- a/examples/pcre/pcre.p5m
+++ /dev/null
@@ -1,109 +0,0 @@
-set name=pkg.fmri value=pkg:/library/pcre@$(ips-version)
-set name=pkg.summary value="$(summary)"
-set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
-license $(license-file) license="$(license)"
-
-<transform file dir link path=.*pcre-config.* -> default facet.devel true>
-
-dir path=usr
-dir path=usr/include
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man1
-dir path=usr/share/man/man3
-file path=usr/bin/$(MACH64)/pcre-config
-file path=usr/bin/pcre-config
-file path=usr/include/pcre_scanner.h
-file path=usr/include/pcre_stringpiece.h
-file path=usr/include/pcre.h
-file path=usr/include/pcreposix.h
-file path=usr/lib/$(MACH64)/libpcre.so.1.0.1
-file path=usr/lib/$(MACH64)/libpcreposix.so.0.0.1
-file path=usr/lib/$(MACH64)/pkgconfig/libpcre.pc
-file path=usr/lib/$(MACH64)/pkgconfig/libpcreposix.pc
-file path=usr/lib/libpcre.so.1.0.1
-file path=usr/lib/libpcreposix.so.0.0.1
-file path=usr/lib/pkgconfig/libpcre.pc
-file path=usr/lib/pkgconfig/libpcreposix.pc
-file path=usr/share/man/man1/pcre-config.1
-file path=usr/share/man/man3/pcre_assign_jit_stack.3
-file path=usr/share/man/man3/pcre_compile.3
-file path=usr/share/man/man3/pcre_compile2.3
-file path=usr/share/man/man3/pcre_config.3
-file path=usr/share/man/man3/pcre_copy_named_substring.3
-file path=usr/share/man/man3/pcre_copy_substring.3
-file path=usr/share/man/man3/pcre_dfa_exec.3
-file path=usr/share/man/man3/pcre_exec.3
-file path=usr/share/man/man3/pcre_free_study.3
-file path=usr/share/man/man3/pcre_free_substring_list.3
-file path=usr/share/man/man3/pcre_free_substring.3
-file path=usr/share/man/man3/pcre_fullinfo.3
-file path=usr/share/man/man3/pcre_get_named_substring.3
-file path=usr/share/man/man3/pcre_get_stringnumber.3
-file path=usr/share/man/man3/pcre_get_stringtable_entries.3
-file path=usr/share/man/man3/pcre_get_substring_list.3
-file path=usr/share/man/man3/pcre_get_substring.3
-file path=usr/share/man/man3/pcre_jit_stack_alloc.3
-file path=usr/share/man/man3/pcre_jit_stack_free.3
-file path=usr/share/man/man3/pcre_maketables.3
-file path=usr/share/man/man3/pcre_pattern_to_host_byte_order.3
-file path=usr/share/man/man3/pcre_refcount.3
-file path=usr/share/man/man3/pcre_study.3
-file path=usr/share/man/man3/pcre_utf16_to_host_byte_order.3
-file path=usr/share/man/man3/pcre_version.3
-file path=usr/share/man/man3/pcre.3
-file path=usr/share/man/man3/pcre16.3
-file path=usr/share/man/man3/pcreapi.3
-file path=usr/share/man/man3/pcrebuild.3
-file path=usr/share/man/man3/pcrecallout.3
-file path=usr/share/man/man3/pcrecompat.3
-file path=usr/share/man/man3/pcrejit.3
-file path=usr/share/man/man3/pcrelimits.3
-file path=usr/share/man/man3/pcrematching.3
-file path=usr/share/man/man3/pcrepartial.3
-file path=usr/share/man/man3/pcrepattern.3
-file path=usr/share/man/man3/pcreperform.3
-file path=usr/share/man/man3/pcreposix.3
-file path=usr/share/man/man3/pcreprecompile.3
-file path=usr/share/man/man3/pcresample.3
-file path=usr/share/man/man3/pcrestack.3
-file path=usr/share/man/man3/pcresyntax.3
-file path=usr/share/man/man3/pcreunicode.3
-link path=usr/lib/$(MACH64)/libpcre.so target=libpcre.so.1.0.1
-link path=usr/lib/$(MACH64)/libpcre.so.1 target=libpcre.so.1.0.1
-link path=usr/lib/$(MACH64)/libpcreposix.so target=libpcreposix.so.0.0.1
-link path=usr/lib/$(MACH64)/libpcreposix.so.0 target=libpcreposix.so.0.0.1
-link path=usr/lib/libpcre.so target=libpcre.so.1.0.1
-link path=usr/lib/libpcre.so.1 target=libpcre.so.1.0.1
-link path=usr/lib/libpcreposix.so target=libpcreposix.so.0.0.1
-link path=usr/lib/libpcreposix.so.0 target=libpcreposix.so.0.0.1
-link path=usr/share/man/man3/pcre16_assign_jit_stack.3 target=pcre_assign_jit_stack.3
-link path=usr/share/man/man3/pcre16_compile.3 target=pcre_compile.3
-link path=usr/share/man/man3/pcre16_compile2.3 target=pcre_compile2.3
-link path=usr/share/man/man3/pcre16_config.3 target=pcre_config.3
-link path=usr/share/man/man3/pcre16_copy_named_substring.3 target=pcre_copy_named_substring.3
-link path=usr/share/man/man3/pcre16_copy_substring.3 target=pcre_copy_substring.3
-link path=usr/share/man/man3/pcre16_dfa_exec.3 target=pcre_dfa_exec.3
-link path=usr/share/man/man3/pcre16_exec.3 target=pcre_exec.3
-link path=usr/share/man/man3/pcre16_free_study.3 target=pcre_free_study.3
-link path=usr/share/man/man3/pcre16_free_substring_list.3 target=pcre_free_substring_list.3
-link path=usr/share/man/man3/pcre16_free_substring.3 target=pcre_free_substring.3
-link path=usr/share/man/man3/pcre16_fullinfo.3 target=pcre_fullinfo.3
-link path=usr/share/man/man3/pcre16_get_named_substring.3 target=pcre_get_named_substring.3
-link path=usr/share/man/man3/pcre16_get_stringnumber.3 target=pcre_get_stringnumber.3
-link path=usr/share/man/man3/pcre16_get_stringtable_entries.3 target=pcre_get_stringtable_entries.3
-link path=usr/share/man/man3/pcre16_get_substring_list.3 target=pcre_get_substring_list.3
-link path=usr/share/man/man3/pcre16_get_substring.3 target=pcre_get_substring.3
-link path=usr/share/man/man3/pcre16_jit_stack_alloc.3 target=pcre_jit_stack_alloc.3
-link path=usr/share/man/man3/pcre16_jit_stack_free.3 target=pcre_jit_stack_free.3
-link path=usr/share/man/man3/pcre16_maketables.3 target=pcre_maketables.3
-link path=usr/share/man/man3/pcre16_pattern_to_host_byte_order.3 target=pcre_pattern_to_host_byte_order.3
-link path=usr/share/man/man3/pcre16_refcount.3 target=pcre_refcount.3
-link path=usr/share/man/man3/pcre16_study.3 target=pcre_study.3
-link path=usr/share/man/man3/pcre16_utf16_to_host_byte_order.3 target=pcre_utf16_to_host_byte_order.3
-link path=usr/share/man/man3/pcre16_version.3 target=pcre_version.3
diff --git a/examples/pcre/pcrecpp.p5m b/examples/pcre/pcrecpp.p5m
deleted file mode 100644
index e2eb275..0000000
--- a/examples/pcre/pcrecpp.p5m
+++ /dev/null
@@ -1,21 +0,0 @@
-
-set name=pkg.fmri value=pkg:/library/pcrecpp@$(ips-version)
-set name=pkg.summary value="$(summary), C++ library"
-set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
-license $(license-file) license="$(license)"
-
-depend fmri=pkg:/library/pcre@$(ips-version) type=incorporate
-
-file path=usr/include/pcrecpp.h
-file path=usr/include/pcrecpparg.h
-file path=usr/lib/$(MACH64)/libpcrecpp.so.0.0.0
-file path=usr/lib/$(MACH64)/pkgconfig/libpcrecpp.pc
-file path=usr/lib/libpcrecpp.so.0.0.0
-file path=usr/lib/pkgconfig/libpcrecpp.pc
-file path=usr/share/man/man3/pcrecpp.3
-link path=usr/lib/$(MACH64)/libpcrecpp.so target=libpcrecpp.so.0.0.0
-link path=usr/lib/$(MACH64)/libpcrecpp.so.0 target=libpcrecpp.so.0.0.0
-link path=usr/lib/libpcrecpp.so target=libpcrecpp.so.0.0.0
-link path=usr/lib/libpcrecpp.so.0 target=libpcrecpp.so.0.0.0
-
diff --git a/examples/symlinks/Makefile b/examples/symlinks/Makefile
index c90184b..94a83b2 100644
--- a/examples/symlinks/Makefile
+++ b/examples/symlinks/Makefile
@@ -1,7 +1,7 @@
include /usr/share/cibs/rules/ips.mk
include /usr/share/cibs/rules/git.mk
include /usr/share/cibs/rules/patch.mk
-include /usr/share/cibs/rules/32.mk
+include /usr/share/cibs/rules/64.mk
summary := scan/change symbolic links
@@ -26,6 +26,6 @@ build-%-stamp: download-stamp patch-stamp
touch $@
install-%-stamp: build-%-stamp
- mkdir -p $(protodir)/$(bindir)
- cp $(builddir)/symlinks $(protodir)/$(bindir)
+ mkdir -p $(destdir)/$(bindir)
+ cp $(builddir)/symlinks $(destdir)/$(bindir)
touch $@
diff --git a/examples/zeromq/Makefile b/examples/zeromq/Makefile
deleted file mode 100644
index 5b20f6d..0000000
--- a/examples/zeromq/Makefile
+++ /dev/null
@@ -1,32 +0,0 @@
-include /usr/share/cibs/rules/ips.mk
-include /usr/share/cibs/rules/archive.mk
-#include /usr/share/cibs/rules/patch.mk
-#include /usr/share/cibs/rules/autoreconf.mk
-include /usr/share/cibs/rules/autotools.mk
-include /usr/share/cibs/rules/32.mk
-include /usr/share/cibs/rules/64.mk
-
-
-summary := The ZeroMQ messaging library
-license := LGPL
-license-file := COPYING.LESSER
-
-build-depends += \
- pkg:/library/libpgm
-
-#/usr/gcc/4.3/bin/gcc -m32 -luuid -o test
-#ld: warning: file libdladm.so.1: required by /usr/lib/libdlpi.so.1, not found
-configure-env += LDFLAGS="-L/lib"
-
-configure-options += --with-system-pgm
-
-home := http://www.zeromq.org
-name := zeromq
-version := 2.2.0
-archive := $(name)-$(version).tar.gz
-download := http://download.zeromq.org/$(archive)
-checksum := \
- md5:1b11aae09b19d18276d0717b2ea288f6 \
- sha1:e4bc024c33d3e62f658640625e061ce4e8bd1ff1 \
- sha256:43904aeb9ea6844f72ca02e4e53bf1d481a1a0264e64979da761464e88604637 \
- size:1900378
diff --git a/examples/zeromq/zeromq.p5m b/examples/zeromq/zeromq.p5m
deleted file mode 100644
index aa78982..0000000
--- a/examples/zeromq/zeromq.p5m
+++ /dev/null
@@ -1,27 +0,0 @@
-set name=pkg.fmri value=pkg:/library/zeromq@$(ips-version)
-set name=pkg.summary value="$(summary)"
-set name=info.upstream-url value="$(home)"
-set name=info.source_url value="$(download)"
-license $(license-file) license="$(license)"
-
-dir path=usr
-dir path=usr/include
-dir path=usr/lib
-dir path=usr/lib/$(MACH64)
-dir path=usr/lib/$(MACH64)/pkgconfig
-dir path=usr/lib/pkgconfig
-dir path=usr/share
-dir path=usr/share/man
-dir path=usr/share/man/man3
-dir path=usr/share/man/man7
-file path=usr/include/zmq.h
-file path=usr/include/zmq.hpp
-file path=usr/include/zmq_utils.h
-file path=usr/lib/$(MACH64)/libzmq.so.1.0.1
-file path=usr/lib/$(MACH64)/pkgconfig/libzmq.pc
-file path=usr/lib/libzmq.so.1.0.1
-file path=usr/lib/pkgconfig/libzmq.pc
-link path=usr/lib/$(MACH64)/libzmq.so target=libzmq.so.1.0.1
-link path=usr/lib/$(MACH64)/libzmq.so.1 target=libzmq.so.1.0.1
-link path=usr/lib/libzmq.so target=libzmq.so.1.0.1
-link path=usr/lib/libzmq.so.1 target=libzmq.so.1.0.1