From owner-freebsd-bugs Tue Sep 25 4:20:13 2001 Delivered-To: freebsd-bugs@hub.freebsd.org Received: from freefall.freebsd.org (unknown [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id A250E37B43D for ; Tue, 25 Sep 2001 04:20:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.4/8.11.4) id f8PBK1c29421; Tue, 25 Sep 2001 04:20:01 -0700 (PDT) (envelope-from gnats) Received: from smtp.noos.fr (zola.noos.net [212.198.2.76]) by hub.freebsd.org (Postfix) with ESMTP id CBAAD37B439 for ; Tue, 25 Sep 2001 04:11:33 -0700 (PDT) Received: (qmail 9002323 invoked by uid 0); 25 Sep 2001 11:03:04 -0000 Received: from unknown (HELO gits.dyndns.org) ([212.198.231.187]) (envelope-sender ) by 212.198.2.76 (qmail-ldap-1.03) with DES-CBC3-SHA encrypted SMTP for ; 25 Sep 2001 11:03:04 -0000 Received: (from root@localhost) by gits.dyndns.org (8.11.6/8.11.6) id f8PB33329575; Tue, 25 Sep 2001 13:03:03 +0200 (CEST) (envelope-from root) Message-Id: <200109251103.f8PB33329575@gits.dyndns.org> Date: Tue, 25 Sep 2001 13:03:03 +0200 (CEST) From: Cyrille Lefevre Reply-To: clefevre@citeweb.net To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.113 Subject: bin/30812: giant termcap database update Sender: owner-freebsd-bugs@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 30812 >Category: bin >Synopsis: giant termcap database update >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Sep 25 04:20:01 PDT 2001 >Closed-Date: >Last-Modified: >Originator: Cyrille Lefevre >Release: FreeBSD 4.4-RC i386 >Organization: ACME >Environment: System: FreeBSD gits 4.4-RC FreeBSD 4.4-RC #7: Thu Sep 20 12:40:17 CEST 2001 root@gits:/disk2/4.x-stable/src/sys/compile/CUSTOM i386 >Description: the termcap database is almost obsolete. a newer one may be found at the following URL : http://tuxedo.org/~esr/terminfo/ src/etc/defaults/make.conf NO_TERMTYPES descrition added. src/share/termcap/Makefile changed to conditionnaly compile the old or the new termcap database according to NO_TERMTYPES. src/share/termcap/reorder.tc new file related to termtypes.tc (is it really needed ?) src/share/termcap/termtypes.tc new file not provided since it is too big for a PR (700+ KB). use the following URL to retreive an up to date one : http://tuxedo.org/~esr/terminfo/termtypes.tc.gz >How-To-Repeat: n/a >Fix: Index: make.conf =================================================================== RCS file: /home/ncvs/src/etc/defaults/Attic/make.conf,v retrieving revision 1.97.2.58 diff -u -r1.97.2.58 make.conf --- make.conf 2001/08/23 20:08:51 1.97.2.58 +++ make.conf 2001/09/25 10:56:27 @@ -99,6 +99,7 @@ #NO_OPENSSL= true # do not build OpenSSL (implies NO_OPENSSH) #NO_SENDMAIL= true # do not build sendmail and related programs #NO_SHAREDOCS= true # do not build the 4.4BSD legacy docs #NO_TCSH= true # do not build and install /bin/csh (which is tcsh) +#NO_TERMTYPES= true # do not use the new tuxedo termcap database #NO_X= true # do not compile in XWindows support (e.g. doscmd) #NOCRYPT= true # do not build any crypto code Index: Makefile =================================================================== RCS file: /home/ncvs/src/share/termcap/Makefile,v retrieving revision 1.12.2.3 diff -u -r1.12.2.3 Makefile --- Makefile 2001/09/17 15:40:09 1.12.2.3 +++ Makefile 2001/09/25 10:47:53 @@ -1,22 +1,40 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 # $FreeBSD: src/share/termcap/Makefile,v 1.12.2.3 2001/09/17 15:40:09 ru Exp $ +MAN= termcap.5 + +TERMCAP= termcap +.if defined(NO_TERMTYPES) +TERMCAPSRC= termcap.src +.else +TERMCAPSRC= termtypes.tc +.endif +TERMCAPDB= termcap.db + +FILES= ${TERMCAP} ${TERMCAPDB} +CLEANFILES+= ${FILES} + +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 - -CLEANFILES+= termcap termcap.db -FILES= termcap termcap.db +.if defined(NO_TERMTYPES) +REORDER= ${.CURDIR}/reorder +.else +REORDER= ${.CURDIR}/reorder.tc +.endif -all: termcap termcap.db +all: ${FILES} -termcap: reorder termcap.src - TERM=dumb ex - ${.CURDIR}/termcap.src < ${.CURDIR}/reorder +${TERMCAP}: ${REORDER} ${TERMCAPSRC} + @rm -f ${.TARGET} + TERM=dumb ex - ${.CURDIR}/${TERMCAPSRC} < ${REORDER} +# IMHO, the new termtypes.tc file don't need to be reordered... +# ln -fs ${.CURDIR}/${TERMCAPSRC} ${.TARGET} -termcap.db: termcap - cap_mkdb termcap +${TERMCAPDB}: ${TERMCAP} + ${CAP_MKDB} ${TERMCAP} 2> /dev/null beforeinstall: ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m ${SHAREMODE} \ >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-bugs" in the body of the message