| @@ -1,57 +1,65 @@ | | | @@ -1,57 +1,65 @@ |
| 1 | $NetBSD: patch-ag,v 1.1.1.1 2008/11/15 18:28:56 jmcneill Exp $ | | 1 | $NetBSD: patch-ag,v 1.2 2013/08/24 15:34:39 prlw1 Exp $ |
| 2 | | | 2 | |
| 3 | --- Utils/Platform.pm.orig 2008-03-09 09:21:45.000000000 -0400 | | 3 | --- Utils/Platform.pm.orig 2008-03-09 13:21:45.000000000 +0000 |
| 4 | +++ Utils/Platform.pm | | 4 | +++ Utils/Platform.pm |
| 5 | @@ -76,6 +76,10 @@ my $PLATFORM_INFO = { | | 5 | @@ -1,4 +1,4 @@ |
| | | 6 | -#!/usr/bin/env perl |
| | | 7 | +#!/usr/pkg/bin/perl |
| | | 8 | #-*- Mode: perl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- |
| | | 9 | |
| | | 10 | # Determine the platform we're running on. |
| | | 11 | @@ -76,6 +76,11 @@ my $PLATFORM_INFO = { |
| 6 | "slackware-11.0.0" => [ "Slackware", "11.0.0", "" ], | | 12 | "slackware-11.0.0" => [ "Slackware", "11.0.0", "" ], |
| 7 | "slackware-12.0.0" => [ "Slackware", "12.0.0", "" ], | | 13 | "slackware-12.0.0" => [ "Slackware", "12.0.0", "" ], |
| 8 | "bluewhite64-12.0.0" => [ "Bluewhite64", "12.0.0", "" ], | | 14 | "bluewhite64-12.0.0" => [ "Bluewhite64", "12.0.0", "" ], |
| 9 | + "netbsd-2" => [ "NetBSD", "2", "" ], | | 15 | + "netbsd-2" => [ "NetBSD", "2", "" ], |
| 10 | + "netbsd-3" => [ "NetBSD", "3", "" ], | | 16 | + "netbsd-3" => [ "NetBSD", "3", "" ], |
| 11 | + "netbsd-4" => [ "NetBSD", "4", "" ], | | 17 | + "netbsd-4" => [ "NetBSD", "4", "" ], |
| 12 | + "netbsd-5" => [ "NetBSD", "5", "" ], | | 18 | + "netbsd-5" => [ "NetBSD", "5", "" ], |
| | | 19 | + "netbsd-6" => [ "NetBSD", "6", "" ], |
| 13 | "freebsd-4" => [ "FreeBSD", "4", "" ], | | 20 | "freebsd-4" => [ "FreeBSD", "4", "" ], |
| 14 | "freebsd-5" => [ "FreeBSD", "5", "" ], | | 21 | "freebsd-5" => [ "FreeBSD", "5", "" ], |
| 15 | "freebsd-6" => [ "FreeBSD", "6", "" ], | | 22 | "freebsd-6" => [ "FreeBSD", "6", "" ], |
| 16 | @@ -131,6 +135,9 @@ sub ensure_distro_map | | 23 | @@ -131,6 +136,10 @@ sub ensure_distro_map |
| 17 | "fedora-3" => "redhat-7.2", | | 24 | "fedora-3" => "redhat-7.2", |
| 18 | "fedora-4" => "redhat-7.2", | | 25 | "fedora-4" => "redhat-7.2", |
| 19 | "fedora-5" => "redhat-7.2", | | 26 | "fedora-5" => "redhat-7.2", |
| 20 | + "netbsd-3" => "netbsd-2", | | 27 | + "netbsd-3" => "netbsd-2", |
| 21 | + "netbsd-4" => "netbsd-2", | | 28 | + "netbsd-4" => "netbsd-2", |
| 22 | + "netbsd-5" => "netbsd-2", | | 29 | + "netbsd-5" => "netbsd-2", |
| | | 30 | + "netbsd-6" => "netbsd-2", |
| 23 | "freebsd-6" => "freebsd-5", | | 31 | "freebsd-6" => "freebsd-5", |
| 24 | "freebsd-7" => "freebsd-5", | | 32 | "freebsd-7" => "freebsd-5", |
| 25 | "openna-1.0" => "redhat-6.2", | | 33 | "openna-1.0" => "redhat-6.2", |
| 26 | @@ -251,6 +258,23 @@ sub check_ark | | 34 | @@ -251,6 +260,23 @@ sub check_ark |
| 27 | return -1; | | 35 | return -1; |
| 28 | } | | 36 | } |
| 29 | | | 37 | |
| 30 | +sub check_netbsd | | 38 | +sub check_netbsd |
| 31 | +{ | | 39 | +{ |
| 32 | + my ($sysctl_cmd, @output); | | 40 | + my ($sysctl_cmd, @output); |
| 33 | + | | 41 | + |
| 34 | + $sysctl_cmd = &Utils::File::locate_tool ("sysctl"); | | 42 | + $sysctl_cmd = &Utils::File::locate_tool ("sysctl"); |
| 35 | + @output = (readpipe("$sysctl_cmd -n kern.version")); | | 43 | + @output = (readpipe("$sysctl_cmd -n kern.version")); |
| 36 | + foreach (@output) | | 44 | + foreach (@output) |
| 37 | + { | | 45 | + { |
| 38 | + chomp; | | 46 | + chomp; |
| 39 | + if (/^NetBSD\s([0-9]+)\.\S+.*/) | | 47 | + if (/^NetBSD\s([0-9]+)\.\S+.*/) |
| 40 | + { | | 48 | + { |
| 41 | + return "netbsd-$1"; | | 49 | + return "netbsd-$1"; |
| 42 | + } | | 50 | + } |
| 43 | + } | | 51 | + } |
| 44 | + return -1; | | 52 | + return -1; |
| 45 | +} | | 53 | +} |
| 46 | + | | 54 | + |
| 47 | sub check_freebsd | | 55 | sub check_freebsd |
| 48 | { | | 56 | { |
| 49 | my ($sysctl_cmd, @output); | | 57 | my ($sysctl_cmd, @output); |
| 50 | @@ -391,6 +415,7 @@ sub guess | | 58 | @@ -391,6 +417,7 @@ sub guess |
| 51 | [ \&check_distro_file, "/etc/yellowdog-release", "yellowdog", "^Yellow Dog Linux release (\\S+)" ], | | 59 | [ \&check_distro_file, "/etc/yellowdog-release", "yellowdog", "^Yellow Dog Linux release (\\S+)" ], |
| 52 | ], | | 60 | ], |
| 53 | "FreeBSD" => [[ \&check_freebsd ]], | | 61 | "FreeBSD" => [[ \&check_freebsd ]], |
| 54 | + "NetBSD" => [[ \&check_netbsd ]], | | 62 | + "NetBSD" => [[ \&check_netbsd ]], |
| 55 | "SunOS" => [[ \&check_solaris ]] | | 63 | "SunOS" => [[ \&check_solaris ]] |
| 56 | ); | | 64 | ); |
| 57 | | | 65 | |