Date: Mon, 20 May 2002 14:29:00 +0200 (CEST) From: Cyrille Lefevre <cyrille.lefevre@laposte.net> To: freebsd gnats <freebsd-gnats-submit@freebsd.org>, freebsd bugs <freebsd-bugs@freebsd.org> Subject: Re: bin/30812: giant termcap database update Message-ID: <200205201229.g4KCT0ID024189@gits.gits.dyndns.org> In-Reply-To: <200109251120.f8PBK1E29417@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--ELM1021897740-24140-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset=US-ASCII
On Sep 25, 2001 04:20:01 am -0700, gnats-admin@FreeBSD.org wrote:
this patch to Makefile replace the existing one.
also, see PR#38168 which is related to terminfo.
Cyrille.
--
Cyrille Lefevre mailto:cyrille.lefevre@laposte.net
--ELM1021897740-24140-0_
Content-Transfer-Encoding: 7bit
Content-Type: text/x-patch
Content-Disposition: attachment; filename=termcap-2.patch
Content-Description: termcap-2.patch
Index: Makefile
===================================================================
RCS file: /home/ncvs/src/share/termcap/Makefile,v
retrieving revision 1.12.2.4
diff -u -r1.12.2.4 Makefile
--- Makefile 18 Feb 2002 15:03:35 -0000 1.12.2.4
+++ Makefile 19 May 2002 05:30:41 -0000
@@ -1,23 +1,54 @@
# @(#)Makefile 8.1 (Berkeley) 6/8/93
# $FreeBSD: src/share/termcap/Makefile,v 1.12.2.4 2002/02/18 15:03:35 ru Exp $
+MAN= termcap.5
+
+NCURSES= ${.CURDIR}/../../contrib/ncurses
+
+NO_TERMTYPES= yes # ncurses termcap database appear to be up-to-date.
+
+.if defined(NO_TERMTYPES)
+.if defined(NO_NCTERMCAP)
+TERMCAPSRC= ${.CURDIR}/termcap.src
+.else
+# ftp://invisible-island.net/ncurses/termcap.src.gz
+TERMCAPSRC= ${NCURSES}/misc/termcap.src
+.endif
+.else
+# http://tuxedo.org/terminfo/termtypes.ti.gz
+TERMCAPSRC= ${.CURDIR}/termtypes.tc
+.endif
+
+TERMCAP= termcap
+TERMCAPDB= termcap.db
+
+FILES= map3270 ${TERMCAP} ${TERMCAPDB}
+FILESDIR= ${BINDIR}/misc
+CLEANFILES+= ${TERMCAP} ${TERMCAPDB}
+
+CAP_MKDB?= cap_mkdb
+
# reorder gives an editor command for most common terminals
# (in reverse order from n'th to 1'st most commonly used)
# to move them to the front of termcap
-#
-MAN= termcap.5
-
-FILES= map3270 termcap termcap.db
-FILESDIR= ${BINDIR}/misc
-CLEANFILES+= termcap termcap.db
+.if defined(NO_TERMTYPES) && defined(NO_NCTERMCAP)
+REORDER= reorder
+.else
+REORDER= # reorder.tc # newer databases don't need to me reordered.
+.endif
-termcap: reorder termcap.src
- TERM=dumb ex - ${.CURDIR}/termcap.src < ${.CURDIR}/reorder
+${TERMCAP}: ${REORDER} ${TERMCAPSRC}
+.if defined(NO_TERMTYPES) && defined(NO_NCTERMCAP)
+ @rm -f ${.TARGET}
+ TERM=dumb ex - ${TERMCAPSRC} < ${.CURDIR}/${REORDER}
+.else
+ ln -fs ${TERMCAPSRC} ${.TARGET}
+.endif
-termcap.db: termcap
- cap_mkdb termcap
+${TERMCAPDB}: ${TERMCAP}
+ ${CAP_MKDB} ${TERMCAP} 2> /dev/null
etc-termcap:
- ln -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap
+ ln -fs ${FILESDIR}/termcap ${DESTDIR}/etc/termcap
.include <bsd.prog.mk>
--ELM1021897740-24140-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?200205201229.g4KCT0ID024189>