diff options
| -rw-r--r-- | devel/portlint/src/portlint.pl | 13 | ||||
| -rw-r--r-- | ports-mgmt/portlint/src/portlint.pl | 13 |
2 files changed, 14 insertions, 12 deletions
diff --git a/devel/portlint/src/portlint.pl b/devel/portlint/src/portlint.pl index 8989f4cdc55a..1c3876678ea2 100644 --- a/devel/portlint/src/portlint.pl +++ b/devel/portlint/src/portlint.pl @@ -13,7 +13,7 @@ # bsd.port.mk. There are significant differences in those so you'll have # hard time upgrading this... # -# $Id: portlint.pl,v 1.1 1999/01/05 12:23:28 itojun Exp $ +# $Id: portlint.pl,v 1.2 1999/01/05 12:26:08 itojun Exp $ # $err = $warn = 0; @@ -688,18 +688,19 @@ EOF # check x11 in CATEGORIES if ($newxdef - && $tmp =~ /\nCATEGORIES[+?]?=[ \t]*([^\n]*)\n/ && $1 =~ /x11/) { + && $tmp =~ /\nCATEGORIES[+?]?=[ \t]*([^\n]*)\n/ + && ($foo = $1) =~ /x11/) { print "OK: checking x11 in CATEGORIES.\n" if ($verbose); - @i = split(/\s+/, $1); - if ($i[0] eq 'x11') { + @i = split(/\s+/, $foo); + if ($i[0] =~ /^x11\-?/) { ; # okay } elsif ($i[0] =~ /(chinese|japanese|korean|german|russian)/) { ; # okay } else { &perror("WARN: only specific kind of apps should ". "specify \"x11\" in CATEGORIES. ". - "do you mean just USE_XLIB? ". - "then remove \"x11\" from CATEGORIES."); + "Do you mean just USE_XLIB? ". + "Then remove \"x11\" from CATEGORIES."); } } diff --git a/ports-mgmt/portlint/src/portlint.pl b/ports-mgmt/portlint/src/portlint.pl index 8989f4cdc55a..1c3876678ea2 100644 --- a/ports-mgmt/portlint/src/portlint.pl +++ b/ports-mgmt/portlint/src/portlint.pl @@ -13,7 +13,7 @@ # bsd.port.mk. There are significant differences in those so you'll have # hard time upgrading this... # -# $Id: portlint.pl,v 1.1 1999/01/05 12:23:28 itojun Exp $ +# $Id: portlint.pl,v 1.2 1999/01/05 12:26:08 itojun Exp $ # $err = $warn = 0; @@ -688,18 +688,19 @@ EOF # check x11 in CATEGORIES if ($newxdef - && $tmp =~ /\nCATEGORIES[+?]?=[ \t]*([^\n]*)\n/ && $1 =~ /x11/) { + && $tmp =~ /\nCATEGORIES[+?]?=[ \t]*([^\n]*)\n/ + && ($foo = $1) =~ /x11/) { print "OK: checking x11 in CATEGORIES.\n" if ($verbose); - @i = split(/\s+/, $1); - if ($i[0] eq 'x11') { + @i = split(/\s+/, $foo); + if ($i[0] =~ /^x11\-?/) { ; # okay } elsif ($i[0] =~ /(chinese|japanese|korean|german|russian)/) { ; # okay } else { &perror("WARN: only specific kind of apps should ". "specify \"x11\" in CATEGORIES. ". - "do you mean just USE_XLIB? ". - "then remove \"x11\" from CATEGORIES."); + "Do you mean just USE_XLIB? ". + "Then remove \"x11\" from CATEGORIES."); } } |