From owner-svn-src-all@freebsd.org  Tue Apr 12 23:38:11 2016
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC713B0EA72;
 Tue, 12 Apr 2016 23:38:11 +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 mx1.freebsd.org (Postfix) with ESMTPS id BE37D18AA;
 Tue, 12 Apr 2016 23:38:11 +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 u3CNcAsF092731;
 Tue, 12 Apr 2016 23:38:10 GMT (envelope-from phil@FreeBSD.org)
Received: (from phil@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u3CNcAmQ092730;
 Tue, 12 Apr 2016 23:38:10 GMT (envelope-from phil@FreeBSD.org)
Message-Id: <201604122338.u3CNcAmQ092730@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: Tue, 12 Apr 2016 23:38:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-vendor@freebsd.org
Subject: svn commit: r297895 - vendor/Juniper/libxo
X-SVN-Group: vendor
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.21
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 12 Apr 2016 23:38:12 -0000

Author: phil
Date: Tue Apr 12 23:38:10 2016
New Revision: 297895
URL: https://svnweb.freebsd.org/changeset/base/297895

Log:
  add FreeBSD header to copied files

Modified:
  vendor/Juniper/libxo/import.sh

Modified: vendor/Juniper/libxo/import.sh
==============================================================================
--- vendor/Juniper/libxo/import.sh	Tue Apr 12 23:30:56 2016	(r297894)
+++ vendor/Juniper/libxo/import.sh	Tue Apr 12 23:38:10 2016	(r297895)
@@ -15,6 +15,9 @@
 PROJECT=libxo
 MAKEOBJDIRPREFIX=/tank/home/phil/work/bsd/base/head/obj/
 export MAKEOBJDIRPREFIX
+EDITOR=vi
+VISUAL=vi
+export EDITOR VISUAL
 
 #"global" vars
 # Set SVN variables
@@ -261,8 +264,8 @@ Cd $CWD/../../../head
 HEAD=`pwd`
 info "HEAD = $HEAD"
 
-run "copying xo_config.h" "cp $CWD/dist/build/libxo/xo_config.h $HEAD/lib/libxo/"
-run "copying add.man" "cp $CWD/dist/build/libxo/add.man $HEAD/lib/libxo/"
+run "copying xo_config.h" "(echo '/* \$FreeBSD\$ */' ; cat $CWD/dist/build/libxo/xo_config.h ) > $HEAD/lib/libxo/xo_config.h"
+run "copying add.man" "(echo '.\\\" \$FreeBSD\$' ; cat $CWD/dist/build/libxo/add.man ) > $HEAD/lib/libxo/add.man"
 
 #BUILDDIRS="lib/libxo usr.bin/xo"
 #for dir in $BUILDDIRS ; do
@@ -309,7 +312,7 @@ run "checking merge issues" "$SVN diff -
 Cd $HEAD
 run "show svn stat for 'head'" "$SVN stat"
 run "show svn diff for 'head'" "$SVN diff --no-diff-deleted"
-run "commit changes to 'head'" "$SVN -m 'Merge $PROJECT $VERSION' commit"
+run "commit changes to 'head'" "$SVN commit"
 run "show svn stat for 'head'" "$SVN stat"
 
 exit 0