diff options
| author | rillig <rillig@pkgsrc.org> | 2008-03-06 08:37:26 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2008-03-06 08:37:26 +0000 |
| commit | dce691f7d74914a57274665e65675cf7b744d233 (patch) | |
| tree | 48ec4a899ee1445512589659d029c13919cca7e1 /pkgtools/pkglint | |
| parent | a6205891e13acd5e6a955b041a6a5e9f3aa13629 (diff) | |
| download | pkgsrc-dce691f7d74914a57274665e65675cf7b744d233.tar.gz | |
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 (limited to 'pkgtools/pkglint')
| -rw-r--r-- | pkgtools/pkglint/files/pkglint.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl index bd79cf1ddba..09ea9c156cd 100644 --- a/pkgtools/pkglint/files/pkglint.pl +++ b/pkgtools/pkglint/files/pkglint.pl @@ -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_dependency=> qr"^([^\s:]+(?:\s*[^\s:]+)*):\s*([^#]*?)(?:\s 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"\$\{"; |