Merge bk://openembedded@openembedded.bkbits.net/packages

into null.(none):/data/mtx/oe/oe.write/packages

2004/10/18 17:17:30+02:00 (none)!br1
include basic terminfo files in ncurses package

BKrev: 4173dea1NwSP9X6wjgHPHbNrZw06vg

diff --git a/ncurses/ncurses_5.4.oe b/ncurses/ncurses_5.4.oe
index 4f9cbb0..889be1f 100644 (file)
--- a/ncurses/ncurses_5.4.oe
+++ b/ncurses/ncurses_5.4.oe
@@ -1,11 +1,11 @@
-PR = "r1"
+PR = "r2"
 DESCRIPTION = "Ncurses library"
 SECTION = "libs"
 DEPENDS = "ncurses-native"
 PACKAGES_append = " ncurses-terminfo"
 FILES_ncurses_append = " ${datadir}/tabset"
 FILES_ncurses-terminfo = "${datadir}/terminfo"
-RRECOMMENDS_${PN} = "ncurses-terminfo"
+RSUGGESTS_${PN} = "ncurses-terminfo"
 
 SRC_URI = "${GNU_MIRROR}/ncurses/ncurses-${PV}.tar.gz"
 S = "${WORKDIR}/ncurses-${PV}"
@@ -50,3 +50,23 @@ do_stage () {
        done
        ln -sf curses.h ${STAGING_INCDIR}/ncurses.h
 }
+
+do_install_append() {
+       # include some basic terminfo files
+       # stolen ;) from gentoo and modified a bit
+       for x in ansi console dumb linux rxvt screen sun vt{52,100,102,200,220} xterm-color xterm-xfree86
+        do
+                local termfile="$(find "${D}/usr/share/terminfo/" -name "${x}" 2>/dev/null)"
+                local basedir="$(basename $(dirname "${termfile}"))"
+
+                if [ -n "${termfile}" ]
+                then
+                        install -d ${D}/etc/terminfo/${basedir}
+                        mv ${termfile} ${D}/etc/terminfo/${basedir}/
+                        ln -s /etc/terminfo/${basedir}/${x} \
+                                ${D}/usr/share/terminfo/${basedir}/${x}
+                fi
+        done
+       # i think we can use xterm-color as default xterm
+       ln -sf xterm-color ${D}/etc/terminfo/x/xterm
+}