diff options
| author | wiz <wiz> | 2014-10-09 13:44:32 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2014-10-09 13:44:32 +0000 |
| commit | 508475860e4451e63a6de3b23e38100b05d7b9ab (patch) | |
| tree | d43e14befa596c41d96cf54f018ad5d1dfff9156 /pkgtools | |
| parent | 93cf1633ea11d97b45910a45a745726717710cb8 (diff) | |
| download | pkgsrc-508475860e4451e63a6de3b23e38100b05d7b9ab.tar.gz | |
Remove SVR4_PKGNAME, per discussion on tech-pkg.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkglint/files/makevars.map | 3 | ||||
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 5 | ||||
| -rw-r--r-- | pkgtools/revbump/files/revbump | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/pkgtools/pkglint/files/makevars.map b/pkgtools/pkglint/files/makevars.map index 1be6e487f50..38d4146907e 100644 --- a/pkgtools/pkglint/files/makevars.map +++ b/pkgtools/pkglint/files/makevars.map @@ -1,4 +1,4 @@ -# $NetBSD: makevars.map,v 1.255 2014/10/08 19:15:16 rillig Exp $ +# $NetBSD: makevars.map,v 1.256 2014/10/09 13:44:53 wiz Exp $ # # This file contains the guessed type of some variables, according to @@ -707,7 +707,6 @@ SUBST_SED.* SedCommands [m:as,c:as,h:as,o:as,Makefile.*:as] SUBST_STAGE.* Stage [$package] SUBST_VARS.* List of Varname [$package_list] SUPERSEDES InternalList of Dependency [$package_list] -SVR4_PKGNAME SVR4PkgName [$package] TEST_DIRS List of WrksrcSubdirectory [$package_list] TEST_ENV List of ShellWord [$package_list] TEST_TARGET List of Identifier [m:s,c:ds,o:as] diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index d36fd661d37..2b64601a8d5 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -1,5 +1,5 @@ #! @PERL@ -# $NetBSD: pkglint.pl,v 1.871 2014/10/08 19:15:16 rillig Exp $ +# $NetBSD: pkglint.pl,v 1.872 2014/10/09 13:44:53 wiz Exp $ # # pkglint - static analyzer and checker for pkgsrc packages @@ -4351,9 +4351,7 @@ sub checkline_mk_vartype_basic($$$$$$$$) { SVR4PkgName => sub { if ($value =~ regex_unresolved) { - $line->log_error("SVR4_PKGNAME must not contain references to other variables."); } elsif (length($value) > 5) { - $line->log_error("SVR4_PKGNAME must not be longer than 5 characters."); } }, @@ -4954,7 +4952,6 @@ sub checklines_package_Makefile_varorder($) { [ "DISTNAME", optional ], [ "PKGNAME", optional ], [ "PKGREVISION", optional ], - [ "SVR4_PKGNAME", optional ], [ "CATEGORIES", once ], [ "MASTER_SITES", optional ], [ "DIST_SUBDIR", optional ], diff --git a/pkgtools/revbump/files/revbump b/pkgtools/revbump/files/revbump index 794bd39fd33..4dc91cfde74 100644 --- a/pkgtools/revbump/files/revbump +++ b/pkgtools/revbump/files/revbump @@ -1,7 +1,7 @@ #!@PERL@ -w # -*- perl -*- # -# $NetBSD: revbump,v 1.4 2014/08/22 11:26:25 wiz Exp $ +# $NetBSD: revbump,v 1.5 2014/10/09 13:44:53 wiz Exp $ # # Copyright (c) 2003, 2004 The NetBSD Foundation, Inc. # @@ -76,7 +76,6 @@ sub revbump { if ($done == 0 && /^PKGREVISION=([ \t]+)([0-9]+)$/) { $done = $2 + 1; print NEWMK "PKGREVISION=${1}${done}\n"; - } elsif ($done == 0 && /^SVR4_PKGNAME=([ \t]+)/) { print NEWMK "PKGREVISION=${1}1\n"; print NEWMK $_; $done = 1; |