[pkgsrc/trunk]: pkgsrc/pkgtools/pkglint/files After the recent fixes by wiz, ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/20566011efbf
branches:  trunk
changeset: 539459:20566011efbf
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Mar 06 08:37:26 2008 +0000

description:
After the recent fixes by wiz, the regular expression for splitting a
package name into PKGBASE and PKGVERSION has been changed. It treats
everything in front of the last hyphen as the package basename and the
rest (which will hopefully start with a digit) as the package version.
Packages that are affected by this change are for example:

* fonts/*-100dpi
* lang/elisp-manual: elisp-manual-21-2.8
* mail/postfix-current: postfix-2.6-20080216
* net/flodo: flodo-4-20040907

diffstat:

 pkgtools/pkglint/files/pkglint.pl |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (19 lines):

diff -r bf404a41c81e -r 20566011efbf pkgtools/pkglint/files/pkglint.pl
--- a/pkgtools/pkglint/files/pkglint.pl Thu Mar 06 05:58:50 2008 +0000
+++ b/pkgtools/pkglint/files/pkglint.pl Thu Mar 06 08:37:26 2008 +0000
@@ -1,5 +1,5 @@
 #! @PERL@
-# $NetBSD: pkglint.pl,v 1.766 2008/02/27 00:24:19 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.767 2008/03/06 08:37:26 rillig Exp $
 #
 
 # pkglint - static analyzer and checker for pkgsrc packages
@@ -1759,7 +1759,7 @@
 use constant regex_mk_include  => qr"^\.\s*(s?include)\s+\"([^\"]+)\"\s*(?:#.*)?$";
 use constant regex_mk_sysinclude=> qr"^\.\s*s?include\s+<([^>]+)>\s*(?:#.*)?$";
 use constant regex_mk_shellvaruse => qr"(?:^|[^\$])\$\$\{?(\w+)\}?"; # XXX: not perfect
-use constant regex_pkgname     => qr"^((?:[\w.+]|-[^\d])+)-(\d(?:\w|\.\d)*)$";
+use constant regex_pkgname     => qr"^([\w\-.+]+)-(\d(?:\w|\.\d)*)$";
 use constant regex_mk_shellcmd => qr"^\t(.*)$";
 use constant regex_rcs_conflict        => qr"^(<<<<<<<|=======|>>>>>>>)";
 use constant regex_unresolved  => qr"\$\{";