They've all been normalized to be /usr/share/tabset already, except
for one that was missed (I've altered the upstream maintainer).
Also remove blank lines while we are at it.
- todd
Index: share/termtypes/Makefile
===================================================================
RCS file: /cvs/src/share/termtypes/Makefile,v
retrieving revision 1.19
diff -u -r1.19 Makefile
--- share/termtypes/Makefile 5 Jul 2011 03:34:30 -0000 1.19
+++ share/termtypes/Makefile 6 Jul 2011 16:53:49 -0000
@@ -9,11 +9,7 @@
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 @@
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 @@
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
\
Index: share/termtypes/termtypes.master
===================================================================
RCS file: /cvs/src/share/termtypes/termtypes.master,v
retrieving revision 1.43
diff -u -r1.43 termtypes.master
--- share/termtypes/termtypes.master 6 Jul 2011 16:20:29 -0000 1.43
+++ share/termtypes/termtypes.master 6 Jul 2011 16:53:53 -0000
@@ -5827,7 +5827,7 @@
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/>,
