From 1c71974b6c58151b2b5105eb3bb46aa5e88f054a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dag-Erling=20Sm=C3=B8rgrav?= <des@FreeBSD.org>
Date: Wed, 6 Feb 2008 23:14:24 +0000
Subject: [PATCH] Fix the Xlist so it actually works with 'tar -X', and update
 the upgrade instructions accordingly.

---
 crypto/openssh/FREEBSD-Xlist   | 13 ++++++-------
 crypto/openssh/FREEBSD-upgrade |  8 ++++----
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/crypto/openssh/FREEBSD-Xlist b/crypto/openssh/FREEBSD-Xlist
index 6d8ac040866f..3059451e64c6 100644
--- a/crypto/openssh/FREEBSD-Xlist
+++ b/crypto/openssh/FREEBSD-Xlist
@@ -1,10 +1,9 @@
 $FreeBSD$
 *.0
 */.cvsignore
-.cvsignore
-autom4te*
-config.h.in
-configure
-contrib
-regress/*.[0-9]
-stamp-h.in
+*autom4te*
+*config.h.in
+*configure
+*contrib
+*regress/*.[0-9]
+*stamp-h.in
diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade
index f379622bc832..3b561cd7c29c 100644
--- a/crypto/openssh/FREEBSD-upgrade
+++ b/crypto/openssh/FREEBSD-upgrade
@@ -12,12 +12,12 @@
 
 2) Unpack the tarball in a suitable directory.
 
+	$ tar xf openssh-X.YpZ.tar.gz \
+		-X /usr/src/crypto/openssh/FREEBSD-Xlist
+
 3) Remove trash:
 
-	$ sh -c 'while read glob ; do rm -rvf $glob ; done' \
-		</usr/src/crypto/openssh/FREEBSD-Xlist
-
-   Make sure that took care of everything, and if it didn't, make sure
+   Make sure -X took care of everything, and if it didn't, make sure
    to update FREEBSD-Xlist so you won't miss it the next time.  A good
    way to do this is to run a test import and see if any new files
    show up: