- Renamed the type PlatformTuple into PlatformTriple.

- Added an explanation for invalid PlatformTriples.

2 files changed, 11 insertions, 7 deletions

diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map
index cfa8123ea27..77a7a83a058 100644
--- a/pkgtools/pkglint/files/makevars.map
+++ b/pkgtools/pkglint/files/makevars.map
@@ -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 @@ FILES_SUBST		List+ of ShellWord
 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 @@ MASTER_SITES		List of URL
 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_MTREE		Yes
 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 --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index d7a773c11e2..ad172d8253d 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -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 @@ sub checkline_basic_vartype($$$$$) {
 			$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 @@ sub checkline_basic_vartype($$$$$) {
 			}
 
 		} 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") {