Remove last traces of bmp here too.

Was not installed for a long time and recently removed from NetBSD base.

5 files changed, 4 insertions, 340 deletions

diff --git a/pkgtools/pkg_install/files/Makefile.in b/pkgtools/pkg_install/files/Makefile.in
index 10426801f4e..9a10d38e4ab 100644
--- a/pkgtools/pkg_install/files/Makefile.in
+++ b/pkgtools/pkg_install/files/Makefile.in
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.in,v 1.11 2015/12/27 12:36:42 joerg Exp $
+# $NetBSD: Makefile.in,v 1.12 2016/06/30 17:42:04 wiz Exp $
 
 BOOTSTRAP=	@bootstrap@
 
@@ -22,4 +22,3 @@ distclean: clean
 	rm -f config.log config.status configure.lineno
 	rm -f Makefile */Makefile
 	rm -f lib/config.h lib/pkg_install.conf.5 lib/pkg_install.conf.cat
-	rm -f bpm/bpm.sh
diff --git a/pkgtools/pkg_install/files/bpm/bpm.1 b/pkgtools/pkg_install/files/bpm/bpm.1
deleted file mode 100644
index 8f731b80e2a..00000000000
--- a/pkgtools/pkg_install/files/bpm/bpm.1
+++ /dev/null
@@ -1,114 +0,0 @@
-.\" $NetBSD: bpm.1,v 1.8 2013/07/20 21:50:53 wiz Exp $ */
-.\"
-.\" Copyright (c) 2003,2009 The NetBSD Foundation, Inc.
-.\" All rights reserved.
-.\"
-.\" This code is derived from software contributed to The NetBSD Foundation
-.\" by Alistair Crooks (agc@NetBSD.org)
-.\"
-.\" 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
-.\"
-.Dd August 3, 2007
-.Dt BPM 1
-.Os
-.Sh NAME
-.Nm bpm
-.Nd menu-based binary package manager
-.Sh SYNOPSIS
-.Nm
-.Op Fl hnVv
-.Op Fl b Ar baseURL
-.Op Fl m Ar machine
-.Op Fl r Ar release
-.Op Fl w Ar seconds
-.Sh DESCRIPTION
-The
-.Nm
-command is used to locate and install binary packages from any
-reachable URL.
-.Pp
-The following command-line options are supported:
-.Bl -tag -width indent
-.It Fl b Ar baseURL
-Specify a base URL from which to download binary packages.
-The default URL is
-.Pa ftp://ftp.NetBSD.org/pub/pkgsrc/packages .
-.It Fl h
-Print a help message and then exit.
-.It Fl m Ar machine
-Use
-.Ar machine
-as the machine architecture to be used, instead of that returned by
-.Xr uname 1 .
-.It Fl n
-Don't actually execute the commands to add the package.
-.It Fl r Ar release
-Use
-.Ar release
-as the operating system release to be used, instead of that returned by
-.Xr uname 1 .
-.It Fl V
-Print version number and exit.
-.It Fl v
-Turn on verbose output.
-.It Fl w Ar seconds
-The number of
-.Ar seconds
-to wait after displaying an error message and returning to
-normal menu operations.
-.El
-.Pp
-.Nm
-provides a menu-based binary package manager for
-.Nx .
-.Nm
-first connects to the URL using
-.Xr ftp 1 ,
-and displays a list of categories for which binary packages exist.
-If no categories are displayed, it could
-be that the machine architecture or operating system release string
-have been wrongly interpreted, and that it will be necessary to override
-this values by means of the command line options.
-Within a category, a list of packages will be displayed, and by selecting
-one using the number assigned to it, the package will be downloaded
-automatically, and installed, using the
-.Xr pkg_add 1
-utility.
-It is also possible to change the category currently being examined,
-and to quit from the utility, simply by selecting the appropriate choices
-on the menu.
-.Sh ENVIRONMENT
-The environment variables which govern the behavior of
-.Xr ftp 1
-and
-.Xr pkg_add 1
-are valid for
-.Nm .
-.Sh SEE ALSO
-.Xr ftp 1 ,
-.Xr pkg_add 1 ,
-.Xr uname 1
-.Sh AUTHORS
-The
-.Nm
-utility was written by
-.An Alistair Crooks Aq Mt agc@NetBSD.org .
diff --git a/pkgtools/pkg_install/files/bpm/bpm.sh.in b/pkgtools/pkg_install/files/bpm/bpm.sh.in
deleted file mode 100644
index 6e31f111a9e..00000000000
--- a/pkgtools/pkg_install/files/bpm/bpm.sh.in
+++ /dev/null
@@ -1,220 +0,0 @@
-#! /bin/sh
-#
-# $NetBSD: bpm.sh.in,v 1.5 2012/02/21 18:32:14 wiz Exp $
-#
-# Copyright (c) 2003,2009 The NetBSD Foundation, Inc.
-# All rights reserved.
-#
-# This code is derived from software contributed to The NetBSD Foundation
-# by Alistair Crooks (agc@NetBSD.org)
-#
-# 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 NETBSD FOUNDATION, INC. 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 FOUNDATION 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.
-#
-
-die()
-{
-	echo >&2 "$@"
-	exit 1
-}
-
-check_prog()
-{
-	_var="$1"; _name="$2"
-
-	eval _tmp=\"\$$_var\"
-	if [ "x$_tmp" != "x" ]; then
-		# Variable is already set (by the user, for example)
-		return 0
-	fi
-
-	for _d in `echo $PATH | tr ':' ' '`; do
-		if [ -x "$_d/$_name" ]; then
-			# Program found
-			eval $_var=\""$_d/$_name"\"
-			return 1
-		fi
-	done
-
-	die "$_name not found in path."
-}
-
-check_prog awkprog awk
-check_prog echoprog echo
-check_prog ftpprog ftp
-check_prog idprog id
-check_prog moreprog more
-check_prog pkg_addprog pkg_add
-check_prog rmprog rm
-check_prog sedprog sed
-check_prog suprog su
-check_prog unameprog uname
-
-# print version and exit
-version() {
-	$pkg_addprog -V
-	exit 0
-}
-
-# temporary files
-tmpcategories=/tmp/categories.$$
-tmppackages=/tmp/packages.$$
-
-# some base parameters
-base=ftp://ftp.NetBSD.org/pub/pkgsrc/packages
-release=`${unameprog} -r | ${sedprog} -e 's/_STABLE//'`
-machine=`${unameprog} -m`
-
-sleepsecs=1
-
-doit=""
-
-while [ $# -gt 0 ]; do
-	case $1 in
-	-V)	version ;;
-	-b)	base=$2; shift ;;
-	-h)	${echoprog} "$0 [-b BaseURL] [-h] [-m machine] [-n] [-r release] [-v] [-w secs]"; exit 0;;
-	-m)	machine=$2; shift ;;
-	-n)	doit=":" ;;
-	-r)	release=$2; shift ;;
-	-v)	set -x ;;
-	-w)	sleepsecs=$2; shift ;;
-	*)	break ;;
-	esac
-	shift
-done
-
-category=""
-
-while true; do
-	# if we don't have a packages file, then we need to choose a category
-	case "$category" in
-	"")	# get possible categories
-		if [ ! -f $tmpcategories ]; then
-			${echoprog} "Downloading package categories from ${base}..."
-			${echoprog} "** QUIT" > $tmpcategories
-			${echoprog} ls | ${ftpprog} ${base}/${release}/${machine}/ 2>/dev/null | \
-				${awkprog} 'NF == 9 { if ($9 != "All") print $9 }' >> $tmpcategories
-		fi
-
-		# check for bad release numbering
-		# - it usually shows with 0 categories being displayed
-		${awkprog} 'END { if (NR == 1) { print "\n\n\n*** No categories found - is the OS release set properly? ***\n\n\n" } }' < $tmpcategories
-	
-		# display possible categories
-		${awkprog} '{ print NR ". " $0 }' < $tmpcategories | ${moreprog}
-
-		# read a category number from the user
-		${echoprog} -n "Please type the category number: "
-		read choice
-
-		# validate user's choice
-		case "$choice" in
-		0|1)		${rmprog} -f $tmpcategories $tmppackages; exit 0 ;;
-		[2-9]|[0-9]*)	category=`${awkprog} 'NR == '$choice' { print }' < $tmpcategories` ;;
-		*)		category="" ;;
-		esac
-		case "$category" in
-		"")	${echoprog} "No such category \"$choice\""
-			sleep $sleepsecs
-			continue
-			;;
-		esac
-
-		# get possible packages
-		${echoprog} ""
-		${echoprog} "Downloading package names from ${base}/${category}..."
-		${echoprog} "** QUIT" > $tmppackages
-		${echoprog} "** Change category" >> $tmppackages
-		${echoprog} ls | ${ftpprog} ${base}/${release}/${machine}/${category}/ 2>/dev/null \
-			| ${awkprog} 'NF == 11 { print $9 }' >> $tmppackages
-		;;
-	esac
-
-	# display possible packages
-	${awkprog} '{ print NR ". " $0 }' < $tmppackages | ${moreprog}
-
-	# read a package number from the user
-	${echoprog} -n "Please type the package number: "
-	read choice
-
-	# validate user's choice
-	case "$choice" in
-	1)	${rmprog} -f $tmppackages $tmpcategories; exit 0 ;;
-	2)	category=""; continue ;; # no package to install - choose new category
-	[3-9]|[0-9]*)	package=`${awkprog} 'NR == '$choice' { print }' < $tmppackages` ;;
-	*)	package="" ;;
-	esac
-	case "$package" in
-	"")	${echoprog} "No such package \"$choice\""
-		sleep $sleepsecs
-		continue
-		;;
-	esac
-
-	# check it's not already installed
-	pkgbase=`${echoprog} ${package} | ${sedprog} -e 's|-[0-9].*||'`
-	installed=`pkg_info -e $pkgbase`
-	case "$installed" in
-	"")	;;
-	*)	${echoprog} "$package selected, but $installed already installed"
-		sleep $sleepsecs
-		continue
-		;;
-	esac
-
-	# Tell people what we're doing
-	${echoprog} ""
-	${echoprog} "Adding package ${base}/${release}/${machine}/${category}/${package}"
-
-	cmd="env PKG_PATH=${base}/${release}/${machine}/All ${pkg_addprog} ${package}"
-
-	# check if we need to become root for this
-	if [ `${idprog} -u` != 0 ]; then
-		${echoprog} "Becoming root@`/bin/hostname` to add a binary package"
-		${echoprog} -n "`${echoprog} ${suprog} | $awkprog '{ print $1 }'` "
-		$doit ${suprog} root -c "$cmd"
-		success=$?
-	else
-		$doit $cmd
-		success=$?
-	fi
-
-	# give feedback after adding the package
-	case $success in
-	0)	${echoprog} "$package successfully installed" ;;
-	*)	${echoprog} "Problems when installing $package - please try again" ;;
-	esac
-
-	${echoprog} ""
-	${echoprog} -n "[Q]uit, [C]hange category, [I]nstall another package: "
-	read choice
-
-	case "$choice" in
-	[Qq])	break ;;
-	[Cc])	category="" ;;
-	[Ii])	;;
-	esac
-done
-
-${rmprog} -f $tmpcategories $tmppackages
-
-exit 0
diff --git a/pkgtools/pkg_install/files/configure b/pkgtools/pkg_install/files/configure
index 21579c95964..469e905a853 100755
--- a/pkgtools/pkg_install/files/configure
+++ b/pkgtools/pkg_install/files/configure
@@ -5281,7 +5281,7 @@ SYSCONFDIR="$sysconfdir"
 PKG_DBDIR="$pkgdbdir"
 
 
