Avoid embedding $NetBSD\$ and similiar constructs in-tree files.

The strings would be picked up for +BUILD_VERSION and create mismatches
when using ident on the same files.

5 files changed, 11 insertions, 11 deletions

diff --git a/pkgtools/createbuildlink/files/createbuildlink b/pkgtools/createbuildlink/files/createbuildlink
index 974308c11ea..abcd10015d8 100755
--- a/pkgtools/createbuildlink/files/createbuildlink
+++ b/pkgtools/createbuildlink/files/createbuildlink
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#	$NetBSD: createbuildlink,v 1.32 2006/07/12 13:29:03 wiz Exp $
+#	$NetBSD: createbuildlink,v 1.33 2007/07/10 15:27:57 joerg Exp $
 #
 # Copyright (c) 2002 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -39,7 +39,7 @@
 # Create an initial buildlink3.mk from a package's Makefile and PLIST
 #
 
-REV=`echo '$Revision: 1.32 $' | sed 's/\\$//g'`
+REV=`echo '$Revision: 1.33 $' | sed 's/\\$//g'`
 tmpdir=/tmp
 spacesintab=8
 makefile=Makefile
@@ -102,7 +102,7 @@ fi
 ## create sed rules
 ##
 echo  >$sedrules "s|@@CURDIR@@|$CURDIR|g"
-echo >>$sedrules "s|@@ID@@|\$NetBSD\$|g"
+echo >>$sedrules "s|@@ID@@|\$Net""BSD\$|g"
 echo >>$sedrules "s|@@PKGNAME@@|$PKGNAME|g"
 echo >>$sedrules "s|@@PKGNOVER@@|$PKGNOVER|g"
 echo >>$sedrules "s|@@PKGUPPER@@|$PKGUPPER|g"
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index f6c0edcb451..eee68cb4ea7 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.711 2007/06/26 06:08:11 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.712 2007/07/10 15:27:57 joerg Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -6576,7 +6576,7 @@ sub checkfile_distinfo($) {
 			if (open(PATCH, "<", $fname)) {
 				my $data = "";
 				foreach my $patchline (<PATCH>) {
-					$data .= $patchline unless $patchline =~ qr"\$NetBSD";
+					$data .= $patchline unless $patchline =~ qr"\$[N]etBSD";
 				}
 				close(PATCH);
 				my $chksum = Digest::SHA1::sha1_hex($data);
diff --git a/pkgtools/port2pkg/files/port2pkg.pl b/pkgtools/port2pkg/files/port2pkg.pl
index 25a1ca6ea9b..e826d503ac4 100755
--- a/pkgtools/port2pkg/files/port2pkg.pl
+++ b/pkgtools/port2pkg/files/port2pkg.pl
@@ -1,6 +1,6 @@
 #!/usr/bin/env perl
 #
-# $NetBSD: port2pkg.pl,v 1.18 2007/02/23 15:29:14 ginsbach Exp $
+# $NetBSD: port2pkg.pl,v 1.19 2007/07/10 15:27:57 joerg Exp $
 #
 
 require 'getopts.pl';
@@ -150,7 +150,7 @@ sub conv_Makefile {
 	open(PKG, ">$pkgdir/Makefile")
 		|| die "$pkgdir/Makefile: $!\n";
 
-	print PKG "# \$NetBSD\$\n";
+	print PKG "# \$Net" . "BSD\$\n";
 
 	# header
 	while (<PORTS>) {
diff --git a/pkgtools/url2pkg/files/url2pkg.pl b/pkgtools/url2pkg/files/url2pkg.pl
index 7a4af95219b..c35a719e8e2 100644
--- a/pkgtools/url2pkg/files/url2pkg.pl
+++ b/pkgtools/url2pkg/files/url2pkg.pl
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: url2pkg.pl,v 1.8 2007/03/19 01:38:56 rillig Exp $
+# $NetBSD: url2pkg.pl,v 1.9 2007/07/10 15:27:57 joerg Exp $
 #
 
 use strict;
@@ -272,7 +272,7 @@ sub generate_initial_package($) {
 	$category = $1;
 
 	open(MF, ">", "Makefile") or die;
-	print MF ("# \$NetBSD\$\n");
+	print MF ("# \$NetBSD" . "\$\n");
 	print MF ("#\n");
 	print MF ("\n");
 	print_section(*MF, [
diff --git a/security/audit-packages/files/audit-packages b/security/audit-packages/files/audit-packages
index 5f136bc077d..6d88a30c930 100755
--- a/security/audit-packages/files/audit-packages
+++ b/security/audit-packages/files/audit-packages
@@ -1,6 +1,6 @@
 #! @SH@
 #
-# $NetBSD: audit-packages,v 1.30 2006/12/09 12:30:47 adrianp Exp $
+# $NetBSD: audit-packages,v 1.31 2007/07/10 15:27:57 joerg Exp $
 #
 # Copyright (c) 2000-2003 Alistair Crooks.  All rights reserved.
 #
@@ -165,7 +165,7 @@ case "$errmsg" in
 		"")	errmsg="No checksum algorithm found in $vuls file"
 			errsolution="$ERR_DOWNLOAD"
 			;;
-		*)	calcsum=`@AWK@ '$1 == "#CHECKSUM" || /\$NetBSD.*/ { next } { print }' "$vuls" | @DIGEST@ "$recordedalg"`
+		*)	calcsum=`@AWK@ '$1 == "#CHECKSUM" || /\$[N]etBSD.*/ { next } { print }' "$vuls" | @DIGEST@ "$recordedalg"`
 			if [ "$recordedsum" != "$calcsum" ]; then
 				errmsg="Checksum mismatch - recorded $recordedalg checksum \"$recordedsum\", calculated checksum \"$calcsum\""
 				errsolution="$ERR_DOWNLOAD"