From e909bba276c5b8b908a628855f3d13d03e99fdf4 Mon Sep 17 00:00:00 2001 From: Simon Schubert Date: Fri, 29 Dec 2006 22:43:32 +0000 Subject: [PATCH] Remove vgrind and nvi as build tools. ex was used to reorder termcap, which seems unnecessary vgrind was only used for share/doc Wondering-together-with: swildner --- Makefile.inc1 | 4 +- share/termcap/Makefile | 18 +++------ share/termcap/reorder | 63 ----------------------------- share/termcap/tck | 91 ------------------------------------------ 4 files changed, 8 insertions(+), 168 deletions(-) delete mode 100644 share/termcap/reorder delete mode 100644 share/termcap/tck diff --git a/Makefile.inc1 b/Makefile.inc1 index afe0bc8b38..4d1bfa6c1d 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,6 +1,6 @@ # # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $ -# $DragonFly: src/Makefile.inc1,v 1.95 2006/12/26 11:27:44 sephe Exp $ +# $DragonFly: src/Makefile.inc1,v 1.96 2006/12/29 22:43:32 corecode Exp $ # # Build-time options are documented in make.conf(5). # @@ -774,7 +774,7 @@ bootstrap-tools: usr.bin/tsort usr.bin/tr usr.bin/join usr.bin/wc usr.bin/basename \ usr.bin/gencat usr.bin/chflags usr.bin/expand usr.bin/paste \ usr.bin/mklocale usr.bin/uuencode usr.bin/compile_et usr.bin/hexdump \ - usr.bin/vi usr.bin/cap_mkdb usr.bin/vgrind usr.bin/true usr.bin/false \ + usr.bin/cap_mkdb usr.bin/true usr.bin/false \ usr.bin/cmp usr.bin/xargs usr.bin/id usr.bin/env usr.bin/dirname \ usr.bin/tail \ usr.sbin/chown usr.sbin/mtree usr.sbin/config \ diff --git a/share/termcap/Makefile b/share/termcap/Makefile index 1d4b117867..5177b2b3bd 100644 --- a/share/termcap/Makefile +++ b/share/termcap/Makefile @@ -1,22 +1,16 @@ # @(#)Makefile 8.1 (Berkeley) 6/8/93 # $FreeBSD: src/share/termcap/Makefile,v 1.12.2.5 2002/07/17 15:10:20 ru Exp $ -# $DragonFly: src/share/termcap/Makefile,v 1.3 2005/07/07 11:49:56 corecode Exp $ +# $DragonFly: src/share/termcap/Makefile,v 1.4 2006/12/29 22:43:32 corecode Exp $ -# 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 +FILES= map3270 termcap.src termcap.db +FILENAME_termcap.src= termcap FILESDIR= ${BINDIR}/misc -CLEANFILES+= termcap termcap.db +CLEANFILES+= termcap.db -termcap: reorder termcap.src - TERM=dumb TERMCAP=dumb: ex - ${.CURDIR}/termcap.src < ${.CURDIR}/reorder - -termcap.db: termcap - cap_mkdb termcap +termcap.db: termcap.src + cap_mkdb -f termcap ${.ALLSRC} etc-termcap: ${LN} -fs ${BINDIR}/misc/termcap ${DESTDIR}/etc/termcap diff --git a/share/termcap/reorder b/share/termcap/reorder deleted file mode 100644 index f824d872f8..0000000000 --- a/share/termcap/reorder +++ /dev/null @@ -1,63 +0,0 @@ -" $FreeBSD: src/share/termcap/reorder,v 1.4.8.1 2003/04/29 12:01:57 schweikh Exp $ -" $DragonFly: src/share/termcap/Attic/reorder,v 1.2 2003/06/17 04:37:03 dillon Exp $ -/# << EOH -/k a -/^adm12|/;.,/^[^ ]/-m'a -/^pcplot/;.,/^[^ ]/-m'a -/^c100|/;.,/^[^ ]/-m'a -/^c100-rv|/;.,/^[^ ]/-m'a -/^c100-rv-pp|/;.,/^[^ ]/-m'a -/^c108-4p|/;.,/^[^ ]/-m'a -/^c108-rv-4p|/;.,/^[^ ]/-m'a -/^c108|/;.,/^[^ ]/-m'a -/^c108-rv-8p|/;.,/^[^ ]/-m'a -/^avt|/;.,/^[^ ]/-m'a -/^avt-rv|/;.,/^[^ ]/-m'a -/^avt-4p-s|/;.,/^[^ ]/-m'a -/^avt-8p-s|/;.,/^[^ ]/-m'a -/^ansi.sys|/;.,/^[^ ]/-m'a -/^ansi.sysk|/;.,/^[^ ]/-m'a -/^nansi.sys|/;.,/^[^ ]/-m'a -/^nansi.sysk|/;.,/^[^ ]/-m'a -/^h19k|/;.,/^[^ ]/-m'a -/^msk22714|/;.,/^[^ ]/-m'a -/^msk227am|/;.,/^[^ ]/-m'a -/^msk227|/;.,/^[^ ]/-m'a -/^pckermit120|/;.,/^[^ ]/-m'a -/^pckermit|/;.,/^[^ ]/-m'a -/^kermitam|/;.,/^[^ ]/-m'a -/^kermit|/;.,/^[^ ]/-m'a -/^sun-17|/;.,/^[^ ]/-m'a -/^sun-24|/;.,/^[^ ]/-m'a -/^sun-34|/;.,/^[^ ]/-m'a -/^sun-48|/;.,/^[^ ]/-m'a -/^sun-e-s|/;.,/^[^ ]/-m'a -/^sun-s|/;.,/^[^ ]/-m'a -/^sun-e|/;.,/^[^ ]/-m'a -/^sun|/;.,/^[^ ]/-m'a -/^xterm|/;.,/^[^ ]/-m'a -/^adm3|/;.,/^[^ ]/-m'a -/^adm31|/;.,/^[^ ]/-m'a -/^adm3a|/;.,/^[^ ]/-m'a -/^tvi924vb|/;.,/^[^ ]/-m'a -/^tvi924|/;.,/^[^ ]/-m'a -/^tvi912|/;.,/^[^ ]/-m'a -/^920b|/;.,/^[^ ]/-m'a -/^tvi925vb|/;.,/^[^ ]/-m'a -/^tvi925|/;.,/^[^ ]/-m'a -/^vt100|/;.,/^[^ ]/-m'a -/^vt200|/;.,/^[^ ]/-m'a -/^hp|/;.,/^[^ ]/-m'a -/^hp2645|/;.,/^[^ ]/-m'a -/^2621-nl|/;.,/^[^ ]/-m'a -/^2621|/;.,/^[^ ]/-m'a -/^h29|/;.,/^[^ ]/-m'a -/^h19|/;.,/^[^ ]/-m'a -/^h19-u|/;.,/^[^ ]/-m'a -/^h19-us|/;.,/^[^ ]/-m'a -/^h19-e|/;.,/^[^ ]/-m'a -/^h19-g|/;.,/^[^ ]/-m'a -/^dmd|/;.,/^[^ ]/-m'a -/^s/;.,/^#/-m'a -'ad -w! termcap -q diff --git a/share/termcap/tck b/share/termcap/tck deleted file mode 100644 index a0e7c13199..0000000000 --- a/share/termcap/tck +++ /dev/null @@ -1,91 +0,0 @@ -#!/bin/sh - -# -# Copyright (c) 1991, 1993 -# The Regents of the University of California. All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. All advertising materials mentioning features or use of this software -# must display the following acknowledgement: -# This product includes software developed by the University of -# California, Berkeley and its contributors. -# 4. Neither the name of the University nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -# SUCH DAMAGE. -# -# @(#)tck 8.1 (Berkeley) 6/8/93 -# - -# Look for default (and termcap-only?) capabilities. -# Defaults should be removed to save space. - -showtc $* | \ -sed -n \ - -e 's/ bc=^H$/DEFAULT &/p' \ - -e 's/ bc=\\h$/DEFAULT &/p' \ - -e 's/ bc=\\10$/DEFAULT &/p' \ - -e 's/ bc=\\010$/DEFAULT &/p' \ - -e 's/ bl=^G$/DEFAULT &/p' \ - -e 's/ bl=\\7$/DEFAULT &/p' \ - -e 's/ bl=\\07$/DEFAULT &/p' \ - -e 's/ bl=\\007$/DEFAULT &/p' \ - -e 's/ cr=^M$/DEFAULT &/p' \ - -e 's/ cr=\\r$/DEFAULT &/p' \ - -e 's/ cr=\\15$/DEFAULT &/p' \ - -e 's/ cr=\\015$/DEFAULT &/p' \ - -e 's/ ff=^L$/DEFAULT &/p' \ - -e 's/ ff=^L$/DEFAULT &/p' \ - -e 's/ ff=\\14$/DEFAULT &/p' \ - -e 's/ ff=\\014$/DEFAULT &/p' \ - -e 's/ nl=^J$/DEFAULT &/p' \ - -e 's/ nl=\\n$/DEFAULT &/p' \ - -e 's/ nl=\\12$/DEFAULT &/p' \ - -e 's/ nl=\\012$/DEFAULT &/p' \ - -e 's/ ta=^I$/DEFAULT &/p' \ - -e 's/ ta=\\t$/DEFAULT &/p' \ - -e 's/ ta=\\11$/DEFAULT &/p' \ - -e 's/ ta=\\011$/DEFAULT &/p' \ - \ - -e 's/ bc$/TERMCAP ONLY &/p' \ - -e 's/ bs$/TERMCAP ONLY &/p' \ - -e 's/ dB$/TERMCAP ONLY &/p' \ - -e 's/ dC$/TERMCAP ONLY &/p' \ - -e 's/ dF$/TERMCAP ONLY &/p' \ - -e 's/ dN$/TERMCAP ONLY &/p' \ - -e 's/ dT$/TERMCAP ONLY &/p' \ - -e 's/ dV$/TERMCAP ONLY &/p' \ - -e 's/ EP$/TERMCAP ONLY &/p' \ - -e 's/ HD$/TERMCAP ONLY &/p' \ - -e 's/ kn$/TERMCAP ONLY &/p' \ - -e 's/ ko$/TERMCAP ONLY &/p' \ - -e 's/ LC$/TERMCAP ONLY &/p' \ - -e 's/ ma$/TERMCAP ONLY &/p' \ - -e 's/ ml$/TERMCAP ONLY &/p' \ - -e 's/ mu$/TERMCAP ONLY &/p' \ - -e 's/ nc$/TERMCAP ONLY &/p' \ - -e 's/ NL$/TERMCAP ONLY &/p' \ - -e 's/ nl$/TERMCAP ONLY &/p' \ - -e 's/ ns$/TERMCAP ONLY &/p' \ - -e 's/ OP$/TERMCAP ONLY &/p' \ - -e 's/ pt$/TERMCAP ONLY &/p' \ - -e 's/ UC$/TERMCAP ONLY &/p' \ - -e 's/ xr$/TERMCAP ONLY &/p' \ - -e 's/ xx$/TERMCAP ONLY &/p' \ -- 2.41.0