From: akfaew <akfaew@openbsd.org>
Date: Tue, 20 Jun 2017 20:24:07 +0000 (+0000)
Subject: Remove locate.concatdb, it never worked.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=8584512ba683c88b9cfb064a7fd93c25501907ad;p=openbsd

Remove locate.concatdb, it never worked.

OK millert@
---

diff --git a/usr.bin/locate/locate/Makefile b/usr.bin/locate/locate/Makefile
index 4435eab7c7d..cc85a6d6006 100644
--- a/usr.bin/locate/locate/Makefile
+++ b/usr.bin/locate/locate/Makefile
@@ -1,13 +1,13 @@
-#	$OpenBSD: Makefile,v 1.11 2015/11/21 19:35:20 jmc Exp $
+#	$OpenBSD: Makefile,v 1.12 2017/06/20 20:24:07 akfaew Exp $
 #
 #	@(#)Makefile	8.1 (Berkeley) 6/6/93
-# $Id: Makefile,v 1.11 2015/11/21 19:35:20 jmc Exp $
+# $Id: Makefile,v 1.12 2017/06/20 20:24:07 akfaew Exp $
 
 PROG=	locate
 SRCS=	util.c locate.c
 CFLAGS+= -I${.CURDIR}
 MAN=	locate.1	locate.updatedb.8
-SCRIPTS= updatedb mklocatedb concatdb
+SCRIPTS= updatedb mklocatedb
 
 
 beforeinstall:
diff --git a/usr.bin/locate/locate/concatdb.sh b/usr.bin/locate/locate/concatdb.sh
deleted file mode 100644
index 4c3ba44ab83..00000000000
--- a/usr.bin/locate/locate/concatdb.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-# $OpenBSD: concatdb.sh,v 1.10 2003/06/29 21:59:28 millert Exp $
-#
-# Copyright (c) September 1995 Wolfram Schneider <wosch@FreeBSD.org>. Berlin.
-# 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.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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.
-#
-# concatdb - concatenate locate databases
-# 
-# usage: concatdb database1 ... databaseN > newdb
-#
-# Sequence of databases is important.
-#
-# $Id: concatdb.sh,v 1.10 2003/06/29 21:59:28 millert Exp $
-
-# The directory containing locate subprograms
-: ${LIBEXECDIR=/usr/libexec}; export LIBEXECDIR
-
-PATH=$LIBEXECDIR:/bin:/usr/bin:$PATH; export PATH
-
-umask 077			# protect temp files
-
-TMPDIR=${TMPDIR:-/tmp}; export TMPDIR;
-if test X"$TMPDIR" = X -o ! -d "$TMPDIR"; then
-	TMPDIR=/tmp; export TMPDIR
-fi
-
-# utilities to built locate database
-: ${bigram=locate.bigram}
-: ${code=locate.code}
-: ${sort=sort -H}
-
-
-case $# in 
-        [01]) 	echo 'usage: concatdb databases1 ... databaseN > newdb'
-		exit 1
-		;;
-esac
-
-bigrams=`mktemp ${TMPDIR=/tmp}/_bigrams.XXXXXXXXXX` || exit 1
-
-trap 'rm -f $bigrams' 0 1 2 3 5 10 15
-
-for db 
-do
-       $locate -d $db /
-done | $bigram | $sort -nr | awk 'BEGIN { ORS = "" } NR <= 128 { print $2 }' > $bigrams
-
-for db
-do
-	$locate -d $db /
-done | $code $bigrams