From owner-svn-src-vendor@freebsd.org  Thu Nov  7 18:07:34 2019
Return-Path: <owner-svn-src-vendor@freebsd.org>
Delivered-To: svn-src-vendor@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id E2F5F1BB83F;
 Thu,  7 Nov 2019 18:07:34 +0000 (UTC)
 (envelope-from phil@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 server-signature RSA-PSS (4096 bits)
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 478BFf5ldnz43Xv;
 Thu,  7 Nov 2019 18:07:34 +0000 (UTC)
 (envelope-from phil@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A1AB019A7E;
 Thu,  7 Nov 2019 18:07:34 +0000 (UTC)
 (envelope-from phil@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id xA7I7Yv5063860;
 Thu, 7 Nov 2019 18:07:34 GMT (envelope-from phil@FreeBSD.org)
Received: (from phil@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id xA7I7Ywq063859;
 Thu, 7 Nov 2019 18:07:34 GMT (envelope-from phil@FreeBSD.org)
Message-Id: <201911071807.xA7I7Ywq063859@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: phil set sender to
 phil@FreeBSD.org using -f
From: Phil Shafer <phil@FreeBSD.org>
Date: Thu, 7 Nov 2019 18:07:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r354456 - vendor/Juniper/libxo
X-SVN-Group: vendor
X-SVN-Commit-Author: phil
X-SVN-Commit-Paths: vendor/Juniper/libxo
X-SVN-Commit-Revision: 354456
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-vendor@freebsd.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: SVN commit messages for the vendor work area tree
 <svn-src-vendor.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-vendor>, 
 <mailto:svn-src-vendor-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-vendor/>
List-Post: <mailto:svn-src-vendor@freebsd.org>
List-Help: <mailto:svn-src-vendor-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-vendor>,
 <mailto:svn-src-vendor-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Nov 2019 18:07:35 -0000

Author: phil
Date: Thu Nov  7 18:07:34 2019
New Revision: 354456
URL: https://svnweb.freebsd.org/changeset/base/354456

Log:
  Remove oxtradoc version of documentation; move to RST/Sphinx

Modified:
  vendor/Juniper/libxo/import.sh

Modified: vendor/Juniper/libxo/import.sh
==============================================================================
--- vendor/Juniper/libxo/import.sh	Thu Nov  7 18:06:44 2019	(r354455)
+++ vendor/Juniper/libxo/import.sh	Thu Nov  7 18:07:34 2019	(r354456)
@@ -26,14 +26,19 @@ GMAKE=${GMAKE:-gmake}
 
 # For consistency...
 Error() {
-	echo ERROR: ${1+"$@"} >&2
-	exit 1
+    echo ERROR: ${1+"$@"} >&2
+    exit 1
 }
 
 Cd() {
-	[ $# -eq 1 ] || Error "Cd() takes a single parameter."
-	cd $1 || Error "cannot \"cd $1\" from $PWD"
-        info "Directory =" `pwd`
+    [ $# -eq 1 ] || Error "Cd() takes a single parameter."
+    cd $1 || Error "cannot \"cd $1\" from $PWD"
+    info "Directory =" `pwd`
+         
+    if [ "$DOC" = doc ]; then
+       echo "    cd $1"
+       echo "  "
+    fi
 }
 
 siginfo() {
@@ -51,8 +56,8 @@ run() {
     CMD="$2"
 
     if [ "$DOC" = doc ]; then
-        echo " == $desc"
-        echo "     - $cmd"
+        echo "## $desc"
+        echo "     $cmd"
         echo " "
     else
         echo "===="
@@ -66,7 +71,7 @@ run() {
 }
 
 info() {
-    echo " -- " "$@"
+    echo "## -- " "$@"
 }
 
 okay() {
@@ -182,13 +187,7 @@ fi
 
 # We need the release tar ball for the HTML docs, nothing more
 DOCURL=https://github.com/Juniper/libxo/releases/download/$VERS/libxo-$VERS.tar.gz
-DOCBALL=~/tars/doc-$BASEURL
 
-if [ "$FETCH" = "yes" -o ! -f $DOCBALL ]; then
-    run "fetching doc tarball" "fetch -o $DOCBALL $DOCURL"
-    test -s ${DOCBALL} || Error need DOCBALL
-fi
-
 # BASE should match what the TARBALL contains
 BASE=`basename $TARBALL .tar.gz`
 VERSION=`echo $BASE | sed 's/libxo-//'`
@@ -196,8 +195,6 @@ VERSION=`echo $BASE | sed 's/libxo-//'`
 TF=$BASE/info
 
 run "untarring source files TARBALL" "tar zxf $TARBALL"
-run "untarring html manual" \
-    "tar zxf $DOCBALL libxo-$VERS/doc/libxo-manual.html"
 
 # List of top-level files we want to ignore
 TOPJUNKFILES="\