freebsd-skq/crypto/openssh/freebsd-post-merge.sh

#!/bin/sh
#
# $FreeBSD$
#

xargs perl -n -i -e '
	print;
	s/\$(Id|OpenBSD): [^\$]*/\$FreeBSD/ && print;
' <keywords

xargs perl -n -i -e '
	print;
	m/^\#include "includes.h"/ && print "__RCSID(\"\$FreeBSD\$\");\n";
' <rcsid
Add a pre-merge script which reverts mechanical changes such as added $FreeBSD$ tags and man page dates. Add a post-merge script which reapplies these changes. Run both scripts to normalize the existing code base. As a result, many files which should have had $FreeBSD$ tags but didn't now have them. Partly rewrite the upgrade instructions and remove the now outdated list of tricks. 2014-03-24 19:15:13 +00:00			`#!/bin/sh`
			`#`
			`# $FreeBSD$`
			`#`

			`xargs perl -n -i -e '`
			`print;`
			`s/\$(Id\|OpenBSD): [^\$]*/\$FreeBSD/ && print;`
			`' <keywords`

Update the pre- and post-merge scripts to work correctly after the recent cleanup. A round-trip (./freebsd-pre-merge.sh ; ./freebsd-post-merge.sh) now results in an unchanged working copy. 2016-01-19 12:38:53 +00:00			`xargs perl -n -i -e '`
			`print;`
			`m/^\#include "includes.h"/ && print "__RCSID(\"\$FreeBSD\$\");\n";`
			`' <rcsid`