Lainports/opnsense-ports
3
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Framework: sync with upstream

Browse source 
Taken from: FreeBSD
This commit is contained in:
Franco Fichtner 2015-09-21 07:18:21 +02:00
parent bbfb5d2631
commit ac5bee7883
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MOVED
View file

@ -7722,7 +7722,7 @@ security/rubygem-net-ssh27||2015-07-20|Has expired: not used by other ports anym
graphics/kuickshow-kde4||2015-07-21|Has expired: Broken for more than 6 months
graphics/sng||2015-07-21|Has expired: Broken for more than 6 months
japanese/netype||2015-07-21|Has expired: Broken for more than 6 months
databases/p5-DBD-Pg32|databases/p5-DBD-Pg|2015-07-22|Has expired: Use databases/p5-DBD-Pg instead, compatability probles are fixed
databases/p5-DBD-Pg32|databases/p5-DBD-Pg|2015-07-22|Has expired: Use databases/p5-DBD-Pg instead, compatibility probles are fixed
textproc/py-asciinema|textproc/asciinema|2015-07-23|Has expired: use textproc/asciinema instead
devel/libiomp5-devel|devel/llvm-devel|2015-07-24|Merged with devel/llvm-devel
devel/amd64-binutils||2015-07-25|No real use

9
Tools/scripts/mfh
View file

@ -67,7 +67,7 @@ do
esac
done
: ${svnserver:="svn.FreeBSD.org"}
: ${svnserver:="svn+ssh://repo.FreeBSD.org"}
if [ -n "$(type svn 2>/dev/null)" ]; then
svn=svn
@ -80,7 +80,7 @@ fi
trap "rc=\$? ; rm -rf \"\${dir}\" ; exit \$rc" EXIT
dir=$(mktemp -d /tmp/merge.XXXXXX)
cd "${dir}"
"${svn}" co --depth=empty svn+ssh://${svnserver}/ports/branches/"${branch}"
"${svn}" co --depth=empty ${svnserver}/ports/branches/"${branch}"
filelist=""
echo -n "MFH:" > commit.txt
@ -93,8 +93,7 @@ echo >> commit.txt
for rev in $@
do
rev=${rev##r}
# svn:// is faster than svn+ssh://. Use it wherever it's possible.
for f in $("${svn}" diff --summarize -c r${rev} svn://${svnserver}/ports/head); do
for f in $("${svn}" diff --summarize -c r${rev} ${svnserver}/ports/head); do
case ${f} in
*/*) ;;
*)continue;;
@ -103,7 +102,7 @@ do
f=${f%/*}
filelist="${filelist}${LF}${f}"
done
"${svn}" log -r${rev} svn://${svnserver}/ports/head | sed '1,2d;$d;/^MFH:/d' \
"${svn}" log -r${rev} ${svnserver}/ports/head | sed '1,2d;$d;/^MFH:/d' \
| sed '$d' >> commit.txt
done
filelist=$(printf '%s\n' "${filelist}" | sort -u)