From owner-freebsd-bugs Mon May 20 5:29:16 2002 Delivered-To: freebsd-bugs@freebsd.org Received: from smtp.noos.fr (claudel.noos.net [212.198.2.83]) by hub.freebsd.org (Postfix) with ESMTP id 1D73437B40B for ; Mon, 20 May 2002 05:29:06 -0700 (PDT) Received: (qmail 69736838 invoked by uid 0); 20 May 2002 12:29:02 -0000 Received: from unknown (HELO gits.gits.dyndns.org) ([212.198.230.194]) (envelope-sender ) by 212.198.2.83 (qmail-ldap-1.03) with SMTP for ; 20 May 2002 12:29:02 -0000 Received: from gits.gits.dyndns.org (m35qb432j4t9l9c3@localhost [127.0.0.1]) by gits.gits.dyndns.org (8.12.3/8.12.3) with ESMTP id g4KCT0i2024190; Mon, 20 May 2002 14:29:01 +0200 (CEST) (envelope-from root@gits.dyndns.org) Received: (from root@localhost) by gits.gits.dyndns.org (8.12.3/8.12.3/Submit) id g4KCT0ID024189; Mon, 20 May 2002 14:29:00 +0200 (CEST) (envelope-from root) Message-Id: <200205201229.g4KCT0ID024189@gits.gits.dyndns.org> Subject: Re: bin/30812: giant termcap database update In-Reply-To: <200109251120.f8PBK1E29417@freefall.freebsd.org> To: freebsd gnats , freebsd bugs Date: Mon, 20 May 2002 14:29:00 +0200 (CEST) From: Cyrille Lefevre Reply-To: cyrille.lefevre@laposte.net X-Face: V|+c;4!|B?E%BE^{E6);aI.[< List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org --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 --ELM1021897740-24140-0_-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message