[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files - Renamed the type PlatformTupl...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/b1b936a3cb21
branches:  trunk
changeset: 503738:b1b936a3cb21
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sun Nov 27 21:18:43 2005 +0000

description:
- Renamed the type PlatformTuple into PlatformTriple.
- Added an explanation for invalid PlatformTriples.

diffstat:

 pkgtools/pkglint/files/makevars.map |   8 ++++----
 pkgtools/pkglint/files/pkglint.pl   |  10 +++++++---
 2 files changed, 11 insertions(+), 7 deletions(-)

diffs (70 lines):

diff -r 90d4e958bd6e -r b1b936a3cb21 pkgtools/pkglint/files/makevars.map
--- a/pkgtools/pkglint/files/makevars.map       Sun Nov 27 21:10:20 2005 +0000
+++ b/pkgtools/pkglint/files/makevars.map       Sun Nov 27 21:18:43 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: makevars.map,v 1.38 2005/11/24 08:05:01 rillig Exp $
+# $NetBSD: makevars.map,v 1.39 2005/11/27 21:18:43 rillig Exp $
 #
 
 # This file contains the guessed type of some variables, according to
@@ -94,7 +94,7 @@
 GCC_REQD               List+
 GNU_CONFIGURE          Yes
 HOMEPAGE               URL
-INCOMPAT_CURSES                List of PlatformTuple
+INCOMPAT_CURSES                List of PlatformTriple
 INSTALL_DIRS           List of WrksrcSubdirectory
 INSTALL_UNSTRIPPED     YesNo
 KRB5BASE               Readonly
@@ -113,7 +113,7 @@
 MYSQL_VERSIONS_ACCEPTED        List of { 40 41 50 }
 MYSQL_VERSION_DEFAULT  Userdefined
 NOT_FOR_COMPILER       List of { ccc gcc icc ido mipspro mipspro-ucode sunpro xlc }
-NOT_FOR_PLATFORM       List of PlatformTuple
+NOT_FOR_PLATFORM       List of PlatformTriple
 NO_BUILD               Yes
 NO_CHECKSUM            Yes
 NO_CONFIGURE           Yes
@@ -121,7 +121,7 @@
 NO_PKGTOOLS_REQD_CHECK Yes
 NO_PKG_REGISTER                Yes
 ONLY_FOR_COMPILER      List of { ccc gcc icc ido mipspro mipspro-ucode sunpro xlc }
-ONLY_FOR_PLATFORM      List of PlatformTuple
+ONLY_FOR_PLATFORM      List of PlatformTriple
 PAMBASE                        Readonly
 PAM_ACCEPTED           List of { linux-pam openpam solaris-pam }
 PAM_DEFAULT            Userdefined
diff -r 90d4e958bd6e -r b1b936a3cb21 pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Sun Nov 27 21:10:20 2005 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Sun Nov 27 21:18:43 2005 +0000
@@ -11,7 +11,7 @@
 # Freely redistributable.  Absolutely no warranty.
 #
 # From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp
-# $NetBSD: pkglint.pl,v 1.388 2005/11/27 21:10:20 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.389 2005/11/27 21:18:43 rillig Exp $
 #
 # This version contains lots of changes necessary for NetBSD packages
 # done by:
@@ -1915,7 +1915,7 @@
                        $line->log_error("${varname} must not be set outside the package Makefile.");
                }
 
-       } elsif ($type eq "PlatformTuple") {
+       } elsif ($type eq "PlatformTriple") {
                my $part = qr"(?:\[[^\]]+\]|[^-\[])+";
                if ($value =~ qr"^(${part})-(${part})-(${part})$") {
                        my ($opsys, $os_version, $arch) = ($1, $2, $3);
@@ -1929,7 +1929,11 @@
                        }
 
                } else {
-                       $line->log_warning("\"${value}\" is not a valid platform tuple.");
+                       $line->log_warning("\"${value}\" is not a valid platform triple.");
+                       $line->explain(
+                               "A platform triple has the form <OPSYS>-<OS_VERSION>-<MACHINE_ARCH>.",
+                               "Each of these components may be a shell globbing expression.",
+                               "Examples: NetBSD-*-i386, *-*-*, Linux-*-*.");
                }
 
        } elsif ($type eq "Readonly") {