Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 20 May 2002 14:23:45 +0200 (CEST)
From:      Cyrille Lefevre <cyrille.lefevre@laposte.net>
To:        Thomas Dickey <dickey@herndon4.his.com>
Cc:        freebsd gnats <freebsd-gnats-submit@freebsd.org>, freebsd bugs <freebsd-bugs@freebsd.org>
Subject:   Re: bin/38168: installing curses programs and terminfo database
Message-ID:  <200205201223.g4KCNj3r024102@gits.gits.dyndns.org>
In-Reply-To: <200205171930.PAA00794@bloatware.dickey.net>

next in thread | previous in thread | raw e-mail | index | archive | help

--ELM1021897425-24078-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII

On May 17, 2002 03:30:47 pm -0400, Thomas Dickey wrote:
> not exactly - a current (since early 2000) ncurses terminfo.src contains all
> of the information in termtypes.ti, along with lots of bug-fixes that I made
> while incorporating the information.  I use that to generate a corresponding
> termcap.src (which appears to have fewer errors than FreeBSD's termcap file ;-)

oops, you are right and I'm totally wrong... my apologies ;^)

I've considered that the ncurses databases where obsolete because
FreeBSD uses it's own termcap database instead of the ncurses one,
while, in fact, it appear that ncurses databases are up-to-date.

so, src/contrib/ncurses/misc/terminfo.src may be updated using
this one :
> ftp://invisible-island.net/ncurses/terminfo.src.gz
850+ KB

and src/contrib/ncurses/misc/termcap.src may be imported from :
> ftp://invisible-island.net/ncurses/termcap.src.gz
750+ KB

humm! the first comment says :

# This version of terminfo.src is distributed with ncurses.
                  ^^^^^^^^^^^^ should be termcap.src

see attached patches which updated existing ones.

Cyrille.
-- 
Cyrille Lefevre                 mailto:cyrille.lefevre@laposte.net

--ELM1021897425-24078-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/x-patch
Content-Disposition: attachment; filename=ncurses-2.patch
Content-Description: ncurses-2.patch

--- usr.bin/nclear/Makefile.old	Fri May 17 07:02:46 2002
+++ usr.bin/nclear/Makefile	Mon May 20 13:30:27 2002
@@ -30,8 +30,7 @@
 ${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
 
 ncurses_def.h:  MKncurses_def.sh ncurses_defs
-	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
-	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
+	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
 
 # MAN page junk
 MAN1=	${PROG}.1
--- usr.bin/ninfocmp/Makefile.old	Fri May 17 07:02:54 2002
+++ usr.bin/ninfocmp/Makefile	Mon May 20 13:38:08 2002
@@ -30,16 +30,13 @@
 ${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
 
 ncurses_def.h:  MKncurses_def.sh ncurses_defs
-	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
-	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
+	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
 
 parametrized.h: MKparametrized.sh Caps
-	AWK=${AWK} sh ${NCURSES}/include/MKparametrized.sh \
-	    ${NCURSES}/include/Caps > $@
+	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
 
 termsort.c: MKtermsort.sh Caps
-	sh ${NCURSES}/progs/MKtermsort.sh \
-	    ${AWK} ${NCURSES}/include/Caps > $@
+	set ${.ALLSRC}; sh $$1 ${AWK} $$2 > ${.TARGET}
 
 # MAN page junk
 MAN1m=	${PROG}.1m
--- usr.bin/ntic/Makefile.old	Mon May 20 13:36:27 2002
+++ usr.bin/ntic/Makefile	Mon May 20 13:34:43 2002
@@ -33,12 +33,10 @@
 ${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
 
 ncurses_def.h:  MKncurses_def.sh ncurses_defs
-	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
-	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
+	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
 
 parametrized.h: MKparametrized.sh Caps
-	AWK=${AWK} sh ${NCURSES}/include/MKparametrized.sh \
-	    ${NCURSES}/include/Caps > $@
+	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
 
 transform.h:
 	echo "#define PROG_CAPTOINFO \"${CAPTOINFO}\"" >$@
@@ -47,8 +45,7 @@
 	echo "#define PROG_INIT      \"${INIT}\""      >>$@
 
 termsort.c: MKtermsort.sh Caps
-	sh ${NCURSES}/progs/MKtermsort.sh \
-	    ${AWK} ${NCURSES}/include/Caps > $@
+	set ${.ALLSRC}; sh $$1 ${AWK} $$2 > ${.TARGET}
 
 # MAN page junk
 MAN1m=	${PROG}.1m
--- usr.bin/ntoe/Makefile.old	Mon May 20 13:39:35 2002
+++ usr.bin/ntoe/Makefile	Mon May 20 13:38:38 2002
@@ -30,8 +30,7 @@
 ${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
 
 ncurses_def.h:  MKncurses_def.sh ncurses_defs
-	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
-	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
+	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
 
 # MAN page junk
 MAN1m=	${PROG}.1m
--- usr.bin/ntput/Makefile.old	Fri May 17 07:03:17 2002
+++ usr.bin/ntput/Makefile	Mon May 20 13:47:10 2002
@@ -30,12 +30,10 @@
 ${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
 
 ncurses_def.h:  MKncurses_def.sh ncurses_defs
-	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
-	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
+	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
 
 termsort.c: MKtermsort.sh Caps
-	sh ${NCURSES}/progs/MKtermsort.sh \
-	    ${AWK} ${NCURSES}/include/Caps > $@
+	set ${.ALLSRC}; sh $$1 ${AWK} $$2 > ${.TARGET}
 
 transform.h:
 	echo "#define PROG_CAPTOINFO \"${CAPTOINFO}\"" >$@
--- usr.bin/ntset/Makefile.old	Fri May 17 07:03:27 2002
+++ usr.bin/ntset/Makefile	Mon May 20 13:42:25 2002
@@ -32,8 +32,7 @@
 ${PROG:S/^${NCPREFIX}//}.o: ${GENHDR}
 
 ncurses_def.h:  MKncurses_def.sh ncurses_defs
-	AWK=${AWK} sh ${NCURSES}/include/MKncurses_def.sh \
-	    ${NCURSES}/include/ncurses_defs > ncurses_def.h
+	AWK=${AWK} sh ${.ALLSRC} > ${.TARGET}
 
 transform.h:
 	echo "#define PROG_CAPTOINFO \"${CAPTOINFO}\"" >$@
--- share/terminfo/Makefile.old	Fri May 17 08:35:27 2002
+++ share/terminfo/Makefile	Sun May 19 08:00:20 2002
@@ -6,9 +6,16 @@
 
 NCURSES=	${.CURDIR}/../../contrib/ncurses
 
+.PATH:	${NCURSES}/include
+.PATH:	${NCURSES}/man
+
+NO_TERMTYPES=	yes	# ncurses terminfo database appear to be up-to-date.
+
 .if defined(NO_TERMTYPES)
+# ftp://invisible-island.net/ncurses/terminfo.src.gz
 TERMINFOSRC=	${NCURSES}/misc/terminfo.src
 .else
+# http://tuxedo.org/terminfo/termtypes.ti.gz
 TERMINFOSRC=	${.CURDIR}/termtypes.ti
 .endif
 
@@ -16,7 +23,11 @@
 
 FILES=		${TERMINFO}
 FILESDIR=	${BINDIR}/misc
-CLEANFILES+=	${FILES}
+CLEANFILES+=	${FILES} ${MAN}
+
+MAN5=		terminfo.5
+
+MANFILTER=	sed -e 's|@TERMINFO@|${TERMINFODIR}|g'
 
 all: ${FILES}
 
@@ -25,5 +36,9 @@
 
 afterinstall:
 	${TIC} ${TERMINFO}
+
+# sources order is important.
+terminfo.5: MKterminfo.sh terminfo.head Caps terminfo.tail
+	sh ${.ALLSRC} > ${.TARGET}
 
 .include <bsd.prog.mk>

--ELM1021897425-24078-0_--

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200205201223.g4KCNj3r024102>