More SVR4_PKGNAME cleanup.

5 files changed, 9 insertions, 21 deletions

diff --git a/pkgtools/pkglint/files/deprecated.map b/pkgtools/pkglint/files/deprecated.map
index 08e9f04288f..becd9c76861 100644
--- a/pkgtools/pkglint/files/deprecated.map
+++ b/pkgtools/pkglint/files/deprecated.map
@@ -1,4 +1,4 @@
-# $NetBSD: deprecated.map,v 1.64 2013/07/15 08:09:21 wiz Exp $
+# $NetBSD: deprecated.map,v 1.65 2014/10/09 13:54:47 wiz Exp $
 #
 
 # This file contains names of Makefile variables and a short explanation
@@ -160,3 +160,6 @@ GAMEOWN			Use GAMES_USER instead.
 
 # July 2013
 USE_GNU_READLINE	Include "../../devel/readline/buildlink3.mk" instead.
+
+# October 2014
+SVR4_PKGNAME		Just remove it.
diff --git a/pkgtools/pkglint/files/doc/chap.types.xml b/pkgtools/pkglint/files/doc/chap.types.xml
index d91d7711b9f..1cf85e4650d 100644
--- a/pkgtools/pkglint/files/doc/chap.types.xml
+++ b/pkgtools/pkglint/files/doc/chap.types.xml
@@ -1,4 +1,4 @@
-<!-- $NetBSD: chap.types.xml,v 1.17 2009/06/13 06:33:35 rillig Exp $ -->
+<!-- $NetBSD: chap.types.xml,v 1.18 2014/10/09 13:54:47 wiz Exp $ -->
 
 <chapter id="types">
 <title>The &pkglint; type system</title>
@@ -403,12 +403,6 @@
 	See also <literal><type>RelativePkgDir</type></literal>.</para>
 	</listitem></varlistentry>
 
-	<varlistentry><term><literal><type>SVR4PkgName</type></literal></term>
-	<listitem><para>When converting pkgsrc packages to Solaris
-	packages, the package name is restricted to 9 characters, of
-	which five remain for the package
-	itself.</para></listitem></varlistentry>
-
 	<varlistentry><term><literal><type>ShellCommand</type></literal></term>
 	<listitem><para>A shell command is similar to a
 	<literal><type>List of ShellWord</type></literal>, except that
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 2b64601a8d5..0a8eadab680 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.872 2014/10/09 13:44:53 wiz Exp $
+# $NetBSD: pkglint.pl,v 1.873 2014/10/09 13:54:47 wiz Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -4349,12 +4349,6 @@ sub checkline_mk_vartype_basic($$$$$$$$) {
 			}
 		},
 
-		SVR4PkgName => sub {
-			if ($value =~ regex_unresolved) {
-			} elsif (length($value) > 5) {
-			}
-		},
-
 		SedCommand => sub {
 		},
 
diff --git a/pkgtools/pkglint/files/pkglint.t b/pkgtools/pkglint/files/pkglint.t
index 841b38d096e..ba3fe8a8a33 100644
--- a/pkgtools/pkglint/files/pkglint.t
+++ b/pkgtools/pkglint/files/pkglint.t
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.t,v 1.9 2013/03/26 15:11:36 schmonz Exp $
+# $NetBSD: pkglint.t,v 1.10 2014/10/09 13:54:47 wiz Exp $
 #
 
 require 'pkglint.pl';			# so we can test its internals
@@ -83,7 +83,7 @@ sub test_get_vartypes_basictypes {
 		PkgName PkgOptionsVar PkgPath PkgRevision
 		PlatformTriple PrefixPathname
 		RelativePkgDir RelativePkgPath
-		Restricted SVR4PkgName
+		Restricted
 		SedCommand SedCommands
 		ShellCommand ShellWord
 		Stage String Tool URL Unchecked UserGroupName Varname Version
diff --git a/pkgtools/revbump/files/revbump b/pkgtools/revbump/files/revbump
index 4dc91cfde74..1e150d2a275 100644
--- a/pkgtools/revbump/files/revbump
+++ b/pkgtools/revbump/files/revbump
@@ -1,7 +1,7 @@
 #!@PERL@ -w
 # -*- perl -*-
 #
-# $NetBSD: revbump,v 1.5 2014/10/09 13:44:53 wiz Exp $
+# $NetBSD: revbump,v 1.6 2014/10/09 13:51:42 wiz Exp $
 #
 # Copyright (c) 2003, 2004 The NetBSD Foundation, Inc.
 #
@@ -76,9 +76,6 @@ sub revbump {
         if ($done == 0 && /^PKGREVISION=([ \t]+)([0-9]+)$/) {
             $done = $2 + 1;
             print NEWMK "PKGREVISION=${1}${done}\n";
-            print NEWMK "PKGREVISION=${1}1\n";
-            print NEWMK $_;
-            $done = 1;
         } elsif ($done == 0 && /^CATEGORIES=([ \t]+)/) {
             print NEWMK "PKGREVISION=${1}1\n";
             print NEWMK $_;