Crypto is now part of the base distribution. Remove crypto-install.sh,

and add scrypto, skrb5, ssecure into src-install.sh

Reminded by:	ru

2 files changed, 4 insertions, 26 deletions

diff --git a/release/scripts/crypto-install.sh b/release/scripts/crypto-install.sh
deleted file mode 100755
index 97feda1..0000000
--- a/release/scripts/crypto-install.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-#
-# $FreeBSD$
-#
-
-if [ "`id -u`" != "0" ]; then
-	echo "Sorry, this must be done as root."
-	exit 1
-fi
-_DEST=${DESTDIR:-/}
-echo "You are about to extract the CRYPTO distribution into ${_DEST} - are you SURE"
-echo "you want to do this over your installed system?  If not, hit ^C now,"
-echo -n "otherwise hit return to continue. "
-read junk
-cat crypto.?? | tar --unlink -xpzf - -C ${_DEST}
-echo -n "Do you want to install the CRYPTO sources (y/n)? "
-read ans
-if [ "$ans" = "y" ]; then
-	cat scrypto.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src
-	cat ssecure.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src
-	cat skrb5.?? | tar --unlink -xpzf - -C ${_DEST}/usr/src
-fi
-exit 0
diff --git a/release/scripts/src-install.sh b/release/scripts/src-install.sh
index f713a22..be0f1da 100755
--- a/release/scripts/src-install.sh
+++ b/release/scripts/src-install.sh
@@ -11,15 +11,16 @@ if [ $# -lt 1 ]; then
 	echo "You must specify which components of src to extract"
 	echo "possible subcomponents are:"
 	echo
-	echo "base bin contrib etc games gnu include lib libexec"
-	echo "release rescue sbin share sys tools ubin usbin"
+	echo "base bin contrib crypto etc games gnu include krb5 lib"
+	echo "libexec release rescue sbin secure share sys tools ubin"
+	echo "usbin"
 	echo
 	echo "You may also specify all to extract all subcomponents."
 	exit 1
 fi
 
 if [ "$1" = "all" ]; then
-	dists="base bin contrib etc games gnu include lib libexec release rescue sbin share sys tools ubin usbin"
+	dists="base bin contrib crypto etc games gnu include krb5 lib libexec release rescue sbin secure share sys tools ubin usbin"
 else
 	dists="$*"
 fi