Index: vendor/NetBSD/bmake/do-update.sh =================================================================== --- vendor/NetBSD/bmake/do-update.sh (revision 296963) +++ vendor/NetBSD/bmake/do-update.sh (nonexistent) @@ -1,85 +0,0 @@ -: -# $FreeBSD$ - -# "global" vars -ECHO= -# Set SVN variables -# select the local subversion site -SVN=${SVN:-/usr/local/bin/svn} -SITE=${SITE:-ftp://ftp.netbsd.org/pub/NetBSD/misc/sjg} - -# For consistency... -Error() { - echo ERROR: ${1+"$@"} >&2 - exit 1 -} - -Cd() { - [ $# -eq 1 ] || Error "Cd() takes a single parameter." - cd $1 || Error "cannot \"cd $1\" from $PWD" -} - -# Call this function and then follow it by any specific import script additions -option_parsing() { - local _shift=$# - # Parse command line options - while : - do - case "$1" in - *=*) eval "$1"; shift;; - --) shift; break;; - -a) TARBALL=$2; shift 2;; - -b) TARBALL=$2; shift 2;; - -n) ECHO=echo; shift;; - -P) PR=$2; shift 2;; - -r) REVIEWER=$2; shift 2;; - -u) url=$2; shift 2;; - -v) VERSION=$2; shift 2;; - -h) echo "Usage:"; - echo " "$0 '[-abhnPrv] [ARCHIVE=] [TARBALL=] [PR=] [REVIEWER=] [VERSION=]' - echo " "$0 '-a # (a)rchive' - echo " "$0 '-b # tar(b)all' - echo " "$0 '-h # print usage' - echo " "$0 '-n # do not import, check only.' - echo " "$0 '-P # Use PR' - echo " "$0 '-r # (r)eviewed by' - echo " "$0 '-v # (v)ersion#' - echo " "$0 'PR=' - echo " "$0 'REVIEWER=' - echo " "$0 'VERSION=' - exit 1;; - *) break;; - esac - done - TARBALL=${ARCHIVE:-${TARBALL}} - return $(($_shift - $#)) -} - -### - -option_parsing "$@" -shift $? - -Cd `dirname $0` -test -s ${TARBALL:-/dev/null} || Error need TARBALL -rm -rf bmake -TF=/tmp/.$USER.$$ - -tar zxf $TARBALL -MAKE_VERSION=`grep '^MAKE_VERSION' bmake/Makefile | sed 's,.*=[[:space:]]*,,'` -rm -rf bmake/missing -('cd' dist && $SVN list -R) | grep -v '/$' | sort > $TF.old -('cd' bmake && find . -type f ) | cut -c 3- | sort > $TF.new -comm -23 $TF.old $TF.new > $TF.rmlist -comm -13 $TF.old $TF.new > $TF.addlist -[ -s $TF.rmlist ] && { echo rm:; cat $TF.rmlist; } -[ -s $TF.addlist ] && { echo add:; cat $TF.addlist; } -('cd' bmake && tar cf - . | tar xf - -C ../dist) -('cd' dist -test -s $TF.rmlist && xargs $SVN rm < $TF.rmlist -test -s $TF.addlist && xargs $SVN --parents add < $TF.addlist -) - -url=`$SVN info | sed -n '/^URL:/s,URL: ,,p'` -echo After committing dist... -echo $SVN cp $url/dist $url/$MAKE_VERSION Property changes on: vendor/NetBSD/bmake/do-update.sh ___________________________________________________________________ Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:executable ## -1 +0,0 ## -* \ No newline at end of property Deleted: svn:keywords ## -1 +0,0 ## -FreeBSD=%H \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: vendor/NetBSD/bmake/import.sh =================================================================== --- vendor/NetBSD/bmake/import.sh (nonexistent) +++ vendor/NetBSD/bmake/import.sh (revision 296964) @@ -0,0 +1,86 @@ +: +# $FreeBSD$ + +# "global" vars +ECHO= +# Set SVN variables +# select the local subversion site +SVN=${SVN:-/usr/local/bin/svn} + +# For consistency... +Error() { + echo ERROR: ${1+"$@"} >&2 + exit 1 +} + +Cd() { + [ $# -eq 1 ] || Error "Cd() takes a single parameter." + cd $1 || Error "cannot \"cd $1\" from $PWD" +} + +# Call this function and then follow it by any specific import script additions +option_parsing() { + local _shift=$# + # Parse command line options + while : + do + case "$1" in + *=*) eval "$1"; shift;; + --) shift; break;; + -a) TARBALL=$2; shift 2;; + -n) ECHO=echo; shift;; + -P) PR=$2; shift 2;; + -r) REVIEWER=$2; shift 2;; + -u) url=$2; shift 2;; + -h) echo "Usage:"; + echo " "$0 '[-ahnPr] [TARBALL=] [PR=] [REVIEWER=]' + echo " "$0 '-a # (a)rchive' + echo " "$0 '-h # print usage' + echo " "$0 '-n # do not import, check only.' + echo " "$0 '-P # Use PR' + echo " "$0 '-r # (r)eviewed by' + echo " "$0 'PR=' + echo " "$0 'REVIEWER=' + exit 1;; + *) break;; + esac + done + return $(($_shift - $#)) +} + +### + +option_parsing "$@" +shift $? + +TF=/tmp/.$USER.$$ +Cd `dirname $0` +test -s ${TARBALL:-/dev/null} || Error need TARBALL +here=`pwd` +# thing should match what the TARBALL contains +thing=`basename $here` + +rm -rf $thing +tar zxf $TARBALL + +# steps unique to bmake +VERSION=`grep '^MAKE_VERSION' bmake/Makefile | sed 's,.*=[[:space:]]*,,'` +rm -rf bmake/missing + +# the rest should be common +('cd' dist && $SVN list -R) | grep -v '/$' | sort > $TF.old +('cd' $thing && find . -type f ) | cut -c 3- | sort > $TF.new +comm -23 $TF.old $TF.new > $TF.rmlist +comm -13 $TF.old $TF.new > $TF.addlist +[ -s $TF.rmlist ] && { echo rm:; cat $TF.rmlist; } +[ -s $TF.addlist ] && { echo add:; cat $TF.addlist; } +('cd' $thing && tar cf - . | tar xf - -C ../dist) +('cd' dist +test -s $TF.rmlist && xargs $SVN rm < $TF.rmlist +test -s $TF.addlist && xargs $SVN --parents add < $TF.addlist +) + +url=`$SVN info | sed -n '/^URL:/s,URL: ,,p'` +echo After committing dist... run tag.sh +echo "$SVN cp $url/dist $url/$VERSION" > tag.sh + Property changes on: vendor/NetBSD/bmake/import.sh ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property