diff options
| author | Todd C. Miller <millert@cvs.openbsd.org> | 2011-07-06 18:49:09 +0000 |
|---|---|---|
| committer | Todd C. Miller <millert@cvs.openbsd.org> | 2011-07-06 18:49:09 +0000 |
| commit | 630ecc6f9532ab145f9301a50383240db7d254c8 (patch) | |
| tree | 7338462c87cc5872e3d60835fe06c32a1e12e2af /share/termtypes | |
| parent | 1acf4eb046df0168b93c0af258be1110e0553fa6 (diff) | |
No need to change tabset path in termtypes.master, they've all been
normalized to be /usr/share/tabset (except one that was missed).
OK nicm@
Diffstat (limited to 'share/termtypes')
| -rw-r--r-- | share/termtypes/Makefile | 19 | ||||
| -rw-r--r-- | share/termtypes/termtypes.master | 8 |
2 files changed, 8 insertions, 19 deletions
diff --git a/share/termtypes/Makefile b/share/termtypes/Makefile index a1d72ae9698..e11faaec5b9 100644 --- a/share/termtypes/Makefile +++ b/share/termtypes/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.19 2011/07/05 03:34:30 nicm Exp $ +# $OpenBSD: Makefile,v 1.20 2011/07/06 18:49:08 millert Exp $ # # Take termcap/terminfo master file and generate termcap/terminfo .db files @@ -9,11 +9,7 @@ TIC= /usr/bin/tic all: terminfo.db termcap.db termcap terminfo.src: termtypes.master - ${TIC} -I -x ${.ALLSRC} | sed \ - -e 's,/usr/share/lib/tabset,/usr/share/tabset,g' \ - -e 's,/usr/lib/tabset,/usr/share/tabset,g' \ - -e '/^#/d' \ - > ${.TARGET} + ${TIC} -I -x ${.ALLSRC} | sed -e '/^#/d' -e '/^$$/d' > ${.TARGET} @if [ ! -s ${.TARGET} ]; then \ echo ${.TARGET} is zero length! You need to update ${TIC} ;\ rm -f ${.TARGET} ;\ @@ -24,11 +20,7 @@ terminfo.db: terminfo.src cap_mkdb -i -f terminfo terminfo.src termcap.src: termtypes.master - ${TIC} -C -x ${.ALLSRC} | sed \ - -e 's,/usr/share/lib/tabset,/usr/share/tabset,g' \ - -e 's,/usr/lib/tabset,/usr/share/tabset,g' \ - -e '/^#/d' \ - > ${.TARGET} + ${TIC} -C -x ${.ALLSRC} | sed -e '/^#/d' -e '/^$$/d' > ${.TARGET} @if [ ! -s ${.TARGET} ]; then \ echo ${.TARGET} is zero length! You need to update ${TIC} ;\ rm -f ${.TARGET} ;\ @@ -39,10 +31,7 @@ termcap.db: termcap.src cap_mkdb -f termcap termcap.src termcap: termtypes.master - ${TIC} -C -x ${.ALLSRC} | sed \ - -e 's,/usr/share/lib/tabset,/usr/share/tabset,g' \ - -e 's,/usr/lib/tabset,/usr/share/tabset,g' \ - > ${.TARGET} + ${TIC} -C -x ${.ALLSRC} > ${.TARGET} realinstall: ${INSTALL} ${INSTALL_COPY} -o ${BINOWN} -g ${BINGRP} -m 444 terminfo.db \ diff --git a/share/termtypes/termtypes.master b/share/termtypes/termtypes.master index 925d88a0a5c..99d69161299 100644 --- a/share/termtypes/termtypes.master +++ b/share/termtypes/termtypes.master @@ -1,6 +1,6 @@ ######## TERMINAL TYPE DESCRIPTIONS SOURCE FILE # -# $OpenBSD: termtypes.master,v 1.43 2011/07/06 16:20:29 nicm Exp $ +# $OpenBSD: termtypes.master,v 1.44 2011/07/06 18:49:08 millert Exp $ # # This version of terminfo.src is distributed with ncurses and is maintained # by Thomas E. Dickey (TD). @@ -8,8 +8,8 @@ # Report bugs and new terminal descriptions to # bug-ncurses@gnu.org # -# $Revision: 1.43 $ -# $Date: 2011/07/06 16:20:29 $ +# $Revision: 1.44 $ +# $Date: 2011/07/06 18:49:08 $ # # 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 @@ -5827,7 +5827,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/>, |