-ac_config_files="$ac_config_files Makefile add/Makefile admin/Makefile bpm/bpm.sh create/Makefile delete/Makefile info/Makefile lib/Makefile lib/pkg_install.conf.5 lib/pkg_install.conf.cat"
+ac_config_files="$ac_config_files Makefile add/Makefile admin/Makefile create/Makefile delete/Makefile info/Makefile lib/Makefile lib/pkg_install.conf.5 lib/pkg_install.conf.cat"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -5977,7 +5977,6 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "add/Makefile") CONFIG_FILES="$CONFIG_FILES add/Makefile" ;;
     "admin/Makefile") CONFIG_FILES="$CONFIG_FILES admin/Makefile" ;;
-    "bpm/bpm.sh") CONFIG_FILES="$CONFIG_FILES bpm/bpm.sh" ;;
     "create/Makefile") CONFIG_FILES="$CONFIG_FILES create/Makefile" ;;
     "delete/Makefile") CONFIG_FILES="$CONFIG_FILES delete/Makefile" ;;
     "info/Makefile") CONFIG_FILES="$CONFIG_FILES info/Makefile" ;;
diff --git a/pkgtools/pkg_install/files/configure.ac b/pkgtools/pkg_install/files/configure.ac
index 2ec1ab6c2be..3194a6958ef 100644
--- a/pkgtools/pkg_install/files/configure.ac
+++ b/pkgtools/pkg_install/files/configure.ac
@@ -1,4 +1,4 @@
-dnl $NetBSD: configure.ac,v 1.41 2016/02/14 08:06:54 agc Exp $
+dnl $NetBSD: configure.ac,v 1.42 2016/06/30 17:42:04 wiz Exp $
 dnl Process this file with autoconf to produce a configure script.
 AC_PREREQ(2.52)
 AC_INIT([pkg_install], [20090911], [joerg@NetBSD.org])
@@ -172,7 +172,7 @@ AC_SUBST(SYSCONFDIR)
 PKG_DBDIR="$pkgdbdir"
 AC_SUBST(PKG_DBDIR)
 
-AC_CONFIG_FILES([Makefile add/Makefile admin/Makefile bpm/bpm.sh \
+AC_CONFIG_FILES([Makefile add/Makefile admin/Makefile \
 	create/Makefile delete/Makefile info/Makefile \
 	lib/Makefile lib/pkg_install.conf.5 lib/pkg_install.conf.cat])
 AC_OUTPUT